v2.3.1

Saratoga-Official · Dec 23, 2024 · 0fa28fd · 0fa28fd
1 parent 1815df8
commit 0fa28fd
Show file tree

Hide file tree

Showing 5 changed files with 728 additions and 217 deletions.
diff --git a/assets/interface.json b/assets/interface.json
@@ -181,6 +181,50 @@
                     ]
                 }
             }
+        },
+        {
+            "name": "活动地峡之岚",
+            "entry": "进入活动",
+            "check": false,
+            "repeatable": true,
+            "doc": "[color:red]活动不支持自动导航，活动模式选择活动出征须在出击准备界面点开始，其余设置沿用自动出征，活动答题须在答题界面点开始，选择答题后下面设置将无效[/color]",
+            "repeat_count": 1,
+            "option": [
+                "活动模式",
+                "战斗编队",
+                "战斗阵型",
+                "活动无限次数",
+                "战斗大破/中破舰船处理",
+                "门口SL目标1",
+                "门口SL目标2",
+                "夜战追击",
+                "战斗点位",
+                "战斗使用军阶buff"
+            ],
+            "pipeline_override": {
+                "回到关卡了": {
+                    "expected": "出击准备",
+                    "roi": [
+                        980,
+                        581,
+                        254,
+                        75
+                    ],
+                    "next": [
+                        "无限战斗",
+                        "无动作结束"
+                    ]
+                },
+                "进入关卡": {
+                    "expected": "出击准备",
+                    "roi": [
+                        980,
+                        581,
+                        254,
+                        75
+                    ]
+                }
+            }
         }
     ],
     "option": {
@@ -2256,6 +2300,52 @@
                     }
                 }
             ]
+        },
+        "活动无限次数": {
+            "cases": [
+                {
+                    "name": "关闭",
+                    "pipeline_override": {
+                        "无限战斗": {
+                            "enabled": false
+                        }
+                    }
+                },
+                {
+                    "name": "直到捞船达到上限停止",
+                    "pipeline_override": {
+                        "无限战斗": {
+                            "recognition": "OCR",
+                            "expected": "^500/500$",
+                            "roi": [
+                                1153,
+                                19,
+                                89,
+                                30
+                            ],
+                            "inverse": true
+                        }
+                    }
+                }
+            ]
+        },
+        "活动模式": {
+            "cases": [
+                {
+                    "name": "活动出征",
+                    "pipeline_override": {}
+                },
+                {
+                    "name": "活动答题（测试功能）",
+                    "pipeline_override": {
+                        "进入活动": {
+                            "next": [
+                                "检查题目"
+                            ]
+                        }
+                    }
+                }
+            ]
         }
     }
 }
diff --git a/assets/resource/base/pipeline/刷鱼雷狗粮.json b/assets/resource/base/pipeline/刷鱼雷狗粮.json
@@ -78,58 +78,86 @@
         ]
     },
     "点排序": {
-        "recognition": "TemplateMatch",
-        "template": "排列顺序.png",
-        "order_by": "Score",
-        "threshold": 0.95,
+        "recognition": "OCR",
+        "expected": "排列顺序",
+        "roi": [
+            1097,
+            334,
+            136,
+            97
+        ],
         "action": "Click",
         "next": [
             "点获得时间",
             "点排序确定"
         ]
     },
     "点获得时间": {
-        "recognition": "TemplateMatch",
-        "template": "获得时间.png",
-        "order_by": "Score",
-        "threshold": 0.95,
+        "recognition": "OCR",
+        "expected": "获得时间",
+        "roi": [
+            382,
+            254,
+            160,
+            81
+        ],
         "action": "Click",
         "next": [
             "点排序确定"
         ]
     },
     "点排序确定": {
-        "recognition": "TemplateMatch",
-        "template": "排序确定.png",
+        "recognition": "OCR",
+        "expected": "确定",
+        "roi": [
+            1026,
+            568,
+            190,
+            87
+        ],
         "action": "Click",
         "next": [
             "点类型"
         ]
     },
     "点类型": {
-        "recognition": "TemplateMatch",
-        "template": "类型.png",
-        "order_by": "Score",
-        "threshold": 0.95,
+        "recognition": "OCR",
+        "expected": "类型",
+        "roi": [
+            1104,
+            431,
+            129,
+            101
+        ],
         "action": "Click",
         "next": [
             "点护卫",
             "点类型确定"
         ]
     },
     "点护卫": {
-        "recognition": "TemplateMatch",
-        "template": "护卫.png",
-        "order_by": "Score",
-        "threshold": 0.95,
+        "recognition": "OCR",
+        "expected": "护卫",
+        "roi": [
+            1123,
+            495,
+            123,
+            82
+        ],
         "action": "Click",
         "next": [
             "点类型确定"
         ]
     },
     "点类型确定": {
-        "recognition": "TemplateMatch",
-        "template": "排序确定.png",
+        "recognition": "OCR",
+        "expected": "确定",
+        "roi": [
+            1026,
+            568,
+            190,
+            87
+        ],
         "action": "Click",
         "next": [
             "点狗粮"