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:
@@ -114,6 +114,7 @@ public partial class CECGameRun : MonoBehaviour, IMsgHandler
|
||||
{
|
||||
Destroy(go,delayTime);
|
||||
}
|
||||
|
||||
public GameObject InitCharacter(info_player_1 info)
|
||||
{
|
||||
if (characterPrefab == null)
|
||||
|
||||
Reference in New Issue
Block a user