diff --git a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity index ce28dc06..95b55a40 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:720cb4498be295ad886e46b2fceea9765ae69058616925a5569d891862b4b196 -size 2114558 +oid sha256:966715466c0f208aa6cfdebf5ffeaf4dfdf0e15a885df4dc8ad3b1339bb6de25 +size 2114751 diff --git a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity index a6de7ad0..bb6167e7 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c37380f04c686f839ba83fff030f4d95cce62067f04d94da7cf3a9f919fbb6c -size 11725 +oid sha256:df3547b34290f5075760581922dbe37e195330e003ffece2b0a206d93322ab9b +size 50348 diff --git a/Assets/01_Scenes/blackjack.unity b/Assets/01_Scenes/blackjack.unity index 291ebd5f..6fea2fc7 100644 --- a/Assets/01_Scenes/blackjack.unity +++ b/Assets/01_Scenes/blackjack.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:535b35396890d4109235a76b80c6219d34aaf4ea892dec76b4ebaaef5f99bd94 -size 2301118 +oid sha256:f39ac55a1d93f297206e86d1f91ba89b0acfbfc9ec28a2b722da923bb5c91ccd +size 2306089 diff --git a/Assets/02_Scripts/Managers/change room manager/gapato.meta b/Assets/02_Scripts/Managers/change room manager/gapato.meta new file mode 100644 index 00000000..53cf0798 --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/gapato.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47ef309091683cf409e48c93663f025b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs new file mode 100644 index 00000000..8557751f --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs @@ -0,0 +1,151 @@ +using System.Collections; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +public class GeppettoRunTriggerZone : MonoBehaviour +{ + [Header("Trigger")] + public string playerTag = "Player"; + + [Header("Geppetto")] + public Transform geppetto; + public Animator geppettoAnimator; + public string runBoolName = "isRunning"; + + [Header("Move")] + public float runSpeed = 5f; + public float rotateSpeed = 8f; + public float fadeDistance = 2f; + + [Header("Fade")] + public Image blackFadeImage; + public float fadeDuration = 1f; + + [Header("Scene")] + public string nextSceneName; + + private Transform targetPlayer; + private bool started = false; + private bool fading = false; + + private void Start() + { + if (blackFadeImage != null) + { + blackFadeImage.gameObject.SetActive(true); + + Color c = blackFadeImage.color; + c.a = 0f; + blackFadeImage.color = c; + } + + if (geppettoAnimator != null && !string.IsNullOrEmpty(runBoolName)) + { + geppettoAnimator.SetBool(runBoolName, false); + } + } + + private void OnTriggerEnter(Collider other) + { + if (started) + return; + + if (!IsPlayer(other)) + return; + + Debug.Log("제페토 이벤트 구역 진입: " + other.name); + + targetPlayer = other.transform; + started = true; + + if (geppettoAnimator != null && !string.IsNullOrEmpty(runBoolName)) + { + geppettoAnimator.SetBool(runBoolName, true); + } + + Collider triggerCollider = GetComponent(); + if (triggerCollider != null) + { + triggerCollider.enabled = false; + } + } + + private void Update() + { + if (!started || fading) + return; + + if (geppetto == null || targetPlayer == null) + return; + + Vector3 dir = targetPlayer.position - geppetto.position; + dir.y = 0f; + + float distance = dir.magnitude; + + if (dir.sqrMagnitude > 0.001f) + { + Quaternion targetRotation = Quaternion.LookRotation(dir); + geppetto.rotation = Quaternion.Slerp( + geppetto.rotation, + targetRotation, + Time.deltaTime * rotateSpeed + ); + + geppetto.position += dir.normalized * runSpeed * Time.deltaTime; + } + + if (distance <= fadeDistance) + { + StartCoroutine(FadeOutAndLoadScene()); + } + } + + private IEnumerator FadeOutAndLoadScene() + { + fading = true; + + if (geppettoAnimator != null && !string.IsNullOrEmpty(runBoolName)) + { + geppettoAnimator.SetBool(runBoolName, false); + } + + float t = 0f; + + while (t < fadeDuration) + { + t += Time.deltaTime; + float alpha = Mathf.Clamp01(t / fadeDuration); + + if (blackFadeImage != null) + { + Color c = blackFadeImage.color; + c.a = alpha; + blackFadeImage.color = c; + } + + yield return null; + } + + if (!string.IsNullOrWhiteSpace(nextSceneName)) + { + SceneManager.LoadScene(nextSceneName); + } + else + { + Debug.LogWarning("Next Scene Name이 비어있습니다."); + } + } + + private bool IsPlayer(Collider other) + { + if (other.CompareTag(playerTag)) + return true; + + if (other.transform.root.CompareTag(playerTag)) + return true; + + return false; + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs.meta b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs.meta new file mode 100644 index 00000000..1eb822b1 --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9147beba2b87e4d4b9644fb0647ef6b2 \ No newline at end of file diff --git a/Assets/04_Models/Characters/gepto/gepto.controller b/Assets/04_Models/Characters/gepto/gepto.controller index e2542c13..434f7b0a 100644 --- a/Assets/04_Models/Characters/gepto/gepto.controller +++ b/Assets/04_Models/Characters/gepto/gepto.controller @@ -12,9 +12,6 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -2406606947297670322} m_Position: {x: -210, y: 20, z: 0} - - serializedVersion: 1 - m_State: {fileID: -3832682758273198342} - m_Position: {x: 100, y: -170, z: 0} - serializedVersion: 1 m_State: {fileID: 6143119609231041675} m_Position: {x: -378.74075, y: -74.29628, z: 0} @@ -43,32 +40,6 @@ AnimatorTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 1 ---- !u!1102 &-3832682758273198342 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KA_Idle33_Hug1_1 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 8993902097722301239, guid: e3140c001bd1dd249b2f4885d3041714, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &-2406606947297670322 AnimatorState: serializedVersion: 6 @@ -103,7 +74,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isRunning + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 6143119609231041675} m_Solo: 0 @@ -126,7 +100,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: gepto serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: isRunning + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -140,28 +120,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &2768032479665430707 -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: -3832682758273198342} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.77272725 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &6143119609231041675 AnimatorState: serializedVersion: 6 @@ -172,8 +130,7 @@ AnimatorState: m_Name: Running (1) m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 2768032479665430707} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb b/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb new file mode 100644 index 00000000..e5d842a0 Binary files /dev/null and b/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb differ diff --git a/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb.meta b/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb.meta new file mode 100644 index 00000000..6dd1a140 --- /dev/null +++ b/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb.meta @@ -0,0 +1,28 @@ +fileFormatVersion: 2 +guid: 44bc951c8943f4642b0ef9dc7fb25204 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3} + editorImportSettings: + generateSecondaryUVSet: 0 + importSettings: + nodeNameMethod: 1 + animationMethod: 2 + generateMipMaps: 1 + texturesReadable: 0 + defaultMinFilterMode: 9729 + defaultMagFilterMode: 9729 + anisotropicFilterLevel: 1 + instantiationSettings: + mask: -1 + layer: 0 + skinUpdateWhenOffscreen: 1 + lightIntensityFactor: 1 + sceneObjectCreation: 2 + assetDependencies: [] + reportItems: [] diff --git a/Assets/New Terrain 1.asset b/Assets/New Terrain 1.asset new file mode 100644 index 00000000..4d956b74 --- /dev/null +++ b/Assets/New Terrain 1.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:368dbe6748851fdf60be88e380844e7ed88f532eb5476343fd04172c45b5cf1c +size 1958860 diff --git a/Assets/New Terrain 1.asset.meta b/Assets/New Terrain 1.asset.meta new file mode 100644 index 00000000..53b994d1 --- /dev/null +++ b/Assets/New Terrain 1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5fd6eed5b5a9b940b1db858e80950af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 15600000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Stylized Water 3/_Demo/DemoAssets/Terrain/Layers/SWS_Seaweed.terrainlayer b/Assets/Stylized Water 3/_Demo/DemoAssets/Terrain/Layers/SWS_Seaweed.terrainlayer index 4e288e33..7b4990f5 100644 --- a/Assets/Stylized Water 3/_Demo/DemoAssets/Terrain/Layers/SWS_Seaweed.terrainlayer +++ b/Assets/Stylized Water 3/_Demo/DemoAssets/Terrain/Layers/SWS_Seaweed.terrainlayer @@ -20,3 +20,4 @@ TerrainLayer: m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_SmoothnessSource: 1