From 50feced56f5a1956544ff772efd04dfb4bac7034 Mon Sep 17 00:00:00 2001 From: VDH Date: Tue, 9 Sep 2025 13:30:12 +0700 Subject: [PATCH] adjust --- Assets/Scripts/{CharacterCtrl.cs => CECHostPlayer.cs} | 10 +++++++++- Assets/Scripts/CECHostPlayer.cs.meta | 2 ++ Assets/Scripts/CharacterCtrl.cs.meta | 2 -- Assets/Scripts/GameController.cs | 4 ++-- Assets/Scripts/PlayerState/PlayerMoveState.cs | 2 +- Assets/Scripts/PlayerState/PlayerState.cs | 4 ++-- Assets/Scripts/PlayerStateMachine.cs | 2 +- .../Scripts/ThirdPersonController.cs | 6 +++--- 8 files changed, 20 insertions(+), 12 deletions(-) rename Assets/Scripts/{CharacterCtrl.cs => CECHostPlayer.cs} (97%) create mode 100644 Assets/Scripts/CECHostPlayer.cs.meta delete mode 100644 Assets/Scripts/CharacterCtrl.cs.meta diff --git a/Assets/Scripts/CharacterCtrl.cs b/Assets/Scripts/CECHostPlayer.cs similarity index 97% rename from Assets/Scripts/CharacterCtrl.cs rename to Assets/Scripts/CECHostPlayer.cs index 28639d1475..b7c8d6ef39 100644 --- a/Assets/Scripts/CharacterCtrl.cs +++ b/Assets/Scripts/CECHostPlayer.cs @@ -6,7 +6,7 @@ using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.UI; -public class CharacterCtrl : MonoBehaviour +public class CECHostPlayer : MonoBehaviour { [SerializeField] private TextMeshPro txtName; [SerializeField] private CharacterController controller; @@ -27,6 +27,7 @@ public class CharacterCtrl : MonoBehaviour bool isGrounded = false; bool isRun = false; GameObject modle; + Vector3 m_vLastSevPos; // ====== Ground cast config ====== [Header("Ground Cast")] @@ -163,7 +164,14 @@ public class CharacterCtrl : MonoBehaviour SetAnimJump(); } } + private void OnMsgHstCorrectPos() + { + } + private void SetPos() + { + + } public void SetStatusRun(bool value) { if (!isGrounded) diff --git a/Assets/Scripts/CECHostPlayer.cs.meta b/Assets/Scripts/CECHostPlayer.cs.meta new file mode 100644 index 0000000000..d3498cdfc3 --- /dev/null +++ b/Assets/Scripts/CECHostPlayer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c0911af06fee458459c86236ea21b716 \ No newline at end of file diff --git a/Assets/Scripts/CharacterCtrl.cs.meta b/Assets/Scripts/CharacterCtrl.cs.meta deleted file mode 100644 index 4f2f803dde..0000000000 --- a/Assets/Scripts/CharacterCtrl.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: c0525de198450e14f9f6ad854b95ec99 \ No newline at end of file diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs index 5098a43ea9..9a0a497524 100644 --- a/Assets/Scripts/GameController.cs +++ b/Assets/Scripts/GameController.cs @@ -7,7 +7,7 @@ public class GameController : MonoBehaviour { private static GameController instance; - [SerializeField] private CharacterCtrl characterPrefab; + [SerializeField] private CECHostPlayer characterPrefab; [SerializeField] private Transform ground; Camera camera; @@ -44,7 +44,7 @@ public class GameController : MonoBehaviour public void InitCharacter(RoleInfo roleInfo) { - CharacterCtrl character = Instantiate(characterPrefab, transform); + CECHostPlayer character = Instantiate(characterPrefab, transform); character.InitCharacter(roleInfo); Vector3 pos = new Vector3(roleInfo.posx, roleInfo.posy, roleInfo.posz); Vector3 posCam = pos; diff --git a/Assets/Scripts/PlayerState/PlayerMoveState.cs b/Assets/Scripts/PlayerState/PlayerMoveState.cs index b7f4e92fae..d284e874e7 100644 --- a/Assets/Scripts/PlayerState/PlayerMoveState.cs +++ b/Assets/Scripts/PlayerState/PlayerMoveState.cs @@ -2,7 +2,7 @@ using UnityEngine; public class PlayerMoveState : PlayerState { - public PlayerMoveState(CharacterCtrl characterCtrl) : base(characterCtrl) + public PlayerMoveState(CECHostPlayer characterCtrl) : base(characterCtrl) { } diff --git a/Assets/Scripts/PlayerState/PlayerState.cs b/Assets/Scripts/PlayerState/PlayerState.cs index 3c41a61c20..6ce5c03a59 100644 --- a/Assets/Scripts/PlayerState/PlayerState.cs +++ b/Assets/Scripts/PlayerState/PlayerState.cs @@ -2,8 +2,8 @@ using UnityEngine; public abstract class PlayerState { - protected readonly CharacterCtrl _characterCtrl; - public PlayerState(CharacterCtrl characterCtrl) + protected readonly CECHostPlayer _characterCtrl; + public PlayerState(CECHostPlayer characterCtrl) { _characterCtrl = characterCtrl; } diff --git a/Assets/Scripts/PlayerStateMachine.cs b/Assets/Scripts/PlayerStateMachine.cs index 40c4955d57..ecf8110c01 100644 --- a/Assets/Scripts/PlayerStateMachine.cs +++ b/Assets/Scripts/PlayerStateMachine.cs @@ -3,7 +3,7 @@ using UnityEngine; public class PlayerStateMachine { PlayerState _state; - CharacterCtrl _characterCtrl; + CECHostPlayer _characterCtrl; public void InitState(PlayerState state) { diff --git a/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs b/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs index ea49fab083..855dea1336 100644 --- a/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs +++ b/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs @@ -8,7 +8,7 @@ using UnityEngine.InputSystem; namespace StarterAssets { - [RequireComponent(typeof(CharacterCtrl))] + [RequireComponent(typeof(CECHostPlayer))] #if ENABLE_INPUT_SYSTEM [RequireComponent(typeof(PlayerInput))] #endif @@ -102,7 +102,7 @@ namespace StarterAssets private PlayerInput _playerInput; #endif private Animator _animator; - private CharacterCtrl _controller; + private CECHostPlayer _controller; private StarterAssetsInputs _input; private GameObject _mainCamera; @@ -137,7 +137,7 @@ namespace StarterAssets _cinemachineTargetYaw = CinemachineCameraTarget.transform.rotation.eulerAngles.y; _hasAnimator = TryGetComponent(out _animator); - _controller = GetComponent(); + _controller = GetComponent(); _input = GetComponent(); #if ENABLE_INPUT_SYSTEM _playerInput = GetComponent();