From c975f65d00c0b0b7791a8d9ae42c95b2dd5e3af8 Mon Sep 17 00:00:00 2001 From: a16797 <167970334@qq.com> Date: Sat, 6 Jul 2024 03:05:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=80=A0=E7=89=A9?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=88=B0[=E8=AF=8D=E6=9D=A1]=EF=BC=9B=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BB=AA=E5=BC=8F=E5=8C=95=E9=A6=96=E5=90=83=E9=80=A0=E7=89=A9?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8=E6=B7=B1=E7=9C=A0?= =?UTF-8?q?bug=20(#129)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pipeline/activity/StagePromotion.json | 18 +-- .../activity/ThePrisonerintheCave.json | 4 +- .../pipeline/activity/outsidededuction.json | 103 ++++++++++++------ assets/resource/base/pipeline/all_in.json | 18 +-- assets/resource/base/pipeline/combat.json | 14 +-- .../base/pipeline/combat_activity.json | 2 +- assets/resource/base/pipeline/eat_candy.json | 18 +-- assets/resource/base/pipeline/limbo.json | 34 +++--- assets/resource/base/pipeline/psychube.json | 2 +- assets/resource/base/pipeline/startup.json | 6 +- 10 files changed, 131 insertions(+), 88 deletions(-) diff --git a/assets/resource/base/pipeline/activity/StagePromotion.json b/assets/resource/base/pipeline/activity/StagePromotion.json index ecf89225..580a1ddc 100644 --- a/assets/resource/base/pipeline/activity/StagePromotion.json +++ b/assets/resource/base/pipeline/activity/StagePromotion.json @@ -60,7 +60,7 @@ }, "StagePromotion_ReadyForAction": { "recognition": "OCR", - "text": [ + "expected": [ "开始行动" ], "roi": [ @@ -81,7 +81,7 @@ "StagePromotion_BalanceModel": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "制衡模式" ], "roi": [ @@ -101,7 +101,7 @@ "StagePromotion_EatCandy": { "enabled": false, "recognition": "OCR", - "text": [ + "expected": [ "活性", "恢复" ], @@ -194,7 +194,7 @@ }, "StagePromotion_QuitEatCandyPage": { "recognition": "OCR", - "text": [ + "expected": [ "活性", "恢复" ], @@ -218,7 +218,7 @@ }, "StagePromotion_Skip": { "recognition": "OCR", - "text": [ + "expected": [ "跳过" ], "roi": [ @@ -236,7 +236,7 @@ }, "StagePromotion_Confirm": { "recognition": "OCR", - "text": [ + "expected": [ "确认" ], "roi": [ @@ -263,7 +263,7 @@ 64, 64 ], - "timeout":40000, + "timeout": 40000, "next": [ "StagePromotion_Victory", "StagePromotion_CombatDefeat", @@ -274,7 +274,7 @@ }, "StagePromotion_Victory": { "recognition": "OCR", - "text": [ + "expected": [ "战斗", "胜利" ], @@ -296,7 +296,7 @@ }, "StagePromotion_CombatDefeat": { "recognition": "OCR", - "text": [ + "expected": [ "战斗", "失败" ], diff --git a/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json b/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json index 04caaa74..4a88b87d 100644 --- a/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json +++ b/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json @@ -39,7 +39,7 @@ }, "ThePrisonerintheCaveTargetStageName": { "recognition": "OCR", - "text": [ + "expected": [ "证明启示V" ], "roi": [ @@ -55,7 +55,7 @@ }, "ThePrisonerintheCaveReadyForAction": { "recognition": "OCR", - "text": [ + "expected": [ "开始行动" ], "roi": [ diff --git a/assets/resource/base/pipeline/activity/outsidededuction.json b/assets/resource/base/pipeline/activity/outsidededuction.json index 67581401..759c6095 100644 --- a/assets/resource/base/pipeline/activity/outsidededuction.json +++ b/assets/resource/base/pipeline/activity/outsidededuction.json @@ -57,7 +57,7 @@ }, "SODStop_Click_1": { "recognition": "OCR", - "text": [ + "expected": [ "阴霾", "渐生" ], @@ -75,7 +75,7 @@ }, "SODStop_Click_2": { "recognition": "OCR", - "text": [ + "expected": [ "幕终寻获" ], "roi": [ @@ -99,7 +99,7 @@ }, "SOD_Complete_Click_1": { "recognition": "OCR", - "text": [ + "expected": [ "阴霾", "消散" ], @@ -117,7 +117,7 @@ }, "SODStop_Click_3": { "recognition": "OCR", - "text": [ + "expected": [ "累计获得造物" ], "roi": [ @@ -172,7 +172,7 @@ }, "SODStart_GoodsSellect": { "recognition": "OCR", - "text": [ + "expected": [ "镜的馈赠" ], "roi": [ @@ -192,14 +192,14 @@ "Sub_SODStart_GoodsSellect": { "is_sub": true, "recognition": "OCR", - "order_by": "Length", - "index": -1, - "text": [ + "expected": [ "软盘", "造物", "发条", "金雀" ], + "order_by": "Length", + "index": -1, "roi": [ 2, 359, @@ -213,14 +213,14 @@ }, "SODStart_GoodsSellect_2": { "recognition": "OCR", - "order_by": "Length", - "index": -2, - "text": [ + "expected": [ "软盘", "造物", "发条", "金雀" ], + "order_by": "Length", + "index": -2, "roi": [ 2, 359, @@ -364,6 +364,7 @@ "action": "Click", "post_delay": 1500, "next": [ + "SOD_ClearDeployment", "SOD_ArcanistAdd_Confirm_2", "SOD_CombatStart", "SOD_Departure", @@ -1086,7 +1087,7 @@ }, "SOD_Levelup": { "recognition": "OCR", - "text": [ + "expected": [ "触媒等级提升" ], "roi": [ @@ -1127,7 +1128,7 @@ }, "SOD_Fight": { "recognition": "OCR", - "text": [ + "expected": [ "开始行动" ], "roi": [ @@ -1251,7 +1252,7 @@ "Sub_SOD_Dialog_3": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "升华" ], "roi": [ @@ -1264,7 +1265,7 @@ }, "SOD_CombatDefeat_hint": { "recognition": "OCR", - "text": [ + "expected": [ "终止探索" ], "roi": [ @@ -1283,7 +1284,7 @@ }, "SOD_CombatVictory": { "recognition": "OCR", - "text": [ + "expected": [ "战斗胜利", "胜利" ], @@ -1308,7 +1309,7 @@ }, "SOD_CombatDefeat": { "recognition": "OCR", - "text": [ + "expected": [ "战斗失败", "失败" ], @@ -1327,7 +1328,7 @@ }, "SOD_ItemSellct_1": { "recognition": "OCR", - "text": [ + "expected": [ "造物选择" ], "roi": [ @@ -1339,7 +1340,7 @@ "action": "Click", "target": [ 267, - 361, + 300, 20, 20 ], @@ -1364,7 +1365,7 @@ }, "SOD_ItemSellct_2": { "recognition": "OCR", - "text": [ + "expected": [ "造物选择" ], "roi": [ @@ -1376,7 +1377,7 @@ "action": "Click", "target": [ 632, - 361, + 300, 20, 20 ], @@ -1401,7 +1402,7 @@ }, "SOD_ItemSellct_3": { "recognition": "OCR", - "text": [ + "expected": [ "造物选择" ], "roi": [ @@ -1413,7 +1414,7 @@ "action": "Click", "target": [ 855, - 361, + 300, 20, 20 ], @@ -1438,7 +1439,7 @@ }, "SOD_ItemSellct_4": { "recognition": "OCR", - "text": [ + "expected": [ "造物选择" ], "roi": [ @@ -1450,7 +1451,7 @@ "action": "Click", "target": [ 1132, - 361, + 300, 20, 20 ], @@ -1474,7 +1475,7 @@ }, "SOD_ItemSellct_Confirm": { "recognition": "OCR", - "text": [ + "expected": [ "确认" ], "roi": [ @@ -1505,7 +1506,7 @@ }, "SOD_ItemLose_1": { "recognition": "OCR", - "text": [ + "expected": [ "交付造物", "失去造物" ], @@ -1553,7 +1554,7 @@ }, "SOD_NewArcanist": { "recognition": "OCR", - "text": [ + "expected": [ "等级" ], "roi": [ @@ -1575,7 +1576,7 @@ }, "SOD_Departure": { "recognition": "OCR", - "text": [ + "expected": [ "启程" ], "roi": [ @@ -1679,7 +1680,7 @@ }, "SOD_Acquire": { "recognition": "OCR", - "text": [ + "expected": [ "获得造物" ], "roi": [ @@ -1721,6 +1722,7 @@ 85 ], "next": [ + "SOD_ClearDeployment", "SOD_Departure", "SOD_Ending_1", "SOD_Ending_2", @@ -1755,9 +1757,44 @@ "SOD_SellectNext_7_2" ] }, + "SOD_ClearDeployment": { + "recognition": "OCR", + "expected": [ + "清空布设" + ], + "roi": [ + 0, + 440, + 210, + 278 + ], + "pre_delay": 1000, + "action": "Click", + "next": [ + "SOD_OneClickDeploymentt", + "SOD_ClearDeployment" + ] + }, + "SOD_OneClickDeploymentt": { + "recognition": "OCR", + "expected": [ + "布设" + ], + "roi": [ + 0, + 492, + 104, + 81 + ], + "action": "Click", + "next": [ + "SOD_Main", + "Sub_BackButton" + ] + }, "SOD_Skip": { "recognition": "OCR", - "text": [ + "expected": [ "跳过" ], "roi": [ @@ -1775,7 +1812,7 @@ }, "SOD_Skip_Confirm": { "recognition": "OCR", - "text": [ + "expected": [ "确认" ], "roi": [ @@ -1867,4 +1904,4 @@ "SOD_EndingSelecct" ] } -} +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/all_in.json b/assets/resource/base/pipeline/all_in.json index d2090fc4..a7ba4d51 100644 --- a/assets/resource/base/pipeline/all_in.json +++ b/assets/resource/base/pipeline/all_in.json @@ -2,7 +2,7 @@ "AllIn": { "enabled": false, "recognition": "OCR", - "text": [ + "expected": [ "复现" ], "roi": [ @@ -152,7 +152,7 @@ }, "StartReplayX4": { "recognition": "OCR", - "text": [ + "expected": [ "复现" ], "roi": [ @@ -170,7 +170,7 @@ }, "StartReplayX3": { "recognition": "OCR", - "text": [ + "expected": [ "复现" ], "roi": [ @@ -188,7 +188,7 @@ }, "StartReplayX2": { "recognition": "OCR", - "text": [ + "expected": [ "复现" ], "roi": [ @@ -206,7 +206,7 @@ }, "StartReplayX1": { "recognition": "OCR", - "text": [ + "expected": [ "复现" ], "roi": [ @@ -224,7 +224,7 @@ }, "RecoveryPageByX4": { "recognition": "OCR", - "text": [ + "expected": [ "活性", "恢复" ], @@ -242,7 +242,7 @@ }, "RecoveryPageByX3": { "recognition": "OCR", - "text": [ + "expected": [ "活性", "恢复" ], @@ -260,7 +260,7 @@ }, "RecoveryPageByX2": { "recognition": "OCR", - "text": [ + "expected": [ "活性", "恢复" ], @@ -278,7 +278,7 @@ }, "RecoveryPageByX1": { "recognition": "OCR", - "text": [ + "expected": [ "活性", "恢复" ], diff --git a/assets/resource/base/pipeline/combat.json b/assets/resource/base/pipeline/combat.json index fd080221..e757fc71 100644 --- a/assets/resource/base/pipeline/combat.json +++ b/assets/resource/base/pipeline/combat.json @@ -474,7 +474,7 @@ }, "TheFarLeftOfStageList": { "recognition": "OCR", - "text": "01", + "expected": "01", "roi": [ 0, 470, @@ -595,7 +595,7 @@ }, "ReadyForAction": { "recognition": "OCR", - "text": [ + "expected": [ "开始行动" ], "roi": [ @@ -672,7 +672,7 @@ }, "StartReplay": { "recognition": "OCR", - "text": [ + "expected": [ "复现" ], "roi": [ @@ -690,7 +690,7 @@ }, "RecoveryPage": { "recognition": "OCR", - "text": [ + "expected": [ "活性", "恢复" ], @@ -709,7 +709,7 @@ }, "Replaying": { "recognition": "OCR", - "text": [ + "expected": [ "行为", "复现" ], @@ -727,7 +727,7 @@ }, "Victory": { "recognition": "OCR", - "text": [ + "expected": [ "战斗", "胜利" ], @@ -746,4 +746,4 @@ "Sub_StartUp" ] } -} +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/combat_activity.json b/assets/resource/base/pipeline/combat_activity.json index d1dde772..3688f6ff 100644 --- a/assets/resource/base/pipeline/combat_activity.json +++ b/assets/resource/base/pipeline/combat_activity.json @@ -7,7 +7,7 @@ }, "ActivityStageDifficulty_Hard": { "recognition": "OCR", - "text": [ + "expected": [ "艰难" ], "roi": [ diff --git a/assets/resource/base/pipeline/eat_candy.json b/assets/resource/base/pipeline/eat_candy.json index dec0d1d0..789e1de4 100644 --- a/assets/resource/base/pipeline/eat_candy.json +++ b/assets/resource/base/pipeline/eat_candy.json @@ -10,7 +10,7 @@ }, "MiniCandy24H": { "recognition": "OCR", - "text": "小时", + "expected": "小时", "roi": [ 989, 212, @@ -23,7 +23,7 @@ }, "SmallCandy24H": { "recognition": "OCR", - "text": "小时", + "expected": "小时", "roi": [ 829, 65, @@ -36,7 +36,7 @@ }, "BigCandy24H": { "recognition": "OCR", - "text": "小时", + "expected": "小时", "roi": [ 856, 373, @@ -49,7 +49,7 @@ }, "NotCandy24H": { "recognition": "OCR", - "text": [ + "expected": [ "活性", "恢复" ], @@ -130,7 +130,7 @@ }, "MiniCandy24HNotEnough": { "recognition": "OCR", - "text": "苦目软糖", + "expected": "苦目软糖", "roi": [ 989, 212, @@ -146,7 +146,7 @@ }, "SmallCandy24HNotEnough": { "recognition": "OCR", - "text": "苦目糖果", + "expected": "苦目糖果", "roi": [ 997, 62, @@ -162,7 +162,7 @@ }, "BigCandy24HNotEnough": { "recognition": "OCR", - "text": "苦目糖罐", + "expected": "苦目糖罐", "roi": [ 997, 62, @@ -178,7 +178,7 @@ "Sub_QuitEatCandyPage": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "活性", "恢复" ], @@ -226,4 +226,4 @@ "ConvertCandyConfirm" ] } -} +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/limbo.json b/assets/resource/base/pipeline/limbo.json index 0615f65d..e76acc2a 100644 --- a/assets/resource/base/pipeline/limbo.json +++ b/assets/resource/base/pipeline/limbo.json @@ -24,7 +24,7 @@ }, "ArtificialSleepwalking": { "recognition": "OCR", - "text": "人工梦游", + "expected": "人工梦游", "roi": [ 0, 550, @@ -91,7 +91,7 @@ }, "LimboStageRightest": { "recognition": "OCR", - "text": "深眠片段", + "expected": "深眠片段", "roi": [ 0, 112, @@ -116,7 +116,7 @@ }, "LimboStageFlag": { "recognition": "OCR", - "text": "梦境重置", + "expected": "梦境重置", "roi": [ 0, 586, @@ -153,7 +153,7 @@ }, "LimboActionFlag_1": { "recognition": "OCR", - "text": "开始行动", + "expected": "开始行动", "roi": [ 988, 566, @@ -167,7 +167,7 @@ }, "LimboTeamSelection_1": { "recognition": "OCR", - "text": "成员队列", + "expected": "成员队列", "roi": [ 786, 631, @@ -187,7 +187,10 @@ "Limbo/LimboTeamSelection_12.png" ], "order_by": "Score", - "threshold": 0.9, + "threshold": [ + 0.9, + 0.9 + ], "roi": [ 722, 342, @@ -202,7 +205,7 @@ }, "LimboAction_1": { "recognition": "OCR", - "text": "开始行动", + "expected": "开始行动", "roi": [ 988, 566, @@ -218,7 +221,7 @@ }, "LimboVictory_1": { "recognition": "OCR", - "text": [ + "expected": [ "战斗胜利", "战斗失败" ], @@ -260,7 +263,7 @@ }, "LimboActionFlag_2": { "recognition": "OCR", - "text": "开始行动", + "expected": "开始行动", "roi": [ 988, 566, @@ -274,7 +277,7 @@ }, "LimboTeamSelection_2": { "recognition": "OCR", - "text": "成员队列", + "expected": "成员队列", "roi": [ 786, 631, @@ -294,7 +297,10 @@ "Limbo/LimboTeamSelection_22.png" ], "order_by": "Score", - "threshold": 0.9, + "threshold": [ + 0.9, + 0.9 + ], "roi": [ 722, 342, @@ -309,7 +315,7 @@ }, "LimboAction_2": { "recognition": "OCR", - "text": "开始行动", + "expected": "开始行动", "roi": [ 988, 566, @@ -325,7 +331,7 @@ }, "LimboVictory_2": { "recognition": "OCR", - "text": [ + "expected": [ "战斗胜利", "战斗失败" ], @@ -389,7 +395,7 @@ }, "LimboObtainedAwards_2": { "recognition": "OCR", - "text": "深眠试验酬劳", + "expected": "深眠试验酬劳", "roi": [ 104, 36, diff --git a/assets/resource/base/pipeline/psychube.json b/assets/resource/base/pipeline/psychube.json index 901c0caf..f9b9b688 100644 --- a/assets/resource/base/pipeline/psychube.json +++ b/assets/resource/base/pipeline/psychube.json @@ -84,7 +84,7 @@ }, "PsychubeReadyForAction": { "recognition": "OCR", - "text": [ + "expected": [ "开始行动" ], "roi": [ diff --git a/assets/resource/base/pipeline/startup.json b/assets/resource/base/pipeline/startup.json index 92dbb4cd..4ac7b0ce 100644 --- a/assets/resource/base/pipeline/startup.json +++ b/assets/resource/base/pipeline/startup.json @@ -98,7 +98,7 @@ }, "Download": { "recognition": "OCR", - "text": [ + "expected": [ "下载", "重试" ], @@ -136,7 +136,7 @@ "StartGame": { "recognition": "TemplateMatch", "template": "StartUp/StartGame.png", - "green_mask":true, + "green_mask": true, "roi": [ 352, 230, @@ -271,4 +271,4 @@ ], "action": "Click" } -} +} \ No newline at end of file