From b70d6b6b7ff153a7e77752cbc8d457440ccf5911 Mon Sep 17 00:00:00 2001 From: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com> Date: Thu, 20 Nov 2025 21:34:02 +0800 Subject: [PATCH] =?UTF-8?q?rft:=20=E6=8B=86=E5=88=86=E5=A4=9A=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E8=AF=86=E5=88=AB=E4=BB=BB=E5=8A=A1=20(#14774)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: DavidWang19 --- resource/tasks/RA/base.json | 27 +- resource/tasks/Roguelike/base.json | 26 +- resource/tasks/UiTheme/Depot.json | 79 +++++ resource/tasks/UiTheme/Friends.json | 80 +++++ resource/tasks/UiTheme/Gacha.json | 79 +++++ resource/tasks/UiTheme/Infrast.json | 80 +++++ resource/tasks/UiTheme/Mall.json | 80 +++++ resource/tasks/UiTheme/OperBox.json | 79 +++++ resource/tasks/UiTheme/Recruit.json | 79 +++++ resource/tasks/UiTheme/Task.json | 81 +++++ resource/tasks/UiTheme/Terminal.json | 81 +++++ resource/tasks/tasks.json | 488 ++++----------------------- 12 files changed, 796 insertions(+), 463 deletions(-) create mode 100644 resource/tasks/UiTheme/Depot.json create mode 100644 resource/tasks/UiTheme/Friends.json create mode 100644 resource/tasks/UiTheme/Gacha.json create mode 100644 resource/tasks/UiTheme/Infrast.json create mode 100644 resource/tasks/UiTheme/Mall.json create mode 100644 resource/tasks/UiTheme/OperBox.json create mode 100644 resource/tasks/UiTheme/Recruit.json create mode 100644 resource/tasks/UiTheme/Task.json create mode 100644 resource/tasks/UiTheme/Terminal.json diff --git a/resource/tasks/RA/base.json b/resource/tasks/RA/base.json index 6b8898c225..5dbf7be8c1 100644 --- a/resource/tasks/RA/base.json +++ b/resource/tasks/RA/base.json @@ -20,33 +20,16 @@ "next": ["RA@Navigation-FromMainInterface", "RA@Navigation@CloseAnnos#next"] }, "RA@Navigation-FromMainInterface": { - "doc": "模版任务: 从主界面导航到对应的生息演算主题", - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], - "maskRange": [1, 255], - "action": "ClickSelf", - "roi": [844, 58, 268, 272], + "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["Terminal-Entry"], "next": [ "RA@Navigation-FromTodoList", "RA@Navigation-LongTermExploration", "RA@Navigation-FromMainInterface", "RA@Navigation@ReturnButtons#next" - ], - "postDelay": 3000 + ] }, "RA@Navigation-LongTermExploration": { "doc": "在 <终端> 下方导航条点击 <长期探索> 图标, 此处引用 <集成战略> 相关任务作为 baseTask", diff --git a/resource/tasks/Roguelike/base.json b/resource/tasks/Roguelike/base.json index e73c7361b4..93d8d90969 100644 --- a/resource/tasks/Roguelike/base.json +++ b/resource/tasks/Roguelike/base.json @@ -1,32 +1,16 @@ { "Roguelike": { - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], - "maskRange": [1, 255], - "action": "ClickSelf", - "roi": [844, 58, 268, 272], + "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["Terminal-Entry"], "next": [ "Roguelike", "Roguelike@CloseAnnos#next", "Roguelike@TodoEnter", "Roguelike@IntegratedStrategies", "Roguelike@ReturnButtons#next" - ], - "postDelay": 3000 + ] }, "RoguelikeBattleAbandon": { "action": "ClickSelf", diff --git a/resource/tasks/UiTheme/Depot.json b/resource/tasks/UiTheme/Depot.json new file mode 100644 index 0000000000..77bbbb6622 --- /dev/null +++ b/resource/tasks/UiTheme/Depot.json @@ -0,0 +1,79 @@ +{ + "Depot-Entry": { + "algorithm": "JustReturn", + "action": "DoNothing", + "crop_doc": { + "roi": [1153, 606, 77, 79], + "mask": [] + }, + "next": [ + "DepotDefault", + "DepotDark", + "DepotSami", + "DepotMistCity", + "DepotSiege", + "DepotSarkaz", + "DepotDelicious", + "DepotGaming", + "DepotDahuangCity", + "DepotDreamland", + "DepotJieGarden", + "DepotAveMujica", + "DepotTogether" + ] + }, + "DepotDefault": { + "action": "ClickSelf", + "maskRange": [1, 255], + "roi": [1109, 560, 171, 160], + "template": "Default/DepotEnter.png" + }, + "DepotDark": { + "baseTask": "DepotDefault", + "template": "Dark/DepotEnter.png" + }, + "DepotSami": { + "baseTask": "DepotDefault", + "template": "Sami/DepotEnter.png" + }, + "DepotMistCity": { + "baseTask": "DepotDefault", + "template": "MistCity/DepotEnter.png" + }, + "DepotSiege": { + "baseTask": "DepotDefault", + "template": "Siege/DepotEnter.png" + }, + "DepotSarkaz": { + "baseTask": "DepotDefault", + "template": "Sarkaz/DepotEnter.png" + }, + "DepotDelicious": { + "baseTask": "DepotDefault", + "template": "Delicious/DepotEnter.png" + }, + "DepotGaming": { + "baseTask": "DepotDefault", + "template": "Gaming/DepotEnter.png" + }, + "DepotDahuangCity": { + "baseTask": "DepotDefault", + "template": "DahuangCity/DepotEnter.png" + }, + "DepotDreamland": { + "baseTask": "DepotDefault", + "template": ["Dreamland/DreamlandDefault/DepotEnter.png", "Dreamland/DreamlandDark/DepotEnter.png"] + }, + "DepotJieGarden": { + "baseTask": "DepotDefault", + "template": "JieGarden/DepotEnter.png" + }, + "DepotAveMujica": { + "baseTask": "DepotDefault", + "template": "AveMujica/DepotEnter.png" + }, + "DepotTogether": { + "baseTask": "DepotDefault", + "template": "Together/DepotEnter.png" + } +} diff --git a/resource/tasks/UiTheme/Friends.json b/resource/tasks/UiTheme/Friends.json new file mode 100644 index 0000000000..a99e2cd43f --- /dev/null +++ b/resource/tasks/UiTheme/Friends.json @@ -0,0 +1,80 @@ +{ + "Friends-Entry": { + "algorithm": "JustReturn", + "action": "DoNothing", + "crop_doc": { + "roi": [300, 550, 128, 41], + "mask": [] + }, + "next": [ + "FriendsDefault", + "FriendsDark", + "FriendsSami", + "FriendsMistCity", + "FriendsSiege", + "FriendsSarkaz", + "FriendsDelicious", + "FriendsGaming", + "FriendsDahuangCity", + "FriendsDreamland", + "FriendsJieGarden", + "FriendsAveMujica", + "FriendsTogether" + ] + }, + "FriendsDefault": { + "action": "ClickSelf", + "maskRange": [1, 255], + "roi": [250, 500, 200, 200], + "templThreshold": 0.7, + "template": "Default/Friends.png" + }, + "FriendsDark": { + "baseTask": "FriendsDefault", + "template": "Dark/Friends.png" + }, + "FriendsSami": { + "baseTask": "FriendsDefault", + "template": "Sami/Friends.png" + }, + "FriendsMistCity": { + "baseTask": "FriendsDefault", + "template": "MistCity/Friends.png" + }, + "FriendsSiege": { + "baseTask": "FriendsDefault", + "template": "Siege/Friends.png" + }, + "FriendsSarkaz": { + "baseTask": "FriendsDefault", + "template": "Sarkaz/Friends.png" + }, + "FriendsDelicious": { + "baseTask": "FriendsDefault", + "template": "Delicious/Friends.png" + }, + "FriendsGaming": { + "baseTask": "FriendsDefault", + "template": "Gaming/Friends.png" + }, + "FriendsDahuangCity": { + "baseTask": "FriendsDefault", + "template": "DahuangCity/Friends.png" + }, + "FriendsDreamland": { + "baseTask": "FriendsDefault", + "template": ["Dreamland/DreamlandDefault/Friends.png", "Dreamland/DreamlandDark/Friends.png"] + }, + "FriendsJieGarden": { + "baseTask": "FriendsDefault", + "template": "JieGarden/Friends.png" + }, + "FriendsAveMujica": { + "baseTask": "FriendsDefault", + "template": "AveMujica/Friends.png" + }, + "FriendsTogether": { + "baseTask": "FriendsDefault", + "template": "Together/Friends.png" + } +} diff --git a/resource/tasks/UiTheme/Gacha.json b/resource/tasks/UiTheme/Gacha.json new file mode 100644 index 0000000000..50eb926833 --- /dev/null +++ b/resource/tasks/UiTheme/Gacha.json @@ -0,0 +1,79 @@ +{ + "Gacha-Entry": { + "algorithm": "JustReturn", + "action": "DoNothing", + "crop_doc": { + "roi": [1095, 497, 167, 56], + "mask": [] + }, + "next": [ + "GachaDefault", + "GachaDark", + "GachaSami", + "GachaMistCity", + "GachaSiege", + "GachaSarkaz", + "GachaDelicious", + "GachaGaming", + "GachaDahuangCity", + "GachaDreamland", + "GachaJieGarden", + "GachaAveMujica", + "GachaTogether" + ] + }, + "GachaDefault": { + "action": "ClickSelf", + "maskRange": [1, 255], + "roi": [1052, 426, 228, 174], + "template": "Default/GachaEnter.png" + }, + "GachaDark": { + "baseTask": "GachaDefault", + "template": "Dark/GachaEnter.png" + }, + "GachaSami": { + "baseTask": "GachaDefault", + "template": "Sami/GachaEnter.png" + }, + "GachaMistCity": { + "baseTask": "GachaDefault", + "template": "MistCity/GachaEnter.png" + }, + "GachaSiege": { + "baseTask": "GachaDefault", + "template": "Siege/GachaEnter.png" + }, + "GachaSarkaz": { + "baseTask": "GachaDefault", + "template": "Sarkaz/GachaEnter.png" + }, + "GachaDelicious": { + "baseTask": "GachaDefault", + "template": "Delicious/GachaEnter.png" + }, + "GachaGaming": { + "baseTask": "GachaDefault", + "template": "Gaming/GachaEnter.png" + }, + "GachaDahuangCity": { + "baseTask": "GachaDefault", + "template": "DahuangCity/GachaEnter.png" + }, + "GachaDreamland": { + "baseTask": "GachaDefault", + "template": ["Dreamland/DreamlandDefault/GachaEnter.png", "Dreamland/DreamlandDark/GachaEnter.png"] + }, + "GachaJieGarden": { + "baseTask": "GachaDefault", + "template": "JieGarden/GachaEnter.png" + }, + "GachaAveMujica": { + "baseTask": "GachaDefault", + "template": "AveMujica/GachaEnter.png" + }, + "GachaTogether": { + "baseTask": "GachaDefault", + "template": "Together/GachaEnter.png" + } +} diff --git a/resource/tasks/UiTheme/Infrast.json b/resource/tasks/UiTheme/Infrast.json new file mode 100644 index 0000000000..caf805e717 --- /dev/null +++ b/resource/tasks/UiTheme/Infrast.json @@ -0,0 +1,80 @@ +{ + "Infrast-Entry": { + "algorithm": "JustReturn", + "action": "DoNothing", + "crop_doc": { + "roi": [935, 570, 85, 75], + "mask": [] + }, + "next": [ + "InfrastDefault", + "InfrastDark", + "InfrastSami", + "InfrastMistCity", + "InfrastSiege", + "InfrastSarkaz", + "InfrastDelicious", + "InfrastGaming", + "InfrastDahuangCity", + "InfrastDreamland", + "InfrastJieGarden", + "InfrastAveMujica", + "InfrastTogether" + ] + }, + "InfrastDefault": { + "action": "ClickSelf", + "maskRange": [1, 255], + "postDelay": 5000, + "roi": [930, 540, 230, 180], + "template": "Default/EnterInfrast.png" + }, + "InfrastDark": { + "baseTask": "InfrastDefault", + "template": "Dark/EnterInfrast.png" + }, + "InfrastSami": { + "baseTask": "InfrastDefault", + "template": "Sami/EnterInfrast.png" + }, + "InfrastMistCity": { + "baseTask": "InfrastDefault", + "template": "MistCity/EnterInfrast.png" + }, + "InfrastSiege": { + "baseTask": "InfrastDefault", + "template": "Siege/EnterInfrast.png" + }, + "InfrastSarkaz": { + "baseTask": "InfrastDefault", + "template": "Sarkaz/EnterInfrast.png" + }, + "InfrastDelicious": { + "baseTask": "InfrastDefault", + "template": "Delicious/EnterInfrast.png" + }, + "InfrastGaming": { + "baseTask": "InfrastDefault", + "template": "Gaming/EnterInfrast.png" + }, + "InfrastDahuangCity": { + "baseTask": "InfrastDefault", + "template": "DahuangCity/EnterInfrast.png" + }, + "InfrastDreamland": { + "baseTask": "InfrastDefault", + "template": ["Dreamland/DreamlandDefault/EnterInfrast.png", "Dreamland/DreamlandDark/EnterInfrast.png"] + }, + "InfrastJieGarden": { + "baseTask": "InfrastDefault", + "template": "JieGarden/EnterInfrast.png" + }, + "InfrastAveMujica": { + "baseTask": "InfrastDefault", + "template": "AveMujica/EnterInfrast.png" + }, + "InfrastTogether": { + "baseTask": "InfrastDefault", + "template": "Together/EnterInfrast.png" + } +} diff --git a/resource/tasks/UiTheme/Mall.json b/resource/tasks/UiTheme/Mall.json new file mode 100644 index 0000000000..4e6173da79 --- /dev/null +++ b/resource/tasks/UiTheme/Mall.json @@ -0,0 +1,80 @@ +{ + "Mall-Entry": { + "algorithm": "JustReturn", + "action": "DoNothing", + "crop_doc": { + "roi": [822, 457, 86, 71], + "mask": [] + }, + "next": [ + "MallDefault", + "MallDark", + "MallSami", + "MallMistCity", + "MallSiege", + "MallSarkaz", + "MallDelicious", + "MallGaming", + "MallDahuangCity", + "MallDreamland", + "MallJieGarden", + "MallAveMujica", + "MallTogether" + ] + }, + "MallDefault": { + "action": "ClickSelf", + "maskRange": [1, 255], + "postDelay": 500, + "roi": [772, 407, 186, 171], + "template": "Default/Mall.png" + }, + "MallDark": { + "baseTask": "MallDefault", + "template": "Dark/Mall.png" + }, + "MallSami": { + "baseTask": "MallDefault", + "template": "Sami/Mall.png" + }, + "MallMistCity": { + "baseTask": "MallDefault", + "template": "MistCity/Mall.png" + }, + "MallSiege": { + "baseTask": "MallDefault", + "template": "Siege/Mall.png" + }, + "MallSarkaz": { + "baseTask": "MallDefault", + "template": "Sarkaz/Mall.png" + }, + "MallDelicious": { + "baseTask": "MallDefault", + "template": "Delicious/Mall.png" + }, + "MallGaming": { + "baseTask": "MallDefault", + "template": "Gaming/Mall.png" + }, + "MallDahuangCity": { + "baseTask": "MallDefault", + "template": "DahuangCity/Mall.png" + }, + "MallDreamland": { + "baseTask": "MallDefault", + "template": ["Dreamland/DreamlandDefault/Mall.png", "Dreamland/DreamlandDark/Mall.png"] + }, + "MallJieGarden": { + "baseTask": "MallDefault", + "template": "JieGarden/Mall.png" + }, + "MallAveMujica": { + "baseTask": "MallDefault", + "template": "AveMujica/Mall.png" + }, + "MallTogether": { + "baseTask": "MallDefault", + "template": "Together/Mall.png" + } +} diff --git a/resource/tasks/UiTheme/OperBox.json b/resource/tasks/UiTheme/OperBox.json new file mode 100644 index 0000000000..f09de5a2bc --- /dev/null +++ b/resource/tasks/UiTheme/OperBox.json @@ -0,0 +1,79 @@ +{ + "OperBox-Entry": { + "algorithm": "JustReturn", + "action": "DoNothing", + "crop_doc": { + "roi": [945, 301, 85, 78], + "mask": [] + }, + "next": [ + "OperBoxDefault", + "OperBoxDark", + "OperBoxSami", + "OperBoxMistCity", + "OperBoxSiege", + "OperBoxSarkaz", + "OperBoxDelicious", + "OperBoxGaming", + "OperBoxDahuangCity", + "OperBoxDreamland", + "OperBoxJieGarden", + "OperBoxAveMujica", + "OperBoxTogether" + ] + }, + "OperBoxDefault": { + "action": "ClickSelf", + "maskRange": [1, 255], + "roi": [935, 300, 265, 110], + "template": "Default/OperBoxEnter.png" + }, + "OperBoxDark": { + "baseTask": "OperBoxDefault", + "template": "Dark/OperBoxEnter.png" + }, + "OperBoxSami": { + "baseTask": "OperBoxDefault", + "template": "Sami/OperBoxEnter.png" + }, + "OperBoxMistCity": { + "baseTask": "OperBoxDefault", + "template": "MistCity/OperBoxEnter.png" + }, + "OperBoxSiege": { + "baseTask": "OperBoxDefault", + "template": "Siege/OperBoxEnter.png" + }, + "OperBoxSarkaz": { + "baseTask": "OperBoxDefault", + "template": "Sarkaz/OperBoxEnter.png" + }, + "OperBoxDelicious": { + "baseTask": "OperBoxDefault", + "template": "Delicious/OperBoxEnter.png" + }, + "OperBoxGaming": { + "baseTask": "OperBoxDefault", + "template": "Gaming/OperBoxEnter.png" + }, + "OperBoxDahuangCity": { + "baseTask": "OperBoxDefault", + "template": "DahuangCity/OperBoxEnter.png" + }, + "OperBoxDreamland": { + "baseTask": "OperBoxDefault", + "template": ["Dreamland/DreamlandDefault/OperBoxEnter.png", "Dreamland/DreamlandDark/OperBoxEnter.png"] + }, + "OperBoxJieGarden": { + "baseTask": "OperBoxDefault", + "template": "JieGarden/OperBoxEnter.png" + }, + "OperBoxAveMujica": { + "baseTask": "OperBoxDefault", + "template": "AveMujica/OperBoxEnter.png" + }, + "OperBoxTogether": { + "baseTask": "OperBoxDefault", + "template": "Together/OperBoxEnter.png" + } +} diff --git a/resource/tasks/UiTheme/Recruit.json b/resource/tasks/UiTheme/Recruit.json new file mode 100644 index 0000000000..c28aadcbf3 --- /dev/null +++ b/resource/tasks/UiTheme/Recruit.json @@ -0,0 +1,79 @@ +{ + "Recruit-Entry": { + "algorithm": "JustReturn", + "action": "DoNothing", + "crop_doc": { + "roi": [935, 480, 145, 61], + "mask": [125, 0, 25, 20] + }, + "next": [ + "RecruitDefault", + "RecruitDark", + "RecruitSami", + "RecruitMistCity", + "RecruitSiege", + "RecruitSarkaz", + "RecruitDelicious", + "RecruitGaming", + "RecruitDahuangCity", + "RecruitDreamland", + "RecruitJieGarden", + "RecruitAveMujica", + "RecruitTogether" + ] + }, + "RecruitDefault": { + "action": "ClickSelf", + "maskRange": [1, 255], + "roi": [925, 425, 200, 150], + "template": "Default/Recruit.png" + }, + "RecruitDark": { + "baseTask": "RecruitDefault", + "template": "Dark/Recruit.png" + }, + "RecruitSami": { + "baseTask": "RecruitDefault", + "template": "Sami/Recruit.png" + }, + "RecruitMistCity": { + "baseTask": "RecruitDefault", + "template": "MistCity/Recruit.png" + }, + "RecruitSiege": { + "baseTask": "RecruitDefault", + "template": "Siege/Recruit.png" + }, + "RecruitSarkaz": { + "baseTask": "RecruitDefault", + "template": "Sarkaz/Recruit.png" + }, + "RecruitDelicious": { + "baseTask": "RecruitDefault", + "template": "Delicious/Recruit.png" + }, + "RecruitGaming": { + "baseTask": "RecruitDefault", + "template": "Gaming/Recruit.png" + }, + "RecruitDahuangCity": { + "baseTask": "RecruitDefault", + "template": "DahuangCity/Recruit.png" + }, + "RecruitDreamland": { + "baseTask": "RecruitDefault", + "template": ["Dreamland/DreamlandDefault/Recruit.png", "Dreamland/DreamlandDark/Recruit.png"] + }, + "RecruitJieGarden": { + "baseTask": "RecruitDefault", + "template": "JieGarden/Recruit.png" + }, + "RecruitAveMujica": { + "baseTask": "RecruitDefault", + "template": "AveMujica/Recruit.png" + }, + "RecruitTogether": { + "baseTask": "RecruitDefault", + "template": "Together/Recruit.png" + } +} diff --git a/resource/tasks/UiTheme/Task.json b/resource/tasks/UiTheme/Task.json new file mode 100644 index 0000000000..d5d4417f8d --- /dev/null +++ b/resource/tasks/UiTheme/Task.json @@ -0,0 +1,81 @@ +{ + "Task-Entry": { + "algorithm": "JustReturn", + "action": "DoNothing", + "crop_doc": { + "roi": [720, 553, 75, 70], + "mask": [] + }, + "next": [ + "TaskDefault", + "TaskDark", + "TaskSami", + "TaskMistCity", + "TaskSiege", + "TaskSarkaz", + "TaskDelicious", + "TaskGaming", + "TaskDahuangCity", + "TaskDreamland", + "TaskJieGarden", + "TaskAveMujica", + "TaskTogether" + ] + }, + "TaskDefault": { + "action": "ClickSelf", + "maskRange": [1, 255], + "roi": [700, 530, 230, 190], + "template": "Default/Task.png" + }, + "TaskDark": { + "baseTask": "TaskDefault", + "template": "Dark/Task.png" + }, + "TaskSami": { + "baseTask": "TaskDefault", + "template": "Sami/Task.png" + }, + "TaskMistCity": { + "baseTask": "TaskDefault", + "template": "MistCity/Task.png" + }, + "TaskSiege": { + "baseTask": "TaskDefault", + "template": "Siege/Task.png" + }, + "TaskSarkaz": { + "baseTask": "TaskDefault", + "template": "Sarkaz/Task.png" + }, + "TaskDelicious": { + "baseTask": "TaskDefault", + "template": "Delicious/Task.png" + }, + "TaskGaming": { + "baseTask": "TaskDefault", + "template": "Gaming/Task.png" + }, + "TaskDahuangCity": { + "baseTask": "TaskDefault", + "template": "DahuangCity/Task.png" + }, + "TaskDreamland": { + "baseTask": "TaskDefault", + "template": ["Dreamland/DreamlandDefault/Task.png", "Dreamland/DreamlandDark/Task.png"] + }, + "TaskJieGarden": { + "baseTask": "TaskDefault", + "template": "JieGarden/Task.png" + }, + "TaskAveMujica": { + "baseTask": "TaskDefault", + "templThreshold": 0.9, + "template": "AveMujica/Task.png" + }, + "TaskTogether": { + "baseTask": "TaskDefault", + "templThreshold": 0.9, + "template": "Together/Task.png" + } +} diff --git a/resource/tasks/UiTheme/Terminal.json b/resource/tasks/UiTheme/Terminal.json new file mode 100644 index 0000000000..1feb8b860d --- /dev/null +++ b/resource/tasks/UiTheme/Terminal.json @@ -0,0 +1,81 @@ +{ + "Terminal-Entry": { + "algorithm": "JustReturn", + "action": "DoNothing", + "crop_doc": { + "doc": "Heads up: YostarEN needs 133 of 'y' instead of 120", + "roi": [903, 120, 97, 58], + "mask": [] + }, + "next": [ + "TerminalDefault", + "TerminalDark", + "TerminalSami", + "TerminalMistCity", + "TerminalSiege", + "TerminalSarkaz", + "TerminalDelicious", + "TerminalGaming", + "TerminalDahuangCity", + "TerminalDreamland", + "TerminalJieGarden", + "TerminalAveMujica", + "TerminalTogether" + ] + }, + "TerminalDefault": { + "action": "ClickSelf", + "maskRange": [1, 255], + "roi": [844, 58, 268, 272], + "postDelay": 3000, + "template": "Default/Terminal.png" + }, + "TerminalDark": { + "baseTask": "TerminalDefault", + "template": "Dark/Terminal.png" + }, + "TerminalSami": { + "baseTask": "TerminalDefault", + "template": "Sami/Terminal.png" + }, + "TerminalMistCity": { + "baseTask": "TerminalDefault", + "template": "MistCity/Terminal.png" + }, + "TerminalSiege": { + "baseTask": "TerminalDefault", + "template": "Siege/Terminal.png" + }, + "TerminalSarkaz": { + "baseTask": "TerminalDefault", + "template": "Sarkaz/Terminal.png" + }, + "TerminalDelicious": { + "baseTask": "TerminalDefault", + "template": "Delicious/Terminal.png" + }, + "TerminalGaming": { + "baseTask": "TerminalDefault", + "template": "Gaming/Terminal.png" + }, + "TerminalDahuangCity": { + "baseTask": "TerminalDefault", + "template": "DahuangCity/Terminal.png" + }, + "TerminalDreamland": { + "baseTask": "TerminalDefault", + "template": ["Dreamland/DreamlandDefault/Terminal.png", "Dreamland/DreamlandDark/Terminal.png"] + }, + "TerminalJieGarden": { + "baseTask": "TerminalDefault", + "template": "JieGarden/Terminal.png" + }, + "TerminalAveMujica": { + "baseTask": "TerminalDefault", + "template": "AveMujica/Terminal.png" + }, + "TerminalTogether": { + "baseTask": "TerminalDefault", + "template": "Together/Terminal.png" + } +} diff --git a/resource/tasks/tasks.json b/resource/tasks/tasks.json index 51d0fe1f5f..9a97e02fa1 100644 --- a/resource/tasks/tasks.json +++ b/resource/tasks/tasks.json @@ -642,23 +642,7 @@ }, "StageQueue": { "baseTask": "Fight", - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], - "maxTimes": 3, + "template": "SwitchTheme@ToggleSettingsMenu.png", "exceededNext": ["Stop"], "next": ["StageQueue@GoLastBattle", "StageQueue"] }, @@ -852,23 +836,8 @@ ] }, "SwitchAccount": { - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], "baseTask": "StartUp", + "template": "SwitchTheme@ToggleSettingsMenu.png", "next": ["Settings"] }, "Settings": { @@ -1077,22 +1046,7 @@ "StartAtHome": { "baseTask": "Home", "action": "DoNothing", - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], + "template": "SwitchTheme@ToggleSettingsMenu.png", "next": ["Home", "StartUpBegin"], "postDelay_Doc": "等待以防万一（StartUp还有双倍的任务延迟等待，默认0.5s x2", "postDelay": 1000 @@ -1108,27 +1062,11 @@ "next": ["Home"] }, "StartUp": { - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], - "maskRange": [1, 255], - "roi": [844, 58, 268, 272], "Doc": "有时候明明已经在主界面了，停了一小会又弹个窗。多检测几次，一直在主界面才算完成", - "postDelay": 1000, - "maxTimes": 3, + "action": "DoNothing", + "roi": [227, 327, 159, 152], + "template": "SwitchTheme@ToggleSettingsMenu.png", + "sub": ["Terminal-Entry"], "next": ["StartUp", "StartUp@LoadingText", "StartUp@CloseAnnos#next"] }, "CloseAnnos": { @@ -1756,34 +1694,17 @@ "next": ["StartUpThemes#next", "RestartGameAndContinue@LoadingIcon", "ReturnButtons#next"] }, "Fight": { - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], - "maskRange": [1, 255], - "action": "ClickSelf", - "roi": [844, 58, 268, 272], - "exceededNext": ["Fight@TodaysSupplies", "Fight@CloseAnnos#next", "Stop"], + "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["Terminal-Entry"], "next": [ "Fight@GoLastBattle", "Fight", "Fight@CloseAnnos#next", "Fight@GoTerminalStopflag", "Fight@ReturnButtons#next" - ], - "postDelay": 3000 + ] }, "GoTerminalStopflag": { "template": "StageResource.png", @@ -1811,29 +1732,10 @@ "onErrorNext": ["RecruitBegin@SwitchTheme@ToggleSettingsMenu"] }, "Recruit": { - "template": [ - "Default/Recruit.png", - "Dark/Recruit.png", - "Sami/Recruit.png", - "MistCity/Recruit.png", - "Siege/Recruit.png", - "Sarkaz/Recruit.png", - "Delicious/Recruit.png", - "Gaming/Recruit.png", - "DahuangCity/Recruit.png", - "Dreamland/DreamlandDefault/Recruit.png", - "Dreamland/DreamlandDark/Recruit.png", - "JieGarden/Recruit.png", - "AveMujica/Recruit.png", - "Together/Recruit.png" - ], - "action": "ClickSelf", - "roi": [925, 425, 200, 150], - "crop_doc": { - "roi": [935, 480, 145, 61], - "mask": [125, 0, 25, 20] - }, - "maskRange": [1, 255], + "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["Recruit-Entry"], "next": ["RecruitBegin@LoadingText", "RecruitBegin"] }, "RecruitFinish": { @@ -1898,22 +1800,7 @@ "MiningActivitiesReturnHome": { "baseTask": "Home", "action": "DoNothing", - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], + "template": "SwitchTheme@ToggleSettingsMenu.png", "next": ["MiningActivities", "Stop"] }, "MiningActivities": { @@ -1948,22 +1835,7 @@ "OrundumActivitiesReturnHome": { "baseTask": "Home", "action": "DoNothing", - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], + "template": "SwitchTheme@ToggleSettingsMenu.png", "next": ["OrundumActivities", "Stop"] }, "OrundumActivities": { @@ -2036,22 +1908,7 @@ "RecruitingActivitiesReturnHome": { "baseTask": "Home", "action": "DoNothing", - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], + "template": "SwitchTheme@ToggleSettingsMenu.png", "next": ["RecruitingActivities", "Stop"] }, "RecruitingActivities": { @@ -2123,22 +1980,7 @@ "SpecialAccessActivitiesReturnHome": { "baseTask": "Home", "action": "DoNothing", - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], + "template": "SwitchTheme@ToggleSettingsMenu.png", "next": ["SpecialAccessActivities", "Stop"] }, "SpecialAccessActivities": { @@ -2184,31 +2026,11 @@ "onErrorNext": ["AwardBegin@SwitchTheme@ToggleSettingsMenu"] }, "Award": { - "template": [ - "Default/Task.png", - "Dark/Task.png", - "Sami/Task.png", - "MistCity/Task.png", - "Siege/Task.png", - "Sarkaz/Task.png", - "Delicious/Task.png", - "Gaming/Task.png", - "DahuangCity/Task.png", - "Dreamland/DreamlandDefault/Task.png", - "Dreamland/DreamlandDark/Task.png", - "JieGarden/Task.png", - "AveMujica/Task.png", - "Together/Task.png" - ], - "templThreshold": [0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.9, 0.9], - "maskRange": [1, 255], - "action": "ClickSelf", - "roi": [700, 530, 230, 190], - "next": ["ReceiveAward", "DailyTask", "WeeklyTask", "Award", "Award@CloseAnnos#next"], - "crop_doc": { - "roi": [720, 553, 75, 70], - "mask": [] - } + "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["Task-Entry"], + "next": ["ReceiveAward", "DailyTask", "WeeklyTask", "Award", "Award@CloseAnnos#next"] }, "ReceiveAward": { "action": "ClickSelf", @@ -2255,23 +2077,8 @@ }, "MailReturnToHome": { "baseTask": "Home", - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", "next": ["Mail", "MailWithoutAward"] }, "Mail": { @@ -2318,31 +2125,11 @@ "onErrorNext": ["VisitBegin@SwitchTheme@ToggleSettingsMenu"] }, "Visit": { - "template": [ - "Default/Friends.png", - "Dark/Friends.png", - "Sami/Friends.png", - "MistCity/Friends.png", - "Siege/Friends.png", - "Sarkaz/Friends.png", - "Delicious/Friends.png", - "Gaming/Friends.png", - "DahuangCity/Friends.png", - "Dreamland/DreamlandDefault/Friends.png", - "Dreamland/DreamlandDark/Friends.png", - "JieGarden/Friends.png", - "AveMujica/Friends.png", - "Together/Friends.png" - ], - "templThreshold": 0.7, - "maskRange": [1, 255], - "action": "ClickSelf", - "roi": [250, 500, 200, 200], - "next": ["FriendsList", "Visit", "Visit@CloseAnnos#next"], - "crop_doc": { - "roi": [300, 550, 128, 41], - "mask": [] - } + "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["Friends-Entry"], + "next": ["FriendsList", "Visit", "Visit@CloseAnnos#next"] }, "FriendsList": { "action": "ClickSelf", @@ -2400,32 +2187,11 @@ "onErrorNext": ["MallBegin@SwitchTheme@ToggleSettingsMenu"] }, "Mall": { - "doc": "请同步更新 Store@EnterStore 的 template", - "template": [ - "Default/Mall.png", - "Dark/Mall.png", - "Sami/Mall.png", - "MistCity/Mall.png", - "Siege/Mall.png", - "Sarkaz/Mall.png", - "Delicious/Mall.png", - "Gaming/Mall.png", - "DahuangCity/Mall.png", - "Dreamland/DreamlandDefault/Mall.png", - "Dreamland/DreamlandDark/Mall.png", - "JieGarden/Mall.png", - "AveMujica/Mall.png", - "Together/Mall.png" - ], - "maskRange": [1, 255], - "action": "ClickSelf", - "roi": [772, 407, 186, 171], - "next": ["CreditStoreOcr", "Mall", "Mall@CloseAnnos#next"], - "postDelay": 500, - "crop_doc": { - "roi": [822, 457, 86, 71], - "mask": [] - } + "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["Mall-Entry"], + "next": ["CreditStoreOcr", "Mall", "Mall@CloseAnnos#next"] }, "CreditStoreOcr": { "algorithm": "OcrDetect", @@ -2463,30 +2229,10 @@ "next": ["Home@ReturnButtons#next"] }, "Home": { - "template": [ - "Default/Terminal.png", - "Dark/Terminal.png", - "Sami/Terminal.png", - "MistCity/Terminal.png", - "Siege/Terminal.png", - "Sarkaz/Terminal.png", - "Delicious/Terminal.png", - "Gaming/Terminal.png", - "DahuangCity/Terminal.png", - "Dreamland/DreamlandDefault/Terminal.png", - "Dreamland/DreamlandDark/Terminal.png", - "JieGarden/Terminal.png", - "AveMujica/Terminal.png", - "Together/Terminal.png" - ], - "maskRange": [1, 255], "action": "Stop", - "roi": [844, 58, 268, 272], - "crop_doc": { - "doc": "Heads up: YostarEN needs 133 of 'y' instead of 120", - "roi": [903, 120, 97, 58], - "mask": [] - } + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["Terminal-Entry"] }, "CreditShop-Commodities": { "template": "CreditPoint.png", @@ -2644,31 +2390,11 @@ "roi": [0, 0, 180, 80] }, "Infrast": { - "template": [ - "Default/EnterInfrast.png", - "Dark/EnterInfrast.png", - "Sami/EnterInfrast.png", - "MistCity/EnterInfrast.png", - "Siege/EnterInfrast.png", - "Sarkaz/EnterInfrast.png", - "Delicious/EnterInfrast.png", - "Gaming/EnterInfrast.png", - "DahuangCity/EnterInfrast.png", - "Dreamland/DreamlandDefault/EnterInfrast.png", - "Dreamland/DreamlandDark/EnterInfrast.png", - "JieGarden/EnterInfrast.png", - "AveMujica/EnterInfrast.png", - "Together/EnterInfrast.png" - ], - "maskRange": [1, 255], - "roi": [930, 540, 230, 180], - "action": "ClickSelf", - "next": ["InfrastEnteredFlag", "Infrast", "Infrast@CloseAnnos#next", "Infrast@OfflineConfirm"], - "postDelay": 5000, - "crop_doc": { - "roi": [935, 570, 85, 75], - "mask": [] - } + "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["Infrast-Entry"], + "next": ["InfrastEnteredFlag", "Infrast", "Infrast@CloseAnnos#next", "Infrast@OfflineConfirm"] }, "InfrastEnteredFlag": { "template": "InfrastOverview.png", @@ -4431,40 +4157,15 @@ }, "DepotBegin": { "algorithm": "JustReturn", - "next": [ - "DepotEnter", - "DepotMaterialTab", - "DepotAllTab", - "DepotMaterialTabClicked", - "DepotEnter@ReturnButtons#next" - ], + "next": ["Depot", "DepotMaterialTab", "DepotAllTab", "DepotMaterialTabClicked", "Depot@ReturnButtons#next"], "onErrorNext": ["DepotBegin@SwitchTheme@ToggleSettingsMenu"] }, - "DepotEnter": { - "action": "ClickSelf", - "template": [ - "Default/DepotEnter.png", - "Dark/DepotEnter.png", - "Sami/DepotEnter.png", - "MistCity/DepotEnter.png", - "Siege/DepotEnter.png", - "Sarkaz/DepotEnter.png", - "Delicious/DepotEnter.png", - "Gaming/DepotEnter.png", - "DahuangCity/DepotEnter.png", - "Dreamland/DreamlandDefault/DepotEnter.png", - "Dreamland/DreamlandDark/DepotEnter.png", - "JieGarden/DepotEnter.png", - "AveMujica/DepotEnter.png", - "Together/DepotEnter.png" - ], - "maskRange": [1, 255], - "roi": [1109, 560, 171, 160], - "next": ["#self", "DepotMaterialTab"], - "crop_doc": { - "roi": [1153, 606, 77, 79], - "mask": [] - } + "Depot": { + "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["Depot-Entry"], + "next": ["#self", "DepotMaterialTab"] }, "DepotAllTab": { "action": "ClickSelf", @@ -4529,39 +4230,20 @@ "OperBoxBegin": { "algorithm": "JustReturn", "next": [ - "OperBoxEnter", + "OperBox", "OperBoxRoleTabSelect", "OperBoxSortTabSelect", "OperBoxRoleTab", - "OperBoxEnter@ReturnButtons#next" + "OperBox@ReturnButtons#next" ], "onErrorNext": ["OperBoxBegin@SwitchTheme@ToggleSettingsMenu"] }, - "OperBoxEnter": { - "template": [ - "Default/OperBoxEnter.png", - "Dark/OperBoxEnter.png", - "Sami/OperBoxEnter.png", - "MistCity/OperBoxEnter.png", - "Siege/OperBoxEnter.png", - "Sarkaz/OperBoxEnter.png", - "Delicious/OperBoxEnter.png", - "Gaming/OperBoxEnter.png", - "DahuangCity/OperBoxEnter.png", - "Dreamland/DreamlandDefault/OperBoxEnter.png", - "Dreamland/DreamlandDark/OperBoxEnter.png", - "JieGarden/OperBoxEnter.png", - "AveMujica/OperBoxEnter.png", - "Together/OperBoxEnter.png" - ], - "action": "ClickSelf", - "maskRange": [1, 255], - "roi": [935, 300, 265, 110], - "next": ["OperBoxRoleTabSelect", "OperBoxSortTabSelect", "OperBoxRoleTab"], - "crop_doc": { - "roi": [945, 301, 85, 78], - "mask": [] - } + "OperBox": { + "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["OperBox-Entry"], + "next": ["OperBoxRoleTabSelect", "OperBoxSortTabSelect", "OperBoxRoleTab"] }, "OperBoxRoleTabSelect": { "action": "ClickSelf", @@ -5108,39 +4790,20 @@ "algorithm": "JustReturn", "next": [ "DoGacha", - "GachaEnter", - "GachaEnter@ReturnButtons#next", + "Gacha", + "Gacha@ReturnButtons#next", "GachaLastOnceResult", "GachaLastTenTimesResult1", "GachaLastTenTimesResult2" ], "onErrorNext": ["GachaBegin@SwitchTheme@ToggleSettingsMenu"] }, - "GachaEnter": { - "action": "ClickSelf", - "template": [ - "Default/GachaEnter.png", - "Dark/GachaEnter.png", - "Sami/GachaEnter.png", - "MistCity/GachaEnter.png", - "Siege/GachaEnter.png", - "Sarkaz/GachaEnter.png", - "Delicious/GachaEnter.png", - "Gaming/GachaEnter.png", - "DahuangCity/GachaEnter.png", - "Dreamland/DreamlandDefault/GachaEnter.png", - "Dreamland/DreamlandDark/GachaEnter.png", - "JieGarden/GachaEnter.png", - "AveMujica/GachaEnter.png", - "Together/GachaEnter.png" - ], - "maskRange": [1, 255], - "roi": [1052, 426, 228, 174], - "next": ["GachaEnter", "GachaEnter@LoadingText", "DoGacha"], - "crop_doc": { - "roi": [1095, 497, 167, 56], - "mask": [] - } + "Gacha": { + "action": "DoNothing", + "template": "SwitchTheme@ToggleSettingsMenu.png", + "roi": [227, 327, 159, 152], + "sub": ["Gacha-Entry"], + "next": ["Gacha", "Gacha@LoadingText", "DoGacha"] }, "GachaLastOnceResult": { "algorithm": "OcrDetect", @@ -5224,22 +4887,7 @@ }, "Store@EnterStore": { "baseTask": "Mall", - "template": [ - "Default/Mall.png", - "Dark/Mall.png", - "Sami/Mall.png", - "MistCity/Mall.png", - "Siege/Mall.png", - "Sarkaz/Mall.png", - "Delicious/Mall.png", - "Gaming/Mall.png", - "DahuangCity/Mall.png", - "Dreamland/DreamlandDefault/Mall.png", - "Dreamland/DreamlandDark/Mall.png", - "JieGarden/Mall.png", - "AveMujica/Mall.png", - "Together/Mall.png" - ], + "template": "SwitchTheme@ToggleSettingsMenu.png", "next": ["Store@EnterTicketStore@LoadingIcon", "Store@EnterTicketStore"] }, "Store@EnterTicketStore": {