UI界面上的换装对象优化

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

@@ -76,7 +76,7 @@ namespace GFGGame
         /// <param name="roleObj"></param>
         /// <param name="showBg"></param>
         /// <param name="resetData">是否重置装备数据</param>
-        public void setSceneObj(GameObject sceneObj, bool needSetMask = false, bool showSceneType = true, GameObject roleObj = null, bool showBg = true, bool resetData = true)
+        public void setSceneObj(GameObject sceneObj, bool needSetMask = false, bool showSceneType = true, GameObject roleObj = null, bool showBg = true)
         {
             if (_sceneObj != null)
             {
@@ -87,7 +87,7 @@ namespace GFGGame
             _showSceneType = showSceneType;
             _showBg = showBg;
             _roleObj = roleObj;
-            if(resetData)
+            if(_dressUpData.suitId <= 0 && _dressUpData.actionId <= 0 && _dressUpData.itemList.Count <= 0 && _dressUpData.bgId <= 0)
             {
                 PutOnDefaultDressUpData();
             }

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -184,7 +184,9 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
+                MyDressUpHelper.dressUpObj.TakeOffAll();
                 MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
+                MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData();
             }
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
 

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleView.cs

@@ -47,7 +47,7 @@ namespace GFGGame
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
             }
-            MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, true, null, true, false);
+            MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject);
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             if (!string.IsNullOrEmpty(fightCfg.music))

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetView.cs

@@ -48,7 +48,7 @@ namespace GFGGame
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
             }
-            MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, true, true, null, true, false);
+            MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, true);
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             SceneController.UpdateFightTarget(fightCfg.targetRes, _sceneObject);