Skip to content

Commit

Permalink
#602 make moonicorn ghost only appear once Merky enters the checkpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
shieldgenerator7 committed Aug 9, 2024
1 parent 7b6a88d commit 0c54f75
Show file tree
Hide file tree
Showing 7 changed files with 476 additions and 137 deletions.
111 changes: 80 additions & 31 deletions Assets/Prefabs/Characters/NPC Moonicorn Ghost.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -91,52 +92,66 @@ 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}
m_PrefabInstance: {fileID: 0}
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
Expand Down Expand Up @@ -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}
Expand All @@ -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
111 changes: 111 additions & 0 deletions Assets/Prefabs/Discoverables/SaveStone Pod.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Loading

0 comments on commit 0c54f75

Please sign in to comment.