Merge pull request #13 from LBEILC/dev

Dev
MaaXYZ · Sep 15, 2024 · 9936dec · 9936dec
2 parents 9bb2245 + 652ceeb
commit 9936dec
Show file tree

Hide file tree

Showing 10 changed files with 441 additions and 324 deletions.
diff --git a/assets/interface.json b/assets/interface.json
@@ -38,14 +38,14 @@
         },
         {
             "name": "夏日活动",
-            "entry": "SummerActivities"
+            "entry": "夏活"
         },
         {
             "name": "模拟军演",
-            "entry": "Rehearsal",
+            "entry": "模拟军演",
             "param": {
-                "Sortie": {
-                    "next": "Simulation"
+                "首页_出击": {
+                    "next": "模拟军演_入口"
                 }
             }
         },
@@ -64,7 +64,7 @@
             "name": "周本",
             "entry": "WeekInstance",
             "param": {
-                "Sortie": {
+                "首页_出击": {
                     "next": "ActivityExploration"
                 }
             },
@@ -89,7 +89,7 @@
                 {
                     "name": "技能书",
                     "param": {
-                        "Sortie": {
+                        "首页_出击": {
                             "next": "DailyExplore_Entry"
                         },
                         "DailyExplore_Entry": {
@@ -106,7 +106,7 @@
                 {
                     "name": "星币",
                     "param": {
-                        "Sortie": {
+                        "首页_出击": {
                             "next": "DailyExplore_Entry"
                         },
                         "DailyExplore_Entry": {
@@ -123,7 +123,7 @@
                 {
                     "name": "经验书",
                     "param": {
-                        "Sortie": {
+                        "首页_出击": {
                             "next": "DailyExplore_Entry"
                         },
                         "DailyExplore_Entry": {
@@ -140,7 +140,7 @@
                 {
                     "name": "遗余之谱(异星灰域商店币)",
                     "param": {
-                        "Sortie": {
+                        "首页_出击": {
                             "next": "DailyExplore_Entry"
                         },
                         "DailyExplore_Entry": {
@@ -157,7 +157,7 @@
                 {
                     "name": "芯片_物攻振奋",
                     "param": {
-                        "Sortie": {
+                        "首页_出击": {
                             "next": "DailyExplore_Entry"
                         },
                         "DailyExplore_Entry": {
@@ -174,7 +174,7 @@
                 {
                     "name": "芯片_能量金刚",
                     "param": {
-                        "Sortie": {
+                        "首页_出击": {
                             "next": "DailyExplore_Entry"
                         },
                         "DailyExplore_Entry": {
@@ -191,7 +191,7 @@
                 {
                     "name": "芯片_切割集中",
                     "param": {
-                        "Sortie": {
+                        "首页_出击": {
                             "next": "DailyExplore_Entry"
                         },
                         "DailyExplore_Entry": {
@@ -208,7 +208,7 @@
                 {
                     "name": "模块_气象山脉",
                     "param": {
-                        "Sortie": {
+                        "首页_出击": {
                             "next": "DailyExplore_Entry"
                         },
                         "DailyExplore_Entry": {
@@ -225,7 +225,7 @@
                 {
                     "name": "模块_灭刃乐团",
                     "param": {
-                        "Sortie": {
+                        "首页_出击": {
                             "next": "DailyExplore_Entry"
                         },
                         "DailyExplore_Entry": {
@@ -242,7 +242,7 @@
                 {
                     "name": "模块_不朽虫洞",
                     "param": {
-                        "Sortie": {
+                        "首页_出击": {
                             "next": "DailyExplore_Entry"
                         },
                         "DailyExplore_Entry": {

diff --git a/assets/resource/base/pipeline/awards.json b/assets/resource/base/pipeline/awards.json
@@ -8,7 +8,7 @@
             "Sub_StartUp"
         ]
     },
-    "Mail":{
+    "Mail": {
         "recognition": "ColorMatch",
         "roi": [
             254,
@@ -34,7 +34,7 @@
             "Mail"
         ]
     },
-    "Mail_Receive":{
+    "Mail_Receive": {
         "recognition": "ColorMatch",
         "roi": [
             230,
@@ -93,7 +93,7 @@
             "DailyTask"
         ]
     },
-    "DailyTask_Receive0":{
+    "DailyTask_Receive0": {
         "recognition": "ColorMatch",
         "roi": [
             23,
@@ -146,7 +146,7 @@
             "DailyTask_Receive2"
         ]
     },
-    "DailyTask_Receive2":{
+    "DailyTask_Receive2": {
         "recognition": "ColorMatch",
         "roi": [
             23,
@@ -233,9 +233,9 @@
             "BattlePass"
         ]
     },
-    "BattlePass_ReceiveMission":{
+    "BattlePass_ReceiveMission": {
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "任务"
         ],
         "roi": [
@@ -278,7 +278,7 @@
             "BattlePass_ReceiveDailyMissionGet"
         ]
     },
-    "BattlePass_ReceiveWeeklyMission":{
+    "BattlePass_ReceiveWeeklyMission": {
         "recognition": "ColorMatch",
         "roi": [
             197,
@@ -333,7 +333,7 @@
             "BattlePass_ReceiveWeeklyMissionGet"
         ]
     },
-    "BattlePass_ReceiveMonthlyMission":{
+    "BattlePass_ReceiveMonthlyMission": {
         "recognition": "ColorMatch",
         "roi": [
             195,
@@ -388,9 +388,9 @@
             "BattlePass_ReceiveMonthlyMissionGet"
         ]
     },
-    "BattlePass_MissionExist":{
+    "BattlePass_MissionExist": {
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "本期任务"
         ],
         "roi": [