From 42ef7cc9bd1a2a75b9a05b3cfc633e39b1c9ad8b Mon Sep 17 00:00:00 2001 From: milan Date: Wed, 12 Apr 2023 12:18:04 +0200 Subject: [PATCH] timed button stand puzzle --- Assets/Scenes/PuzzleTest.unity | 371 ++++++++++------ .../Module Descriptions/M Button Hoop.asset | 20 + .../M Button Hoop.asset.meta | 8 + .../P Timed Button Stand.asset | 25 ++ .../P Timed Button Stand.asset.meta | 8 + .../Module Descriptions/R Button Hoop.asset | 15 + .../R Button Hoop.asset.meta | 8 + Assets/Station46/Modules/Button Stand.meta | 8 + .../Modules/Button Stand/Button Stand.prefab | 416 ++++++++++++++++++ .../Button Stand/Button Stand.prefab.meta | 7 + .../Modules/Button Stand/Scripts.meta | 3 + .../Button Stand/Scripts/TimedButtonStand.cs | 78 ++++ .../Scripts/TimedButtonStand.cs.meta | 3 + .../Button Stand/Timed Button Stand.prefab | 138 ++++++ .../Timed Button Stand.prefab.meta | 7 + .../Elevated Platform.prefab | 318 ++++--------- .../Station46/Modules/Hoop/Button Hoop.prefab | 35 +- .../Modules/Hoop/Scripts/ButtonHoop.cs | 25 +- Assets/Station46/Scripts/Emission.cs | 6 + Assets/Station46/Scripts/HoloButton.cs | 8 + Assets/Station46/Station 46.asset | 1 + Assets/Test Assets/Test Theme.asset | 2 +- 22 files changed, 1145 insertions(+), 365 deletions(-) create mode 100644 Assets/Station46/Module Descriptions/M Button Hoop.asset create mode 100644 Assets/Station46/Module Descriptions/M Button Hoop.asset.meta create mode 100644 Assets/Station46/Module Descriptions/P Timed Button Stand.asset create mode 100644 Assets/Station46/Module Descriptions/P Timed Button Stand.asset.meta create mode 100644 Assets/Station46/Module Descriptions/R Button Hoop.asset create mode 100644 Assets/Station46/Module Descriptions/R Button Hoop.asset.meta create mode 100644 Assets/Station46/Modules/Button Stand.meta create mode 100644 Assets/Station46/Modules/Button Stand/Button Stand.prefab create mode 100644 Assets/Station46/Modules/Button Stand/Button Stand.prefab.meta create mode 100644 Assets/Station46/Modules/Button Stand/Scripts.meta create mode 100644 Assets/Station46/Modules/Button Stand/Scripts/TimedButtonStand.cs create mode 100644 Assets/Station46/Modules/Button Stand/Scripts/TimedButtonStand.cs.meta create mode 100644 Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab create mode 100644 Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab.meta diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index e235385..39673c9 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -209,7 +209,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -224,12 +224,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -3.9999995 + value: -4 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -239,7 +239,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -1.0000029 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -293,7 +293,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -308,7 +308,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -323,7 +323,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -0.0000007152557 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -547,7 +547,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -562,12 +562,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -4.9999986 + value: -5 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -577,7 +577,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -3.0000036 + value: -3 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -710,7 +710,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -725,12 +725,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -2.9999995 + value: -3 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -740,7 +740,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -1.0000021 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -794,7 +794,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -809,12 +809,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -3.9999986 + value: -4 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -824,7 +824,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -3.0000029 + value: -3 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -878,7 +878,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -893,12 +893,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -4.9999995 + value: -5 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -908,7 +908,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -1.0000036 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -962,7 +962,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -977,12 +977,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: 0.00000047683716 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -1457,7 +1457,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -1472,12 +1472,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -0.9999995 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -1487,7 +1487,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -1.0000007 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -1541,7 +1541,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -1556,12 +1556,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -0.99999905 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -1571,7 +1571,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -2.0000007 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -1625,7 +1625,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -1640,7 +1640,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -1655,7 +1655,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -0.0000035762785 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2092,7 +2092,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2107,7 +2107,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2122,7 +2122,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -0.000002145767 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2311,7 +2311,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 8664788757336834016, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2321,7 +2321,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2336,7 +2336,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -0.000004291534 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2542,7 +2542,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2557,12 +2557,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -5.9999995 + value: -6 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2572,7 +2572,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -1.0000043 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2632,7 +2632,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2647,12 +2647,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -0.99999857 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2662,7 +2662,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -3.0000007 + value: -3 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2874,7 +2874,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2889,7 +2889,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2958,7 +2958,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2973,12 +2973,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -2.999999 + value: -3 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -2988,7 +2988,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -2.0000021 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3064,10 +3064,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 411421604} - {fileID: 1853180256} - {fileID: 538618498} - {fileID: 9336441} - - {fileID: 411421604} + - {fileID: 675198211105780961} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} @@ -3077,7 +3078,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3092,12 +3093,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -3.999999 + value: -4 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3107,7 +3108,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -2.0000029 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3161,7 +3162,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3176,12 +3177,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: 0.0000014305115 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3245,7 +3246,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3260,12 +3261,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -1.9999986 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3275,7 +3276,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -3.0000014 + value: -3 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3329,7 +3330,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3344,12 +3345,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -1.9999995 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3359,7 +3360,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -1.0000014 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3413,7 +3414,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3428,12 +3429,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -4.999999 + value: -5 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3443,7 +3444,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -2.0000036 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3576,7 +3577,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3591,12 +3592,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -1.999999 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3606,7 +3607,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -2.0000014 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3910,13 +3911,72 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1719705406} m_PrefabAsset: {fileID: 0} +--- !u!1 &1730358899 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1730358900} + m_Layer: 0 + m_Name: floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1730358900 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730358899} + 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: 1911033176} + - {fileID: 65360853} + - {fileID: 1824758690} + - {fileID: 784045274} + - {fileID: 1893584457} + - {fileID: 535692514} + - {fileID: 880724128} + - {fileID: 992490972} + - {fileID: 306972211} + - {fileID: 50341410} + - {fileID: 281952426} + - {fileID: 1437568077} + - {fileID: 498175375} + - {fileID: 336652729} + - {fileID: 1244783267} + - {fileID: 1450431649} + - {fileID: 1364926075} + - {fileID: 1305634226} + - {fileID: 1615827503} + - {fileID: 533925775} + - {fileID: 1923995415} + - {fileID: 2024452942} + - {fileID: 156157352} + - {fileID: 289379737} + - {fileID: 1874638393} + - {fileID: 1380219442} + - {fileID: 1039442852} + - {fileID: 1365631765} + m_Father: {fileID: 1851812988} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1824758689 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3931,7 +3991,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -3946,7 +4006,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -0.0000014305114 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4023,34 +4083,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1860072080} - - {fileID: 1911033176} - - {fileID: 65360853} - - {fileID: 1824758690} - - {fileID: 784045274} - - {fileID: 1893584457} - - {fileID: 535692514} - - {fileID: 880724128} - - {fileID: 992490972} - - {fileID: 306972211} - - {fileID: 50341410} - - {fileID: 281952426} - - {fileID: 1437568077} - - {fileID: 498175375} - - {fileID: 336652729} - - {fileID: 1244783267} - - {fileID: 1450431649} - - {fileID: 1364926075} - - {fileID: 1305634226} - - {fileID: 1615827503} - - {fileID: 533925775} - - {fileID: 1923995415} - - {fileID: 2024452942} - - {fileID: 156157352} - - {fileID: 289379737} - - {fileID: 1874638393} - - {fileID: 1380219442} - - {fileID: 1039442852} - - {fileID: 1365631765} + - {fileID: 1730358900} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4070,7 +4103,7 @@ PrefabInstance: - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, type: 3} propertyPath: m_LocalPosition.x - value: 4.9999995 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, type: 3} @@ -4080,7 +4113,7 @@ PrefabInstance: - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, type: 3} propertyPath: m_LocalPosition.z - value: 2.9999983 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, type: 3} @@ -4218,7 +4251,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4233,12 +4266,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -2.9999986 + value: -3 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4248,7 +4281,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -3.0000021 + value: -3 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4302,7 +4335,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4317,7 +4350,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4332,7 +4365,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.z - value: -0.0000028610227 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4386,7 +4419,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4401,7 +4434,7 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4470,7 +4503,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4485,12 +4518,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: 0.0000009536743 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4566,7 +4599,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1851812988} + m_TransformParent: {fileID: 1730358900} m_Modifications: - target: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4581,12 +4614,12 @@ PrefabInstance: - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} propertyPath: m_LocalPosition.x - value: -5.9999995 + value: -6 objectReference: {fileID: 0} - target: {fileID: 8664788757336834019, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} @@ -4717,6 +4750,86 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} +--- !u!4 &675198211105780961 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + m_PrefabInstance: {fileID: 690663345979379813} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &690663345979379813 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_LocalPosition.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8965591617983332632, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + propertyPath: m_Name + value: Timed Button Stand + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1570236479429067028, guid: 97cc1523ce05b9544bccb2e3be7f024d, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 97cc1523ce05b9544bccb2e3be7f024d, type: 3} --- !u!1001 &1532540192886921384 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Station46/Module Descriptions/M Button Hoop.asset b/Assets/Station46/Module Descriptions/M Button Hoop.asset new file mode 100644 index 0000000..003e626 --- /dev/null +++ b/Assets/Station46/Module Descriptions/M Button Hoop.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: abf4a405f6c64073995bded39977563e, type: 3} + m_Name: M Button Hoop + m_EditorClassIdentifier: + types: 03000000 + modulePrefab: {fileID: 9114356374823472745, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + preconditionRequirements: [] + placementRequirements: + - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} diff --git a/Assets/Station46/Module Descriptions/M Button Hoop.asset.meta b/Assets/Station46/Module Descriptions/M Button Hoop.asset.meta new file mode 100644 index 0000000..3bfbccc --- /dev/null +++ b/Assets/Station46/Module Descriptions/M Button Hoop.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69cebf488cebe814da4f070d168e8790 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Module Descriptions/P Timed Button Stand.asset b/Assets/Station46/Module Descriptions/P Timed Button Stand.asset new file mode 100644 index 0000000..c4f2102 --- /dev/null +++ b/Assets/Station46/Module Descriptions/P Timed Button Stand.asset @@ -0,0 +1,25 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} + m_Name: P Timed Button Stand + m_EditorClassIdentifier: + types: 02000000 + modulePrefab: {fileID: 6227164789557300763, guid: 97cc1523ce05b9544bccb2e3be7f024d, + type: 3} + preconditionRequirements: + - {fileID: 11400000, guid: 6fff173f5982cd94983f920106782de7, type: 2} + - {fileID: 11400000, guid: eba249f4b0132404786212abf1344016, type: 2} + - {fileID: 11400000, guid: 0e5f5eca8a8276b408329e6cb7ab404d, type: 2} + placementRequirements: + - {fileID: 11400000, guid: 411d7db1fe13b1c4d8edf7bd7def1b73, type: 2} + puzzleName: Timed Button Stand + puzzleVersion: 1 diff --git a/Assets/Station46/Module Descriptions/P Timed Button Stand.asset.meta b/Assets/Station46/Module Descriptions/P Timed Button Stand.asset.meta new file mode 100644 index 0000000..62386ad --- /dev/null +++ b/Assets/Station46/Module Descriptions/P Timed Button Stand.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 010a967ecaf566041a0e12459806bd04 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Module Descriptions/R Button Hoop.asset b/Assets/Station46/Module Descriptions/R Button Hoop.asset new file mode 100644 index 0000000..3723d63 --- /dev/null +++ b/Assets/Station46/Module Descriptions/R Button Hoop.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e3f3bf07aae4a03834a7943c255f37d, type: 3} + m_Name: R Button Hoop + m_EditorClassIdentifier: + relatedModule: {fileID: 11400000, guid: 69cebf488cebe814da4f070d168e8790, type: 2} diff --git a/Assets/Station46/Module Descriptions/R Button Hoop.asset.meta b/Assets/Station46/Module Descriptions/R Button Hoop.asset.meta new file mode 100644 index 0000000..af52431 --- /dev/null +++ b/Assets/Station46/Module Descriptions/R Button Hoop.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eba249f4b0132404786212abf1344016 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Button Stand.meta b/Assets/Station46/Modules/Button Stand.meta new file mode 100644 index 0000000..654e976 --- /dev/null +++ b/Assets/Station46/Modules/Button Stand.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 248976014a75a9d4983a577e383fa321 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Button Stand/Button Stand.prefab b/Assets/Station46/Modules/Button Stand/Button Stand.prefab new file mode 100644 index 0000000..2c27ff7 --- /dev/null +++ b/Assets/Station46/Modules/Button Stand/Button Stand.prefab @@ -0,0 +1,416 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &242775360432065206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7514415232938006188} + - component: {fileID: 2968767364904468826} + - component: {fileID: 4721366812762946611} + - component: {fileID: 4755606095102556792} + - component: {fileID: 5574978694872577325} + m_Layer: 0 + m_Name: Stand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7514415232938006188 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242775360432065206} + m_LocalRotation: {x: -0.70710576, y: -0, z: -0, w: 0.70710784} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 852813185195933073} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &2968767364904468826 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242775360432065206} + m_Mesh: {fileID: -9189612823058448048, guid: 4b88264faf0bc6d49ad324d6e223146a, type: 3} +--- !u!23 &4721366812762946611 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242775360432065206} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 365bf6911e5c2c344b74a37ce47db72f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &4755606095102556792 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242775360432065206} + 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: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -9189612823058448048, guid: 4b88264faf0bc6d49ad324d6e223146a, type: 3} +--- !u!114 &5574978694872577325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242775360432065206} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17de1e2991b64847bceea06f966f0560, type: 3} + m_Name: + m_EditorClassIdentifier: + color: {r: 8, g: 3.5137255, b: 0, a: 1} + startActive: 1 + emissionRenderer: {fileID: 4721366812762946611} +--- !u!1 &4346312165422302743 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1223383990908721599} + m_Layer: 0 + m_Name: Button Stand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1223383990908721599 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4346312165422302743} + 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: 852813185195933073} + - {fileID: 979859350274255980} + m_Father: {fileID: 0} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7351803888791370729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 852813185195933073} + m_Layer: 0 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &852813185195933073 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7351803888791370729} + 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: 7514415232938006188} + m_Father: {fileID: 1223383990908721599} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8609232115685006976 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 979859350274255980} + - component: {fileID: 2974506240804922852} + - component: {fileID: 7222608493507710839} + - component: {fileID: 874298466439840366} + - component: {fileID: 3852086329416498098} + - component: {fileID: 5448525209797620389} + m_Layer: 0 + m_Name: Holo Orb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &979859350274255980 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8609232115685006976} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.9, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1223383990908721599} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2974506240804922852 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8609232115685006976} + m_Mesh: {fileID: -5029552177822622209, guid: bb684bc47f5683348ba50e093338f484, type: 3} +--- !u!23 &7222608493507710839 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8609232115685006976} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d1f58490f6d04c64da01277723d63536, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &874298466439840366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8609232115685006976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 352860bb2c6549d0b3e84104afef3f54, type: 3} + m_Name: + m_EditorClassIdentifier: + hideWhenDisabled: 0 + startInactive: 0 + holoRenderer: {fileID: 7222608493507710839} +--- !u!114 &3852086329416498098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8609232115685006976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a35f6cfbfba9b548aaa00d52cfe8a50, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 0 + m_CustomReticle: {fileID: 0} + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 874298466439840366} + m_TargetAssemblyTypeName: EscapeRoomEngine.Station46.Runtime.Button, Station46 + m_MethodName: Press + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_HoverExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 874298466439840366} + m_TargetAssemblyTypeName: EscapeRoomEngine.Station46.Runtime.Button, Station46 + m_MethodName: Release + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_OnFirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnLastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectCanceled: + m_PersistentCalls: + m_Calls: [] + m_OnActivate: + m_PersistentCalls: + m_Calls: [] + m_OnDeactivate: + m_PersistentCalls: + m_Calls: [] +--- !u!135 &5448525209797620389 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8609232115685006976} + 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_Radius: 0.100000024 + m_Center: {x: -0.000000029802322, y: 0.00000003725291, z: 0} diff --git a/Assets/Station46/Modules/Button Stand/Button Stand.prefab.meta b/Assets/Station46/Modules/Button Stand/Button Stand.prefab.meta new file mode 100644 index 0000000..89136f8 --- /dev/null +++ b/Assets/Station46/Modules/Button Stand/Button Stand.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 866e3516e2f8502408e17cb19c4e57cc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Button Stand/Scripts.meta b/Assets/Station46/Modules/Button Stand/Scripts.meta new file mode 100644 index 0000000..1152858 --- /dev/null +++ b/Assets/Station46/Modules/Button Stand/Scripts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8389ddb03ad84a8988cc0446946603af +timeCreated: 1683734801 \ No newline at end of file diff --git a/Assets/Station46/Modules/Button Stand/Scripts/TimedButtonStand.cs b/Assets/Station46/Modules/Button Stand/Scripts/TimedButtonStand.cs new file mode 100644 index 0000000..35fac5a --- /dev/null +++ b/Assets/Station46/Modules/Button Stand/Scripts/TimedButtonStand.cs @@ -0,0 +1,78 @@ +using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules.State; +using EscapeRoomEngine.Engine.Runtime.Utilities; +using NaughtyAttributes; +using Station46.Modules.Hoop.Scripts; +using Station46.Scripts; +using UnityEngine; + +namespace Station46.Modules.Button_Stand.Scripts +{ + public class TimedButtonStand : StatePuzzle + { + [BoxGroup("Internal")] [SerializeField] private HoloButton button; + [BoxGroup("Internal")] [SerializeField] private Emission standLight; + + private ButtonHoop _hoop; + + protected override void Start() + { + base.Start(); + + PuzzleEvent += (_, type) => + { + // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault + switch (type) + { + case PuzzleEventType.Restarted: + standLight.color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor.hdr; + button.hideWhenDisabled = true; + button.Enable(); + button.Disable(); + break; + case PuzzleEventType.Solved: + standLight.color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor.hdr; + button.hideWhenDisabled = false; + button.Enable(); + button.Disable(); + break; + } + }; + + button.ButtonEvent += (_, type) => + { + if (type == ButtonEventType.Pressed) + { + Solve(); + } + }; + } + + public override void SetModule(Module module) + { + base.SetModule(module); + + // The hoop requires a related dispenser module + // We use the second slot because the first slot is reserved for the platform + var secondRelatedModule = Module.relatedModules[1]; + if (secondRelatedModule.State is ButtonHoop hoop) + { + hoop.Button.ButtonEvent += (_, type) => + { + if (type == ButtonEventType.Pressed) + { + button.Enable(); + } + else + { + button.Disable(); + } + }; + } + else + { + throw new EngineException($"{this} was not assigned a related button hoop."); + } + } + } +} \ No newline at end of file diff --git a/Assets/Station46/Modules/Button Stand/Scripts/TimedButtonStand.cs.meta b/Assets/Station46/Modules/Button Stand/Scripts/TimedButtonStand.cs.meta new file mode 100644 index 0000000..6167b10 --- /dev/null +++ b/Assets/Station46/Modules/Button Stand/Scripts/TimedButtonStand.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 04813ea711414777bb27154ebd3671b4 +timeCreated: 1683734810 \ No newline at end of file diff --git a/Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab b/Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab new file mode 100644 index 0000000..401bb22 --- /dev/null +++ b/Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4628888916587005711 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 874298466439840366, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: startInactive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 874298466439840366, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: hideWhenDisabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalPosition.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4346312165422302743, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_Name + value: Timed Button Stand + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4346312165422302743, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6227164789557300763} + m_SourcePrefab: {fileID: 100100000, guid: 866e3516e2f8502408e17cb19c4e57cc, type: 3} +--- !u!114 &964703136615330338 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5574978694872577325, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + m_PrefabInstance: {fileID: 4628888916587005711} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17de1e2991b64847bceea06f966f0560, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5485168994165556577 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 874298466439840366, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + m_PrefabInstance: {fileID: 4628888916587005711} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 352860bb2c6549d0b3e84104afef3f54, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &8965591617983332632 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4346312165422302743, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + m_PrefabInstance: {fileID: 4628888916587005711} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6227164789557300763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8965591617983332632} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04813ea711414777bb27154ebd3671b4, type: 3} + m_Name: + m_EditorClassIdentifier: + size: {x: 1, y: 1} + states: 00000000 + solution: 01000000 + stateCount: 1 + correctStates: 0 + button: {fileID: 5485168994165556577} + standLight: {fileID: 964703136615330338} diff --git a/Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab.meta b/Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab.meta new file mode 100644 index 0000000..be32a81 --- /dev/null +++ b/Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 97cc1523ce05b9544bccb2e3be7f024d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Elevated Platform/Elevated Platform.prefab b/Assets/Station46/Modules/Elevated Platform/Elevated Platform.prefab index c4bc0b0..2ecedaf 100644 --- a/Assets/Station46/Modules/Elevated Platform/Elevated Platform.prefab +++ b/Assets/Station46/Modules/Elevated Platform/Elevated Platform.prefab @@ -272,7 +272,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7109134845987214259} + - {fileID: 9208671408544671328} - {fileID: 2517313415079161690} m_Father: {fileID: 6915102081068721723} m_RootOrder: -1 @@ -311,231 +311,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &1750689039537693023 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7109134845987214259} - - component: {fileID: 5077246951360453179} - - component: {fileID: 795532608663810216} - - component: {fileID: 7139244772581621169} - - component: {fileID: 6504548621765592173} - - component: {fileID: 2642658977663749498} - m_Layer: 0 - m_Name: Holo Orb - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7109134845987214259 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750689039537693023} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8648774459861283546} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5077246951360453179 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750689039537693023} - m_Mesh: {fileID: -5029552177822622209, guid: bb684bc47f5683348ba50e093338f484, type: 3} ---- !u!23 &795532608663810216 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750689039537693023} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d1f58490f6d04c64da01277723d63536, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7139244772581621169 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750689039537693023} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 352860bb2c6549d0b3e84104afef3f54, type: 3} - m_Name: - m_EditorClassIdentifier: - holoRenderer: {fileID: 795532608663810216} ---- !u!114 &6504548621765592173 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750689039537693023} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a35f6cfbfba9b548aaa00d52cfe8a50, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 1 - m_DistanceCalculationMode: 1 - m_SelectMode: 0 - m_CustomReticle: {fileID: 0} - m_FirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 7139244772581621169} - m_TargetAssemblyTypeName: EscapeRoomEngine.Station46.Runtime.Button, Station46 - m_MethodName: Press - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_HoverExited: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 7139244772581621169} - m_TargetAssemblyTypeName: EscapeRoomEngine.Station46.Runtime.Button, Station46 - m_MethodName: Release - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] ---- !u!135 &2642658977663749498 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750689039537693023} - 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_Radius: 0.100000024 - m_Center: {x: -0.000000029802322, y: 0.00000003725291, z: 0} --- !u!1 &2011102000134893803 GameObject: m_ObjectHideFlags: 0 @@ -1072,3 +847,94 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 2.842171e-14, y: 0, z: 0} +--- !u!1001 &8012344199772536799 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8648774459861283546} + m_Modifications: + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4346312165422302743, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + propertyPath: m_Name + value: Button Stand + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 866e3516e2f8502408e17cb19c4e57cc, type: 3} +--- !u!114 &7139244772581621169 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 874298466439840366, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + m_PrefabInstance: {fileID: 8012344199772536799} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 352860bb2c6549d0b3e84104afef3f54, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &9208671408544671328 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + m_PrefabInstance: {fileID: 8012344199772536799} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Station46/Modules/Hoop/Button Hoop.prefab b/Assets/Station46/Modules/Hoop/Button Hoop.prefab index 1ba3f33..9f4ee23 100644 --- a/Assets/Station46/Modules/Hoop/Button Hoop.prefab +++ b/Assets/Station46/Modules/Hoop/Button Hoop.prefab @@ -18,6 +18,21 @@ PrefabInstance: propertyPath: m_RootOrder value: -1 objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} propertyPath: m_LocalPosition.x @@ -92,10 +107,14 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} insertIndex: 2 - addedObject: {fileID: 2510553829162414157} + addedObject: {fileID: 6951216667893815768} - targetCorrespondingSourceObject: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} insertIndex: 3 + addedObject: {fileID: 2510553829162414157} + - targetCorrespondingSourceObject: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + insertIndex: 4 addedObject: {fileID: 4434097653282366288} m_SourcePrefab: {fileID: 100100000, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} --- !u!1 &1478369497145927568 stripped @@ -116,6 +135,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8418942d5fe34028bdc0165490d5abf7, type: 3} m_Name: m_EditorClassIdentifier: + size: {x: 1, y: 1} +--- !u!114 &6951216667893815768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478369497145927568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 05ccb586cbc54f9e8c46ade911449f7f, type: 3} + m_Name: + m_EditorClassIdentifier: number: 0 --- !u!114 &2510553829162414157 MonoBehaviour: @@ -130,6 +162,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 8, g: 3.5137255, b: 0, a: 0} + startActive: 0 emissionRenderer: {fileID: 2117939242591259622} additionalEmissionRenderers: - {fileID: 4765051065728883424} diff --git a/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs b/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs index 6fa4619..1a2602c 100644 --- a/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs +++ b/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs @@ -1,23 +1,30 @@ -using Station46.Modules.Holes.Scripts; +using System; +using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules.State; +using Station46.Modules.Holes.Scripts; using Station46.Scripts; using UnityEngine; namespace Station46.Modules.Hoop.Scripts { - [RequireComponent(typeof(Animator))] - public class ButtonHoop : Hole + [RequireComponent(typeof(Animator), typeof(Hole))] + public class ButtonHoop : ModuleState { private static readonly int PressedHash = Animator.StringToHash("Pressed"); - + + public Hole Button { get; private set; } + private Animator _animator; - protected override void Start() + private void Awake() { - base.Start(); - _animator = GetComponent(); + Button = GetComponent(); + } - ButtonEvent += (_, type) => + private void Start() + { + Button.ButtonEvent += (_, type) => { // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault switch (type) @@ -31,5 +38,7 @@ namespace Station46.Modules.Hoop.Scripts } }; } + + public override void SetModule(Module module) {} } } \ No newline at end of file diff --git a/Assets/Station46/Scripts/Emission.cs b/Assets/Station46/Scripts/Emission.cs index 0bf5960..6dbd655 100644 --- a/Assets/Station46/Scripts/Emission.cs +++ b/Assets/Station46/Scripts/Emission.cs @@ -13,6 +13,7 @@ namespace Station46.Scripts [Tooltip("The colour of the emission.")] [ColorUsage(false, true)] public Color color; + public bool startActive; [BoxGroup("Internal")] [Required] public MeshRenderer emissionRenderer; @@ -32,6 +33,11 @@ namespace Station46.Scripts private void Start() { + if (startActive) + { + active = true; + } + ChangedToggle(); ChangedColor(); } diff --git a/Assets/Station46/Scripts/HoloButton.cs b/Assets/Station46/Scripts/HoloButton.cs index 85b958a..cc26620 100644 --- a/Assets/Station46/Scripts/HoloButton.cs +++ b/Assets/Station46/Scripts/HoloButton.cs @@ -11,6 +11,7 @@ namespace Station46.Scripts private static readonly int FresnelColor = Shader.PropertyToID("_FresnelColor"); private static readonly int Color = Shader.PropertyToID("_Color"); + public bool hideWhenDisabled, startInactive; [BoxGroup("Internal")] [Required] public MeshRenderer holoRenderer; private Material _material; @@ -35,9 +36,16 @@ namespace Station46.Scripts color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.activeColor; } + holoRenderer.enabled = Active || !hideWhenDisabled; + _material.SetColor(FresnelColor, color.hdr); _material.SetColor(Color, color.hdr); }; + + if (startInactive) + { + Active = false; + } } } } \ No newline at end of file diff --git a/Assets/Station46/Station 46.asset b/Assets/Station46/Station 46.asset index 7f6a484..280e555 100644 --- a/Assets/Station46/Station 46.asset +++ b/Assets/Station46/Station 46.asset @@ -39,3 +39,4 @@ MonoBehaviour: - {fileID: 11400000, guid: ee5a44432e80cd64689be3ff34750339, type: 2} - {fileID: 11400000, guid: 1b21332d2a4da2d4d9f8a105d1e24980, type: 2} - {fileID: 11400000, guid: 6ea70b544b4cffb4ca12286c749da98d, type: 2} + - {fileID: 11400000, guid: 010a967ecaf566041a0e12459806bd04, type: 2} diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset index 737c506..02aa916 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: ee5a44432e80cd64689be3ff34750339, type: 2} + - {fileID: 11400000, guid: 6ea70b544b4cffb4ca12286c749da98d, type: 2}