Merge pull request #14 from LBEILC/dev

解耦startup文件，修改部分任务名称增加可读性,添加夏日活动自动领取奖品
MaaXYZ · Sep 15, 2024 · ccf0512 · ccf0512
2 parents 9936dec + 8a63d87
commit ccf0512
Show file tree

Hide file tree

Showing 13 changed files with 290 additions and 210 deletions.
diff --git a/assets/interface.json b/assets/interface.json
@@ -23,7 +23,7 @@
     "task": [
         {
             "name": "启动游戏",
-            "entry": "StartUp"
+            "entry": "进入首页"
         },
         {
             "name": "每日免费礼包",
@@ -78,7 +78,7 @@
         },
         {
             "name": "关闭游戏",
-            "entry": "CloseCrossCore"
+            "entry": "关闭游戏"
         }
     ],
     "recognizer": {},
@@ -292,7 +292,7 @@
                         },
                         "ActivityExploration_CombatEnd3": {
                             "next": [
-                                "Sub_GetItems",
+                                "子任务_获得物品",
                                 "ActivityExploration_3",
                                 "ActivityExploration_CombatEnd3"
                             ]
@@ -311,7 +311,7 @@
                         },
                         "ActivityExploration_CombatEnd3": {
                             "next": [
-                                "Sub_GetItems",
+                                "子任务_获得物品",
                                 "ActivityExploration_第五关",
                                 "ActivityExploration_CombatEnd3"
                             ]

diff --git a/assets/resource/base/pipeline/awards.json b/assets/resource/base/pipeline/awards.json
@@ -1,11 +1,11 @@
 {
     "Awards": {
         "next": [
-            "Sub_Cancel",
-            "Sub_CloseAnnouncement",
+            "子任务_点击取消",
+            "子任务_关闭公告",
             "Mail",
             "NoMail",
-            "Sub_StartUp"
+            "子任务_进入首页"
         ]
     },
     "Mail": {
@@ -59,7 +59,7 @@
             "DailyTask",
             "NoDailyTask",
             "Mail_Receive",
-            "Sub_StartUp"
+            "子任务_进入首页"
         ]
     },
     "NoMail": {
@@ -141,7 +141,7 @@
         "count": 7,
         "action": "Click",
         "next": [
-            "Sub_GetItems",
+            "子任务_获得物品",
             "DailyTask_Receive1",
             "DailyTask_Receive2"
         ]
@@ -171,7 +171,7 @@
             "DailyTask_Receive3",
             "BattlePass",
             "NoBattlePass",
-            "Sub_StartUp"
+            "子任务_进入首页"
         ]
     },
     "DailyTask_Receive3": {
@@ -196,11 +196,11 @@
         "count": 7,
         "action": "Click",
         "next": [
-            "Sub_GetItems",
+            "子任务_获得物品",
             "BattlePass",
             "NoBattlePass",
             "DailyTask_Receive3",
-            "Sub_StartUp"
+            "子任务_进入首页"
         ]
     },
     "NoDailyTask": {
@@ -215,7 +215,7 @@
         "next": [
             "BattlePass",
             "NoBattlePass",
-            "Sub_StartUp"
+            "子任务_进入首页"
         ]
     },
     "BattlePass": {
@@ -273,7 +273,7 @@
         "count": 7,
         "action": "Click",
         "next": [
-            "Sub_GetItems",
+            "子任务_获得物品",
             "BattlePass_ReceiveWeeklyMission",
             "BattlePass_ReceiveDailyMissionGet"
         ]
@@ -300,7 +300,7 @@
         "count": 2,
         "action": "Click",
         "next": [
-            "Sub_GetItems",
+            "子任务_获得物品",
             "BattlePass_ReceiveWeeklyMissionGet",
             "BattlePass_ReceiveMonthlyMission",
             "BattlePass_ReceiveWeeklyMission"
@@ -328,7 +328,7 @@
         "count": 7,
         "action": "Click",
         "next": [
-            "Sub_GetItems",
+            "子任务_获得物品",
             "BattlePass_ReceiveMonthlyMission",
             "BattlePass_ReceiveWeeklyMissionGet"
         ]
@@ -355,7 +355,7 @@
         "count": 2,
         "action": "Click",
         "next": [
-            "Sub_GetItems",
+            "子任务_获得物品",
             "BattlePass_ReceiveMonthlyMissionGet",
             "BattlePass_MissionExist",
             "BattlePass_ReceiveMonthlyMission"
@@ -383,7 +383,7 @@
         "count": 7,
         "action": "Click",
         "next": [
-            "Sub_GetItems",
+            "子任务_获得物品",
             "BattlePass_MissionExist",
             "BattlePass_ReceiveMonthlyMissionGet"
         ]
@@ -408,7 +408,7 @@
         ],
         "next": [
             "BattlePass_ReceiveAll",
-            "StartUp"
+            "进入首页"
         ]
     },
     "BattlePass_ReceiveAll": {
@@ -433,7 +433,7 @@
         "count": 7,
         "action": "Click",
         "next": [
-            "StartUp"
+            "进入首页"
         ]
     },
     "NoBattlePass": {

diff --git a/assets/resource/base/pipeline/combat.json b/assets/resource/base/pipeline/combat.json
@@ -2,7 +2,7 @@
     "DailyExplore": {
         "next": [
             "首页_出击",
-            "Sub_StartUp"
+            "子任务_进入首页"
         ]
     },
     "DailyExplore_Entry": {
@@ -166,7 +166,7 @@
             10
         ],
         "next": [
-            "StartUp"
+            "进入首页"
         ]
     },
     "DailyExplore_MopUpAwards": {