diff --git a/Assets/Prefabs/Characters/NPC Moonicorn Ghost.prefab b/Assets/Prefabs/Characters/NPC Moonicorn Ghost.prefab index 3bb878162..eb689cf59 100644 --- a/Assets/Prefabs/Characters/NPC Moonicorn Ghost.prefab +++ b/Assets/Prefabs/Characters/NPC Moonicorn Ghost.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 8513666452482770071} - component: {fileID: 7097610638833298088} - component: {fileID: 3720343550151818144} + - component: {fileID: 2946010386384065859} m_Layer: 0 m_Name: dialogue trigger m_TagString: Untagged @@ -91,11 +92,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 157980bc11266644cb1bfab4867dfe74, type: 3} m_Name: m_EditorClassIdentifier: - title: Contact Made + title: characters: - Moonicorn variableSetAction: {fileID: 0} ---- !u!1 &8401612053240400921 +--- !u!114 &2946010386384065859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3442483250004085918} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 92613873f5656e04ebc66942baed9f63, type: 3} + m_Name: + m_EditorClassIdentifier: + objectsToActivate: + - {fileID: 7121742407864655820} + activeOnPlayerIn: 1 + activeOnPlayerOut: 0 +--- !u!1 &7121742407864655820 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -103,40 +120,38 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7723809909595253995} - - component: {fileID: 474067885164873461} - - component: {fileID: 4509635860338865313} - - component: {fileID: 6385652729089574233} + - component: {fileID: 2089007561721407328} + - component: {fileID: 4549289919061221871} + - component: {fileID: 1863305471264950700} m_Layer: 0 - m_Name: NPC Moonicorn Ghost + m_Name: Sprite m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7723809909595253995 +--- !u!4 &2089007561721407328 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8401612053240400921} + m_GameObject: {fileID: 7121742407864655820} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0.1636393, w: 0.9865203} - m_LocalPosition: {x: 94.374016, y: 276.64572, z: 0} + m_LocalRotation: {x: -0, y: -0, z: 0.1636393, w: 0.9865203} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8513666452482770071} - m_Father: {fileID: 0} + m_Children: [] + m_Father: {fileID: 7723809909595253995} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &474067885164873461 +--- !u!212 &4549289919061221871 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8401612053240400921} + m_GameObject: {fileID: 7121742407864655820} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -185,27 +200,14 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &4509635860338865313 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8401612053240400921} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fb914b3be499852479ef4a65144ad56c, type: 3} - m_Name: - m_EditorClassIdentifier: - characterName: Moonicorn ---- !u!95 &6385652729089574233 +--- !u!95 &1863305471264950700 Animator: serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8401612053240400921} + m_GameObject: {fileID: 7121742407864655820} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: c086c77680f2aae4f9ab41e4dc070e1c, type: 2} @@ -220,3 +222,50 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &8401612053240400921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7723809909595253995} + - component: {fileID: 9013634556069957398} + m_Layer: 0 + m_Name: NPC Moonicorn Ghost + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7723809909595253995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8401612053240400921} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0.1636393, w: 0.9865203} + m_LocalPosition: {x: 94.374016, y: 276.64572, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8513666452482770071} + - {fileID: 2089007561721407328} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9013634556069957398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8401612053240400921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb914b3be499852479ef4a65144ad56c, type: 3} + m_Name: + m_EditorClassIdentifier: + characterName: Moonicorn diff --git a/Assets/Prefabs/Discoverables/SaveStone Pod.prefab b/Assets/Prefabs/Discoverables/SaveStone Pod.prefab index 2cee102dd..44dd3b646 100644 --- a/Assets/Prefabs/Discoverables/SaveStone Pod.prefab +++ b/Assets/Prefabs/Discoverables/SaveStone Pod.prefab @@ -4945,6 +4945,7 @@ Transform: m_Children: - {fileID: 6794295307566556669} - {fileID: 1813859630529469282} + - {fileID: 1359842569472893112} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &2287131174219348760 @@ -6281,3 +6282,113 @@ Transform: m_CorrespondingSourceObject: {fileID: 7649741771931850978, guid: 0479d5c0ccb20a64c95bd065949bb590, type: 3} m_PrefabInstance: {fileID: 8249675797213192171} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8786344391371639891 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4188424702584116} + m_Modifications: + - target: {fileID: 2089007561721407328, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalPosition.x + value: -0.83 + objectReference: {fileID: 0} + - target: {fileID: 2089007561721407328, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalPosition.y + value: 1.28 + objectReference: {fileID: 0} + - target: {fileID: 7097610638833298088, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_Size.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7097610638833298088, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_Size.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7097610638833298088, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_Offset.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7097610638833298088, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_Offset.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8401612053240400921, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_Name + value: NPC Moonicorn Ghost + objectReference: {fileID: 0} + - target: {fileID: 8513666452482770071, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8513666452482770071, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8513666452482770071, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8513666452482770071, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8513666452482770071, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8513666452482770071, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} +--- !u!4 &1359842569472893112 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} + m_PrefabInstance: {fileID: 8786344391371639891} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Dialogue/stonicorn_dialogue.json b/Assets/Resources/Dialogue/stonicorn_dialogue.json index 5224075e4..b301db229 100644 --- a/Assets/Resources/Dialogue/stonicorn_dialogue.json +++ b/Assets/Resources/Dialogue/stonicorn_dialogue.json @@ -4,7 +4,7 @@ "title": "Test", "conditions": [ { - "variableName": "introvar", + "variableName": "mooncomm", "testType": 0, "testValue": 0 } @@ -73,7 +73,7 @@ ], "actions": [ { - "variableName": "introvar", + "variableName": "mooncomm", "actionType": 1, "actionValue": 1 } @@ -81,34 +81,150 @@ }, { "title": "Contact Made", - "conditions": [], + "conditions": [ + { + "variableName": "mooncomm", + "testType": 0, + "testValue": 0 + } + ], "quotes": [ { "characterName": "Moonicorn", - "text": "Merky! Are you there? Can you hear me?", + "text": "Moon to Merky...", "imageFileName": "", "voiceLineFileName": "" }, { "characterName": "Moonicorn", - "text": "Merky, is that you?", + "text": "...", "imageFileName": "", "voiceLineFileName": "" }, { "characterName": "Moonicorn", - "text": "It is! Oh thank the Alicorn! I was so worried about you.", + "text": "Moon to Merky...", "imageFileName": "", "voiceLineFileName": "" }, { "characterName": "Moonicorn", - "text": "Quick! There's no time. You need to get up to the moon right away!", + "text": "...", "imageFileName": "", "voiceLineFileName": "" } ], - "actions": [] + "actions": [ + { + "variableName": "mooncomm", + "actionType": 1, + "actionValue": 1 + } + ] + }, + { + "title": "Contact Made", + "conditions": [ + { + "variableName": "mooncomm", + "testType": 0, + "testValue": 1 + } + ], + "quotes": [ + { + "characterName": "Moonicorn", + "text": "Moon to Merky...", + "imageFileName": "", + "voiceLineFileName": "" + }, + { + "characterName": "Moonicorn", + "text": "...", + "imageFileName": "", + "voiceLineFileName": "" + }, + { + "characterName": "Moonicorn", + "text": "Come in Merky...", + "imageFileName": "", + "voiceLineFileName": "" + } + ], + "actions": [ + { + "variableName": "mooncomm", + "actionType": 1, + "actionValue": 1 + } + ] + }, + { + "title": "Contact Made", + "conditions": [ + { + "variableName": "mooncomm", + "testType": 0, + "testValue": 2 + } + ], + "quotes": [ + { + "characterName": "Moonicorn", + "text": "Merky!", + "imageFileName": "", + "voiceLineFileName": "" + }, + { + "characterName": "Moonicorn", + "text": "Is that you?", + "imageFileName": "", + "voiceLineFileName": "" + } + ], + "actions": [ + { + "variableName": "mooncomm", + "actionType": 1, + "actionValue": 1 + } + ] + }, + { + "title": "Contact Made", + "conditions": [ + { + "variableName": "mooncomm", + "testType": 0, + "testValue": 3 + } + ], + "quotes": [ + { + "characterName": "Moonicorn", + "text": "Merky! It's you!", + "imageFileName": "", + "voiceLineFileName": "" + }, + { + "characterName": "Moonicorn", + "text": "Quick! There's no time to lose. You need to come to the moon ASAP!", + "imageFileName": "", + "voiceLineFileName": "" + } + ], + "actions": [ + { + "variableName": "mooncomm", + "actionType": 1, + "actionValue": 1 + }, + { + "variableName": "moonquest", + "actionType": 1, + "actionValue": 1 + } + ] }, { "title": "Moon Welcome", @@ -125,6 +241,80 @@ "text": "Now, let's get out of here!", "imageFileName": "", "voiceLineFileName": "" + }, + { + "characterName": "Moonicorn", + "text": "(this is the end of the game)", + "imageFileName": "", + "voiceLineFileName": "" + }, + { + "characterName": "Moonicorn", + "text": "(ENDING 1: ESCAPE)", + "imageFileName": "", + "voiceLineFileName": "" + } + ], + "actions": [] + }, + { + "title": "Dialogue Title", + "conditions": [ + { + "variableName": "moonquest", + "testType": 0, + "testValue": 1 + } + ], + "quotes": [ + { + "characterName": "Moonicorn", + "text": "Oh hay! I forgot to tell you how to get to the moon.", + "imageFileName": "", + "voiceLineFileName": "" + }, + { + "characterName": "Moonicorn", + "text": "There's a shuttle pod in the desert that should still be operational.", + "imageFileName": "", + "voiceLineFileName": "" + }, + { + "characterName": "Moonicorn", + "text": "There's also the railgun transport system, but that hasn't been used in a while. I'm not sure it's still operational.", + "imageFileName": "", + "voiceLineFileName": "" + }, + { + "characterName": "Moonicorn", + "text": "Or if you can somehow fly, I don't care. Just get here quick.", + "imageFileName": "", + "voiceLineFileName": "" + } + ], + "actions": [ + { + "variableName": "moonquest", + "actionType": 1, + "actionValue": 1 + } + ] + }, + { + "title": "Dialogue Title", + "conditions": [], + "quotes": [ + { + "characterName": "Moonicorn", + "text": "Here it is.", + "imageFileName": "", + "voiceLineFileName": "" + }, + { + "characterName": "Moonicorn", + "text": "You remember how to pilot these, right Merky?", + "imageFileName": "", + "voiceLineFileName": "" } ], "actions": [] diff --git a/Assets/Scenes/Levels/Forest.unity b/Assets/Scenes/Levels/Forest.unity index 6b162dd7d..4f7e86780 100644 --- a/Assets/Scenes/Levels/Forest.unity +++ b/Assets/Scenes/Levels/Forest.unity @@ -106319,11 +106319,6 @@ Transform: m_Children: [] m_Father: {fileID: 1750306369} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1996060516 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - m_PrefabInstance: {fileID: 1530396076340953372} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1996272623 PrefabInstance: m_ObjectHideFlags: 0 @@ -109010,38 +109005,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65ceefcc30cb13142abcfa50f2853724, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2106814174 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2106814175} - m_Layer: 0 - m_Name: NPCs - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2106814175 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2106814174} - serializedVersion: 2 - 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: 1996060516} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2107521725 PrefabInstance: m_ObjectHideFlags: 0 @@ -110581,63 +110544,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2424185159515904961, guid: 37271da4ebc9f0343a4cf84c82e4dc9e, type: 3} m_PrefabInstance: {fileID: 7901298202511590193} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1530396076340953372 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 2106814175} - m_Modifications: - - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - propertyPath: m_LocalPosition.x - value: 94.374016 - objectReference: {fileID: 0} - - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - propertyPath: m_LocalPosition.y - value: 276.64572 - objectReference: {fileID: 0} - - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9865203 - objectReference: {fileID: 0} - - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - propertyPath: m_LocalRotation.z - value: -0.1636393 - objectReference: {fileID: 0} - - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7723809909595253995, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8401612053240400921, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} - propertyPath: m_Name - value: moonicorn - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4c53f70319e855749b9c22579f3a8550, type: 3} --- !u!1001 &1674891644191891018 PrefabInstance: m_ObjectHideFlags: 0 @@ -110996,4 +110902,3 @@ SceneRoots: - {fileID: 1939390844} - {fileID: 1121648327} - {fileID: 1627823761} - - {fileID: 2106814175} diff --git a/Assets/Scenes/PlayerScene.unity b/Assets/Scenes/PlayerScene.unity index f3626288e..7a3a79834 100644 --- a/Assets/Scenes/PlayerScene.unity +++ b/Assets/Scenes/PlayerScene.unity @@ -186,6 +186,10 @@ PrefabInstance: propertyPath: 'telepads.Array.data[5]' value: objectReference: {fileID: 0} + - target: {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1488479641167960267, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} propertyPath: ghostSprite value: @@ -540,6 +544,10 @@ PrefabInstance: propertyPath: 'telepads.Array.data[5]' value: objectReference: {fileID: 0} + - target: {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1488479641167960267, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} propertyPath: ghostSprite value: @@ -6080,6 +6088,10 @@ PrefabInstance: propertyPath: 'telepads.Array.data[6]' value: objectReference: {fileID: 0} + - target: {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1488479641167960267, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} propertyPath: ghostSprite value: @@ -6117,7 +6129,8 @@ PrefabInstance: value: 1013 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} @@ -6202,6 +6215,10 @@ PrefabInstance: propertyPath: 'telepads.Array.data[6]' value: objectReference: {fileID: 0} + - target: {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1488479641167960267, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} propertyPath: ghostSprite value: @@ -6314,6 +6331,10 @@ PrefabInstance: propertyPath: 'telepads.Array.data[6]' value: objectReference: {fileID: 0} + - target: {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1488479641167960267, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} propertyPath: ghostSprite value: @@ -6538,6 +6559,10 @@ PrefabInstance: propertyPath: 'telepads.Array.data[6]' value: objectReference: {fileID: 0} + - target: {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1488479641167960267, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} propertyPath: ghostSprite value: @@ -6879,7 +6904,8 @@ PrefabInstance: value: 1014 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} @@ -7340,6 +7366,10 @@ PrefabInstance: propertyPath: 'telepads.Array.data[6]' value: objectReference: {fileID: 0} + - target: {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1488479641167960267, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} propertyPath: ghostSprite value: @@ -8967,6 +8997,10 @@ PrefabInstance: propertyPath: 'telepads.Array.data[5]' value: objectReference: {fileID: 0} + - target: {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1488479641167960267, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} propertyPath: ghostSprite value: @@ -9292,7 +9326,8 @@ PrefabInstance: value: 1015 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} @@ -9385,6 +9420,10 @@ PrefabInstance: propertyPath: 'telepads.Array.data[6]' value: objectReference: {fileID: 0} + - target: {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1488479641167960267, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} propertyPath: ghostSprite value: @@ -9627,6 +9666,10 @@ PrefabInstance: propertyPath: 'telepads.Array.data[6]' value: objectReference: {fileID: 0} + - target: {fileID: 970481782585229386, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1488479641167960267, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} propertyPath: ghostSprite value: diff --git a/Assets/Scripts/OnTriggerActivate.cs b/Assets/Scripts/OnTriggerActivate.cs new file mode 100644 index 000000000..e04b96efb --- /dev/null +++ b/Assets/Scripts/OnTriggerActivate.cs @@ -0,0 +1,39 @@ +using System.Collections.Generic; +using UnityEngine; + +public class OnTriggerActivate : MonoBehaviour +{ + + public List objectsToActivate; + public bool activeOnPlayerIn = true; + public bool activeOnPlayerOut = false; + + private void Start() + { + bool playerInTrigger = GetComponent() + .OverlapsCollider(Managers.Player.GetComponent());//dirty: assumes player is using PolygonCollider2D + //activate objects + activateObjects((playerInTrigger) ? activeOnPlayerIn : activeOnPlayerOut); + } + + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.isPlayerSolid()) + { + activateObjects(activeOnPlayerIn); + } + } + + private void OnTriggerExit2D(Collider2D collision) + { + if (collision.isPlayerSolid()) + { + activateObjects(activeOnPlayerOut); + } + } + + void activateObjects(bool active) + { + objectsToActivate.ForEach(go => go.SetActive(active)); + } +} diff --git a/Assets/Scripts/OnTriggerActivate.cs.meta b/Assets/Scripts/OnTriggerActivate.cs.meta new file mode 100644 index 000000000..23816e114 --- /dev/null +++ b/Assets/Scripts/OnTriggerActivate.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 92613873f5656e04ebc66942baed9f63 \ No newline at end of file