Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -43,7 +43,7 @@ namespace GFGGame
 
             _ui.m_listTab.selectedIndex = 0;
             _ui.m_listType.selectedIndex = 0;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zxian_bg3");
+            _ui.m_loaBg.url = "ui://Main/zhangjie_bg";//ResPathUtil.GetBgImgPath("zxian_bg3");
 
             _ui.m_listChapter.scrollPane.onScroll.Add(DoSpecialEffect);//滚动时派发事件
 

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

@@ -71,7 +71,7 @@ namespace GFGGame
             {
                 OnClickBonusBox(_ui.m_bonusBox3, 2);
             });
-            _ui.m_loaBg.url = "ui://Main/zhangjie_bg";//ResPathUtil.GetBgImgPath("zxian_bg3");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zxian_bg3");
 
             _comEff = new GComponent();
             _comEff = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComEff").asCom;