Merge pull request #3517 from WLLEGit/ReclamationAlgorithm

fix: 修复自动生息演算的若干问题

resource/tasks.json

@@ -9796,11 +9796,13 @@
         ]
     },
     "Reclamation@ConfirmStart":{
+        "cache": false,
+        "algorithm": "OcrDetect",
+        "text": [
+            "演算", "开始"
+        ],
         "roi": [
-            874,
-            503,
-            350,
-            212
+            790, 497, 465, 223
         ],
         "action": "ClickSelf",
         "next": [
@@ -9850,12 +9852,14 @@
             557, 281, 162, 155
         ],
         "action": "ClickSelf",
-        "postDelay": 1000,
+        "exceededNext": [
+            "Reclamation@ResetScope"  
+        ],
         "next": [
+            "Reclamation@NextDay",
             "Reclamation@ClickAnyZoneOcr",
             "Reclamation@SkipAnnounce",
             "Reclamation@SkipDailyReport",
-            "Reclamation@ResetScope",
             "Reclamation@ClickCenterBase"
         ]
     },
@@ -9911,12 +9915,14 @@
         ],
         "action": "ClickSelf",
         "next": [
+            "Reclamation@ClickExitLevel",
             "Reclamation@StartActionPopupConfirm",
             "Reclamation@StartActionConfirm"
         ]
     },
     "Reclamation@StartActionPopupConfirm":{
         "template": "PopupConfirm.png",
+        "templThreshold": 0.7,
         "action": "ClickSelf",
         "roi": [
             630,
@@ -9988,6 +9994,7 @@
         "action": "ClickSelf",
         "postDelay": 500,
         "next": [
+            "Reclamation@NextDay",
             "Reclamation@ClickCenterBase",
             "Reclamation@ResetScope"
         ]
@@ -9997,7 +10004,7 @@
             1055, 0, 225, 177
         ],
         "action": "ClickSelf",
-        "postDelay": 1000,
+        "postDelay": 4000,
         "next": [
             "Reclamation@Emergency",
             "Reclamation@NextDay",
@@ -10006,6 +10013,7 @@
     },
     "Reclamation@Emergency":{
         "action": "DoNothing",
+        "templThreshold": 0.7,
         "roi": [
             1055, 0, 225, 181
         ],
@@ -10035,6 +10043,7 @@
     },
     "Reclamation@GiveupAlgorithmConfirm":{
         "template": "PopupConfirm.png",
+        "templThreshold": 0.7,
         "action": "ClickSelf",
         "roi": [
             630,
@@ -10073,7 +10082,8 @@
         ],
         "action": "ClickSelf",
         "next": [
-            "Reclamation@Begin"
+            "Reclamation@Begin",
+            "Reclamation@GainReword"
         ]   
     }
 }

src/MaaWpfGui/Main/TaskQueueViewModel.cs

@@ -655,7 +655,7 @@ namespace MaaWpfGui
                 {
                     ret &= AppendRoguelike();
                 }
-                else if(item.OriginalName == "ReclamationAlgorithm")
+                else if (item.OriginalName == "ReclamationAlgorithm")
                 {
                     ret &= AppendReclamation();
                 }