From cafb27345d16e36c888e4605d461e54cd5d0e87a Mon Sep 17 00:00:00 2001 From: Teodor Vecerdi Date: Sun, 10 Apr 2022 16:40:46 +0300 Subject: [PATCH] Update Sample project --- Samples~/DemoProject/Example.dlog | 148 +++-- Samples~/DemoProject/Example.dlog.meta | 2 +- Samples~/DemoProject/Scenes/Demo.unity | 543 ++++++++++++------ .../DemoProject/Scripts/LineController.cs | 6 +- Samples~/DemoProject/Scripts/NPCDialogue.cs | 12 +- 5 files changed, 477 insertions(+), 234 deletions(-) diff --git a/Samples~/DemoProject/Example.dlog b/Samples~/DemoProject/Example.dlog index 00692f8..0a4a167 100644 --- a/Samples~/DemoProject/Example.dlog +++ b/Samples~/DemoProject/Example.dlog @@ -1,11 +1,11 @@ { - "AssetGuid": "f1715ee0a9e1d9943a01aff710c974ee", - "IsBlackboardVisible": true, - "DialogueGraphVersion": "1.1.5", + "AssetGuid": "eb71420dc23754148891843881b4dc58", + "IsBlackboardVisible": false, + "DialogueGraphVersion": "2.0.0", "nodes": [ { "GUID": "850489ea-8d9d-4bc2-9a5f-6a3302035848", - "Type": "Dlog.NpcNode", + "Type": "DialogueGraph.NpcNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -33,7 +33,7 @@ }, { "GUID": "2f81bcfa-aecc-41aa-91d9-443c4df926e7", - "Type": "Dlog.PropertyNode", + "Type": "DialogueGraph.PropertyNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -51,14 +51,14 @@ }, { "GUID": "d997cd5a-7120-44a6-99d8-f90c7f2ceebb", - "Type": "Dlog.PropertyNode", + "Type": "DialogueGraph.PropertyNode", "DrawState": { "Position": { "serializedVersion": "2", - "x": -0.999965250492096, - "y": 419.0000305175781, - "width": 102.00000762939453, - "height": 42.000003814697269 + "x": -69.00000762939453, + "y": 389.0, + "width": 107.00000762939453, + "height": 42.000030517578128 }, "Expanded": true }, @@ -69,7 +69,7 @@ }, { "GUID": "9ea12800-a39a-4a23-af51-b8da8c0f3d08", - "Type": "Dlog.PropertyNode", + "Type": "DialogueGraph.PropertyNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -87,14 +87,14 @@ }, { "GUID": "5824fb09-4f78-4fbf-b470-3c0241b140b2", - "Type": "Dlog.PropertyNode", + "Type": "DialogueGraph.PropertyNode", "DrawState": { "Position": { "serializedVersion": "2", - "x": -3.0000345706939699, - "y": 362.0000305175781, - "width": 73.0, - "height": 42.000003814697269 + "x": -40.0, + "y": 347.0000305175781, + "width": 78.0, + "height": 41.999969482421878 }, "Expanded": true }, @@ -105,7 +105,7 @@ }, { "GUID": "001eee13-a346-4270-a20f-d4a806b66389", - "Type": "Dlog.NpcNode", + "Type": "DialogueGraph.NpcNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -130,7 +130,7 @@ }, { "GUID": "e8bfabc3-8e0b-4e64-8259-fcf3f1c86cce", - "Type": "Dlog.PropertyNode", + "Type": "DialogueGraph.PropertyNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -148,7 +148,7 @@ }, { "GUID": "1c559177-1a9d-469d-8c2d-662ad37b6387", - "Type": "Dlog.SelfNode", + "Type": "DialogueGraph.SelfNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -170,7 +170,7 @@ }, { "GUID": "0cfb83ea-f5ad-4a2f-bedf-fe22b7ebafc1", - "Type": "Dlog.PropertyNode", + "Type": "DialogueGraph.PropertyNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -188,7 +188,7 @@ }, { "GUID": "82d6350e-1df0-4078-b8ff-2878c7e501be", - "Type": "Dlog.PropertyNode", + "Type": "DialogueGraph.PropertyNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -206,7 +206,7 @@ }, { "GUID": "89793740-d936-4d5d-9759-90f6d66cc405", - "Type": "Dlog.SelfNode", + "Type": "DialogueGraph.SelfNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -228,7 +228,7 @@ }, { "GUID": "dad5e7fd-c153-461b-b722-22aaa319a7cc", - "Type": "Dlog.PropertyNode", + "Type": "DialogueGraph.PropertyNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -246,7 +246,7 @@ }, { "GUID": "946bc4b7-6ed0-4771-b07a-a44463447712", - "Type": "Dlog.NpcNode", + "Type": "DialogueGraph.NpcNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -268,7 +268,7 @@ }, { "GUID": "335c0c20-4f6f-4b3b-834f-a27ccaa9ade7", - "Type": "Dlog.PropertyNode", + "Type": "DialogueGraph.PropertyNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -286,7 +286,7 @@ }, { "GUID": "8f0c0b57-a2c6-4eda-aca3-f6f78d63650b", - "Type": "Dlog.SelfNode", + "Type": "DialogueGraph.SelfNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -310,7 +310,7 @@ }, { "GUID": "e0f76e76-8cca-4e4b-914c-c416be309488", - "Type": "Dlog.PropertyNode", + "Type": "DialogueGraph.PropertyNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -328,7 +328,7 @@ }, { "GUID": "4ebe931e-de48-46de-af51-b36313dfc175", - "Type": "Dlog.PropertyNode", + "Type": "DialogueGraph.PropertyNode", "DrawState": { "Position": { "serializedVersion": "2", @@ -343,6 +343,26 @@ "PortData": [ "54d84279-8fd3-40b0-8816-bd9156014b48" ] + }, + { + "GUID": "25e31218-4152-4863-b40f-0646fde7fdb5", + "Type": "DialogueGraph.AndBooleanNode", + "DrawState": { + "Position": { + "serializedVersion": "2", + "x": 66.0, + "y": 359.0, + "width": 69.99998474121094, + "height": 42.000030517578128 + }, + "Expanded": true + }, + "NodeData": "{}", + "PortData": [ + "e1ad3df5-45d7-429d-898d-eb164827392d", + "30cafc6a-cbe6-43c2-9107-62ab28b3a4a1", + "71a7be46-510f-484d-86d2-feec149d6329" + ] } ], "edges": [ @@ -362,22 +382,6 @@ "InputCapacity": 1, "OutputCapacity": 1 }, - { - "Input": "850489ea-8d9d-4bc2-9a5f-6a3302035848", - "Output": "d997cd5a-7120-44a6-99d8-f90c7f2ceebb", - "InputPort": "f39f52fc-9fdd-4425-9fc2-bb4065553657", - "OutputPort": "151b15e6-dccc-4140-a293-0cf981a5d6e7", - "InputCapacity": 1, - "OutputCapacity": 1 - }, - { - "Input": "850489ea-8d9d-4bc2-9a5f-6a3302035848", - "Output": "5824fb09-4f78-4fbf-b470-3c0241b140b2", - "InputPort": "f39f52fc-9fdd-4425-9fc2-bb4065553657", - "OutputPort": "d2be7122-1bae-4152-aa8a-775381c30450", - "InputCapacity": 1, - "OutputCapacity": 1 - }, { "Input": "9ea12800-a39a-4a23-af51-b8da8c0f3d08", "Output": "850489ea-8d9d-4bc2-9a5f-6a3302035848", @@ -513,40 +517,64 @@ "OutputPort": "6204d9ef-60f0-44ee-a9d8-1a6fdbcc1a2b", "InputCapacity": 1, "OutputCapacity": 0 + }, + { + "Input": "25e31218-4152-4863-b40f-0646fde7fdb5", + "Output": "5824fb09-4f78-4fbf-b470-3c0241b140b2", + "InputPort": "e1ad3df5-45d7-429d-898d-eb164827392d", + "OutputPort": "d2be7122-1bae-4152-aa8a-775381c30450", + "InputCapacity": 0, + "OutputCapacity": 1 + }, + { + "Input": "25e31218-4152-4863-b40f-0646fde7fdb5", + "Output": "d997cd5a-7120-44a6-99d8-f90c7f2ceebb", + "InputPort": "30cafc6a-cbe6-43c2-9107-62ab28b3a4a1", + "OutputPort": "151b15e6-dccc-4140-a293-0cf981a5d6e7", + "InputCapacity": 0, + "OutputCapacity": 1 + }, + { + "Input": "850489ea-8d9d-4bc2-9a5f-6a3302035848", + "Output": "25e31218-4152-4863-b40f-0646fde7fdb5", + "InputPort": "f39f52fc-9fdd-4425-9fc2-bb4065553657", + "OutputPort": "71a7be46-510f-484d-86d2-feec149d6329", + "InputCapacity": 1, + "OutputCapacity": 0 } ], "serializedProperties": [ { - "Type": "Dlog.ActorProperty", - "Data": "{\"$type\":\"Dlog.ActorProperty, DialogueGraph.Editor\",\"GUID\":\"7d6a525b-b711-4587-899b-abe39a024b3d\",\"Type\":2,\"DisplayName\":\"Shop Keeper\",\"ReferenceName\":\"Actor_47349990\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"47349990\"}" + "Type": "DialogueGraph.ActorProperty", + "Data": "{\"$type\":\"DialogueGraph.ActorProperty, DialogueGraph.Editor\",\"GUID\":\"7d6a525b-b711-4587-899b-abe39a024b3d\",\"Type\":2,\"DisplayName\":\"Shop Keeper\",\"ReferenceName\":\"Actor_47349990\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"47349990\"}" }, { - "Type": "Dlog.TriggerProperty", - "Data": "{\"$type\":\"Dlog.TriggerProperty, DialogueGraph.Editor\",\"GUID\":\"040ac558-1527-47e7-96f5-741bd7d7a28e\",\"Type\":0,\"DisplayName\":\"Meet\",\"ReferenceName\":\"Trigger_F3AC8EC2\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"F3AC8EC2\"}" + "Type": "DialogueGraph.TriggerProperty", + "Data": "{\"$type\":\"DialogueGraph.TriggerProperty, DialogueGraph.Editor\",\"GUID\":\"040ac558-1527-47e7-96f5-741bd7d7a28e\",\"Type\":0,\"DisplayName\":\"Meet\",\"ReferenceName\":\"Trigger_F3AC8EC2\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"F3AC8EC2\"}" }, { - "Type": "Dlog.TriggerProperty", - "Data": "{\"$type\":\"Dlog.TriggerProperty, DialogueGraph.Editor\",\"GUID\":\"4cf90030-325a-4b21-bde1-66f9e82e46ab\",\"Type\":0,\"DisplayName\":\"Clear Angry\",\"ReferenceName\":\"Trigger_2DA2BB98\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"2DA2BB98\"}" + "Type": "DialogueGraph.TriggerProperty", + "Data": "{\"$type\":\"DialogueGraph.TriggerProperty, DialogueGraph.Editor\",\"GUID\":\"4cf90030-325a-4b21-bde1-66f9e82e46ab\",\"Type\":0,\"DisplayName\":\"Clear Angry\",\"ReferenceName\":\"Trigger_2DA2BB98\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"2DA2BB98\"}" }, { - "Type": "Dlog.TriggerProperty", - "Data": "{\"$type\":\"Dlog.TriggerProperty, DialogueGraph.Editor\",\"GUID\":\"444013ed-b010-4bf5-aa9f-cc66c157bd12\",\"Type\":0,\"DisplayName\":\"Make Angry\",\"ReferenceName\":\"Trigger_FDF03340\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"FDF03340\"}" + "Type": "DialogueGraph.TriggerProperty", + "Data": "{\"$type\":\"DialogueGraph.TriggerProperty, DialogueGraph.Editor\",\"GUID\":\"444013ed-b010-4bf5-aa9f-cc66c157bd12\",\"Type\":0,\"DisplayName\":\"Make Angry\",\"ReferenceName\":\"Trigger_FDF03340\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"FDF03340\"}" }, { - "Type": "Dlog.CheckProperty", - "Data": "{\"$type\":\"Dlog.CheckProperty, DialogueGraph.Editor\",\"GUID\":\"0499b57d-42ae-415f-b6fe-ccde98cc2fe1\",\"Type\":1,\"DisplayName\":\"Met Before?\",\"ReferenceName\":\"Check_535AF728\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"535AF728\"}" + "Type": "DialogueGraph.CheckProperty", + "Data": "{\"$type\":\"DialogueGraph.CheckProperty, DialogueGraph.Editor\",\"GUID\":\"0499b57d-42ae-415f-b6fe-ccde98cc2fe1\",\"Type\":1,\"DisplayName\":\"Met Before?\",\"ReferenceName\":\"Check_535AF728\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"535AF728\"}" }, { - "Type": "Dlog.CheckProperty", - "Data": "{\"$type\":\"Dlog.CheckProperty, DialogueGraph.Editor\",\"GUID\":\"3f457785-b316-4eae-87ee-8129b6b6ccd3\",\"Type\":1,\"DisplayName\":\"Angry?\",\"ReferenceName\":\"Check_26FE9665\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"26FE9665\"}" + "Type": "DialogueGraph.CheckProperty", + "Data": "{\"$type\":\"DialogueGraph.CheckProperty, DialogueGraph.Editor\",\"GUID\":\"3f457785-b316-4eae-87ee-8129b6b6ccd3\",\"Type\":1,\"DisplayName\":\"Angry?\",\"ReferenceName\":\"Check_26FE9665\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"26FE9665\"}" }, { - "Type": "Dlog.TriggerProperty", - "Data": "{\"$type\":\"Dlog.TriggerProperty, DialogueGraph.Editor\",\"GUID\":\"81c1a9c3-23ac-4fd0-92cc-597d9a8172e3\",\"Type\":0,\"DisplayName\":\"Play Game\",\"ReferenceName\":\"Trigger_4500646E\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"4500646E\"}" + "Type": "DialogueGraph.TriggerProperty", + "Data": "{\"$type\":\"DialogueGraph.TriggerProperty, DialogueGraph.Editor\",\"GUID\":\"81c1a9c3-23ac-4fd0-92cc-597d9a8172e3\",\"Type\":0,\"DisplayName\":\"Play Game\",\"ReferenceName\":\"Trigger_4500646E\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"4500646E\"}" }, { - "Type": "Dlog.TriggerProperty", - "Data": "{\"$type\":\"Dlog.TriggerProperty, DialogueGraph.Editor\",\"GUID\":\"2af6175d-4323-4bd4-be23-72ea22a80668\",\"Type\":0,\"DisplayName\":\"Open Shop\",\"ReferenceName\":\"Trigger_ABEE4873\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"ABEE4873\"}" + "Type": "DialogueGraph.TriggerProperty", + "Data": "{\"$type\":\"DialogueGraph.TriggerProperty, DialogueGraph.Editor\",\"GUID\":\"2af6175d-4323-4bd4-be23-72ea22a80668\",\"Type\":0,\"DisplayName\":\"Open Shop\",\"ReferenceName\":\"Trigger_ABEE4873\",\"OverrideReferenceName\":null,\"Hidden\":false,\"ShortGuid\":\"ABEE4873\"}" } ] } \ No newline at end of file diff --git a/Samples~/DemoProject/Example.dlog.meta b/Samples~/DemoProject/Example.dlog.meta index 450072b..98e5a2e 100644 --- a/Samples~/DemoProject/Example.dlog.meta +++ b/Samples~/DemoProject/Example.dlog.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f1715ee0a9e1d9943a01aff710c974ee +guid: eb71420dc23754148891843881b4dc58 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Samples~/DemoProject/Scenes/Demo.unity b/Samples~/DemoProject/Scenes/Demo.unity index 71df0da..6a1d780 100644 --- a/Samples~/DemoProject/Scenes/Demo.unity +++ b/Samples~/DemoProject/Scenes/Demo.unity @@ -151,6 +151,7 @@ RectTransform: 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: 556143344} - {fileID: 1556049107} @@ -229,6 +230,7 @@ RectTransform: 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: [] m_Father: {fileID: 1563392481} m_RootOrder: 0 @@ -369,6 +371,7 @@ RectTransform: 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: 1018603580} - {fileID: 1917591670} @@ -418,140 +421,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 159501387} m_CullTransparentMesh: 0 ---- !u!1 &401708173 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 401708174} - - component: {fileID: 401708176} - - component: {fileID: 401708175} - m_Layer: 5 - m_Name: EnterConvHelper - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &401708174 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 401708173} - 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_Children: [] - m_Father: {fileID: 635846895} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &401708175 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 401708173} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Press F to enter conversation - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &401708176 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 401708173} - m_CullTransparentMesh: 0 --- !u!1 &556143343 GameObject: m_ObjectHideFlags: 0 @@ -580,6 +449,7 @@ RectTransform: 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: [] m_Father: {fileID: 84139885} m_RootOrder: 0 @@ -744,6 +614,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &635846894 Canvas: m_ObjectHideFlags: 0 @@ -775,11 +646,12 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 84139885} - {fileID: 159501388} - {fileID: 1563392481} - - {fileID: 401708174} + - {fileID: 793253569} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -816,6 +688,7 @@ RectTransform: 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: [] m_Father: {fileID: 84139885} m_RootOrder: 2 @@ -922,6 +795,164 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 691273549} m_CullTransparentMesh: 0 +--- !u!1 &793253568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 793253569} + - component: {fileID: 793253571} + - component: {fileID: 793253570} + m_Layer: 5 + m_Name: Keybinds + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &793253569 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 793253568} + 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: [] + m_Father: {fileID: 635846895} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &793253570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 793253568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Keybinds + + + General: + + F - Enter conversation + + Z + - Reset conversation state + + SPACE - Continue conversation + + ESC + - Close shop/game menu + + + Choosing Line: + + UP - Select previous + line + + DOWN - Select next line + + SPACE - Confirm selection' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 16, y: 16, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &793253571 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 793253568} + m_CullTransparentMesh: 0 --- !u!1 &815786735 GameObject: m_ObjectHideFlags: 0 @@ -952,8 +983,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80c49c349eea4a6f9719386703f11e48, type: 3} m_Name: m_EditorClassIdentifier: - DlogObject: {fileID: 2841676755933307327, guid: f1715ee0a9e1d9943a01aff710c974ee, type: 3} - CurrentAssetGuid: f1715ee0a9e1d9943a01aff710c974ee + DlogObject: {fileID: 2841676755933307327, guid: eb71420dc23754148891843881b4dc58, type: 3} + CurrentAssetGuid: eb71420dc23754148891843881b4dc58 PersistentData: - ActorDataIndices: m_keys: @@ -991,7 +1022,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 815786737} @@ -1012,7 +1043,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 TriggerDataIndices: @@ -1042,7 +1073,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 815786737} @@ -1063,7 +1094,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 815786737} @@ -1084,7 +1115,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 815786737} @@ -1105,7 +1136,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 815786737} @@ -1126,7 +1157,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - ActorDataIndices: @@ -1165,7 +1196,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 815786737} @@ -1186,7 +1217,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 TriggerDataIndices: @@ -1216,7 +1247,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 815786737} @@ -1237,7 +1268,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 815786737} @@ -1258,7 +1289,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 815786737} @@ -1279,7 +1310,7 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 815786737} @@ -1300,14 +1331,189 @@ MonoBehaviour: argType: 2 _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + dirty: 0 + - ActorDataIndices: + m_keys: + - 7d6a525b-b711-4587-899b-abe39a024b3d + m_values: 00000000 + ActorData: + - Name: Shopkeeper + CustomData: {fileID: 0} + Property: + Guid: 7d6a525b-b711-4587-899b-abe39a024b3d + ReferenceName: Actor_47349990 + DisplayName: Shop Keeper + Type: 2 + CheckDataIndices: + m_keys: + - 0499b57d-42ae-415f-b6fe-ccde98cc2fe1 + - 3f457785-b316-4eae-87ee-8129b6b6ccd3 + m_values: 0000000001000000 + CheckData: + - _target: {fileID: 815786737} + _methodName: MetBefore + _args: + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 4 + _typeName: System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 2 + _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + _dynamic: 1 + _typeName: DialogueGraph.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + dirty: 0 + - _target: {fileID: 815786737} + _methodName: Angry + _args: + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 4 + _typeName: System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 2 + _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + _dynamic: 1 + _typeName: DialogueGraph.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + dirty: 0 + TriggerDataIndices: + m_keys: + - 040ac558-1527-47e7-96f5-741bd7d7a28e + - 4cf90030-325a-4b21-bde1-66f9e82e46ab + - 444013ed-b010-4bf5-aa9f-cc66c157bd12 + - 81c1a9c3-23ac-4fd0-92cc-597d9a8172e3 + - 2af6175d-4323-4bd4-be23-72ea22a80668 + m_values: 0000000001000000020000000300000004000000 + TriggerData: + - _target: {fileID: 815786737} + _methodName: Meet + _args: + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 4 + _typeName: System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 2 + _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + _dynamic: 1 + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + dirty: 0 + - _target: {fileID: 815786737} + _methodName: ClearAngry + _args: + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 4 + _typeName: System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 2 + _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + _dynamic: 1 + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + dirty: 0 + - _target: {fileID: 815786737} + _methodName: MakeAngry + _args: + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 4 + _typeName: System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 2 + _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + _dynamic: 1 + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + dirty: 0 + - _target: {fileID: 815786737} + _methodName: PlayGame + _args: + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 4 + _typeName: System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 2 + _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + _dynamic: 1 + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + dirty: 0 + - _target: {fileID: 815786737} + _methodName: OpenShop + _args: + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 4 + _typeName: System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - boolValue: 0 + intValue: 0 + floatValue: 0 + stringValue: + objectValue: {fileID: 0} + argType: 2 + _typeName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + _dynamic: 1 + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 PersistentDataIndices: m_keys: - ffe1901b3b8186c41bce7f983aec2f3e - f1715ee0a9e1d9943a01aff710c974ee - m_values: 0000000001000000 + - eb71420dc23754148891843881b4dc58 + m_values: 000000000100000002000000 --- !u!114 &815786737 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1338,6 +1544,7 @@ Transform: 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: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -1370,6 +1577,7 @@ RectTransform: 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: [] m_Father: {fileID: 159501388} m_RootOrder: 0 @@ -1538,6 +1746,7 @@ Transform: 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: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -1570,6 +1779,7 @@ RectTransform: 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: [] m_Father: {fileID: 84139885} m_RootOrder: 1 @@ -1647,6 +1857,7 @@ RectTransform: 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: 106971681} m_Father: {fileID: 635846895} @@ -1735,8 +1946,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80c49c349eea4a6f9719386703f11e48, type: 3} m_Name: m_EditorClassIdentifier: - DlogObject: {fileID: 2841676755933307327, guid: ffe1901b3b8186c41bce7f983aec2f3e, type: 3} - CurrentAssetGuid: ffe1901b3b8186c41bce7f983aec2f3e + DlogObject: {fileID: 0} + CurrentAssetGuid: PersistentData: - ActorDataIndices: m_keys: @@ -1767,7 +1978,7 @@ MonoBehaviour: _methodName: _args: [] _dynamic: 1 - _typeName: Dlog.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 TriggerDataIndices: @@ -1780,14 +1991,14 @@ MonoBehaviour: _methodName: _args: [] _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 0} _methodName: _args: [] _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - ActorDataIndices: @@ -1812,14 +2023,14 @@ MonoBehaviour: _methodName: _args: [] _dynamic: 1 - _typeName: Dlog.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 0} _methodName: _args: [] _dynamic: 1 - _typeName: Dlog.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.CheckEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 TriggerDataIndices: @@ -1835,35 +2046,35 @@ MonoBehaviour: _methodName: _args: [] _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 0} _methodName: _args: [] _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 0} _methodName: _args: [] _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 0} _methodName: _args: [] _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 - _target: {fileID: 0} _methodName: _args: [] _dynamic: 1 - _typeName: Dlog.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, + _typeName: DialogueGraph.Runtime.TriggerEvent, DialogueGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null dirty: 0 PersistentDataIndices: @@ -1924,6 +2135,7 @@ Transform: 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: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1950,12 +2162,14 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 1 m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 m_RenderPostProcessing: 1 m_Antialiasing: 1 m_AntialiasingQuality: 2 m_StopNaN: 1 m_Dithering: 0 m_ClearDepth: 1 + m_AllowXRRendering: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -1987,6 +2201,7 @@ RectTransform: 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: [] m_Father: {fileID: 159501388} m_RootOrder: 1 diff --git a/Samples~/DemoProject/Scripts/LineController.cs b/Samples~/DemoProject/Scripts/LineController.cs index e270e1e..9301344 100644 --- a/Samples~/DemoProject/Scripts/LineController.cs +++ b/Samples~/DemoProject/Scripts/LineController.cs @@ -1,7 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; -using Dlog.Runtime; +using DialogueGraph.Runtime; using UnityEngine; public class LineController : MonoBehaviour { @@ -15,7 +15,7 @@ public void Clear() { entries.ForEach(entry => Destroy(entry.gameObject)); entries.Clear(); } - + public void Initialize(List lines) { isActive = true; entries = new List(); @@ -51,7 +51,7 @@ private void Update() { selectedIndex = nextIndex; } - if (Input.GetKeyDown(KeyCode.Return)) { + if (Input.GetKeyDown(KeyCode.Space)) { SelectLine(selectedIndex); } } diff --git a/Samples~/DemoProject/Scripts/NPCDialogue.cs b/Samples~/DemoProject/Scripts/NPCDialogue.cs index 3aacea2..7d2d75f 100644 --- a/Samples~/DemoProject/Scripts/NPCDialogue.cs +++ b/Samples~/DemoProject/Scripts/NPCDialogue.cs @@ -1,9 +1,9 @@ -using Dlog.Runtime; +using DialogueGraph.Runtime; using TMPro; using UnityEngine; public class NPCDialogue : MonoBehaviour { - public DialogueGraph DialogueSystem; + public RuntimeDialogueGraph DialogueSystem; public LineController LineController; [Header("UI References")] @@ -36,7 +36,7 @@ private void Update() { isInConversation = true; (showPlayer ? PlayerContainer : NpcContainer).SetActive(true); } - + if (showingSecondaryScreen) { if (Input.GetKeyDown(KeyCode.Escape)) { showingSecondaryScreen = false; @@ -69,7 +69,7 @@ private void Update() { isPlayerChoosing = false; shouldShowText = false; showingText = false; - + PlayerContainer.SetActive(false); NpcContainer.SetActive(false); return; @@ -123,7 +123,7 @@ public void ClearAngry(string node, int lineIndex) { public void PlayGame(string node, int lineIndex) { showingSecondaryScreen = true; SecondaryScreen.SetActive(true); - + NpcContainer.SetActive(false); PlayerContainer.gameObject.SetActive(false); showingText = false; @@ -134,7 +134,7 @@ public void PlayGame(string node, int lineIndex) { public void OpenShop(string node, int lineIndex) { showingSecondaryScreen = true; SecondaryScreen.SetActive(true); - + NpcContainer.SetActive(false); PlayerContainer.gameObject.SetActive(false); showingText = false;