Merge pull request #1334 from MaaAssistantArknights/release/v4.1.2

chore: 更新复刻活动 `多索雷斯假日` 关卡资源

CHANGELOG.md

@@ -1,11 +1,6 @@
-- 新增支持 繁中服 自动公招、公招识别 @rockerhank
-- 修复 肉鸽 编队人数过多时出现的一些问题 @MistEO
-- 修复 肉鸽 偶现掉线后、凌晨 4 点更新后无法继续的问题 @MistEO
-- 修复 肉鸽 在部分模拟器上战斗画面识别错误问题 @MistEO
-- 修复 EN 服 肉鸽 招募干员、进入安全屋、领取关卡奖励时卡住的问题 @MistEO
-- 修复 刷理智 偶现掉落识别问题 @MistEO
-- 修复 自动战斗 选择了 `删除编队` 时任务报错的问题 @MistEO
-- 修复 自动战斗 存在 14 个及以上干员时的崩溃问题 @MistEO
-- 修复 界面 崩溃问题 @MistEO
-- 新增 core `AsstGetUUID`, `AsstGetTasksList` 接口 @MistEO
-- 更新 各种文档 @LYZhelloworld @zzyyyl @ABA2396
+- 新增支持 `多索雷斯假日` 活动关卡导航 @ABA2396
+- 更新 `多索雷斯假日` 活动关卡地图数据 @yuanyan3060 @MistEO
+- 修复 `多索雷斯假日` 部分关卡自动战斗击杀数识别错误 @MistEO
+- 修复 `多索雷斯假日` 误报 `电子晶体元件` 的问题 @MistEO
+
+~~这个活动掉落是代币，不是材料，要单独整理资源比较麻烦，于是摆烂了~~

resource/tasks.json

@@ -198,6 +198,69 @@
             60
         ]
     },
+    "DH-9": {
+        "algorithm": "JustReturn",
+        "action": "DoNothing",
+        "sub": [
+            "DH-Open"
+        ],
+        "next": [
+            "StageDH-9"
+        ]
+    },
+    "DH-Open": {
+        "action": "ClickSelf",
+        "algorithm": "OcrDetect",
+        "text": [
+            "假日",
+            "复刻",
+            "活动",
+            "开放"
+        ],
+        "roi": [
+            0,
+            500,
+            500,
+            150
+        ],
+        "next": [
+            "DHChapterToDH"
+        ]
+    },
+    "DHChapterToDH": {
+        "algorithm": "OcrDetect",
+        "action": "ClickSelf",
+        "cache": false,
+        "text": [
+            "极限",
+            "铁人",
+            "大奖"
+        ],
+        "roi": [
+            934,
+            280,
+            234,
+            124
+        ],
+        "rearDelay": 2000,
+        "next": [
+            "DHChapterToDH",
+            "SwipeToTheRight"
+        ]
+    },
+    "StageDH-9": {
+        "algorithm": "OcrDetect",
+        "action": "ClickSelf",
+        "text": [
+            "DH-9"
+        ],
+        "roi": [
+            518,
+            133,
+            176,
+            134
+        ]
+    },
     "DV-8": {
         "algorithm": "JustReturn",
         "action": "DoNothing",
@@ -5269,7 +5332,8 @@
         "maskRange": [
             1,
             255
-        ]
+        ],
+        "templThreshold": 0.6
     },
     "BattleKills": {
         "algorithm": "OcrDetect",
@@ -7473,7 +7537,7 @@
     },
     "StageDrops-Item": {
         "template": "empty.png",
-        "templThreshold": 0.6,
+        "templThreshold": 0.65,
         "roi": [
             0,
             -130,

src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs

@@ -180,6 +180,9 @@ namespace MeoAsstGui
                 new CombData { Display = "当前关卡", Value = string.Empty },
                 new CombData { Display = "上次作战", Value = "LastBattle" },
 
+                // SideStory「多索雷斯假日」复刻活动关卡
+                new CombData { Display = "DH-9", Value = "DH-9" },
+
                 new CombData { Display = "1-7", Value = "1-7" },
                 new CombData { Display = "龙门币-6/5", Value = "CE-6" },
                 new CombData { Display = "红票-5", Value = "AP-5" },

tools/ResourceUpdater/main.cpp

@@ -77,7 +77,7 @@ int main([[maybe_unused]] int argc, char** argv)
     std::cout << "------------Update roguelike recruit data------------" << std::endl;
     if (!update_roguelike_recruit(input_dir, resource_dir, solution_dir)) {
         std::cerr << "Update roguelike recruit data failed" << std::endl;
-        return -1;
+        //return -1;
     }
 
     /* Update stage.json from Penguin Stats*/