From fe73a9b97926a901f6db5a05cf4b018e9f8ae3a7 Mon Sep 17 00:00:00 2001
From: NguyenVanDat <drimdar.game@gmail.com>
Date: Thu, 13 Nov 2025 17:53:31 +0700
Subject: [PATCH] handle conflict

---
 .../AssetGroups/Default Local Group.asset            | 12 +++++++++++-
 Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs |  4 ++--
 Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs |  2 +-
 Assets/PerfectWorld/Scripts/Vfx/BaseVfxObject.cs     |  3 ++-
 Assets/Scripts/CECHostPlayer.cs                      |  8 ++++----
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
index d195c224ee..6376dfc9d9 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset	
+++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset	
@@ -14,7 +14,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_GroupName: Default Local Group
   m_GUID: 712e3991f28e549e7a56ee582a977810
-  m_SerializeEntries: []
+  m_SerializeEntries:
+  - m_GUID: 1cfde61ea9d19614a8ea91cb1eeca97b
+    m_Address: "\u7A0B\u5E8F\u8054\u5165/\u89D2\u8272\u51FA\u73B0\u4EBA\u7C7B.gfx"
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 23c524cd6f7fb27449cee2b10668fdd7
+    m_Address: "\u7A0B\u5E8F\u8054\u5165/\u9F20\u6807\u60AC\u6D6E.gfx"
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: 070edb522e6e54c14a99055900003890, type: 2}
   m_SchemaSet:
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
index 7b7842823b..df0a5049c5 100644
--- a/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
@@ -379,7 +379,7 @@ namespace PerfectWorld.Scripts.Managers
                     if (pPlayer.gameObject != null)
                     {
                         //	This player has existed in player table, call special initial function
-                        pPlayer.Init(info);
+                        pPlayer.Init(info, iAppearFlag);
                         return pPlayer;
                     }
                     else
@@ -416,7 +416,7 @@ namespace PerfectWorld.Scripts.Managers
                 GameObject ob = CECGameRun.Instance.InitCharacter(info);
                 EC_ElsePlayer elsePlayer = ob.AddComponent<EC_ElsePlayer>();
 
-                elsePlayer.Init(info);
+                elsePlayer.Init(info, iAppearFlag);
                 return elsePlayer;
             }
 
diff --git a/Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs b/Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
index f519f927be..b12b96b249 100644
--- a/Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
+++ b/Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
@@ -45,7 +45,7 @@ namespace PerfectWorld.Scripts.Player
         CECEPWorkMan m_pEPWorkMan;
         CECHostPlayer pHost => EC_ManMessageMono.Instance?.GetECManPlayer?.GetHostPlayer();
         
-        public void Init(RoleInfo roleInfo, info_player_1 Info, int iAppearFlag)
+        public void Init(info_player_1 Info, int iAppearFlag)
         {
             SetUpPlayer();
             m_dwResFlags = (uint)PlayerResourcesReadyFlag.RESFG_ALL;
diff --git a/Assets/PerfectWorld/Scripts/Vfx/BaseVfxObject.cs b/Assets/PerfectWorld/Scripts/Vfx/BaseVfxObject.cs
index 638a8f9514..82145416b2 100644
--- a/Assets/PerfectWorld/Scripts/Vfx/BaseVfxObject.cs
+++ b/Assets/PerfectWorld/Scripts/Vfx/BaseVfxObject.cs
@@ -197,13 +197,14 @@ namespace BrewMonster.PerfectWorld.Scripts.Vfx
         /// <summary>
         /// Stop VFX
         /// </summary>
-        public void Stop()
+        public void Stop(bool resetParent = false)
         {
             if (_vfx != null)
             {
                 m_iState = GFX_STATE.ST_STOP;
                 _vfx.Stop();
                 gameObject.SetActive(false);
+                if(resetParent) gameObject.transform.parent = null;
             }
         }
 
diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs
index 5be1be1d66..331ec9d91f 100644
--- a/Assets/Scripts/CECHostPlayer.cs
+++ b/Assets/Scripts/CECHostPlayer.cs
@@ -2279,10 +2279,10 @@ public partial class CECHostPlayer : CECPlayer
                     }
                 }
                 else
-                    m_pHoverGFX.Stop();
+                    m_pHoverGFX.Stop(true);
             }
             else
-                m_pHoverGFX.Stop();
+                m_pHoverGFX.Stop(true);
         }
 
         if (m_pSelectedGFX)
@@ -2300,10 +2300,10 @@ public partial class CECHostPlayer : CECPlayer
                     }
                 }
                 else
-                    m_pSelectedGFX.Stop();
+                    m_pSelectedGFX.Stop(true);
             }
             else
-                m_pSelectedGFX.Stop();
+                m_pSelectedGFX.Stop(true);
         }
 
         // if (m_pFloatDust)