Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang

# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs.meta
#	Assets/PerfectWorld/Scripts/Move/EC_Player.cs
#	Assets/PerfectWorld/Scripts/Move/EC_Player.cs.meta
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/Move/CECPlayer.cs

Assets/Scripts/CECHostPlayer.cs

@@ -21,7 +21,7 @@ using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using Scene = UnityEngine.SceneManagement.Scene;
 
-public class CECHostPlayer : CECPlayer
+public class CECHostPlayer : EC_Player
 {
     [SerializeField] private TextMeshPro txtName;
     [SerializeField] private CharacterController controller;

Assets/Scripts/EC_Utility.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections;
 using System.Runtime.InteropServices;
 using UnityEngine;
-using static CECPlayer;
+using static EC_Player;
 
 public static class EC_Utility
 {

Assets/Scripts/GameController.cs

@@ -54,7 +54,7 @@ public class GameController : MonoBehaviour
             Debug.LogError("null prefab");
             return;
         }
-        CECPlayer.InitStaticRes();
+        EC_Player.InitStaticRes();
         hostPlayer = Instantiate(characterPrefab, transform);
         hostPlayer.InitCharacter(info);
         cinemachineCamera.Follow = hostPlayer.transform;

Assets/Scripts/InitializePlayer.cs

@@ -5,11 +5,11 @@ public class InitializePlayer /*: IAutoInitialize*/
 {
     public void Dispose()
     {
-        CECPlayer.Dispose();
+        EC_Player.Dispose();
     }
 
     public void Initialize()
     {
-        CECPlayer.InitStaticRes();
+        EC_Player.InitStaticRes();
     }
 }

Assets/Scripts/PlayerVisual.cs

@@ -23,7 +23,7 @@ public class PlayerVisual : MonoBehaviour
             BrewMonster.BMLogger.LogError("animancer == null");
             return;
         }
-        var player = GetComponentInParent<CECPlayer>();
+        var player = GetComponentInParent<EC_Player>();
         if(player == null)
         {
             BrewMonster.BMLogger.LogError("player == null");