添加跳转，修改修炼挂机时间八小时

Assets/Res/Config/GameConstantConfig.json

@@ -51,7 +51,7 @@
         0.023148
       ],
       "daolvfavoratePara": 200,
-      "offlineexpMaxTime": 86400,
+      "offlineexpMaxTime": 28800,
       "daoyouMaxshowupNum": 3
     }
   ]

Assets/Res/Config/LanguageChineseConfig.json

@@ -38554,7 +38554,7 @@
     },
     {
       "ID": 10379,
-      "txt": "该主线尚未解锁，需再完成{0}个事件"
+      "txt": "该主线尚未解锁，需再完成{0}个事件。"
     },
     {
       "ID": 10380,
@@ -40323,6 +40323,86 @@
     {
       "ID": 10821,
       "txt": "今日宝券广告次数已用完！"
+    },
+    {
+      "ID": 10822,
+      "txt": "广告加载中"
+    },
+    {
+      "ID": 10823,
+      "txt": "是否前往吗？"
+    },
+    {
+      "ID": 10824,
+      "txt": "0"
+    },
+    {
+      "ID": 10825,
+      "txt": "0"
+    },
+    {
+      "ID": 10826,
+      "txt": "0"
+    },
+    {
+      "ID": 10827,
+      "txt": "0"
+    },
+    {
+      "ID": 10828,
+      "txt": "0"
+    },
+    {
+      "ID": 10829,
+      "txt": "0"
+    },
+    {
+      "ID": 10830,
+      "txt": "0"
+    },
+    {
+      "ID": 10831,
+      "txt": "0"
+    },
+    {
+      "ID": 10832,
+      "txt": "0"
+    },
+    {
+      "ID": 10833,
+      "txt": "0"
+    },
+    {
+      "ID": 10834,
+      "txt": "0"
+    },
+    {
+      "ID": 10835,
+      "txt": "0"
+    },
+    {
+      "ID": 10836,
+      "txt": "0"
+    },
+    {
+      "ID": 10837,
+      "txt": "0"
+    },
+    {
+      "ID": 10838,
+      "txt": "0"
+    },
+    {
+      "ID": 10839,
+      "txt": "0"
+    },
+    {
+      "ID": 10840,
+      "txt": "0"
+    },
+    {
+      "ID": 10841,
+      "txt": "0"
     }
   ]
 }

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -13,6 +13,7 @@ using GameLogic.Bag;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Player;
+using Mono.Utility;
 using UnityEngine;
 using Utility;
 using EventConfig = Excel2Json.EventConfig;
@@ -775,14 +776,21 @@ public class EventSystemManager : Singleton<EventSystemManager>
                                                         lastSmallPlacesData.completionEventCount <
                                                         lastSmallPlacesConfig.CompletionEventCount))
                 {
-                    TipMessagePanel tipMessagePanel = await TipMessagePanel.OpenTipMessagePanel(
-                        LanguageManager.Instance.Text(10379,
-                            lastSmallPlacesConfig.CompletionEventCount - lastSmallPlacesData?.completionEventCount));
+                    string tips = LanguageManager.Instance.Text(10379,
+                        lastSmallPlacesConfig.CompletionEventCount - lastSmallPlacesData?.completionEventCount);
+                    // TipMessagePanel tipMessagePanel = await TipMessagePanel.OpenTipMessagePanel(tips);
 
-                    if (eventConfig.ID == 10002 && PlayerGuideManager.Instance.GuideIsCanDo(3))
+                    bool isOk = await TipsPanle.OpenPnael("", tips +"\n" + LanguageManager.Instance.Text(10823));
+                    if (isOk)
                     {
-                        PlayerGuideManager.Instance.SetGuid(3);
+                        SkiptoHelper.Skipto(8);
                     }
+                    
+                    
+                    // if (eventConfig.ID == 10002 && PlayerGuideManager.Instance.GuideIsCanDo(3))
+                    // {
+                    //     PlayerGuideManager.Instance.SetGuid(3);
+                    // }
 
                     AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -1,6 +1,9 @@
 using System.Collections.Generic;
 using Core.Audio;
 using Fort23.Core;
+using GameLogic.Combat;
+using GameLogic.Combat.CombatType;
+using GameUI.Combat;
 using Mono.Utility;
 
 namespace Fort23.Mono
@@ -11,6 +14,8 @@ namespace Fort23.Mono
         private System.Action callBack;
 
         List<SkipToWidget> skipToWidgets = new List<SkipToWidget>();
+        
+        LevelBattleCombatType levelBattleCombatType ;
 
         private void Init()
         {
@@ -49,6 +54,8 @@ namespace Fort23.Mono
         public async void CustomInit(bool isWin, System.Action callBack)
         {
             this.callBack = callBack;
+            levelBattleCombatType =
+                CombatDrive.Instance.CombatController.CombatTypeBasic as LevelBattleCombatType;
             AudioManager.Instance.PauseBGM();
             if (isWin)
             {
@@ -65,6 +72,15 @@ namespace Fort23.Mono
                 WinRoot.SetActive(false);
                 FailRoot.SetActive(true);
                 Text_Desc1.gameObject.SetActive(false);
+
+                if (levelBattleCombatType.levelbattleConfig.ID == 1003 || levelBattleCombatType.levelbattleConfig.ID == 100004)
+                {
+                    SkipToWidget skipToWidget = await UIManager.Instance.CreateGComponentForObject<SkipToWidget>(SkipToWidgetGam, null, SkipToContent);
+                    skipToWidget.CustonInit(1);
+                    skipToWidgets.Add(skipToWidget);
+                    skipToWidget.OnClick = OnClick;
+                }
+      
             }
         }
 

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -239,6 +239,8 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
+
+            int selectType = (int)uiData[0];
             xianTuLogConfigs = ConfigComponent.Instance.GetAll<XianTuLogConfig>().ToList();
 
 
@@ -290,7 +292,15 @@ namespace Fort23.Mono
             BigMapList.GetChildObj();
             BigMapList.ShowTargetIndex(0);
 
-            Btn_Main_OnClick();
+            if (selectType == 1)
+            {
+                Btn_Main_OnClick();
+            }
+            else
+            {
+                Btn_Event_OnClick();
+            }
+         
             return await base.AsyncInit(uiData);
         }
 
@@ -436,9 +446,9 @@ namespace Fort23.Mono
             }
         }
 
-        public async static CTask OpenPanel()
+        public async static CTask OpenPanel(int type = 1)
         {
-            XianTuLogPanel xianTuLogPanel = await UIManager.Instance.LoadAndOpenPanel<XianTuLogPanel>(null);
+            XianTuLogPanel xianTuLogPanel = await UIManager.Instance.LoadAndOpenPanel<XianTuLogPanel>(null,uiData:new object[]{type});
         }
 
         List<UIComponent> _components = new List<UIComponent>();