diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index bdce29b..1bdb792 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -1443,11 +1443,12 @@ Transform: - {fileID: 604728745} - {fileID: 681930983} - {fileID: 6067357455631746734} - - {fileID: 2343402481646314946} - {fileID: 1853180256} - {fileID: 538618498} - {fileID: 9336441} - {fileID: 675198211105780961} + - {fileID: 3750376657174321754} + - {fileID: 2343402481646314946} m_Father: {fileID: 1340421038} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3215,7 +3216,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1340421038 Transform: m_ObjectHideFlags: 0 @@ -5056,6 +5057,51 @@ PrefabInstance: propertyPath: m_Name value: Dispenser Orb Group objectReference: {fileID: 0} + - target: {fileID: 3095507210209193804, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3095507210209193804, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3095507210209193804, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3095507210209193804, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3095507210209193804, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3095507210209193804, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3095507210209193804, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3095507210209193805, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_UseGravity + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3095507210209193805, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} propertyPath: m_RootOrder @@ -5064,7 +5110,7 @@ PrefabInstance: - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} propertyPath: m_LocalPosition.x - value: 2.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} @@ -5074,12 +5120,12 @@ PrefabInstance: - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} propertyPath: m_LocalPosition.z - value: 1.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} @@ -5089,7 +5135,7 @@ PrefabInstance: - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.70710677 objectReference: {fileID: 0} - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} @@ -5104,7 +5150,7 @@ PrefabInstance: - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} @@ -5122,6 +5168,103 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2343402481646314945} m_PrefabAsset: {fileID: 0} +--- !u!114 &2343402481646314947 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3095507210209193806, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + m_PrefabInstance: {fileID: 2343402481646314945} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 461335b38aec4817a787dae9c5a63f0b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &3750376657174321753 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 411421604} + m_Modifications: + - target: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6537805278405256415, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: _orb + value: + objectReference: {fileID: 2343402481646314947} + - target: {fileID: 8254297096454668303, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + propertyPath: m_Name + value: Align Steles + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8930977863103299702, guid: 688a459dfb23b3844b9f14f23236d50c, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 688a459dfb23b3844b9f14f23236d50c, type: 3} +--- !u!4 &3750376657174321754 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1377556053648530484, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + m_PrefabInstance: {fileID: 3750376657174321753} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5113659104536846699 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Station46/Module Descriptions/P Align Steles.asset b/Assets/Station46/Module Descriptions/P Align Steles.asset new file mode 100644 index 0000000..18d8b3c --- /dev/null +++ b/Assets/Station46/Module Descriptions/P Align Steles.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 Align Steles + m_EditorClassIdentifier: + types: 02000000 + modulePrefab: {fileID: 6537805278405256415, guid: 688a459dfb23b3844b9f14f23236d50c, + type: 3} + preconditionRequirements: + - {fileID: 11400000, guid: 0e5f5eca8a8276b408329e6cb7ab404d, type: 2} + placementRequirements: + - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} + puzzleName: Align Steles + puzzleVersion: 1 diff --git a/Assets/Station46/Module Descriptions/P Align Steles.asset.meta b/Assets/Station46/Module Descriptions/P Align Steles.asset.meta new file mode 100644 index 0000000..8d82e0f --- /dev/null +++ b/Assets/Station46/Module Descriptions/P Align Steles.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d56e3bfca17b264e9f04bd8242030f8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs b/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs index b053c23..fdf4632 100644 --- a/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs +++ b/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs @@ -9,6 +9,7 @@ namespace Station46.Modules.Dispenser.Scripts public Color Color { set => _emission.color = value; + get => _emission.color; } private Emission _emission; diff --git a/Assets/Station46/Modules/Steles.meta b/Assets/Station46/Modules/Steles.meta new file mode 100644 index 0000000..1725973 --- /dev/null +++ b/Assets/Station46/Modules/Steles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2677d7de3b08c91428ffe82b99bd505b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Steles/Align Steles.prefab b/Assets/Station46/Modules/Steles/Align Steles.prefab new file mode 100644 index 0000000..8d41fb1 --- /dev/null +++ b/Assets/Station46/Modules/Steles/Align Steles.prefab @@ -0,0 +1,517 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &438722653736032690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1666949579012228321} + m_Layer: 0 + m_Name: Center + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1666949579012228321 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 438722653736032690} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 4, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5438075180398223774} + - {fileID: 4556871430726547708} + - {fileID: 6232625892806627483} + m_Father: {fileID: 1377556053648530484} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &961158290873518042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5438075180398223774} + m_Layer: 0 + m_Name: Stele X Offset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5438075180398223774 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961158290873518042} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 111424190893198489} + m_Father: {fileID: 1666949579012228321} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3589403280140641946 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4556871430726547708} + m_Layer: 0 + m_Name: Stele Y Offset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4556871430726547708 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3589403280140641946} + m_LocalRotation: {x: 0, y: 0, z: 0.86602545, w: 0.49999994} + m_LocalPosition: {x: 0, y: 0, z: -0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6945883952068559587} + m_Father: {fileID: 1666949579012228321} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 120} +--- !u!1 &4426766302994341959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6232625892806627483} + m_Layer: 0 + m_Name: Stele Z Offset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6232625892806627483 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4426766302994341959} + m_LocalRotation: {x: 0, y: 0, z: -0.86602545, w: 0.49999994} + m_LocalPosition: {x: 0, y: 0, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3982728463575887781} + m_Father: {fileID: 1666949579012228321} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -120} +--- !u!1 &6942349559200739032 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3486750519070425340} + m_Layer: 0 + m_Name: Target + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3486750519070425340 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6942349559200739032} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.6, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1377556053648530484} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8254297096454668303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1377556053648530484} + - component: {fileID: 6537805278405256415} + - component: {fileID: 7994627676923678814} + m_Layer: 0 + m_Name: Align Steles + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1377556053648530484 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8254297096454668303} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3486750519070425340} + - {fileID: 1666949579012228321} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6537805278405256415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8254297096454668303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1c3022c62a3d4d92be9a4e42a558270c, type: 3} + m_Name: + m_EditorClassIdentifier: + size: {x: 1, y: 1} + states: 010000000100000001000000 + solution: 000000000000000000000000 + stateCount: 3 + correctStates: 0 + accuracy: 0.5 + sensitivity: 0.001 + movementScaling: {x: 5, y: -10, z: 2} + target: {fileID: 3486750519070425340} + steleX: {fileID: 6855642418435424590} + steleY: {fileID: 4524786553574166324} + steleZ: {fileID: 7632061696842244722} + animator: {fileID: 7994627676923678814} +--- !u!95 &7994627676923678814 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8254297096454668303} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: fbd3dd49ef650824d981f053b3485006, 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!1001 &3037207613285643011 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4556871430726547708} + m_Modifications: + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8391494527741424172, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_Name + value: Stele Y + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c9f64f0efcef6214db38caa5c975adee, type: 3} +--- !u!114 &4524786553574166324 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1507880546355657783, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + m_PrefabInstance: {fileID: 3037207613285643011} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a920c663eb740c084fc8e87fbe72cb7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &6945883952068559587 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + m_PrefabInstance: {fileID: 3037207613285643011} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5460952282280607097 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5438075180398223774} + m_Modifications: + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8391494527741424172, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_Name + value: Stele X + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c9f64f0efcef6214db38caa5c975adee, type: 3} +--- !u!4 &111424190893198489 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + m_PrefabInstance: {fileID: 5460952282280607097} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6855642418435424590 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1507880546355657783, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + m_PrefabInstance: {fileID: 5460952282280607097} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a920c663eb740c084fc8e87fbe72cb7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &9009335551633235525 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6232625892806627483} + m_Modifications: + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8391494527741424172, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_Name + value: Stele Z + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c9f64f0efcef6214db38caa5c975adee, type: 3} +--- !u!4 &3982728463575887781 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + m_PrefabInstance: {fileID: 9009335551633235525} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7632061696842244722 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1507880546355657783, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + m_PrefabInstance: {fileID: 9009335551633235525} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a920c663eb740c084fc8e87fbe72cb7, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Station46/Modules/Steles/Align Steles.prefab.meta b/Assets/Station46/Modules/Steles/Align Steles.prefab.meta new file mode 100644 index 0000000..b972258 --- /dev/null +++ b/Assets/Station46/Modules/Steles/Align Steles.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 688a459dfb23b3844b9f14f23236d50c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Steles/Animations.meta b/Assets/Station46/Modules/Steles/Animations.meta new file mode 100644 index 0000000..9359cc3 --- /dev/null +++ b/Assets/Station46/Modules/Steles/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef6e71a4c6a2b804d9e801c5cf7e4193 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Steles/Animations/Align Steles.controller b/Assets/Station46/Modules/Steles/Animations/Align Steles.controller new file mode 100644 index 0000000..796d2cb --- /dev/null +++ b/Assets/Station46/Modules/Steles/Animations/Align Steles.controller @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-6982983510367089126 +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: 194155562125716419} + m_Position: {x: 530, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4570744533644314072} + m_Position: {x: 280, y: 110, 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: -4570744533644314072} +--- !u!1102 &-4570744533644314072 +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: 6679131184966544485} + 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!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Align Steles + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Slot In + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6982983510367089126} + 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!1102 &194155562125716419 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Slot In + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 045f16cd0512f364887183263c153b46, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6679131184966544485 +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: Slot In + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 194155562125716419} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Station46/Modules/Steles/Animations/Align Steles.controller.meta b/Assets/Station46/Modules/Steles/Animations/Align Steles.controller.meta new file mode 100644 index 0000000..3de8ad0 --- /dev/null +++ b/Assets/Station46/Modules/Steles/Animations/Align Steles.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fbd3dd49ef650824d981f053b3485006 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Steles/Animations/Slot In.anim b/Assets/Station46/Modules/Steles/Animations/Slot In.anim new file mode 100644 index 0000000..9da893a --- /dev/null +++ b/Assets/Station46/Modules/Steles/Animations/Slot In.anim @@ -0,0 +1,301 @@ +%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: Slot In + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -0.5} + 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: 1 + value: {x: 0, y: 0, z: -0.5} + 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Center/Stele Y Offset + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0.5} + 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: 1 + value: {x: 0, y: 0, z: 0.5} + 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Center/Stele Z Offset + 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: 3759349908 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1855727479 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2 + 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.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -0.5 + 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: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Center/Stele Y Offset + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.5 + 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: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Center/Stele Z Offset + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Center/Stele Y Offset + classID: 4 + script: {fileID: 0} + flags: 8 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Center/Stele Y Offset + classID: 4 + script: {fileID: 0} + flags: 8 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Center/Stele Z Offset + classID: 4 + script: {fileID: 0} + flags: 8 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Center/Stele Z Offset + classID: 4 + script: {fileID: 0} + flags: 8 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Station46/Modules/Steles/Animations/Slot In.anim.meta b/Assets/Station46/Modules/Steles/Animations/Slot In.anim.meta new file mode 100644 index 0000000..6b727ec --- /dev/null +++ b/Assets/Station46/Modules/Steles/Animations/Slot In.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 045f16cd0512f364887183263c153b46 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Steles/Scripts.meta b/Assets/Station46/Modules/Steles/Scripts.meta new file mode 100644 index 0000000..c6848b4 --- /dev/null +++ b/Assets/Station46/Modules/Steles/Scripts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 48d9dec1ba5c4de3bd26d9ce12fc6e26 +timeCreated: 1683750788 \ No newline at end of file diff --git a/Assets/Station46/Modules/Steles/Scripts/AlignStele.cs b/Assets/Station46/Modules/Steles/Scripts/AlignStele.cs new file mode 100644 index 0000000..cbc2f91 --- /dev/null +++ b/Assets/Station46/Modules/Steles/Scripts/AlignStele.cs @@ -0,0 +1,20 @@ +using NaughtyAttributes; +using UnityEngine; + +namespace Station46.Modules.Steles.Scripts +{ + public class AlignStele : MonoBehaviour + { + public float speed; + + [ShowNativeProperty] public float Displacement { get; set; } + + private void Update() + { + var t = transform; + var position = t.localPosition; + var delta = position.y - Displacement; + t.localPosition = new Vector3(0, position.y - delta * speed, 0); + } + } +} \ No newline at end of file diff --git a/Assets/Station46/Modules/Steles/Scripts/AlignStele.cs.meta b/Assets/Station46/Modules/Steles/Scripts/AlignStele.cs.meta new file mode 100644 index 0000000..8cb0f50 --- /dev/null +++ b/Assets/Station46/Modules/Steles/Scripts/AlignStele.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0a920c663eb740c084fc8e87fbe72cb7 +timeCreated: 1683754591 \ No newline at end of file diff --git a/Assets/Station46/Modules/Steles/Scripts/AlignSteles.cs b/Assets/Station46/Modules/Steles/Scripts/AlignSteles.cs new file mode 100644 index 0000000..b72fffb --- /dev/null +++ b/Assets/Station46/Modules/Steles/Scripts/AlignSteles.cs @@ -0,0 +1,91 @@ +using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules.State; +using EscapeRoomEngine.Engine.Runtime.Utilities; +using NaughtyAttributes; +using Station46.Modules.Dispenser.Scripts; +using Station46.Scripts; +using UnityEngine; +using UnityEngine.XR.Interaction.Toolkit; + +namespace Station46.Modules.Steles.Scripts +{ + public class AlignSteles : StatePuzzle + { + private static readonly int SlotIn = Animator.StringToHash("Slot In"); + + public float accuracy = 0.1f; + public float sensitivity = 0.001f; + public Vector3 movementScaling = Vector3.one; + [BoxGroup("Internal")] [SerializeField] private Transform target; + [BoxGroup("Internal")] [SerializeField] private AlignStele steleX, steleY, steleZ; + [BoxGroup("Internal")] [SerializeField] private Animator animator; + + private DispenserOrb _orb; + private Vector3 _previousPosition; + + protected override void Start() + { + base.Start(); + + PuzzleEvent += (_, type) => + { + // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault + switch (type) + { + case PuzzleEventType.Restarted: + _orb.GetComponent().enabled = true; + _orb.Color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor.hdr; + break; + case PuzzleEventType.Solved: + _orb.transform.position = target.position; + steleX.Displacement = 0; + steleY.Displacement = 0; + steleZ.Displacement = 0; + _orb.Color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor.hdr; + _orb.GetComponent().enabled = false; + animator.SetTrigger(SlotIn); + break; + } + }; + } + + private void Update() + { + if (!Solved) + { + var position = _orb.transform.position - target.position; + steleX.Displacement = position.x * movementScaling.x; + steleY.Displacement = position.y * movementScaling.y; + steleZ.Displacement = position.z * movementScaling.z; + + SetState(0, Mathf.RoundToInt(steleX.Displacement / accuracy), false); + SetState(1, Mathf.RoundToInt(steleY.Displacement / accuracy), false); + SetState(2, Mathf.RoundToInt(steleZ.Displacement / accuracy), true); + + if (_orb.Color != EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor.hdr) + { + _orb.Color = (position - _previousPosition).magnitude < sensitivity + ? EscapeRoomEngine.Engine.Runtime.Engine.Theme.puzzleColor.hdr + : EscapeRoomEngine.Engine.Runtime.Engine.Theme.activeColor.hdr; + _previousPosition = position; + } + } + } + + public override void SetModule(Module module) + { + base.SetModule(module); + + // The holes require a related dispenser module + var firstRelatedModule = Module.relatedModules[0]; + if (firstRelatedModule.State is DispenserOrbGroup orbGroup) + { + _orb = orbGroup.GetComponentInChildren(); + } + else + { + throw new EngineException("Align steles was not assigned a related dispenser orb."); + } + } + } +} \ No newline at end of file diff --git a/Assets/Station46/Modules/Steles/Scripts/AlignSteles.cs.meta b/Assets/Station46/Modules/Steles/Scripts/AlignSteles.cs.meta new file mode 100644 index 0000000..735a5c3 --- /dev/null +++ b/Assets/Station46/Modules/Steles/Scripts/AlignSteles.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1c3022c62a3d4d92be9a4e42a558270c +timeCreated: 1683750812 \ No newline at end of file diff --git a/Assets/Station46/Modules/Steles/Stele.prefab b/Assets/Station46/Modules/Steles/Stele.prefab new file mode 100644 index 0000000..45ba904 --- /dev/null +++ b/Assets/Station46/Modules/Steles/Stele.prefab @@ -0,0 +1,186 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3302982186101801852 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4822827650078765387} + - component: {fileID: 7370477893254798401} + - component: {fileID: 6885447830141951681} + - component: {fileID: 894542594047277095} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4822827650078765387 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3302982186101801852} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.5, y: 2, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5815855292540061822} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7370477893254798401 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3302982186101801852} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6885447830141951681 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3302982186101801852} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 3e334d6799a0d0040a41fe4794da90f5, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &894542594047277095 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3302982186101801852} + 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: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: -0.00000011920929, y: 0, z: 0} +--- !u!1 &8391494527741424172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5351095067423715808} + - component: {fileID: 1507880546355657783} + m_Layer: 0 + m_Name: Stele + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5351095067423715808 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8391494527741424172} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5815855292540061822} + m_Father: {fileID: 0} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1507880546355657783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8391494527741424172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a920c663eb740c084fc8e87fbe72cb7, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 0.2 + Displacement: 0 +--- !u!1 &8793346168272628290 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5815855292540061822} + m_Layer: 0 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5815855292540061822 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8793346168272628290} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4822827650078765387} + m_Father: {fileID: 5351095067423715808} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Station46/Modules/Steles/Stele.prefab.meta b/Assets/Station46/Modules/Steles/Stele.prefab.meta new file mode 100644 index 0000000..331a742 --- /dev/null +++ b/Assets/Station46/Modules/Steles/Stele.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c9f64f0efcef6214db38caa5c975adee +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Station 46.asset b/Assets/Station46/Station 46.asset index 855cd79..a78e3b4 100644 --- a/Assets/Station46/Station 46.asset +++ b/Assets/Station46/Station 46.asset @@ -41,3 +41,4 @@ MonoBehaviour: - {fileID: 11400000, guid: 6ea70b544b4cffb4ca12286c749da98d, type: 2} - {fileID: 11400000, guid: 010a967ecaf566041a0e12459806bd04, type: 2} - {fileID: 11400000, guid: ae16de9735d6541419214ac1699feed8, type: 2} + - {fileID: 11400000, guid: 9d56e3bfca17b264e9f04bd8242030f8, type: 2} diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset index c3e097c..39b2607 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: 4, y: 2} - playSpace: {x: 4, y: 2} + minRoomSize: {x: 2, y: 3} + playSpace: {x: 2, y: 3} spaceTile: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} environment: {fileID: 5743657079028767629, guid: 17ecdbaca50efaa4ab503614dfec54a8, @@ -32,5 +32,4 @@ MonoBehaviour: - {fileID: 11400000, guid: 83d6800536b1df14287ff2cd8e0d58ce, type: 2} puzzleCount: {x: 1, y: 1} puzzleTypes: - - {fileID: 11400000, guid: 8707242279bb6c541a12dc4491388c42, type: 2} - - {fileID: 11400000, guid: 3f79d37154e44ca47b54bb43bbe8d9aa, type: 2} + - {fileID: 11400000, guid: 9d56e3bfca17b264e9f04bd8242030f8, type: 2}