Merge remote-tracking branch 'remotes/origin/master' into zhaoyang

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -38,10 +38,7 @@ namespace GFGGame
             {
                 //游戏角色初始数据完成后才执行
                 bool dataInited = GameGlobal.DataInited;
-                if (dataInited)
-                {
-                    DressUpMenuItemDataManager.Add(itemID);
-                }
+                DressUpMenuItemDataManager.Add(itemID);
                 if (!DressUpMenuItemDataManager.CheckIsSceneType(itemID))
                 {
                     DecomposeDataManager.Instance.Add(itemID);

GameClient/Assets/Game/HotUpdate/ServerProxy/MessageHelper.cs

@@ -23,7 +23,7 @@ namespace GFGGame
             }
             catch (Exception e)
             {
-                Log.Error(e.ToString());
+                Log.Warning(e.ToString());
                 return null;
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/GetSuitItemController.cs

@@ -14,7 +14,7 @@ namespace GFGGame
 
         public static void AddItemId(int itemId)
         {
-            if (!enable)
+            if (!enable || !GameGlobal.DataInited)
             {
                 return;
             }