diff --git a/Assets/01_Scenes/Hischool_Chapter4.unity b/Assets/01_Scenes/Hischool_Chapter4.unity index a1f19646..53d7ffa3 100644 --- a/Assets/01_Scenes/Hischool_Chapter4.unity +++ b/Assets/01_Scenes/Hischool_Chapter4.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d1eeb06914b7a9d888a52e41216688d08e4d63480b15c5c43ad282305f14ecc -size 551478 +oid sha256:c441ec8031e5e3d17488303e7db4cc8e087288549e854e80e58f430de4e14175 +size 578239 diff --git a/Assets/01_Scenes/MyHouse.unity b/Assets/01_Scenes/MyHouse.unity index d6fda7b6..56e7c90b 100644 --- a/Assets/01_Scenes/MyHouse.unity +++ b/Assets/01_Scenes/MyHouse.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:426c507de5a27391559521aed994a7485803a61aba8fa061424c473898b55807 -size 1289987 +oid sha256:db295a487eac686d4b517fe2a093421d5bef099b71ecd14de4a5399f01d37b6b +size 1290873 diff --git a/Assets/02_Scripts/Story/PlayerPushToPoint.cs b/Assets/02_Scripts/Story/PlayerPushToPoint.cs deleted file mode 100644 index 704067d0..00000000 --- a/Assets/02_Scripts/Story/PlayerPushToPoint.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System.Collections; -using UnityEngine; - -public class PlayerPushToPoint : MonoBehaviour -{ - [Header("Player")] - [SerializeField] private Transform xrOrigin; - [SerializeField] private Transform playerCamera; - [SerializeField] private CharacterController characterController; - - [Header("Target")] - [SerializeField] private Transform pushDirectionPoint; - - [Header("Push")] - [SerializeField] private float pushDuration = 0.2f; - - private bool hasPushed; - private bool isPushing; - - // 타임라인에서 충돌 순간에 호출 - public void PushPlayerOnce() - { - if (hasPushed || isPushing) - return; - - if (xrOrigin == null || playerCamera == null || pushDirectionPoint == null) - { - Debug.LogWarning("플레이어 밀기 설정이 비어 있습니다."); - return; - } - - hasPushed = true; - StartCoroutine(PushRoutine()); - } - - private IEnumerator PushRoutine() - { - isPushing = true; - - // 카메라의 현재 위치가 목표 지점까지 가기 위해 필요한 이동량 - Vector3 totalMovement = - pushDirectionPoint.position - playerCamera.position; - - // VR 플레이어 높이는 변경하지 않음 - totalMovement.y = 0f; - - float elapsed = 0f; - Vector3 movedAmount = Vector3.zero; - - while (elapsed < pushDuration) - { - elapsed += Time.deltaTime; - - float t = Mathf.Clamp01(elapsed / pushDuration); - - // 처음에 빠르게 밀리고 끝에서 부드럽게 멈춤 - float easedT = 1f - Mathf.Pow(1f - t, 3f); - - Vector3 targetMovement = totalMovement * easedT; - Vector3 frameMovement = targetMovement - movedAmount; - - if (characterController != null && - characterController.enabled) - { - characterController.Move(frameMovement); - } - else - { - xrOrigin.position += frameMovement; - } - - movedAmount = targetMovement; - yield return null; - } - - isPushing = false; - } - - // 반복 테스트할 때만 사용 - public void ResetPush() - { - hasPushed = false; - } -} \ No newline at end of file diff --git a/Assets/02_Scripts/Story/ch4 scrip.meta b/Assets/02_Scripts/Story/ch4 scrip.meta new file mode 100644 index 00000000..9e4edc59 --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c11f945087bd984d9e4dbe8f0632a20 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/Story/ch4 scrip/JunpyoCollapseEvent.cs b/Assets/02_Scripts/Story/ch4 scrip/JunpyoCollapseEvent.cs new file mode 100644 index 00000000..a79c8bcc --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip/JunpyoCollapseEvent.cs @@ -0,0 +1,152 @@ +using System.Collections; +using UnityEngine; +using UnityEngine.Events; + +public class JunpyoCollapseEvent : MonoBehaviour +{ + [Header("구준표")] + [SerializeField] private Animator junpyoAnimator; + [SerializeField] private string collapseTrigger = "Collapse"; + + [Header("플레이어 시선")] + [SerializeField] private Transform xrOrigin; + [SerializeField] private Transform playerCamera; + [SerializeField] private Transform lookTarget; + + [Tooltip("구준표 쪽으로 화면이 돌아가는 시간")] + [SerializeField] private float lookDuration = 0.4f; + + [Tooltip("화면 전환을 시작하고 몇 초 뒤 쓰러질지")] + [SerializeField] private float collapseStartDelay = 0.15f; + + [Header("페이드 타이밍")] + [Tooltip("쓰러지기 시작한 뒤 페이드 아웃까지 기다리는 시간")] + [SerializeField] private float fadeDelay = 1.3f; + + [Header("쓰러진 뒤 실행")] + [SerializeField] private UnityEvent onCollapseFinished; + + private bool hasPlayed; + + public void PlayCollapse() + { + if (hasPlayed) + return; + + if (junpyoAnimator == null) + { + Debug.LogWarning( + "[JunpyoCollapseEvent] 구준표 Animator가 연결되지 않았습니다." + ); + return; + } + + if (xrOrigin == null || + playerCamera == null || + lookTarget == null) + { + Debug.LogWarning( + "[JunpyoCollapseEvent] 플레이어 시선 설정이 비어 있습니다." + ); + return; + } + + hasPlayed = true; + StartCoroutine(CollapseRoutine()); + } + + private IEnumerator CollapseRoutine() + { + // 구준표 방향으로 화면 전환 시작 + StartCoroutine(LookAtJunpyoRoutine()); + + // 화면이 돌아가기 시작한 뒤 잠깐 기다림 + yield return new WaitForSeconds(collapseStartDelay); + + // 구준표 쓰러지는 애니메이션 실행 + junpyoAnimator.ResetTrigger(collapseTrigger); + junpyoAnimator.SetTrigger(collapseTrigger); + + // 쓰러지는 모습을 보여준 뒤 페이드 아웃 + yield return new WaitForSeconds(fadeDelay); + + onCollapseFinished?.Invoke(); + } + + private IEnumerator LookAtJunpyoRoutine() + { + Vector3 cameraForward = playerCamera.forward; + cameraForward.y = 0f; + + Vector3 targetDirection = + lookTarget.position - playerCamera.position; + targetDirection.y = 0f; + + if (cameraForward.sqrMagnitude < 0.001f || + targetDirection.sqrMagnitude < 0.001f) + { + yield break; + } + + cameraForward.Normalize(); + targetDirection.Normalize(); + + // 현재 시선에서 구준표까지 필요한 좌우 회전각 + float totalAngle = Vector3.SignedAngle( + cameraForward, + targetDirection, + Vector3.up + ); + + float duration = Mathf.Max(0.01f, lookDuration); + float elapsed = 0f; + float previousAngle = 0f; + + while (elapsed < duration) + { + elapsed += Time.deltaTime; + + float t = Mathf.Clamp01(elapsed / duration); + + // 부드럽게 시작하고 부드럽게 멈춤 + float easedT = t * t * (3f - 2f * t); + + float currentAngle = totalAngle * easedT; + float frameAngle = currentAngle - previousAngle; + + // 카메라 현재 위치를 중심으로 XR Origin 회전 + // 플레이어 위치가 옆으로 밀리는 현상을 방지 + xrOrigin.RotateAround( + playerCamera.position, + Vector3.up, + frameAngle + ); + + previousAngle = currentAngle; + + yield return null; + } + } + + public void ResetCollapse() + { + StopAllCoroutines(); + + hasPlayed = false; + + if (junpyoAnimator != null) + junpyoAnimator.ResetTrigger(collapseTrigger); + } + + [ContextMenu("Test Collapse")] + private void TestCollapse() + { + PlayCollapse(); + } + + [ContextMenu("Reset Collapse")] + private void TestResetCollapse() + { + ResetCollapse(); + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Story/ch4 scrip/JunpyoCollapseEvent.cs.meta b/Assets/02_Scripts/Story/ch4 scrip/JunpyoCollapseEvent.cs.meta new file mode 100644 index 00000000..c26d6508 --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip/JunpyoCollapseEvent.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 72d7bab8fc449ae44a7d202606c5382e \ No newline at end of file diff --git a/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueEvent.cs b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueEvent.cs new file mode 100644 index 00000000..1dcb5a94 --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueEvent.cs @@ -0,0 +1,84 @@ +using System.Collections; +using UnityEngine; + +public class JunpyoRescueEvent : MonoBehaviour +{ + [Header("Event Components")] + [SerializeField] private JunpyoRunToPoint junpyoRun; + [SerializeField] private PlayerPushToPoint playerPush; + [SerializeField] private SpotlightFall spotlightFall; + + [Header("Timing")] + [Tooltip("구준표가 출발한 뒤 플레이어를 밀 때까지 시간")] + [SerializeField] private float pushDelay = 1.0f; + + [Tooltip("플레이어를 민 뒤 조명이 떨어질 때까지 시간")] + [SerializeField] private float spotlightDelayAfterPush = 0.1f; + + private bool hasPlayed; + + public void PlayRescueEvent() + { + if (hasPlayed) + return; + + if (junpyoRun == null || + playerPush == null || + spotlightFall == null) + { + Debug.LogWarning( + "[JunpyoRescueEvent] 연결되지 않은 컴포넌트가 있습니다." + ); + return; + } + + hasPlayed = true; + StartCoroutine(RescueRoutine()); + } + + private IEnumerator RescueRoutine() + { + // 1. 구준표가 달려오기 시작 + junpyoRun.RunToStopPoint(); + + // 2. 구준표가 거의 도착할 때까지 대기 + yield return new WaitForSeconds(pushDelay); + + // 3. 플레이어 밀기 + playerPush.PushPlayerOnce(); + + // 4. 밀린 직후 잠깐 기다림 + yield return new WaitForSeconds(spotlightDelayAfterPush); + + // 5. 조명 떨어뜨리기 + spotlightFall.DropSpotlight(); + } + + public void ResetEvent() + { + StopAllCoroutines(); + + hasPlayed = false; + + if (junpyoRun != null) + junpyoRun.ResetMovement(); + + if (playerPush != null) + playerPush.ResetPush(); + + if (spotlightFall != null) + spotlightFall.ResetFall(); + } + + [ContextMenu("Test Rescue Event")] + private void TestRescueEvent() + { + PlayRescueEvent(); + } + + [ContextMenu("Reset Rescue Event")] + private void TestResetEvent() + { + ResetEvent(); + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueEvent.cs.meta b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueEvent.cs.meta new file mode 100644 index 00000000..fea7e73d --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueEvent.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 459517eb5f032fd4e9672d8c30c93d74 \ No newline at end of file diff --git a/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueZone.cs b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueZone.cs new file mode 100644 index 00000000..6e5c8294 --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueZone.cs @@ -0,0 +1,70 @@ +using System.Collections; +using UnityEngine; +using UnityEngine.Events; + +public class JunpyoRescueSequence : MonoBehaviour +{ + [Header("구준표 구조 연출")] + [SerializeField] private JunpyoRescueEvent rescueEvent; + + [Header("대화 시작 타이밍")] + [Tooltip("구준표가 달려오고 플레이어를 민 뒤, 대화를 시작하기까지의 전체 시간")] + [SerializeField] private float dialogueStartDelay = 1.5f; + + [Header("연출 종료 후 실행")] + [Tooltip("여기에 기존 대화 시작 함수를 연결")] + [SerializeField] private UnityEvent onRescueFinished; + + private bool hasPlayed; + + public void PlaySequence() + { + if (hasPlayed) + return; + + if (rescueEvent == null) + { + Debug.LogWarning( + "[JunpyoRescueSequence] Rescue Event가 연결되지 않았습니다." + ); + return; + } + + hasPlayed = true; + StartCoroutine(SequenceRoutine()); + } + + private IEnumerator SequenceRoutine() + { + // 1. 구준표 달려오기 + 플레이어 밀기 + rescueEvent.PlayRescueEvent(); + + // 2. 구조 연출이 끝날 때까지 기다림 + yield return new WaitForSeconds(dialogueStartDelay); + + // 3. 구조 연출 종료 후 대화 시작 + onRescueFinished?.Invoke(); + } + + public void ResetSequence() + { + StopAllCoroutines(); + + hasPlayed = false; + + if (rescueEvent != null) + rescueEvent.ResetEvent(); + } + + [ContextMenu("Test Sequence")] + private void TestSequence() + { + PlaySequence(); + } + + [ContextMenu("Reset Sequence")] + private void TestResetSequence() + { + ResetSequence(); + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueZone.cs.meta b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueZone.cs.meta new file mode 100644 index 00000000..0a96ad54 --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRescueZone.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a6460eb96d882e34d9d11a86f188b0cd \ No newline at end of file diff --git a/Assets/02_Scripts/Story/ch4 scrip/JunpyoRunToPoint.cs b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRunToPoint.cs new file mode 100644 index 00000000..2fe4565d --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRunToPoint.cs @@ -0,0 +1,104 @@ +using System.Collections; +using UnityEngine; + +public class JunpyoRunToPoint : MonoBehaviour +{ + [Header("Junpyo")] + [SerializeField] private Transform junpyo; + + [Header("Target")] + [SerializeField] private Transform junpyoStopPoint; + + [Header("Movement")] + [SerializeField] private float moveDuration = 1.2f; + [SerializeField] private bool faceMoveDirection = true; + + private bool isMoving; + private bool hasMoved; + + // 대화가 시작될 때 호출 + public void RunToStopPoint() + { + if (isMoving || hasMoved) + return; + + if (junpyo == null || junpyoStopPoint == null) + { + Debug.LogWarning("구준표 또는 JunpyoStopPoint가 연결되지 않았습니다."); + return; + } + + hasMoved = true; + StartCoroutine(MoveRoutine()); + } + + private IEnumerator MoveRoutine() + { + isMoving = true; + + Vector3 startPosition = junpyo.position; + Quaternion startRotation = junpyo.rotation; + + Vector3 targetPosition = junpyoStopPoint.position; + targetPosition.y = startPosition.y; + + Vector3 direction = targetPosition - startPosition; + direction.y = 0f; + + Quaternion targetRotation = startRotation; + + if (faceMoveDirection && direction.sqrMagnitude > 0.001f) + targetRotation = Quaternion.LookRotation(direction.normalized); + + float elapsed = 0f; + + while (elapsed < moveDuration) + { + elapsed += Time.deltaTime; + float t = Mathf.Clamp01(elapsed / moveDuration); + + junpyo.position = Vector3.Lerp( + startPosition, + targetPosition, + t + ); + + if (faceMoveDirection) + { + junpyo.rotation = Quaternion.Slerp( + startRotation, + targetRotation, + t + ); + } + + yield return null; + } + + // 마지막 위치를 정확하게 맞춤 + junpyo.position = targetPosition; + + if (faceMoveDirection) + junpyo.rotation = targetRotation; + + isMoving = false; + } + + public void ResetMovement() + { + hasMoved = false; + isMoving = false; + } + + [ContextMenu("Test Run")] + private void TestRun() + { + RunToStopPoint(); + } + + [ContextMenu("Reset Run")] + private void TestResetRun() + { + ResetMovement(); + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Story/ch4 scrip/JunpyoRunToPoint.cs.meta b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRunToPoint.cs.meta new file mode 100644 index 00000000..57c7b7b3 --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip/JunpyoRunToPoint.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 91bed9cabff116f43a42e695be8d8a95 \ No newline at end of file diff --git a/Assets/02_Scripts/Story/ch4 scrip/PlayerPushToPoint.cs b/Assets/02_Scripts/Story/ch4 scrip/PlayerPushToPoint.cs new file mode 100644 index 00000000..8fc80111 --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip/PlayerPushToPoint.cs @@ -0,0 +1,134 @@ +using System.Collections; +using UnityEngine; + +public class PlayerPushToPoint : MonoBehaviour +{ + [Header("Player")] + [SerializeField] private Transform xrOrigin; + [SerializeField] private Transform playerCamera; + [SerializeField] private CharacterController characterController; + + [Header("Push Direction")] + [SerializeField] private Transform pushDirectionPoint; + + [Header("Push Settings")] + [SerializeField] private float pushDistance = 0.9f; + [SerializeField] private float pushDuration = 0.18f; + + private bool hasPushed; + private bool isPushing; + + public void PushPlayerOnce() + { + if (hasPushed || isPushing) + return; + + if (xrOrigin == null || + playerCamera == null || + pushDirectionPoint == null) + { + Debug.LogWarning( + "[PlayerPushToPoint] 연결되지 않은 오브젝트가 있습니다." + ); + return; + } + + hasPushed = true; + StartCoroutine(PushRoutine()); + } + + private IEnumerator PushRoutine() + { + isPushing = true; + + // 플레이어에서 포인트로 향하는 방향 + Vector3 direction = + pushDirectionPoint.position - playerCamera.position; + + // 수평 방향만 사용 + direction.y = 0f; + + if (direction.sqrMagnitude < 0.001f) + { + Debug.LogWarning( + "[PlayerPushToPoint] 밀기 방향을 계산할 수 없습니다." + ); + + hasPushed = false; + isPushing = false; + yield break; + } + + direction.Normalize(); + + Vector3 startPosition = xrOrigin.position; + Vector3 targetPosition = + startPosition + direction * pushDistance; + + // 시작 높이를 그대로 고정 + float fixedY = startPosition.y; + targetPosition.y = fixedY; + + bool controllerWasEnabled = + characterController != null && + characterController.enabled; + + // 밀리는 동안 바닥이나 장애물 때문에 위로 올라가지 않도록 끔 + if (controllerWasEnabled) + characterController.enabled = false; + + float duration = Mathf.Max(0.01f, pushDuration); + float elapsed = 0f; + + while (elapsed < duration) + { + elapsed += Time.deltaTime; + + float t = Mathf.Clamp01(elapsed / duration); + float easedT = 1f - Mathf.Pow(1f - t, 3f); + + Vector3 nextPosition = + Vector3.Lerp(startPosition, targetPosition, easedT); + + // 매 프레임 Y값 강제 고정 + nextPosition.y = fixedY; + xrOrigin.position = nextPosition; + + yield return null; + } + + // 마지막 위치 정확히 고정 + xrOrigin.position = targetPosition; + + if (controllerWasEnabled) + characterController.enabled = true; + + isPushing = false; + } + + public void ResetPush() + { + StopAllCoroutines(); + + hasPushed = false; + isPushing = false; + + if (characterController != null && + !characterController.enabled) + { + characterController.enabled = true; + } + } + + [ContextMenu("Test Push")] + private void TestPush() + { + PushPlayerOnce(); + } + + [ContextMenu("Reset Push")] + private void TestResetPush() + { + ResetPush(); + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Story/PlayerPushToPoint.cs.meta b/Assets/02_Scripts/Story/ch4 scrip/PlayerPushToPoint.cs.meta similarity index 100% rename from Assets/02_Scripts/Story/PlayerPushToPoint.cs.meta rename to Assets/02_Scripts/Story/ch4 scrip/PlayerPushToPoint.cs.meta diff --git a/Assets/02_Scripts/Story/ch4 scrip/SpotlightFall.cs b/Assets/02_Scripts/Story/ch4 scrip/SpotlightFall.cs new file mode 100644 index 00000000..df295ffe --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip/SpotlightFall.cs @@ -0,0 +1,154 @@ +using System.Collections; +using UnityEngine; + +public class SpotlightFall : MonoBehaviour +{ + [Header("떨어질 조명")] + [SerializeField] private Transform spotlight; + + [Header("도착 위치")] + [SerializeField] private Transform fallEndPoint; + + [Header("낙하 설정")] + [SerializeField] private float fallDuration = 1f; + + [Header("충돌 사운드")] + [SerializeField] private AudioSource impactAudioSource; + [SerializeField] private AudioClip impactSound; + + [Range(0f, 1f)] + [SerializeField] private float impactVolume = 1f; + + [Tooltip("조명이 도착하기 몇 초 전에 소리를 재생할지")] + [SerializeField] private float impactSoundLeadTime = 0.12f; + + private Vector3 startPosition; + private Quaternion startRotation; + + private bool hasFallen; + private bool isFalling; + + private void Awake() + { + if (spotlight != null) + { + startPosition = spotlight.position; + startRotation = spotlight.rotation; + } + } + + public void DropSpotlight() + { + if (hasFallen || isFalling) + return; + + if (spotlight == null) + { + Debug.LogWarning( + "[SpotlightFall] Spotlight가 연결되지 않았습니다." + ); + return; + } + + if (fallEndPoint == null) + { + Debug.LogWarning( + "[SpotlightFall] Fall End Point가 연결되지 않았습니다." + ); + return; + } + + hasFallen = true; + StartCoroutine(FallRoutine()); + } + + private IEnumerator FallRoutine() + { + isFalling = true; + + Vector3 fallStartPosition = spotlight.position; + Vector3 targetPosition = fallEndPoint.position; + + float duration = Mathf.Max(0.01f, fallDuration); + float elapsed = 0f; + + bool impactSoundPlayed = false; + + while (elapsed < duration) + { + elapsed += Time.deltaTime; + + float t = Mathf.Clamp01(elapsed / duration); + + // 처음에는 느리고 아래로 갈수록 빠르게 낙하 + float acceleratedT = t * t * t; + + spotlight.position = Vector3.Lerp( + fallStartPosition, + targetPosition, + acceleratedT + ); + + // 완전히 도착하기 조금 전에 와장창 소리 재생 + if (!impactSoundPlayed && + duration - elapsed <= impactSoundLeadTime) + { + impactSoundPlayed = true; + PlayImpactSound(); + } + + yield return null; + } + + // 마지막 위치 정확히 맞추기 + spotlight.position = targetPosition; + + // Lead Time이 너무 작아 소리가 실행되지 않았을 경우 대비 + if (!impactSoundPlayed) + { + PlayImpactSound(); + } + + isFalling = false; + } + + private void PlayImpactSound() + { + if (impactAudioSource == null || impactSound == null) + return; + + impactAudioSource.PlayOneShot( + impactSound, + impactVolume + ); + } + + public void ResetFall() + { + StopAllCoroutines(); + + hasFallen = false; + isFalling = false; + + if (impactAudioSource != null) + impactAudioSource.Stop(); + + if (spotlight != null) + { + spotlight.position = startPosition; + spotlight.rotation = startRotation; + } + } + + [ContextMenu("Test Fall")] + private void TestFall() + { + DropSpotlight(); + } + + [ContextMenu("Reset Fall")] + private void TestResetFall() + { + ResetFall(); + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Story/ch4 scrip/SpotlightFall.cs.meta b/Assets/02_Scripts/Story/ch4 scrip/SpotlightFall.cs.meta new file mode 100644 index 00000000..13c0774d --- /dev/null +++ b/Assets/02_Scripts/Story/ch4 scrip/SpotlightFall.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f21d1c5f5053dcd46b78113e83920072 \ No newline at end of file diff --git a/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/carn_Chapter4.controller b/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/carn_Chapter4.controller index adf77941..db0bac33 100644 --- a/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/carn_Chapter4.controller +++ b/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/carn_Chapter4.controller @@ -1,17 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-2944761435178376677 +--- !u!1109 &-1541341828435012952 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 9121159352670520278} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 +--- !u!1102 &-1366997901898685909 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Carn|Walk + m_Name: Carn|WalkGrowl m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -484299869792730782} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -21,34 +34,12 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400050, guid: 3a76ebca0d7213f44b4079b9bb53b121, type: 3} + m_Motion: {fileID: 7400056, guid: 3a76ebca0d7213f44b4079b9bb53b121, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-484299869792730782 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 8112752976601807942} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.87288135 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -57,7 +48,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: carn_Chapter4 serializedVersion: 6 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Collapse + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -72,14 +69,14 @@ AnimatorController: m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} m_EvaluateTransitionsOnStart: 1 ---- !u!1102 &8112752976601807942 +--- !u!1102 &89671668286707132 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Carn|Die2 + m_Name: Collapse m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -98,6 +95,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &6712500203938039011 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Collapse + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 89671668286707132} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.74137926 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &8238045318014309158 AnimatorStateMachine: serializedVersion: 7 @@ -108,18 +130,49 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: -2944761435178376677} - m_Position: {x: 370, y: 80, z: 0} + m_State: {fileID: 9121159352670520278} + m_Position: {x: 296.30942, y: 47.309174, z: 0} - serializedVersion: 1 - m_State: {fileID: 8112752976601807942} - m_Position: {x: 451, y: 202, z: 0} + m_State: {fileID: 89671668286707132} + m_Position: {x: 650, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1366997901898685909} + m_Position: {x: 540, y: -30, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] - m_EntryTransitions: [] + m_EntryTransitions: + - {fileID: -1541341828435012952} m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_AnyStatePosition: {x: 820, y: -60, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_ExitPosition: {x: 810, y: 230, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -2944761435178376677} + m_DefaultState: {fileID: 9121159352670520278} +--- !u!1102 &9121159352670520278 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Carn|Idle2B + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6712500203938039011} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400068, guid: 3a76ebca0d7213f44b4079b9bb53b121, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg index c32d09ce..414ce4c4 100644 --- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg @@ -55,7 +55,7 @@ MonoBehaviour: serializedVersion: 2 x: 139 y: -396 - width: 1843 + width: 1842 height: 2092 m_GraphElementMetaData: - m_Guid: @@ -243,7 +243,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -265,6 +264,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 4848514453388656906 - rid: 4848514453388656907 @@ -273,7 +273,6 @@ MonoBehaviour: - rid: 4848514453388656910 - rid: 4848514453388656911 - rid: 4848514453388656912 - - rid: 4848514453388656913 - rid: 4848514453388656914 - rid: 4848514453388656915 - rid: 4848514453388656916 @@ -295,6 +294,7 @@ MonoBehaviour: - rid: 8016363865578406433 - rid: 8016363865578406479 - rid: 8016363865578406480 + - rid: 8016363991059660838 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -363,7 +363,8 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: + Value: "\uBB50\uC57C, \uB108 \uC5EC\uAE30\uAE4C\uC9C0 \uB0A0 \uB530\uB77C\uC628 + \uAC70\uB0D0?" - rid: 4848514453388656911 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -372,10 +373,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 4848514453388656913 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 4848514453388656914 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -466,7 +463,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -480,6 +476,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598855968 - rid: 8016363832598855969 @@ -489,7 +486,6 @@ MonoBehaviour: - rid: 8016363832598855973 - rid: 8016363832598855974 - rid: 8016363832598855975 - - rid: 8016363832598855976 - rid: 8016363832598855977 - rid: 8016363832598855978 - rid: 8016363832598855979 @@ -503,6 +499,7 @@ MonoBehaviour: - rid: 8016363865578406436 - rid: 8016363865578406481 - rid: 8016363865578406482 + - rid: 8016363991059660839 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -585,10 +582,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598855976 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598855977 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -634,7 +627,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 228a06591bd212fb3fbcbb008ba7c6c9 m_Version: 2 - m_Position: {x: 1571, y: -392.14502} + m_Position: {x: 1569.85, y: -392.14502} m_Title: m_Tooltip: m_NodePreviewModel: @@ -650,7 +643,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -664,6 +656,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598855988 - rid: 8016363832598855989 @@ -673,7 +666,6 @@ MonoBehaviour: - rid: 8016363832598855993 - rid: 8016363832598855994 - rid: 8016363832598855995 - - rid: 8016363832598855996 - rid: 8016363832598855997 - rid: 8016363832598855998 - rid: 8016363832598855999 @@ -687,6 +679,7 @@ MonoBehaviour: - rid: 8016363865578406439 - rid: 8016363865578406483 - rid: 8016363865578406484 + - rid: 8016363991059660840 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -769,10 +762,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598855996 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598855997 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -800,7 +789,7 @@ MonoBehaviour: - rid: 8016363832598856003 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 5 + m_Value: 25 - rid: 8016363832598856004 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -834,7 +823,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -848,6 +836,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598856008 - rid: 8016363832598856009 @@ -857,7 +846,6 @@ MonoBehaviour: - rid: 8016363832598856013 - rid: 8016363832598856014 - rid: 8016363832598856015 - - rid: 8016363832598856016 - rid: 8016363832598856017 - rid: 8016363832598856018 - rid: 8016363832598856019 @@ -871,6 +859,7 @@ MonoBehaviour: - rid: 8016363865578406442 - rid: 8016363865578406485 - rid: 8016363865578406486 + - rid: 8016363991059660841 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -952,10 +941,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598856016 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598856017 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -983,7 +968,7 @@ MonoBehaviour: - rid: 8016363832598856023 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: -10 - rid: 8016363832598856024 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1027,7 +1012,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1041,6 +1025,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598856030 - rid: 8016363832598856031 @@ -1050,7 +1035,6 @@ MonoBehaviour: - rid: 8016363832598856035 - rid: 8016363832598856036 - rid: 8016363832598856037 - - rid: 8016363832598856038 - rid: 8016363832598856039 - rid: 8016363832598856040 - rid: 8016363832598856041 @@ -1064,6 +1048,7 @@ MonoBehaviour: - rid: 8016363865578406445 - rid: 8016363865578406487 - rid: 8016363865578406488 + - rid: 8016363991059660842 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1114,10 +1099,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598856038 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598856039 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1179,7 +1160,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1193,6 +1173,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363859357991072 - rid: 8016363859357991073 @@ -1202,7 +1183,6 @@ MonoBehaviour: - rid: 8016363859357991077 - rid: 8016363859357991078 - rid: 8016363859357991079 - - rid: 8016363859357991080 - rid: 8016363859357991081 - rid: 8016363859357991082 - rid: 8016363859357991083 @@ -1216,6 +1196,7 @@ MonoBehaviour: - rid: 8016363865578406448 - rid: 8016363865578406489 - rid: 8016363865578406490 + - rid: 8016363991059660843 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1265,10 +1246,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363859357991080 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363859357991081 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1488,3 +1465,27 @@ MonoBehaviour: type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: 0 + - rid: 8016363991059660838 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660839 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660840 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660841 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660842 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660843 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} diff --git a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus2.dlg b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus2.dlg index d94eb6a9..dffee988 100644 --- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus2.dlg +++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus2.dlg @@ -172,7 +172,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -186,6 +185,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363859357991117 - rid: 8016363859357991118 @@ -195,7 +195,6 @@ MonoBehaviour: - rid: 8016363859357991122 - rid: 8016363859357991123 - rid: 8016363859357991124 - - rid: 8016363859357991125 - rid: 8016363859357991126 - rid: 8016363859357991127 - rid: 8016363859357991128 @@ -209,6 +208,7 @@ MonoBehaviour: - rid: 8016363904930938942 - rid: 8016363904930938943 - rid: 8016363904930938944 + - rid: 8016363991059660844 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -259,10 +259,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363859357991125 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363859357991126 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -324,7 +320,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -338,6 +333,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363859357991154 - rid: 8016363859357991155 @@ -347,7 +343,6 @@ MonoBehaviour: - rid: 8016363859357991159 - rid: 8016363859357991160 - rid: 8016363859357991161 - - rid: 8016363859357991162 - rid: 8016363859357991163 - rid: 8016363859357991164 - rid: 8016363859357991165 @@ -361,6 +356,7 @@ MonoBehaviour: - rid: 8016363904930938947 - rid: 8016363904930938948 - rid: 8016363904930938949 + - rid: 8016363991059660845 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -410,10 +406,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363859357991162 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363859357991163 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -441,7 +433,7 @@ MonoBehaviour: - rid: 8016363859357991169 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 2 + m_Value: 25 - rid: 8016363859357991170 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -553,3 +545,11 @@ MonoBehaviour: type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: 0 + - rid: 8016363991059660844 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660845 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} diff --git a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg index 8989c31b..e621fb1d 100644 --- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg @@ -58,7 +58,7 @@ MonoBehaviour: x: 173 y: -300 width: 2685 - height: 2399 + height: 2349 m_GraphElementMetaData: - m_Guid: m_Value0: 3953896658662454792 @@ -261,7 +261,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -283,6 +282,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 4848514453388656906 - rid: 4848514453388656907 @@ -291,7 +291,6 @@ MonoBehaviour: - rid: 4848514453388656910 - rid: 4848514453388656911 - rid: 4848514453388656912 - - rid: 4848514453388656913 - rid: 4848514453388656914 - rid: 4848514453388656915 - rid: 4848514453388656916 @@ -313,6 +312,7 @@ MonoBehaviour: - rid: 8016363904930938907 - rid: 8016363904930938908 - rid: 8016363904930938909 + - rid: 8016363991059660856 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -381,7 +381,7 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: + Value: "\uC751, \uAE08\uC794\uB514. \uBB34\uC2A8 \uC77C\uC774\uC57C?" - rid: 4848514453388656911 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -390,10 +390,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 4848514453388656913 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 4848514453388656914 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -483,7 +479,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -497,6 +492,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598855756 - rid: 8016363832598855757 @@ -506,7 +502,6 @@ MonoBehaviour: - rid: 8016363832598855761 - rid: 8016363832598855762 - rid: 8016363832598855763 - - rid: 8016363832598855764 - rid: 8016363832598855765 - rid: 8016363832598855766 - rid: 8016363832598855767 @@ -520,6 +515,7 @@ MonoBehaviour: - rid: 8016363904930938912 - rid: 8016363904930938913 - rid: 8016363904930938914 + - rid: 8016363991059660857 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -602,10 +598,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598855764 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598855765 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -667,7 +659,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -681,6 +672,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598855793 - rid: 8016363832598855794 @@ -690,7 +682,6 @@ MonoBehaviour: - rid: 8016363832598855798 - rid: 8016363832598855799 - rid: 8016363832598855800 - - rid: 8016363832598855801 - rid: 8016363832598855802 - rid: 8016363832598855803 - rid: 8016363832598855804 @@ -704,6 +695,7 @@ MonoBehaviour: - rid: 8016363904930938917 - rid: 8016363904930938918 - rid: 8016363904930938919 + - rid: 8016363991059660858 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -753,10 +745,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598855801 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598855802 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -859,7 +847,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -873,6 +860,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598855833 - rid: 8016363832598855834 @@ -882,7 +870,6 @@ MonoBehaviour: - rid: 8016363832598855838 - rid: 8016363832598855839 - rid: 8016363832598855840 - - rid: 8016363832598855841 - rid: 8016363832598855842 - rid: 8016363832598855843 - rid: 8016363832598855844 @@ -896,6 +883,7 @@ MonoBehaviour: - rid: 8016363904930938922 - rid: 8016363904930938923 - rid: 8016363904930938924 + - rid: 8016363991059660859 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -946,10 +934,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598855841 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598855842 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -977,7 +961,7 @@ MonoBehaviour: - rid: 8016363832598855848 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 3 + m_Value: 35 - rid: 8016363832598855849 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1043,7 +1027,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1062,6 +1045,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598855854 - rid: 8016363832598855855 @@ -1071,7 +1055,6 @@ MonoBehaviour: - rid: 8016363832598855859 - rid: 8016363832598855860 - rid: 8016363832598855861 - - rid: 8016363832598855862 - rid: 8016363832598855863 - rid: 8016363832598855864 - rid: 8016363832598855865 @@ -1090,6 +1073,7 @@ MonoBehaviour: - rid: 8016363904930938927 - rid: 8016363904930938928 - rid: 8016363904930938929 + - rid: 8016363991059660860 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1140,10 +1124,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598855862 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598855863 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1205,7 +1185,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1219,6 +1198,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598855897 - rid: 8016363832598855898 @@ -1228,7 +1208,6 @@ MonoBehaviour: - rid: 8016363832598855902 - rid: 8016363832598855903 - rid: 8016363832598855904 - - rid: 8016363832598855905 - rid: 8016363832598855906 - rid: 8016363832598855907 - rid: 8016363832598855908 @@ -1242,6 +1221,7 @@ MonoBehaviour: - rid: 8016363904930938932 - rid: 8016363904930938933 - rid: 8016363904930938934 + - rid: 8016363991059660861 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1291,10 +1271,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598855905 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598855906 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1322,7 +1298,7 @@ MonoBehaviour: - rid: 8016363832598855912 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: -2 + m_Value: -10 - rid: 8016363832598855913 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1413,7 +1389,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1427,6 +1402,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598855941 - rid: 8016363832598855942 @@ -1436,7 +1412,6 @@ MonoBehaviour: - rid: 8016363832598855946 - rid: 8016363832598855947 - rid: 8016363832598855948 - - rid: 8016363832598855949 - rid: 8016363832598855950 - rid: 8016363832598855951 - rid: 8016363832598855952 @@ -1450,6 +1425,7 @@ MonoBehaviour: - rid: 8016363904930938937 - rid: 8016363904930938938 - rid: 8016363904930938939 + - rid: 8016363991059660862 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1499,10 +1475,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598855949 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598855950 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1530,7 +1502,7 @@ MonoBehaviour: - rid: 8016363832598855956 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 2 + m_Value: 35 - rid: 8016363832598855957 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1742,3 +1714,31 @@ MonoBehaviour: type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: 0 + - rid: 8016363991059660856 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660857 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660858 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660859 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660860 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660861 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660862 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} diff --git a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg index 5f246357..9b68f6b5 100644 --- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg +++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg @@ -315,7 +315,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -330,6 +329,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 4848514453388656906 - rid: 4848514453388656907 @@ -338,7 +338,6 @@ MonoBehaviour: - rid: 4848514453388656910 - rid: 4848514453388656911 - rid: 4848514453388656912 - - rid: 4848514453388656913 - rid: 4848514453388656914 - rid: 4848514453388656915 - rid: 4848514453388656916 @@ -353,6 +352,7 @@ MonoBehaviour: - rid: 8016363904930938952 - rid: 8016363904930938953 - rid: 8016363904930938954 + - rid: 8016363991059660846 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -431,10 +431,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 4848514453388656913 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 4848514453388656914 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -500,7 +496,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -514,6 +509,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598856108 - rid: 8016363832598856109 @@ -523,7 +519,6 @@ MonoBehaviour: - rid: 8016363832598856113 - rid: 8016363832598856114 - rid: 8016363832598856115 - - rid: 8016363832598856116 - rid: 8016363832598856117 - rid: 8016363832598856118 - rid: 8016363832598856119 @@ -537,6 +532,7 @@ MonoBehaviour: - rid: 8016363904930938957 - rid: 8016363904930938958 - rid: 8016363904930938959 + - rid: 8016363991059660847 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -619,10 +615,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598856116 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598856117 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -684,7 +676,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -705,6 +696,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598856128 - rid: 8016363832598856129 @@ -714,7 +706,6 @@ MonoBehaviour: - rid: 8016363832598856133 - rid: 8016363832598856134 - rid: 8016363832598856135 - - rid: 8016363832598856136 - rid: 8016363832598856137 - rid: 8016363832598856138 - rid: 8016363832598856139 @@ -735,6 +726,7 @@ MonoBehaviour: - rid: 8016363904930938962 - rid: 8016363904930938963 - rid: 8016363904930938964 + - rid: 8016363991059660848 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -807,7 +799,7 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: + Value: "\uB098 \uC544\uC9C1 \uC544\uBB34\uAC83\uB3C4 \uC548 \uBB3C\uC5B4\uBD24\uB294\uB370\u2026\u2026." - rid: 8016363832598856134 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -816,10 +808,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598856136 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598856137 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -916,7 +904,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -930,6 +917,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598856155 - rid: 8016363832598856156 @@ -939,7 +927,6 @@ MonoBehaviour: - rid: 8016363832598856160 - rid: 8016363832598856161 - rid: 8016363832598856162 - - rid: 8016363832598856163 - rid: 8016363832598856164 - rid: 8016363832598856165 - rid: 8016363832598856166 @@ -953,6 +940,7 @@ MonoBehaviour: - rid: 8016363904930938967 - rid: 8016363904930938968 - rid: 8016363904930938969 + - rid: 8016363991059660849 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1002,10 +990,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598856163 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598856164 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1067,7 +1051,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1081,6 +1064,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598856175 - rid: 8016363832598856176 @@ -1090,7 +1074,6 @@ MonoBehaviour: - rid: 8016363832598856180 - rid: 8016363832598856181 - rid: 8016363832598856182 - - rid: 8016363832598856183 - rid: 8016363832598856184 - rid: 8016363832598856185 - rid: 8016363832598856186 @@ -1104,6 +1087,7 @@ MonoBehaviour: - rid: 8016363904930938972 - rid: 8016363904930938973 - rid: 8016363904930938974 + - rid: 8016363991059660850 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1185,10 +1169,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598856183 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598856184 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1250,7 +1230,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1264,6 +1243,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598856195 - rid: 8016363832598856196 @@ -1273,7 +1253,6 @@ MonoBehaviour: - rid: 8016363832598856200 - rid: 8016363832598856201 - rid: 8016363832598856202 - - rid: 8016363832598856203 - rid: 8016363832598856204 - rid: 8016363832598856205 - rid: 8016363832598856206 @@ -1287,6 +1266,7 @@ MonoBehaviour: - rid: 8016363904930938977 - rid: 8016363904930938978 - rid: 8016363904930938979 + - rid: 8016363991059660851 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1368,10 +1348,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598856203 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598856204 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1399,7 +1375,7 @@ MonoBehaviour: - rid: 8016363832598856210 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 3 + m_Value: 35 - rid: 8016363832598856211 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1433,7 +1409,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1447,6 +1422,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598856215 - rid: 8016363832598856216 @@ -1456,7 +1432,6 @@ MonoBehaviour: - rid: 8016363832598856220 - rid: 8016363832598856221 - rid: 8016363832598856222 - - rid: 8016363832598856223 - rid: 8016363832598856224 - rid: 8016363832598856225 - rid: 8016363832598856226 @@ -1470,6 +1445,7 @@ MonoBehaviour: - rid: 8016363904930938982 - rid: 8016363904930938983 - rid: 8016363904930938984 + - rid: 8016363991059660852 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1519,10 +1495,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598856223 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598856224 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1550,7 +1522,7 @@ MonoBehaviour: - rid: 8016363832598856230 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: -2 + m_Value: -10 - rid: 8016363832598856231 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1584,7 +1556,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1598,6 +1569,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598856237 - rid: 8016363832598856238 @@ -1607,7 +1579,6 @@ MonoBehaviour: - rid: 8016363832598856242 - rid: 8016363832598856243 - rid: 8016363832598856244 - - rid: 8016363832598856245 - rid: 8016363832598856246 - rid: 8016363832598856247 - rid: 8016363832598856248 @@ -1621,6 +1592,7 @@ MonoBehaviour: - rid: 8016363904930938987 - rid: 8016363904930938988 - rid: 8016363904930938989 + - rid: 8016363991059660853 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1702,10 +1674,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598856245 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598856246 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1767,7 +1735,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1781,6 +1748,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598856257 - rid: 8016363832598856258 @@ -1790,7 +1758,6 @@ MonoBehaviour: - rid: 8016363832598856262 - rid: 8016363832598856263 - rid: 8016363832598856264 - - rid: 8016363832598856265 - rid: 8016363832598856266 - rid: 8016363832598856267 - rid: 8016363832598856268 @@ -1804,6 +1771,7 @@ MonoBehaviour: - rid: 8016363904930938992 - rid: 8016363904930938993 - rid: 8016363904930938994 + - rid: 8016363991059660854 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1885,10 +1853,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598856265 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598856266 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1950,7 +1914,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1964,6 +1927,7 @@ MonoBehaviour: - __option_HiddenCode - UseFixedAngle - FixedAngleY + - Voice m_ValueList: - rid: 8016363832598856277 - rid: 8016363832598856278 @@ -1973,7 +1937,6 @@ MonoBehaviour: - rid: 8016363832598856282 - rid: 8016363832598856283 - rid: 8016363832598856284 - - rid: 8016363832598856285 - rid: 8016363832598856286 - rid: 8016363832598856287 - rid: 8016363832598856288 @@ -1987,6 +1950,7 @@ MonoBehaviour: - rid: 8016363904930938997 - rid: 8016363904930938998 - rid: 8016363904930938999 + - rid: 8016363991059660855 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2069,10 +2033,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363832598856285 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363832598856286 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2100,7 +2060,7 @@ MonoBehaviour: - rid: 8016363832598856292 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 1 + m_Value: 0 - rid: 8016363832598856293 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2372,3 +2332,43 @@ MonoBehaviour: type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: 0 + - rid: 8016363991059660846 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660847 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660848 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660849 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660850 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660851 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660852 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660853 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660854 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660855 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} diff --git a/Assets/07_Data/DialogGraph/Chapter4/Carnotaurus ch4.dlg b/Assets/07_Data/DialogGraph/Chapter4/Carnotaurus ch4.dlg index 2fa1a6bf..04350e47 100644 --- a/Assets/07_Data/DialogGraph/Chapter4/Carnotaurus ch4.dlg +++ b/Assets/07_Data/DialogGraph/Chapter4/Carnotaurus ch4.dlg @@ -793,7 +793,9 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: + Value: "\uCC29\uAC01\uD558\uC9C0 \uB9C8. \uB110 \uAD6C\uD558\uB824\uB358 + \uAC8C \uC544\uB2C8\uB77C \uADF8\uB0E5 \uB0B4 \uC55E\uC5D0 \uB124\uAC00 + \uC788\uC5C8\uB358 \uAC70\uC57C." - rid: 8016363972690968794 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1391,7 +1393,7 @@ MonoBehaviour: - rid: 8016363972690968866 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: + m_Value: EnableJunpyoCollapse - rid: 8016363972690968867 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1467,11 +1469,11 @@ MonoBehaviour: - rid: 8016363972690968885 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 25 - rid: 8016363972690968886 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 20 - rid: 8016363972690968887 type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: @@ -1592,7 +1594,7 @@ MonoBehaviour: - rid: 8016363972690968891 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: + m_Value: EnableJunpyoCollapse - rid: 8016363972690968892 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1668,11 +1670,11 @@ MonoBehaviour: - rid: 8016363972690968910 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 25 - rid: 8016363972690968911 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 20 - rid: 8016363972690968912 type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: diff --git a/Assets/07_Data/DialogGraph/Chapter4/Styracosaurus ch4.dlg b/Assets/07_Data/DialogGraph/Chapter4/Styracosaurus ch4.dlg index 35d8741c..eae07866 100644 --- a/Assets/07_Data/DialogGraph/Chapter4/Styracosaurus ch4.dlg +++ b/Assets/07_Data/DialogGraph/Chapter4/Styracosaurus ch4.dlg @@ -38,6 +38,7 @@ MonoBehaviour: - rid: 8016363972690968683 - rid: 8016363972690968708 - rid: 8016363972690968733 + - rid: 8016363991059660893 m_GraphWireModels: - rid: 8016363972690968626 - rid: 8016363972690968627 @@ -46,6 +47,7 @@ MonoBehaviour: - rid: 8016363972690968684 - rid: 8016363972690968709 - rid: 8016363972690968734 + - rid: 8016363991059660917 m_GraphStickyNoteModels: [] m_GraphPlacematModels: [] m_GraphVariableModels: [] @@ -56,9 +58,9 @@ MonoBehaviour: m_LastKnownBounds: serializedVersion: 2 x: -44 - y: -435 + y: -505 width: 3374 - height: 1357 + height: 1427 m_GraphElementMetaData: - m_Guid: m_Value0: 8626403947206528014 @@ -180,6 +182,22 @@ MonoBehaviour: Hash: bc4b78ec44bb9a6eb9af43965358dc01 m_Category: 2 m_Index: 6 + - m_Guid: + m_Value0: 18425120084521440740 + m_Value1: 12066133965218665309 + m_HashGuid: + serializedVersion: 2 + Hash: e4d5d0ad182db3ff5d532289e98473a7 + m_Category: 0 + m_Index: 8 + - m_Guid: + m_Value0: 11532748687919323888 + m_Value1: 3790987765041823046 + m_HashGuid: + serializedVersion: 2 + Hash: f09a481bd48d0ca0467d2b6b494b9c34 + m_Category: 2 + m_Index: 7 m_EntryPoint: rid: 8016363908462280767 m_Graph: @@ -265,7 +283,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -276,6 +293,7 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - Voice m_ValueList: - rid: 8016363908462280771 - rid: 8016363908462280772 @@ -288,7 +306,6 @@ MonoBehaviour: - rid: 8016363908462280779 - rid: 8016363908462280780 - rid: 8016363908462280781 - - rid: 8016363908462280782 - rid: 8016363908462280783 - rid: 8016363908462280784 - rid: 8016363908462280785 @@ -299,6 +316,7 @@ MonoBehaviour: - rid: 8016363908462280790 - rid: 8016363908462280791 - rid: 8016363908462280792 + - rid: 8016363991059660863 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -360,10 +378,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363908462280782 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363908462280783 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -436,7 +450,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -447,6 +460,7 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - Voice m_ValueList: - rid: 8016363972690968603 - rid: 8016363972690968604 @@ -459,7 +473,6 @@ MonoBehaviour: - rid: 8016363972690968611 - rid: 8016363972690968612 - rid: 8016363972690968613 - - rid: 8016363972690968614 - rid: 8016363972690968615 - rid: 8016363972690968616 - rid: 8016363972690968617 @@ -470,6 +483,7 @@ MonoBehaviour: - rid: 8016363972690968622 - rid: 8016363972690968623 - rid: 8016363972690968624 + - rid: 8016363991059660864 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -532,10 +546,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363972690968614 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363972690968615 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -672,7 +682,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -688,6 +697,7 @@ MonoBehaviour: - Choice0Code - Choice1Text - Choice1Code + - Voice m_ValueList: - rid: 8016363972690968630 - rid: 8016363972690968631 @@ -700,7 +710,6 @@ MonoBehaviour: - rid: 8016363972690968638 - rid: 8016363972690968639 - rid: 8016363972690968640 - - rid: 8016363972690968641 - rid: 8016363972690968642 - rid: 8016363972690968643 - rid: 8016363972690968644 @@ -716,6 +725,7 @@ MonoBehaviour: - rid: 8016363972690968655 - rid: 8016363972690968656 - rid: 8016363972690968657 + - rid: 8016363991059660865 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -800,7 +810,7 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: + Value: "\uC794\uB514\uC57C, \uB9C8\uCE68 \uC798 \uC654\uC5B4." - rid: 8016363972690968639 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -809,10 +819,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363972690968641 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363972690968642 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -865,7 +871,8 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: "\uC81C\uAC00 \uB300\uC2E0 \uB3CC\uB824\uBCF4\uB0BC\uAC8C\uC694." + Value: "\uC120\uBC30\uB294 \uC26C\uACE0 \uC788\uC5B4\uC694. \uC81C\uAC00 + \uB300\uC2E0 \uB3CC\uB824\uBCF4\uB0BC\uAC8C\uC694." - rid: 8016363972690968655 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -908,7 +915,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -919,6 +925,7 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - Voice m_ValueList: - rid: 8016363972690968660 - rid: 8016363972690968661 @@ -931,7 +938,6 @@ MonoBehaviour: - rid: 8016363972690968668 - rid: 8016363972690968669 - rid: 8016363972690968670 - - rid: 8016363972690968671 - rid: 8016363972690968672 - rid: 8016363972690968673 - rid: 8016363972690968674 @@ -942,6 +948,7 @@ MonoBehaviour: - rid: 8016363972690968679 - rid: 8016363972690968680 - rid: 8016363972690968681 + - rid: 8016363991059660866 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1036,10 +1043,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363972690968671 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363972690968672 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1079,7 +1082,7 @@ MonoBehaviour: - rid: 8016363972690968681 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 20 - rid: 8016363972690968682 type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: @@ -1112,7 +1115,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1123,6 +1125,7 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - Voice m_ValueList: - rid: 8016363972690968685 - rid: 8016363972690968686 @@ -1135,7 +1138,6 @@ MonoBehaviour: - rid: 8016363972690968693 - rid: 8016363972690968694 - rid: 8016363972690968695 - - rid: 8016363972690968696 - rid: 8016363972690968697 - rid: 8016363972690968698 - rid: 8016363972690968699 @@ -1146,6 +1148,7 @@ MonoBehaviour: - rid: 8016363972690968704 - rid: 8016363972690968705 - rid: 8016363972690968706 + - rid: 8016363991059660867 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1239,10 +1242,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363972690968696 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363972690968697 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1315,7 +1314,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1326,6 +1324,7 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - Voice m_ValueList: - rid: 8016363972690968710 - rid: 8016363972690968711 @@ -1338,7 +1337,6 @@ MonoBehaviour: - rid: 8016363972690968718 - rid: 8016363972690968719 - rid: 8016363972690968720 - - rid: 8016363972690968721 - rid: 8016363972690968722 - rid: 8016363972690968723 - rid: 8016363972690968724 @@ -1349,6 +1347,7 @@ MonoBehaviour: - rid: 8016363972690968729 - rid: 8016363972690968730 - rid: 8016363972690968731 + - rid: 8016363991059660868 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1443,10 +1442,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363972690968721 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363972690968722 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1519,7 +1514,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -1530,6 +1524,7 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - Voice m_ValueList: - rid: 8016363972690968735 - rid: 8016363972690968736 @@ -1542,7 +1537,6 @@ MonoBehaviour: - rid: 8016363972690968743 - rid: 8016363972690968744 - rid: 8016363972690968745 - - rid: 8016363972690968746 - rid: 8016363972690968747 - rid: 8016363972690968748 - rid: 8016363972690968749 @@ -1553,6 +1547,7 @@ MonoBehaviour: - rid: 8016363972690968754 - rid: 8016363972690968755 - rid: 8016363972690968756 + - rid: 8016363991059660869 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1647,10 +1642,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363972690968746 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363972690968747 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1686,11 +1677,242 @@ MonoBehaviour: - rid: 8016363972690968755 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: -10 - rid: 8016363972690968756 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 20 - rid: 8016363972690968757 type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: + - rid: 8016363991059660863 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660864 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660865 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660866 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660867 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660868 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660869 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660893 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 18425120084521440740 + m_Value1: 12066133965218665309 + m_HashGuid: + serializedVersion: 2 + Hash: e4d5d0ad182db3ff5d532289e98473a7 + m_Version: 2 + m_Position: {x: 2457.734, y: -504.9305} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - UseFixedAngle + - FixedAngleY + - WaitForInput + - Affection + - Progress + - Voice + m_ValueList: + - rid: 8016363991059660894 + - rid: 8016363991059660895 + - rid: 8016363991059660896 + - rid: 8016363991059660897 + - rid: 8016363991059660898 + - rid: 8016363991059660899 + - rid: 8016363991059660900 + - rid: 8016363991059660901 + - rid: 8016363991059660902 + - rid: 8016363991059660903 + - rid: 8016363991059660904 + - rid: 8016363991059660905 + - rid: 8016363991059660906 + - rid: 8016363991059660907 + - rid: 8016363991059660908 + - rid: 8016363991059660909 + - rid: 8016363991059660910 + - rid: 8016363991059660911 + - rid: 8016363991059660912 + - rid: 8016363991059660913 + - rid: 8016363991059660914 + - rid: 8016363991059660915 + 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: 8016363991059660916 + - rid: 8016363991059660894 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059660895 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363991059660896 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059660897 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363991059660898 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363991059660899 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: c6477f09ddbfaaa43b73a8eb323ba389, type: 2} + - rid: 8016363991059660900 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 8016363991059660901 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: c6477f09ddbfaaa43b73a8eb323ba389, type: 2} + - rid: 8016363991059660902 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uACE0\uB9C8\uC6CC \uC794\uB514\uC57C." + - rid: 8016363991059660903 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660904 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660905 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660906 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660907 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 5 + - rid: 8016363991059660908 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059660909 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059660910 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059660911 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059660912 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059660913 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 35 + - rid: 8016363991059660914 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 20 + - rid: 8016363991059660915 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660916 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 8016363991059660917 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 11532748687919323888 + m_Value1: 3790987765041823046 + m_HashGuid: + serializedVersion: 2 + Hash: f09a481bd48d0ca0467d2b6b494b9c34 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 5787625678279484125 + m_Value1: 14753596033021308946 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: dd22c7e6e3c6515012f0d8936c4dbfcc + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 18425120084521440740 + m_Value1: 12066133965218665309 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: e4d5d0ad182db3ff5d532289e98473a7 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: diff --git a/Assets/07_Data/DialogGraph/Chapter4/yuna ch4.dlg b/Assets/07_Data/DialogGraph/Chapter4/yuna ch4.dlg index 9c4fbec6..2950266e 100644 --- a/Assets/07_Data/DialogGraph/Chapter4/yuna ch4.dlg +++ b/Assets/07_Data/DialogGraph/Chapter4/yuna ch4.dlg @@ -211,7 +211,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -229,6 +228,7 @@ MonoBehaviour: - Choice1Code - Choice2Text - Choice2Code + - Voice m_ValueList: - rid: 8016363972690969080 - rid: 8016363972690969081 @@ -241,7 +241,6 @@ MonoBehaviour: - rid: 8016363972690969088 - rid: 8016363972690969089 - rid: 8016363972690969090 - - rid: 8016363972690969091 - rid: 8016363972690969092 - rid: 8016363972690969093 - rid: 8016363972690969094 @@ -259,6 +258,7 @@ MonoBehaviour: - rid: 8016363972690969107 - rid: 8016363972690969108 - rid: 8016363972690969109 + - rid: 8016363991059660918 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -343,7 +343,8 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: + Value: "\uC794\uB514\uC57C, \uC5EC\uAE30\uAE4C\uC9C0 \uC6EC\uC77C\uC774\uC57C?\n\uD639\uC2DC + \uB204\uAD6C \uCC3E\uC73C\uB7EC \uC654\uC5B4?" - rid: 8016363972690969089 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -352,10 +353,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363972690969091 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363972690969092 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -462,7 +459,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -473,6 +469,7 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - Voice m_ValueList: - rid: 8016363972690969112 - rid: 8016363972690969113 @@ -485,7 +482,6 @@ MonoBehaviour: - rid: 8016363972690969120 - rid: 8016363972690969121 - rid: 8016363972690969122 - - rid: 8016363972690969123 - rid: 8016363972690969124 - rid: 8016363972690969125 - rid: 8016363972690969126 @@ -496,6 +492,7 @@ MonoBehaviour: - rid: 8016363972690969131 - rid: 8016363972690969132 - rid: 8016363972690969133 + - rid: 8016363991059660919 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -590,10 +587,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363972690969123 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363972690969124 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -666,7 +659,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -677,6 +669,7 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - Voice m_ValueList: - rid: 8016363972690969159 - rid: 8016363972690969160 @@ -689,7 +682,6 @@ MonoBehaviour: - rid: 8016363972690969167 - rid: 8016363972690969168 - rid: 8016363972690969169 - - rid: 8016363972690969170 - rid: 8016363972690969171 - rid: 8016363972690969172 - rid: 8016363972690969173 @@ -700,6 +692,7 @@ MonoBehaviour: - rid: 8016363972690969178 - rid: 8016363972690969179 - rid: 8016363972690969180 + - rid: 8016363991059660920 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -763,10 +756,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363972690969170 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363972690969171 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -802,11 +791,11 @@ MonoBehaviour: - rid: 8016363972690969179 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 35 - rid: 8016363972690969180 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 20 - rid: 8016363972690969181 type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: @@ -839,7 +828,6 @@ MonoBehaviour: - TalkText - Gesture - Expression - - Voice - Bgm - Vfx - LineDuration @@ -850,6 +838,7 @@ MonoBehaviour: - WaitForInput - Affection - Progress + - Voice m_ValueList: - rid: 8016363972690969206 - rid: 8016363972690969207 @@ -862,7 +851,6 @@ MonoBehaviour: - rid: 8016363972690969214 - rid: 8016363972690969215 - rid: 8016363972690969216 - - rid: 8016363972690969217 - rid: 8016363972690969218 - rid: 8016363972690969219 - rid: 8016363972690969220 @@ -873,6 +861,7 @@ MonoBehaviour: - rid: 8016363972690969225 - rid: 8016363972690969226 - rid: 8016363972690969227 + - rid: 8016363991059660921 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -935,10 +924,6 @@ MonoBehaviour: type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363972690969217 - type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - rid: 8016363972690969218 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1046,3 +1031,19 @@ MonoBehaviour: m_PortDirection: 1 m_PortOrientation: 0 m_Title: + - rid: 8016363991059660918 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660919 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660920 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059660921 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} diff --git a/Assets/11_Audio/BGM/ep4.meta b/Assets/11_Audio/BGM/ep4.meta new file mode 100644 index 00000000..0bd761ef --- /dev/null +++ b/Assets/11_Audio/BGM/ep4.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2fcec9da9cf43bb4d900c8d775f711d2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/11_Audio/BGM/ep4/falling-down-02-239540.mp3 b/Assets/11_Audio/BGM/ep4/falling-down-02-239540.mp3 new file mode 100644 index 00000000..a5073552 --- /dev/null +++ b/Assets/11_Audio/BGM/ep4/falling-down-02-239540.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dfcd54d2b1dd32331e45e5bd2df4041ebcb00f116c24ac0fe505d4174d5bbc0 +size 86935 diff --git a/Assets/11_Audio/BGM/ep4/falling-down-02-239540.mp3.meta b/Assets/11_Audio/BGM/ep4/falling-down-02-239540.mp3.meta new file mode 100644 index 00000000..883e5ac8 --- /dev/null +++ b/Assets/11_Audio/BGM/ep4/falling-down-02-239540.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 587cdb03e5810074f855a1fa72a7862e +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index 96124b78..9c148c8f 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afe3d153300f1eaab8f59629b2ff578ba019f6369d60a4e972bdb582baf87882 -size 93940 +oid sha256:070d1c71aa93b126ebed3832ffbc33829b19e6930781dfa98ea022fe52c8c0d0 +size 98825