From f55d53e0278cb64a4d0b25fbe46a732b95344ec6 Mon Sep 17 00:00:00 2001 From: rainylinjing-reboot Date: Tue, 23 Jun 2026 11:30:22 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=A1=B0=EA=B0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Cave_Test_2.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/01_Scenes/Cave_Test_2.unity b/Assets/01_Scenes/Cave_Test_2.unity index 9e2bc848..b464beef 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:7ee90cb504baf5bfa40c4fcf5713a6c96739b4ad9c4a4c8f6bdf4e76f586a7bc -size 921497 +oid sha256:1be5b58392cdd2a0cfaa604df71dd546d7f0a1aca86801f20b1eb8d18f07650d +size 922954 From ee83d7bc2043afc201930d54a5007797846006ac Mon Sep 17 00:00:00 2001 From: rainylinjing-reboot Date: Tue, 23 Jun 2026 17:17:00 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=AC=B8=EB=8B=AC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Cave_Test_2.meta | 8 + Assets/01_Scenes/Cave_Test_2.unity | 4 +- .../Cave_Test_2/Global Volume Profile.asset | 3 + .../Global Volume Profile.asset.meta | 8 + .../Cave_Test_2/NavMesh-Cube (2).asset | 3 + .../Cave_Test_2/NavMesh-Cube (2).asset.meta | 8 + .../01_Scenes/Cave_Test_2/NavMesh-Cube.asset | 3 + .../Cave_Test_2/NavMesh-Cube.asset.meta | 8 + .../Cave_Test_2/NavMesh-NavMesh Surface.asset | 3 + .../NavMesh-NavMesh Surface.asset.meta | 8 + .../Cave_Test_2/NavMesh-Raft 1.asset | 3 + .../Cave_Test_2/NavMesh-Raft 1.asset.meta | 8 + .../01_Scenes/Cave_Test_2/NavMesh-Raft.asset | 3 + .../Cave_Test_2/NavMesh-Raft.asset.meta | 8 + .../NavMesh-StylizedWater_Desktop (9).asset | 3 + ...vMesh-StylizedWater_Desktop (9).asset.meta | 8 + .../01_Scenes/Cave_Test_2/NavMesh-alt.asset | 3 + .../Cave_Test_2/NavMesh-alt.asset.meta | 8 + Assets/02_Scripts/Cave/ClamBiteDetector.cs | 445 ++++++++++++--- Assets/02_Scripts/Cave/FallingStalactite.cs | 167 ++++++ .../02_Scripts/Cave/FallingStalactite.cs.meta | 2 + Assets/02_Scripts/Cave/RaftRideEndHandler.cs | 158 +++++- .../02_Scripts/Cave/StalactiteFallTrigger.cs | 143 +++++ .../Cave/StalactiteFallTrigger.cs.meta | 2 + .../Communication/DialogGraph/Cave.meta | 8 + .../DialogGraph/Cave/Fairy_CaveEnd.wdg | 406 ++++++++++++++ .../DialogGraph/Cave/Fairy_CaveEnd.wdg.meta | 10 + .../DialogGraph/Cave/Fairy_CaveStart.wdg | 525 ++++++++++++++++++ .../DialogGraph/Cave/Fairy_CaveStart.wdg.meta | 10 + .../Fonts/Pretendard-Black SDF.asset | 4 +- .../Materials/StylizedWater3_Default cave.mat | 4 +- 31 files changed, 1894 insertions(+), 90 deletions(-) create mode 100644 Assets/01_Scenes/Cave_Test_2.meta create mode 100644 Assets/01_Scenes/Cave_Test_2/Global Volume Profile.asset create mode 100644 Assets/01_Scenes/Cave_Test_2/Global Volume Profile.asset.meta create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset.meta create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-Cube.asset create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-Cube.asset.meta create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-NavMesh Surface.asset create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-NavMesh Surface.asset.meta create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-Raft 1.asset create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-Raft 1.asset.meta create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-Raft.asset create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-Raft.asset.meta create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-StylizedWater_Desktop (9).asset create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-StylizedWater_Desktop (9).asset.meta create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-alt.asset create mode 100644 Assets/01_Scenes/Cave_Test_2/NavMesh-alt.asset.meta create mode 100644 Assets/02_Scripts/Cave/FallingStalactite.cs create mode 100644 Assets/02_Scripts/Cave/FallingStalactite.cs.meta create mode 100644 Assets/02_Scripts/Cave/StalactiteFallTrigger.cs create mode 100644 Assets/02_Scripts/Cave/StalactiteFallTrigger.cs.meta create mode 100644 Assets/07_Data/Communication/DialogGraph/Cave.meta create mode 100644 Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg create mode 100644 Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg.meta create mode 100644 Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg create mode 100644 Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg.meta diff --git a/Assets/01_Scenes/Cave_Test_2.meta b/Assets/01_Scenes/Cave_Test_2.meta new file mode 100644 index 00000000..04df4f0e --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22c48954392c4924a9f14a73f3fbbb3d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/Cave_Test_2.unity b/Assets/01_Scenes/Cave_Test_2.unity index b464beef..c37b2f68 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:1be5b58392cdd2a0cfaa604df71dd546d7f0a1aca86801f20b1eb8d18f07650d -size 922954 +oid sha256:72a4d3341d25bee59d8ce59d54f63f884d8949904508d6cab593f6b4ee365237 +size 1012409 diff --git a/Assets/01_Scenes/Cave_Test_2/Global Volume Profile.asset b/Assets/01_Scenes/Cave_Test_2/Global Volume Profile.asset new file mode 100644 index 00000000..ebce9715 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/Global Volume Profile.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e275c4de23f79d7f5c5be06372e75f0fba587421b5613de2dd4e7b1f1bba64f0 +size 1670 diff --git a/Assets/01_Scenes/Cave_Test_2/Global Volume Profile.asset.meta b/Assets/01_Scenes/Cave_Test_2/Global Volume Profile.asset.meta new file mode 100644 index 00000000..f1ff9bde --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 293ae9b4ba9bb864eb13ed76498d8af1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset b/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset new file mode 100644 index 00000000..9d976047 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:204c3453d8a8b9e111d27c31abb46c735458952a8f33fac80bdb05303c8d2f3b +size 1098428 diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset.meta b/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset.meta new file mode 100644 index 00000000..1190bb46 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e784aa74ee4b0b6478f487690cea54a8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube.asset b/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube.asset new file mode 100644 index 00000000..2a47e823 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb230edd5bdace918e5e91fb8539389382a4e1227e614640e4b38b1a26334532 +size 962136 diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube.asset.meta b/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube.asset.meta new file mode 100644 index 00000000..3675f7ed --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-Cube.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5557f000a847e6543bf4b91f966c7a17 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-NavMesh Surface.asset b/Assets/01_Scenes/Cave_Test_2/NavMesh-NavMesh Surface.asset new file mode 100644 index 00000000..3737ea62 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-NavMesh Surface.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b2f44d348a4dc9d0fb1838c0d55958ab4a1fc62baf81114d77a8216683845b9 +size 1093644 diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-NavMesh Surface.asset.meta b/Assets/01_Scenes/Cave_Test_2/NavMesh-NavMesh Surface.asset.meta new file mode 100644 index 00000000..be688856 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-NavMesh Surface.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd0bb753427d9b942acb6f375babd10c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft 1.asset b/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft 1.asset new file mode 100644 index 00000000..8ac18e8d --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft 1.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e6e4263c29a361bce94bd15f9cfe744480ae0ca6c10b7929610ef83dd8a99d8 +size 1081800 diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft 1.asset.meta b/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft 1.asset.meta new file mode 100644 index 00000000..000a459d --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft 1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09328789fee0d6545a33ffe0936cb421 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft.asset b/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft.asset new file mode 100644 index 00000000..be8cb666 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd8ecc30b1d785af53c01ac6aee8d4c1febfbfd67cc1ff3e25a6872d7f56e9af +size 1082200 diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft.asset.meta b/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft.asset.meta new file mode 100644 index 00000000..f6d564f3 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-Raft.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0ce582b15881184db9fe7ed94ad5d90 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-StylizedWater_Desktop (9).asset b/Assets/01_Scenes/Cave_Test_2/NavMesh-StylizedWater_Desktop (9).asset new file mode 100644 index 00000000..33e14207 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-StylizedWater_Desktop (9).asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9dd056d1cbc183b0af054f99f2e45a764a32f3101df62d617eb0b39d3cba5ca +size 1053356 diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-StylizedWater_Desktop (9).asset.meta b/Assets/01_Scenes/Cave_Test_2/NavMesh-StylizedWater_Desktop (9).asset.meta new file mode 100644 index 00000000..8cffd671 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-StylizedWater_Desktop (9).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b08abd6d4e548046ad05dcfeab40a03 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-alt.asset b/Assets/01_Scenes/Cave_Test_2/NavMesh-alt.asset new file mode 100644 index 00000000..c6d079f2 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-alt.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28c731ec7d0e104bc74d12ecac0652b8341e3d3fc327bb3ec99c7919f14acc74 +size 674084 diff --git a/Assets/01_Scenes/Cave_Test_2/NavMesh-alt.asset.meta b/Assets/01_Scenes/Cave_Test_2/NavMesh-alt.asset.meta new file mode 100644 index 00000000..537d2145 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/NavMesh-alt.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 28542cc7fcf9a964c80227023cd1aa9f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/Cave/ClamBiteDetector.cs b/Assets/02_Scripts/Cave/ClamBiteDetector.cs index 82f51618..b2bb137a 100644 --- a/Assets/02_Scripts/Cave/ClamBiteDetector.cs +++ b/Assets/02_Scripts/Cave/ClamBiteDetector.cs @@ -1,5 +1,7 @@ using System.Collections.Generic; using UnityEngine; +using UnityEngine.Events; +using UnityEngine.XR.Interaction.Toolkit; using UnityEngine.XR.Interaction.Toolkit.Interactables; public class ClamBiteDetector : MonoBehaviour @@ -21,22 +23,48 @@ public class ClamBiteDetector : MonoBehaviour [Tooltip("조개가 닫히는 동안 이미 한 번 물렸으면 추가 판정을 막습니다.")] [SerializeField] private bool biteOncePerClose = true; - [Header("Target Detection")] - [Tooltip("손 오브젝트에 붙일 태그입니다. 태그를 안 쓰면 XRHandMarker로도 판정합니다.")] - [SerializeField] private string handTag = "PlayerHand"; + [Tooltip("미션 중 BiteZone Collider를 계속 켜두어 조각이 빠져나갔는지 추적합니다.")] + [SerializeField] private bool keepBiteZoneEnabledDuringMission = true; - [Tooltip("기억의 조각 태그입니다. 단, 조각은 잡힌 상태일 때만 물림 대상으로 봅니다.")] + [Header("Fragment Rule")] + [Tooltip("기억의 조각을 잡은 뒤 BiteZone을 빠져나가지 못한 상태에서 조개가 닫히면 물림 처리합니다.")] + [SerializeField] private bool biteIfGrabbedFragmentDidNotExitBiteZone = true; + + [Tooltip("기억의 조각을 잡고 있을 때만 조각 물림 판정을 합니다.")] + [SerializeField] private bool biteFragmentOnlyWhenGrabbed = true; + + [Header("Hand Rule")] + [Tooltip("손 콜라이더가 BiteZone 안에 있으면 조개가 닫힐 때 물림 처리합니다.")] + [SerializeField] private bool biteHandInsideZone = true; + + [Header("Target Detection")] + [SerializeField] private string handTag = "PlayerHand"; [SerializeField] private string fragmentTag = "MemoryFragment"; - [Tooltip("기억의 조각은 플레이어가 잡고 있을 때만 물림 판정합니다.")] - [SerializeField] private bool biteFragmentOnlyWhenGrabbed = true; + [Header("Clear Event")] + [Tooltip("기억의 조각을 잡은 상태로 BiteZone 밖으로 빼냈을 때 한 번만 성공 처리합니다.")] + [SerializeField] private bool clearOnce = true; + + [Tooltip("성공하면 조개 물림 미션을 끕니다.")] + [SerializeField] private bool stopMissionOnClear = true; + + public UnityEvent onMemoryFragmentEscaped; [Header("Debug")] [SerializeField] private bool showDebugLog = true; private bool missionActive; + private bool biteWindowOpen; private bool hasBittenThisClose; + private bool fragmentGrabbed; + private bool fragmentInsideBiteZone; + private bool fragmentGrabStartedInsideBiteZone; + private bool clearTriggered; + + private XRGrabInteractable memoryGrabInteractable; + private Collider[] memoryFragmentColliders; + private readonly HashSet collidersInside = new(); private void Awake() @@ -59,16 +87,45 @@ private void Awake() if (memoryFragment == null) memoryFragment = FindFirstObjectByType(); + if (memoryFragment != null) + { + memoryGrabInteractable = memoryFragment.GetComponent(); + memoryFragmentColliders = memoryFragment.GetComponentsInChildren(true); + } + missionActive = missionActiveOnStart; } + private void Start() + { + if (missionActive && keepBiteZoneEnabledDuringMission) + { + SetBiteZoneEnabled(true); + RefreshInitialOverlapState(); + } + } + + private void Update() + { + if (!missionActive || !fragmentGrabbed || !fragmentGrabStartedInsideBiteZone || clearTriggered) + return; + + UpdateFragmentOverlapState(); + } + private void OnEnable() { if (clam != null) { - clam.onCloseStarted.AddListener(EnableBiteWindow); - clam.onClosed.AddListener(DisableBiteWindow); - clam.onOpened.AddListener(ResetBiteState); + clam.onCloseStarted.AddListener(OnClamCloseStarted); + clam.onClosed.AddListener(OnClamClosed); + clam.onOpened.AddListener(OnClamOpened); + } + + if (memoryGrabInteractable != null) + { + memoryGrabInteractable.selectEntered.AddListener(OnFragmentGrabbed); + memoryGrabInteractable.selectExited.AddListener(OnFragmentReleased); } } @@ -76,9 +133,15 @@ private void OnDisable() { if (clam != null) { - clam.onCloseStarted.RemoveListener(EnableBiteWindow); - clam.onClosed.RemoveListener(DisableBiteWindow); - clam.onOpened.RemoveListener(ResetBiteState); + clam.onCloseStarted.RemoveListener(OnClamCloseStarted); + clam.onClosed.RemoveListener(OnClamClosed); + clam.onOpened.RemoveListener(OnClamOpened); + } + + if (memoryGrabInteractable != null) + { + memoryGrabInteractable.selectEntered.RemoveListener(OnFragmentGrabbed); + memoryGrabInteractable.selectExited.RemoveListener(OnFragmentReleased); } } @@ -86,111 +149,225 @@ private void OnTriggerEnter(Collider other) { collidersInside.Add(other); - if (IsBiteWindowOpen()) - TryBite(other); + if (IsMemoryFragmentCollider(other)) + { + fragmentInsideBiteZone = true; + } + + if (biteWindowOpen) + { + TryBiteByCollider(other); + } } private void OnTriggerStay(Collider other) { collidersInside.Add(other); - if (IsBiteWindowOpen()) - TryBite(other); + if (IsMemoryFragmentCollider(other)) + { + fragmentInsideBiteZone = true; + } + + if (biteWindowOpen) + { + TryBiteByCollider(other); + } } private void OnTriggerExit(Collider other) { collidersInside.Remove(other); + + if (IsMemoryFragmentCollider(other)) + { + UpdateFragmentOverlapState(); + } } public void StartBiteMission() { missionActive = true; + biteWindowOpen = false; hasBittenThisClose = false; + clearTriggered = false; + collidersInside.Clear(); + SetBiteZoneEnabled(true); + RefreshInitialOverlapState(); + if (showDebugLog) - Debug.Log("[ClamBiteDetector] 조개 미션 시작. 물림 판정 활성 준비.", this); + Debug.Log("[ClamBiteDetector] 조개 미션 시작. BiteZone 추적 ON.", this); } public void StopBiteMission() { missionActive = false; + biteWindowOpen = false; hasBittenThisClose = false; + + fragmentGrabbed = false; + fragmentInsideBiteZone = false; + fragmentGrabStartedInsideBiteZone = false; + collidersInside.Clear(); - if (biteZoneCollider != null) - biteZoneCollider.enabled = false; + SetBiteZoneEnabled(false); if (showDebugLog) - Debug.Log("[ClamBiteDetector] 조개 미션 정지. 물림 판정 비활성.", this); + Debug.Log("[ClamBiteDetector] 조개 미션 정지. BiteZone 추적 OFF.", this); } - private void EnableBiteWindow() + private void OnClamOpened() + { + hasBittenThisClose = false; + biteWindowOpen = false; + + if (!missionActive) + return; + + SetBiteZoneEnabled(true); + RefreshInitialOverlapState(); + } + + private void OnClamCloseStarted() { if (!missionActive) return; hasBittenThisClose = false; + biteWindowOpen = true; - if (biteZoneCollider != null) - biteZoneCollider.enabled = true; + SetBiteZoneEnabled(true); + RefreshInitialOverlapState(); if (showDebugLog) - Debug.Log("[ClamBiteDetector] 조개 물림 판정 ON", this); + Debug.Log("[ClamBiteDetector] 조개 닫힘 시작. 물림 판정 체크.", this); - foreach (Collider col in collidersInside) + TryBiteGrabbedFragmentIfStillInside(); + TryBiteCurrentHandsInside(); + } + + private void OnClamClosed() + { + biteWindowOpen = false; + hasBittenThisClose = false; + collidersInside.Clear(); + + if (!missionActive) + return; + + if (keepBiteZoneEnabledDuringMission) { - if (col != null) - TryBite(col); + SetBiteZoneEnabled(true); + RefreshInitialOverlapState(); } + else + { + SetBiteZoneEnabled(false); + } + + if (showDebugLog) + Debug.Log("[ClamBiteDetector] 조개 닫힘 완료. 물림 판정 종료.", this); } - private void DisableBiteWindow() + private void OnFragmentGrabbed(SelectEnterEventArgs args) { - if (biteZoneCollider != null) - biteZoneCollider.enabled = false; + fragmentGrabbed = true; + fragmentInsideBiteZone = IsFragmentOverlappingBiteZone(); + fragmentGrabStartedInsideBiteZone = fragmentInsideBiteZone; - collidersInside.Clear(); + RefreshInitialOverlapState(); - if (showDebugLog && missionActive) - Debug.Log("[ClamBiteDetector] 조개 물림 판정 OFF", this); + if (showDebugLog) + Debug.Log("[ClamBiteDetector] 기억의 조각을 잡았습니다.", this); } - private void ResetBiteState() + private void OnFragmentReleased(SelectExitEventArgs args) { - hasBittenThisClose = false; + fragmentGrabbed = false; + fragmentGrabStartedInsideBiteZone = false; + + if (showDebugLog) + Debug.Log("[ClamBiteDetector] 기억의 조각을 놓았습니다.", this); } - private bool IsBiteWindowOpen() + private void TryBiteGrabbedFragmentIfStillInside() { - if (!missionActive) - return false; - - if (biteZoneCollider == null) - return false; - - return biteZoneCollider.enabled; - } - - private void TryBite(Collider other) - { - if (other == null) + if (!biteIfGrabbedFragmentDidNotExitBiteZone) return; - if (!missionActive) + if (memoryFragment == null) return; if (biteOncePerClose && hasBittenThisClose) return; - bool isHand = IsHandCollider(other); - bool isGrabbedFragment = IsGrabbedMemoryFragment(other); + bool isSelected = IsFragmentGrabbed(); - if (!isHand && !isGrabbedFragment) + if (biteFragmentOnlyWhenGrabbed && !isSelected) + return; + + bool shouldBite = isSelected && IsFragmentOverlappingBiteZone(); + + if (!shouldBite) + return; + + BiteNow("기억의 조각을 잡은 뒤 BiteZone 밖으로 빼내지 못함"); + } + + private void TryBiteCurrentHandsInside() + { + if (!biteHandInsideZone) + return; + + foreach (Collider col in collidersInside) + { + if (col == null) + continue; + + if (IsHandCollider(col)) + { + BiteNow("손이 BiteZone 안에 있음"); + return; + } + } + } + + private void TryBiteByCollider(Collider other) + { + if (!missionActive) + return; + + if (!biteWindowOpen) + return; + + if (biteOncePerClose && hasBittenThisClose) + return; + + if (biteHandInsideZone && IsHandCollider(other)) + { + BiteNow("손이 BiteZone 안에 있음"); + return; + } + + if (IsMemoryFragmentCollider(other)) + { + if (memoryGrabInteractable != null && memoryGrabInteractable.isSelected) + { + BiteNow("기억의 조각이 BiteZone 안에 있음"); + } + } + } + + private void BiteNow(string reason) + { + if (biteOncePerClose && hasBittenThisClose) return; hasBittenThisClose = true; + biteWindowOpen = false; if (health != null) health.TakeDamage(biteDamage); @@ -198,45 +375,153 @@ private void TryBite(Collider other) if (memoryFragment != null) memoryFragment.ResetFragment(); + fragmentGrabbed = false; + fragmentInsideBiteZone = false; + fragmentGrabStartedInsideBiteZone = false; + if (showDebugLog) { - Debug.Log($"[ClamBiteDetector] 조개에게 물림. 데미지 {biteDamage}, 기억의 조각 리셋", this); + Debug.Log($"[ClamBiteDetector] 조개에게 물림. 이유: {reason}. 데미지 {biteDamage}, 기억의 조각 리셋", this); } } + private void TriggerMemoryFragmentEscaped() + { + if (clearOnce && clearTriggered) + return; + + clearTriggered = true; + + if (showDebugLog) + Debug.Log("[ClamBiteDetector] 기억의 조각 꺼내기 성공. 클리어 이벤트 실행.", this); + + onMemoryFragmentEscaped?.Invoke(); + + if (stopMissionOnClear) + { + StopBiteMission(); + } + } + + private void RefreshInitialOverlapState() + { + if (biteZoneCollider == null || !biteZoneCollider.enabled) + return; + + collidersInside.Clear(); + fragmentInsideBiteZone = false; + + Bounds bounds = biteZoneCollider.bounds; + + Collider[] hits = Physics.OverlapBox( + bounds.center, + bounds.extents, + biteZoneCollider.transform.rotation, + ~0, + QueryTriggerInteraction.Collide + ); + + foreach (Collider hit in hits) + { + if (hit == null) + continue; + + collidersInside.Add(hit); + + if (IsMemoryFragmentCollider(hit)) + fragmentInsideBiteZone = true; + } + } + + private void UpdateFragmentOverlapState() + { + bool wasInside = fragmentInsideBiteZone; + fragmentInsideBiteZone = IsFragmentOverlappingBiteZone(); + + if (!wasInside || fragmentInsideBiteZone) + return; + + if (!fragmentGrabbed || !missionActive || !fragmentGrabStartedInsideBiteZone) + return; + + if (showDebugLog) + Debug.Log("[ClamBiteDetector] 기억의 조각이 BiteZone 밖으로 빠져나갔습니다.", this); + + TriggerMemoryFragmentEscaped(); + } + + private bool IsFragmentOverlappingBiteZone() + { + if (biteZoneCollider == null || memoryFragment == null) + return false; + + if (memoryFragmentColliders == null || memoryFragmentColliders.Length == 0) + memoryFragmentColliders = memoryFragment.GetComponentsInChildren(true); + + foreach (Collider fragmentCollider in memoryFragmentColliders) + { + if (fragmentCollider == null || fragmentCollider == biteZoneCollider) + continue; + + if (Physics.ComputePenetration( + biteZoneCollider, + biteZoneCollider.transform.position, + biteZoneCollider.transform.rotation, + fragmentCollider, + fragmentCollider.transform.position, + fragmentCollider.transform.rotation, + out _, + out _)) + { + return true; + } + + if (biteZoneCollider.bounds.Intersects(fragmentCollider.bounds)) + { + return true; + } + } + + return false; + } + + private bool IsFragmentGrabbed() + { + if (memoryGrabInteractable != null) + return memoryGrabInteractable.isSelected; + + return fragmentGrabbed; + } + + private void SetBiteZoneEnabled(bool enabled) + { + if (biteZoneCollider == null) + return; + + biteZoneCollider.enabled = enabled; + } + + private bool IsMemoryFragmentCollider(Collider other) + { + if (other == null) + return false; + + if (other.CompareTag(fragmentTag)) + return true; + + MemoryFragmentReset fragment = other.GetComponentInParent(); + return fragment != null; + } + private bool IsHandCollider(Collider other) { + if (other == null) + return false; + if (other.CompareTag(handTag)) return true; XRHandMarker marker = other.GetComponentInParent(); - return marker != null; } - - private bool IsGrabbedMemoryFragment(Collider other) - { - MemoryFragmentReset fragment = other.GetComponentInParent(); - - if (fragment == null) - { - if (!other.CompareTag(fragmentTag)) - return false; - - fragment = memoryFragment; - } - - if (fragment == null) - return false; - - XRGrabInteractable grab = fragment.GetComponent(); - - if (grab == null) - return !biteFragmentOnlyWhenGrabbed; - - if (biteFragmentOnlyWhenGrabbed) - return grab.isSelected; - - return true; - } } \ No newline at end of file diff --git a/Assets/02_Scripts/Cave/FallingStalactite.cs b/Assets/02_Scripts/Cave/FallingStalactite.cs new file mode 100644 index 00000000..71aabb1f --- /dev/null +++ b/Assets/02_Scripts/Cave/FallingStalactite.cs @@ -0,0 +1,167 @@ +using System.Collections; +using UnityEngine; + +public class FallingStalactite : MonoBehaviour +{ + [Header("References")] + [SerializeField] private Rigidbody rb; + [SerializeField] private Collider damageCollider; + [SerializeField] private DamageObstacle damageObstacle; + + [Header("Fall Settings")] + [SerializeField] private float fallDelay = 0.0f; + + [Tooltip("떨어질 때 아래 방향으로 추가 속도를 줍니다.")] + [SerializeField] private float initialDownVelocity = 0f; + + [Tooltip("떨어질 때 약간 회전시키고 싶으면 값을 넣습니다.")] + [SerializeField] private Vector3 initialAngularVelocity = new Vector3(0f, 0f, 0f); + + [Header("Damage")] + [SerializeField] private int damage = 10; + + [Tooltip("떨어지기 전에는 데미지를 끄고, 떨어질 때 켭니다.")] + [SerializeField] private bool damageOnlyWhileFalling = true; + + [Header("Reset Option")] + [SerializeField] private bool resetAfterFall = true; + + [Tooltip("떨어진 뒤 몇 초 후 원래 위치로 돌아갈지 설정합니다.")] + [SerializeField] private float resetDelay = 4.0f; + + [Tooltip("리셋할 때 종유석을 다시 숨기지 않고 원위치에 고정합니다.")] + [SerializeField] private bool readyAgainAfterReset = true; + + [Header("Debug")] + [SerializeField] private bool showDebugLog = true; + + private Vector3 startPosition; + private Quaternion startRotation; + private bool hasFallen; + private Coroutine fallRoutine; + + public bool HasFallen => hasFallen; + + private void Awake() + { + ResolveReferences(); + + startPosition = transform.position; + startRotation = transform.rotation; + + PrepareStalactite(); + } + + private void ResolveReferences() + { + if (rb == null) + rb = GetComponent(); + + if (damageCollider == null) + damageCollider = GetComponent(); + + if (damageObstacle == null) + damageObstacle = GetComponent(); + } + + private void PrepareStalactite() + { + if (rb != null) + { + rb.useGravity = false; + rb.isKinematic = true; + rb.linearVelocity = Vector3.zero; + rb.angularVelocity = Vector3.zero; + } + + if (damageObstacle != null) + { + damageObstacle.SetDamage(damage); + damageObstacle.SetCanDamage(!damageOnlyWhileFalling); + } + + if (damageCollider != null) + { + damageCollider.enabled = true; + } + + hasFallen = false; + } + + public void TriggerFall() + { + if (hasFallen) + return; + + if (fallRoutine != null) + StopCoroutine(fallRoutine); + + fallRoutine = StartCoroutine(FallRoutine()); + } + + private IEnumerator FallRoutine() + { + hasFallen = true; + + if (fallDelay > 0f) + yield return new WaitForSeconds(fallDelay); + + if (damageObstacle != null) + { + damageObstacle.SetDamage(damage); + damageObstacle.SetCanDamage(true); + } + + if (rb != null) + { + rb.isKinematic = false; + rb.useGravity = true; + + if (initialDownVelocity > 0f) + { + rb.linearVelocity = Vector3.down * initialDownVelocity; + } + + rb.angularVelocity = initialAngularVelocity; + } + + if (showDebugLog) + Debug.Log($"[FallingStalactite] {name} 낙하 시작. 데미지 {damage}", this); + + if (resetAfterFall) + { + yield return new WaitForSeconds(resetDelay); + ResetStalactite(); + } + + fallRoutine = null; + } + + public void ResetStalactite() + { + if (rb != null) + { + rb.linearVelocity = Vector3.zero; + rb.angularVelocity = Vector3.zero; + rb.useGravity = false; + rb.isKinematic = true; + } + + transform.position = startPosition; + transform.rotation = startRotation; + + if (damageObstacle != null) + { + damageObstacle.SetDamage(damage); + damageObstacle.SetCanDamage(!damageOnlyWhileFalling); + } + + if (readyAgainAfterReset) + { + hasFallen = false; + } + + if (showDebugLog) + Debug.Log($"[FallingStalactite] {name} 원위치 리셋", this); + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Cave/FallingStalactite.cs.meta b/Assets/02_Scripts/Cave/FallingStalactite.cs.meta new file mode 100644 index 00000000..731e62e1 --- /dev/null +++ b/Assets/02_Scripts/Cave/FallingStalactite.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ba858a5e5caeb144d91cb3020852ad0f \ No newline at end of file diff --git a/Assets/02_Scripts/Cave/RaftRideEndHandler.cs b/Assets/02_Scripts/Cave/RaftRideEndHandler.cs index 93ac0796..857b382f 100644 --- a/Assets/02_Scripts/Cave/RaftRideEndHandler.cs +++ b/Assets/02_Scripts/Cave/RaftRideEndHandler.cs @@ -18,12 +18,41 @@ public class RaftRideEndHandler : MonoBehaviour [Tooltip("도착 후 활성화할 조개 미션 오브젝트")] [SerializeField] private GameObject clamMissionObject; - [Tooltip("처음에는 꺼두었다가 나중에 기억의 조각 획득 후 켤 문")] + [Tooltip("기억의 조각 획득 후 켤 다음 문 오브젝트")] [SerializeField] private GameObject nextDoorObject; + [Header("Clam Bite Mission")] + [Tooltip("도착 후 조개 물림 판정을 시작할지 여부")] + [SerializeField] private bool startClamBiteMissionOnArrive = true; + + [Tooltip("직접 연결할 조개 물림 판정 스크립트들입니다. 비워두면 Clam Mission Object 아래에서 자동 탐색합니다.")] + [SerializeField] private ClamBiteDetector[] clamBiteDetectors; + + [Header("Clear Options")] + [Tooltip("조개 미션 성공 시 조개 물림 판정을 정지합니다.")] + [SerializeField] private bool stopClamBiteMissionOnClear = true; + + [Tooltip("조개 미션 성공 시 조개 오브젝트를 계속 유지할지 여부입니다.")] + [SerializeField] private bool keepClamMissionObjectAfterClear = true; + + [Tooltip("조개 미션 성공 시 Next Door Object를 켭니다.")] + [SerializeField] private bool activateNextDoorOnClear = true; + + [Header("Debug")] + [SerializeField] private bool showDebugLog = true; + + private bool hasArrived; + private bool clamMissionCleared; + public void OnRaftArrived() { - Debug.Log("[RaftRideEndHandler] 뗏목 도착 처리 시작."); + if (hasArrived) + return; + + hasArrived = true; + + if (showDebugLog) + Debug.Log("[RaftRideEndHandler] 뗏목 도착 처리 시작."); if (detachPlayerFromRaft && xrOrigin != null) { @@ -32,7 +61,8 @@ public void OnRaftArrived() if (exitPoint != null && xrOrigin != null) { - // 강제로 이동시키고 싶지 않으면 이 부분은 주석 처리해도 됨. + // 현재는 강제 이동하지 않음. + // 필요하면 아래 두 줄을 활성화. // xrOrigin.position = exitPoint.position; // xrOrigin.rotation = exitPoint.rotation; } @@ -52,6 +82,126 @@ public void OnRaftArrived() nextDoorObject.SetActive(false); } - Debug.Log("[RaftRideEndHandler] 이제 플레이어가 육지로 이동해 조개 미션을 진행할 수 있습니다."); + if (startClamBiteMissionOnArrive) + { + StartClamBiteMission(); + } + + if (showDebugLog) + Debug.Log("[RaftRideEndHandler] 도착 처리 완료. 육지/조개 미션 진행 가능."); + } + + public void OnClamMissionCleared() + { + if (clamMissionCleared) + return; + + clamMissionCleared = true; + + if (showDebugLog) + Debug.Log("[RaftRideEndHandler] 조개 미션 클리어. 다음 문을 엽니다."); + + if (stopClamBiteMissionOnClear) + { + StopClamBiteMission(); + } + + if (clamMissionObject != null && !keepClamMissionObjectAfterClear) + { + clamMissionObject.SetActive(false); + } + + if (activateNextDoorOnClear && nextDoorObject != null) + { + nextDoorObject.SetActive(true); + } + else if (activateNextDoorOnClear && nextDoorObject == null) + { + Debug.LogWarning("[RaftRideEndHandler] Next Door Object가 연결되지 않았습니다.", this); + } + } + + public void OpenNextDoor() + { + if (nextDoorObject == null) + { + Debug.LogWarning("[RaftRideEndHandler] Next Door Object가 연결되지 않았습니다.", this); + return; + } + + nextDoorObject.SetActive(true); + + if (showDebugLog) + Debug.Log("[RaftRideEndHandler] Next Door Object 활성화."); + } + + public void CloseNextDoor() + { + if (nextDoorObject == null) + return; + + nextDoorObject.SetActive(false); + + if (showDebugLog) + Debug.Log("[RaftRideEndHandler] Next Door Object 비활성화."); + } + + private void StartClamBiteMission() + { + ResolveClamBiteDetectors(); + + if (clamBiteDetectors == null || clamBiteDetectors.Length == 0) + { + if (showDebugLog) + Debug.LogWarning("[RaftRideEndHandler] ClamBiteDetector를 찾지 못했습니다.", this); + + return; + } + + foreach (ClamBiteDetector detector in clamBiteDetectors) + { + if (detector == null) + continue; + + detector.StartBiteMission(); + } + + if (showDebugLog) + Debug.Log("[RaftRideEndHandler] 조개 물림 미션 시작."); + } + + private void StopClamBiteMission() + { + ResolveClamBiteDetectors(); + + if (clamBiteDetectors == null || clamBiteDetectors.Length == 0) + return; + + foreach (ClamBiteDetector detector in clamBiteDetectors) + { + if (detector == null) + continue; + + detector.StopBiteMission(); + } + + if (showDebugLog) + Debug.Log("[RaftRideEndHandler] 조개 물림 미션 정지."); + } + + private void ResolveClamBiteDetectors() + { + if (clamBiteDetectors != null && clamBiteDetectors.Length > 0) + return; + + if (clamMissionObject != null) + { + clamBiteDetectors = clamMissionObject.GetComponentsInChildren(true); + } + + if (clamBiteDetectors == null || clamBiteDetectors.Length == 0) + { + clamBiteDetectors = FindObjectsByType(FindObjectsSortMode.None); + } } } \ No newline at end of file diff --git a/Assets/02_Scripts/Cave/StalactiteFallTrigger.cs b/Assets/02_Scripts/Cave/StalactiteFallTrigger.cs new file mode 100644 index 00000000..55afb51b --- /dev/null +++ b/Assets/02_Scripts/Cave/StalactiteFallTrigger.cs @@ -0,0 +1,143 @@ +using System.Collections; +using UnityEngine; + +public class StalactiteFallTrigger : MonoBehaviour +{ + [Header("References")] + [SerializeField] private FallingStalactite[] stalactites; + + [Header("Trigger Settings")] + [SerializeField] private bool triggerOnce = true; + + [Tooltip("RaftDamageReceiver가 붙은 RaftHitBox가 들어왔을 때만 작동합니다.")] + [SerializeField] private bool requireRaftDamageReceiver = true; + + [Tooltip("특정 태그가 들어왔을 때도 작동시키고 싶으면 입력합니다. 비워두면 태그 검사를 하지 않습니다.")] + [SerializeField] private string targetTag = ""; + + [Tooltip("트리거 후 종유석이 떨어지기까지의 추가 지연 시간입니다.")] + [SerializeField] private float triggerDelay = 0f; + + [Tooltip("여러 종유석을 순차적으로 떨어뜨릴 때 간격입니다.")] + [SerializeField] private float intervalBetweenStalactites = 0.15f; + + [Header("Debug")] + [SerializeField] private bool showDebugLog = true; + + private bool hasTriggered; + private Coroutine triggerRoutine; + + private void Reset() + { + Collider col = GetComponent(); + + if (col != null) + col.isTrigger = true; + } + + private void Awake() + { + Collider col = GetComponent(); + + if (col != null) + col.isTrigger = true; + + if (stalactites == null || stalactites.Length == 0) + { + stalactites = GetComponentsInChildren(true); + } + } + + private void OnTriggerEnter(Collider other) + { + TryTrigger(other); + } + + private void TryTrigger(Collider other) + { + if (triggerOnce && hasTriggered) + return; + + if (!IsValidTarget(other)) + return; + + hasTriggered = true; + + if (triggerRoutine != null) + StopCoroutine(triggerRoutine); + + triggerRoutine = StartCoroutine(TriggerRoutine()); + + if (showDebugLog) + Debug.Log($"[StalactiteFallTrigger] {name} 작동. 감지 대상: {other.name}", this); + } + + private bool IsValidTarget(Collider other) + { + if (other == null) + return false; + + bool valid = false; + + if (requireRaftDamageReceiver) + { + RaftDamageReceiver receiver = other.GetComponentInParent(); + if (receiver != null) + valid = true; + } + + if (!string.IsNullOrEmpty(targetTag)) + { + if (other.CompareTag(targetTag)) + valid = true; + } + + if (!requireRaftDamageReceiver && string.IsNullOrEmpty(targetTag)) + { + valid = true; + } + + return valid; + } + + private IEnumerator TriggerRoutine() + { + if (triggerDelay > 0f) + yield return new WaitForSeconds(triggerDelay); + + if (stalactites == null || stalactites.Length == 0) + { + if (showDebugLog) + Debug.LogWarning("[StalactiteFallTrigger] 연결된 FallingStalactite가 없습니다.", this); + + yield break; + } + + foreach (FallingStalactite stalactite in stalactites) + { + if (stalactite == null) + continue; + + stalactite.TriggerFall(); + + if (intervalBetweenStalactites > 0f) + yield return new WaitForSeconds(intervalBetweenStalactites); + } + + triggerRoutine = null; + } + + public void ResetTrigger() + { + hasTriggered = false; + + if (triggerRoutine != null) + { + StopCoroutine(triggerRoutine); + triggerRoutine = null; + } + + if (showDebugLog) + Debug.Log($"[StalactiteFallTrigger] {name} 리셋", this); + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Cave/StalactiteFallTrigger.cs.meta b/Assets/02_Scripts/Cave/StalactiteFallTrigger.cs.meta new file mode 100644 index 00000000..11fe5333 --- /dev/null +++ b/Assets/02_Scripts/Cave/StalactiteFallTrigger.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8d76523d73ab7184fa82d121e34448bd \ No newline at end of file diff --git a/Assets/07_Data/Communication/DialogGraph/Cave.meta b/Assets/07_Data/Communication/DialogGraph/Cave.meta new file mode 100644 index 00000000..ba23eec4 --- /dev/null +++ b/Assets/07_Data/Communication/DialogGraph/Cave.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9866be40e3155b43a9769b5afcc0c88 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg new file mode 100644 index 00000000..cf553836 --- /dev/null +++ b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg @@ -0,0 +1,406 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 790b4d75d92f4b0984310a268dbd952f, type: 3} + m_Name: Fairy_CaveEnd + m_EditorClassIdentifier: Unity.GraphToolkit.Editor::Unity.GraphToolkit.Editor.Implementation.GraphObjectImp + m_GraphModel: + rid: 6595524353106116630 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 6595524353106116630 + type: {class: GraphModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 13819889836145151562 + m_Value1: 2645381255326452780 + m_HashGuid: + serializedVersion: 2 + Hash: 4a8e76c6951ccabf2ccc35633c48b624 + m_Name: Fairy_CaveEnd + m_GraphNodeModels: + - rid: 6595524353106116633 + - rid: 6595524353106116635 + - rid: 6595524353106116646 + m_GraphWireModels: + - rid: 6595524353106116636 + - rid: 8414246349295583368 + m_GraphStickyNoteModels: [] + m_GraphPlacematModels: [] + m_GraphVariableModels: [] + m_GraphPortalModels: [] + m_SectionModels: + - rid: 6595524353106116631 + m_LocalSubgraphs: [] + m_LastKnownBounds: + serializedVersion: 2 + x: 222 + y: 76 + width: 1015 + height: 562 + m_GraphElementMetaData: + - m_Guid: + m_Value0: 14845512388065122572 + m_Value1: 17804268460506216482 + m_HashGuid: + serializedVersion: 2 + Hash: 0c5948afdcda05ce22f82972d57715f7 + m_Category: 0 + m_Index: 0 + - m_Guid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_HashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_Category: 0 + m_Index: 1 + - m_Guid: + m_Value0: 5269650743910428719 + m_Value1: 257959026697812224 + m_HashGuid: + serializedVersion: 2 + Hash: 2f7027896e8f214900b9ed385e749403 + m_Category: 2 + m_Index: 0 + - m_Guid: + m_Value0: 7697830479301862552 + m_Value1: 13043115897654624489 + m_HashGuid: + serializedVersion: 2 + Hash: 9864f63b0930d46ae940f4b3cd7402b5 + m_Category: 0 + m_Index: 2 + - m_Guid: + m_Value0: 9676839463197748057 + m_Value1: 16416879655357221472 + m_HashGuid: + serializedVersion: 2 + Hash: 592b62c0380a4b86608ae7f11079d4e3 + m_Category: 2 + m_Index: 1 + m_EntryPoint: + rid: 6595524353106116633 + m_Graph: + rid: 6595524353106116632 + - rid: 6595524353106116631 + type: {class: SectionModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Guid: + m_Value0: 13482299192089173763 + m_Value1: 8100932157345530803 + m_HashGuid: + serializedVersion: 2 + Hash: 03df02d4aebf1abbb3831e64e04a6c70 + m_Version: 2 + m_Items: [] + m_Title: + - rid: 6595524353106116632 + type: {class: DialogGraph, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 6595524353106116633 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 14845512388065122572 + m_Value1: 17804268460506216482 + m_HashGuid: + serializedVersion: 2 + Hash: 0c5948afdcda05ce22f82972d57715f7 + m_Version: 2 + m_Position: {x: 222.2174, y: 116.434784} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: [] + m_ValueList: [] + 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: 6595524353106116634 + - rid: 6595524353106116634 + type: {class: DialogStartNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 6595524353106116635 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_HashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_Version: 2 + m_Position: {x: 445.68893, y: 76.47801} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - Speaker + - TalkText + - Gesture + - Expression + - Voice + - LineDuration + - LookAtPlayer + m_ValueList: + - rid: 6595524353106116637 + - rid: 6595524353106116638 + - rid: 6595524353106116639 + - rid: 6595524353106116640 + - rid: 6595524353106116641 + - rid: 6595524353106116642 + - rid: 6595524353106116643 + - rid: 6595524353106116644 + 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: 6595524353106116645 + - rid: 6595524353106116636 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Guid: + m_Value0: 5269650743910428719 + m_Value1: 257959026697812224 + m_HashGuid: + serializedVersion: 2 + Hash: 2f7027896e8f214900b9ed385e749403 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 14845512388065122572 + m_Value1: 17804268460506216482 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 0c5948afdcda05ce22f82972d57715f7 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 6595524353106116637 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 6595524353106116638 + 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: 6595524353106116639 + 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: "\uD574\uB0C8\uC5B4, \uD53C\uB178\uD0A4\uC624! \r\n\uAE30\uC5B5\uC758 + \uC870\uAC01\uC744 \uCC3E\uC558\uC5B4.\r\n" + - rid: 6595524353106116640 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116641 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116642 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116643 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 5 + - rid: 6595524353106116644 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 1 + - rid: 6595524353106116645 + type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 6595524353106116646 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 7697830479301862552 + m_Value1: 13043115897654624489 + m_HashGuid: + serializedVersion: 2 + Hash: 9864f63b0930d46ae940f4b3cd7402b5 + m_Version: 2 + m_Position: {x: 830.3975, y: 76.96198} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - Speaker + - TalkText + - Gesture + - Expression + - Voice + - LineDuration + - LookAtPlayer + - ChoiceQuestion + - Choice0Text + - Choice1Text + m_ValueList: + - rid: 6595524353106116648 + - rid: 6595524353106116649 + - rid: 6595524353106116650 + - rid: 6595524353106116651 + - rid: 6595524353106116652 + - rid: 6595524353106116653 + - rid: 6595524353106116654 + - rid: 6595524353106116655 + - rid: 8414246349295583420 + - rid: 8414246349295583421 + - rid: 8414246349295583422 + 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: 6595524353106116656 + - rid: 6595524353106116648 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 2 + - rid: 6595524353106116649 + 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 + 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 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116652 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116653 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116654 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 5 + - rid: 6595524353106116655 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 1 + - rid: 6595524353106116656 + type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 8414246349295583368 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Guid: + m_Value0: 9676839463197748057 + m_Value1: 16416879655357221472 + m_HashGuid: + serializedVersion: 2 + Hash: 592b62c0380a4b86608ae7f11079d4e3 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 7697830479301862552 + m_Value1: 13043115897654624489 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 9864f63b0930d46ae940f4b3cd7402b5 + 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} + 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} + 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: diff --git a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg.meta b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg.meta new file mode 100644 index 00000000..f797bb9e --- /dev/null +++ b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 933ac3f32496ef947b565cafab251cb6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 2ae5ca89bbed445479d9023586f0c041, type: 3} diff --git a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg new file mode 100644 index 00000000..48447e3e --- /dev/null +++ b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg @@ -0,0 +1,525 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 790b4d75d92f4b0984310a268dbd952f, type: 3} + m_Name: Fairy_CaveStart + m_EditorClassIdentifier: Unity.GraphToolkit.Editor::Unity.GraphToolkit.Editor.Implementation.GraphObjectImp + m_GraphModel: + rid: 6595524353106116630 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 6595524353106116630 + type: {class: GraphModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 13819889836145151562 + m_Value1: 2645381255326452780 + m_HashGuid: + serializedVersion: 2 + Hash: 4a8e76c6951ccabf2ccc35633c48b624 + m_Name: Fairy_CaveStart + m_GraphNodeModels: + - rid: 6595524353106116633 + - rid: 6595524353106116635 + - rid: 6595524353106116646 + - rid: 8414246349295583386 + m_GraphWireModels: + - rid: 6595524353106116636 + - rid: 8414246349295583368 + - rid: 8414246349295583396 + m_GraphStickyNoteModels: [] + m_GraphPlacematModels: [] + m_GraphVariableModels: [] + m_GraphPortalModels: [] + m_SectionModels: + - rid: 6595524353106116631 + m_LocalSubgraphs: [] + m_LastKnownBounds: + serializedVersion: 2 + x: 222 + y: 76 + width: 1337 + height: 340 + m_GraphElementMetaData: + - m_Guid: + m_Value0: 14845512388065122572 + m_Value1: 17804268460506216482 + m_HashGuid: + serializedVersion: 2 + Hash: 0c5948afdcda05ce22f82972d57715f7 + m_Category: 0 + m_Index: 0 + - m_Guid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_HashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_Category: 0 + m_Index: 1 + - m_Guid: + m_Value0: 5269650743910428719 + m_Value1: 257959026697812224 + m_HashGuid: + serializedVersion: 2 + Hash: 2f7027896e8f214900b9ed385e749403 + m_Category: 2 + m_Index: 0 + - m_Guid: + m_Value0: 7697830479301862552 + m_Value1: 13043115897654624489 + m_HashGuid: + serializedVersion: 2 + Hash: 9864f63b0930d46ae940f4b3cd7402b5 + m_Category: 0 + m_Index: 2 + - m_Guid: + m_Value0: 9676839463197748057 + m_Value1: 16416879655357221472 + m_HashGuid: + serializedVersion: 2 + Hash: 592b62c0380a4b86608ae7f11079d4e3 + m_Category: 2 + m_Index: 1 + - m_Guid: + m_Value0: 165892771380819058 + m_Value1: 3661599737597125745 + m_HashGuid: + serializedVersion: 2 + Hash: 7274f5bc985e4d0271e423b58f9dd032 + m_Category: 0 + m_Index: 3 + - m_Guid: + m_Value0: 12805069808161808465 + m_Value1: 3672582199730454926 + m_HashGuid: + serializedVersion: 2 + Hash: 5160907725bfb4b18e415b6f0da2f732 + m_Category: 2 + m_Index: 2 + m_EntryPoint: + rid: 6595524353106116633 + m_Graph: + rid: 6595524353106116632 + - rid: 6595524353106116631 + type: {class: SectionModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Guid: + m_Value0: 13482299192089173763 + m_Value1: 8100932157345530803 + m_HashGuid: + serializedVersion: 2 + Hash: 03df02d4aebf1abbb3831e64e04a6c70 + m_Version: 2 + m_Items: [] + m_Title: + - rid: 6595524353106116632 + type: {class: DialogGraph, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 6595524353106116633 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 14845512388065122572 + m_Value1: 17804268460506216482 + m_HashGuid: + serializedVersion: 2 + Hash: 0c5948afdcda05ce22f82972d57715f7 + m_Version: 2 + m_Position: {x: 222.2174, y: 116.434784} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: [] + m_ValueList: [] + 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: 6595524353106116634 + - rid: 6595524353106116634 + type: {class: DialogStartNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 6595524353106116635 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_HashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_Version: 2 + m_Position: {x: 445.68893, y: 76.47801} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - Speaker + - TalkText + - Gesture + - Expression + - Voice + - LineDuration + - LookAtPlayer + m_ValueList: + - rid: 6595524353106116637 + - rid: 6595524353106116638 + - rid: 6595524353106116639 + - rid: 6595524353106116640 + - rid: 6595524353106116641 + - rid: 6595524353106116642 + - rid: 6595524353106116643 + - rid: 6595524353106116644 + 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: 6595524353106116645 + - rid: 6595524353106116636 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Guid: + m_Value0: 5269650743910428719 + m_Value1: 257959026697812224 + m_HashGuid: + serializedVersion: 2 + Hash: 2f7027896e8f214900b9ed385e749403 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 14845512388065122572 + m_Value1: 17804268460506216482 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 0c5948afdcda05ce22f82972d57715f7 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 6595524353106116637 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 6595524353106116638 + 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: 6595524353106116639 + 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: "\uD53C\uB178\uD0A4\uC624, \n\uC5EC\uAE30\uB294 \uAC70\uAFB8\uB85C + \uACC4\uACE1\uC774\uC57C.\r\n\uB9CE\uC740 \uC704\uD5D8\uC774 \uC228\uC5B4\uC788\uB294 + \uACF3\uC774\uC9C0." + - rid: 6595524353106116640 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116641 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116642 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116643 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 5 + - rid: 6595524353106116644 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 1 + - rid: 6595524353106116645 + type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 6595524353106116646 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 7697830479301862552 + m_Value1: 13043115897654624489 + m_HashGuid: + serializedVersion: 2 + Hash: 9864f63b0930d46ae940f4b3cd7402b5 + m_Version: 2 + m_Position: {x: 830.3975, y: 76.96198} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - Speaker + - TalkText + - Gesture + - Expression + - Voice + - LineDuration + - LookAtPlayer + m_ValueList: + - rid: 6595524353106116648 + - rid: 6595524353106116649 + - rid: 6595524353106116650 + - rid: 6595524353106116651 + - rid: 6595524353106116652 + - rid: 6595524353106116653 + - rid: 6595524353106116654 + - rid: 6595524353106116655 + 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: 6595524353106116656 + - rid: 6595524353106116648 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 6595524353106116649 + 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 + 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: "\uC800\uAE30 \uAC15\uB05D, \uC870\uAC1C \uC548\uC5D0\uC11C \uAE30\uC5B5\uC758 + \uC870\uAC01\uC774 \uC788\uC5B4. \n\uC870\uAC1C\uAC00 \uB2EB\uD788\uAE30 + \uC804\uC5D0 \uAEBC\uB0B4\uC57C \uD574." + - rid: 6595524353106116651 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116652 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116653 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 6595524353106116654 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 5 + - rid: 6595524353106116655 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 1 + - rid: 6595524353106116656 + type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 8414246349295583368 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Guid: + m_Value0: 9676839463197748057 + m_Value1: 16416879655357221472 + m_HashGuid: + serializedVersion: 2 + Hash: 592b62c0380a4b86608ae7f11079d4e3 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 7989713923298697385 + m_Value1: 15604869423937906234 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: a920365f7b2ae16e3a662c1c10a28fd8 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 7697830479301862552 + m_Value1: 13043115897654624489 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 9864f63b0930d46ae940f4b3cd7402b5 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 8414246349295583386 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor} + data: + m_Guid: + m_Value0: 165892771380819058 + m_Value1: 3661599737597125745 + m_HashGuid: + serializedVersion: 2 + Hash: 7274f5bc985e4d0271e423b58f9dd032 + m_Version: 2 + m_Position: {x: 1219.72, y: 76.582504} + 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 + m_ValueList: + - rid: 8414246349295583387 + - rid: 8414246349295583388 + - rid: 8414246349295583389 + - rid: 8414246349295583390 + - rid: 8414246349295583391 + - rid: 8414246349295583392 + - rid: 8414246349295583393 + - rid: 8414246349295583394 + 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: 8414246349295583395 + - rid: 8414246349295583387 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583388 + 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: 8414246349295583389 + 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: "\uC624\uB978\uC190 \uC544\uB798 \uD0A4\uB97C \uC7A1\uC544.\n\uC790, + \uCD9C\uBC1C\uD558\uC790!!" + - rid: 8414246349295583390 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 8414246349295583391 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 8414246349295583392 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: {fileID: 0} + - rid: 8414246349295583393 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 5 + - rid: 8414246349295583394 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Value: 0 + - rid: 8414246349295583395 + type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 8414246349295583396 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} + data: + m_Guid: + m_Value0: 12805069808161808465 + m_Value1: 3672582199730454926 + m_HashGuid: + serializedVersion: 2 + Hash: 5160907725bfb4b18e415b6f0da2f732 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 7697830479301862552 + m_Value1: 13043115897654624489 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 9864f63b0930d46ae940f4b3cd7402b5 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 165892771380819058 + m_Value1: 3661599737597125745 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 7274f5bc985e4d0271e423b58f9dd032 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: diff --git a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg.meta b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg.meta new file mode 100644 index 00000000..b4eb8f71 --- /dev/null +++ b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1b6a698bc20e6604286457901cb51e77 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 2ae5ca89bbed445479d9023586f0c041, type: 3} diff --git a/Assets/My project/Fonts/Pretendard-Black SDF.asset b/Assets/My project/Fonts/Pretendard-Black SDF.asset index 2fcd95a4..0977b864 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:3ba0e87e30e2da2803bd86a2630597c0fd3ca9d3d1c466df18454c24d7bbf168 -size 41373404 +oid sha256:d8140abcb9e70554ebaec17832cccb8f31485b9a5cd1b5c0da97adffe14c50f5 +size 41396192 diff --git a/Assets/Stylized Water 3/Materials/StylizedWater3_Default cave.mat b/Assets/Stylized Water 3/Materials/StylizedWater3_Default cave.mat index 0832d0fc..ffc6aa6a 100644 --- a/Assets/Stylized Water 3/Materials/StylizedWater3_Default cave.mat +++ b/Assets/Stylized Water 3/Materials/StylizedWater3_Default cave.mat @@ -322,7 +322,7 @@ Material: - _ZClip: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0, g: 0.16451614, b: 0.34, a: 0.9647059} + - _BaseColor: {r: 0.20265219, g: 0.4339623, b: 0.27534965, a: 0.9647059} - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _DepthMapBounds: {r: -402.3, g: -459.43, b: 0.0012693577, a: 0} - _Direction: {r: 1, g: 1, b: 0, a: 0} @@ -336,7 +336,7 @@ Material: - _IntersectionColor: {r: 1, g: 1, b: 1, a: 1} - _NormalTiling: {r: 0.3, g: 0.3, b: 0, a: 0} - _RimColor: {r: 1, g: 1, b: 1, a: 1} - - _ShallowColor: {r: 0, g: 1, b: 0.98136926, a: 0.3764706} + - _ShallowColor: {r: 0.045389812, g: 1.9245284, b: 1.5720304, a: 0.3764706} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - _WaterColor: {r: 0.21176466, g: 0.6745098, b: 1, a: 1} - _WaterShallowColor: {r: 0, g: 0.9394503, b: 1, a: 1} From 2ac02d78f8467b3b1913ab0703a35db283912d82 Mon Sep 17 00:00:00 2001 From: rainylinjing-reboot Date: Wed, 24 Jun 2026 09:41:58 +0900 Subject: [PATCH 3/4] =?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 From 59bf6f0555abecbac1c79b8f160795f8038b3ab1 Mon Sep 17 00:00:00 2001 From: rainylinjing-reboot Date: Wed, 24 Jun 2026 09:47:33 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=AA=A8=EB=A5=B4=EB=8A=94=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XR/AndroidXR/AndroidXRSettingsInitializer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/XR/AndroidXR/AndroidXRSettingsInitializer b/Assets/XR/AndroidXR/AndroidXRSettingsInitializer index ba1ef72f..f9a9372d 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: + m_EditorClassIdentifier: Unity.XR.AndroidOpenXR.Editor::UnityEditor.XR.OpenXR.Features.Android.AndroidXRSettingsInitializer isInitialized: 0