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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryChapterUI.cs

@@ -23,6 +23,7 @@ namespace UI.Main
         public UI_CompBonusBox m_bonusBox2;
         public UI_CompBonusBox m_bonusBox1;
         public GTextField m_txtStarCount;
+        public GLoader m_switchChapter;
         public const string URL = "ui://mfvz4q8km7n51u";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryChapterUI";
@@ -86,6 +87,7 @@ namespace UI.Main
             m_bonusBox2 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox2"));
             m_bonusBox1 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox1"));
             m_txtStarCount = (GTextField)comp.GetChild("txtStarCount");
+            m_switchChapter = (GLoader)comp.GetChild("switchChapter");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -109,6 +111,7 @@ namespace UI.Main
             m_bonusBox1.Dispose();
             m_bonusBox1 = null;
             m_txtStarCount = null;
+            m_switchChapter = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -57,6 +57,7 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
+            _ui.m_switchChapter.onClick.Add(OnClickBtnBack);
             _ui.m_chapter.m_compChapterScroll.m_imgBegin.onClick.Add(OnClickNext);
             _ui.m_bonusBox1.target.onClick.Add(() =>
             {
@@ -70,7 +71,7 @@ namespace GFGGame
             {
                 OnClickBonusBox(_ui.m_bonusBox3, 2);
             });
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zxian_bg3");
+            _ui.m_loaBg.url = "ui://Main/zhangjie_bg";//ResPathUtil.GetBgImgPath("zxian_bg3");
 
             _comEff = new GComponent();
             _comEff = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComEff").asCom;

GameClient/Assets/StreamingAssets/Bundles.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a71d610f561efe84fb231488f4db759b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: