Browse Source

添加引导

lzx 3 days ago
parent
commit
32c5fa24ec

+ 8 - 0
Assets/Res/Config/LanguageChineseConfig.json

@@ -38827,6 +38827,14 @@
     {
       "ID": 10447,
       "txt": "千辛踏尽见仙庭,一念逍遥万念宁。"
+    },
+    {
+      "ID": 10448,
+      "txt": "法宝准备好了,点击这里使用"
+    },
+    {
+      "ID": 10449,
+      "txt": "同时使用的法宝,会开始比拼!"
     }
   ]
 }

+ 78 - 0
Assets/Res/Config/PlayerGuideConfig.json

@@ -1301,6 +1301,84 @@
       "ForceOnclick": 0,
       "forceText": 1,
       "voiceFile": ""
+    },
+    {
+      "ID": 901,
+      "Index": 1,
+      "NeedLevel": 0,
+      "groupID": 9,
+      "FingerType": 1,
+      "dialogPos": [
+        -182,
+        -517
+      ],
+      "NpcPos": [
+        422,
+        -100
+      ],
+      "NpcSize": [
+        500,
+        500
+      ],
+      "SpeakerName": 0,
+      "SpeakerStyle": 1,
+      "SpeakerImage": 3,
+      "desc": 10448,
+      "Highlighting": 1,
+      "AwardItem": [
+        1002
+      ],
+      "AwardItemNum": [
+        2700
+      ],
+      "blackAlpha": 0.0,
+      "Handle": 1,
+      "IsSkip": 0,
+      "TextSize": [
+        1240,
+        157
+      ],
+      "reversalFinger": 1,
+      "reversalBox": 2,
+      "ForceOnclick": 1,
+      "forceText": 1,
+      "voiceFile": ""
+    },
+    {
+      "ID": 902,
+      "Index": 2,
+      "NeedLevel": 0,
+      "groupID": 9,
+      "FingerType": 1,
+      "dialogPos": [
+        -182,
+        -517
+      ],
+      "NpcPos": [
+        422,
+        -100
+      ],
+      "NpcSize": [
+        500,
+        500
+      ],
+      "SpeakerName": 0,
+      "SpeakerStyle": 1,
+      "SpeakerImage": 3,
+      "desc": 10449,
+      "Highlighting": 1,
+      "blackAlpha": 0.0,
+      "Handle": 1,
+      "IsSkip": 0,
+      "TextSize": [
+        1240,
+        157
+      ],
+      "reversalFinger": 1,
+      "reversalBox": 2,
+      "ForceOnclick": 0,
+      "forceText": 1,
+      "voiceFile": ""
     }
   ]
 }

+ 13 - 2
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -1232,6 +1232,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
             await rewardsPanel.UIClosed();
         }
 
+        if (eventConfig.EventTriggerType == 4)
+        {
+            await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
+            UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
+        }
 
         if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid)
         {
@@ -1262,7 +1267,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// 取消事件
     /// </summary>
     /// <param name="eventID">事件ID</param>
-    public void CancelEvent(AccountFileInfo.EventList eventList)
+    public async void CancelEvent(AccountFileInfo.EventList eventList)
     {
         LogTool.Log($"取消事件{eventList.eventID}");
         isTriggerEvent = false;
@@ -1271,7 +1276,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
         CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
         onCompleteCallback?.Invoke();
         onCompleteCallback = null;
-
+        EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+        if (eventConfig.EventTriggerType == 4)
+        {
+          
+            await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
+            await UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
+        }
 
         if (PlayerGuideManager.Instance.GuideIsCanDo(2))
         {

BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/PlayerGuide.xlsx