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

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -32,7 +32,7 @@ namespace GFGGame
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
             // LoginAddress = "http://login.gfg.com:10005";
-            //LoginAddress = "192.168.2.12:10005";//测试地址
+            // LoginAddress = "192.168.2.12:10005";//测试地址
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))
             {

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             list.ScrollToView(curIndex);
             base.OnShown();
 
-            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
             com.GetChild("Name").asLoader.url = "ui://Studio/gzs_fb_bt_zwxf";
             com.GetChild("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
             com.height = _ui.target.height;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -42,7 +42,7 @@ namespace GFGGame
             isReturnView = true;
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
             _ui.m_btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
 
             _ui.m_list.itemRenderer = RenderListItem;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioMetalView.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             list.numItems = this.storyLevelCfgs.Count;
             list.ScrollToView(curIndex);
 
-            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
             com.GetChild("Name").asLoader.url = "ui://Studio/gzs_fb_bt_jsxf";
             com.GetChild("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
 

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPorcelainView.cs

@@ -31,7 +31,7 @@ namespace GFGGame
         {
             _comPorcelain = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComPorcelain").asCom;
             AddChildCom(_comPorcelain);
-            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPorcelainView).FullName;
             this._studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPorcelainView).Name)[StudioDataManager.Instance.PorcelainTheme - 1];

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
             list.itemRenderer = ListItemRender;
             _croProperty.onChanged.Add(OnControllerChange);
 
-            _bg0.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            _bg0.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
             //_bg1.url = "ui://Studio/lm_db_chang_2";
             _btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");