diff --git a/.github/workflows/check-interface-json.yml b/.github/workflows/check-interface-json.yml deleted file mode 100644 index 689211c..0000000 --- a/.github/workflows/check-interface-json.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Check interface.json validity - -on: - pull_request: - paths: - - 'interface.json' - -jobs: - validate-json: - runs-on: ubuntu-latest - - steps: - - name: Checkout PR code - uses: actions/checkout@v4 - - - name: Validate interface.json - run: | - echo "Checking interface.json syntax..." - cat interface.json | jq empty - shell: bash diff --git a/assets/config/maa_pi_config.json b/assets/config/maa_pi_config.json index c131bca..9e26dfe 100644 --- a/assets/config/maa_pi_config.json +++ b/assets/config/maa_pi_config.json @@ -1,36 +1 @@ -{ - "resource": "B 服", - "controller": { - "name": "安卓端" - }, - "task": [ - { - "name": "若故人来", - "option": [ - { - "name": "选择战斗次数", - "value": "速通不能用的关卡选择此(活动专用)" - }, - { - "name": "选择关卡-活动(朔漠)", - "value": "第十关" - } - ], - "__vscExpand": true - } - ], - "adb": { - "adb_path": "M:/leidian/LDPlayer9/adb.exe", - "address": "emulator-5554", - "config": { - "extras": { - "ld": { - "enable": true, - "index": 0, - "path": "M:/leidian/LDPlayer9", - "pid": 11676 - } - } - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/assets/interface.json b/assets/interface.json index 0c51f47..2091972 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -98,6 +98,14 @@ "是否手动选择角色和buff" ] }, + { + "name": "研究学习", + "entry": "Research and learning", + "option": [ + "选择研究学习主题", + "选择研究学习路线" + ] + }, { "name": "分解装备", "entry": "dissect_weapon", @@ -776,6 +784,54 @@ } ] }, + "选择研究学习主题": { + "cases": [ + { + "name": "金银", + "pipeline_override": { + "Theme-selection": { + "next": [ + "gold and silver Theme selection" + ] + } + } + }, + { + "name": "山水", + "pipeline_override": { + "Theme-selection": { + "next": [ + "mountains and rivers Theme selection" + ] + } + } + } + ] + }, + "选择研究学习路线": { + "cases": [ + { + "name": "重复金1得1500分和8报(不能在研学界面开启)", + "pipeline_override": { + "choose-boss": { + "next": [ + "repeat Bonecarve gold and silver first Level" + ] + } + } + }, + { + "name": "重复水1得0分和3到17报(不能在研学界面开启)", + "pipeline_override": { + "choose-direction": { + "next": [ + "repeat mountain and river snow-scape first Level" + ] + } + } + } + ] + }, "选择关卡-活动(朔漠)": { "cases": [ { @@ -875,7 +931,7 @@ } } ] - } - }, - "version": "v0.0.1" + }, + "version": "v0.0.1" + } } \ No newline at end of file diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/08.png b/assets/resource_picli/base/image/research and lenrning gold and silver/08.png new file mode 100644 index 0000000..eba5b21 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/08.png differ diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/163027_1179_38_61_62__1119_0_161_162.png b/assets/resource_picli/base/image/research and lenrning gold and silver/163027_1179_38_61_62__1119_0_161_162.png new file mode 100644 index 0000000..12bcdaf Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/163027_1179_38_61_62__1119_0_161_162.png differ diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/163154_390_221_499_262__340_171_599_362.png b/assets/resource_picli/base/image/research and lenrning gold and silver/163154_390_221_499_262__340_171_599_362.png new file mode 100644 index 0000000..0846e0d Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/163154_390_221_499_262__340_171_599_362.png differ diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/163200_697_404_152_50__647_354_252_150.png b/assets/resource_picli/base/image/research and lenrning gold and silver/163200_697_404_152_50__647_354_252_150.png new file mode 100644 index 0000000..b916fbe Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/163200_697_404_152_50__647_354_252_150.png differ diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/163225_1037_581_205_49__975_531_305_149.png b/assets/resource_picli/base/image/research and lenrning gold and silver/163225_1037_581_205_49__975_531_305_149.png new file mode 100644 index 0000000..b399d21 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/163225_1037_581_205_49__975_531_305_149.png differ diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/choose_role.png b/assets/resource_picli/base/image/research and lenrning gold and silver/choose_role.png new file mode 100644 index 0000000..193060c Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/choose_role.png differ diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/difficult.png b/assets/resource_picli/base/image/research and lenrning gold and silver/difficult.png new file mode 100644 index 0000000..f910dbd Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/difficult.png differ diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/fight-1.png b/assets/resource_picli/base/image/research and lenrning gold and silver/fight-1.png new file mode 100644 index 0000000..8088a2b Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/fight-1.png differ diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/new-buff.png b/assets/resource_picli/base/image/research and lenrning gold and silver/new-buff.png new file mode 100644 index 0000000..d7c7f8b Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/new-buff.png differ diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/points.png b/assets/resource_picli/base/image/research and lenrning gold and silver/points.png new file mode 100644 index 0000000..19a2053 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/points.png differ diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/rest-2.png b/assets/resource_picli/base/image/research and lenrning gold and silver/rest-2.png new file mode 100644 index 0000000..fcd43b7 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/rest-2.png differ diff --git a/assets/resource_picli/base/image/research and lenrning gold and silver/stop.png b/assets/resource_picli/base/image/research and lenrning gold and silver/stop.png new file mode 100644 index 0000000..ff17c75 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning gold and silver/stop.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/Confirm.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/Confirm.png new file mode 100644 index 0000000..bccc488 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/Confirm.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/Negative-status.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/Negative-status.png new file mode 100644 index 0000000..50486d9 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/Negative-status.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/Positive-Combat-status.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/Positive-Combat-status.png new file mode 100644 index 0000000..923bf8a Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/Positive-Combat-status.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/check-mark.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/check-mark.png new file mode 100644 index 0000000..ffdc57f Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/check-mark.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/continue.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/continue.png new file mode 100644 index 0000000..6bbd48f Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/continue.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/downlevel.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/downlevel.png new file mode 100644 index 0000000..754db58 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/downlevel.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/evaluation.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/evaluation.png new file mode 100644 index 0000000..179940b Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/evaluation.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/get-new-fight-status.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/get-new-fight-status.png new file mode 100644 index 0000000..c630814 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/get-new-fight-status.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/get-one-Positive-status.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/get-one-Positive-status.png new file mode 100644 index 0000000..1f515be Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/get-one-Positive-status.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/jijinghui.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/jijinghui.png new file mode 100644 index 0000000..5d0e7fb Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/jijinghui.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/prepare.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/prepare.png new file mode 100644 index 0000000..7d97ce4 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/prepare.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/sasuga.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/sasuga.png new file mode 100644 index 0000000..c6c287a Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/sasuga.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/shijian.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/shijian.png new file mode 100644 index 0000000..5aea155 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/shijian.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/start.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/start.png new file mode 100644 index 0000000..b1fe3d7 Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/start.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/uplevel.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/uplevel.png new file mode 100644 index 0000000..00499eb Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/uplevel.png differ diff --git a/assets/resource_picli/base/image/research and lenrning mountains and rivers/xuanze.png b/assets/resource_picli/base/image/research and lenrning mountains and rivers/xuanze.png new file mode 100644 index 0000000..6fa49eb Binary files /dev/null and b/assets/resource_picli/base/image/research and lenrning mountains and rivers/xuanze.png differ diff --git a/assets/resource_picli/base/pipeline/11-research and lenrning gold and silver repeat.json b/assets/resource_picli/base/pipeline/11-research and lenrning gold and silver repeat.json new file mode 100644 index 0000000..6559a59 --- /dev/null +++ b/assets/resource_picli/base/pipeline/11-research and lenrning gold and silver repeat.json @@ -0,0 +1,448 @@ +{ + "repeat Bonecarve gold and silver first Level": { + "recognition": "OCR", + "expected": [ + "骨刻" + ], + "action": "Click", + "post_delay": 2000, + "next": "choose-difficulty" + }, + "choose-difficulty": { + "action": "Click", + "target": [ + 357, + 376, + 0, + 0 + ], + "next": [ + "rlgr-choose-role" + ] + }, + "rlgr-choose-role": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/choose_role.png", + "action": "Click", + "next": [ + "rlgr-change-tag-Assassin" + ] + }, + "rlgr-change-tag-Assassin": { + "recognition": "TemplateMatch", + "template": "Research2/filter.png", + "roi": [ + 1197, + 10, + 61, + 42 + ], + "action": "Click", + "next": [ + "rlgr-choose-tag-Assassin" + ] + }, + "rlgr-choose-tag-Assassin": { + "recognition": "OCR", + "expected": "轻锐", + "roi": [ + 469, + 207, + 501, + 60 + ], + "action": "Click", + "next": [ + "rlgr-ensure-tag" + ] + }, + "rlgr-ensure-tag": { + "recognition": "OCR", + "expected": "确定", + "action": "Click", + "next": [ + "rlgr-find-shangyang" + ], + "interrupt": [ + "rlgr-swipe-page" + ] + }, + "rlgr-swipe-page": { + "action": "Swipe", + "begin": [ + 780, + 362, + 0, + 0 + ], + "end": [ + 475, + 362, + 0, + 0 + ], + "duration": 1000, + "post_delay": 500 + }, + "rlgr-find-shangyang": { + "recognition": "OCR", + "expected": "商鞅方升", + "action": "Click", + "post_delay": 1000, + "next": [ + "rlgr-change-tag" + ] + }, + "rlgr-change-tag": { + "recognition": "TemplateMatch", + "template": "Research2/filter.png", + "roi": [ + 1197, + 10, + 61, + 42 + ], + "post_delay": 1000, + "action": "Click", + "next": [ + "rlgr-choose-tag-2" + ] + }, + "rlgr-choose-tag-2": { + "recognition": "OCR", + "expected": "全部", + "roi": [ + 469, + 207, + 501, + 60 + ], + "post_delay": 1000, + "action": "Click", + "next": [ + "rlgr-ensure-tag-1" + ] + }, + "rlgr-ensure-tag-1": { + "recognition": "OCR", + "expected": "确定", + "action": "Click", + "next": [ + "rlgr-choose-role-1" + ] + }, + "rlgr-choose-role-1": { + "action": "Click", + "target": [ + 554, + 511, + 1, + 1 + ], + "post_delay": 1000, + "next": "rlgr-choose-role-2" + }, + "rlgr-choose-role-2": { + "action": "Click", + "target": [ + 693, + 191, + 1, + 1 + ], + "post_delay": 1000, + "next": "rlgr-choose-role-3" + }, + "rlgr-choose-role-3": { + "action": "Click", + "target": [ + 699, + 516, + 1, + 1 + ], + "post_delay": 1000, + "next": [ + "rlgr-checkmark-1" + ] + }, + "rlgr-checkmark-1": { + "recognition": "TemplateMatch", + "template": "Research2/ensure_1.png", + "roi": [ + 1167, + 672, + 54, + 36 + ], + "post_delay": 1000, + "action": "Click", + "next": [ + "rlgr-choose-strategy" + ] + }, + "rlgr-choose-strategy": { + "recognition": "OCR", + "expected": "辅助效果", + "action": "Click", + "post_delay": 1000, + "next": [ + "rlgr-start-research" + ] + }, + "rlgr-start-research": { + "recognition": "OCR", + "expected": "进入研学", + "action": "Click", + "post_delay": 10000, + "next": [ + "rlgr-recognition" + ] + }, + "rlgr-recognition": { + "recognition": "TemplateMatch", + "template": [ + "research and lenrning gold and silver/rest-2.png" + ], + "green_mask": true, + "post_wait_freezes": 500, + "index": -1, + "action": "Click", + "next": [ + "rlgr-action", + "rlgr-recognition" + ] + }, + "rlgr-action": { + "next": [ + "rlgr-action-rest", + "rlgr-action-fight", + "rlgr-recognition" + ] + }, + "rlgr-action-rest": { + "recognition": "OCR", + "expected": "休息", + "roi": [ + 872, + 490, + 351, + 55 + ], + "post_wait_freezes": 500, + "action": "Click", + "next": [ + "rlgr-rest-sure" + ] + }, + "rlgr-rest-sure": { + "recognition": "OCR", + "expected": "确认", + "post_wait_freezes": 500, + "action": "Click", + "next": [ + "rlgr-recognition" + ] + }, + "rlgr-action-fight": { + "recognition": "OCR", + "expected": "战斗", + "roi": [ + 858, + 474, + 389, + 80 + ], + "action": "Click", + "post_wait_freezes": 500, + "next": [ + "rlgr-fight-begin", + "rlgr-recognition" + ] + }, + "rlgr-fight-begin": { + "recognition": "OCR", + "expected": "开始", + "roi": [ + 1030, + 617, + 200, + 74 + ], + "action": "Click", + "next": [ + "rlgr-not-full", + "rlgr-auto", + "rlgr-fight-begin-2", + "rlgr-fight-begin" + ] + }, + "rlgr-not-full": { + "pre_delay": 500, + "recognition": "TemplateMatch", + "template": "Research2\\ensure_2.png", + "roi": [ + 686, + 396, + 169, + 62 + ], + "action": "Click", + "next": [ + "rlgr-auto", + "rlgr-fight-begin-2", + "rlgr-fight-begin" + ] + }, + "rlgr-auto": { + "recognition": "TemplateMatch", + "template": "Research2\\auto.png", + "roi": [ + 1196, + 123, + 78, + 67 + ], + "action": "Click", + "post_wait_freezes": 500, + "next": [ + "rlgr-fight-begin-2", + "rlgr-fight-begin" + ] + }, + "rlgr-fight-begin-2": { + "recognition": "TemplateMatch", + "template": "Research2\\begin_fight.png", + "roi": [ + 1012, + 621, + 268, + 99 + ], + "action": "Click", + "next": [ + "rlgr-sure-fightwait", + "rlgr-fight-begin-2" + ] + }, + "rlgr-sure-fightwait": { + "next": [ + "rlgr-sure-fightwait-1" + ], + "interrupt": [ + "rlgr-auto-fightwait" + ] + }, + "rlgr-auto-fightwait": { + "pre_delay": 10000, + "recognition": "TemplateMatch", + "template": "research and lenrning gold and silver\\stop.png", + "action": "DoNothing" + }, + "rlgr-sure-fightwait-1": { + "pre_delay": 10000, + "recognition": "OCR", + "expected": "确定", + "roi": [ + 913, + 626, + 125, + 53 + ], + "action": "Click", + "post_wait_freezes": 5000, + "next": [ + "rlgr-buff-recognition-afterfight", + "rlgr-sure-fightwait-1" + ] + }, + "rlgr-buff-recognition-afterfight": { + "recognition": "TemplateMatch", + "template": "research and lenrning gold and silver\\new-buff.png", + "pre_wait_freezes": 300, + "next": [ + "rlgr-buff-afterfight-click-mid" + ] + }, + "rlgr-buff-sure-afterfight": { + "recognition": "OCR", + "expected": "确认", + "roi": [ + 782, + 619, + 233, + 53 + ], + "action": "Click", + "post_wait_freezes": 1000, + "next": [ + "rlgr-buff-recognition-afterfight", + "rlgr-quit" + ] + }, + "rlgr-buff-afterfight-click-mid": { + "action": "Click", + "target": [ + 620, + 340, + 0, + 0 + ], + "next": [ + "rlgr-buff-sure-afterfight" + ] + }, + "rlgr-quit": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/quit.png", + "action": "Click", + "next": [ + "rlgr-sure-quit" + ] + }, + "rlgr-sure-quit": { + "recognition": "TemplateMatch", + "template": "research and lenrning gold and silver/08.png", + "action": "Click", + "next": [ + "rlgr-finish-research" + ] + }, + "rlgr-finish-research": { + "pre_wait_freezes": 2000, + "recognition": "OCR", + "expected": "结束", + "roi": [ + 1021, + 565, + 246, + 88 + ], + "action": "Click", + "next": [ + "rlgr-returntodesktop-1" + ] + }, + "rlgr-returntodesktop-1": { + "next": [ + "rlgr-returntodesktop" + ] + }, + "rlgr-returntodesktop": { + "recognition": "TemplateMatch", + "template": "Collect/06.png", + "action": "Click", + "post_delay": 2000, + "next": [ + "rlgr-desktop", + "rlgr-returntodesktop" + ] + }, + "rlgr-desktop": { + "recognition": "OCR", + "expected": "等级", + "action": "DoNothing" + } +} \ No newline at end of file diff --git a/assets/resource_picli/base/pipeline/11-research and lenrning.json b/assets/resource_picli/base/pipeline/11-research and lenrning.json new file mode 100644 index 0000000..7501383 --- /dev/null +++ b/assets/resource_picli/base/pipeline/11-research and lenrning.json @@ -0,0 +1,91 @@ +{ + "Research and learning": { + "post_delay": 5000, + "next": [ + "enter research and learning", + "return-todesktop" + ] + }, + "return-todesktop": { + "recognition": "TemplateMatch", + "template": "Collect/06.png", + "action": "Click", + "post_delay": 2000, + "next": [ + "enter research and learning", + "return-todesktop" + ] + }, + "enter research and learning": { + "recognition": "OCR", + "expected": [ + "博物", + "研学" + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "close-Weekly-rewards", + "Theme-selection" + ] + }, + "close-Weekly-rewards": { + "recognition": "TemplateMatch", + "template": "research and lenrning gold and silver/points.png", + "action": "Click", + "post_delay": 2000, + "next": [ + "Theme-selection" + ] + }, + "Theme-selection": { + "next": [ + "mountains and rivers Theme selection", + "gold and silver Theme selection" + ] + }, + "mountains and rivers Theme selection": { + "recognition": "OCR", + "expected": [ + "山水画境" + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "enter Theme mountains and rivers" + ] + }, + "gold and silver Theme selection": { + "recognition": "OCR", + "expected": [ + "金银纪行" + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "enter Theme gold and silver" + ] + }, + "enter Theme gold and silver": { + "recognition": "OCR", + "expected": [ + "进入主题" + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "set-out-Theme-select gold and silver" + ] + }, + "enter Theme mountains and rivers": { + "recognition": "OCR", + "expected": [ + "进入主题" + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "set-out-Theme-select mountains and rivers" + ] + } +} \ No newline at end of file diff --git a/assets/resource_picli/base/pipeline/11_research and lenrning gold and silver.json b/assets/resource_picli/base/pipeline/11_research and lenrning gold and silver.json new file mode 100644 index 0000000..bd8aa11 --- /dev/null +++ b/assets/resource_picli/base/pipeline/11_research and lenrning gold and silver.json @@ -0,0 +1,218 @@ +{ + "set-out-Theme-select gold and silver": { + "recognition": "OCR", + "expected": [ + "研学启程", + "继续研学" + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "choose-boss", + "rlgr-recognition" + ] + }, + "choose-boss": { + "next": [ + "Bonecarve", + "nightmare", + "firechild", + "repeat Bonecarve gold and silver first Level" + ] + }, + "Bonecarve": { + "recognition": "OCR", + "expected": [ + "骨刻" + ], + "action": "Click", + "post_delay": 2000, + "next": "choose-difficulty" + }, + "nightmare": { + "recognition": "OCR", + "expected": [ + "猼訑" + ], + "action": "Click", + "post_delay": 2000, + "next": "choose-role" + }, + "firechild": { + "recognition": "OCR", + "expected": [ + "火婴" + ], + "action": "Click", + "post_delay": 2000, + "next": "choose-role" + }, + "choose-role": { + "pre_wait_freezes": 500, + "recognition": "TemplateMatch", + "template": "Research2/choose_role.png", + "action": "Click", + "next": [ + "change-tag-Assassin" + ] + }, + "change-tag-Assassin": { + "recognition": "TemplateMatch", + "template": "Research2/filter.png", + "roi": [ + 1197, + 10, + 61, + 42 + ], + "action": "Click", + "next": [ + "choose-tag-Assassin" + ] + }, + "choose-tag-Assassin": { + "recognition": "OCR", + "expected": "轻锐", + "roi": [ + 469, + 207, + 501, + 60 + ], + "action": "Click", + "next": [ + "ensure-tag" + ] + }, + "ensure-tag": { + "recognition": "OCR", + "expected": "确定", + "action": "Click", + "next": [ + "find-shangyang" + ], + "interrupt": [ + "swipe-page" + ] + }, + "swipe-page": { + "action": "Swipe", + "begin": [ + 780, + 362, + 0, + 0 + ], + "end": [ + 475, + 362, + 0, + 0 + ], + "duration": 1000, + "post_delay": 500 + }, + "find-shangyang": { + "recognition": "OCR", + "expected": "商鞅方升", + "action": "Click", + "next": [ + "change_tag" + ] + }, + "change-tag": { + "recognition": "TemplateMatch", + "template": "Research2/filter.png", + "roi": [ + 1197, + 10, + 61, + 42 + ], + "action": "Click", + "next": [ + "choose-tag-2" + ] + }, + "choose-tag-2": { + "recognition": "OCR", + "expected": "全部", + "roi": [ + 469, + 207, + 501, + 60 + ], + "action": "Click", + "next": [ + "ensure-tag-1" + ] + }, + "ensure-tag-1": { + "recognition": "OCR", + "expected": "确定", + "action": "Click", + "next": [ + "choose-role-1" + ] + }, + "choose-role-1": { + "action": "Click", + "target": [ + 554, + 511, + 1, + 1 + ], + "next": "choose-role-2" + }, + "choose-role-2": { + "action": "Click", + "target": [ + 693, + 191, + 1, + 1 + ], + "next": "choose-role-3" + }, + "choose-role-3": { + "action": "Click", + "target": [ + 699, + 516, + 1, + 1 + ], + "next": "ensure-1" + }, + "ensure-1": { + "recognition": "TemplateMatch", + "template": "Research2/ensure_1.png", + "roi": [ + 1167, + 672, + 54, + 36 + ], + "action": "Click", + "next": [ + "choose-strategy" + ] + }, + "choose-strategy": { + "recognition": "OCR", + "expected": "辅助效果", + "action": "Click", + "next": [ + "start-research" + ] + }, + "start-research": { + "recognition": "OCR", + "expected": "进入研学", + "action": "Click", + "post_delay": 20000, + "next": [] + } +} \ No newline at end of file diff --git a/assets/resource_picli/base/pipeline/11_research and lenrning mountains and rivers repeat.json b/assets/resource_picli/base/pipeline/11_research and lenrning mountains and rivers repeat.json new file mode 100644 index 0000000..4266bd9 --- /dev/null +++ b/assets/resource_picli/base/pipeline/11_research and lenrning mountains and rivers repeat.json @@ -0,0 +1,460 @@ +{ + "repeat mountain and river snow-scape first Level": { + "recognition": "OCR", + "expected": [ + "开始研学" + ], + "roi": [ + 104, + 522, + 283, + 55 + ], + "action": "Click", + "post_delay": 5000, + "next": "rlmr-choose-firstbuff" + }, + "rlmr-choose-firstbuff": { + "action": "Click", + "target": [ + 637, + 274, + 0, + 0 + ], + "post_delay": 2000, + "next": "rlmr-sure" + }, + "rlmr-sure": { + "recognition": "OCR", + "expected": [ + "确认" + ], + "action": "Click", + "post_delay": 2000, + "next": "rlmr-glade-click" + }, + "rlmr-glade-click": { + "action": "Click", + "target": [ + 625, + 616, + 0, + 0 + ], + "next": "Exhaustive-clicks-1" + }, + "Exhaustive-clicks": { + "next": [ + "Exhaustive-clicks-1", + "Exhaustive-clicks-2", + "Exhaustive-clicks-3", + "Exhaustive-clicks-4", + "Exhaustive-clicks-5" + ] + }, + "Exhaustive-clicks-1": { + "action": "Click", + "target": [ + 424, + 471, + 0, + 0 + ], + "post_delay": 2000, + "next": [ + "rlmr-head-for", + "Exhaustive-clicks-2", + "Exhaustive-clicks-3", + "Exhaustive-clicks-4", + "Exhaustive-clicks-5", + "Exhaustive-clicks-6" + ] + }, + "Exhaustive-clicks-2": { + "action": "Click", + "target": [ + 649, + 444, + 0, + 0 + ], + "post_delay": 2000, + "next": [ + "rlmr-head-for", + "Exhaustive-clicks-3", + "Exhaustive-clicks-4", + "Exhaustive-clicks-5" + ] + }, + "Exhaustive-clicks-3": { + "action": "Click", + "target": [ + 669, + 453, + 0, + 0 + ], + "post_delay": 2000, + "next": [ + "rlmr-head-for", + "Exhaustive-clicks-4", + "Exhaustive-clicks-5" + ] + }, + "Exhaustive-clicks-4": { + "action": "Click", + "target": [ + 723, + 605, + 0, + 0 + ], + "post_delay": 2000, + "next": [ + "rlmr-head-for", + "Exhaustive-clicks-5" + ] + }, + "Exhaustive-clicks-5": { + "action": "Click", + "target": [ + 843, + 394, + 0, + 0 + ], + "post_delay": 2000, + "next": "rlmr-head-for" + }, + "Exhaustive-clicks-6": { + "action": "Click", + "target": [ + 418, + 550, + 0, + 0 + ], + "post_delay": 2000, + "next": "rlmr-head-for" + }, + "rlmr-head-for": { + "recognition": "OCR", + "expected": [ + "前往" + ], + "action": "Click", + "next": "rlmr-head-for-2" + }, + "rlmr-head-for-2": { + "next": [ + "rlmr-foundation", + "rlmr-sasuga", + "rlmr-keyword", + "rlmr-down-grade", + "rlmr-up-grade", + "rlmr-Pre-war-assessment", + "rlmr-continue" + ] + }, + "rlmr-foundation": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/jijinghui.png", + "action": "Click", + "target": [ + 728, + 409, + 0, + 0 + ], + "post_delay": 4000, + "next": "rlmr-head-for-2" + }, + "rlmr-sasuga": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/sasuga.png", + "action": "Click", + "post_delay": 4000, + "next": "rlmr-head-for-2" + }, + "rlmr-keyword": { + "recognition": "TemplateMatch", + "template": "Research/15.png", + "action": "Click", + "post_delay": 2000, + "next": "rlmr-head-for-2" + }, + "rlmr-up-grade": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/uplevel.png", + "post_delay": 1000, + "next": "grade-click" + }, + "rlmr-down-grade": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/downlevel.png", + "post_delay": 1000, + "next": "grade-click" + }, + "grade-click": { + "next": "grade-click-1" + }, + "grade-click-1": { + "action": "Click", + "target": [ + 265, + 314, + 0, + 0 + ], + "post_delay": 1000, + "next": "rlmr-choose-click-1" + }, + "rlmr-choose-click-1": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/xuanze.png", + "action": "Click", + "post_delay": 1000, + "next": [ + "rlmr-Was-the-upgrade-successful-1", + "Exhaustive-clicks" + ] + }, + "rlmr-Was-the-upgrade-successful-1": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/xuanze.png", + "next": "grade-click-2" + }, + "grade-click-2": { + "action": "Click", + "target": [ + 212, + 402, + 0, + 0 + ], + "post_delay": 1000, + "next": "rlmr-choose-click-2" + }, + "rlmr-choose-click-2": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/xuanze.png", + "action": "Click", + "post_delay": 2000, + "next": [ + "rlmr-Was-the-upgrade-successful-2", + "Exhaustive-clicks" + ] + }, + "rlmr-Was-the-upgrade-successful-2": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/xuanze.png", + "next": "grade-click-3" + }, + "grade-click-3": { + "action": "Click", + "target": [ + 319, + 394, + 0, + 0 + ], + "post_delay": 2000, + "next": "rlmr-choose-click-3" + }, + "rlmr-choose-click-3": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/xuanze.png", + "action": "Click", + "post_delay": 2000, + "next": [ + "rlmr-Was-the-upgrade-successful-3", + "Exhaustive-clicks" + ] + }, + "rlmr-Was-the-upgrade-successful-3": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/xuanze.png", + "next": "grade-click-4" + }, + "grade-click-4": { + "action": "Click", + "target": [ + 600, + 320, + 0, + 0 + ], + "post_delay": 2000, + "next": "rlmr-choose-click-4" + }, + "rlmr-choose-click-4": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/xuanze.png", + "action": "Click", + "post_delay": 2000, + "next": [ + "rlmr-Was-the-upgrade-successful-4", + "Exhaustive-clicks" + ] + }, + "rlmr-Was-the-upgrade-successful-4": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/xuanze.png", + "next": "grade-click-5" + }, + "grade-click-5": { + "action": "Click", + "target": [ + 550, + 400, + 0, + 0 + ], + "post_delay": 2000, + "next": "rlmr-choose-click-5" + }, + "rlmr-choose-click-5": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/xuanze.png", + "action": "Click", + "post_delay": 2000, + "next": [ + "rlmr-Was-the-upgrade-successful-5", + "Exhaustive-clicks" + ] + }, + "rlmr-Was-the-upgrade-successful-5": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/xuanze.png", + "next": "grade-click-6" + }, + "grade-click-6": { + "action": "Click", + "target": [ + 650, + 400, + 0, + 0 + ], + "post_delay": 2000, + "next": "rlmr-choose-click-6" + }, + "rlmr-choose-click-6": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/xuanze.png", + "action": "Click", + "post_delay": 2000, + "next": [ + "Exhaustive-clicks" + ] + }, + "rlmr-Pre-war-assessment": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/evaluation.png", + "pre_delay": 4000, + "action": "Click", + "next": [ + "get-two-Positive-status", + "Negative-status", + "get-one-Positive-status" + ] + }, + "Negative-status": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/Negative-status.png", + "pre_delay": 4000, + "action": "Click", + "next": [ + "rlmr-prepare" + ] + }, + "get-one-Positive-status": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/get-one-Positive-status.png", + "pre_delay": 4000, + "action": "Click", + "next": [ + "rlmr-prepare" + ] + }, + "get-two-Positive-status": { + "recognition": "OCR", + "expected": "选择两个正向战斗状态", + "action": "Click", + "target": [ + 377, + 332, + 0, + 0 + ], + "post_delay": 1000, + "next": "Select-the-battle-status-Click-1" + }, + "Select-the-battle-status-Click-1": { + "action": "Click", + "target": [ + 639, + 342, + 0, + 0 + ], + "post_delay": 1000, + "next": "Select-the-battle-status-Click-sure" + }, + "Select-the-battle-status-Click-sure": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/Confirm.png", + "action": "Click", + "post_delay": 1000, + "next": "Select-the-battle-status-get" + }, + "Select-the-battle-status-get": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/get-new-fight-status.png", + "action": "Click", + "post_delay": 1000, + "next": "rlmr-prepare" + }, + "rlmr-prepare": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/prepare.png", + "action": "Click", + "post_delay": 1000, + "next": "check-mark" + }, + "check-mark": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/check-mark.png", + "action": "Click", + "post_delay": 1000, + "next": "rlmr-down-grade" + }, + "rlmr-continue": { + "recognition": "TemplateMatch", + "template": "research and lenrning mountains and rivers/continue.png", + "action": "Click", + "post_delay": 1000, + "next": "rlmr-returntodesktop-1" + }, + "rlmr-returntodesktop-1": { + "next": [ + "rlmr-returntodesktop" + ] + }, + "rlmr-returntodesktop": { + "recognition": "TemplateMatch", + "template": "Collect/06.png", + "action": "Click", + "post_delay": 1000, + "next": [ + "rlmr-desktop", + "rlmr-returntodesktop" + ] + }, + "rlmr-desktop": { + "recognition": "OCR", + "expected": "等级", + "action": "DoNothing" + } +} \ No newline at end of file diff --git a/assets/resource_picli/base/pipeline/11_research and lenrning mountains and rivers.json b/assets/resource_picli/base/pipeline/11_research and lenrning mountains and rivers.json new file mode 100644 index 0000000..6248f75 --- /dev/null +++ b/assets/resource_picli/base/pipeline/11_research and lenrning mountains and rivers.json @@ -0,0 +1,66 @@ +{ + "set-out-Theme-select mountains and rivers": { + "recognition": "OCR", + "expected": [ + "研学启程" + ], + "action": "Click", + "post_delay": 2000, + "next": [ + "choose-direction" + ] + }, + "choose-direction": { + "next": [ + "repeat mountain and river snow-scape first Level", + "snow-scape", + "river-mountain", + "creek-mountain" + ] + }, + "snow-scape": { + "recognition": "OCR", + "expected": [ + "开始研学" + ], + "roi": [ + 104, + 522, + 283, + 55 + ], + "action": "Click", + "post_delay": 2000, + "next": "choose-role" + }, + "river-mountain": { + "recognition": "OCR", + "expected": [ + "开始研学" + ], + "roi": [ + 499, + 519, + 285, + 60 + ], + "action": "Click", + "post_delay": 2000, + "next": "choose-role" + }, + "creek-mountain": { + "recognition": "OCR", + "expected": [ + "开始研学" + ], + "roi": [ + 882, + 520, + 285, + 60 + ], + "action": "Click", + "post_delay": 2000, + "next": "choose-role" + } +} \ No newline at end of file diff --git a/res.zip b/res.zip index 464d02d..d519b26 100644 Binary files a/res.zip and b/res.zip differ diff --git a/version.txt b/version.txt index 27b4d6e..fefb598 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -287 \ No newline at end of file +284 \ No newline at end of file