From a0aaf5e87de3f0d3c0cf91ac39ce4adb131f9c2b Mon Sep 17 00:00:00 2001 From: milan Date: Tue, 11 Apr 2023 13:40:17 +0200 Subject: [PATCH] respawning --- Assets/Scenes/PuzzleTest.unity | 324 ++++++++++-------- .../Desert/Desert Environment.prefab | 86 ++++- .../Modules/Dispenser/Dispenser Orb.prefab | 67 +++- .../Dispenser/Respawning Dispenser Orb.prefab | 97 ++++++ .../Respawning Dispenser Orb.prefab.meta | 7 + .../Laser/Laser Redirector Group.prefab | 84 ++++- .../Modules/Laser/Laser Redirector.prefab | 16 +- Assets/Station46/Scripts/RespawnTrigger.cs | 17 + .../Station46/Scripts/RespawnTrigger.cs.meta | 3 + Assets/Station46/Scripts/Respawning.cs | 44 +++ Assets/Station46/Scripts/Respawning.cs.meta | 3 + Assets/Test Assets/Test Theme.asset | 2 +- 12 files changed, 586 insertions(+), 164 deletions(-) create mode 100644 Assets/Station46/Modules/Dispenser/Respawning Dispenser Orb.prefab create mode 100644 Assets/Station46/Modules/Dispenser/Respawning Dispenser Orb.prefab.meta create mode 100644 Assets/Station46/Scripts/RespawnTrigger.cs create mode 100644 Assets/Station46/Scripts/RespawnTrigger.cs.meta create mode 100644 Assets/Station46/Scripts/Respawning.cs create mode 100644 Assets/Station46/Scripts/Respawning.cs.meta diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index cfa3113..7babff1 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -558,7 +558,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 5480458432365400826, guid: 4b1cba03201b02345916ed8d217027f2, type: 3} @@ -568,7 +568,7 @@ PrefabInstance: - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 5480458432365400829, guid: 4b1cba03201b02345916ed8d217027f2, type: 3} @@ -1045,7 +1045,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 3968590605239387246, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} @@ -1055,7 +1055,7 @@ PrefabInstance: - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} @@ -1080,17 +1080,17 @@ PrefabInstance: - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3968590605239387248, guid: e5dce190a8604bc48b04c109b103f8b5, type: 3} @@ -1236,6 +1236,49 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 2 +--- !u!1 &411421603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 411421604} + m_Layer: 0 + m_Name: hidden + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &411421604 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 411421603} + 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: + - {fileID: 449668084} + - {fileID: 353929129} + - {fileID: 1719705407} + - {fileID: 1930155662} + - {fileID: 1348527227} + - {fileID: 229080824} + - {fileID: 1198940296} + - {fileID: 1028578884} + - {fileID: 438720342} + - {fileID: 1101383441} + - {fileID: 1532540192886921385} + - {fileID: 1949077063} + m_Father: {fileID: 1340421038} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &438720342 stripped Transform: m_CorrespondingSourceObject: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, @@ -1248,7 +1291,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 5218681765336759419, guid: 435cdab79ab05ef43b4a387004dc04b5, type: 3} @@ -1258,7 +1301,7 @@ PrefabInstance: - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, type: 3} @@ -1283,17 +1326,17 @@ PrefabInstance: - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, type: 3} @@ -1579,12 +1622,12 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, type: 3} @@ -1609,17 +1652,17 @@ PrefabInstance: - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4738486521284232426, guid: 20c9cfab710bbe04ca6f81d44a01b025, type: 3} @@ -1810,7 +1853,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 5480458432365400826, guid: c83416abc9544024db244093f8c800dd, type: 3} @@ -1820,7 +1863,7 @@ PrefabInstance: - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 5480458432365400829, guid: c83416abc9544024db244093f8c800dd, type: 3} @@ -1961,6 +2004,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 784045273} m_PrefabAsset: {fileID: 0} +--- !u!4 &796526694 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + m_PrefabInstance: {fileID: 2119948940} + m_PrefabAsset: {fileID: 0} --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -2175,7 +2224,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 2914491806035128037, guid: 5167cb020dbd15b46a7548cfe941e182, type: 3} @@ -2185,7 +2234,7 @@ PrefabInstance: - target: {fileID: 7679428933749886477, guid: 5167cb020dbd15b46a7548cfe941e182, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 7679428933749886477, guid: 5167cb020dbd15b46a7548cfe941e182, type: 3} @@ -2210,7 +2259,7 @@ PrefabInstance: - target: {fileID: 7679428933749886477, guid: 5167cb020dbd15b46a7548cfe941e182, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7679428933749886477, guid: 5167cb020dbd15b46a7548cfe941e182, type: 3} @@ -2220,7 +2269,7 @@ PrefabInstance: - target: {fileID: 7679428933749886477, guid: 5167cb020dbd15b46a7548cfe941e182, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7679428933749886477, guid: 5167cb020dbd15b46a7548cfe941e182, type: 3} @@ -2501,22 +2550,17 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 246239776342662160, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, type: 3} propertyPath: m_Name value: Position Ball objectReference: {fileID: 0} - - target: {fileID: 246239776342662160, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, type: 3} @@ -2541,17 +2585,17 @@ PrefabInstance: - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, type: 3} @@ -2579,12 +2623,12 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, type: 3} @@ -2609,17 +2653,17 @@ PrefabInstance: - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 316766740189467720, guid: 8253a7c07eeea3b48832a42b847cf0f1, type: 3} @@ -2854,25 +2898,14 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 449668084} - - {fileID: 353929129} - - {fileID: 1719705407} - - {fileID: 1930155662} - - {fileID: 1348527227} - - {fileID: 229080824} - - {fileID: 1198940296} - - {fileID: 1028578884} - - {fileID: 438720342} - - {fileID: 1101383441} + - {fileID: 411421604} - {fileID: 874637333} - {fileID: 5113659104536846700} - - {fileID: 1990624197} + - {fileID: 796526694} - {fileID: 987689138} - {fileID: 604728745} - {fileID: 681930983} - {fileID: 6067357455631746734} - - {fileID: 1532540192886921385} - - {fileID: 1949077063} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} @@ -2882,12 +2915,12 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} @@ -2912,17 +2945,17 @@ PrefabInstance: - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} @@ -3569,22 +3602,17 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 246239776342662160, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, type: 3} propertyPath: m_Name value: Symbol Ball objectReference: {fileID: 0} - - target: {fileID: 246239776342662160, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, type: 3} @@ -3609,17 +3637,17 @@ PrefabInstance: - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, type: 3} @@ -3647,7 +3675,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 4375253467126868621, guid: aea74bf9bbeb3e94bba5b275e087b8a9, type: 3} @@ -3657,7 +3685,7 @@ PrefabInstance: - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, type: 3} @@ -3682,17 +3710,17 @@ PrefabInstance: - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4375253467126868627, guid: aea74bf9bbeb3e94bba5b275e087b8a9, type: 3} @@ -4291,85 +4319,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 911374153} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1990624196 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} - m_Modifications: - - target: {fileID: 6665240268073425225, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_Name - value: Dispenser Orb - objectReference: {fileID: 0} - - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_LocalPosition.x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.75 - objectReference: {fileID: 0} - - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 39c7a496fd0efad4cbb5e6fe1a171309, type: 3} ---- !u!4 &1990624197 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - m_PrefabInstance: {fileID: 1990624196} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2024452941 PrefabInstance: m_ObjectHideFlags: 0 @@ -4454,7 +4403,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2024452941} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1532540192886921384 +--- !u!1001 &2119948940 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -4462,6 +4411,79 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1340421038} m_Modifications: + - target: {fileID: 8558524283348193081, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_Name + value: Respawning Dispenser Orb + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} +--- !u!1001 &1532540192886921384 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 411421604} + m_Modifications: - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Station46/Environments/Desert/Desert Environment.prefab b/Assets/Station46/Environments/Desert/Desert Environment.prefab index 1da1290..64922eb 100644 --- a/Assets/Station46/Environments/Desert/Desert Environment.prefab +++ b/Assets/Station46/Environments/Desert/Desert Environment.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &261657313129027875 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7923022385326637093} + - component: {fileID: 2868191364499615810} + - component: {fileID: 5240132829499334097} + - component: {fileID: 6758834897188183274} + m_Layer: 0 + m_Name: Respawn Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7923022385326637093 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261657313129027875} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -5, z: 0} + m_LocalScale: {x: 100, y: 10, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7933998900790106032} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2868191364499615810 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261657313129027875} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &5240132829499334097 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261657313129027875} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6758834897188183274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261657313129027875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a0c8567dfd74fefb6f5e90098ab7af3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5743657079028767629 GameObject: m_ObjectHideFlags: 0 @@ -30,7 +105,7 @@ Transform: m_Children: - {fileID: 7933998900790106032} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8236754837553209924 GameObject: @@ -61,6 +136,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8825350056022503906} + - {fileID: 7923022385326637093} m_Father: {fileID: 7626240558108670521} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -69,7 +145,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 7933998900790106032} m_Modifications: - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361, @@ -138,7 +214,13 @@ PrefabInstance: value: Desert Floor objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3a11a6b6fc0ad1a429fa098c08e2c361, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1902631214646309221} m_SourcePrefab: {fileID: 100100000, guid: 3a11a6b6fc0ad1a429fa098c08e2c361, type: 3} --- !u!1 &8156618926076308312 stripped GameObject: diff --git a/Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab b/Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab index 7ab5e6f..a033178 100644 --- a/Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab +++ b/Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab @@ -121,7 +121,7 @@ Transform: m_Children: - {fileID: 6621787781305821930} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &1036238382491359241 SphereCollider: @@ -131,9 +131,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6665240268073425225} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.08350818 m_Center: {x: -0.016491815, y: 0, z: 0} --- !u!135 &8622568307222677767 @@ -144,9 +152,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6665240268073425225} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.08350818 m_Center: {x: 0.01649182, y: 0, z: 0} --- !u!135 &2301225619036503967 @@ -157,9 +173,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6665240268073425225} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.08350818 m_Center: {x: 0, y: 0, z: -0.01649182} --- !u!135 &33709339505785279 @@ -170,9 +194,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6665240268073425225} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.08350818 m_Center: {x: 0, y: 0, z: 0.01649182} --- !u!54 &6665240268073425228 @@ -182,15 +214,26 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6665240268073425225} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 0 - m_CollisionDetection: 0 + m_CollisionDetection: 2 --- !u!114 &7480587180842755505 MonoBehaviour: m_ObjectHideFlags: 0 @@ -236,6 +279,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -268,6 +312,8 @@ MonoBehaviour: m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -296,6 +342,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -332,3 +382,6 @@ MonoBehaviour: m_ForceGravityOnDetach: 0 m_RetainTransformParent: 1 m_AttachPointCompatibilityMode: 0 + m_StartingSingleGrabTransformers: [] + m_StartingMultipleGrabTransformers: [] + m_AddDefaultGrabTransformers: 1 diff --git a/Assets/Station46/Modules/Dispenser/Respawning Dispenser Orb.prefab b/Assets/Station46/Modules/Dispenser/Respawning Dispenser Orb.prefab new file mode 100644 index 0000000..adf9b4f --- /dev/null +++ b/Assets/Station46/Modules/Dispenser/Respawning Dispenser Orb.prefab @@ -0,0 +1,97 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3078857717803341424 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6665240268073425225, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_Name + value: Respawning Dispenser Orb + objectReference: {fileID: 0} + - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6665240268073425225, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1397504423829359831} + m_SourcePrefab: {fileID: 100100000, guid: 39c7a496fd0efad4cbb5e6fe1a171309, type: 3} +--- !u!1 &8558524283348193081 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6665240268073425225, guid: 39c7a496fd0efad4cbb5e6fe1a171309, + type: 3} + m_PrefabInstance: {fileID: 3078857717803341424} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1397504423829359831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8558524283348193081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 883312c0b43e43d4bd9b113d29da2ee2, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Station46/Modules/Dispenser/Respawning Dispenser Orb.prefab.meta b/Assets/Station46/Modules/Dispenser/Respawning Dispenser Orb.prefab.meta new file mode 100644 index 0000000..6a92b33 --- /dev/null +++ b/Assets/Station46/Modules/Dispenser/Respawning Dispenser Orb.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 47b21ad213905c342b92fc5b384878c4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Laser Redirector Group.prefab b/Assets/Station46/Modules/Laser/Laser Redirector Group.prefab index 3808a53..0cb1e45 100644 --- a/Assets/Station46/Modules/Laser/Laser Redirector Group.prefab +++ b/Assets/Station46/Modules/Laser/Laser Redirector Group.prefab @@ -32,6 +32,7 @@ Transform: - {fileID: 4962209360291872147} - {fileID: 8028899283464672130} - {fileID: 2517468216669162399} + - {fileID: 677046973731718451} m_Father: {fileID: 0} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -48,6 +49,85 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: size: {x: 1, y: 1} +--- !u!1001 &2036437371661111836 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 463845462802249093} + m_Modifications: + - target: {fileID: 251845578051121456, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_Name + value: Redirector 4 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.104 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.125 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.333 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000007872404 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.715814 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000015685944 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.698291 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -451.41998 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} +--- !u!4 &677046973731718451 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + m_PrefabInstance: {fileID: 2036437371661111836} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4019572223174925488 PrefabInstance: m_ObjectHideFlags: 0 @@ -227,7 +307,7 @@ PrefabInstance: - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} propertyPath: m_LocalPosition.x - value: -0.021999948 + value: -0.0047 objectReference: {fileID: 0} - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} @@ -237,7 +317,7 @@ PrefabInstance: - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} propertyPath: m_LocalPosition.z - value: 0.08099992 + value: 0.1603 objectReference: {fileID: 0} - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} diff --git a/Assets/Station46/Modules/Laser/Laser Redirector.prefab b/Assets/Station46/Modules/Laser/Laser Redirector.prefab index c96eefa..5327d53 100644 --- a/Assets/Station46/Modules/Laser/Laser Redirector.prefab +++ b/Assets/Station46/Modules/Laser/Laser Redirector.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 4164828007642968986} - component: {fileID: 5156043258505205515} - component: {fileID: 7231726315279509463} + - component: {fileID: 65979914628935854} m_Layer: 0 m_Name: Laser Redirector m_TagString: Untagged @@ -36,7 +37,7 @@ Transform: - {fileID: 6130255007532736668} - {fileID: 8905692309860668305} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &897376356061303010 MonoBehaviour: @@ -238,6 +239,19 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 2 +--- !u!114 &65979914628935854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251845578051121456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 883312c0b43e43d4bd9b113d29da2ee2, type: 3} + m_Name: + m_EditorClassIdentifier: + spawn: {fileID: 0} --- !u!1 &452836741980269854 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Station46/Scripts/RespawnTrigger.cs b/Assets/Station46/Scripts/RespawnTrigger.cs new file mode 100644 index 0000000..a2a0122 --- /dev/null +++ b/Assets/Station46/Scripts/RespawnTrigger.cs @@ -0,0 +1,17 @@ +using EscapeRoomEngine.Engine.Runtime.Utilities; +using UnityEngine; + +namespace Station46.Scripts +{ + [RequireComponent(typeof(Collider))] + public class RespawnTrigger : MonoBehaviour + { + private void Awake() + { + if (!GetComponent().isTrigger) + { + throw new WrongTypeException($"{this} must have a trigger collider."); + } + } + } +} \ No newline at end of file diff --git a/Assets/Station46/Scripts/RespawnTrigger.cs.meta b/Assets/Station46/Scripts/RespawnTrigger.cs.meta new file mode 100644 index 0000000..93f17eb --- /dev/null +++ b/Assets/Station46/Scripts/RespawnTrigger.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7a0c8567dfd74fefb6f5e90098ab7af3 +timeCreated: 1683720477 \ No newline at end of file diff --git a/Assets/Station46/Scripts/Respawning.cs b/Assets/Station46/Scripts/Respawning.cs new file mode 100644 index 0000000..8f61f69 --- /dev/null +++ b/Assets/Station46/Scripts/Respawning.cs @@ -0,0 +1,44 @@ +using EscapeRoomEngine.Engine.Runtime.Utilities; +using UnityEngine; + +namespace Station46.Scripts +{ + /// + /// An object that will be placed in its original position if it falls off the platform. + /// + [RequireComponent(typeof(Collider), typeof(Rigidbody))] + public class Respawning : MonoBehaviour + { + private Vector3 _spawnPosition; + private Quaternion _spawnRotation; + private Rigidbody _rigidbody; + + private void Awake() + { + _rigidbody = GetComponent(); + + if (GetComponent().isTrigger) + { + throw new WrongTypeException($"{this} must have a rigidbody collider."); + } + } + + private void Start() + { + var t = transform; + _spawnPosition = t.position; + _spawnRotation = t.rotation; + } + + private void OnTriggerEnter(Collider other) + { + var respawnTrigger = other.GetComponent(); + if (respawnTrigger) + { + transform.SetPositionAndRotation(_spawnPosition, _spawnRotation); + _rigidbody.velocity = Vector3.zero; + _rigidbody.angularVelocity = Vector3.zero; + } + } + } +} \ No newline at end of file diff --git a/Assets/Station46/Scripts/Respawning.cs.meta b/Assets/Station46/Scripts/Respawning.cs.meta new file mode 100644 index 0000000..4adbcc6 --- /dev/null +++ b/Assets/Station46/Scripts/Respawning.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 883312c0b43e43d4bd9b113d29da2ee2 +timeCreated: 1683720386 \ No newline at end of file diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset index 02aa916..485d65c 100644 --- a/Assets/Test Assets/Test Theme.asset +++ b/Assets/Test Assets/Test Theme.asset @@ -32,4 +32,4 @@ MonoBehaviour: - {fileID: 11400000, guid: 83d6800536b1df14287ff2cd8e0d58ce, type: 2} puzzleCount: {x: 1, y: 1} puzzleTypes: - - {fileID: 11400000, guid: 6ea70b544b4cffb4ca12286c749da98d, type: 2} + - {fileID: 11400000, guid: 1b21332d2a4da2d4d9f8a105d1e24980, type: 2}