Merge branch 'develop' into feature/add-vfx

# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs

Assets/Scripts/CECHostPlayer.cs

@@ -1087,7 +1087,7 @@ public partial class CECHostPlayer : CECPlayer
         isRun = value;
     }
 
-    public void InitCharacter(cmd_self_info_1 role)
+    public async void InitCharacter(cmd_self_info_1 role)
     {
         SetUpPlayer();
         controller = GetComponent<CharacterController>();
@@ -1101,7 +1101,7 @@ public partial class CECHostPlayer : CECPlayer
         //    roleName = Encoding.UTF8.GetString(role.name.ByteArray, 0, role.name.Length);
         //}
         SetPlayerInfor(new INFO(role.cid, role.crc_e, role.crc_c));
-        SetModelHostPlayer();
+        await SetPlayerModel(UnityGameSession.Instance.GetRoleInfo().occupation, UnityGameSession.Instance.GetRoleInfo().gender);
 
         Vector3 pos = new Vector3(role.pos.x, role.pos.y, role.pos.z);
         string roleName = Encoding.Unicode.GetString(UnityGameSession.Instance.GetRoleInfo().name.ByteArray);
@@ -1169,6 +1169,8 @@ public partial class CECHostPlayer : CECPlayer
         EventBus.Unsubscribe<JoystickPressEvent>(JoystickStartDrag);
     }
 
+
+    //TODO: Remove this function. Since it has been deprecated.
     public void InitCharacter(info_player_1 role)
     {
         string roleName = "(Error decoding name)";
@@ -1179,7 +1181,7 @@ public partial class CECHostPlayer : CECPlayer
         Vector3 pos = new Vector3(role.pos.x, role.pos.y, role.pos.z);
         if (txtName != null) txtName.text = roleName;
         transform.position = pos;
-        SetModelHostPlayer();
+        // SetPlayerModel();
         //Debug.LogError("Pos Character = " + pos);
     }