duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle conflict

Browse Source
This commit is contained in:
NguyenVanDat
2025-11-13 17:53:31 +07:00
parent f7d0ee6b43
commit fe73a9b979
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
+11 -1
View File
@@ -14,7 +14,17 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_GroupName: Default Local Group m_GroupName: Default Local Group
m_GUID: 712e3991f28e549e7a56ee582a977810 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_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 070edb522e6e54c14a99055900003890, type: 2} m_Settings: {fileID: 11400000, guid: 070edb522e6e54c14a99055900003890, type: 2}
m_SchemaSet: m_SchemaSet:
Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
+2 -2
View File
@@ -379,7 +379,7 @@ namespace PerfectWorld.Scripts.Managers
if (pPlayer.gameObject != null) if (pPlayer.gameObject != null)
{ {
// This player has existed in player table, call special initial function // This player has existed in player table, call special initial function
pPlayer.Init(info); pPlayer.Init(info, iAppearFlag);
return pPlayer; return pPlayer;
} }
else else
@@ -416,7 +416,7 @@ namespace PerfectWorld.Scripts.Managers
GameObject ob = CECGameRun.Instance.InitCharacter(info); GameObject ob = CECGameRun.Instance.InitCharacter(info);
EC_ElsePlayer elsePlayer = ob.AddComponent<EC_ElsePlayer>(); EC_ElsePlayer elsePlayer = ob.AddComponent<EC_ElsePlayer>();
elsePlayer.Init(info); elsePlayer.Init(info, iAppearFlag);
return elsePlayer; return elsePlayer;
} }
Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
+1 -1
View File
@@ -45,7 +45,7 @@ namespace PerfectWorld.Scripts.Player
CECEPWorkMan m_pEPWorkMan; CECEPWorkMan m_pEPWorkMan;
CECHostPlayer pHost => EC_ManMessageMono.Instance?.GetECManPlayer?.GetHostPlayer(); 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(); SetUpPlayer();
m_dwResFlags = (uint)PlayerResourcesReadyFlag.RESFG_ALL; m_dwResFlags = (uint)PlayerResourcesReadyFlag.RESFG_ALL;
Assets/PerfectWorld/Scripts/Vfx/BaseVfxObject.cs
+2 -1
View File
@@ -197,13 +197,14 @@ namespace BrewMonster.PerfectWorld.Scripts.Vfx
/// <summary> /// <summary>
/// Stop VFX /// Stop VFX
/// </summary> /// </summary>
public void Stop() public void Stop(bool resetParent = false)
{ {
if (_vfx != null) if (_vfx != null)
{ {
m_iState = GFX_STATE.ST_STOP; m_iState = GFX_STATE.ST_STOP;
_vfx.Stop(); _vfx.Stop();
gameObject.SetActive(false); gameObject.SetActive(false);
if(resetParent) gameObject.transform.parent = null;
} }
} }
Assets/Scripts/CECHostPlayer.cs
+4 -4
View File
@@ -2279,10 +2279,10 @@ public partial class CECHostPlayer : CECPlayer
} }
} }
else else
m_pHoverGFX.Stop(); m_pHoverGFX.Stop(true);
} }
else else
m_pHoverGFX.Stop(); m_pHoverGFX.Stop(true);
} }
if (m_pSelectedGFX) if (m_pSelectedGFX)
@@ -2300,10 +2300,10 @@ public partial class CECHostPlayer : CECPlayer
} }
} }
else else
m_pSelectedGFX.Stop(); m_pSelectedGFX.Stop(true);
} }
else else
m_pSelectedGFX.Stop(); m_pSelectedGFX.Stop(true);
} }
// if (m_pFloatDust) // if (m_pFloatDust)