瀏覽代碼

通关失败提示

zhaoyang 2 年之前
父節點
當前提交
bf9ced3abc
共有 36 個文件被更改,包括 380 次插入78 次删除
  1. 12 0
      FGUIProject/assets/Main/StoryFightFailUI.xml
  2. 0 0
      FGUIProject/assets/Main/components/ComArenaSkillTips.xml
  3. 0 0
      FGUIProject/assets/Main/components/ComStarClick.xml
  4. 0 0
      FGUIProject/assets/Main/components/ListCardSkillItem.xml
  5. 0 0
      FGUIProject/assets/Main/components/ListCardSkillItemMask.xml
  6. 10 0
      FGUIProject/assets/Main/components/ListFailItem.xml
  7. 6 4
      FGUIProject/assets/Main/package.xml
  8. 1 1
      GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs
  9. 0 49
      GameClient/Assets/Game/HotUpdate/Data/TaskDataManager.cs
  10. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComArenaSkillTips.cs
  11. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComArenaSkillTips.cs.meta
  12. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListFailItem.cs
  13. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListFailItem.cs.meta
  14. 2 2
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryCardChooseUI.cs
  15. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightFailUI.cs
  16. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightFailUI.cs.meta
  17. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs
  18. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs
  19. 98 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightFailView.cs
  20. 11 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightFailView.cs.meta
  21. 3 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs
  22. 11 11
      GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs
  23. 49 0
      GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs
  24. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  25. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  26. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  27. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  28. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  29. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  30. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  31. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  32. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  33. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  34. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  35. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  36. 二進制
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 12 - 0
FGUIProject/assets/Main/StoryFightFailUI.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1120">
+  <displayList>
+    <image id="n0_jx6z" name="n0" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,1120"/>
+    <list id="n1_jx6z" name="list" xy="90,411" size="900,653" overflow="scroll" lineGap="20" defaultItem="ui://mfvz4q8kjx6zpf" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 0 - 0
FGUIProject/assets/Main/ComSkillTips.xml → FGUIProject/assets/Main/components/ComArenaSkillTips.xml


+ 0 - 0
FGUIProject/assets/Main/components/ComClick(1).xml → FGUIProject/assets/Main/components/ComStarClick.xml


+ 0 - 0
FGUIProject/assets/Main/ListCardSkillItem.xml → FGUIProject/assets/Main/components/ListCardSkillItem.xml


+ 0 - 0
FGUIProject/assets/Main/ListCardSkillItemMask.xml → FGUIProject/assets/Main/components/ListCardSkillItemMask.xml


+ 10 - 0
FGUIProject/assets/Main/components/ListFailItem.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="900,180" overflow="hidden">
+  <displayList>
+    <image id="n2_jx6z" name="n2" src="8xpg4r" fileName="imagesFight/zd_jsjm_ditu.png" xy="0,-67"/>
+    <text id="n3_jx6z" name="txtDesc" xy="62,64" size="230,51" fontSize="38" color="#9e7c50" vAlign="middle" singleLine="true" autoClearText="true" text="示例巴拉巴拉"/>
+    <component id="n4_jx6z" name="btnGo" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="668,58">
+      <Button title="前往"/>
+    </component>
+  </displayList>
+</component>

+ 6 - 4
FGUIProject/assets/Main/package.xml

@@ -450,7 +450,7 @@
     <component id="psphix" name="ComDeduction.xml" path="/components/"/>
     <component id="psphiy" name="ComSkillShow.xml" path="/components/"/>
     <component id="psphiz" name="ComTargetCard.xml" path="/components/"/>
-    <component id="psphj0" name="ComClick(1).xml" path="/components/"/>
+    <component id="psphj0" name="ComStarClick.xml" path="/components/"/>
     <component id="psphj1" name="ComSkillTips.xml" path="/components/"/>
     <component id="psphj2" name="ComAllCircle.xml" path="/components/"/>
     <component id="psphj4" name="ComAllPerfect.xml" path="/components/"/>
@@ -645,9 +645,9 @@
     <image id="t6j1ox" name="zd_shanghai_db.png" path="/imagesNew/"/>
     <image id="jt8doy" name="db_qipaokuang.png" path="/imagesNew/" scale="9grid" scale9grid="17,9,177,18"/>
     <image id="e050oz" name="jdt_shuangrenzd.png" path="/imagesNew/"/>
-    <component id="ofwup0" name="ListCardSkillItem.xml" path="/"/>
-    <component id="ofwup1" name="ListCardSkillItemMask.xml" path="/"/>
-    <component id="ofwup2" name="ComSkillTips.xml" path="/"/>
+    <component id="ofwup0" name="ListCardSkillItem.xml" path="/components/"/>
+    <component id="ofwup1" name="ListCardSkillItemMask.xml" path="/components/"/>
+    <component id="ofwup2" name="ComArenaSkillTips.xml" path="/components/"/>
     <image id="jx6zp3" name="zjm_dibutb_db.png" path="/imagesNew/"/>
     <image id="jx6zp4" name="fuben_bg.png" path="/"/>
     <image id="jx6zp5" name="sn_txt_xfqs.png" path="/imagesNew/"/>
@@ -659,6 +659,8 @@
     <image id="jx6zpb" name="sn_txt_wss.png" path="/imagesNew/"/>
     <component id="jx6zpc" name="ButtonModle8.xml" path="/components/"/>
     <component id="jx6zpd" name="ButtonModle9.xml" path="/components/"/>
+    <component id="jx6zpe" name="StoryFightFailUI.xml" path="/" exported="true"/>
+    <component id="jx6zpf" name="ListFailItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -89,7 +89,7 @@ namespace GFGGame
                 StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0).Coroutine();
             }
         }
-        public int maxFightSpeed = 2;
+        public int maxFightSpeed = 6;
         private int _fightSpeed = 1;
         public int fightSpeed
         {

+ 0 - 49
GameClient/Assets/Game/HotUpdate/Data/TaskDataManager.cs

@@ -195,55 +195,6 @@ namespace GFGGame
             return false;
         }
 
-        /// <summary>
-        /// 任务界面跳转
-        /// </summary>
-        /// <param name="jumpId"></param>
-        public void JumpToView(string jumpId, object[] param, object[] goBackDatas)
-        {
-            switch (jumpId)
-            {
-                case nameof(LeagueAnswerView):
-
-                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
-                    {
-                        ViewManager.Show<LeagueView>(null, goBackDatas, true);
-                        ViewManager.Show($"GFGGame.{jumpId}");
-                    }
-                    else
-                    {
-                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
-                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, true, true);
-                    }
-
-                    break;
-                case nameof(LeagueView):
-                    if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
-                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
-                    {
-                        ViewManager.Show<LeagueView>(null, goBackDatas, true);
-                    }
-                    else
-                    {
-                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, true, true);
-                    }
-                    break;
-                case nameof(StoreView):
-                    ViewManager.Show(goBackDatas[0].ToString(), goBackDatas.Length > 1 ? goBackDatas[1] : null);
-                    ViewManager.Show<StoreView>(param, goBackDatas);
-                    break;
-                case nameof(StoryChapterListView):
-                    ViewManager.Show($"GFGGame.{jumpId}", param, goBackDatas, true, true);
-                    break;
-                case nameof(StoryChapterView):
-                    ViewManager.Show<StoryChapterView>(param[0], goBackDatas, true);
-                    break;
-                default:
-                    ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, true, true);
-                    break;
-            }
-        }
-
         public void Clear()
         {
             TaskInfosDic.Clear();

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillTips.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComArenaSkillTips.cs

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ComSkillTips
+    public partial class UI_ComArenaSkillTips
     {
         public GComponent target;
         public GTextField m_txtName;
         public GTextField m_txtSkillTips;
         public const string URL = "ui://mfvz4q8kofwup2";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComSkillTips";
-        private static UI_ComSkillTips _proxy;
+        public const string RES_NAME = "ComArenaSkillTips";
+        private static UI_ComArenaSkillTips _proxy;
 
-        public static UI_ComSkillTips Create(GObject gObject = null)
+        public static UI_ComArenaSkillTips Create(GObject gObject = null)
         {
-            var ui = new UI_ComSkillTips();
+            var ui = new UI_ComArenaSkillTips();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComSkillTips Proxy(GObject gObject = null)
+        public static UI_ComArenaSkillTips Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComSkillTips();
+                _proxy = new UI_ComArenaSkillTips();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillTips.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComArenaSkillTips.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b3031fddd2902754fadc7366251116d6
+guid: d12b42a471c05884ba7d9af303692534
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListFailItem.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ListFailItem
+    {
+        public GComponent target;
+        public GTextField m_txtDesc;
+        public GButton m_btnGo;
+        public const string URL = "ui://mfvz4q8kjx6zpf";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ListFailItem";
+        private static UI_ListFailItem _proxy;
+
+        public static UI_ListFailItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListFailItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListFailItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListFailItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_btnGo = (GButton)comp.GetChild("btnGo");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtDesc = null;
+            m_btnGo = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListFailItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 05516d9d74aef834996cc69d986ae437
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryCardChooseUI.cs

@@ -15,7 +15,7 @@ namespace UI.Main
         public GButton m_btnUpCard;
         public GList m_listSkill;
         public GTextField m_txtTips;
-        public UI_ComSkillTips m_comSkillTips;
+        public UI_ComArenaSkillTips m_comSkillTips;
         public const string URL = "ui://mfvz4q8kr1a99d";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryCardChooseUI";
@@ -71,7 +71,7 @@ namespace UI.Main
             m_btnUpCard = (GButton)comp.GetChild("btnUpCard");
             m_listSkill = (GList)comp.GetChild("listSkill");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
-            m_comSkillTips = (UI_ComSkillTips)UI_ComSkillTips.Create(comp.GetChild("comSkillTips"));
+            m_comSkillTips = (UI_ComArenaSkillTips)UI_ComArenaSkillTips.Create(comp.GetChild("comSkillTips"));
         }
         public void Dispose(bool disposeTarget = false)
         {

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightFailUI.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_StoryFightFailUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://mfvz4q8kjx6zpe";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "StoryFightFailUI";
+        private static UI_StoryFightFailUI _proxy;
+
+        public static UI_StoryFightFailUI Create(GObject gObject = null)
+        {
+            var ui = new UI_StoryFightFailUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_StoryFightFailUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoryFightFailUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightFailUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 66a405728cf685743a2a83cad60dd246
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -227,7 +227,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            TaskDataManager.Instance.JumpToView(taskCfg.jumpId, param,
+            ViewManager.JumpToView(taskCfg.jumpId, param,
                 new[] { typeof(ActivityDay7View).FullName, viewData });
         }
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -122,7 +122,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            TaskDataManager.Instance.JumpToView(taskCfg.jumpId, param, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, true });
+            ViewManager.JumpToView(taskCfg.jumpId, param, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, true });
         }
     }
 }

+ 98 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightFailView.cs

@@ -0,0 +1,98 @@
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.Main;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class StoryFightFailView : BaseWindow
+    {
+        private UI_StoryFightFailUI _ui;
+        private List<LevelTipsCfg> _cfgs = new List<LevelTipsCfg>();
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StoryFightFailUI.PACKAGE_NAME;
+            _ui = UI_StoryFightFailUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_list.itemRenderer = RenderListItem;
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            for (int i = 0; i < LevelTipsCfgArray.Instance.dataArray.Length; i++)
+            {
+                LevelTipsCfg cfg = LevelTipsCfgArray.Instance.dataArray[i];
+                if (cfg.storyLevel > 0 && InstanceZonesDataManager.currentLevelCfgId != cfg.storyLevel) continue;
+                _cfgs.Add(cfg);
+            }
+            _ui.m_list.numItems = _cfgs.Count;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _cfgs.Clear();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+
+        }
+
+        private void RenderListItem(int index, GObject gObject)
+        {
+            UI_ListFailItem item = UI_ListFailItem.Proxy(gObject);
+
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+
+            item.m_txtDesc.text = string.Format(_cfgs[index].desc, ConstDressUpScoreType.scoreTypeList()[fightCfg.scoreType]);
+            if (item.m_btnGo.data == null)
+            {
+                item.m_btnGo.onClick.Add(OnBtnGoClick);
+            }
+            item.m_btnGo.data = _cfgs[index];
+
+            UI_ListFailItem.ProxyEnd();
+
+        }
+
+        private void OnBtnGoClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            LevelTipsCfg cfg = obj.data as LevelTipsCfg;
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(cfg.jumpId)) return;
+            object[] param = new object[cfg.jumpParamArr.Length];
+            for (int i = 0; i < cfg.jumpParamArr.Length; i++)
+            {
+                param[i] = cfg.jumpParamArr[i];
+            }
+            Hide();
+            ViewManager.Hide<StroyFightResultView>();
+            ViewManager.JumpToView(cfg.jumpId, param, null, false);
+
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightFailView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 73af2783e2ac1f442800aa097c7f1974
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -141,7 +141,7 @@ namespace GFGGame
                 _ui.m_comExpBar.m_txtExpAdded.SetVar("value", fightCfg.exp.ToString()).FlushVars();
             }
 
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Field)
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Field && this._resultData.Result && FieldDataManager.Instance.currFightLv < FieldCfgArray.Instance.GetCfg(FieldDataManager.Instance.chapterId).num)
             {
                 _ui.m_comExpBar.target.visible = false;
                 Timers.inst.Add(3, 1, OnClickBtnClose);
@@ -210,6 +210,8 @@ namespace GFGGame
                 _ui.m_comExpBar.m_proExp.m_comHolder.target.width = t.value.x / cfgExp * _ui.m_comExpBar.m_proExp.m_comHolder.target.initWidth;
             }).OnComplete(() =>
             {
+                if (!this._resultData.Result) ViewManager.Show<StoryFightFailView>();
+
                 InstanceZonesDataManager.isResultFighting = false;
             });
             _ui.m_btnClose.enabled = true;

+ 11 - 11
GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -228,7 +228,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            TaskDataManager.Instance.JumpToView(taskCfg.jumpId, param, new[] { typeof(TaskView).FullName, viewData });
+            ViewManager.JumpToView(taskCfg.jumpId, param, new[] { typeof(TaskView).FullName, viewData });
         }
 
         private async void OnBtnGetAllClick()
@@ -259,17 +259,17 @@ namespace GFGGame
             switch (state)
             {
                 case ConstBonusStatus.CAN_NOT_GET:
-                {
-                    var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
-                    ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
-                    break;
-                }
+                    {
+                        var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
+                        ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
+                        break;
+                    }
                 case ConstBonusStatus.CAN_GET:
-                {
-                    var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
-                    if (result) UpdateLivenessProcess();
-                    break;
-                }
+                    {
+                        var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
+                        if (result) UpdateLivenessProcess();
+                        break;
+                    }
                 case ConstBonusStatus.GOT:
                     //领取完毕
                     break;

+ 49 - 0
GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -289,6 +289,7 @@ namespace GFGGame
             }
             else
             {
+                MainDataManager.Instance.ViewType = 0;
                 ViewManager.Show(ViewName.MAINUI_VIEW, null, null, hideOther);
             }
         }
@@ -413,6 +414,54 @@ namespace GFGGame
 
         }
 
+        /// <summary>
+        /// 任务界面跳转
+        /// </summary>
+        /// <param name="jumpId"></param>
+        public static void JumpToView(string jumpId, object[] param, object[] goBackDatas, bool hideOther = true, Action onSuccess = null)
+        {
+            switch (jumpId)
+            {
+                case nameof(LeagueAnswerView):
 
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        ViewManager.Show<LeagueView>(null, goBackDatas, hideOther);
+                        ViewManager.Show($"GFGGame.{jumpId}");
+                    }
+                    else
+                    {
+                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
+                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, hideOther, true);
+                    }
+
+                    break;
+                case nameof(LeagueView):
+                    if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        ViewManager.Show<LeagueView>(null, goBackDatas, hideOther);
+                    }
+                    else
+                    {
+                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, hideOther, true);
+                    }
+                    break;
+                case nameof(StoreView):
+                    ViewManager.Show(goBackDatas[0].ToString(), goBackDatas.Length > 1 ? goBackDatas[1] : null);
+                    ViewManager.Show<StoreView>(param, goBackDatas);
+                    break;
+                case nameof(StoryChapterListView):
+                    ViewManager.Show($"GFGGame.{jumpId}", param, goBackDatas, hideOther, true);
+                    break;
+                case nameof(StoryChapterView):
+                    ViewManager.Show<StoryChapterView>(param[0], goBackDatas, hideOther);
+                    break;
+                default:
+                    ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, hideOther, true);
+                    break;
+            }
+            onSuccess?.Invoke();
+        }
     }
 }

二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes