From 2ac02d78f8467b3b1913ab0703a35db283912d82 Mon Sep 17 00:00:00 2001 From: rainylinjing-reboot Date: Wed, 24 Jun 2026 09:41:58 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=94=EB=93=9C=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=EC=A7=80=20=EC=88=98=EC=A0=95=20=EC=A0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Cave_Test_2.unity | 4 +- .../BlackJackRoom/BlackJack_Area1.wdg | 24 + .../CatsRoom/Fairy_CatsRoom_ClearArea.wdg | 6 +- .../DialogGraph/Cave/Fairy_CaveEnd.wdg | 448 +++++++++++++++--- .../DialogGraph/Cave/Fairy_CaveStart.wdg | 36 ++ .../Fonts/Pretendard-Black SDF.asset | 4 +- .../XR/AndroidXR/AndroidXRSettingsInitializer | 2 +- 7 files changed, 458 insertions(+), 66 deletions(-) diff --git a/Assets/01_Scenes/Cave_Test_2.unity b/Assets/01_Scenes/Cave_Test_2.unity index c37b2f68..a858149c 100644 --- a/Assets/01_Scenes/Cave_Test_2.unity +++ b/Assets/01_Scenes/Cave_Test_2.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72a4d3341d25bee59d8ce59d54f63f884d8949904508d6cab593f6b4ee365237 -size 1012409 +oid sha256:01dc71f932eb55a37ad06c3233ec111ee46eecac67233d26fc9f71e43746c237 +size 1056085 diff --git a/Assets/07_Data/Communication/DialogGraph/BlackJackRoom/BlackJack_Area1.wdg b/Assets/07_Data/Communication/DialogGraph/BlackJackRoom/BlackJack_Area1.wdg index 98f24f40..87068c31 100644 --- a/Assets/07_Data/Communication/DialogGraph/BlackJackRoom/BlackJack_Area1.wdg +++ b/Assets/07_Data/Communication/DialogGraph/BlackJackRoom/BlackJack_Area1.wdg @@ -172,6 +172,8 @@ MonoBehaviour: - Voice - LineDuration - LookAtPlayer + - __option_EventKey + - WaitForInput m_ValueList: - rid: 6595524353106116637 - rid: 6595524353106116638 @@ -181,6 +183,8 @@ MonoBehaviour: - rid: 6595524353106116642 - rid: 6595524353106116643 - rid: 6595524353106116644 + - rid: 8414246349295583529 + - rid: 8414246349295583530 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -290,6 +294,8 @@ MonoBehaviour: - Voice - LineDuration - LookAtPlayer + - __option_EventKey + - WaitForInput m_ValueList: - rid: 6595524353106116648 - rid: 6595524353106116649 @@ -299,6 +305,8 @@ MonoBehaviour: - rid: 6595524353106116653 - rid: 6595524353106116654 - rid: 6595524353106116655 + - rid: 8414246349295583531 + - rid: 8414246349295583532 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -382,3 +390,19 @@ MonoBehaviour: - rid: 6595524353106116656 type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: + - rid: 8414246349295583529 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + - rid: 8414246349295583530 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583531 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + - rid: 8414246349295583532 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 diff --git a/Assets/07_Data/Communication/DialogGraph/CatsRoom/Fairy_CatsRoom_ClearArea.wdg b/Assets/07_Data/Communication/DialogGraph/CatsRoom/Fairy_CatsRoom_ClearArea.wdg index 984438c8..4098c3f0 100644 --- a/Assets/07_Data/Communication/DialogGraph/CatsRoom/Fairy_CatsRoom_ClearArea.wdg +++ b/Assets/07_Data/Communication/DialogGraph/CatsRoom/Fairy_CatsRoom_ClearArea.wdg @@ -155,7 +155,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 0c5948afdcda05ce22f82972d57715f7 m_Version: 2 - m_Position: {x: 222.2174, y: 116.434784} + m_Position: {x: 224, y: 117} m_Title: m_Tooltip: m_NodePreviewModel: @@ -192,7 +192,7 @@ MonoBehaviour: serializedVersion: 2 Hash: a920365f7b2ae16e3a662c1c10a28fd8 m_Version: 2 - m_Position: {x: 430.9063, y: 86.04323} + m_Position: {x: 433, y: 87} m_Title: m_Tooltip: m_NodePreviewModel: @@ -315,7 +315,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 9864f63b0930d46ae940f4b3cd7402b5 m_Version: 2 - m_Position: {x: 806, y: 84} + m_Position: {x: 808.30005, y: 85.15} m_Title: m_Tooltip: m_NodePreviewModel: diff --git a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg index cf553836..78c4111c 100644 --- a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg +++ b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg @@ -32,10 +32,14 @@ MonoBehaviour: m_GraphNodeModels: - rid: 6595524353106116633 - rid: 6595524353106116635 - - rid: 6595524353106116646 + - rid: 8414246349295583477 + - rid: 8414246349295583478 + - rid: 8414246349295583479 m_GraphWireModels: - rid: 6595524353106116636 - - rid: 8414246349295583368 + - rid: 8414246349295583518 + - rid: 8414246349295583519 + - rid: 8414246349295583520 m_GraphStickyNoteModels: [] m_GraphPlacematModels: [] m_GraphVariableModels: [] @@ -47,8 +51,8 @@ MonoBehaviour: serializedVersion: 2 x: 222 y: 76 - width: 1015 - height: 562 + width: 1519 + height: 809 m_GraphElementMetaData: - m_Guid: m_Value0: 14845512388065122572 @@ -75,21 +79,53 @@ MonoBehaviour: m_Category: 2 m_Index: 0 - m_Guid: - m_Value0: 7697830479301862552 - m_Value1: 13043115897654624489 + m_Value0: 9090430376222730232 + m_Value1: 8698854824339867131 m_HashGuid: serializedVersion: 2 - Hash: 9864f63b0930d46ae940f4b3cd7402b5 + Hash: f8272d9643b2277efb8578cd5f8ab878 m_Category: 0 m_Index: 2 - m_Guid: - m_Value0: 9676839463197748057 - m_Value1: 16416879655357221472 + m_Value0: 15390156432564575044 + m_Value1: 14460584967228753390 m_HashGuid: serializedVersion: 2 - Hash: 592b62c0380a4b86608ae7f11079d4e3 + Hash: 445bb420bcd194d5ee0506886951aec8 + m_Category: 0 + m_Index: 3 + - m_Guid: + m_Value0: 11535367287818405796 + m_Value1: 9331372092596623223 + m_HashGuid: + serializedVersion: 2 + Hash: a4c713686edb15a07717377e7ab17f81 + m_Category: 0 + m_Index: 4 + - m_Guid: + m_Value0: 12600121196200009236 + m_Value1: 3923184474935055345 + m_HashGuid: + serializedVersion: 2 + Hash: 141e5f3a789fdcaef1d3d4787ef37136 m_Category: 2 m_Index: 1 + - m_Guid: + m_Value0: 7604000673015478271 + m_Value1: 7661249770941691247 + m_HashGuid: + serializedVersion: 2 + Hash: ff37eb0a53d686696fb5855c133a526a + m_Category: 2 + m_Index: 2 + - m_Guid: + m_Value0: 4180187583526580033 + m_Value1: 5831705010877596313 + m_HashGuid: + serializedVersion: 2 + Hash: 41af99aa7502033a99823948cf60ee50 + m_Category: 2 + m_Index: 3 m_EntryPoint: rid: 6595524353106116633 m_Graph: @@ -172,6 +208,8 @@ MonoBehaviour: - Voice - LineDuration - LookAtPlayer + - __option_EventKey + - WaitForInput m_ValueList: - rid: 6595524353106116637 - rid: 6595524353106116638 @@ -181,6 +219,8 @@ MonoBehaviour: - rid: 6595524353106116642 - rid: 6595524353106116643 - rid: 6595524353106116644 + - rid: 8414246349295583433 + - rid: 8414246349295583434 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -265,18 +305,26 @@ MonoBehaviour: - rid: 6595524353106116645 type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: - - rid: 6595524353106116646 + - rid: 8414246349295583433 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + - rid: 8414246349295583434 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583477 type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} data: m_Guid: - m_Value0: 7697830479301862552 - m_Value1: 13043115897654624489 + m_Value0: 9090430376222730232 + m_Value1: 8698854824339867131 m_HashGuid: serializedVersion: 2 - Hash: 9864f63b0930d46ae940f4b3cd7402b5 + Hash: f8272d9643b2277efb8578cd5f8ab878 m_Version: 2 - m_Position: {x: 830.3975, y: 76.96198} - m_Title: + m_Position: {x: 895.3325, y: 87.58484} + m_Title: DialogLineNode m_Tooltip: m_NodePreviewModel: rid: -2 @@ -294,18 +342,26 @@ MonoBehaviour: - ChoiceQuestion - Choice0Text - Choice1Text + - WaitForInput + - __option_EventKey + - Choice0Code + - Choice1Code m_ValueList: - - rid: 6595524353106116648 - - rid: 6595524353106116649 - - rid: 6595524353106116650 - - rid: 6595524353106116651 - - rid: 6595524353106116652 - - rid: 6595524353106116653 - - rid: 6595524353106116654 - - rid: 6595524353106116655 - - rid: 8414246349295583420 - - rid: 8414246349295583421 - - rid: 8414246349295583422 + - rid: 8414246349295583480 + - rid: 8414246349295583481 + - rid: 8414246349295583482 + - rid: 8414246349295583483 + - rid: 8414246349295583484 + - rid: 8414246349295583485 + - rid: 8414246349295583486 + - rid: 8414246349295583487 + - rid: 8414246349295583488 + - rid: 8414246349295583489 + - rid: 8414246349295583490 + - rid: 8414246349295583491 + - rid: 8414246349295583492 + - rid: 8414246349295583493 + - rid: 8414246349295583494 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -320,52 +376,279 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_HasUserColor: 0 m_Node: - rid: 6595524353106116656 - - rid: 6595524353106116648 + rid: 8414246349295583495 + - rid: 8414246349295583478 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 15390156432564575044 + m_Value1: 14460584967228753390 + m_HashGuid: + serializedVersion: 2 + Hash: 445bb420bcd194d5ee0506886951aec8 + m_Version: 2 + m_Position: {x: 1402.0514, y: 500.70782} + m_Title: DialogLineNode + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - Speaker + - TalkText + - Gesture + - Expression + - Voice + - LineDuration + - LookAtPlayer + - WaitForInput + - __option_EventKey + m_ValueList: + - rid: 8414246349295583496 + - rid: 8414246349295583497 + - rid: 8414246349295583498 + - rid: 8414246349295583499 + - rid: 8414246349295583500 + - rid: 8414246349295583501 + - rid: 8414246349295583502 + - rid: 8414246349295583503 + - rid: 8414246349295583504 + - rid: 8414246349295583505 + 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: 8414246349295583506 + - rid: 8414246349295583479 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 11535367287818405796 + m_Value1: 9331372092596623223 + m_HashGuid: + serializedVersion: 2 + Hash: a4c713686edb15a07717377e7ab17f81 + m_Version: 2 + m_Position: {x: 1394.7207, y: 81.995026} + m_Title: DialogLineNode + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - Speaker + - TalkText + - Gesture + - Expression + - Voice + - LineDuration + - LookAtPlayer + - WaitForInput + - __option_EventKey + m_ValueList: + - rid: 8414246349295583507 + - rid: 8414246349295583508 + - rid: 8414246349295583509 + - rid: 8414246349295583510 + - rid: 8414246349295583511 + - rid: 8414246349295583512 + - rid: 8414246349295583513 + - rid: 8414246349295583514 + - rid: 8414246349295583515 + - rid: 8414246349295583516 + 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: 8414246349295583517 + - rid: 8414246349295583480 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: m_Value: 2 - - rid: 6595524353106116649 + - rid: 8414246349295583481 type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: m_Value: {fileID: 11400000, guid: 816884903bb3c4d478520286d768c304, type: 2} - - rid: 6595524353106116650 + - rid: 8414246349295583482 type: {class: 'Constant`1[[WhaleAdventure.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: m_Value: - Value: "\uC774\uBC88\uC5D4 \uC5B4\uB514\uB85C \uAC00\uBCFC\uAE4C?\r\n" - - rid: 6595524353106116651 + Value: "\uC5B4\uB290 \uACF5\uAC04\uC73C\uB85C \uC774\uB3D9\uD560\uB798?" + - rid: 8414246349295583483 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: m_Value: {fileID: 0} - - rid: 6595524353106116652 + - rid: 8414246349295583484 type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: m_Value: {fileID: 0} - - rid: 6595524353106116653 + - rid: 8414246349295583485 type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: m_Value: {fileID: 0} - - rid: 6595524353106116654 + - rid: 8414246349295583486 type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: m_Value: 5 - - rid: 6595524353106116655 + - rid: 8414246349295583487 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583488 + type: {class: 'Constant`1[[WhaleAdventure.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + Value: + - rid: 8414246349295583489 + type: {class: 'Constant`1[[WhaleAdventure.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + Value: '{SpaceSceneName1}' + - rid: 8414246349295583490 + type: {class: 'Constant`1[[WhaleAdventure.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + Value: '{SpaceSceneName2}' + - rid: 8414246349295583491 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583492 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + - rid: 8414246349295583493 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: '{SpaceSceneCode1}' + - rid: 8414246349295583494 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: '{SpaceSceneCode2}' + - rid: 8414246349295583495 + type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 8414246349295583496 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583497 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 11400000, guid: 816884903bb3c4d478520286d768c304, type: 2} + - rid: 8414246349295583498 + type: {class: 'Constant`1[[WhaleAdventure.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + Value: "\uC88B\uC544! {SpaceSceneName2}\uB85C \uC774\uB3D9\uD558\uC790." + - rid: 8414246349295583499 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 8414246349295583500 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 8414246349295583501 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 8414246349295583502 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 5 + - rid: 8414246349295583503 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583504 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: m_Value: 1 - - rid: 6595524353106116656 + - rid: 8414246349295583505 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: OpenDoor + - rid: 8414246349295583506 type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: - - rid: 8414246349295583368 + - rid: 8414246349295583507 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583508 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 11400000, guid: 816884903bb3c4d478520286d768c304, type: 2} + - rid: 8414246349295583509 + type: {class: 'Constant`1[[WhaleAdventure.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + Value: "\uC88B\uC544! {SpaceSceneName1}\uB85C \uC774\uB3D9\uD558\uC790." + - rid: 8414246349295583510 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 8414246349295583511 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 8414246349295583512 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 8414246349295583513 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 5 + - rid: 8414246349295583514 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583515 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 1 + - rid: 8414246349295583516 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: OpenDoor + - rid: 8414246349295583517 + type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 8414246349295583518 type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: m_Guid: - m_Value0: 9676839463197748057 - m_Value1: 16416879655357221472 + m_Value0: 12600121196200009236 + m_Value1: 3923184474935055345 m_HashGuid: serializedVersion: 2 - Hash: 592b62c0380a4b86608ae7f11079d4e3 + Hash: 141e5f3a789fdcaef1d3d4787ef37136 m_Version: 2 m_FromPortReference: m_NodeModelGuid: @@ -380,27 +663,76 @@ MonoBehaviour: m_Title: m_ToPortReference: m_NodeModelGuid: - m_Value0: 7697830479301862552 - m_Value1: 13043115897654624489 + m_Value0: 9090430376222730232 + m_Value1: 8698854824339867131 m_NodeModelHashGuid: serializedVersion: 2 - Hash: 9864f63b0930d46ae940f4b3cd7402b5 + Hash: f8272d9643b2277efb8578cd5f8ab878 m_UniqueId: In m_PortDirection: 1 m_PortOrientation: 0 m_Title: - - rid: 8414246349295583420 - type: {class: 'Constant`1[[WhaleAdventure.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + - rid: 8414246349295583519 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: - m_Value: - Value: - - rid: 8414246349295583421 - type: {class: 'Constant`1[[WhaleAdventure.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + m_Guid: + m_Value0: 7604000673015478271 + m_Value1: 7661249770941691247 + m_HashGuid: + serializedVersion: 2 + Hash: ff37eb0a53d686696fb5855c133a526a + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 9090430376222730232 + m_Value1: 8698854824339867131 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: f8272d9643b2277efb8578cd5f8ab878 + m_UniqueId: Choice0Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: "Choice 1 \u2192" + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 11535367287818405796 + m_Value1: 9331372092596623223 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: a4c713686edb15a07717377e7ab17f81 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 8414246349295583520 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: - m_Value: - Value: - - rid: 8414246349295583422 - type: {class: 'Constant`1[[WhaleAdventure.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} - data: - m_Value: - Value: + m_Guid: + m_Value0: 4180187583526580033 + m_Value1: 5831705010877596313 + m_HashGuid: + serializedVersion: 2 + Hash: 41af99aa7502033a99823948cf60ee50 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 9090430376222730232 + m_Value1: 8698854824339867131 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: f8272d9643b2277efb8578cd5f8ab878 + m_UniqueId: Choice1Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: "Choice 2 \u2192" + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 15390156432564575044 + m_Value1: 14460584967228753390 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 445bb420bcd194d5ee0506886951aec8 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: diff --git a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg index 48447e3e..95e27e54 100644 --- a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg +++ b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg @@ -190,6 +190,8 @@ MonoBehaviour: - Voice - LineDuration - LookAtPlayer + - __option_EventKey + - WaitForInput m_ValueList: - rid: 6595524353106116637 - rid: 6595524353106116638 @@ -199,6 +201,8 @@ MonoBehaviour: - rid: 6595524353106116642 - rid: 6595524353106116643 - rid: 6595524353106116644 + - rid: 8414246349295583521 + - rid: 8414246349295583522 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -310,6 +314,8 @@ MonoBehaviour: - Voice - LineDuration - LookAtPlayer + - __option_EventKey + - WaitForInput m_ValueList: - rid: 6595524353106116648 - rid: 6595524353106116649 @@ -319,6 +325,8 @@ MonoBehaviour: - rid: 6595524353106116653 - rid: 6595524353106116654 - rid: 6595524353106116655 + - rid: 8414246349295583523 + - rid: 8414246349295583524 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -430,6 +438,8 @@ MonoBehaviour: - Voice - LineDuration - LookAtPlayer + - __option_EventKey + - WaitForInput m_ValueList: - rid: 8414246349295583387 - rid: 8414246349295583388 @@ -439,6 +449,8 @@ MonoBehaviour: - rid: 8414246349295583392 - rid: 8414246349295583393 - rid: 8414246349295583394 + - rid: 8414246349295583525 + - rid: 8414246349295583526 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -523,3 +535,27 @@ MonoBehaviour: m_PortDirection: 1 m_PortOrientation: 0 m_Title: + - rid: 8414246349295583521 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + - rid: 8414246349295583522 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583523 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + - rid: 8414246349295583524 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583525 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: + - rid: 8414246349295583526 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 diff --git a/Assets/My project/Fonts/Pretendard-Black SDF.asset b/Assets/My project/Fonts/Pretendard-Black SDF.asset index 0977b864..afbcf0ab 100644 --- a/Assets/My project/Fonts/Pretendard-Black SDF.asset +++ b/Assets/My project/Fonts/Pretendard-Black SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8140abcb9e70554ebaec17832cccb8f31485b9a5cd1b5c0da97adffe14c50f5 -size 41396192 +oid sha256:a81a06b57f04031dc553ed2a18857edbf18e5f2ef32f65f713e538f6cebf5da5 +size 7807136 diff --git a/Assets/XR/AndroidXR/AndroidXRSettingsInitializer b/Assets/XR/AndroidXR/AndroidXRSettingsInitializer index f9a9372d..ba1ef72f 100644 --- a/Assets/XR/AndroidXR/AndroidXRSettingsInitializer +++ b/Assets/XR/AndroidXR/AndroidXRSettingsInitializer @@ -11,5 +11,5 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d7e9a0ba2b7f40ebbb3dad8385aa807b, type: 3} m_Name: - m_EditorClassIdentifier: Unity.XR.AndroidOpenXR.Editor::UnityEditor.XR.OpenXR.Features.Android.AndroidXRSettingsInitializer + m_EditorClassIdentifier: isInitialized: 0