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

GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -202,7 +202,6 @@ namespace GFGGame
                 Add(roleItem);
             }
             DressUpMenuItemDataManager.StartPreLoadItemCfg();
-            //_ = DressUpMenuItemDataManager.GetAllDressUpGuideIdListBySubTypeAsync();
 
         }
 

GameClient/Assets/Game/HotUpdate/Data/VO/CardData.cs

@@ -22,7 +22,7 @@ namespace GFGGame
                 if(_resources == null)
 {
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(id);
-                    CardDataManager.GetCardResources(itemCfg);
+                    _resources = CardDataManager.GetCardResources(itemCfg);
                 }
                 return _resources;
             }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs

@@ -57,6 +57,7 @@ namespace GFGGame
             _ui.m_listDressUp.onClickItem.Add(OnClickListDressUpItem);
             _ui.m_listDressUp.SetVirtual();
             _ui.m_btnAccessories.onClick.Add(OnClickBtnAllAccessories);
+            DressUpMenuItemDataManager.isLoading = true;
         }
 
         protected override void AddEventListener()
@@ -86,6 +87,7 @@ namespace GFGGame
             if (DressUpMenuItemDataManager.isLoading)
             {
                 ViewManager.Show<ModalStatusView>("加载中...");
+                DressUpMenuItemDataManager.GetAllDressUpGuideIdListBySubTypeAsync();
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnsweringView.cs

@@ -39,7 +39,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             isReturnView = true;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnRule.onClick.Add(OnBtnRuleClick);

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

@@ -37,7 +37,7 @@ namespace GFGGame
                     {
                         index = 1;
                     }
-                    ViewManager.Show<StoryChapterListView>(new object[] { index , levelCfg.order + 1}, null, true);
+                    ViewManager.Show<StoryChapterListView>(new object[] { index , nextStoryChapterCfg.order - 1}, null, true);
                 }
                 else
                 {

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

@@ -122,7 +122,7 @@ namespace GFGGame
             //else
             {
                 //this.Hide();
-                Timers.inst.Add(1.8f, 1, AutoHide);
+                Timers.inst.Add(2.0f, 1, AutoHide);
             }
         }
         protected override void OnHide()