Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -2}
m_SizeDelta: {x: 500, y: 40}
m_SizeDelta: {x: 480, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8085800207596840679
CanvasRenderer:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dialogueUIPrefab: {fileID: 4093843948648021414, guid: 25357f13f39a025438a8bcba440e103b, type: 3}
infoPannelPrefab: {fileID: 6645276890318459487, guid: 51b4f4206bcc56c49a44f5ce7b98b561, type: 3}
choiceParentPrefab: {fileID: 4045703632978157169, guid: 2ff43316bce107744b16a302560809d6, type: 3}
eventSystem: {fileID: 2043946777}
--- !u!4 &14891216
Expand Down Expand Up @@ -1731,10 +1732,46 @@ PrefabInstance:
propertyPath: m_Name
value: chestObject
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: isEndpointEvent
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: endpointDialogue
value: used the key. Found a letter
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 6661306661222431264}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ChoosePathString
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: DialogueDisplay, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
value: 1letter
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 7395938312844855585, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: m_Constraints
value: 126
Expand Down Expand Up @@ -1858,6 +1895,9 @@ MonoBehaviour:
goingInside: 0
positionToLoad: {x: 0, y: 0, z: 0}
locked: 0
lockedEvent:
m_PersistentCalls:
m_Calls: []
--- !u!65 &1182978863
BoxCollider:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3392,6 +3432,10 @@ PrefabInstance:
propertyPath: inkScript
value:
objectReference: {fileID: 4900000, guid: f1663b04fbd74a64bb7738cfba602f9f, type: 3}
- target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
propertyPath: choicePrefab
value:
objectReference: {fileID: 3856283038282802624, guid: 677ba264c0e591f46822e829268723f2, type: 3}
- target: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
propertyPath: speakerSprite
value:
Expand All @@ -3405,6 +3449,17 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
--- !u!114 &6661306661222431264 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 9016890536702456913, guid: 6790864b4f1ae054ca9f45a664bb8d02, type: 3}
m_PrefabInstance: {fileID: 6661306661222431263}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 662c9669254b92140b6ffec2e5ec6198, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ MonoBehaviour:
inkScript: {fileID: 4900000, guid: 9fb30a71747196c4fb4a3a7328e1fda5, type: 3}
lines: []
gameManager: {fileID: 0}
alreadySeen: 0
alreadySeen: -1
playerScript: {fileID: 0}
infoPanel: {fileID: 0}
--- !u!114 &64336018 stripped
Expand Down Expand Up @@ -983,14 +983,14 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 64336015}
m_TargetAssemblyTypeName: DialogueDisplay, Assembly-CSharp
m_MethodName: ChooseChoiceIndex
m_Mode: 3
m_MethodName: ChoosePathString
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument: keys
m_BoolArgument: 0
m_CallState: 2
isEndpointEvent: 0
Expand Down Expand Up @@ -2710,14 +2710,14 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 64336015}
m_TargetAssemblyTypeName: DialogueDisplay, Assembly-CSharp
m_MethodName: ChooseChoiceIndex
m_Mode: 3
m_MethodName: ChoosePathString
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument: remember
m_BoolArgument: 0
m_CallState: 2
--- !u!4 &973223645
Expand Down Expand Up @@ -4543,7 +4543,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7685249071450483770, guid: d2681751ed0e59c489d4ddc7c647ab44, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 3
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7685249071450483770, guid: d2681751ed0e59c489d4ddc7c647ab44, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_Target
Expand All @@ -4555,12 +4555,16 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7685249071450483770, guid: d2681751ed0e59c489d4ddc7c647ab44, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ChooseChoiceIndex
value: ChoosePathString
objectReference: {fileID: 0}
- target: {fileID: 7685249071450483770, guid: d2681751ed0e59c489d4ddc7c647ab44, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: DialogueDisplay, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 7685249071450483770, guid: d2681751ed0e59c489d4ddc7c647ab44, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
value: storage_door
objectReference: {fileID: 0}
- target: {fileID: 7685249071450483770, guid: d2681751ed0e59c489d4ddc7c647ab44, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
Expand Down Expand Up @@ -7398,10 +7402,22 @@ PrefabInstance:
propertyPath: m_Name
value: Door1
objectReference: {fileID: 0}
- target: {fileID: 799228954589078042, guid: 4a4221006aae5854b88e58edca5f0a1b, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 5
objectReference: {fileID: 0}
- target: {fileID: 799228954589078042, guid: 4a4221006aae5854b88e58edca5f0a1b, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 64336015}
- target: {fileID: 799228954589078042, guid: 4a4221006aae5854b88e58edca5f0a1b, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ChoosePathString
objectReference: {fileID: 0}
- target: {fileID: 799228954589078042, guid: 4a4221006aae5854b88e58edca5f0a1b, type: 3}
propertyPath: onEndpoint.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
value: storage
objectReference: {fileID: 0}
- target: {fileID: 5444824671652310955, guid: 4a4221006aae5854b88e58edca5f0a1b, type: 3}
propertyPath: m_LocalPosition.x
value: -11.52
Expand Down Expand Up @@ -7459,13 +7475,49 @@ PrefabInstance:
propertyPath: cameraController
value:
objectReference: {fileID: 1124417050}
- target: {fileID: 689097347558772711, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 689097347558772711, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 5
objectReference: {fileID: 0}
- target: {fileID: 689097347558772711, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 64336015}
- target: {fileID: 689097347558772711, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 689097347558772711, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ChoosePathString
objectReference: {fileID: 0}
- target: {fileID: 689097347558772711, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: DialogueDisplay, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 689097347558772711, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
value: storage_storage
objectReference: {fileID: 0}
- target: {fileID: 689097347558772711, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: onEnter.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2783402992089816728, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: m_LocalScale.x
value: 10.9236
objectReference: {fileID: 0}
- target: {fileID: 2783402992089816728, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: m_LocalScale.y
value: 18.70808
value: 24.70808
objectReference: {fileID: 0}
- target: {fileID: 2783402992089816728, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: m_LocalScale.z
value: 10.76012
objectReference: {fileID: 0}
- target: {fileID: 2783402992089816728, guid: 75815bf93aa5bc349b917dff8f9f5c04, type: 3}
propertyPath: m_LocalPosition.x
Expand Down
Loading
Loading