From 3111305a8373316727721cc2381028265b895dcd Mon Sep 17 00:00:00 2001 From: Santi Date: Fri, 7 Jun 2024 14:37:52 +0100 Subject: [PATCH] WackAMole: Moles only give one point per, a timer has been added, comments Timer: Created a universal timer Colours: Improved Comments, cubes now randomly appear on start. When a cube is in a container it gets randomly teleported back --- Assets/Scenes/ObjectMinigameTests.unity | 140 ++++++- Assets/Scenes/Whack-A-Mole.unity | 500 ++++++++++++++++-------- Assets/Scripts/BoxSpawns.cs | 19 + Assets/Scripts/BoxSpawns.cs.meta | 11 + Assets/Scripts/Colours.cs | 32 +- Assets/Scripts/Hamor.cs | 24 +- Assets/Scripts/Moles.cs | 44 ++- Assets/Scripts/Moles_IsHit.cs | 19 + Assets/Scripts/Moles_IsHit.cs.meta | 11 + Assets/Scripts/Movement.cs | 18 +- Assets/Scripts/Timer.cs | 20 + Assets/Scripts/Timer.cs.meta | 11 + 12 files changed, 633 insertions(+), 216 deletions(-) create mode 100644 Assets/Scripts/BoxSpawns.cs create mode 100644 Assets/Scripts/BoxSpawns.cs.meta create mode 100644 Assets/Scripts/Moles_IsHit.cs create mode 100644 Assets/Scripts/Moles_IsHit.cs.meta create mode 100644 Assets/Scripts/Timer.cs create mode 100644 Assets/Scripts/Timer.cs.meta diff --git a/Assets/Scenes/ObjectMinigameTests.unity b/Assets/Scenes/ObjectMinigameTests.unity index 4ad6681..4c63bc7 100644 --- a/Assets/Scenes/ObjectMinigameTests.unity +++ b/Assets/Scenes/ObjectMinigameTests.unity @@ -137,6 +137,7 @@ GameObject: - component: {fileID: 11243060} - component: {fileID: 11243064} - component: {fileID: 11243065} + - component: {fileID: 11243066} m_Layer: 0 m_Name: Cube (1) m_TagString: PickupObject @@ -251,6 +252,18 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &11243066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11243058} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4117eaed8044c04fa8e28e453955ca6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &63540143 GameObject: m_ObjectHideFlags: 0 @@ -265,6 +278,7 @@ GameObject: - component: {fileID: 63540147} - component: {fileID: 63540146} - component: {fileID: 63540145} + - component: {fileID: 63540150} m_Layer: 0 m_Name: Cube (7) m_TagString: PickupObject @@ -379,6 +393,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 63540143} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &63540150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 63540143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4117eaed8044c04fa8e28e453955ca6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &68930911 GameObject: m_ObjectHideFlags: 0 @@ -12072,6 +12098,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!1 &160828132 GameObject: m_ObjectHideFlags: 0 @@ -23765,6 +23793,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!43 &227805119 Mesh: m_ObjectHideFlags: 0 @@ -35912,6 +35942,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!65 &739774406 BoxCollider: m_ObjectHideFlags: 0 @@ -47801,6 +47833,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!43 &850156295 Mesh: m_ObjectHideFlags: 0 @@ -47979,6 +48013,7 @@ GameObject: - component: {fileID: 876529137} - component: {fileID: 876529141} - component: {fileID: 876529142} + - component: {fileID: 876529143} m_Layer: 0 m_Name: Cube (4) m_TagString: PickupObject @@ -48093,6 +48128,18 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &876529143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 876529135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4117eaed8044c04fa8e28e453955ca6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!43 &939033180 Mesh: m_ObjectHideFlags: 0 @@ -60113,6 +60160,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!1 &1091937918 GameObject: m_ObjectHideFlags: 0 @@ -60190,6 +60239,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!65 &1099757773 BoxCollider: m_ObjectHideFlags: 0 @@ -60217,6 +60268,7 @@ GameObject: - component: {fileID: 1120068328} - component: {fileID: 1120068332} - component: {fileID: 1120068333} + - component: {fileID: 1120068334} m_Layer: 0 m_Name: Cube (3) m_TagString: PickupObject @@ -60331,6 +60383,18 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1120068334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120068326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4117eaed8044c04fa8e28e453955ca6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1123558005 GameObject: m_ObjectHideFlags: 0 @@ -60345,6 +60409,7 @@ GameObject: - component: {fileID: 1123558007} - component: {fileID: 1123558011} - component: {fileID: 1123558012} + - component: {fileID: 1123558013} m_Layer: 0 m_Name: Cube m_TagString: PickupObject @@ -60459,6 +60524,18 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1123558013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1123558005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4117eaed8044c04fa8e28e453955ca6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1272725192 GameObject: m_ObjectHideFlags: 0 @@ -60473,6 +60550,7 @@ GameObject: - component: {fileID: 1272725194} - component: {fileID: 1272725198} - component: {fileID: 1272725199} + - component: {fileID: 1272725200} m_Layer: 0 m_Name: Cube (2) m_TagString: PickupObject @@ -60587,6 +60665,18 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1272725200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272725192} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4117eaed8044c04fa8e28e453955ca6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1308571409 GameObject: m_ObjectHideFlags: 0 @@ -60597,7 +60687,7 @@ GameObject: m_Component: - component: {fileID: 1308571410} m_Layer: 0 - m_Name: Racism + m_Name: Containers m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -60672,6 +60762,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!65 &1376790802 BoxCollider: m_ObjectHideFlags: 0 @@ -60908,6 +61000,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!1 &1474533909 GameObject: m_ObjectHideFlags: 0 @@ -60954,6 +61048,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!65 &1474533912 BoxCollider: m_ObjectHideFlags: 0 @@ -60965,8 +61061,8 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1.5, y: 3.7, z: 1.5} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1.5, y: 5.869747, z: 1.5} + m_Center: {x: 0, y: 1.0848737, z: 0} --- !u!850595691 &1506078724 LightingSettings: m_ObjectHideFlags: 0 @@ -61075,6 +61171,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!65 &1551258729 BoxCollider: m_ObjectHideFlags: 0 @@ -61134,6 +61232,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!65 &1637775324 BoxCollider: m_ObjectHideFlags: 0 @@ -72840,6 +72940,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!43 &1820899003 Mesh: m_ObjectHideFlags: 0 @@ -73018,6 +73120,7 @@ GameObject: - component: {fileID: 1846846726} - component: {fileID: 1846846730} - component: {fileID: 1846846731} + - component: {fileID: 1846846732} m_Layer: 0 m_Name: Cube (5) m_TagString: PickupObject @@ -73132,6 +73235,18 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1846846732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1846846724} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4117eaed8044c04fa8e28e453955ca6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1871629056 GameObject: m_ObjectHideFlags: 0 @@ -84825,6 +84940,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!1 &1872519961 GameObject: m_ObjectHideFlags: 0 @@ -96721,6 +96838,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!1 &1947815994 GameObject: m_ObjectHideFlags: 0 @@ -96997,6 +97116,7 @@ GameObject: - component: {fileID: 2051963687} - component: {fileID: 2051963691} - component: {fileID: 2051963692} + - component: {fileID: 2051963693} m_Layer: 0 m_Name: Cube (6) m_TagString: PickupObject @@ -97111,6 +97231,18 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2051963693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051963685} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4117eaed8044c04fa8e28e453955ca6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2117739596 GameObject: m_ObjectHideFlags: 0 @@ -97157,6 +97289,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: done: 0 + boxes: [] + waitTime: 3 --- !u!65 &2117739599 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Whack-A-Mole.unity b/Assets/Scenes/Whack-A-Mole.unity index d4627f9..5fbe5e6 100644 --- a/Assets/Scenes/Whack-A-Mole.unity +++ b/Assets/Scenes/Whack-A-Mole.unity @@ -234,170 +234,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 74483759} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!43 &113743803 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-23466 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 180 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 90 - localAABB: - m_Center: {x: 1, y: 1.25, z: 2} - m_Extent: {x: 1, y: 1.25, z: 2} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600180019001a0019001b001a001c001d001e001d001f001e00200021002200210023002200240025002600250027002600280029002a0029002b002a002c002d002e002d002f002e0030003100320031003300320031003400330034003500330035003600330034003700350037003800350038003900350037003a0038003a003b0038003b003c0038003a003d003b003d003e003b003e003f003b003d0040003e00400041003e00410042003e0043004400450043004600440046004700440046004800470046004900480048004a00470048004b004a0048004c004b004b004d004a004b004e004d004b004f004e004e0050004d004e00510050004e0052005100510053005000510054005300510055005400560057005800570059005800 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 90 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 4320 - _typelessdata: 0000004000000000000000000000000000000000000080bf0000803f0000000000000000000080bf00000040000000000000000000000000000000000000000000000000000080bf0000803f0000000000000000000080bf0000000000000000000000405655d53e000000000000000000000000000080bf0000803f0000000000000000000080bf000000405655d53e000000005655d53e000000000000000000000000000080bf0000803f0000000000000000000080bf000000005655d53e000000405655d53e00000000000000000000803f000000000000803f0000000000000000000080bf0000004000000000000000005655d53e00000000000000000000803f000000000000803f0000000000000000000080bf0000000000000000000000405655d53eabaa2a3f000000000000803f000000000000803f0000000000000000000080bf00000040abaa2a3f000000005655d53eabaa2a3f000000000000803f000000000000803f0000000000000000000080bf00000000abaa2a3f000000405655d53eabaa2a3f0000000000000000000080bf0000803f0000000000000000000080bf000000405655d53e000000005655d53eabaa2a3f0000000000000000000080bf0000803f0000000000000000000080bf000000005655d53e000000405655553fabaa2a3f0000000000000000000080bf0000803f0000000000000000000080bf000000405655553f000000005655553fabaa2a3f0000000000000000000080bf0000803f0000000000000000000080bf000000005655553f000000405655553fabaa2a3f000000000000803f000000000000803f0000000000000000000080bf00000040abaa2a3f000000005655553fabaa2a3f000000000000803f000000000000803f0000000000000000000080bf00000000abaa2a3f000000405655553fabaaaa3f000000000000803f000000000000803f0000000000000000000080bf00000040abaaaa3f000000005655553fabaaaa3f000000000000803f000000000000803f0000000000000000000080bf00000000abaaaa3f000000405655553fabaaaa3f0000000000000000000080bf0000803f0000000000000000000080bf000000405655553f000000005655553fabaaaa3f0000000000000000000080bf0000803f0000000000000000000080bf000000005655553f000000400000a03fabaaaa3f0000000000000000000080bf0000803f0000000000000000000080bf000000400000a03f000000000000a03fabaaaa3f0000000000000000000080bf0000803f0000000000000000000080bf000000000000a03f000000400000a03fabaaaa3f000000000000803f000000000000803f0000000000000000000080bf00000040abaaaa3f000000000000a03fabaaaa3f000000000000803f000000000000803f0000000000000000000080bf00000000abaaaa3f000000400000a03f00000040000000000000803f000000000000803f0000000000000000000080bf0000004000000040000000000000a03f00000040000000000000803f000000000000803f0000000000000000000080bf0000000000000040000000400000a03f000000400000000000000000000080bf0000803f0000000000000000000080bf000000400000a03f000000000000a03f000000400000000000000000000080bf0000803f0000000000000000000080bf000000000000a03f000000405655d53f000000400000000000000000000080bf0000803f0000000000000000000080bf000000405655d53f000000005655d53f000000400000000000000000000080bf0000803f0000000000000000000080bf000000005655d53f000000405655d53f00000040000000000000803f000000000000803f0000000000000000000080bf0000004000000040000000005655d53f00000040000000000000803f000000000000803f0000000000000000000080bf0000000000000040000000405655d53fabaa2a40000000000000803f000000000000803f0000000000000000000080bf00000040abaa2a40000000005655d53fabaa2a40000000000000803f000000000000803f0000000000000000000080bf00000000abaa2a40000000405655d53fabaa2a400000000000000000000080bf0000803f0000000000000000000080bf000000405655d53f000000005655d53fabaa2a400000000000000000000080bf0000803f0000000000000000000080bf000000005655d53f0000004055550540abaa2a400000000000000000000080bf0000803f0000000000000000000080bf00000040555505400000000055550540abaa2a400000000000000000000080bf0000803f0000000000000000000080bf00000000555505400000004055550540abaa2a40000000000000803f000000000000803f0000000000000000000080bf00000040abaa2a400000000055550540abaa2a40000000000000803f000000000000803f0000000000000000000080bf00000000abaa2a40000000405555054055555540000000000000803f000000000000803f0000000000000000000080bf0000004055555540000000005555054055555540000000000000803f000000000000803f0000000000000000000080bf00000000555555400000004055550540555555400000000000000000000080bf0000803f0000000000000000000080bf00000040555505400000000055550540555555400000000000000000000080bf0000803f0000000000000000000080bf00000000555505400000004000002040555555400000000000000000000080bf0000803f0000000000000000000080bf00000040000020400000000000002040555555400000000000000000000080bf0000803f0000000000000000000080bf0000000000002040000000400000204055555540000000000000803f000000000000803f0000000000000000000080bf0000004055555540000000000000204055555540000000000000803f000000000000803f0000000000000000000080bf0000000055555540000000400000204000008040000000000000803f000000000000803f0000000000000000000080bf0000004000008040000000000000204000008040000000000000803f000000000000803f0000000000000000000080bf0000000000008040000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf00000000000000000000000000000000abaa2a3f000080bf00000000000000000000000000000000000080bf000080bfabaa2abf00000000000000005555d53e00000000000080bf00000000000000000000000000000000000080bf000080bf000000005555d53e000000005555d53eabaa2a3f000080bf00000000000000000000000000000000000080bf000080bfabaa2abf5555d53e0000000000000000abaaaa3f000080bf00000000000000000000000000000000000080bf000080bfabaaaabf00000000000000005555553fabaaaa3f000080bf00000000000000000000000000000000000080bf000080bfabaaaabf5555553f000000005555553fabaa2a3f000080bf00000000000000000000000000000000000080bf000080bfabaa2abf5555553f000000000000000000000040000080bf00000000000000000000000000000000000080bf000080bf000000c000000000000000000000a03f00000040000080bf00000000000000000000000000000000000080bf000080bf000000c00000a03f000000000000a03fabaaaa3f000080bf00000000000000000000000000000000000080bf000080bfabaaaabf0000a03f0000000000000000abaa2a40000080bf00000000000000000000000000000000000080bf000080bfabaa2ac000000000000000005555d53fabaa2a40000080bf00000000000000000000000000000000000080bf000080bfabaa2ac05555d53f000000005555d53f00000040000080bf00000000000000000000000000000000000080bf000080bf000000c05555d53f000000000000000055555540000080bf00000000000000000000000000000000000080bf000080bf555555c000000000000000005555054055555540000080bf00000000000000000000000000000000000080bf000080bf555555c0555505400000000055550540abaa2a40000080bf00000000000000000000000000000000000080bf000080bfabaa2ac055550540000000000000000000008040000080bf00000000000000000000000000000000000080bf000080bf000080c000000000000000000000204000008040000080bf00000000000000000000000000000000000080bf000080bf000080c000002040000000000000204055555540000080bf00000000000000000000000000000000000080bf000080bf555555c000002040000000405555d53e000000000000803f000000000000000000000000000000000000803f000080bf000000005555d53e0000004000000000abaa2a3f0000803f000000000000000000000000000000000000803f000080bfabaa2a3f000000000000004000000000000000000000803f000000000000000000000000000000000000803f000080bf0000000000000000000000405555d53eabaa2a3f0000803f000000000000000000000000000000000000803f000080bfabaa2a3f5555d53e0000004000000000abaaaa3f0000803f000000000000000000000000000000000000803f000080bfabaaaa3f00000000000000405555553fabaaaa3f0000803f000000000000000000000000000000000000803f000080bfabaaaa3f5555553f000000405555553fabaa2a3f0000803f000000000000000000000000000000000000803f000080bfabaa2a3f5555553f0000004000000000000000400000803f000000000000000000000000000000000000803f000080bf0000004000000000000000400000a03f000000400000803f000000000000000000000000000000000000803f000080bf000000400000a03f000000400000a03fabaaaa3f0000803f000000000000000000000000000000000000803f000080bfabaaaa3f0000a03f0000004000000000abaa2a400000803f000000000000000000000000000000000000803f000080bfabaa2a4000000000000000405555d53fabaa2a400000803f000000000000000000000000000000000000803f000080bfabaa2a405555d53f000000405555d53f000000400000803f000000000000000000000000000000000000803f000080bf000000405555d53f0000004000000000555555400000803f000000000000000000000000000000000000803f000080bf55555540000000000000004055550540555555400000803f000000000000000000000000000000000000803f000080bf55555540555505400000004055550540abaa2a400000803f000000000000000000000000000000000000803f000080bfabaa2a40555505400000004000000000000080400000803f000000000000000000000000000000000000803f000080bf00008040000000000000004000002040000080400000803f000000000000000000000000000000000000803f000080bf00008040000020400000004000002040555555400000803f000000000000000000000000000000000000803f000080bf555555400000204000000000000000000000804000000000000000000000803f000080bf0000000000000000000080bf000000000000000000000040000000000000804000000000000000000000803f000080bf0000000000000000000080bf000000c00000000000000000000020400000804000000000000000000000803f000080bf0000000000000000000080bf000000000000204000000040000020400000804000000000000000000000803f000080bf0000000000000000000080bf000000c000002040 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 1, y: 1.25, z: 2} - m_Extent: {x: 1, y: 1.25, z: 2} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &136654322 GameObject: m_ObjectHideFlags: 0 @@ -466,6 +302,141 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &169935474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 169935475} + - component: {fileID: 169935477} + - component: {fileID: 169935476} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &169935475 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169935474} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 237} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 321956507} + m_RootOrder: 1 + 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: -394.6, y: 438} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &169935476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169935474} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'Time Left: ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &169935477 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169935474} + m_CullTransparentMesh: 1 --- !u!43 &296085051 Mesh: m_ObjectHideFlags: 0 @@ -672,6 +643,7 @@ GameObject: - component: {fileID: 321956506} - component: {fileID: 321956505} - component: {fileID: 321956504} + - component: {fileID: 321956508} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -754,6 +726,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1889252109} + - {fileID: 169935475} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -762,6 +735,20 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &321956508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321956503} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 74dc49a8baecbbb48949a88ac16ad421, type: 3} + m_Name: + m_EditorClassIdentifier: + timeRemaining: 180 + timeText: {fileID: 169935476} --- !u!1 &365973832 GameObject: m_ObjectHideFlags: 0 @@ -1335,6 +1322,170 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &1370299800 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh-23466(Clone) + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 180 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 90 + localAABB: + m_Center: {x: 1, y: 1.25, z: 2} + m_Extent: {x: 1, y: 1.25, z: 2} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600180019001a0019001b001a001c001d001e001d001f001e00200021002200210023002200240025002600250027002600280029002a0029002b002a002c002d002e002d002f002e0030003100320031003300320031003400330034003500330035003600330034003700350037003800350038003900350037003a0038003a003b0038003b003c0038003a003d003b003d003e003b003e003f003b003d0040003e00400041003e00410042003e0043004400450043004600440046004700440046004800470046004900480048004a00470048004b004a0048004c004b004b004d004a004b004e004d004b004f004e004e0050004d004e00510050004e0052005100510053005000510054005300510055005400560057005800570059005800 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 90 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 4320 + _typelessdata: 0000004000000000000000000000000000000000000080bf0000803f0000000000000000000080bf00000040000000000000000000000000000000000000000000000000000080bf0000803f0000000000000000000080bf0000000000000000000000405655d53e000000000000000000000000000080bf0000803f0000000000000000000080bf000000405655d53e000000005655d53e000000000000000000000000000080bf0000803f0000000000000000000080bf000000005655d53e000000405655d53e00000000000000000000803f000000000000803f0000000000000000000080bf0000004000000000000000005655d53e00000000000000000000803f000000000000803f0000000000000000000080bf0000000000000000000000405655d53eabaa2a3f000000000000803f000000000000803f0000000000000000000080bf00000040abaa2a3f000000005655d53eabaa2a3f000000000000803f000000000000803f0000000000000000000080bf00000000abaa2a3f000000405655d53eabaa2a3f0000000000000000000080bf0000803f0000000000000000000080bf000000405655d53e000000005655d53eabaa2a3f0000000000000000000080bf0000803f0000000000000000000080bf000000005655d53e000000405655553fabaa2a3f0000000000000000000080bf0000803f0000000000000000000080bf000000405655553f000000005655553fabaa2a3f0000000000000000000080bf0000803f0000000000000000000080bf000000005655553f000000405655553fabaa2a3f000000000000803f000000000000803f0000000000000000000080bf00000040abaa2a3f000000005655553fabaa2a3f000000000000803f000000000000803f0000000000000000000080bf00000000abaa2a3f000000405655553fabaaaa3f000000000000803f000000000000803f0000000000000000000080bf00000040abaaaa3f000000005655553fabaaaa3f000000000000803f000000000000803f0000000000000000000080bf00000000abaaaa3f000000405655553fabaaaa3f0000000000000000000080bf0000803f0000000000000000000080bf000000405655553f000000005655553fabaaaa3f0000000000000000000080bf0000803f0000000000000000000080bf000000005655553f000000400000a03fabaaaa3f0000000000000000000080bf0000803f0000000000000000000080bf000000400000a03f000000000000a03fabaaaa3f0000000000000000000080bf0000803f0000000000000000000080bf000000000000a03f000000400000a03fabaaaa3f000000000000803f000000000000803f0000000000000000000080bf00000040abaaaa3f000000000000a03fabaaaa3f000000000000803f000000000000803f0000000000000000000080bf00000000abaaaa3f000000400000a03f00000040000000000000803f000000000000803f0000000000000000000080bf0000004000000040000000000000a03f00000040000000000000803f000000000000803f0000000000000000000080bf0000000000000040000000400000a03f000000400000000000000000000080bf0000803f0000000000000000000080bf000000400000a03f000000000000a03f000000400000000000000000000080bf0000803f0000000000000000000080bf000000000000a03f000000405655d53f000000400000000000000000000080bf0000803f0000000000000000000080bf000000405655d53f000000005655d53f000000400000000000000000000080bf0000803f0000000000000000000080bf000000005655d53f000000405655d53f00000040000000000000803f000000000000803f0000000000000000000080bf0000004000000040000000005655d53f00000040000000000000803f000000000000803f0000000000000000000080bf0000000000000040000000405655d53fabaa2a40000000000000803f000000000000803f0000000000000000000080bf00000040abaa2a40000000005655d53fabaa2a40000000000000803f000000000000803f0000000000000000000080bf00000000abaa2a40000000405655d53fabaa2a400000000000000000000080bf0000803f0000000000000000000080bf000000405655d53f000000005655d53fabaa2a400000000000000000000080bf0000803f0000000000000000000080bf000000005655d53f0000004055550540abaa2a400000000000000000000080bf0000803f0000000000000000000080bf00000040555505400000000055550540abaa2a400000000000000000000080bf0000803f0000000000000000000080bf00000000555505400000004055550540abaa2a40000000000000803f000000000000803f0000000000000000000080bf00000040abaa2a400000000055550540abaa2a40000000000000803f000000000000803f0000000000000000000080bf00000000abaa2a40000000405555054055555540000000000000803f000000000000803f0000000000000000000080bf0000004055555540000000005555054055555540000000000000803f000000000000803f0000000000000000000080bf00000000555555400000004055550540555555400000000000000000000080bf0000803f0000000000000000000080bf00000040555505400000000055550540555555400000000000000000000080bf0000803f0000000000000000000080bf00000000555505400000004000002040555555400000000000000000000080bf0000803f0000000000000000000080bf00000040000020400000000000002040555555400000000000000000000080bf0000803f0000000000000000000080bf0000000000002040000000400000204055555540000000000000803f000000000000803f0000000000000000000080bf0000004055555540000000000000204055555540000000000000803f000000000000803f0000000000000000000080bf0000000055555540000000400000204000008040000000000000803f000000000000803f0000000000000000000080bf0000004000008040000000000000204000008040000000000000803f000000000000803f0000000000000000000080bf0000000000008040000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf00000000000000000000000000000000abaa2a3f000080bf00000000000000000000000000000000000080bf000080bfabaa2abf00000000000000005555d53e00000000000080bf00000000000000000000000000000000000080bf000080bf000000005555d53e000000005555d53eabaa2a3f000080bf00000000000000000000000000000000000080bf000080bfabaa2abf5555d53e0000000000000000abaaaa3f000080bf00000000000000000000000000000000000080bf000080bfabaaaabf00000000000000005555553fabaaaa3f000080bf00000000000000000000000000000000000080bf000080bfabaaaabf5555553f000000005555553fabaa2a3f000080bf00000000000000000000000000000000000080bf000080bfabaa2abf5555553f000000000000000000000040000080bf00000000000000000000000000000000000080bf000080bf000000c000000000000000000000a03f00000040000080bf00000000000000000000000000000000000080bf000080bf000000c00000a03f000000000000a03fabaaaa3f000080bf00000000000000000000000000000000000080bf000080bfabaaaabf0000a03f0000000000000000abaa2a40000080bf00000000000000000000000000000000000080bf000080bfabaa2ac000000000000000005555d53fabaa2a40000080bf00000000000000000000000000000000000080bf000080bfabaa2ac05555d53f000000005555d53f00000040000080bf00000000000000000000000000000000000080bf000080bf000000c05555d53f000000000000000055555540000080bf00000000000000000000000000000000000080bf000080bf555555c000000000000000005555054055555540000080bf00000000000000000000000000000000000080bf000080bf555555c0555505400000000055550540abaa2a40000080bf00000000000000000000000000000000000080bf000080bfabaa2ac055550540000000000000000000008040000080bf00000000000000000000000000000000000080bf000080bf000080c000000000000000000000204000008040000080bf00000000000000000000000000000000000080bf000080bf000080c000002040000000000000204055555540000080bf00000000000000000000000000000000000080bf000080bf555555c000002040000000405555d53e000000000000803f000000000000000000000000000000000000803f000080bf000000005555d53e0000004000000000abaa2a3f0000803f000000000000000000000000000000000000803f000080bfabaa2a3f000000000000004000000000000000000000803f000000000000000000000000000000000000803f000080bf0000000000000000000000405555d53eabaa2a3f0000803f000000000000000000000000000000000000803f000080bfabaa2a3f5555d53e0000004000000000abaaaa3f0000803f000000000000000000000000000000000000803f000080bfabaaaa3f00000000000000405555553fabaaaa3f0000803f000000000000000000000000000000000000803f000080bfabaaaa3f5555553f000000405555553fabaa2a3f0000803f000000000000000000000000000000000000803f000080bfabaa2a3f5555553f0000004000000000000000400000803f000000000000000000000000000000000000803f000080bf0000004000000000000000400000a03f000000400000803f000000000000000000000000000000000000803f000080bf000000400000a03f000000400000a03fabaaaa3f0000803f000000000000000000000000000000000000803f000080bfabaaaa3f0000a03f0000004000000000abaa2a400000803f000000000000000000000000000000000000803f000080bfabaa2a4000000000000000405555d53fabaa2a400000803f000000000000000000000000000000000000803f000080bfabaa2a405555d53f000000405555d53f000000400000803f000000000000000000000000000000000000803f000080bf000000405555d53f0000004000000000555555400000803f000000000000000000000000000000000000803f000080bf55555540000000000000004055550540555555400000803f000000000000000000000000000000000000803f000080bf55555540555505400000004055550540abaa2a400000803f000000000000000000000000000000000000803f000080bfabaa2a40555505400000004000000000000080400000803f000000000000000000000000000000000000803f000080bf00008040000000000000004000002040000080400000803f000000000000000000000000000000000000803f000080bf00008040000020400000004000002040555555400000803f000000000000000000000000000000000000803f000080bf555555400000204000000000000000000000804000000000000000000000803f000080bf0000000000000000000080bf000000000000000000000040000000000000804000000000000000000000803f000080bf0000000000000000000080bf000000c00000000000000000000020400000804000000000000000000000803f000080bf0000000000000000000080bf000000000000204000000040000020400000804000000000000000000000803f000080bf0000000000000000000080bf000000c000002040 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 1, y: 1.25, z: 2} + m_Extent: {x: 1, y: 1.25, z: 2} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1398370920 GameObject: m_ObjectHideFlags: 0 @@ -2305,6 +2456,7 @@ GameObject: - component: {fileID: 1970547171} - component: {fileID: 1970547170} - component: {fileID: 1970547169} + - component: {fileID: 1970547174} m_Layer: 0 m_Name: Stair m_TagString: Mole @@ -2325,7 +2477,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 113743803} + m_Mesh: {fileID: 1370299800} --- !u!33 &1970547170 MeshFilter: m_ObjectHideFlags: 10 @@ -2333,7 +2485,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1970547168} - m_Mesh: {fileID: 113743803} + m_Mesh: {fileID: 1370299800} --- !u!23 &1970547171 MeshRenderer: m_ObjectHideFlags: 0 @@ -3428,7 +3580,7 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: - m_Mesh: {fileID: 113743803} + m_Mesh: {fileID: 1370299800} m_VersionIndex: 8 m_IsSelectable: 1 m_SelectedFaces: @@ -3449,6 +3601,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1970547174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1970547168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd50fe78e80ef7046a1452af2b97de93, type: 3} + m_Name: + m_EditorClassIdentifier: + IsHit: 0 --- !u!1 &1972475616 GameObject: m_ObjectHideFlags: 0 @@ -3660,6 +3825,7 @@ MonoBehaviour: particles: 0 scoreText: {fileID: 1889252110} score: 0 + moles: {fileID: 0} --- !u!65 &2067557263 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BoxSpawns.cs b/Assets/Scripts/BoxSpawns.cs new file mode 100644 index 0000000..d032071 --- /dev/null +++ b/Assets/Scripts/BoxSpawns.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BoxSpawns : MonoBehaviour +{ + //*Start is called before the first frame update + void Start() + { + //*Randomly spawn boxes when the game starts + gameObject.transform.position = new Vector3(Random.Range(10, -10), 15, Random.Range(-10, 10)); + } + + //*Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/BoxSpawns.cs.meta b/Assets/Scripts/BoxSpawns.cs.meta new file mode 100644 index 0000000..9fecee3 --- /dev/null +++ b/Assets/Scripts/BoxSpawns.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c4117eaed8044c04fa8e28e453955ca6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Colours.cs b/Assets/Scripts/Colours.cs index 5f273c8..ae8bc8d 100644 --- a/Assets/Scripts/Colours.cs +++ b/Assets/Scripts/Colours.cs @@ -1,18 +1,27 @@ using System.Collections; using System.Collections.Generic; +using System.Runtime.Serialization; using Unity.VisualScripting; using UnityEngine; +//* Cubes need to randomly fall from the sky within the play area at the start of the game, +//TODO when the player drops it in the right container teleport cube into random location in the air. +//TODO Containers need to be randomly allocated a colour at the start of the game +//TODO As the timer goes down, the containers have a chance to switch renders/colours +//! When cube is dropped into the wrong container, the cube is teleported several times - Needs fix public class Colours : MonoBehaviour { public bool done = false; - // Start is called before the first frame update + public GameObject[] boxes; + public int waitTime = 3; + private bool tp = false; + //*Start is called before the first frame update void Start() { } - // Update is called once per frame + //*Update is called once per frame void Update() { @@ -20,10 +29,27 @@ public class Colours : MonoBehaviour private void OnTriggerEnter(Collider other) { + //*If the box is the same colour as the container, set done to true if(other.gameObject.GetComponent().material.name == gameObject.GetComponentInParent().material.name && !done) { - Debug.Log("YUM! Red is my favourite colour!"); done = true; } + else + { + //*If the box is not the same colour as the container, teleport the box + if(!tp) + { + tp = true; + StartCoroutine(BoxSpawn(other)); + } + + } + } + + //*Teleport the box to a random location in the air + IEnumerator BoxSpawn(Collider other) + { + yield return new WaitForSeconds(waitTime); + other.transform.position = new Vector3(Random.Range(10, -10), 15, Random.Range(-10, 10)); } } diff --git a/Assets/Scripts/Hamor.cs b/Assets/Scripts/Hamor.cs index 402673b..1e49179 100644 --- a/Assets/Scripts/Hamor.cs +++ b/Assets/Scripts/Hamor.cs @@ -12,18 +12,19 @@ public class Hamor : MonoBehaviour public bool particles = false; public TextMeshProUGUI scoreText; public int score = 0; - // Start is called before the first frame update + public Moles_IsHit moles; + //*Start is called before the first frame update void Start() { } - // Update is called once per frame + //*Update is called once per frame void Update() { if(Input.GetMouseButtonDown(0)) { - hamorAnimator.SetTrigger("Bonk"); + hamorAnimator.SetTrigger("Bonk"); //*Play the bonk animation } } @@ -38,8 +39,9 @@ public class Hamor : MonoBehaviour { if(other.tag != "Player") { - var bitch = Instantiate(bonkParticles, contact.transform.position, Quaternion.identity); - Destroy(bitch, 1); + //*Play the bonk particles + var parLocation = Instantiate(bonkParticles, contact.transform.position, Quaternion.identity); + Destroy(parLocation, 1); particles = true; StartCoroutine(BonkTimer()); } @@ -47,8 +49,16 @@ public class Hamor : MonoBehaviour if(other.gameObject.tag == "Mole") { - score += 1; - scoreText.text = "Score: " + score.ToString(); + //*Get the Moles_IsHit script from the mole + moles = other.gameObject.GetComponent(); + + //*If the mole has not been hit, increase the score and change bool + if(moles.IsHit == false) + { + score += 1; + scoreText.text = "Score: " + score.ToString(); + moles.IsHit = true; + } } diff --git a/Assets/Scripts/Moles.cs b/Assets/Scripts/Moles.cs index 5957fa4..9d325f8 100644 --- a/Assets/Scripts/Moles.cs +++ b/Assets/Scripts/Moles.cs @@ -1,17 +1,18 @@ using System.Collections; using System.Collections.Generic; +using JetBrains.Annotations; using Unity.VisualScripting; using UnityEngine; -//! Moles need to only let player hit them once and get only 1 point -//! Moles need to change textures when hit to show they have been hit - need textures for this +//TODO Moles need to change textures when hit to show they have been hit - need textures for this +//* As the time goes on, moles appear and disappear faster public class Moles : MonoBehaviour { public GameObject hole1, hole2, hole3, hole4, hole5, hole6, hole7, hole8, hole9; public GameObject mole; private float defaultSpeed = 10f; - public float lifeTime = 7.5f; + public float lifeTime = 5f; public bool moleCanAppear = false; public int randomHole, randomHole2, randomHole3; // Start is called before the first frame update @@ -50,40 +51,41 @@ public class Moles : MonoBehaviour switch (randomHole) { case 1: - var bitch = Instantiate(mole, hole1.transform.position, Quaternion.identity); - Destroy(bitch, lifeTime); + var boxLocation = Instantiate(mole, hole1.transform.position, Quaternion.identity); + + Destroy(boxLocation, lifeTime); break; case 2: - var bitch2 = Instantiate(mole, hole2.transform.position, Quaternion.identity); - Destroy(bitch2, lifeTime); + var boxLocation2 = Instantiate(mole, hole2.transform.position, Quaternion.identity); + Destroy(boxLocation2, lifeTime); break; case 3: - var bitch3 = Instantiate(mole, hole3.transform.position, Quaternion.identity); - Destroy(bitch3, lifeTime); + var boxLocation3 = Instantiate(mole, hole3.transform.position, Quaternion.identity); + Destroy(boxLocation3, lifeTime); break; case 4: - var bitch4 = Instantiate(mole, hole4.transform.position, Quaternion.identity); - Destroy(bitch4, lifeTime); + var boxLocation4 = Instantiate(mole, hole4.transform.position, Quaternion.identity); + Destroy(boxLocation4, lifeTime); break; case 5: - var bitch5 = Instantiate(mole, hole5.transform.position, Quaternion.identity); - Destroy(bitch5, lifeTime); + var boxLocation5 = Instantiate(mole, hole5.transform.position, Quaternion.identity); + Destroy(boxLocation5, lifeTime); break; case 6: - var bitch6 = Instantiate(mole, hole6.transform.position, Quaternion.identity); - Destroy(bitch6, lifeTime); + var boxLocation6 = Instantiate(mole, hole6.transform.position, Quaternion.identity); + Destroy(boxLocation6, lifeTime); break;; case 7: - var bitch7 = Instantiate(mole, hole7.transform.position, Quaternion.identity); - Destroy(bitch7, lifeTime); + var boxLocation7 = Instantiate(mole, hole7.transform.position, Quaternion.identity); + Destroy(boxLocation7, lifeTime); break; case 8: - var bitch8 = Instantiate(mole, hole8.transform.position, Quaternion.identity); - Destroy(bitch8, lifeTime); + var boxLocation8 = Instantiate(mole, hole8.transform.position, Quaternion.identity); + Destroy(boxLocation8, lifeTime); break; case 9: - var bitch9 = Instantiate(mole, hole9.transform.position, Quaternion.identity); - Destroy(bitch9, lifeTime); + var boxLocation9 = Instantiate(mole, hole9.transform.position, Quaternion.identity); + Destroy(boxLocation9, lifeTime); break; } } diff --git a/Assets/Scripts/Moles_IsHit.cs b/Assets/Scripts/Moles_IsHit.cs new file mode 100644 index 0000000..1c8c780 --- /dev/null +++ b/Assets/Scripts/Moles_IsHit.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Moles_IsHit : MonoBehaviour +{ + public bool IsHit; + //*Start is called before the first frame update + void Start() + { + IsHit = false; //*Mole starts as not being hit + } + + //*Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Moles_IsHit.cs.meta b/Assets/Scripts/Moles_IsHit.cs.meta new file mode 100644 index 0000000..0258efc --- /dev/null +++ b/Assets/Scripts/Moles_IsHit.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cd50fe78e80ef7046a1452af2b97de93 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Movement.cs b/Assets/Scripts/Movement.cs index 54a1d05..9486ca6 100644 --- a/Assets/Scripts/Movement.cs +++ b/Assets/Scripts/Movement.cs @@ -37,7 +37,7 @@ public class Movement : MonoBehaviour if (controller.isGrounded) { moveDirection = new Vector3(right - left, 0, forwards - backwards); - // Change the direction the player is facing based on the direction they are moving + //* Change the direction the player is facing based on the direction they are moving if (right - left != 0 || forwards - backwards != 0) { Quaternion ToRotation = Quaternion.LookRotation(moveDirection); @@ -49,20 +49,8 @@ public class Movement : MonoBehaviour throwForce.throwForce = 4.0f; } - if (Input.GetKey(sprintKey)) - { - moveDirection *= sprintSpeed; - jumpForce = 4.0f; - if(right - left != 0 || forwards - backwards != 0) - { - throwForce.throwForce = 20.0f; - } - } - else - { - moveDirection *= speed; - jumpForce = 2.5f; - } + moveDirection *= speed; + jumpForce = 2.5f; if (Input.GetKeyDown(jumpKey)) { diff --git a/Assets/Scripts/Timer.cs b/Assets/Scripts/Timer.cs new file mode 100644 index 0000000..d2bbe2f --- /dev/null +++ b/Assets/Scripts/Timer.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; + +public class Timer : MonoBehaviour +{ + public float timeRemaining; + public TextMeshProUGUI timeText; + + //* Universal code for timers + void Update() + { + if (timeRemaining > 0) + { + timeRemaining -= Time.deltaTime; + timeText.text = timeRemaining.ToString("F0"); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Timer.cs.meta b/Assets/Scripts/Timer.cs.meta new file mode 100644 index 0000000..2c69b79 --- /dev/null +++ b/Assets/Scripts/Timer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 74dc49a8baecbbb48949a88ac16ad421 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: