Merge branch 'develop' into feature/hp_interact_npc

# Conflicts:
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
This commit is contained in:
Tungdv
2025-11-17 14:50:24 +07:00
13036 changed files with 747964 additions and 12302 deletions
+1
View File
@@ -114,6 +114,7 @@ public partial class CECGameRun : MonoBehaviour, IMsgHandler
{
Destroy(go,delayTime);
}
public GameObject InitCharacter(info_player_1 info)
{
if (characterPrefab == null)