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

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

@@ -91,9 +91,11 @@ namespace GFGGame
             {
                 param[i] = cfg.jumpParamArr[i];
             }
-            Hide();
-            ViewManager.Hide<StroyFightResultView>();
-            ViewManager.JumpToView(cfg.jumpId, param, null, false);
+            // ViewManager.Hide<StroyFightResultView>();
+
+            ViewManager.JumpToView(cfg.jumpId, param, null);
+            // ViewManager.Show<MainUIView>();
+            //  Hide();
 
         }
     }

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

@@ -149,7 +149,7 @@ namespace GFGGame
             _ui.m_comResult.m_t0.Play(AddExp);
         }
 
-        protected override void OnHide()
+        protected override async void OnHide()
         {
             base.OnHide();
             if (_sceneObject != null)
@@ -161,11 +161,8 @@ namespace GFGGame
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             _ui.m_comResult.m_t1.Play();
             _ui.m_comExpBar.m_proExp.m_comHolder.target.width = 0;
-        }
 
-        private async void OnClickBtnClose(object param)
-        {
-            this.Hide();
+
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Field)
             {
                 Timers.inst.Remove(OnClickBtnClose);
@@ -195,6 +192,11 @@ namespace GFGGame
             InstanceZonesDataManager.currentCardId = -1;
         }
 
+        private void OnClickBtnClose(object param)
+        {
+            this.Hide();
+        }
+
         private void AddExp()
         {
             float exp = GameGlobal.myNumericComponent.GetAsInt(NumericType.Exp);

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -457,6 +457,9 @@ namespace GFGGame
                 case nameof(StoryChapterView):
                     ViewManager.Show<StoryChapterView>(param[0], goBackDatas, hideOther);
                     break;
+                case nameof(FirstChargeBonusView):
+                    ViewManager.Show<FirstChargeBonusView>(param, goBackDatas, false);
+                    break;
                 default:
                     ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, hideOther, true);
                     break;