diff --git a/Assets/Inputs/Controls.cs b/Assets/Inputs/Controls.cs index 1ef3dd809b1ff283a9d0c85039207dc07ddc5868..0b0ae9e28aed4cf8bce859d25b8d1679bc2dfb0a 100644 --- a/Assets/Inputs/Controls.cs +++ b/Assets/Inputs/Controls.cs @@ -424,7 +424,7 @@ public partial class @Controls: IInputActionCollection2, IDisposable ""id"": ""4cd0b8b9-709b-4ffb-8dcc-2861b7e586d3"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """", + ""interactions"": ""Tap"", ""initialStateCheck"": true }, { diff --git a/Assets/Inputs/Controls.inputactions b/Assets/Inputs/Controls.inputactions index 6f67b3797fe78125193ebb9020d47c8fc9caf2c9..ab023b3d7a457977831bfe0f61fbdd6ea8b18242 100644 --- a/Assets/Inputs/Controls.inputactions +++ b/Assets/Inputs/Controls.inputactions @@ -402,7 +402,7 @@ "id": "4cd0b8b9-709b-4ffb-8dcc-2861b7e586d3", "expectedControlType": "Button", "processors": "", - "interactions": "", + "interactions": "Tap", "initialStateCheck": true }, { diff --git a/Assets/Lighting/LightingData.asset b/Assets/Lighting/LightingData.asset index f34598f157a117133f2b1611cf639136f1e2ca40..f6e8031df0e06190defb7c63a7c761a15f5e40ad 100644 Binary files a/Assets/Lighting/LightingData.asset and b/Assets/Lighting/LightingData.asset differ diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 0a44301a98e1fb967d2eb0d5310550cbb8710a58..eeb864539479d211097078d726b3fef3d1814982 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -216,7 +216,7 @@ GameObject: - component: {fileID: 11400002} - component: {fileID: 13600000} - component: {fileID: 8200002} - - component: {fileID: 7588598180635152441} + - component: {fileID: 5475400658131949190} m_Layer: 0 m_Name: Player m_TagString: Player @@ -324,6 +324,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 6 + originalSpeed: 6 + prevSpeed: 0 --- !u!136 &13600000 CapsuleCollider: m_ObjectHideFlags: 0 @@ -473,8 +475,6 @@ MonoBehaviour: m_DefaultActionMap: Player m_SplitScreenIndex: -1 m_Camera: {fileID: 0} ---- !u!114 &7588598180635152441 - balance: 0 --- !u!1 &100008 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/ShopCanvas.prefab b/Assets/Prefabs/ShopCanvas.prefab index 8db95b9ffac4bad913371a94a58a4bd56bccc840..7416a6302c4850bd9c46fa5d4f9c37afac93e2ad 100644 --- a/Assets/Prefabs/ShopCanvas.prefab +++ b/Assets/Prefabs/ShopCanvas.prefab @@ -202,7 +202,6 @@ GameObject: - component: {fileID: 3346195467346129619} - component: {fileID: 4608170235991123505} - component: {fileID: 3639470170173531391} - - component: {fileID: 7246818182021831408} - component: {fileID: 9118376375914274098} m_Layer: 5 m_Name: ShopCanvas @@ -284,21 +283,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &7246818182021831408 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8884385034281895471} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 19ed055c6eb86c94ba753f5adfd3bf80, type: 3} - m_Name: - m_EditorClassIdentifier: - masterMixer: {fileID: 24100000, guid: 5b84db49d40ea449aa4f3e3bd229ab5b, type: 2} - sfxSlider: {fileID: 0} - musicSlider: {fileID: 0} --- !u!114 &9118376375914274098 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index e838f26e6b05a7413f739326ffa0e298064615c5..06bd8d2110756abeaeb2a493458c78a19e357a73 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -535,7 +535,7 @@ MonoBehaviour: increaseDamageOrbPrefab: {fileID: 5928907673800009345, guid: eb4274969abbb7944acd2b2888294bba, type: 3} restoreHealthOrbPrefab: {fileID: 108012326883433976, guid: cbc7c018424f013499d4f4feb5ff52db, type: 3} increaseSpeedOrbPrefab: {fileID: 6926906167359508983, guid: 842d4cdd8e369c745bf786e8286b0723, type: 3} - inputField: {fileID: 0} + inputField: {fileID: 975036580} --- !u!1 &148003751 GameObject: m_ObjectHideFlags: 0 @@ -570,9 +570,9 @@ RectTransform: - {fileID: 1077360189} m_Father: {fileID: 1722116047} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 807.99994, y: -72.000046} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -474.48077, y: 184.89262} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &148003753 @@ -2371,6 +2371,100 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 588015466} m_CullTransparentMesh: 1 +--- !u!1 &593988439 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 593988440} + - component: {fileID: 593988442} + - component: {fileID: 593988441} + - component: {fileID: 593988443} + m_Layer: 5 + m_Name: CountdownText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &593988440 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 593988439} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1722116047} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 457.48, y: 190.94} + m_SizeDelta: {x: 82.0657, y: 62.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &593988441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 593988439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 109 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &593988442 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 593988439} + m_CullTransparentMesh: 1 +--- !u!114 &593988443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 593988439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c7b6e7c3c78b01d4eb3cc6223c46fc2f, type: 3} + m_Name: + m_EditorClassIdentifier: + countdownTime: 10 + countdownDisplay: {fileID: 593988441} --- !u!114 &667749386 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 11400000, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3} @@ -4188,7 +4282,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1077360188} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -4197,7 +4291,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -740, y: 0} + m_AnchoredPosition: {x: 25.000008, y: -25} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1077360190 @@ -5189,85 +5283,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &1450818666 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1450818667} - - component: {fileID: 1450818669} - - component: {fileID: 1450818668} - m_Layer: 5 - m_Name: GameOverText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1450818667 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1450818666} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 153} - m_SizeDelta: {x: 130, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1450818668 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1450818666} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: Game Over! ---- !u!222 &1450818669 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1450818666} - m_CullTransparentMesh: 1 --- !u!1 &1497441291 GameObject: m_ObjectHideFlags: 0 @@ -5661,175 +5676,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -0.5} m_SizeDelta: {x: -20, y: -13} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1536312378 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1581133371} - - component: {fileID: 1581133373} - - component: {fileID: 1581133372} - - component: {fileID: 1536312381} - - component: {fileID: 1536312379} - - component: {fileID: 1536312380} - m_Layer: 5 - m_Name: GameOverAsk - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1536312379 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536312378} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c7b6e7c3c78b01d4eb3cc6223c46fc2f, type: 3} - m_Name: - m_EditorClassIdentifier: - countdownTime: 10 - countdownDisplay: {fileID: 1536312380} ---- !u!114 &1536312380 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536312378} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 10 ---- !u!222 &1536312381 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536312378} - m_CullTransparentMesh: 1 ---- !u!224 &1581133371 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536312378} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1722116047} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -105} - m_SizeDelta: {x: 130, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1581133372 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536312378} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: Start a new game? ---- !u!222 &1581133373 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536312378} - m_CullTransparentMesh: 1 ---- !u!1 &1630565378 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1630565379} - m_Layer: 5 - m_Name: CountdownText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1630565379 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1630565378} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1641232233 PrefabInstance: m_ObjectHideFlags: 0 @@ -6098,15 +5944,13 @@ PrefabInstance: propertyPath: m_NeverAutoSwitchControlSchemes value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7588598180635152441, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3} m_RemovedGameObjects: - {fileID: 8455667667674168468, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3} - {fileID: 100008, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 100006, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3} - insertIndex: -1 - addedObject: {fileID: 2023876524} - targetCorrespondingSourceObject: {fileID: 100006, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3} insertIndex: -1 addedObject: {fileID: 2023876525} @@ -6470,7 +6314,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: timerManager: {fileID: 867131478} - countdownManager: {fileID: 1536312379} + countdownManager: {fileID: 593988443} mobileHUD: {fileID: 990504890} restartDelay: 10 --- !u!95 &1722116043 @@ -6562,10 +6406,10 @@ RectTransform: - {fileID: 1931296998} - {fileID: 687138047} - {fileID: 1062315028} - - {fileID: 1581133371} - {fileID: 2141633467} - {fileID: 246063895} - {fileID: 867131481} + - {fileID: 593988440} - {fileID: 2090690035} - {fileID: 966331550} - {fileID: 975036583} @@ -7611,18 +7455,6 @@ Animator: m_CorrespondingSourceObject: {fileID: 9500000, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3} m_PrefabInstance: {fileID: 1641232233} m_PrefabAsset: {fileID: 0} ---- !u!114 &2023876524 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974427093} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 472ec104c593ad9439f5dbb57bd16de6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2023876525 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8022,7 +7854,6 @@ CanvasRenderer: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1630565379} - {fileID: 1851598982} - {fileID: 1047928118} - {fileID: 1889514490} @@ -8038,5 +7869,4 @@ SceneRoots: - {fileID: 1102438310} - {fileID: 4043336} - {fileID: 28357258} - - {fileID: 1450818667} - {fileID: 1497441295} diff --git a/Assets/Scenes/Quest03.unity b/Assets/Scenes/Quest03.unity index 737487449b10cd13be60a3538f6dcce88cc7a146..be206ed1db5caf1b252e3f4357af7f93656b2d3d 100644 --- a/Assets/Scenes/Quest03.unity +++ b/Assets/Scenes/Quest03.unity @@ -3120,89 +3120,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 2.6714668, y: 3.0484924, z: 1.128832} m_Center: {x: -0.4395647, y: 1.4388156, z: -0.34513283} ---- !u!1 &1236001944 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1236001945} - - component: {fileID: 1236001948} - - component: {fileID: 1236001947} - - component: {fileID: 1236001946} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1236001945 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1236001944} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1165414997} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1236001946 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1236001944} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2d49b7c1bcd2e07499844da127be038d, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_ForceModuleActive: 0 ---- !u!114 &1236001947 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1236001944} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &1236001948 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1236001944} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 5 --- !u!1 &1254193698 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index dba0bbb669932c7fbbd1b0679fa5cac91d8e1248..c9b6df9d13aa6b0c583a42c7f5608c1223ecbf2c 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -1,10 +1,7 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; public class GameManager : MonoBehaviour { - static GameManager instance; public void startGame() { SceneManager.LoadScene("Cutscene01", LoadSceneMode.Single); } @@ -14,6 +11,6 @@ public class GameManager : MonoBehaviour { } private void Awake() { - // DontDestroyOnLoad(gameObject); + ControlRef.control.Enable(); } } diff --git a/Assets/Scripts/Managers/SettingsManager.cs b/Assets/Scripts/Managers/SettingsManager.cs index 36e9fa2056ca7a04bf1e9eb6619b7ec686a26d7d..7db40c7b0299c569447479c5c3f99e035990324c 100644 --- a/Assets/Scripts/Managers/SettingsManager.cs +++ b/Assets/Scripts/Managers/SettingsManager.cs @@ -11,7 +11,6 @@ public class SettingsManager : MonoBehaviour private void Awake() { - ControlRef.control.Enable(); nameInput.text = PlayerPrefs.GetString("PlayerName", ""); toggles[PlayerPrefs.GetInt("Difficulty", 0)].isOn = true;