diff --git a/resource/tasks/RA/base.json b/resource/tasks/RA/base.json index 40983ec8d5..baf92d4b4d 100644 --- a/resource/tasks/RA/base.json +++ b/resource/tasks/RA/base.json @@ -25,7 +25,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "action": "ClickSelf", "roi": [844, 58, 268, 272], diff --git a/resource/tasks/Roguelike/base.json b/resource/tasks/Roguelike/base.json index 337fd59c42..5e55c58d7c 100644 --- a/resource/tasks/Roguelike/base.json +++ b/resource/tasks/Roguelike/base.json @@ -9,7 +9,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "action": "ClickSelf", "roi": [844, 58, 268, 272], diff --git a/resource/tasks/tasks.json b/resource/tasks/tasks.json index 17f3b62bb5..6f1701063f 100644 --- a/resource/tasks/tasks.json +++ b/resource/tasks/tasks.json @@ -587,7 +587,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "maxTimes": 3, "exceededNext": ["Stop"], @@ -784,7 +786,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "baseTask": "StartUp", "next": ["Settings"] @@ -1003,7 +1007,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "next": ["Home", "StartUpBegin"], "postDelay_Doc": "等待以防万一（StartUp还有双倍的任务延迟等待，默认0.5s x2", @@ -1029,7 +1035,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "roi": [844, 58, 268, 272], "Doc": "有时候明明已经在主界面了，停了一小会又弹个窗。多检测几次，一直在主界面才算完成", @@ -1666,7 +1674,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "action": "ClickSelf", "roi": [844, 58, 268, 272], @@ -1701,7 +1711,9 @@ "Sarkaz/Recruit.png", "Delicious/Recruit.png", "Gaming/Recruit.png", - "DahuangCity/Recruit.png" + "DahuangCity/Recruit.png", + "Dreamland/DreamlandDefault/Recruit.png", + "Dreamland/DreamlandDark/Recruit.png" ], "action": "ClickSelf", "roi": [900, 450, 200, 150], @@ -1782,7 +1794,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "next": ["MiningActivities", "Stop"] }, @@ -1826,7 +1840,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "next": ["OrundumActivities", "Stop"] }, @@ -1908,7 +1924,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "next": ["RecruitingActivities", "Stop"] }, @@ -1989,7 +2007,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "next": ["SpecialAccessActivities", "Stop"] }, @@ -2044,7 +2064,9 @@ "Sarkaz/Task.png", "Delicious/Task.png", "Gaming/Task.png", - "DahuangCity/Task.png" + "DahuangCity/Task.png", + "Dreamland/DreamlandDefault/Task.png", + "Dreamland/DreamlandDark/Task.png" ], "maskRange": [1, 255], "action": "ClickSelf", @@ -2107,7 +2129,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "action": "DoNothing", "next": ["Mail", "MailWithoutAward"] @@ -2164,7 +2188,9 @@ "Sarkaz/Friends.png", "Delicious/Friends.png", "Gaming/Friends.png", - "DahuangCity/Friends.png" + "DahuangCity/Friends.png", + "Dreamland/DreamlandDefault/Friends.png", + "Dreamland/DreamlandDark/Friends.png" ], "templThreshold": 0.7, "maskRange": [1, 255], @@ -2223,7 +2249,9 @@ "Sarkaz/Mall.png", "Delicious/Mall.png", "Gaming/Mall.png", - "DahuangCity/Mall.png" + "DahuangCity/Mall.png", + "Dreamland/DreamlandDefault/Mall.png", + "Dreamland/DreamlandDark/Mall.png" ], "action": "ClickSelf", "roi": [772, 407, 186, 171], @@ -2282,7 +2310,9 @@ "Sarkaz/Terminal.png", "Delicious/Terminal.png", "Gaming/Terminal.png", - "DahuangCity/Terminal.png" + "DahuangCity/Terminal.png", + "Dreamland/DreamlandDefault/Terminal.png", + "Dreamland/DreamlandDark/Terminal.png" ], "action": "Stop", "roi": [844, 58, 268, 272], @@ -2492,7 +2522,9 @@ "Sarkaz/EnterInfrast.png", "Delicious/EnterInfrast.png", "Gaming/EnterInfrast.png", - "DahuangCity/EnterInfrast.png" + "DahuangCity/EnterInfrast.png", + "Dreamland/DreamlandDefault/EnterInfrast.png", + "Dreamland/DreamlandDark/EnterInfrast.png" ], "maskRange": [1, 255], "roi": [930, 540, 230, 180], @@ -4293,7 +4325,9 @@ "Sarkaz/DepotEnter.png", "Delicious/DepotEnter.png", "Gaming/DepotEnter.png", - "DahuangCity/DepotEnter.png" + "DahuangCity/DepotEnter.png", + "Dreamland/DreamlandDefault/DepotEnter.png", + "Dreamland/DreamlandDark/DepotEnter.png" ], "maskRange": [1, 255], "roi": [1109, 560, 171, 160], @@ -4383,7 +4417,9 @@ "Sarkaz/OperBoxEnter.png", "Delicious/OperBoxEnter.png", "Gaming/OperBoxEnter.png", - "DahuangCity/OperBoxEnter.png" + "DahuangCity/OperBoxEnter.png", + "Dreamland/DreamlandDefault/OperBoxEnter.png", + "Dreamland/DreamlandDark/OperBoxEnter.png" ], "action": "ClickSelf", "maskRange": [1, 255], @@ -4876,7 +4912,9 @@ "Sarkaz/GachaEnter.png", "Delicious/GachaEnter.png", "Gaming/GachaEnter.png", - "DahuangCity/GachaEnter.png" + "DahuangCity/GachaEnter.png", + "Dreamland/DreamlandDefault/GachaEnter.png", + "Dreamland/DreamlandDark/GachaEnter.png" ], "roi": [1052, 443, 228, 156], "next": ["GachaEnter", "GachaEnter@LoadingText", "DoGacha"], @@ -5046,7 +5084,9 @@ "Sarkaz/Mall.png", "Delicious/Mall.png", "Gaming/Mall.png", - "DahuangCity/Mall.png" + "DahuangCity/Mall.png", + "Dreamland/DreamlandDefault/Mall.png", + "Dreamland/DreamlandDark/Mall.png" ], "next": ["Store@EnterTicketStore@LoadingIcon", "Store@EnterTicketStore"] }, diff --git a/resource/template/UiTheme/Dreamland/DreamlandDark/DepotEnter.png b/resource/template/UiTheme/Dreamland/DreamlandDark/DepotEnter.png new file mode 100644 index 0000000000..8c80000390 Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDark/DepotEnter.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDark/EnterInfrast.png b/resource/template/UiTheme/Dreamland/DreamlandDark/EnterInfrast.png new file mode 100644 index 0000000000..c4943cb0b9 Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDark/EnterInfrast.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDark/Friends.png b/resource/template/UiTheme/Dreamland/DreamlandDark/Friends.png new file mode 100644 index 0000000000..dcb5de0b37 Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDark/Friends.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDark/GachaEnter.png b/resource/template/UiTheme/Dreamland/DreamlandDark/GachaEnter.png new file mode 100644 index 0000000000..c66ae6a2ad Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDark/GachaEnter.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDark/Mall.png b/resource/template/UiTheme/Dreamland/DreamlandDark/Mall.png new file mode 100644 index 0000000000..ef2afc93d0 Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDark/Mall.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDark/OperBoxEnter.png b/resource/template/UiTheme/Dreamland/DreamlandDark/OperBoxEnter.png new file mode 100644 index 0000000000..0ce2511a0a Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDark/OperBoxEnter.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDark/Recruit.png b/resource/template/UiTheme/Dreamland/DreamlandDark/Recruit.png new file mode 100644 index 0000000000..ddc1d7e68d Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDark/Recruit.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDark/Task.png b/resource/template/UiTheme/Dreamland/DreamlandDark/Task.png new file mode 100644 index 0000000000..bbdc0f8671 Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDark/Task.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDark/Terminal.png b/resource/template/UiTheme/Dreamland/DreamlandDark/Terminal.png new file mode 100644 index 0000000000..d359d3c8ef Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDark/Terminal.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDefault/DepotEnter.png b/resource/template/UiTheme/Dreamland/DreamlandDefault/DepotEnter.png new file mode 100644 index 0000000000..f4d505a59a Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDefault/DepotEnter.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDefault/EnterInfrast.png b/resource/template/UiTheme/Dreamland/DreamlandDefault/EnterInfrast.png new file mode 100644 index 0000000000..74c79c327f Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDefault/EnterInfrast.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDefault/Friends.png b/resource/template/UiTheme/Dreamland/DreamlandDefault/Friends.png new file mode 100644 index 0000000000..d595914a28 Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDefault/Friends.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDefault/GachaEnter.png b/resource/template/UiTheme/Dreamland/DreamlandDefault/GachaEnter.png new file mode 100644 index 0000000000..a718a812ed Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDefault/GachaEnter.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDefault/Mall.png b/resource/template/UiTheme/Dreamland/DreamlandDefault/Mall.png new file mode 100644 index 0000000000..1192d6ef7a Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDefault/Mall.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDefault/OperBoxEnter.png b/resource/template/UiTheme/Dreamland/DreamlandDefault/OperBoxEnter.png new file mode 100644 index 0000000000..8a17e7b130 Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDefault/OperBoxEnter.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDefault/Recruit.png b/resource/template/UiTheme/Dreamland/DreamlandDefault/Recruit.png new file mode 100644 index 0000000000..337edeb543 Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDefault/Recruit.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDefault/Task.png b/resource/template/UiTheme/Dreamland/DreamlandDefault/Task.png new file mode 100644 index 0000000000..6494827f14 Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDefault/Task.png differ diff --git a/resource/template/UiTheme/Dreamland/DreamlandDefault/Terminal.png b/resource/template/UiTheme/Dreamland/DreamlandDefault/Terminal.png new file mode 100644 index 0000000000..cff7daf649 Binary files /dev/null and b/resource/template/UiTheme/Dreamland/DreamlandDefault/Terminal.png differ