From a8dae262a378c1595536d2e5c06c768bdf6c085d Mon Sep 17 00:00:00 2001
From: VDH <vdh992002@gmail.com>
Date: Fri, 6 Mar 2026 10:02:18 +0700
Subject: [PATCH] fix after merge

---
 .../Scripts/Managers/CECSkillGfxMan.cs            |  4 ++--
 Assets/PerfectWorld/Scripts/Move/CECPlayer.cs     | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs b/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs
index 23600d6d88..03415fd172 100644
--- a/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs
@@ -517,7 +517,7 @@ namespace BrewMonster
 
                             // For Phase 3, we'll search for a child model named "goblin" or similar
                             // 对于第3阶段，我们将搜索名为"goblin"或类似的子模型
-                            CECModel pModel = pPlayer.GetPlayerModel();
+                            CECModel pModel = pPlayer.GetPlayerCECModel();
                             if (pModel != null)
                             {
                                 // Try common goblin hanger names
@@ -576,7 +576,7 @@ namespace BrewMonster
 
                                 // Get player model and hook position
                                 // 获取玩家模型和挂点位置
-                                CECModel pModel = pPlayer.GetPlayerModel();
+                                CECModel pModel = pPlayer.GetPlayerCECModel();
                                 if (pModel == null)
                                 {
 #if UNITY_EDITOR
diff --git a/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs b/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
index 5073ede3ad..bc18e5afa4 100644
--- a/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
+++ b/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
@@ -32,8 +32,12 @@ namespace BrewMonster
         private static PLAYER_ACTION[] _turning_actions;
         PLAYER_ACTION[] m_PlayerActions;
         [SerializeField] internal INFO m_PlayerInfo;
+        /// <summary>
+        /// TODO: Evaluate if we can replace CECModel by GameObject and use a hook system based on Unity's Transform hierarchy.
+        /// use _pPlayerModel with higher priority
+        /// </summary>
         protected GameObject _pPlayerModel;
-        private CECModel m_pPlayerCECModel;  // CECModel instance for hook system / 用于挂点系统的CECModel实例
+        private CECModel m_pPlayerCECModel;
         protected float rotationSpeed = 5;
         internal int m_iMoveMode; //	Player's move mode
         [SerializeField] internal int m_idSelTarget;
@@ -243,7 +247,6 @@ namespace BrewMonster
             // 初始化CECModel以支持挂点系统
             InitializePlayerCECModel();
         }
-        }
         protected async Task<bool> QueueLoadDummyModel(int iShape, bool bAtOnce)
         {
             int iShapeType = PLAYERMODEL_GETTYPE(iShape);
@@ -478,10 +481,6 @@ namespace BrewMonster
             
             
 
-        /// <summary>
-        /// Initialize CECModel with SkeletonBuilder and Transform references
-        /// 使用SkeletonBuilder和Transform引用初始化CECModel
-        /// </summary>
         private void InitializePlayerCECModel()
         {
             if (_pPlayerModel == null)
@@ -635,7 +634,7 @@ namespace BrewMonster
         /// 获取玩家的CECModel实例
         /// </summary>
         /// <returns>CECModel instance or null / CECModel实例，未找到返回null</returns>
-        public CECModel GetPlayerModel()
+        public CECModel GetPlayerCECModel()
         {
             return m_pPlayerCECModel;
         }
@@ -649,7 +648,7 @@ namespace BrewMonster
         /// <returns>Hook Transform or null / 挂点变换，未找到返回null</returns>
         public Transform GetHook(string hookName, bool recursive = true)
         {
-            CECModel model = GetPlayerModel();
+            CECModel model = GetPlayerCECModel();
             return model?.GetHook(hookName, recursive);
         }