diff --git a/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity b/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity index f04931b6..0f295927 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e845ecf68887a05690bc9b57b3af34fd55ed2b55df114c9217624a30a05f45e6 -size 63804 +oid sha256:7a0e6106b0d5561f04e6585b8f1abcd4a74db954284e213aec3885d7285126b3 +size 69534 diff --git a/Assets/02_Scripts/Player/PlayerController.cs b/Assets/02_Scripts/Player/PlayerController.cs index f3312f2f..6e050d62 100644 --- a/Assets/02_Scripts/Player/PlayerController.cs +++ b/Assets/02_Scripts/Player/PlayerController.cs @@ -1,15 +1,47 @@ -using System.Collections.Generic; using UnityEngine; +using UnityEngine.XR.Interaction.Toolkit.Locomotion.Movement; -public class PlayerController : MonoBehaviour,ISceneInitializable +public class PlayerController : MonoBehaviour, ISceneInitializable { + [Header("점프 설정")] + [SerializeField] private float _jumpHeight = 1.2f; + + private Vector3 _playerVelocity; + private CharacterController _controller; + private ContinuousMoveProvider _moveProvider; + private float gravityValue = Physics.gravity.y; + + private void Awake() + { + _controller = GetComponentInChildren(true); + _moveProvider = GetComponentInChildren(true); + } + public void OnSceneLoaded() { + // 씬이 다시 로드돼도 한 번만 구독되도록 중복 제거 후 등록 + InputManager.Instance.OnJump_Event -= this.OnJump; InputManager.Instance.OnJump_Event += this.OnJump; } public void OnJump() { - + if (_controller == null) return; + if (!_controller.isGrounded) return; + + _playerVelocity.y = Mathf.Sqrt(_jumpHeight * -2f * gravityValue); } -} \ No newline at end of file + + private void Update() + { + // 바닥 체크 및 Y축 속도 초기화 + if (_controller.isGrounded && _playerVelocity.y < 0) + { + // 완전히 0으로 두면 바닥 감지가 불안정할 수 있으므로 약간의 음수 값을 유지 + _playerVelocity.y = -2f; + } + + _playerVelocity.y += gravityValue * Time.deltaTime; + _controller.Move(_playerVelocity * Time.deltaTime); + } +} diff --git a/Assets/04_Models/Hands/WoodHand/LeftHand_StylizedWood.prefab b/Assets/04_Models/Hands/WoodHand/LeftHand_StylizedWood.prefab new file mode 100644 index 00000000..fd832804 --- /dev/null +++ b/Assets/04_Models/Hands/WoodHand/LeftHand_StylizedWood.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e24ecc59c3ed500c157c6ae5655ed6ee5eba8869554e78570805dcece98f5888 +size 23211 diff --git a/Assets/04_Models/Hands/WoodHand/LeftHand_StylizedWood.prefab.meta b/Assets/04_Models/Hands/WoodHand/LeftHand_StylizedWood.prefab.meta new file mode 100644 index 00000000..cde48bfd --- /dev/null +++ b/Assets/04_Models/Hands/WoodHand/LeftHand_StylizedWood.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9a534fd8b03ad4d4bb52186f1b14673e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Hands/WoodHand/Poses/WHPose_GrabStick.asset b/Assets/04_Models/Hands/WoodHand/Poses/WHPose_GrabStick.asset new file mode 100644 index 00000000..da576886 --- /dev/null +++ b/Assets/04_Models/Hands/WoodHand/Poses/WHPose_GrabStick.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4675375c3170ba56cddbf8d1dbe1e5a6d3e67e41c6407098ce6080a7d810be79 +size 5036 diff --git a/Assets/04_Models/Hands/WoodHand/Poses/WHPose_GrabStick.asset.meta b/Assets/04_Models/Hands/WoodHand/Poses/WHPose_GrabStick.asset.meta new file mode 100644 index 00000000..22e61a48 --- /dev/null +++ b/Assets/04_Models/Hands/WoodHand/Poses/WHPose_GrabStick.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 44d9c2fc7cd20f041829401580b55417 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Hands/WoodHand/Poses/WHPose_Point.asset b/Assets/04_Models/Hands/WoodHand/Poses/WHPose_Point.asset new file mode 100644 index 00000000..0e09c2f0 --- /dev/null +++ b/Assets/04_Models/Hands/WoodHand/Poses/WHPose_Point.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7fc74778ef80efaa179e7eb7d66b3bb10bab4575c195237acd1b72d121a0928 +size 5024 diff --git a/Assets/04_Models/Hands/WoodHand/Poses/WHPose_Point.asset.meta b/Assets/04_Models/Hands/WoodHand/Poses/WHPose_Point.asset.meta new file mode 100644 index 00000000..718208a0 --- /dev/null +++ b/Assets/04_Models/Hands/WoodHand/Poses/WHPose_Point.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b010d83e1b47a0b489dea53925158b33 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Hands/WoodHand/RightHand_StylizedWood.prefab b/Assets/04_Models/Hands/WoodHand/RightHand_StylizedWood.prefab new file mode 100644 index 00000000..d3f5772c --- /dev/null +++ b/Assets/04_Models/Hands/WoodHand/RightHand_StylizedWood.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95d27fd2ced82a4a64cb2fc805af36b99d63a7da8c4d055000c1d112afa2c121 +size 37006 diff --git a/Assets/04_Models/Hands/WoodHand/RightHand_Wood.prefab.meta b/Assets/04_Models/Hands/WoodHand/RightHand_StylizedWood.prefab.meta similarity index 100% rename from Assets/04_Models/Hands/WoodHand/RightHand_Wood.prefab.meta rename to Assets/04_Models/Hands/WoodHand/RightHand_StylizedWood.prefab.meta diff --git a/Assets/04_Models/Hands/WoodHand/RightHand_Wood.prefab b/Assets/04_Models/Hands/WoodHand/RightHand_Wood.prefab deleted file mode 100644 index 5726aee1..00000000 --- a/Assets/04_Models/Hands/WoodHand/RightHand_Wood.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cafadd9ec8e8fb9bcc6006c4a245c892e5f03f7dc673a279d1eaaaa56360c2f9 -size 35929 diff --git a/Assets/04_Models/Player.prefab b/Assets/04_Models/Player.prefab new file mode 100644 index 00000000..ccc36439 --- /dev/null +++ b/Assets/04_Models/Player.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:356a03f4eec731823b24446ee7efd6aedaadfb643fc1e30a317f3d7d54d32f7d +size 76054 diff --git a/Assets/04_Models/Player.prefab.meta b/Assets/04_Models/Player.prefab.meta new file mode 100644 index 00000000..ceb613d9 --- /dev/null +++ b/Assets/04_Models/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 401911b5467339048803f487515483df +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XRI Starter Kit/Assets/Settings/XR/Settings/Open VR Settings.asset b/Assets/XRI Starter Kit/Assets/Settings/XR/Settings/Open VR Settings.asset index e2357fc9..096a150f 100644 --- a/Assets/XRI Starter Kit/Assets/Settings/XR/Settings/Open VR Settings.asset +++ b/Assets/XRI Starter Kit/Assets/Settings/XR/Settings/Open VR Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c234abd793d299b01b9178ee4b65c9dc2f0e6696e567cb4e4dc81d60a48e1f2 -size 722 +oid sha256:7cb0d4385688cdbe9d20019027f657da3d0084dc69763c488d8691c922a9a537 +size 999 diff --git a/Assets/XRI Starter Kit/Resources/HandPoserSettings.asset b/Assets/XRI Starter Kit/Resources/HandPoserSettings.asset index 54a604f3..9f96c538 100644 --- a/Assets/XRI Starter Kit/Resources/HandPoserSettings.asset +++ b/Assets/XRI Starter Kit/Resources/HandPoserSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:680ecb93dcce8c5c511593d487b58a7c61fac4c2b14089147c8d30bb02ac89d7 -size 1609 +oid sha256:37f03201d36157fc0ccf56ceae0091cd82eeab4c94589302c5bc8330d1d2deb0 +size 1072