diff --git a/Assets/01_Scenes/Hischool_Chapter1.unity b/Assets/01_Scenes/Hischool_Chapter1.unity index 4fbed50b..fb3259e6 100644 --- a/Assets/01_Scenes/Hischool_Chapter1.unity +++ b/Assets/01_Scenes/Hischool_Chapter1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c8407049ea0809f849a4dba0a31bbdea2032201c9f4945fe95cb95d35858aed -size 4020029 +oid sha256:505fc693dd6533bac547c1a9617db969511643ba951a97dc67030541dd9a5b80 +size 4020754 diff --git a/Assets/02_Scripts/Communication/Dialog/DialogNode.cs b/Assets/02_Scripts/Communication/Dialog/DialogNode.cs index 5ffa7623..42d08cdf 100644 --- a/Assets/02_Scripts/Communication/Dialog/DialogNode.cs +++ b/Assets/02_Scripts/Communication/Dialog/DialogNode.cs @@ -11,6 +11,10 @@ public class DialogNode : ScriptableObject [Tooltip("비우면 Speaker의 이름 그대로, 채우면 이 이름으로 표시 (예: ???)")] public string SpeakerNameOverride; + [Tooltip("대사창을 띄울 기준 캐릭터. 비우면 Speaker 옆에 띄움 " + + "(다른 NPC가 끼어드는 대사를 원래 대화 상대 옆에 표시하고 싶을 때 지정)")] + public CharacterData HudAnchor; + [Header("Content")] [TextArea(2,5)] public string TalkText; public GestureData Gesture; diff --git a/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs b/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs index 3e809d0b..ba705447 100644 --- a/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs +++ b/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs @@ -362,7 +362,8 @@ private async Awaitable PlayNode(DialogNode node) if (node.StagingOnly) DialogHud.Instance.Hide(); else - DialogHud.Instance.Show(node.Speaker, node.TalkText, node.SpeakerNameOverride); + DialogHud.Instance.Show(node.Speaker, node.TalkText, node.SpeakerNameOverride, + node.HudAnchor); // HudAnchor 지정 시 창은 그 캐릭터 옆에 (비우면 화자 옆) } RaiseNodeEvent(node.EventKey); // EventKey 있으면 매칭 이벤트 호출 diff --git a/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogGraphImporter.cs b/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogGraphImporter.cs index 7830ceec..975a25bc 100644 --- a/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogGraphImporter.cs +++ b/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogGraphImporter.cs @@ -10,7 +10,7 @@ namespace DinoLove.Dialog.GraphTool.Editor // .dlg 그래프 에셋을 기존 런타임 타입(DialogGroup / DialogNode / DialogChoice)으로 변환한다. // 생성된 DialogNode들은 서브에셋으로, DialogGroup이 메인 에셋으로 등록된다. // 따라서 DialogPlayer는 수정 없이 임포트된 .dlg 에셋(= DialogGroup)을 그대로 사용한다. - [ScriptedImporter(6, DialogGraph.AssetExtension)] // 버전 올리면 기존 .dlg 에셋이 재임포트됨 + [ScriptedImporter(8, DialogGraph.AssetExtension)] // 버전 올리면 기존 .dlg 에셋이 재임포트됨 internal class DialogGraphImporter : ScriptedImporter { public override void OnImportAsset(AssetImportContext ctx) @@ -86,6 +86,7 @@ public override void OnImportAsset(AssetImportContext ctx) dn.Speaker = GetInputPortValue(gn.GetInputPortByName(DialogLineNode.PORT_SPEAKER)); dn.SpeakerNameOverride = GetInputPortValue(gn.GetInputPortByName(DialogLineNode.PORT_NAME_OVERRIDE)).Value; + dn.HudAnchor = GetInputPortValue(gn.GetInputPortByName(DialogLineNode.PORT_HUD_ANCHOR)); dn.TalkText = GetInputPortValue(gn.GetInputPortByName(DialogLineNode.PORT_TALK)).Value; dn.Gesture = GetInputPortValue(gn.GetInputPortByName(DialogLineNode.PORT_GESTURE)); dn.Expression = GetInputPortValue(gn.GetInputPortByName(DialogLineNode.PORT_EXPRESSION)); diff --git a/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogLineNode.cs b/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogLineNode.cs index 5d131891..a9966afa 100644 --- a/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogLineNode.cs +++ b/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogLineNode.cs @@ -16,6 +16,7 @@ internal class DialogLineNode : DialogGraphNode { public const string PORT_SPEAKER = "Speaker"; public const string PORT_NAME_OVERRIDE = "SpeakerNameOverride"; + public const string PORT_HUD_ANCHOR = "HudAnchor"; public const string PORT_TALK = "TalkText"; public const string PORT_GESTURE = "Gesture"; public const string PORT_EXPRESSION = "Expression"; @@ -58,6 +59,8 @@ protected override void OnDefinePorts(IPortDefinitionContext context) context.AddInputPort(PORT_SPEAKER).WithDisplayName("Speaker").Build(); context.AddInputPort(PORT_NAME_OVERRIDE).WithDisplayName("Name Override") .WithTooltip("비우면 Speaker 이름 그대로, 채우면 이 이름으로 표시 (예: ???)").Build(); + context.AddInputPort(PORT_HUD_ANCHOR).WithDisplayName("Hud Anchor") + .WithTooltip("대사창을 띄울 기준 캐릭터. 비우면 Speaker 옆에 띄움 (끼어드는 대사를 다른 캐릭터 옆에 표시할 때)").Build(); context.AddInputPort(PORT_TALK).WithDisplayName("Talk Text").Build(); context.AddInputPort(PORT_GESTURE).WithDisplayName("Gesture").Build(); context.AddInputPort(PORT_EXPRESSION).WithDisplayName("Expression").Build(); diff --git a/Assets/02_Scripts/UI/Communication/DialogHud.cs b/Assets/02_Scripts/UI/Communication/DialogHud.cs index 8216cbf2..2580c726 100644 --- a/Assets/02_Scripts/UI/Communication/DialogHud.cs +++ b/Assets/02_Scripts/UI/Communication/DialogHud.cs @@ -70,9 +70,12 @@ private void OnDestroy() // - 배치는 화자 오브젝트의 DialogHudPlacement 값 사용, 없으면 이 컴포넌트의 기본값 폴백 // - speakerNameOverride가 비어있지 않으면 CharacterData.Name 대신 그 이름을 표시한다 (예: "???") // - 화자의 DialogHudPlacement에 후보 목록이 있으면 벽/가림 검사를 통과하는 첫 후보 위치로 자동 배치 - public void Show(CharacterData speaker, string text, string speakerNameOverride = null) + // - anchorOverride가 있으면 창의 위치/배치만 그 캐릭터 기준으로 하고 이름/대사는 speaker 것을 쓴다 + // (다른 NPC가 끼어드는 대사지만 창은 대화 주인 옆에 두고 싶을 때) + public void Show(CharacterData speaker, string text, string speakerNameOverride = null, CharacterData anchorOverride = null) { - var voiceObj = speaker != null ? CharacterVoiceObject.Find(speaker) : null; + var anchorData = anchorOverride != null ? anchorOverride : speaker; + var voiceObj = anchorData != null ? CharacterVoiceObject.Find(anchorData) : null; _speakerTransform = voiceObj != null ? voiceObj.transform : null; DialogHudPlacement placement = null; diff --git a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus1.dlg b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus1.dlg index 672964b5..864d7d1e 100644 --- a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus1.dlg @@ -232,6 +232,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514365209968924 - rid: 4848514365209968925 @@ -247,6 +248,7 @@ MonoBehaviour: - rid: 4848514365209968935 - rid: 4848514453388656932 - rid: 4848514453388656849 + - rid: 4848514455607443581 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -379,6 +381,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514365209968940 - rid: 4848514365209968941 @@ -394,6 +397,7 @@ MonoBehaviour: - rid: 4848514365209968951 - rid: 4848514453388656933 - rid: 4848514453388656851 + - rid: 4848514455607443582 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -525,6 +529,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514430811766893 - rid: 4848514430811766894 @@ -540,6 +545,7 @@ MonoBehaviour: - rid: 4848514430811766904 - rid: 4848514453388656934 - rid: 4848514453388656853 + - rid: 4848514455607443583 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -672,6 +678,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514430811766908 - rid: 4848514430811766909 @@ -687,6 +694,7 @@ MonoBehaviour: - rid: 4848514430811766919 - rid: 4848514453388656935 - rid: 4848514453388656855 + - rid: 4848514455607443584 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -821,6 +829,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514430811766923 - rid: 4848514430811766924 @@ -836,6 +845,7 @@ MonoBehaviour: - rid: 4848514430811766934 - rid: 4848514453388656936 - rid: 4848514453388656857 + - rid: 4848514455607443585 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -980,3 +990,23 @@ MonoBehaviour: data: m_Value: Value: + - rid: 4848514455607443581 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443582 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443583 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443584 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443585 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} diff --git a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus2.dlg b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus2.dlg index 07c4289f..14e98dc3 100644 --- a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus2.dlg +++ b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus2.dlg @@ -196,6 +196,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514365209968924 - rid: 4848514365209968925 @@ -211,6 +212,7 @@ MonoBehaviour: - rid: 4848514365209968935 - rid: 4848514453388656928 - rid: 4848514453388656841 + - rid: 4848514455607443586 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -343,6 +345,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514365209968940 - rid: 4848514365209968941 @@ -358,6 +361,7 @@ MonoBehaviour: - rid: 4848514365209968951 - rid: 4848514453388656929 - rid: 4848514453388656843 + - rid: 4848514455607443587 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -490,6 +494,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514430811767025 - rid: 4848514430811767026 @@ -505,6 +510,7 @@ MonoBehaviour: - rid: 4848514430811767036 - rid: 4848514453388656930 - rid: 4848514453388656845 + - rid: 4848514455607443588 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -631,3 +637,15 @@ MonoBehaviour: data: m_Value: Value: + - rid: 4848514455607443586 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443587 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443588 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} diff --git a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus3.dlg b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus3.dlg index d3b22d4c..40c09731 100644 --- a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus3.dlg +++ b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus3.dlg @@ -160,6 +160,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514365209968924 - rid: 4848514365209968925 @@ -175,6 +176,7 @@ MonoBehaviour: - rid: 4848514365209968935 - rid: 4848514453388656939 - rid: 4848514453388656863 + - rid: 4848514455607443610 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -283,3 +285,7 @@ MonoBehaviour: data: m_Value: Value: + - rid: 4848514455607443610 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} diff --git a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus4.dlg b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus4.dlg index a08dc239..e20758aa 100644 --- a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus4.dlg +++ b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Carnotaurus4.dlg @@ -38,6 +38,7 @@ MonoBehaviour: - rid: 4848514453388656706 - rid: 4848514453388656721 - rid: 4848514453388656887 + - rid: 4848514455607443556 m_GraphWireModels: - rid: 4848514365209968937 - rid: 4848514453388656662 @@ -46,6 +47,7 @@ MonoBehaviour: - rid: 4848514453388656707 - rid: 4848514453388656722 - rid: 4848514453388656888 + - rid: 4848514455607443557 m_GraphStickyNoteModels: [] m_GraphPlacematModels: [] m_GraphVariableModels: [] @@ -56,9 +58,9 @@ MonoBehaviour: m_LastKnownBounds: serializedVersion: 2 x: -86 - y: -165 - width: 3444 - height: 1007 + y: -167 + width: 3925 + height: 1033 m_GraphElementMetaData: - m_Guid: m_Value0: 11886921906498108818 @@ -180,6 +182,22 @@ MonoBehaviour: Hash: 4f10de606971c410553cce97f509d3db m_Category: 2 m_Index: 6 + - m_Guid: + m_Value0: 5097829971250873260 + m_Value1: 15804760356810122577 + m_HashGuid: + serializedVersion: 2 + Hash: ac83bf715921bf4651e5d7abcec955db + m_Category: 0 + m_Index: 8 + - m_Guid: + m_Value0: 15995229784230638009 + m_Value1: 5639653905146355791 + m_HashGuid: + serializedVersion: 2 + Hash: b9b1d00dbe78fadd4fa064b85813444e + m_Category: 2 + m_Index: 7 m_EntryPoint: rid: 4848514365209968921 m_Graph: @@ -273,6 +291,7 @@ MonoBehaviour: - Choice1Code - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514365209968924 - rid: 4848514365209968925 @@ -293,6 +312,7 @@ MonoBehaviour: - rid: 4848514453388656660 - rid: 4848514453388656869 - rid: 4848514453388656825 + - rid: 4848514455607443550 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -448,6 +468,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514453388656663 - rid: 4848514453388656664 @@ -463,6 +484,7 @@ MonoBehaviour: - rid: 4848514453388656674 - rid: 4848514453388656870 - rid: 4848514453388656827 + - rid: 4848514455607443551 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -594,6 +616,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514453388656678 - rid: 4848514453388656679 @@ -609,6 +632,7 @@ MonoBehaviour: - rid: 4848514453388656689 - rid: 4848514453388656871 - rid: 4848514453388656829 + - rid: 4848514455607443552 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -740,6 +764,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514453388656693 - rid: 4848514453388656694 @@ -755,6 +780,7 @@ MonoBehaviour: - rid: 4848514453388656704 - rid: 4848514453388656872 - rid: 4848514453388656831 + - rid: 4848514455607443553 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -886,6 +912,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514453388656708 - rid: 4848514453388656709 @@ -901,6 +928,7 @@ MonoBehaviour: - rid: 4848514453388656719 - rid: 4848514453388656873 - rid: 4848514453388656833 + - rid: 4848514455607443554 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1033,6 +1061,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514453388656723 - rid: 4848514453388656724 @@ -1048,6 +1077,7 @@ MonoBehaviour: - rid: 4848514453388656734 - rid: 4848514453388656874 - rid: 4848514453388656835 + - rid: 4848514455607443555 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1312,7 +1342,7 @@ MonoBehaviour: - rid: 4848514453388656895 type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 10 + m_Value: 5 - rid: 4848514453388656896 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1324,3 +1354,189 @@ MonoBehaviour: - rid: 4848514453388656898 type: {class: DialogStagingNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: + - rid: 4848514455607443550 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443551 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443552 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443553 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443554 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443555 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 4848514455607443556 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 5097829971250873260 + m_Value1: 15804760356810122577 + m_HashGuid: + serializedVersion: 2 + Hash: ac83bf715921bf4651e5d7abcec955db + m_Version: 2 + m_Position: {x: 3417.1, y: -167.31998} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + m_ValueList: + - rid: 4848514455607443558 + - rid: 4848514455607443559 + - rid: 4848514455607443560 + - rid: 4848514455607443561 + - rid: 4848514455607443562 + - rid: 4848514455607443563 + - rid: 4848514455607443564 + - rid: 4848514455607443565 + - rid: 4848514455607443566 + - rid: 4848514455607443567 + - rid: 4848514455607443568 + - rid: 4848514455607443569 + - rid: 4848514455607443570 + - rid: 4848514455607443571 + - rid: 4848514455607443572 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514455607443573 + - rid: 4848514455607443557 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 15995229784230638009 + m_Value1: 5639653905146355791 + m_HashGuid: + serializedVersion: 2 + Hash: b9b1d00dbe78fadd4fa064b85813444e + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 13204935170619073055 + m_Value1: 12088787909568526924 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 1fe2cf2e935a41b74c7adefa8d00c4a7 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 5097829971250873260 + m_Value1: 15804760356810122577 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: ac83bf715921bf4651e5d7abcec955db + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514455607443558 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514455607443559 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514455607443560 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: c6477f09ddbfaaa43b73a8eb323ba389, type: 2} + - rid: 4848514455607443561 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514455607443562 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: c6477f09ddbfaaa43b73a8eb323ba389, type: 2} + - rid: 4848514455607443563 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC219\uB140\uC5D0\uAC8C \uC774\uAC8C \uBB34\uC2A8 \uBB34\uB840\uC9C0? + \uAD6C\uC900\uD45C\uB8E8\uC2A4?" + - rid: 4848514455607443564 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514455607443565 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514455607443566 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514455607443567 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514455607443568 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514455607443569 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 4 + - rid: 4848514455607443570 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514455607443571 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514455607443572 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514455607443573 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: diff --git a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Styracosaurus1.dlg b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Styracosaurus1.dlg index f81e7d5f..c1c65f07 100644 --- a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Styracosaurus1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Styracosaurus1.dlg @@ -160,6 +160,7 @@ MonoBehaviour: - LookAtPlayer - ForcePlayerLook - WaitForInput + - HudAnchor m_ValueList: - rid: 4848514453388656906 - rid: 4848514453388656907 @@ -175,6 +176,7 @@ MonoBehaviour: - rid: 4848514453388656917 - rid: 4848514453388656918 - rid: 4848514453388656919 + - rid: 4848514455607443580 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -283,3 +285,7 @@ MonoBehaviour: - rid: 4848514453388656920 type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: + - rid: 4848514455607443580 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: c6477f09ddbfaaa43b73a8eb323ba389, type: 2} diff --git a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Yuna1.dlg b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Yuna1.dlg index 32a246a2..61c4ae1f 100644 --- a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Yuna1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Yuna1.dlg @@ -178,6 +178,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514365209968924 - rid: 4848514365209968925 @@ -193,6 +194,7 @@ MonoBehaviour: - rid: 4848514365209968935 - rid: 4848514453388656921 - rid: 4848514453388656816 + - rid: 4848514455607443608 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -324,6 +326,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514365209968940 - rid: 4848514365209968941 @@ -339,6 +342,7 @@ MonoBehaviour: - rid: 4848514365209968951 - rid: 4848514453388656922 - rid: 4848514453388656818 + - rid: 4848514455607443609 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -456,3 +460,11 @@ MonoBehaviour: data: m_Value: Value: + - rid: 4848514455607443608 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514455607443609 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} diff --git a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Yuna2.dlg b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Yuna2.dlg index 00247048..4ab06455 100644 --- a/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Yuna2.dlg +++ b/Assets/07_Data/DialogGraph/Chapter1/Chapter1_Yuna2.dlg @@ -160,6 +160,7 @@ MonoBehaviour: - WaitForInput - SpeakerNameOverride - ForcePlayerLook + - HudAnchor m_ValueList: - rid: 4848514365209968924 - rid: 4848514365209968925 @@ -175,6 +176,7 @@ MonoBehaviour: - rid: 4848514365209968935 - rid: 4848514453388656931 - rid: 4848514453388656847 + - rid: 4848514455607443601 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -284,3 +286,7 @@ MonoBehaviour: data: m_Value: Value: + - rid: 4848514455607443601 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2}