Merge branch 'master' into dev

campaign/Readme.md

@@ -121,3 +121,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20221110   | event 20201229 cn        | Inverted Orthant                | 复刻负象限作战     | Inverted Orthant Rerun                   | 虚畳なりし限象（復刻）            | -                    |
 | 20221117   | event 20210325 cn        | Ashen Simulacrum                | -           | -                                    | -                  | 復刻箱庭療法   |
 | 20221124   | event 20221124 cn        | The Alchemist and the Archipelago of Secrets | 炼金术士与秘密遗迹群岛 | The Alchemist and the Archipelago of Secrets | 錬金術士と謎の遺跡群島 | - |
+| 20221201   | event 20221124 cn        | The Alchemist and the Archipelago of Secrets | -           | -                                    | -                  | 鍊金術士與秘密遺跡群島 |

module/combat/assets.py

@@ -28,7 +28,7 @@ EXP_INFO_C = Button(area={'cn': (383, 58, 400, 121), 'en': (383, 58, 400, 121),
 EXP_INFO_D = Button(area={'cn': (377, 42, 393, 137), 'en': (377, 42, 393, 137), 'jp': (377, 42, 393, 137), 'tw': (377, 42, 393, 137)}, color={'cn': (198, 206, 198), 'en': (198, 206, 198), 'jp': (198, 206, 198), 'tw': (198, 206, 198)}, button={'cn': (1051, 631, 1122, 641), 'en': (1051, 631, 1122, 641), 'jp': (1051, 631, 1122, 641), 'tw': (1051, 631, 1122, 641)}, file={'cn': './assets/cn/combat/EXP_INFO_D.png', 'en': './assets/en/combat/EXP_INFO_D.png', 'jp': './assets/jp/combat/EXP_INFO_D.png', 'tw': './assets/tw/combat/EXP_INFO_D.png'})
 EXP_INFO_S = Button(area={'cn': (396, 122, 457, 137), 'en': (396, 122, 457, 137), 'jp': (396, 122, 457, 137), 'tw': (396, 122, 457, 137)}, color={'cn': (233, 241, 127), 'en': (233, 241, 127), 'jp': (233, 241, 127), 'tw': (233, 241, 127)}, button={'cn': (1051, 631, 1122, 641), 'en': (1051, 631, 1122, 641), 'jp': (1051, 631, 1122, 641), 'tw': (1051, 631, 1122, 641)}, file={'cn': './assets/cn/combat/EXP_INFO_S.png', 'en': './assets/en/combat/EXP_INFO_S.png', 'jp': './assets/jp/combat/EXP_INFO_S.png', 'tw': './assets/tw/combat/EXP_INFO_S.png'})
 GET_ITEMS_1 = Button(area={'cn': (538, 217, 741, 253), 'en': (550, 215, 739, 246), 'jp': (539, 220, 741, 252), 'tw': (539, 217, 742, 253)}, color={'cn': (160, 192, 248), 'en': (157, 187, 233), 'jp': (146, 184, 249), 'tw': (155, 190, 248)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_ITEMS_1.png', 'en': './assets/en/combat/GET_ITEMS_1.png', 'jp': './assets/jp/combat/GET_ITEMS_1.png', 'tw': './assets/tw/combat/GET_ITEMS_1.png'})
-GET_ITEMS_1_RYZA = Button(area={'cn': (564, 217, 721, 245), 'en': (577, 211, 704, 239), 'jp': (566, 217, 719, 244), 'tw': (564, 217, 721, 245)}, color={'cn': (176, 199, 243), 'en': (172, 199, 246), 'jp': (179, 201, 243), 'tw': (176, 199, 243)}, button={'cn': (1000, 631, 1055, 689), 'en': (1000, 631, 1055, 689), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_ITEMS_1_RYZA.png', 'en': './assets/en/combat/GET_ITEMS_1_RYZA.png', 'jp': './assets/jp/combat/GET_ITEMS_1_RYZA.png', 'tw': './assets/cn/combat/GET_ITEMS_1_RYZA.png'})
+GET_ITEMS_1_RYZA = Button(area={'cn': (564, 217, 721, 245), 'en': (577, 211, 704, 239), 'jp': (566, 217, 719, 244), 'tw': (564, 218, 723, 246)}, color={'cn': (176, 199, 243), 'en': (172, 199, 246), 'jp': (179, 201, 243), 'tw': (173, 197, 242)}, button={'cn': (1000, 631, 1055, 689), 'en': (1000, 631, 1055, 689), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_ITEMS_1_RYZA.png', 'en': './assets/en/combat/GET_ITEMS_1_RYZA.png', 'jp': './assets/jp/combat/GET_ITEMS_1_RYZA.png', 'tw': './assets/tw/combat/GET_ITEMS_1_RYZA.png'})
 GET_ITEMS_2 = Button(area={'cn': (538, 146, 742, 182), 'en': (549, 140, 740, 176), 'jp': (536, 146, 741, 182), 'tw': (538, 148, 741, 182)}, color={'cn': (160, 192, 248), 'en': (152, 185, 236), 'jp': (145, 182, 249), 'tw': (155, 190, 248)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_ITEMS_2.png', 'en': './assets/en/combat/GET_ITEMS_2.png', 'jp': './assets/jp/combat/GET_ITEMS_2.png', 'tw': './assets/tw/combat/GET_ITEMS_2.png'})
 GET_ITEMS_3 = Button(area={'cn': (539, 143, 742, 179), 'en': (548, 136, 740, 172), 'jp': (540, 143, 742, 179), 'tw': (546, 145, 742, 178)}, color={'cn': (161, 193, 248), 'en': (152, 185, 237), 'jp': (145, 182, 248), 'tw': (156, 190, 248)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_ITEMS_3.png', 'en': './assets/en/combat/GET_ITEMS_3.png', 'jp': './assets/jp/combat/GET_ITEMS_3.png', 'tw': './assets/tw/combat/GET_ITEMS_3.png'})
 GET_ITEMS_3_CHECK = Button(area={'cn': (335, 184, 947, 203), 'en': (335, 184, 947, 203), 'jp': (335, 184, 947, 203), 'tw': (335, 184, 947, 203)}, color={'cn': (84, 95, 109), 'en': (84, 95, 109), 'jp': (84, 95, 109), 'tw': (84, 95, 109)}, button={'cn': (335, 184, 947, 203), 'en': (335, 184, 947, 203), 'jp': (335, 184, 947, 203), 'tw': (335, 184, 947, 203)}, file={'cn': './assets/cn/combat/GET_ITEMS_3_CHECK.png', 'en': './assets/en/combat/GET_ITEMS_3_CHECK.png', 'jp': './assets/jp/combat/GET_ITEMS_3_CHECK.png', 'tw': './assets/tw/combat/GET_ITEMS_3_CHECK.png'})

module/config/argument/args.json

@@ -1627,10 +1627,10 @@
           "event_20200326_cn",
           "event_20200227_cn"
         ],
+        "tw": "event_20221124_cn",
         "cn": "event_20221124_cn",
         "en": "event_20221124_cn",
-        "jp": "event_20221124_cn",
-        "tw": "event_20210325_cn"
+        "jp": "event_20221124_cn"
       },
       "Mode": {
         "type": "select",
@@ -2066,10 +2066,10 @@
           "event_20200227_cn"
         ],
         "display": "disabled",
+        "tw": "event_20221124_cn",
         "cn": "event_20221124_cn",
         "en": "event_20221124_cn",
-        "jp": "event_20221124_cn",
-        "tw": "event_20210325_cn"
+        "jp": "event_20221124_cn"
       },
       "Mode": {
         "type": "select",
@@ -2496,10 +2496,10 @@
           "event_20200227_cn"
         ],
         "display": "disabled",
+        "tw": "event_20221124_cn",
         "cn": "event_20221124_cn",
         "en": "event_20221124_cn",
-        "jp": "event_20221124_cn",
-        "tw": "event_20210325_cn"
+        "jp": "event_20221124_cn"
       },
       "Mode": {
         "type": "select",
@@ -2937,10 +2937,10 @@
           "event_20200227_cn"
         ],
         "display": "disabled",
+        "tw": "event_20221124_cn",
         "cn": "event_20221124_cn",
         "en": "event_20221124_cn",
-        "jp": "event_20221124_cn",
-        "tw": "event_20210325_cn"
+        "jp": "event_20221124_cn"
       },
       "Mode": {
         "type": "select",
@@ -3384,10 +3384,10 @@
           "event_20200227_cn"
         ],
         "display": "disabled",
+        "tw": "event_20221124_cn",
         "cn": "event_20221124_cn",
         "en": "event_20221124_cn",
-        "jp": "event_20221124_cn",
-        "tw": "event_20210325_cn"
+        "jp": "event_20221124_cn"
       },
       "Mode": {
         "type": "select",
@@ -3831,10 +3831,10 @@
           "event_20200227_cn"
         ],
         "display": "disabled",
+        "tw": "event_20221124_cn",
         "cn": "event_20221124_cn",
         "en": "event_20221124_cn",
-        "jp": "event_20221124_cn",
-        "tw": "event_20210325_cn"
+        "jp": "event_20221124_cn"
       },
       "Mode": {
         "type": "select",
@@ -4278,10 +4278,10 @@
           "event_20200227_cn"
         ],
         "display": "disabled",
+        "tw": "event_20221124_cn",
         "cn": "event_20221124_cn",
         "en": "event_20221124_cn",
-        "jp": "event_20221124_cn",
-        "tw": "event_20210325_cn"
+        "jp": "event_20221124_cn"
       },
       "Mode": {
         "type": "select",
@@ -4715,10 +4715,10 @@
           "event_20200227_cn"
         ],
         "display": "disabled",
+        "tw": "event_20221124_cn",
         "cn": "event_20221124_cn",
         "en": "event_20221124_cn",
-        "jp": "event_20221124_cn",
-        "tw": "event_20210325_cn"
+        "jp": "event_20221124_cn"
       },
       "Mode": {
         "type": "select",

module/config/i18n/zh-TW.json

@@ -603,7 +603,7 @@
       "name": "活動名稱",
       "help": "自動選擇至最新的活動圖",
       "campaign_main": "主線圖",
-      "event_20221124_cn": "The Alchemist and the Archipelago of Secrets",
+      "event_20221124_cn": "鍊金術士與秘密遺跡群島",
       "event_20210325_cn": "復刻箱庭療法",
       "event_20201229_cn": "負象限作戰",
       "event_20211111_cn": "杰諾瓦的焰火",

module/handler/assets.py

@@ -58,7 +58,7 @@ MAP_GREEN = Button(area={'cn': (195, 260, 349, 292), 'en': (201, 259, 341, 290),
 MAP_STAR_1 = Button(area={'cn': (245, 377, 254, 384), 'en': (232, 381, 240, 389), 'jp': (245, 377, 254, 384), 'tw': (245, 377, 254, 384)}, color={'cn': (251, 233, 143), 'en': (252, 234, 146), 'jp': (251, 233, 143), 'tw': (251, 233, 143)}, button={'cn': (245, 377, 254, 384), 'en': (232, 381, 240, 389), 'jp': (245, 377, 254, 384), 'tw': (245, 377, 254, 384)}, file={'cn': './assets/cn/handler/MAP_STAR_1.png', 'en': './assets/en/handler/MAP_STAR_1.png', 'jp': './assets/jp/handler/MAP_STAR_1.png', 'tw': './assets/tw/handler/MAP_STAR_1.png'})
 MAP_STAR_2 = Button(area={'cn': (532, 377, 540, 384), 'en': (518, 382, 526, 389), 'jp': (532, 377, 540, 384), 'tw': (532, 377, 540, 384)}, color={'cn': (251, 233, 144), 'en': (252, 234, 144), 'jp': (251, 233, 144), 'tw': (251, 233, 144)}, button={'cn': (532, 377, 540, 384), 'en': (518, 382, 526, 389), 'jp': (532, 377, 540, 384), 'tw': (532, 377, 540, 384)}, file={'cn': './assets/cn/handler/MAP_STAR_2.png', 'en': './assets/en/handler/MAP_STAR_2.png', 'jp': './assets/jp/handler/MAP_STAR_2.png', 'tw': './assets/tw/handler/MAP_STAR_2.png'})
 MAP_STAR_3 = Button(area={'cn': (818, 377, 827, 384), 'en': (804, 382, 812, 389), 'jp': (818, 377, 827, 384), 'tw': (818, 377, 827, 384)}, color={'cn': (251, 233, 143), 'en': (252, 234, 144), 'jp': (251, 233, 143), 'tw': (251, 233, 143)}, button={'cn': (818, 377, 827, 384), 'en': (804, 382, 812, 389), 'jp': (818, 377, 827, 384), 'tw': (818, 377, 827, 384)}, file={'cn': './assets/cn/handler/MAP_STAR_3.png', 'en': './assets/en/handler/MAP_STAR_3.png', 'jp': './assets/jp/handler/MAP_STAR_3.png', 'tw': './assets/tw/handler/MAP_STAR_3.png'})
-MAP_WALK_OUT_OF_STEP = Button(area={'cn': (654, 312, 704, 335), 'en': (454, 314, 698, 338), 'jp': (736, 312, 783, 336), 'tw': (654, 312, 704, 335)}, color={'cn': (109, 113, 120), 'en': (108, 109, 116), 'jp': (137, 135, 143), 'tw': (109, 113, 120)}, button={'cn': (654, 312, 704, 335), 'en': (454, 314, 698, 338), 'jp': (736, 312, 783, 336), 'tw': (654, 312, 704, 335)}, file={'cn': './assets/cn/handler/MAP_WALK_OUT_OF_STEP.png', 'en': './assets/en/handler/MAP_WALK_OUT_OF_STEP.png', 'jp': './assets/jp/handler/MAP_WALK_OUT_OF_STEP.png', 'tw': './assets/tw/handler/MAP_WALK_OUT_OF_STEP.png'})
+MAP_WALK_OUT_OF_STEP = Button(area={'cn': (654, 312, 704, 335), 'en': (454, 314, 698, 338), 'jp': (736, 312, 783, 336), 'tw': (653, 309, 705, 334)}, color={'cn': (109, 113, 120), 'en': (108, 109, 116), 'jp': (137, 135, 143), 'tw': (118, 124, 132)}, button={'cn': (654, 312, 704, 335), 'en': (454, 314, 698, 338), 'jp': (736, 312, 783, 336), 'tw': (653, 309, 705, 334)}, file={'cn': './assets/cn/handler/MAP_WALK_OUT_OF_STEP.png', 'en': './assets/en/handler/MAP_WALK_OUT_OF_STEP.png', 'jp': './assets/jp/handler/MAP_WALK_OUT_OF_STEP.png', 'tw': './assets/tw/handler/MAP_WALK_OUT_OF_STEP.png'})
 MISSION_POPUP_ACK = Button(area={'cn': (413, 489, 566, 532), 'en': (413, 489, 566, 532), 'jp': (413, 489, 566, 532), 'tw': (413, 489, 566, 532)}, color={'cn': (169, 170, 172), 'en': (169, 170, 172), 'jp': (169, 170, 172), 'tw': (169, 170, 172)}, button={'cn': (413, 489, 566, 532), 'en': (413, 489, 566, 532), 'jp': (413, 489, 566, 532), 'tw': (413, 489, 566, 532)}, file={'cn': './assets/cn/handler/MISSION_POPUP_ACK.png', 'en': './assets/en/handler/MISSION_POPUP_ACK.png', 'jp': './assets/jp/handler/MISSION_POPUP_ACK.png', 'tw': './assets/tw/handler/MISSION_POPUP_ACK.png'})
 MISSION_POPUP_GO = Button(area={'cn': (716, 488, 869, 533), 'en': (716, 488, 869, 533), 'jp': (716, 488, 869, 533), 'tw': (716, 488, 869, 533)}, color={'cn': (89, 138, 201), 'en': (89, 138, 201), 'jp': (89, 138, 201), 'tw': (89, 138, 201)}, button={'cn': (716, 488, 869, 533), 'en': (716, 488, 869, 533), 'jp': (716, 488, 869, 533), 'tw': (716, 488, 869, 533)}, file={'cn': './assets/cn/handler/MISSION_POPUP_GO.png', 'en': './assets/en/handler/MISSION_POPUP_GO.png', 'jp': './assets/jp/handler/MISSION_POPUP_GO.png', 'tw': './assets/tw/handler/MISSION_POPUP_GO.png'})
 MONTHLY_PASS_NOTICE = Button(area={'cn': (554, 505, 726, 561), 'en': (716, 488, 869, 533), 'jp': (554, 505, 726, 561), 'tw': (554, 505, 726, 561)}, color={'cn': (109, 153, 208), 'en': (89, 138, 201), 'jp': (109, 153, 208), 'tw': (109, 153, 208)}, button={'cn': (872, 152, 939, 196), 'en': (863, 173, 929, 217), 'jp': (872, 152, 939, 196), 'tw': (872, 152, 939, 196)}, file={'cn': './assets/cn/handler/MONTHLY_PASS_NOTICE.png', 'en': './assets/en/handler/MONTHLY_PASS_NOTICE.png', 'jp': './assets/cn/handler/MONTHLY_PASS_NOTICE.png', 'tw': './assets/cn/handler/MONTHLY_PASS_NOTICE.png'})

module/handler/mystery.py

@@ -1,5 +1,5 @@
 from module.base.timer import Timer
-from module.base.utils import area_in_area
+from module.base.utils import area_cross_area
 from module.combat.assets import GET_ITEMS_1
 from module.handler.assets import *
 from module.handler.enemy_searching import EnemySearchingHandler
@@ -41,7 +41,7 @@ class MysteryHandler(StrategyHandler, EnemySearchingHandler):
         """
         if not self.config.MAP_MYSTERY_MAP_CLICK:
             button = MYSTERY_ITEM
-        if button is None or area_in_area(button.button, MYSTERY_ITEM.area, threshold=20):
+        if button is None or area_cross_area(button.button, MYSTERY_ITEM.area, threshold=5):
             button = MYSTERY_ITEM
 
         if self.appear(GET_ITEMS_1):

module/sos/assets.py

@@ -9,3 +9,6 @@ SIGNAL_LIST_CHECK = Button(area={'cn': (351, 164, 482, 198), 'en': (352, 159, 52
 SIGNAL_SEARCH_CLOSE = Button(area={'cn': (896, 157, 939, 194), 'en': (896, 157, 939, 194), 'jp': (895, 161, 932, 195), 'tw': (896, 157, 939, 194)}, color={'cn': (205, 95, 87), 'en': (205, 95, 87), 'jp': (214, 106, 105), 'tw': (205, 95, 87)}, button={'cn': (896, 157, 939, 194), 'en': (896, 157, 939, 194), 'jp': (895, 161, 932, 195), 'tw': (896, 157, 939, 194)}, file={'cn': './assets/cn/sos/SIGNAL_SEARCH_CLOSE.png', 'en': './assets/en/sos/SIGNAL_SEARCH_CLOSE.png', 'jp': './assets/jp/sos/SIGNAL_SEARCH_CLOSE.png', 'tw': './assets/tw/sos/SIGNAL_SEARCH_CLOSE.png'})
 SIGNAL_SEARCH_ENTER = Button(area={'cn': (1175, 499, 1230, 554), 'en': (1175, 499, 1230, 554), 'jp': (1175, 499, 1230, 554), 'tw': (1175, 499, 1230, 554)}, color={'cn': (72, 81, 98), 'en': (72, 81, 98), 'jp': (72, 81, 98), 'tw': (72, 81, 98)}, button={'cn': (1175, 499, 1230, 554), 'en': (1175, 499, 1230, 554), 'jp': (1175, 499, 1230, 554), 'tw': (1175, 499, 1230, 554)}, file={'cn': './assets/cn/sos/SIGNAL_SEARCH_ENTER.png', 'en': './assets/en/sos/SIGNAL_SEARCH_ENTER.png', 'jp': './assets/jp/sos/SIGNAL_SEARCH_ENTER.png', 'tw': './assets/tw/sos/SIGNAL_SEARCH_ENTER.png'})
 SOS_SCROLL_AREA = Button(area={'cn': (935, 257, 941, 516), 'en': (935, 257, 941, 516), 'jp': (935, 257, 941, 516), 'tw': (937, 258, 941, 514)}, color={'cn': (120, 133, 146), 'en': (120, 133, 146), 'jp': (120, 133, 146), 'tw': (153, 141, 85)}, button={'cn': (935, 257, 941, 516), 'en': (935, 257, 941, 516), 'jp': (935, 257, 941, 516), 'tw': (937, 258, 941, 514)}, file={'cn': './assets/cn/sos/SOS_SCROLL_AREA.png', 'en': './assets/en/sos/SOS_SCROLL_AREA.png', 'jp': './assets/jp/sos/SOS_SCROLL_AREA.png', 'tw': './assets/tw/sos/SOS_SCROLL_AREA.png'})
+TEMPLATE_SIGNAL_CONFIRM = Template(file={'cn': './assets/cn/sos/TEMPLATE_SIGNAL_CONFIRM.png', 'en': './assets/en/sos/TEMPLATE_SIGNAL_CONFIRM.png', 'jp': './assets/jp/sos/TEMPLATE_SIGNAL_CONFIRM.png', 'tw': './assets/tw/sos/TEMPLATE_SIGNAL_CONFIRM.png'})
+TEMPLATE_SIGNAL_GOTO = Template(file={'cn': './assets/cn/sos/TEMPLATE_SIGNAL_GOTO.png', 'en': './assets/en/sos/TEMPLATE_SIGNAL_GOTO.png', 'jp': './assets/jp/sos/TEMPLATE_SIGNAL_GOTO.png', 'tw': './assets/tw/sos/TEMPLATE_SIGNAL_GOTO.png'})
+TEMPLATE_SIGNAL_SEARCH = Template(file={'cn': './assets/cn/sos/TEMPLATE_SIGNAL_SEARCH.png', 'en': './assets/en/sos/TEMPLATE_SIGNAL_SEARCH.png', 'jp': './assets/jp/sos/TEMPLATE_SIGNAL_SEARCH.png', 'tw': './assets/tw/sos/TEMPLATE_SIGNAL_SEARCH.png'})

module/sos/sos.py

@@ -5,7 +5,6 @@ from module.campaign.run import CampaignRun
 from module.logger import logger
 from module.ocr.ocr import Digit
 from module.sos.assets import *
-from module.template.assets import *
 from module.ui.assets import CAMPAIGN_CHECK
 from module.ui.page import page_campaign
 from module.ui.scroll import Scroll
@@ -173,6 +172,8 @@ class CampaignSos(CampaignRun, CampaignBase):
                     self.device.click(entrance)
                 if TEMPLATE_SIGNAL_GOTO.match(image):
                     self.device.click(entrance)
+                if TEMPLATE_SIGNAL_CONFIRM.match(image):
+                    self.device.click(entrance)
 
             # End
             if self.appear(CAMPAIGN_CHECK, offset=(20, 20)):

module/tactical/tactical_class.py

@@ -391,7 +391,7 @@ class RewardTacticalClass(Dock):
             if not study_finished and self.appear(TACTICAL_CHECK, offset=(20, 20)):
                 # Tactical page, has empty position
                 if self.appear_then_click(ADD_NEW_STUDENT, offset=(800, 20), interval=1):
-                    self.interval_reset(TACTICAL_CHECK)
+                    self.interval_reset([TACTICAL_CHECK, RAPID_TRAINING])
                     self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
                     continue
             if self.handle_rapid_training():

module/template/assets.py

@@ -35,8 +35,6 @@ TEMPLATE_OPERATIONS_RED_DOT = Template(file={'cn': './assets/cn/template/TEMPLAT
 TEMPLATE_OS_AllyCargo = Template(file={'cn': './assets/cn/template/TEMPLATE_OS_AllyCargo.png', 'en': './assets/en/template/TEMPLATE_OS_AllyCargo.png', 'jp': './assets/jp/template/TEMPLATE_OS_AllyCargo.png', 'tw': './assets/tw/template/TEMPLATE_OS_AllyCargo.png'})
 TEMPLATE_OS_Meowfficer = Template(file={'cn': './assets/cn/template/TEMPLATE_OS_Meowfficer.gif', 'en': './assets/en/template/TEMPLATE_OS_Meowfficer.gif', 'jp': './assets/jp/template/TEMPLATE_OS_Meowfficer.gif', 'tw': './assets/tw/template/TEMPLATE_OS_Meowfficer.gif'})
 TEMPLATE_OS_Resource = Template(file={'cn': './assets/cn/template/TEMPLATE_OS_Resource.png', 'en': './assets/en/template/TEMPLATE_OS_Resource.png', 'jp': './assets/jp/template/TEMPLATE_OS_Resource.png', 'tw': './assets/tw/template/TEMPLATE_OS_Resource.png'})
-TEMPLATE_SIGNAL_GOTO = Template(file={'cn': './assets/cn/template/TEMPLATE_SIGNAL_GOTO.png', 'en': './assets/en/template/TEMPLATE_SIGNAL_GOTO.png', 'jp': './assets/jp/template/TEMPLATE_SIGNAL_GOTO.png', 'tw': './assets/tw/template/TEMPLATE_SIGNAL_GOTO.png'})
-TEMPLATE_SIGNAL_SEARCH = Template(file={'cn': './assets/cn/template/TEMPLATE_SIGNAL_SEARCH.png', 'en': './assets/en/template/TEMPLATE_SIGNAL_SEARCH.png', 'jp': './assets/jp/template/TEMPLATE_SIGNAL_SEARCH.png', 'tw': './assets/tw/template/TEMPLATE_SIGNAL_SEARCH.png'})
 TEMPLATE_SIREN_Akagi = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Akagi.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Akagi.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Akagi.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Akagi.gif'})
 TEMPLATE_SIREN_Akashi = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Akashi.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Akashi.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Akashi.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Akashi.gif'})
 TEMPLATE_SIREN_AlbacoreIdol = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_AlbacoreIdol.gif', 'en': './assets/en/template/TEMPLATE_SIREN_AlbacoreIdol.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_AlbacoreIdol.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_AlbacoreIdol.gif'})