Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -35,7 +35,7 @@ namespace GFGGame
             //角色
             CustomSuitData suitSavedData = CustomSuitDataManager.GetCurrentSuitList();
             List<int> equipDatas = suitSavedData.equipDatas;
-            UpdateRole(equipDatas, sceneObj, false);
+            UpdateRole(equipDatas, sceneObj, false, null, true, null, false);
             if (suitSavedData.pic && suitSavedData.suitId > 0)
             {
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitSavedData.suitId);
@@ -47,9 +47,12 @@ namespace GFGGame
             }
         }
 
-        public static void UpdateRole(int[] equipDatas, GameObject sceneObj, bool needSetMask = false, int[] exceptTypes = null, bool showAni = true, GameObject parentObj = null)
+        public static void UpdateRole(int[] equipDatas, GameObject sceneObj, bool needSetMask = false, int[] exceptTypes = null, bool showAni = true, GameObject parentObj = null, bool reset = true)
         {
-            Reset(sceneObj);
+            if(reset)
+            {
+                Reset(sceneObj);
+            }
             int count = equipDatas.Length;
             for (int i = 0; i < count; i++)
             {
@@ -67,9 +70,9 @@ namespace GFGGame
             DressUpUtil.UpdateBody(null, sceneObj, false, null, needSetMask, parentObj);
         }
 
-        public static void UpdateRole(List<int> equipDatas, GameObject sceneObj, bool needSetMask = false, int[] exceptTypes = null, bool showAni = true, GameObject parentObj = null)
+        public static void UpdateRole(List<int> equipDatas, GameObject sceneObj, bool needSetMask = false, int[] exceptTypes = null, bool showAni = true, GameObject parentObj = null, bool reset = true)
         {
-            UpdateRole(equipDatas.ToArray(), sceneObj, needSetMask, exceptTypes, showAni, parentObj);
+            UpdateRole(equipDatas.ToArray(), sceneObj, needSetMask, exceptTypes, showAni, parentObj, reset);
         }
 
         public static void UpdateDialogBg(string value, GameObject sceneObj)