diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index 53e9f5b..37556e4 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -1791,7 +1791,7 @@ PrefabInstance: - target: {fileID: 7329942003389928718, guid: 7a8b76a212391334ea8e3937df152874, type: 3} propertyPath: m_Name - value: Laser Receiver + value: Laser Sink objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -2435,6 +2435,11 @@ PrefabInstance: propertyPath: m_Name value: Position Ball objectReference: {fileID: 0} + - target: {fileID: 246239776342662160, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 3713fe00d6eacd244bbc5fc0fcf38f3f, type: 3} propertyPath: m_RootOrder @@ -3340,7 +3345,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: loggingEnabled: 1 - typeFilter: 00000000 + typeFilter: 000000000600000007000000 --- !u!114 &1568048337 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3454,6 +3459,11 @@ PrefabInstance: propertyPath: m_Name value: Symbol Ball objectReference: {fileID: 0} + - target: {fileID: 246239776342662160, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3088195706844166124, guid: 1a598c6c6e5edf74a95d1c18bfbdd857, type: 3} propertyPath: m_RootOrder @@ -4171,11 +4181,6 @@ PrefabInstance: propertyPath: m_Name value: Dispenser Orb objectReference: {fileID: 0} - - target: {fileID: 6665240268073425228, guid: 39c7a496fd0efad4cbb5e6fe1a171309, - type: 3} - propertyPath: m_UseGravity - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6665240268073425229, guid: 39c7a496fd0efad4cbb5e6fe1a171309, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Station46/Module Descriptions/M Laser Button Emitter.asset b/Assets/Station46/Module Descriptions/M Laser Button Emitter.asset index 69266f7..10bebb6 100644 --- a/Assets/Station46/Module Descriptions/M Laser Button Emitter.asset +++ b/Assets/Station46/Module Descriptions/M Laser Button Emitter.asset @@ -18,3 +18,4 @@ MonoBehaviour: preconditionRequirements: [] placementRequirements: - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} + - {fileID: 11400000, guid: c6502f93b5b8c3e499404092d3610b3b, type: 2} diff --git a/Assets/Station46/Module Descriptions/M Laser Emitter.asset b/Assets/Station46/Module Descriptions/M Laser Emitter.asset index 5760ad0..7871cda 100644 --- a/Assets/Station46/Module Descriptions/M Laser Emitter.asset +++ b/Assets/Station46/Module Descriptions/M Laser Emitter.asset @@ -18,3 +18,4 @@ MonoBehaviour: preconditionRequirements: [] placementRequirements: - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} + - {fileID: 11400000, guid: c6502f93b5b8c3e499404092d3610b3b, type: 2} diff --git a/Assets/Station46/Module Descriptions/P Laser Easy.asset b/Assets/Station46/Module Descriptions/P Laser Easy.asset new file mode 100644 index 0000000..ff0729c --- /dev/null +++ b/Assets/Station46/Module Descriptions/P Laser Easy.asset @@ -0,0 +1,24 @@ +%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 Laser Easy + m_EditorClassIdentifier: + types: 02000000 + modulePrefab: {fileID: 5594866580388423996, guid: 7a8b76a212391334ea8e3937df152874, + type: 3} + preconditionRequirements: + - {fileID: 11400000, guid: 01d64225420c0294c9b91149f4a68e0a, type: 2} + placementRequirements: + - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} + - {fileID: 11400000, guid: 117ebc545f75f344da8b05e2412055aa, type: 2} + puzzleName: Laser Easy + puzzleVersion: 1 diff --git a/Assets/Station46/Module Descriptions/P Laser Easy.asset.meta b/Assets/Station46/Module Descriptions/P Laser Easy.asset.meta new file mode 100644 index 0000000..9adb356 --- /dev/null +++ b/Assets/Station46/Module Descriptions/P Laser Easy.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b21332d2a4da2d4d9f8a105d1e24980 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Laser Receiver.prefab b/Assets/Station46/Modules/Laser/Laser Sink.prefab similarity index 86% rename from Assets/Station46/Modules/Laser/Laser Receiver.prefab rename to Assets/Station46/Modules/Laser/Laser Sink.prefab index b88cea0..661290b 100644 --- a/Assets/Station46/Modules/Laser/Laser Receiver.prefab +++ b/Assets/Station46/Modules/Laser/Laser Sink.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 4670783296661506346} - component: {fileID: 6468653525613329624} - component: {fileID: 4501746835798391577} - - component: {fileID: 3136224479957931608} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -84,27 +83,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &3136224479957931608 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1568127473552123573} - 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, y: 0, z: 0} --- !u!1 &7020297526286184566 GameObject: m_ObjectHideFlags: 0 @@ -147,8 +125,10 @@ GameObject: m_Component: - component: {fileID: 2835502344937141734} - component: {fileID: 3450952798919546212} + - component: {fileID: 5594866580388423996} + - component: {fileID: 8806812405325907620} m_Layer: 0 - m_Name: Laser Receiver + m_Name: Laser Sink m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -168,7 +148,7 @@ Transform: m_Children: - {fileID: 2161470782926054222} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3450952798919546212 MonoBehaviour: @@ -182,3 +162,41 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4c152de8a63080540ad136a98dd86dc8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5594866580388423996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7329942003389928718} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c79e4aaf4964939bf62ead988ce66fa, type: 3} + m_Name: + m_EditorClassIdentifier: + size: {x: 1, y: 1} + states: 00000000 + solution: 01000000 + stateCount: 1 + correctStates: 0 +--- !u!65 &8806812405325907620 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7329942003389928718} + 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: 0.125, y: 0.25, z: 0.125} + m_Center: {x: 0, y: 0.125, z: 0} diff --git a/Assets/Station46/Modules/Laser/Laser Receiver.prefab.meta b/Assets/Station46/Modules/Laser/Laser Sink.prefab.meta similarity index 100% rename from Assets/Station46/Modules/Laser/Laser Receiver.prefab.meta rename to Assets/Station46/Modules/Laser/Laser Sink.prefab.meta diff --git a/Assets/Station46/Modules/Laser/Scripts/LaserPuzzleSink.cs b/Assets/Station46/Modules/Laser/Scripts/LaserPuzzleSink.cs new file mode 100644 index 0000000..2638e10 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Scripts/LaserPuzzleSink.cs @@ -0,0 +1,22 @@ +using Station46.Scripts; +using UnityEngine; + +namespace Station46.Modules.Laser.Scripts +{ + [RequireComponent(typeof(LaserReceiver))] + public class LaserPuzzleSink : StatePuzzle + { + protected override void Start() + { + base.Start(); + + GetComponent().LaserEvent += (_, type) => + { + if (type == LaserEventType.Hit) + { + SetState(0, 1, true); + } + }; + } + } +} \ No newline at end of file diff --git a/Assets/Station46/Modules/Laser/Scripts/LaserPuzzleSink.cs.meta b/Assets/Station46/Modules/Laser/Scripts/LaserPuzzleSink.cs.meta new file mode 100644 index 0000000..24d1364 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Scripts/LaserPuzzleSink.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7c79e4aaf4964939bf62ead988ce66fa +timeCreated: 1683677446 \ No newline at end of file