diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index 37556e4..8aced37 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -2797,6 +2797,7 @@ Transform: - {fileID: 987689138} - {fileID: 604728745} - {fileID: 681930983} + - {fileID: 6067357455631746734} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} @@ -4410,3 +4411,82 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5113659104536846699} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6067357455631746733 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340421038} + m_Modifications: + - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_LocalPosition.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156411106459306094, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + propertyPath: m_Name + value: Laser Redirector Group + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b05b36186d7fa524aaec74a927b37b71, type: 3} +--- !u!4 &6067357455631746734 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + m_PrefabInstance: {fileID: 6067357455631746733} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Station46/Module Descriptions/M Laser Redirector Group.asset b/Assets/Station46/Module Descriptions/M Laser Redirector Group.asset new file mode 100644 index 0000000..e25467f --- /dev/null +++ b/Assets/Station46/Module Descriptions/M Laser Redirector 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 Laser Redirector Group + m_EditorClassIdentifier: + types: 03000000 + modulePrefab: {fileID: 3174493585862403805, guid: b05b36186d7fa524aaec74a927b37b71, + type: 3} + preconditionRequirements: [] + placementRequirements: + - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} diff --git a/Assets/Station46/Module Descriptions/M Laser Redirector Group.asset.meta b/Assets/Station46/Module Descriptions/M Laser Redirector Group.asset.meta new file mode 100644 index 0000000..ed094a4 --- /dev/null +++ b/Assets/Station46/Module Descriptions/M Laser Redirector Group.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01de6e35f5ed677438f669e3daf9ccff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Holes/Holes.asset b/Assets/Station46/Module Descriptions/P Holes.asset similarity index 97% rename from Assets/Station46/Modules/Holes/Holes.asset rename to Assets/Station46/Module Descriptions/P Holes.asset index 0bd7f29..7ea6fd5 100644 --- a/Assets/Station46/Modules/Holes/Holes.asset +++ b/Assets/Station46/Module Descriptions/P Holes.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: Holes + m_Name: P Holes m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 2736082226738519698, guid: 435cdab79ab05ef43b4a387004dc04b5, diff --git a/Assets/Station46/Modules/Holes/Holes.asset.meta b/Assets/Station46/Module Descriptions/P Holes.asset.meta similarity index 100% rename from Assets/Station46/Modules/Holes/Holes.asset.meta rename to Assets/Station46/Module Descriptions/P Holes.asset.meta diff --git a/Assets/Station46/Module Descriptions/P Laser Easy.asset b/Assets/Station46/Module Descriptions/P Laser Easy.asset index ff0729c..dd912d4 100644 --- a/Assets/Station46/Module Descriptions/P Laser Easy.asset +++ b/Assets/Station46/Module Descriptions/P Laser Easy.asset @@ -17,6 +17,7 @@ MonoBehaviour: type: 3} preconditionRequirements: - {fileID: 11400000, guid: 01d64225420c0294c9b91149f4a68e0a, type: 2} + - {fileID: 11400000, guid: b914a33f7171ebb4fad5a635e252b98a, type: 2} placementRequirements: - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} - {fileID: 11400000, guid: 117ebc545f75f344da8b05e2412055aa, type: 2} diff --git a/Assets/Station46/Module Descriptions/R Laser Redirector Group.asset b/Assets/Station46/Module Descriptions/R Laser Redirector Group.asset new file mode 100644 index 0000000..3307b55 --- /dev/null +++ b/Assets/Station46/Module Descriptions/R Laser Redirector 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 Laser Redirector Group + m_EditorClassIdentifier: + relatedModule: {fileID: 11400000, guid: 01de6e35f5ed677438f669e3daf9ccff, type: 2} diff --git a/Assets/Station46/Module Descriptions/R Laser Redirector Group.asset.meta b/Assets/Station46/Module Descriptions/R Laser Redirector Group.asset.meta new file mode 100644 index 0000000..a2ee0b1 --- /dev/null +++ b/Assets/Station46/Module Descriptions/R Laser Redirector Group.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b914a33f7171ebb4fad5a635e252b98a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Laser Redirector Group.prefab b/Assets/Station46/Modules/Laser/Laser Redirector Group.prefab new file mode 100644 index 0000000..ee22332 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Laser Redirector Group.prefab @@ -0,0 +1,207 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5156411106459306094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 463845462802249093} + - component: {fileID: 3174493585862403805} + m_Layer: 0 + m_Name: Laser Redirector Group + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &463845462802249093 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5156411106459306094} + 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: 4962209360291872147} + - {fileID: 8028899283464672130} + m_Father: {fileID: 0} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3174493585862403805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5156411106459306094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17682b8cd3b64531a43877f8a07ab954, type: 3} + m_Name: + m_EditorClassIdentifier: + size: {x: 1, y: 1} +--- !u!1001 &5907302957625911996 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 463845462802249093} + m_Modifications: + - target: {fileID: 251845578051121456, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_Name + value: Redirector 1 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.125 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} +--- !u!4 &4962209360291872147 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + m_PrefabInstance: {fileID: 5907302957625911996} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8812377883238745261 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 463845462802249093} + m_Modifications: + - target: {fileID: 251845578051121456, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_Name + value: Redirector 2 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.021 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.375 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.003 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5000002 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.8660253 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -120 + objectReference: {fileID: 0} + - target: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} +--- !u!4 &8028899283464672130 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1524393306245076783, guid: 62927df188f2d924abbd1345eb9d2cdf, + type: 3} + m_PrefabInstance: {fileID: 8812377883238745261} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Station46/Modules/Laser/Laser Redirector Group.prefab.meta b/Assets/Station46/Modules/Laser/Laser Redirector Group.prefab.meta new file mode 100644 index 0000000..be257b9 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Laser Redirector Group.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b05b36186d7fa524aaec74a927b37b71 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Laser Redirector.prefab b/Assets/Station46/Modules/Laser/Laser Redirector.prefab index b69eba7..10fa77d 100644 --- a/Assets/Station46/Modules/Laser/Laser Redirector.prefab +++ b/Assets/Station46/Modules/Laser/Laser Redirector.prefab @@ -10,6 +10,8 @@ GameObject: m_Component: - component: {fileID: 1524393306245076783} - component: {fileID: 897376356061303010} + - component: {fileID: 2812559121526871782} + - component: {fileID: 7742973117490303454} - component: {fileID: 5156043258505205515} - component: {fileID: 7231726315279509463} m_Layer: 0 @@ -51,6 +53,33 @@ MonoBehaviour: firing: 0 laserStart: {fileID: 8905692309860668305} laserLineRenderer: {fileID: 2519225079777001152} +--- !u!114 &2812559121526871782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251845578051121456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4c152de8a63080540ad136a98dd86dc8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7742973117490303454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251845578051121456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f534253f30947c3be8ac6e0924a9cde, type: 3} + m_Name: + m_EditorClassIdentifier: + firing: 0 + laserStart: {fileID: 8905692309860668305} + laserLineRenderer: {fileID: 2519225079777001152} --- !u!65 &5156043258505205515 BoxCollider: m_ObjectHideFlags: 0 @@ -95,7 +124,7 @@ Rigidbody: m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 1 - m_IsKinematic: 1 + m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 diff --git a/Assets/Station46/Modules/Laser/Scripts/LaserRedirector.cs b/Assets/Station46/Modules/Laser/Scripts/LaserRedirector.cs index 98d3dba..bc3ac58 100644 --- a/Assets/Station46/Modules/Laser/Scripts/LaserRedirector.cs +++ b/Assets/Station46/Modules/Laser/Scripts/LaserRedirector.cs @@ -3,14 +3,12 @@ using UnityEngine; namespace Station46.Modules.Laser.Scripts { [RequireComponent(typeof(LaserReceiver))] + [SelectionBase] public class LaserRedirector : Laser { - private LaserReceiver _receiver; - private void Awake() { - _receiver = GetComponent(); - _receiver.LaserEvent += (_, type) => firing = type == LaserEventType.Hit; + GetComponent().LaserEvent += (_, type) => firing = type == LaserEventType.Hit; } } } diff --git a/Assets/Station46/Modules/Laser/Scripts/LaserRedirectorGroup.cs b/Assets/Station46/Modules/Laser/Scripts/LaserRedirectorGroup.cs new file mode 100644 index 0000000..7c550bb --- /dev/null +++ b/Assets/Station46/Modules/Laser/Scripts/LaserRedirectorGroup.cs @@ -0,0 +1,10 @@ +using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules.State; + +namespace Station46.Modules.Laser.Scripts +{ + public class LaserRedirectorGroup : ModuleState + { + public override void SetModule(Module module) {} + } +} \ No newline at end of file diff --git a/Assets/Station46/Modules/Laser/Scripts/LaserRedirectorGroup.cs.meta b/Assets/Station46/Modules/Laser/Scripts/LaserRedirectorGroup.cs.meta new file mode 100644 index 0000000..cedd29e --- /dev/null +++ b/Assets/Station46/Modules/Laser/Scripts/LaserRedirectorGroup.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 17682b8cd3b64531a43877f8a07ab954 +timeCreated: 1683679238 \ No newline at end of file diff --git a/Assets/Station46/Station 46.asset b/Assets/Station46/Station 46.asset index 2ec1b95..dfcb1d0 100644 --- a/Assets/Station46/Station 46.asset +++ b/Assets/Station46/Station 46.asset @@ -37,3 +37,4 @@ MonoBehaviour: - {fileID: 11400000, guid: 15dcebb677f5df940839eaaa50274294, type: 2} - {fileID: 11400000, guid: 3f79d37154e44ca47b54bb43bbe8d9aa, type: 2} - {fileID: 11400000, guid: ee5a44432e80cd64689be3ff34750339, type: 2} + - {fileID: 11400000, guid: 1b21332d2a4da2d4d9f8a105d1e24980, type: 2}