From 7e803a5279df1bf823131f417ef2896f6221d855 Mon Sep 17 00:00:00 2001 From: milan Date: Tue, 11 Apr 2023 17:42:59 +0200 Subject: [PATCH] hoop drop animations, multiemission --- Assets/Scenes/PuzzleTest.unity | 484 +++++++++++++----- .../Module Descriptions/P Hoop Fling.asset | 2 +- .../Elevated Platform.prefab | 2 +- .../Hoop/Animations/Button Hoop.controller | 211 ++++++++ .../Animations/Button Hoop.controller.meta | 8 + .../Modules/Hoop/Animations/Drop.anim | 135 +++++ .../Modules/Hoop/Animations/Drop.anim.meta | 8 + .../Modules/Hoop/Animations/Reset.anim | 117 +++++ .../Modules/Hoop/Animations/Reset.anim.meta | 8 + .../Station46/Modules/Hoop/Button Hoop.prefab | 175 +++++++ .../Modules/Hoop/Button Hoop.prefab.meta | 7 + .../Station46/Modules/Hoop/Fling Hoop.prefab | 82 +++ .../Modules/Hoop/Fling Hoop.prefab.meta | 7 + Assets/Station46/Modules/Hoop/Hoop.prefab | 61 ++- .../Modules/Hoop/Scripts/ButtonHoop.cs | 35 ++ .../Modules/Hoop/Scripts/ButtonHoop.cs.meta | 3 + .../Hoop/Scripts/{Hoop.cs => FlingHoop.cs} | 2 +- .../{Hoop.cs.meta => FlingHoop.cs.meta} | 0 Assets/Station46/Scripts/Emission.cs | 8 +- Assets/Station46/Scripts/MultiEmission.cs | 51 ++ .../Station46/Scripts/MultiEmission.cs.meta | 3 + Assets/Test Assets/Test Theme.asset | 2 +- 22 files changed, 1253 insertions(+), 158 deletions(-) create mode 100644 Assets/Station46/Modules/Hoop/Animations/Button Hoop.controller create mode 100644 Assets/Station46/Modules/Hoop/Animations/Button Hoop.controller.meta create mode 100644 Assets/Station46/Modules/Hoop/Animations/Drop.anim create mode 100644 Assets/Station46/Modules/Hoop/Animations/Drop.anim.meta create mode 100644 Assets/Station46/Modules/Hoop/Animations/Reset.anim create mode 100644 Assets/Station46/Modules/Hoop/Animations/Reset.anim.meta create mode 100644 Assets/Station46/Modules/Hoop/Button Hoop.prefab create mode 100644 Assets/Station46/Modules/Hoop/Button Hoop.prefab.meta create mode 100644 Assets/Station46/Modules/Hoop/Fling Hoop.prefab create mode 100644 Assets/Station46/Modules/Hoop/Fling Hoop.prefab.meta create mode 100644 Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs create mode 100644 Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs.meta rename Assets/Station46/Modules/Hoop/Scripts/{Hoop.cs => FlingHoop.cs} (98%) rename Assets/Station46/Modules/Hoop/Scripts/{Hoop.cs.meta => FlingHoop.cs.meta} (100%) create mode 100644 Assets/Station46/Scripts/MultiEmission.cs create mode 100644 Assets/Station46/Scripts/MultiEmission.cs.meta diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index 0a78ccf..e235385 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -124,6 +124,85 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &9336440 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + 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: -1 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.233 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalPosition.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalPosition.z + value: 3 + 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!4 &9336441 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + m_PrefabInstance: {fileID: 9336440} + m_PrefabAsset: {fileID: 0} --- !u!1001 &50341409 PrefabInstance: m_ObjectHideFlags: 0 @@ -1268,7 +1347,7 @@ Transform: - {fileID: 353929129} - {fileID: 1719705407} - {fileID: 1930155662} - - {fileID: 1348527227} + - {fileID: 1461523425} - {fileID: 229080824} - {fileID: 1198940296} - {fileID: 1028578884} @@ -1276,6 +1355,14 @@ Transform: - {fileID: 1101383441} - {fileID: 1532540192886921385} - {fileID: 1949077063} + - {fileID: 874637333} + - {fileID: 5113659104536846700} + - {fileID: 796526694} + - {fileID: 987689138} + - {fileID: 604728745} + - {fileID: 681930983} + - {fileID: 6067357455631746734} + - {fileID: 2343402481646314946} m_Father: {fileID: 1340421038} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1616,6 +1703,85 @@ Transform: type: 3} m_PrefabInstance: {fileID: 535692513} m_PrefabAsset: {fileID: 0} +--- !u!1001 &538618497 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 1478369497145927568, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_Name + value: Button Hoop + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ceec192b57a11254eae63f938fbd3eb8, type: 3} +--- !u!4 &538618498 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + m_PrefabInstance: {fileID: 538618497} + m_PrefabAsset: {fileID: 0} --- !u!1001 &588055817 PrefabInstance: m_ObjectHideFlags: 0 @@ -1695,7 +1861,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 251845578051121456, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} @@ -1705,7 +1871,7 @@ PrefabInstance: - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} @@ -1774,12 +1940,12 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 2835502344937141734, guid: 7a8b76a212391334ea8e3937df152874, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 2835502344937141734, guid: 7a8b76a212391334ea8e3937df152874, type: 3} @@ -1804,17 +1970,17 @@ PrefabInstance: - target: {fileID: 2835502344937141734, guid: 7a8b76a212391334ea8e3937df152874, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2835502344937141734, guid: 7a8b76a212391334ea8e3937df152874, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2835502344937141734, guid: 7a8b76a212391334ea8e3937df152874, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2835502344937141734, guid: 7a8b76a212391334ea8e3937df152874, type: 3} @@ -2066,12 +2232,12 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3} @@ -2096,17 +2262,17 @@ PrefabInstance: - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3} @@ -2297,7 +2463,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 251845578051121456, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} @@ -2307,7 +2473,7 @@ PrefabInstance: - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} @@ -2885,7 +3051,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1340421038 Transform: m_ObjectHideFlags: 0 @@ -2898,97 +3064,13 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1853180256} + - {fileID: 538618498} + - {fileID: 9336441} - {fileID: 411421604} - - {fileID: 874637333} - - {fileID: 5113659104536846700} - - {fileID: 796526694} - - {fileID: 987689138} - - {fileID: 604728745} - - {fileID: 681930983} - - {fileID: 6067357455631746734} - - {fileID: 2343402481646314946} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!1001 &1348527226 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 411421604} - m_Modifications: - - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_RootOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_LocalPosition.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - propertyPath: m_Name - value: Hoop - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} ---- !u!4 &1348527227 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, - type: 3} - m_PrefabInstance: {fileID: 1348527226} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1364926074 PrefabInstance: m_ObjectHideFlags: 0 @@ -3409,6 +3491,85 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1450431648} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1461523424 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 411421604} + m_Modifications: + - target: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6011687638040384697, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + propertyPath: m_Name + value: Fling Hoop + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7854eeba0cc4ea4419f74ce50bc9c514, type: 3} +--- !u!4 &1461523425 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2216350971831476633, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + type: 3} + m_PrefabInstance: {fileID: 1461523424} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1615827502 PrefabInstance: m_ObjectHideFlags: 0 @@ -3848,7 +4009,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1851812988 Transform: m_ObjectHideFlags: 0 @@ -3893,6 +4054,85 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1853180255 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_LocalPosition.x + value: 4.9999995 + objectReference: {fileID: 0} + - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.9999983 + objectReference: {fileID: 0} + - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000016391276 + objectReference: {fileID: 0} + - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6889276557833470383, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + propertyPath: m_Name + value: Elevated Platform + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 056f81ef6ccf57645b24b2b317a578e7, type: 3} +--- !u!4 &1853180256 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, + type: 3} + m_PrefabInstance: {fileID: 1853180255} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1860072079 PrefabInstance: m_ObjectHideFlags: 0 @@ -4410,7 +4650,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 8558524283348193081, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} @@ -4420,7 +4660,7 @@ PrefabInstance: - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} @@ -4445,17 +4685,17 @@ PrefabInstance: - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} @@ -4562,7 +4802,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 1227162583285562723, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} @@ -4597,17 +4837,17 @@ PrefabInstance: - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} @@ -4641,7 +4881,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 872448883161704311, guid: 511d605163a2abf49a0f1f69be067561, type: 3} @@ -4651,7 +4891,7 @@ PrefabInstance: - target: {fileID: 5691171783781926815, guid: 511d605163a2abf49a0f1f69be067561, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 5691171783781926815, guid: 511d605163a2abf49a0f1f69be067561, type: 3} @@ -4676,17 +4916,17 @@ PrefabInstance: - target: {fileID: 5691171783781926815, guid: 511d605163a2abf49a0f1f69be067561, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5691171783781926815, guid: 511d605163a2abf49a0f1f69be067561, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5691171783781926815, guid: 511d605163a2abf49a0f1f69be067561, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5691171783781926815, guid: 511d605163a2abf49a0f1f69be067561, type: 3} @@ -4720,7 +4960,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, type: 3} @@ -4750,17 +4990,17 @@ PrefabInstance: - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, type: 3} diff --git a/Assets/Station46/Module Descriptions/P Hoop Fling.asset b/Assets/Station46/Module Descriptions/P Hoop Fling.asset index 11319b0..e540677 100644 --- a/Assets/Station46/Module Descriptions/P Hoop Fling.asset +++ b/Assets/Station46/Module Descriptions/P Hoop Fling.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: P Hoop Fling m_EditorClassIdentifier: types: 02000000 - modulePrefab: {fileID: 6853723365353446933, guid: c6f4a21ce6c0ce84584c90804c96ad80, + modulePrefab: {fileID: 7562692363137455273, guid: 7854eeba0cc4ea4419f74ce50bc9c514, type: 3} preconditionRequirements: - {fileID: 11400000, guid: 2393bf2b32e06f647a014688e3d8a8d9, type: 2} diff --git a/Assets/Station46/Modules/Elevated Platform/Elevated Platform.prefab b/Assets/Station46/Modules/Elevated Platform/Elevated Platform.prefab index 8e4086d..c4bc0b0 100644 --- a/Assets/Station46/Modules/Elevated Platform/Elevated Platform.prefab +++ b/Assets/Station46/Modules/Elevated Platform/Elevated Platform.prefab @@ -340,7 +340,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1750689039537693023} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.00000004917382, y: 1, z: -0.4000001} + m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Station46/Modules/Hoop/Animations/Button Hoop.controller b/Assets/Station46/Modules/Hoop/Animations/Button Hoop.controller new file mode 100644 index 0000000..690879d --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Animations/Button Hoop.controller @@ -0,0 +1,211 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8315174593757635322 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Drop + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4313364336951682060} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: f195374e919801c42bbee5c2201c1bfc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-1849888743608791186 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 5523675956409188510} + m_Position: {x: 390, y: 100, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8315174593757635322} + m_Position: {x: 510, y: -20, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1002219146805840128} + m_Position: {x: 270, y: -20, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5523675956409188510} +--- !u!1102 &-1002219146805840128 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Reset + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -875650656141743241} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 5a23d64617d04fb40aecc889ee4472af, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-875650656141743241 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5523675956409188510} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Button Hoop + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Pressed + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -1849888743608791186} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &4313364336951682060 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Pressed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1002219146805840128} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.5 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &5523675956409188510 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Default + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5788500216301283500} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &5788500216301283500 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Pressed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8315174593757635322} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Station46/Modules/Hoop/Animations/Button Hoop.controller.meta b/Assets/Station46/Modules/Hoop/Animations/Button Hoop.controller.meta new file mode 100644 index 0000000..69b7cd0 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Animations/Button Hoop.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f8874d2362757247ad91c6c7805582f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Hoop/Animations/Drop.anim b/Assets/Station46/Modules/Hoop/Animations/Drop.anim new file mode 100644 index 0000000..e5489c7 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Animations/Drop.anim @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Drop + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 3 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.23172808} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Hoop + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2383357319 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 3 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.23172808 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Hoop + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Station46/Modules/Hoop/Animations/Drop.anim.meta b/Assets/Station46/Modules/Hoop/Animations/Drop.anim.meta new file mode 100644 index 0000000..24e1168 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Animations/Drop.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f195374e919801c42bbee5c2201c1bfc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Hoop/Animations/Reset.anim b/Assets/Station46/Modules/Hoop/Animations/Reset.anim new file mode 100644 index 0000000..af4e74a --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Animations/Reset.anim @@ -0,0 +1,117 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Reset + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.23172808} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 360} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Hoop + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2383357319 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.23172808 + - serializedVersion: 3 + time: 1 + value: 360 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Hoop + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Station46/Modules/Hoop/Animations/Reset.anim.meta b/Assets/Station46/Modules/Hoop/Animations/Reset.anim.meta new file mode 100644 index 0000000..7f86885 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Animations/Reset.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a23d64617d04fb40aecc889ee4472af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Hoop/Button Hoop.prefab b/Assets/Station46/Modules/Hoop/Button Hoop.prefab new file mode 100644 index 0000000..1ba3f33 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Button Hoop.prefab @@ -0,0 +1,175 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8070646810589739413 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1431476700248791042, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_Name + value: Button Hoop + objectReference: {fileID: 0} + - target: {fileID: 7796001094996554276, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_Center.y + value: 1.2 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1688848220615297131, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} + - {fileID: 2714932768293234240, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} + - {fileID: 278324090529111625, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + insertIndex: 1 + addedObject: {fileID: 9114356374823472745} + - targetCorrespondingSourceObject: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + insertIndex: 2 + addedObject: {fileID: 2510553829162414157} + - targetCorrespondingSourceObject: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + insertIndex: 3 + addedObject: {fileID: 4434097653282366288} + m_SourcePrefab: {fileID: 100100000, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} +--- !u!1 &1478369497145927568 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + m_PrefabInstance: {fileID: 8070646810589739413} + m_PrefabAsset: {fileID: 0} +--- !u!114 &9114356374823472745 +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: 8418942d5fe34028bdc0165490d5abf7, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 0 +--- !u!114 &2510553829162414157 +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: 5125296c087d4666ab772574843e6896, type: 3} + m_Name: + m_EditorClassIdentifier: + color: {r: 8, g: 3.5137255, b: 0, a: 0} + emissionRenderer: {fileID: 2117939242591259622} + additionalEmissionRenderers: + - {fileID: 4765051065728883424} + - {fileID: 7547196691194273180} +--- !u!95 &4434097653282366288 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478369497145927568} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7f8874d2362757247ad91c6c7805582f, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!23 &2117939242591259622 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 7882667168521007731, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + m_PrefabInstance: {fileID: 8070646810589739413} + m_PrefabAsset: {fileID: 0} +--- !u!23 &4765051065728883424 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 3612008058714776437, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + m_PrefabInstance: {fileID: 8070646810589739413} + m_PrefabAsset: {fileID: 0} +--- !u!23 &7547196691194273180 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1782781022534132745, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + m_PrefabInstance: {fileID: 8070646810589739413} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Station46/Modules/Hoop/Button Hoop.prefab.meta b/Assets/Station46/Modules/Hoop/Button Hoop.prefab.meta new file mode 100644 index 0000000..ceacded --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Button Hoop.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ceec192b57a11254eae63f938fbd3eb8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Hoop/Fling Hoop.prefab b/Assets/Station46/Modules/Hoop/Fling Hoop.prefab new file mode 100644 index 0000000..750b15c --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Fling Hoop.prefab @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4028827982112082620 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1431476700248791042, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalPosition.z + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_Name + value: Fling Hoop + objectReference: {fileID: 0} + - target: {fileID: 7796001094996554276, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + propertyPath: m_Center.z + value: -5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + insertIndex: 1 + addedObject: {fileID: 3033697766135085348} + m_SourcePrefab: {fileID: 100100000, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} +--- !u!1 &6011687638040384697 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + m_PrefabInstance: {fileID: 4028827982112082620} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3033697766135085348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6011687638040384697} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 175342625aa94174a12590b46ad484fc, type: 3} + m_Name: + m_EditorClassIdentifier: + size: {x: 1, y: 1} + states: 00000000 + solution: 03000000 + stateCount: 1 + correctStates: 0 + updateDelay: 1 + rings: + - {fileID: 1688848220615297131, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} + - {fileID: 2714932768293234240, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} + - {fileID: 278324090529111625, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} diff --git a/Assets/Station46/Modules/Hoop/Fling Hoop.prefab.meta b/Assets/Station46/Modules/Hoop/Fling Hoop.prefab.meta new file mode 100644 index 0000000..aab7410 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Fling Hoop.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7854eeba0cc4ea4419f74ce50bc9c514 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Hoop/Hoop.prefab b/Assets/Station46/Modules/Hoop/Hoop.prefab index 63ff1fc..ac32b5f 100644 --- a/Assets/Station46/Modules/Hoop/Hoop.prefab +++ b/Assets/Station46/Modules/Hoop/Hoop.prefab @@ -158,7 +158,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4456850992400510991} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -5} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -186,6 +186,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &7243067731848781317 GameObject: m_ObjectHideFlags: 0 @@ -196,7 +197,6 @@ GameObject: m_Component: - component: {fileID: 2966546982734834469} - component: {fileID: 7796001094996554276} - - component: {fileID: 6853723365353446933} m_Layer: 0 m_Name: Hoop m_TagString: Untagged @@ -228,33 +228,19 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7243067731848781317} 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: 2 + serializedVersion: 3 m_Radius: 0.47 - m_Center: {x: 0, y: 0, z: -5} ---- !u!114 &6853723365353446933 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7243067731848781317} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 175342625aa94174a12590b46ad484fc, type: 3} - m_Name: - m_EditorClassIdentifier: - size: {x: 1, y: 1} - states: 00000000 - solution: 03000000 - stateCount: 1 - correctStates: 0 - updateDelay: 1 - rings: - - {fileID: 1688848220615297131} - - {fileID: 2714932768293234240} - - {fileID: 278324090529111625} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7842527262783484564 GameObject: m_ObjectHideFlags: 0 @@ -348,9 +334,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7842527262783484564} 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: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -3298800115395149385, guid: 69f4a986e91143f479d973224794cfd8, type: 3} @@ -361,10 +355,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7842527262783484564} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 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: 0 m_IsKinematic: 1 m_Interpolate: 0 diff --git a/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs b/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs new file mode 100644 index 0000000..6fa4619 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs @@ -0,0 +1,35 @@ +using Station46.Modules.Holes.Scripts; +using Station46.Scripts; +using UnityEngine; + +namespace Station46.Modules.Hoop.Scripts +{ + [RequireComponent(typeof(Animator))] + public class ButtonHoop : Hole + { + private static readonly int PressedHash = Animator.StringToHash("Pressed"); + + private Animator _animator; + + protected override void Start() + { + base.Start(); + + _animator = GetComponent(); + + ButtonEvent += (_, type) => + { + // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault + switch (type) + { + case ButtonEventType.Pressed: + _animator.SetBool(PressedHash, true); + break; + case ButtonEventType.Released: + _animator.SetBool(PressedHash, false); + break; + } + }; + } + } +} \ No newline at end of file diff --git a/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs.meta b/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs.meta new file mode 100644 index 0000000..2c90aa0 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8418942d5fe34028bdc0165490d5abf7 +timeCreated: 1683724488 \ No newline at end of file diff --git a/Assets/Station46/Modules/Hoop/Scripts/Hoop.cs b/Assets/Station46/Modules/Hoop/Scripts/FlingHoop.cs similarity index 98% rename from Assets/Station46/Modules/Hoop/Scripts/Hoop.cs rename to Assets/Station46/Modules/Hoop/Scripts/FlingHoop.cs index aca47b6..493eeee 100644 --- a/Assets/Station46/Modules/Hoop/Scripts/Hoop.cs +++ b/Assets/Station46/Modules/Hoop/Scripts/FlingHoop.cs @@ -14,7 +14,7 @@ namespace Station46.Modules.Hoop.Scripts /// The main component for the orb throwing module. /// [RequireComponent(typeof(Collider))] - public class Hoop : StatePuzzle + public class FlingHoop : StatePuzzle { [Tooltip("How long to wait in seconds until the state is updated. Orbs that do not stay in the hoop should not be counted.")] public float updateDelay; diff --git a/Assets/Station46/Modules/Hoop/Scripts/Hoop.cs.meta b/Assets/Station46/Modules/Hoop/Scripts/FlingHoop.cs.meta similarity index 100% rename from Assets/Station46/Modules/Hoop/Scripts/Hoop.cs.meta rename to Assets/Station46/Modules/Hoop/Scripts/FlingHoop.cs.meta diff --git a/Assets/Station46/Scripts/Emission.cs b/Assets/Station46/Scripts/Emission.cs index 1500532..0bf5960 100644 --- a/Assets/Station46/Scripts/Emission.cs +++ b/Assets/Station46/Scripts/Emission.cs @@ -8,7 +8,7 @@ namespace Station46.Scripts /// public class Emission : MonoBehaviour { - private static readonly int EmissionColorNameID = Shader.PropertyToID("_EmissionColor"); + protected static readonly int EmissionColorNameID = Shader.PropertyToID("_EmissionColor"); [Tooltip("The colour of the emission.")] [ColorUsage(false, true)] @@ -25,7 +25,7 @@ namespace Station46.Scripts private Color _previousColor; private Material _material; - private void Awake() + protected virtual void Awake() { _material = emissionRenderer.material; } @@ -51,7 +51,7 @@ namespace Station46.Scripts } } - private void ChangedToggle() + protected virtual void ChangedToggle() { if (active) { @@ -63,7 +63,7 @@ namespace Station46.Scripts } } - private void ChangedColor() + protected virtual void ChangedColor() { _material.SetColor(EmissionColorNameID, color); } diff --git a/Assets/Station46/Scripts/MultiEmission.cs b/Assets/Station46/Scripts/MultiEmission.cs new file mode 100644 index 0000000..bedea7c --- /dev/null +++ b/Assets/Station46/Scripts/MultiEmission.cs @@ -0,0 +1,51 @@ +using NaughtyAttributes; +using UnityEngine; + +namespace Station46.Scripts +{ + public class MultiEmission : Emission + { + [BoxGroup("Internal")] [Required] + public MeshRenderer[] additionalEmissionRenderers; + + private Material[] _additionalMaterials; + + protected override void Awake() + { + base.Awake(); + + _additionalMaterials = new Material[additionalEmissionRenderers.Length]; + for (var i = 0; i < additionalEmissionRenderers.Length; i++) + { + _additionalMaterials[i] = additionalEmissionRenderers[i].material; + } + } + + protected override void ChangedToggle() + { + base.ChangedToggle(); + + foreach (var material in _additionalMaterials) + { + if (active) + { + material.EnableKeyword("_EMISSION"); + } + else + { + material.DisableKeyword("_EMISSION"); + } + } + } + + protected override void ChangedColor() + { + base.ChangedColor(); + + foreach (var material in _additionalMaterials) + { + material.SetColor(EmissionColorNameID, color); + } + } + } +} \ No newline at end of file diff --git a/Assets/Station46/Scripts/MultiEmission.cs.meta b/Assets/Station46/Scripts/MultiEmission.cs.meta new file mode 100644 index 0000000..7c600d0 --- /dev/null +++ b/Assets/Station46/Scripts/MultiEmission.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5125296c087d4666ab772574843e6896 +timeCreated: 1683723522 \ No newline at end of file diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset index 485d65c..737c506 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: 1b21332d2a4da2d4d9f8a105d1e24980, type: 2} + - {fileID: 11400000, guid: ee5a44432e80cd64689be3ff34750339, type: 2}