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

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <loader id="n45_gbqo" name="loaBg" xy="540,981" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+    <loader id="n45_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,319"/>

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

@@ -113,6 +113,7 @@ namespace GFGGame
             _ui.m_btnAutoPlay.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.FUNCTION_AUTOPLAY_FIGHT, false);
 
             _levelID = (int)viewData;
+            InstanceZonesDataManager.currentLevelCfgId = _levelID;
             _levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
             _fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
             if (_levelCfg.type == ConstInstanceZonesType.Field)