From 7ddf555771acf3187e7376a0b2eb135b815cdca9 Mon Sep 17 00:00:00 2001 From: milan Date: Wed, 12 Apr 2023 16:03:10 +0200 Subject: [PATCH] fling holes puzzle --- Assets/Scenes/PuzzleTest.unity | 220 ++++++++++++++---- .../M Button Fling Hoop.asset | 22 ++ .../M Button Fling Hoop.asset.meta | 8 + .../M Dispenser with Button Fling Hoop.asset | 21 ++ ...ispenser with Button Fling Hoop.asset.meta | 8 + .../Module Descriptions/P Fling Holes.asset | 23 ++ .../P Fling Holes.asset.meta | 8 + .../Module Descriptions/P Hoop Fling.asset | 2 +- .../R Button Fling Hoop.asset | 15 ++ .../R Button Fling Hoop.asset.meta | 8 + .../R Dispenser with Button Fling Hoop.asset | 15 ++ ...ispenser with Button Fling Hoop.asset.meta | 8 + .../Modules/Dispenser/Dispenser Orb.prefab | 3 +- .../Modules/Holes/Fling Holes.prefab | 116 +++++++++ .../Modules/Holes/Fling Holes.prefab.meta | 7 + .../Modules/Holes/Scripts/FlingHoles.cs | 105 +++++++++ .../Modules/Holes/Scripts/FlingHoles.cs.meta | 3 + .../Station46/Modules/Holes/Scripts/Holes.cs | 11 +- .../Animations/Button Fling Hoop.controller | 211 +++++++++++++++++ .../Button Fling Hoop.controller.meta | 8 + .../Modules/Hoop/Animations/Drop Slow.anim | 135 +++++++++++ .../Hoop/Animations/Drop Slow.anim.meta | 8 + .../Modules/Hoop/Button Fling Hoop.prefab | 115 +++++++++ .../Hoop/Button Fling Hoop.prefab.meta | 7 + .../Modules/Hoop/Scripts/ButtonHoop.cs | 3 +- Assets/Station46/Station 46.asset | 1 + Assets/Test Assets/Test Theme.asset | 6 +- 27 files changed, 1042 insertions(+), 55 deletions(-) create mode 100644 Assets/Station46/Module Descriptions/M Button Fling Hoop.asset create mode 100644 Assets/Station46/Module Descriptions/M Button Fling Hoop.asset.meta create mode 100644 Assets/Station46/Module Descriptions/M Dispenser with Button Fling Hoop.asset create mode 100644 Assets/Station46/Module Descriptions/M Dispenser with Button Fling Hoop.asset.meta create mode 100644 Assets/Station46/Module Descriptions/P Fling Holes.asset create mode 100644 Assets/Station46/Module Descriptions/P Fling Holes.asset.meta create mode 100644 Assets/Station46/Module Descriptions/R Button Fling Hoop.asset create mode 100644 Assets/Station46/Module Descriptions/R Button Fling Hoop.asset.meta create mode 100644 Assets/Station46/Module Descriptions/R Dispenser with Button Fling Hoop.asset create mode 100644 Assets/Station46/Module Descriptions/R Dispenser with Button Fling Hoop.asset.meta create mode 100644 Assets/Station46/Modules/Holes/Fling Holes.prefab create mode 100644 Assets/Station46/Modules/Holes/Fling Holes.prefab.meta create mode 100644 Assets/Station46/Modules/Holes/Scripts/FlingHoles.cs create mode 100644 Assets/Station46/Modules/Holes/Scripts/FlingHoles.cs.meta create mode 100644 Assets/Station46/Modules/Hoop/Animations/Button Fling Hoop.controller create mode 100644 Assets/Station46/Modules/Hoop/Animations/Button Fling Hoop.controller.meta create mode 100644 Assets/Station46/Modules/Hoop/Animations/Drop Slow.anim create mode 100644 Assets/Station46/Modules/Hoop/Animations/Drop Slow.anim.meta create mode 100644 Assets/Station46/Modules/Hoop/Button Fling Hoop.prefab create mode 100644 Assets/Station46/Modules/Hoop/Button Fling Hoop.prefab.meta diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index 39673c9..bdce29b 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -130,7 +130,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} @@ -631,6 +631,85 @@ Transform: type: 3} m_PrefabInstance: {fileID: 742735926} m_PrefabAsset: {fileID: 0} +--- !u!1001 &241734410 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 411421604} + 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: 5 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalPosition.z + value: -5 + 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 &241734411 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + m_PrefabInstance: {fileID: 241734410} + m_PrefabAsset: {fileID: 0} --- !u!1001 &272142277 PrefabInstance: m_ObjectHideFlags: 0 @@ -1353,6 +1432,8 @@ Transform: - {fileID: 1028578884} - {fileID: 438720342} - {fileID: 1101383441} + - {fileID: 437759389} + - {fileID: 241734411} - {fileID: 1532540192886921385} - {fileID: 1949077063} - {fileID: 874637333} @@ -1363,9 +1444,92 @@ Transform: - {fileID: 681930983} - {fileID: 6067357455631746734} - {fileID: 2343402481646314946} + - {fileID: 1853180256} + - {fileID: 538618498} + - {fileID: 9336441} + - {fileID: 675198211105780961} m_Father: {fileID: 1340421038} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &437759388 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 411421604} + m_Modifications: + - target: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.0000005 + objectReference: {fileID: 0} + - target: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8094524745343793461, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + propertyPath: m_Name + value: Button Fling Hoop + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e73939d683dfbd41b3d359167a157cd, type: 3} +--- !u!4 &437759389 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4465959117638929429, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + m_PrefabInstance: {fileID: 437759388} + m_PrefabAsset: {fileID: 0} --- !u!4 &438720342 stripped Transform: m_CorrespondingSourceObject: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, @@ -1709,7 +1873,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 1478369497145927568, guid: ceec192b57a11254eae63f938fbd3eb8, type: 3} @@ -1744,17 +1908,17 @@ PrefabInstance: - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, type: 3} @@ -3065,10 +3229,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 411421604} - - {fileID: 1853180256} - - {fileID: 538618498} - - {fileID: 9336441} - - {fileID: 675198211105780961} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} @@ -3663,31 +3823,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 450372675082525797, guid: 13ff3d1ea55bdb34a94e5700498c78fb, - type: 3} - propertyPath: typeFilter.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 450372675082525797, guid: 13ff3d1ea55bdb34a94e5700498c78fb, - type: 3} - propertyPath: typeFilter.Array.data[1] - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 450372675082525797, guid: 13ff3d1ea55bdb34a94e5700498c78fb, - type: 3} - propertyPath: typeFilter.Array.data[2] - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 450372675082525797, guid: 13ff3d1ea55bdb34a94e5700498c78fb, - type: 3} - propertyPath: typeFilter.Array.data[3] - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 450372675082525797, guid: 13ff3d1ea55bdb34a94e5700498c78fb, - type: 3} - propertyPath: typeFilter.Array.data[4] - value: 5 - objectReference: {fileID: 0} - target: {fileID: 2127942511368541468, guid: 13ff3d1ea55bdb34a94e5700498c78fb, type: 3} propertyPath: m_RootOrder @@ -3926,7 +4061,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1730358900 Transform: m_ObjectHideFlags: 0 @@ -4069,7 +4204,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1851812988 Transform: m_ObjectHideFlags: 0 @@ -4093,7 +4228,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, type: 3} @@ -4762,7 +4897,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, type: 3} @@ -4792,17 +4927,17 @@ PrefabInstance: - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, type: 3} @@ -4824,8 +4959,7 @@ PrefabInstance: propertyPath: m_Name value: Timed Button Stand objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 1570236479429067028, guid: 97cc1523ce05b9544bccb2e3be7f024d, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/Station46/Module Descriptions/M Button Fling Hoop.asset b/Assets/Station46/Module Descriptions/M Button Fling Hoop.asset new file mode 100644 index 0000000..363d226 --- /dev/null +++ b/Assets/Station46/Module Descriptions/M Button Fling Hoop.asset @@ -0,0 +1,22 @@ +%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 Fling Hoop + m_EditorClassIdentifier: + types: 03000000 + modulePrefab: {fileID: 1922206575378763980, guid: 7e73939d683dfbd41b3d359167a157cd, + type: 3} + preconditionRequirements: [] + placementRequirements: + - {fileID: 11400000, guid: ed4830127e9381245a6af07e42c52422, type: 2} + - {fileID: 11400000, guid: 1f1825b71bae09c438a1cb52603347d6, type: 2} + - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} diff --git a/Assets/Station46/Module Descriptions/M Button Fling Hoop.asset.meta b/Assets/Station46/Module Descriptions/M Button Fling Hoop.asset.meta new file mode 100644 index 0000000..f0945d1 --- /dev/null +++ b/Assets/Station46/Module Descriptions/M Button Fling Hoop.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77868aece33ae7540ae48c2e59c25b59 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Module Descriptions/M Dispenser with Button Fling Hoop.asset b/Assets/Station46/Module Descriptions/M Dispenser with Button Fling Hoop.asset new file mode 100644 index 0000000..a2cf741 --- /dev/null +++ b/Assets/Station46/Module Descriptions/M Dispenser with Button Fling Hoop.asset @@ -0,0 +1,21 @@ +%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 Dispenser with Button Fling Hoop + m_EditorClassIdentifier: + types: 03000000 + modulePrefab: {fileID: 3942114796521670514, guid: 20c9cfab710bbe04ca6f81d44a01b025, + type: 3} + preconditionRequirements: + - {fileID: 11400000, guid: 8ad68706bf9b3264eaf66575d8fd92ba, type: 2} + placementRequirements: + - {fileID: 11400000, guid: be3144e12a689e84fbfe2ce50f61dcc7, type: 2} diff --git a/Assets/Station46/Module Descriptions/M Dispenser with Button Fling Hoop.asset.meta b/Assets/Station46/Module Descriptions/M Dispenser with Button Fling Hoop.asset.meta new file mode 100644 index 0000000..919d118 --- /dev/null +++ b/Assets/Station46/Module Descriptions/M Dispenser with Button Fling Hoop.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17146c5490bff964fa5bd47b1cad9ffb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Module Descriptions/P Fling Holes.asset b/Assets/Station46/Module Descriptions/P Fling Holes.asset new file mode 100644 index 0000000..6c22f84 --- /dev/null +++ b/Assets/Station46/Module Descriptions/P Fling Holes.asset @@ -0,0 +1,23 @@ +%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 Fling Holes + m_EditorClassIdentifier: + types: 02000000 + modulePrefab: {fileID: 6565267576267687895, guid: 32d96a1cb69e92046b9c7124681068c9, + type: 3} + preconditionRequirements: + - {fileID: 11400000, guid: e1ac7281b2e206b46834a6eb55274229, type: 2} + placementRequirements: + - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} + puzzleName: Fling Holes + puzzleVersion: 1 diff --git a/Assets/Station46/Module Descriptions/P Fling Holes.asset.meta b/Assets/Station46/Module Descriptions/P Fling Holes.asset.meta new file mode 100644 index 0000000..cb33234 --- /dev/null +++ b/Assets/Station46/Module Descriptions/P Fling Holes.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae16de9735d6541419214ac1699feed8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Module Descriptions/P Hoop Fling.asset b/Assets/Station46/Module Descriptions/P Hoop Fling.asset index e540677..19cd6ab 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: 7562692363137455273, guid: 7854eeba0cc4ea4419f74ce50bc9c514, + modulePrefab: {fileID: 3033697766135085348, guid: 7854eeba0cc4ea4419f74ce50bc9c514, type: 3} preconditionRequirements: - {fileID: 11400000, guid: 2393bf2b32e06f647a014688e3d8a8d9, type: 2} diff --git a/Assets/Station46/Module Descriptions/R Button Fling Hoop.asset b/Assets/Station46/Module Descriptions/R Button Fling Hoop.asset new file mode 100644 index 0000000..3ef4500 --- /dev/null +++ b/Assets/Station46/Module Descriptions/R Button Fling 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 Fling Hoop + m_EditorClassIdentifier: + relatedModule: {fileID: 11400000, guid: 77868aece33ae7540ae48c2e59c25b59, type: 2} diff --git a/Assets/Station46/Module Descriptions/R Button Fling Hoop.asset.meta b/Assets/Station46/Module Descriptions/R Button Fling Hoop.asset.meta new file mode 100644 index 0000000..3c39cdc --- /dev/null +++ b/Assets/Station46/Module Descriptions/R Button Fling Hoop.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ad68706bf9b3264eaf66575d8fd92ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Module Descriptions/R Dispenser with Button Fling Hoop.asset b/Assets/Station46/Module Descriptions/R Dispenser with Button Fling Hoop.asset new file mode 100644 index 0000000..e512ee6 --- /dev/null +++ b/Assets/Station46/Module Descriptions/R Dispenser with Button Fling 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 Dispenser with Button Fling Hoop + m_EditorClassIdentifier: + relatedModule: {fileID: 11400000, guid: 17146c5490bff964fa5bd47b1cad9ffb, type: 2} diff --git a/Assets/Station46/Module Descriptions/R Dispenser with Button Fling Hoop.asset.meta b/Assets/Station46/Module Descriptions/R Dispenser with Button Fling Hoop.asset.meta new file mode 100644 index 0000000..e7b3352 --- /dev/null +++ b/Assets/Station46/Module Descriptions/R Dispenser with Button Fling Hoop.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1ac7281b2e206b46834a6eb55274229 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab b/Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab index a033178..056c036 100644 --- a/Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab +++ b/Assets/Station46/Modules/Dispenser/Dispenser Orb.prefab @@ -247,6 +247,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 8, g: 3.5137255, b: 0, a: 1} + startActive: 0 emissionRenderer: {fileID: 5453432795644727685} --- !u!114 &6665240268073425231 MonoBehaviour: @@ -342,7 +343,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 + m_UseDynamicAttach: 1 m_MatchAttachPosition: 1 m_MatchAttachRotation: 1 m_SnapToColliderVolume: 1 diff --git a/Assets/Station46/Modules/Holes/Fling Holes.prefab b/Assets/Station46/Modules/Holes/Fling Holes.prefab new file mode 100644 index 0000000..7b4ee3e --- /dev/null +++ b/Assets/Station46/Modules/Holes/Fling Holes.prefab @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5840048728257959645 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5218681765336759419, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_Name + value: Fling Holes + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5456409340337094247, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 2736082226738519698, guid: 435cdab79ab05ef43b4a387004dc04b5, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5218681765336759419, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + insertIndex: 1 + addedObject: {fileID: 6565267576267687895} + m_SourcePrefab: {fileID: 100100000, guid: 435cdab79ab05ef43b4a387004dc04b5, type: 3} +--- !u!1 &1828600030873594534 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5218681765336759419, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + m_PrefabInstance: {fileID: 5840048728257959645} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6565267576267687895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828600030873594534} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4be019db99954e58ba0ed646e54d9221, type: 3} + m_Name: + m_EditorClassIdentifier: + size: {x: 2, y: 2} + states: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + solution: 010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000 + stateCount: 36 + correctStates: 0 + frameLight: {fileID: 4142662235197100212} +--- !u!114 &4142662235197100212 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7525994617667372649, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + m_PrefabInstance: {fileID: 5840048728257959645} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828600030873594534} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17de1e2991b64847bceea06f966f0560, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Station46/Modules/Holes/Fling Holes.prefab.meta b/Assets/Station46/Modules/Holes/Fling Holes.prefab.meta new file mode 100644 index 0000000..f95edcc --- /dev/null +++ b/Assets/Station46/Modules/Holes/Fling Holes.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 32d96a1cb69e92046b9c7124681068c9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Holes/Scripts/FlingHoles.cs b/Assets/Station46/Modules/Holes/Scripts/FlingHoles.cs new file mode 100644 index 0000000..bdd2b63 --- /dev/null +++ b/Assets/Station46/Modules/Holes/Scripts/FlingHoles.cs @@ -0,0 +1,105 @@ +using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Utilities; +using Station46.Modules.Hoop.Scripts; +using Station46.Scripts; + +namespace Station46.Modules.Holes.Scripts +{ + /// + /// The main component for the orb grid module. + /// + public class FlingHoles : Holes + { + private bool ShowHint + { + set + { + if (!Solved) + { + var on = EscapeRoomEngine.Engine.Runtime.Engine.Theme.activeColor.hdr; + var off = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor.hdr; + + for (var i = 0; i < solution.Count; i++) + { + holes[i].Emission.color = value + ? solution[i] == 1 ? on : off + : states[i] == 1 ? on : off; + } + } + } + } + + private Button _button; + + protected override void Start() + { + base.Start(); + + _button.ButtonEvent += (_, type) => + { + ShowHint = type == ButtonEventType.Pressed; + }; + + // PuzzleEvent += (_, type) => + // { + // // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault + // switch (type) + // { + // case PuzzleEventType.Restarted: + // var color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor; + // _holes.ForEach(hole => + // { + // hole.Enable(); + // hole.Emission.color = color.hdr; + // }); + // frameLight.color = color.hdr; + // _dispenser.Reset(); + // break; + // case PuzzleEventType.Solved: + // var solvedColor = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor; + // var activeColor = EscapeRoomEngine.Engine.Runtime.Engine.Theme.activeColor; + // _holes.ForEach(hole => + // { + // hole.Disable(); + // hole.Emission.color = solution[hole.number] == 1 ? activeColor.hdr : solvedColor.hdr; + // }); + // frameLight.color = solvedColor.hdr; + // _dispenser.Solve(); + // break; + // } + // }; + // + // _holes.ForEach(hole => hole.ButtonEvent += (_, type) => + // { + // // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault + // switch (type) + // { + // case ButtonEventType.Pressed: + // SetState(hole.number, 1, true); + // break; + // case ButtonEventType.Released: + // SetState(hole.number, 0, true); + // break; + // } + // }); + // + // frameLight.active = true; + } + + public override void SetModule(Module module) + { + base.SetModule(module); + + // The holes require a related button fling hoop module + var secondGradeRelatedModule = Module.relatedModules[0].relatedModules[0]; + if (secondGradeRelatedModule.State is ButtonHoop hoop) + { + _button = hoop.Button; + } + else + { + throw new EngineException("Holes were not assigned a related Dispenser."); + } + } + } +} \ No newline at end of file diff --git a/Assets/Station46/Modules/Holes/Scripts/FlingHoles.cs.meta b/Assets/Station46/Modules/Holes/Scripts/FlingHoles.cs.meta new file mode 100644 index 0000000..340dd30 --- /dev/null +++ b/Assets/Station46/Modules/Holes/Scripts/FlingHoles.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4be019db99954e58ba0ed646e54d9221 +timeCreated: 1683739039 \ No newline at end of file diff --git a/Assets/Station46/Modules/Holes/Scripts/Holes.cs b/Assets/Station46/Modules/Holes/Scripts/Holes.cs index af39e66..c4733ba 100644 --- a/Assets/Station46/Modules/Holes/Scripts/Holes.cs +++ b/Assets/Station46/Modules/Holes/Scripts/Holes.cs @@ -16,14 +16,15 @@ namespace Station46.Modules.Holes.Scripts [BoxGroup("Internal")] [SerializeField] private Emission frameLight; - private List _holes; + protected List holes; + private Dispenser.Scripts.Dispenser _dispenser; protected override void Awake() { base.Awake(); - _holes = new List(GetComponentsInChildren()); + holes = new List(GetComponentsInChildren()); } protected override void Start() @@ -37,7 +38,7 @@ namespace Station46.Modules.Holes.Scripts { case PuzzleEventType.Restarted: var color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor; - _holes.ForEach(hole => + holes.ForEach(hole => { hole.Enable(); hole.Emission.color = color.hdr; @@ -48,7 +49,7 @@ namespace Station46.Modules.Holes.Scripts case PuzzleEventType.Solved: var solvedColor = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor; var activeColor = EscapeRoomEngine.Engine.Runtime.Engine.Theme.activeColor; - _holes.ForEach(hole => + holes.ForEach(hole => { hole.Disable(); hole.Emission.color = solution[hole.number] == 1 ? activeColor.hdr : solvedColor.hdr; @@ -59,7 +60,7 @@ namespace Station46.Modules.Holes.Scripts } }; - _holes.ForEach(hole => hole.ButtonEvent += (_, type) => + holes.ForEach(hole => hole.ButtonEvent += (_, type) => { // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault switch (type) diff --git a/Assets/Station46/Modules/Hoop/Animations/Button Fling Hoop.controller b/Assets/Station46/Modules/Hoop/Animations/Button Fling Hoop.controller new file mode 100644 index 0000000..1737c2f --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Animations/Button Fling 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 Slow + 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: 537bd8e0948247f4488eed5a3f3147e4, 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 Fling Hoop + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Pressed + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + 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 Fling Hoop.controller.meta b/Assets/Station46/Modules/Hoop/Animations/Button Fling Hoop.controller.meta new file mode 100644 index 0000000..f773edc --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Animations/Button Fling Hoop.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c716458d813082d48aeaf564ff4be8dc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Hoop/Animations/Drop Slow.anim b/Assets/Station46/Modules/Hoop/Animations/Drop Slow.anim new file mode 100644 index 0000000..c9aed37 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Animations/Drop Slow.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 Slow + 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: 5 + 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: 6 + 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: 6 + 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: 5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6 + 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 Slow.anim.meta b/Assets/Station46/Modules/Hoop/Animations/Drop Slow.anim.meta new file mode 100644 index 0000000..a57f674 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Animations/Drop Slow.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 537bd8e0948247f4488eed5a3f3147e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Hoop/Button Fling Hoop.prefab b/Assets/Station46/Modules/Hoop/Button Fling Hoop.prefab new file mode 100644 index 0000000..f08b274 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Button Fling Hoop.prefab @@ -0,0 +1,115 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7264797023851028133 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1478369497145927568, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_Name + value: Button Fling Hoop + objectReference: {fileID: 0} + - target: {fileID: 2031201717437352881, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_Center.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2031201717437352881, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_Center.z + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 4434097653282366288, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: c716458d813082d48aeaf564ff4be8dc, type: 2} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6425502251292136112, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + 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: 0 + 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} + - target: {fileID: 7195928648355209623, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7195928648355209623, guid: ceec192b57a11254eae63f938fbd3eb8, + type: 3} + propertyPath: m_LocalPosition.z + value: -3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ceec192b57a11254eae63f938fbd3eb8, type: 3} diff --git a/Assets/Station46/Modules/Hoop/Button Fling Hoop.prefab.meta b/Assets/Station46/Modules/Hoop/Button Fling Hoop.prefab.meta new file mode 100644 index 0000000..b1cccb0 --- /dev/null +++ b/Assets/Station46/Modules/Hoop/Button Fling Hoop.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7e73939d683dfbd41b3d359167a157cd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs b/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs index 1a2602c..db459f0 100644 --- a/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs +++ b/Assets/Station46/Modules/Hoop/Scripts/ButtonHoop.cs @@ -1,5 +1,4 @@ -using System; -using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Modules.State; using Station46.Modules.Holes.Scripts; using Station46.Scripts; diff --git a/Assets/Station46/Station 46.asset b/Assets/Station46/Station 46.asset index 280e555..855cd79 100644 --- a/Assets/Station46/Station 46.asset +++ b/Assets/Station46/Station 46.asset @@ -40,3 +40,4 @@ MonoBehaviour: - {fileID: 11400000, guid: 1b21332d2a4da2d4d9f8a105d1e24980, type: 2} - {fileID: 11400000, guid: 6ea70b544b4cffb4ca12286c749da98d, type: 2} - {fileID: 11400000, guid: 010a967ecaf566041a0e12459806bd04, type: 2} + - {fileID: 11400000, guid: ae16de9735d6541419214ac1699feed8, type: 2} diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset index 02aa916..a619c48 100644 --- a/Assets/Test Assets/Test Theme.asset +++ b/Assets/Test Assets/Test Theme.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 28d04249c1c4438da94b524e7d4afff2, type: 3} m_Name: Test Theme m_EditorClassIdentifier: - minRoomSize: {x: 2, y: 3} - playSpace: {x: 2, y: 3} + minRoomSize: {x: 4, y: 2} + playSpace: {x: 4, y: 2} spaceTile: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} environment: {fileID: 5743657079028767629, guid: 17ecdbaca50efaa4ab503614dfec54a8, @@ -32,4 +32,4 @@ MonoBehaviour: - {fileID: 11400000, guid: 83d6800536b1df14287ff2cd8e0d58ce, type: 2} puzzleCount: {x: 1, y: 1} puzzleTypes: - - {fileID: 11400000, guid: 6ea70b544b4cffb4ca12286c749da98d, type: 2} + - {fileID: 11400000, guid: ae16de9735d6541419214ac1699feed8, type: 2}