From f9b9432f209c577b97332d44fd6426d533c7f74a Mon Sep 17 00:00:00 2001
From: Tungdv <TungDv>
Date: Tue, 6 Jan 2026 19:04:58 +0700
Subject: [PATCH] fix: update logic swim hp.

---
 Assets/PerfectWorld/Scripts/Camera/CameraController.cs | 8 ++++++++
 Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMove.cs  | 1 -
 Assets/PerfectWorld/Scripts/Move/EC_CDR.cs             | 2 +-
 Assets/Scripts/CECHostPlayer.cs                        | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Assets/PerfectWorld/Scripts/Camera/CameraController.cs b/Assets/PerfectWorld/Scripts/Camera/CameraController.cs
index 215106bc54..7a9f933518 100644
--- a/Assets/PerfectWorld/Scripts/Camera/CameraController.cs
+++ b/Assets/PerfectWorld/Scripts/Camera/CameraController.cs
@@ -6,6 +6,7 @@ namespace BrewMonster
 {
     public class CameraController : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, IDragHandler
     {
+        public static CameraController Instance;
         [SerializeField]private CinemachineCamera _cinemachineCamera;
         [SerializeField]private CinemachineOrbitalFollow orbital;
         private Vector2 currentPos;
@@ -15,6 +16,13 @@ namespace BrewMonster
         public float speedX = 1f;
         public float speedY = 1f;
 
+        public CinemachineOrbitalFollow Orbital { get => orbital;}
+
+        void OnEnable()
+        {
+            Instance = this;
+        }
+
         public void OnDrag(PointerEventData eventData)
         {
             delta = eventData.position - currentPos;
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMove.cs b/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMove.cs
index c02f6e0857..6bf6caa3fb 100644
--- a/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMove.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMove.cs
@@ -531,7 +531,6 @@ namespace BrewMonster.Scripts
                     }
 
                     vCurPos = m_pHost.m_MoveCtrl.GroundMove(m_vCurDir, fSpeed, fDeltaTime, m_pHost.m_fVertSpeed);
-                    Debug.LogError(vCurPos);
                     UpdateFacingFromDelta(vCurPos);
 
                     if (m_pHost.m_MoveCtrl.MoveBlocked() >= 3)
diff --git a/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs b/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
index 81badbf9bc..cc420dddd4 100644
--- a/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
+++ b/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
@@ -170,7 +170,7 @@ namespace BrewMonster
                 else
                 {
                     float h0 = 0f;
-                    int countHits0 = Physics.RaycastNonAlloc(vWatStart, Vector3.down, fHitsWater, 1000f, 1 << 8);
+                    int countHits0 = Physics.RaycastNonAlloc(vWatStart + Vector3.up * 500f, Vector3.down, fHitsWater, 1000f, 1 << 8);
                     if (countHits0 > 0)
                     {
                         h0 = fHitsWater[0].point.y;
diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs
index 54fc2f3851..f5ec2f8055 100644
--- a/Assets/Scripts/CECHostPlayer.cs
+++ b/Assets/Scripts/CECHostPlayer.cs
@@ -4227,7 +4227,7 @@ namespace BrewMonster
             else if (m_iMoveEnv == Move_environment.MOVEENV_WATER)
             {
                 vPushDir.x = joystick.Horizontal;
-                vPushDir.y = 0f;
+                vPushDir.y = (transform.position - mainCam.transform.position).normalized.y;
                 vPushDir.z = joystick.Vertical;
                 vPushDir.Normalize();
             }