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

fix the conflicts

Browse Source
This commit is contained in:
Le Duc Anh
2025-11-13 16:43:59 +07:00
parent 648d51ff3a
commit ba9c97d3f6
3 changed files with 792 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
+6 -7
View File
@@ -126,8 +126,7 @@ namespace PerfectWorld.Scripts.Managers
if (cid != iHostID)
{
info_player_1 info_Player_1 = GPDataTypeHelper.FromBytes<info_player_1>((byte[])Msg.dwParam1);
RoleInfo roleInfo = (RoleInfo)Msg.dwParam4;
ElsePlayerEnter(info_Player_1, commandID, roleInfo);
ElsePlayerEnter(info_Player_1, commandID);
CECGameRun.Instance.Log("ElsePlayer has join");
}
break;
@@ -357,7 +356,7 @@ namespace PerfectWorld.Scripts.Managers
return true;
}
public EC_ElsePlayer ElsePlayerEnter(info_player_1 info, int iCmd, RoleInfo roleInfo)
public EC_ElsePlayer ElsePlayerEnter(info_player_1 info, int iCmd)
{
// If this player's id is in unknown table, remove it because this player
// won't be unknown anymore
@@ -380,7 +379,7 @@ namespace PerfectWorld.Scripts.Managers
if (pPlayer.gameObject != null)
{
// This player has existed in player table, call special initial function
pPlayer.Init(roleInfo, info);
pPlayer.Init(info);
return pPlayer;
}
else
@@ -394,7 +393,7 @@ namespace PerfectWorld.Scripts.Managers
}
// Create a new player
if (!(pPlayer = CreateElsePlayer(roleInfo, info, iAppearFlag)))
if (!(pPlayer = CreateElsePlayer(info, iAppearFlag)))
{
return null;
}
@@ -412,12 +411,12 @@ namespace PerfectWorld.Scripts.Managers
return pPlayer;
}
private EC_ElsePlayer CreateElsePlayer(RoleInfo roleInfo, info_player_1 info, int iAppearFlag)
private EC_ElsePlayer CreateElsePlayer(info_player_1 info, int iAppearFlag)
{
GameObject ob = CECGameRun.Instance.InitCharacter(info);
EC_ElsePlayer elsePlayer = ob.AddComponent<EC_ElsePlayer>();
elsePlayer.Init(roleInfo, info);
elsePlayer.Init(info);
return elsePlayer;
}