GJP
/
GlobalGameJam-2021
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make som edits in player prefab and MainMenu

This commit is contained in:
haitem 2021-01-31 01:18:37 +01:00
parent 142e43c9f8
commit 9b95224e59
5 changed files with 237 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/Player.prefab
View File

@ -682,7 +682,7 @@ Rigidbody:
m_GameObject: {fileID: 7094923891560833857}
serializedVersion: 2
m_Mass: 70
m_Drag: 0
m_Drag: 0.05
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0

242
Assets/Scenes/Filip.unity
View File

@ -141,7 +141,7 @@ PrefabInstance:
- target: {fileID: 9203772316689128559, guid: a81c7869040fbef4f8d5acf2c1499c42,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 3
objectReference: {fileID: 0}
- target: {fileID: 9203772316689128559, guid: a81c7869040fbef4f8d5acf2c1499c42,
type: 3}
@ -300,10 +300,15 @@ PrefabInstance:
propertyPath: m_Name
value: PushPullCube
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996502, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
propertyPath: m_Mass
value: 200
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 7
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
@ -357,6 +362,144 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3}
--- !u!1001 &488560107
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2445808756126767684, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_Name
value: HideSpikes
objectReference: {fileID: 0}
- target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_LocalPosition.x
value: 1.3399206
objectReference: {fileID: 0}
- target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.055500984
objectReference: {fileID: 0}
- target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3}
--- !u!1001 &515298013
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_LocalPosition.x
value: 7.016
objectReference: {fileID: 0}
- target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8810309419999466073, guid: 75a5dff38607d264bbf318173d359a5e,
type: 3}
propertyPath: m_Name
value: Saw
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 75a5dff38607d264bbf318173d359a5e, type: 3}
--- !u!1001 &822020710
PrefabInstance:
m_ObjectHideFlags: 0
@ -369,10 +512,15 @@ PrefabInstance:
propertyPath: m_Name
value: PushPullCube (1)
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996502, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
propertyPath: m_Mass
value: 200
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 8
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
@ -522,8 +670,77 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &1158902025
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_LocalPosition.x
value: 3.813418
objectReference: {fileID: 0}
- target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.95
objectReference: {fileID: 0}
- target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8224448297729827165, guid: 08d7423eab725344da0bad3b29f907dd,
type: 3}
propertyPath: m_Name
value: SawRiding
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 08d7423eab725344da0bad3b29f907dd, type: 3}
--- !u!1001 &2549885454013026912
PrefabInstance:
m_ObjectHideFlags: 0
@ -534,7 +751,7 @@ PrefabInstance:
- target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855,
type: 3}
@ -608,7 +825,7 @@ PrefabInstance:
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 9
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
@ -677,7 +894,7 @@ PrefabInstance:
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
@ -746,7 +963,7 @@ PrefabInstance:
- target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97,
type: 3}
propertyPath: m_RootOrder
value: 10
value: 13
objectReference: {fileID: 0}
- target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97,
type: 3}
@ -820,7 +1037,7 @@ PrefabInstance:
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
@ -872,6 +1089,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833918, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_Drag
value: 0.05
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e4d82994b58b7304b91c915c597b71f8, type: 3}
--- !u!1001 &8125994354024151814
@ -884,7 +1106,7 @@ PrefabInstance:
- target: {fileID: 8125994354137083922, guid: 0d7691d0b9091aa4dba16f262d8daf1b,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8125994354137083922, guid: 0d7691d0b9091aa4dba16f262d8daf1b,
type: 3}

2
Assets/Scripts/MainMenu.cs
View File

@ -27,7 +27,7 @@ public class MainMenu : MonoBehaviour
public void Credits()
{
StartCoroutine(GetText("dev.steelants.cz/vasek/GGJ2021/GeorgeJones/Server/api.php"));
StartCoroutine(GetText("dev.steelants.cz/GGJ2021/GeorgeJones/Server/api.php"));
ScoreText.text = "test";
}

2
Assets/Scripts/PlayerManager.cs
View File

@ -58,7 +58,7 @@ public class PlayerManager : MonoBehaviour
{
if (Input.GetKeyDown(KeyCode.Escape))
{
Application.Quit(0);
SceneManager.LoadScene("MainMenu");
}
if (actualHealth <= 0 || gameObject.transform.position.y < -400.0f)
{

4
ProjectSettings/EditorBuildSettings.asset
View File

@ -6,8 +6,8 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/Menu.unity
guid: 8650591ee4e3c1b41b0eb5a15430ded2
path: Assets/Scenes/MainMenu.unity
guid: 33d54f39f74b30b4dbb8d638a1d5c9b4
- enabled: 1
path: Assets/Scenes/Vasek.unity
guid: 127deaeaf7712824f83ee4cba639e023