From 6bd8bb82ea8a3021536d7ff0ef286af3cee103d7 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sat, 1 Oct 2022 12:37:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=8D=E6=AC=A1=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E8=82=89=E9=B8=BD=E5=8D=A1=E4=BD=8F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addition/Roguelike2/resource/tasks.json   |  73 +++++++++++++++++-
 .../template/Roguelike2CloseEvent.png         | Bin 0 -> 3170 bytes
 resource/tasks.json                           |  67 +++++++++++++---
 3 files changed, 126 insertions(+), 14 deletions(-)
 create mode 100644 resource/addition/Roguelike2/resource/template/Roguelike2CloseEvent.png

diff --git a/resource/addition/Roguelike2/resource/tasks.json b/resource/addition/Roguelike2/resource/tasks.json
index a192a1ae41..bd0a87ad41 100644
--- a/resource/addition/Roguelike2/resource/tasks.json
+++ b/resource/addition/Roguelike2/resource/tasks.json
@@ -368,7 +368,7 @@
     },
     "Roguelike2CloseCollectionContinue": {
         "action": "ClickSelf",
-        "templThreshold": 0.85,
+        "templThreshold": 0.9,
         "cache": false,
         "roi": [
             549,
@@ -396,13 +396,14 @@
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
             "Roguelike2CloseCollectionClose",
-            "Roguelike1DropsFlag"
+            "Roguelike1DropsFlag",
+            "Roguelike2CloseEvent"
         ]
     },
     "Roguelike2CloseCollectionClose": {
         "action": "ClickSelf",
         "cache": false,
-        "templThreshold": 0.85,
+        "templThreshold": 0.9,
         "roi": [
             572,
             434,
@@ -413,6 +414,35 @@
             100,
             255
         ],
+        "next": [
+            "Roguelike1StageEncounterEnter",
+            "Roguelike1StageTrader",
+            "Roguelike1StageSafeHouse",
+            "Roguelike1StageEncounter",
+            "Roguelike1StageBoons",
+            "Roguelike1StageCambatDps",
+            "Roguelike1StageEmergencyDps",
+            "Roguelike1StageDreadfulFoe",
+            "Roguelike2StageDreadfulFoe-5",
+            "Roguelike2StageRegionalCommissioning",
+            "Roguelike2StageGambling",
+            "Roguelike2CommissionedMissionCompleted",
+            "Roguelike2DiceConfirm",
+            "Roguelike2CloseCollectionContinue",
+            "Roguelike2CloseCollectionClose",
+            "Roguelike1DropsFlag",
+            "Roguelike2CloseEvent"
+        ]
+    },
+    "Roguelike2CloseEvent": {
+        "action": "ClickSelf",
+        "cache": false,
+        "roi": [
+            567,
+            584,
+            145,
+            136
+        ],
         "next": [
             "Roguelike1StageEncounterEnter",
             "Roguelike1StageTrader",
@@ -494,5 +524,42 @@
         "next": [
             "Roguelike1RecruitOther"
         ]
+    },
+    "Roguelike2NextLevel": {
+        "algorithm": "OcrDetect",
+        "action": "ClickSelf",
+        "cache": false,
+        "text": [
+            "天光海岸",
+            "离岸孤岛",
+            "波涛略地",
+            "隐秘温床",
+            "失尘岩洞",
+            "幽海丛林",
+            "绀碧摇篮"
+        ],
+        "roi": [
+            522,
+            431,
+            245,
+            144
+        ],
+        "next": [
+            "Roguelike1StageTrader",
+            "Roguelike1StageSafeHouse",
+            "Roguelike1StageEncounter",
+            "Roguelike1StageBoons",
+            "Roguelike1StageCambatDps",
+            "Roguelike1StageEmergencyDps",
+            "Roguelike1StageDreadfulFoe",
+            "Roguelike2StageDreadfulFoe-5",
+            "Roguelike2StageRegionalCommissioning",
+            "Roguelike2StageGambling",
+            "Roguelike2CommissionedMissionCompleted",
+            "Roguelike2DiceConfirm",
+            "Roguelike2CloseCollectionContinue",
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel"
+        ]
     }
 }
diff --git a/resource/addition/Roguelike2/resource/template/Roguelike2CloseEvent.png b/resource/addition/Roguelike2/resource/template/Roguelike2CloseEvent.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b8488d6e37919326df201c60dc79a6e76cf3d1e
GIT binary patch
literal 3170
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
IM6N<$f|8jTDF6Tf

literal 0
HcmV?d00001

diff --git a/resource/tasks.json b/resource/tasks.json
index 9026ef8b8f..bf9bcad2a3 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -7100,6 +7100,13 @@
             "Roguelike1StageEmergencyDps",
             "Roguelike1StageDreadfulFoe",
             "Roguelike2StageDreadfulFoe-5",
+            "Roguelike2StageRegionalCommissioning",
+            "Roguelike2StageGambling",
+            "Roguelike2CommissionedMissionCompleted",
+            "Roguelike2DiceConfirm",
+            "Roguelike2CloseCollectionContinue",
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel",
             "Roguelike1ExitThenAbandon",
             "Roguelike1Abandon",
             "TodaysSuppliesToRoguelike1",
@@ -7204,9 +7211,13 @@
             "Roguelike1StageEmergencyDps",
             "Roguelike1StageDreadfulFoe",
             "Roguelike2StageDreadfulFoe-5",
+            "Roguelike2StageRegionalCommissioning",
+            "Roguelike2StageGambling",
+            "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel"
         ]
     },
     "Roguelike1LastReward": {
@@ -7357,9 +7368,13 @@
             "Roguelike1StageEmergencyDps",
             "Roguelike1StageDreadfulFoe",
             "Roguelike2StageDreadfulFoe-5",
+            "Roguelike2StageRegionalCommissioning",
+            "Roguelike2StageGambling",
+            "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
             "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel",
             "Roguelike2MapObject"
         ]
     },
@@ -7606,9 +7621,13 @@
             "Roguelike1StageEmergencyDps",
             "Roguelike1StageDreadfulFoe",
             "Roguelike2StageDreadfulFoe-5",
+            "Roguelike2StageRegionalCommissioning",
+            "Roguelike2StageGambling",
+            "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel"
         ]
     },
     "Roguelike1StageTrader": {
@@ -7632,9 +7651,13 @@
             "Roguelike1StageEmergencyDps",
             "Roguelike1StageDreadfulFoe",
             "Roguelike2StageDreadfulFoe-5",
+            "Roguelike2StageRegionalCommissioning",
+            "Roguelike2StageGambling",
+            "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel"
         ]
     },
     "Roguelike1StageTraderEnter": {
@@ -7767,9 +7790,13 @@
             "Roguelike1StageEmergencyDps",
             "Roguelike1StageDreadfulFoe",
             "Roguelike2StageDreadfulFoe-5",
+            "Roguelike2StageRegionalCommissioning",
+            "Roguelike2StageGambling",
+            "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel"
         ]
     },
     "Roguelike2StageRegionalCommissioning": {
@@ -7997,7 +8024,8 @@
             "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel"
         ]
     },
     "Roguelike2DiceConfirmThenAbandon": {
@@ -8038,7 +8066,8 @@
             "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel"
         ]
     },
     "Roguelike1StageBoons": {
@@ -8067,7 +8096,8 @@
             "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel"
         ]
     },
     "Roguelike1StageEncounterEnter": {
@@ -8231,7 +8261,8 @@
             "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel"
         ],
         "next_Doc": "普通作战和紧急作战的图比较像，有时候会识别错，这里的next把两个开始的按钮都放进来，提高容错"
     },
@@ -8274,7 +8305,8 @@
             "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel"
         ],
         "next_Doc": "普通作战和紧急作战的图比较像，有时候会识别错，这里的next把两个开始的按钮都放进来，提高容错"
     },
@@ -8318,7 +8350,8 @@
             "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel"
         ],
         "next_Doc": "普通作战和紧急作战的图比较像，有时候会识别错，这里的next把两个开始的按钮都放进来，提高容错"
     },
@@ -8505,9 +8538,14 @@
             "Roguelike1MissionFailedFlag2",
             "Roguelike1GamePassSkip1",
             "Roguelike1GamePassTheEndConfirm",
-            "Roguelike1GamePass"
+            "Roguelike1GamePass",
+            "Roguelike2NextLevel"
         ]
     },
+    "Roguelike2NextLevel": {
+        "template": "empty.png",
+        "templThreshold": 2.0
+    },
     "Roguelike1GamePassSkip1": {
         "action": "ClickSelf",
         "roi": [
@@ -8642,6 +8680,7 @@
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
             "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel",
             "Roguelike1ChooseOperFlag",
             "Roguelike1StageEncounterSpecialClose",
             "Roguelike1TraderRandomShopping",
@@ -8686,6 +8725,7 @@
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
             "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel",
             "Roguelike1ChooseOperFlag",
             "Roguelike1StageEncounterFree",
             "Roguelike1StageEncounterLeave",
@@ -8904,6 +8944,7 @@
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
             "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel",
             "Roguelike1ClickToStartPoint"
         ]
     },
@@ -8943,9 +8984,13 @@
             "Roguelike1StageEmergencyDps",
             "Roguelike1StageDreadfulFoe",
             "Roguelike2StageDreadfulFoe-5",
+            "Roguelike2StageRegionalCommissioning",
+            "Roguelike2StageGambling",
+            "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
             "Roguelike2CloseCollectionClose",
+            "Roguelike2NextLevel",
             "TodaysSuppliesToRoguelike1",
             "TerminalToRoguelike1",
             "CloseAnnoToRoguelike1",