diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index 7babff1..0a78ccf 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -2885,7 +2885,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 @@ -2906,6 +2906,7 @@ Transform: - {fileID: 604728745} - {fileID: 681930983} - {fileID: 6067357455631746734} + - {fileID: 2343402481646314946} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} @@ -3847,7 +3848,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 @@ -4555,6 +4556,85 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1532540192886921384} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2343402481646314945 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 1227162583285562723, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_Name + value: Dispenser Orb Group + objectReference: {fileID: 0} + - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 74d86449193b6ab45ae889a9a72472d6, type: 3} +--- !u!4 &2343402481646314946 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4021601992598294505, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + m_PrefabInstance: {fileID: 2343402481646314945} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5113659104536846699 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Station46/Module Descriptions/M Dispenser Orb Group.asset b/Assets/Station46/Module Descriptions/M Dispenser Orb Group.asset new file mode 100644 index 0000000..cfd9e2b --- /dev/null +++ b/Assets/Station46/Module Descriptions/M Dispenser Orb Group.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: abf4a405f6c64073995bded39977563e, type: 3} + m_Name: M Dispenser Orb Group + m_EditorClassIdentifier: + types: 03000000 + modulePrefab: {fileID: 1627856688696095672, guid: 74d86449193b6ab45ae889a9a72472d6, + type: 3} + preconditionRequirements: [] + placementRequirements: + - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} diff --git a/Assets/Station46/Module Descriptions/M Dispenser Orb Group.asset.meta b/Assets/Station46/Module Descriptions/M Dispenser Orb Group.asset.meta new file mode 100644 index 0000000..47514cb --- /dev/null +++ b/Assets/Station46/Module Descriptions/M Dispenser Orb Group.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a55a3d5e6e71b794f996df0e6ae74544 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Module Descriptions/P Laser Easy.asset b/Assets/Station46/Module Descriptions/P Laser Easy.asset index 3afbdde..4a27843 100644 --- a/Assets/Station46/Module Descriptions/P Laser Easy.asset +++ b/Assets/Station46/Module Descriptions/P Laser Easy.asset @@ -18,6 +18,7 @@ MonoBehaviour: preconditionRequirements: - {fileID: 11400000, guid: f2ccf07dcda14b04f979338a242565c1, type: 2} - {fileID: 11400000, guid: b914a33f7171ebb4fad5a635e252b98a, type: 2} + - {fileID: 11400000, guid: 0e5f5eca8a8276b408329e6cb7ab404d, type: 2} placementRequirements: - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} - {fileID: 11400000, guid: 117ebc545f75f344da8b05e2412055aa, type: 2} diff --git a/Assets/Station46/Module Descriptions/R Dispenser Orb Group.asset b/Assets/Station46/Module Descriptions/R Dispenser Orb Group.asset new file mode 100644 index 0000000..9e60217 --- /dev/null +++ b/Assets/Station46/Module Descriptions/R Dispenser Orb Group.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 Orb Group + m_EditorClassIdentifier: + relatedModule: {fileID: 11400000, guid: a55a3d5e6e71b794f996df0e6ae74544, type: 2} diff --git a/Assets/Station46/Module Descriptions/R Dispenser Orb Group.asset.meta b/Assets/Station46/Module Descriptions/R Dispenser Orb Group.asset.meta new file mode 100644 index 0000000..4d75bf9 --- /dev/null +++ b/Assets/Station46/Module Descriptions/R Dispenser Orb Group.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e5f5eca8a8276b408329e6cb7ab404d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Dispenser/Dispenser Orb Group.prefab b/Assets/Station46/Modules/Dispenser/Dispenser Orb Group.prefab new file mode 100644 index 0000000..140a524 --- /dev/null +++ b/Assets/Station46/Modules/Dispenser/Dispenser Orb Group.prefab @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1227162583285562723 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4021601992598294505} + - component: {fileID: 1627856688696095672} + m_Layer: 0 + m_Name: Dispenser Orb Group + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4021601992598294505 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1227162583285562723} + 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: 3095507210209193804} + m_Father: {fileID: 0} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1627856688696095672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1227162583285562723} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 78710552a03d4c07ac3b37d4e20a5f5f, type: 3} + m_Name: + m_EditorClassIdentifier: + size: {x: 1, y: 1} +--- !u!1001 &6642966773659066481 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4021601992598294505} + m_Modifications: + - target: {fileID: 8558524283348193081, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_Name + value: Respawning Dispenser Orb + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.089 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.072 + objectReference: {fileID: 0} + - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.99402434 + 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.10915863 + 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: 12.534 + 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 &3095507210209193804 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, + type: 3} + m_PrefabInstance: {fileID: 6642966773659066481} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Station46/Modules/Dispenser/Dispenser Orb Group.prefab.meta b/Assets/Station46/Modules/Dispenser/Dispenser Orb Group.prefab.meta new file mode 100644 index 0000000..6886877 --- /dev/null +++ b/Assets/Station46/Modules/Dispenser/Dispenser Orb Group.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 74d86449193b6ab45ae889a9a72472d6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrbGroup.cs b/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrbGroup.cs new file mode 100644 index 0000000..d007201 --- /dev/null +++ b/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrbGroup.cs @@ -0,0 +1,10 @@ +using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules.State; + +namespace Station46.Modules.Dispenser.Scripts +{ + public class DispenserOrbGroup : ModuleState + { + public override void SetModule(Module module) {} + } +} \ No newline at end of file diff --git a/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrbGroup.cs.meta b/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrbGroup.cs.meta new file mode 100644 index 0000000..caeab8a --- /dev/null +++ b/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrbGroup.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 78710552a03d4c07ac3b37d4e20a5f5f +timeCreated: 1683722171 \ No newline at end of file diff --git a/Assets/Station46/Modules/Laser/Laser Platform Sink.prefab b/Assets/Station46/Modules/Laser/Laser Platform Sink.prefab index 706eb16..ea030ca 100644 --- a/Assets/Station46/Modules/Laser/Laser Platform Sink.prefab +++ b/Assets/Station46/Modules/Laser/Laser Platform Sink.prefab @@ -73,6 +73,11 @@ PrefabInstance: propertyPath: m_Name value: Laser Platform Sink objectReference: {fileID: 0} + - target: {fileID: 8806812405325907620, guid: 7a8b76a212391334ea8e3937df152874, + type: 3} + propertyPath: m_Center.z + value: -10.25 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Station46/Modules/Laser/Laser Sink.prefab b/Assets/Station46/Modules/Laser/Laser Sink.prefab index 6438bac..4fdf375 100644 --- a/Assets/Station46/Modules/Laser/Laser Sink.prefab +++ b/Assets/Station46/Modules/Laser/Laser Sink.prefab @@ -180,7 +180,7 @@ Transform: m_Children: - {fileID: 4721832177169651751} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3450952798919546212 MonoBehaviour: @@ -231,4 +231,4 @@ BoxCollider: m_Enabled: 1 serializedVersion: 3 m_Size: {x: 0.125, y: 0.25, z: 0.125} - m_Center: {x: 0, y: 0.125, z: -10.25} + m_Center: {x: 0, y: 0.125, z: -0.25}