Opt: SkinBox position filter

campaign/Readme.md

@@ -283,5 +283,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20260205   | raid 20240328            | From Zero to Hero                            | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun                            | ゼロから頑張る魔王討伐（復刻）       | -                          |
 | 20260212   | raid 20260212            | Spring Auction Adventure                     | 春宴怀玉香满庭             | Spring Auction Adventure                           | 新春玉逸品会                         | 春宴懷玉香滿庭             |
 | 20260226   | event 20260226 cn        | Springtide Inn Online                        | 春满客栈Online             | Springtide Inn Online                              | 春色旅籠Online                       | 春滿客棧Online             |
-| 20260312   | event 20240229 cn        | Snowrealm Peregrination Rerun                | 复刻雪境迷踪               | Snowrealm Peregrination Rerun                      | 銀界遊廻（復刻）                     | -                          |
+| 20260312   | event 20240229 cn        | Snowrealm Peregrination                      | 复刻雪境迷踪               | Snowrealm Peregrination Rerun                      | 銀界遊廻（復刻）                     | -                          |
-| 20260319   | event 20220728 cn        | Aquilifer's Ballade                          | -                          | -                                                  | -                                    | 復刻雄鷹的敘事歌           |

module/combat/assets.py

@@ -17,7 +17,7 @@ BATTLE_STATUS_B = Button(area={'cn': (625, 297, 712, 317), 'en': (625, 297, 712,
 BATTLE_STATUS_C = Button(area={'cn': (625, 211, 647, 297), 'en': (625, 211, 647, 297), 'jp': (625, 211, 647, 297), 'tw': (625, 211, 647, 297)}, color={'cn': (199, 208, 198), 'en': (199, 208, 198), 'jp': (199, 208, 198), 'tw': (199, 208, 198)}, 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/BATTLE_STATUS_C.png', 'en': './assets/en/combat/BATTLE_STATUS_C.png', 'jp': './assets/jp/combat/BATTLE_STATUS_C.png', 'tw': './assets/tw/combat/BATTLE_STATUS_C.png'})
 BATTLE_STATUS_D = Button(area={'cn': (618, 191, 639, 317), 'en': (618, 191, 639, 317), 'jp': (618, 191, 639, 317), 'tw': (618, 191, 639, 317)}, color={'cn': (199, 208, 199), 'en': (199, 208, 199), 'jp': (199, 208, 199), 'tw': (199, 208, 199)}, 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/BATTLE_STATUS_D.png', 'en': './assets/en/combat/BATTLE_STATUS_D.png', 'jp': './assets/jp/combat/BATTLE_STATUS_D.png', 'tw': './assets/tw/combat/BATTLE_STATUS_D.png'})
 BATTLE_STATUS_S = Button(area={'cn': (643, 297, 722, 317), 'en': (643, 297, 722, 317), 'jp': (643, 297, 722, 317), 'tw': (643, 297, 722, 317)}, color={'cn': (233, 242, 127), 'en': (233, 242, 127), 'jp': (233, 242, 127), 'tw': (233, 242, 127)}, 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/BATTLE_STATUS_S.png', 'en': './assets/en/combat/BATTLE_STATUS_S.png', 'jp': './assets/jp/combat/BATTLE_STATUS_S.png', 'tw': './assets/tw/combat/BATTLE_STATUS_S.png'})
-COMBAT_AUTO = Button(area={'cn': (136, 572, 167, 605), 'en': (136, 572, 167, 605), 'jp': (136, 572, 167, 605), 'tw': (136, 572, 167, 605)}, color={'cn': (234, 244, 255), 'en': (234, 244, 255), 'jp': (234, 244, 255), 'tw': (234, 244, 255)}, button={'cn': (136, 572, 167, 605), 'en': (136, 572, 167, 605), 'jp': (136, 572, 167, 605), 'tw': (136, 572, 167, 605)}, file={'cn': './assets/cn/combat/COMBAT_AUTO.png', 'en': './assets/en/combat/COMBAT_AUTO.png', 'jp': './assets/jp/combat/COMBAT_AUTO.png', 'tw': './assets/tw/combat/COMBAT_AUTO.png'})
+COMBAT_AUTO = Button(area={'cn': (136, 573, 167, 604), 'en': (136, 573, 167, 604), 'jp': (136, 573, 167, 604), 'tw': (136, 573, 167, 604)}, color={'cn': (229, 242, 255), 'en': (229, 242, 255), 'jp': (229, 242, 255), 'tw': (229, 242, 255)}, button={'cn': (136, 573, 167, 604), 'en': (136, 573, 167, 604), 'jp': (136, 573, 167, 604), 'tw': (136, 573, 167, 604)}, file={'cn': './assets/cn/combat/COMBAT_AUTO.png', 'en': './assets/en/combat/COMBAT_AUTO.png', 'jp': './assets/jp/combat/COMBAT_AUTO.png', 'tw': './assets/tw/combat/COMBAT_AUTO.png'})
 COMBAT_AUTO_133 = Button(area={'cn': (131, 568, 170, 609), 'en': (131, 568, 170, 609), 'jp': (131, 568, 170, 609), 'tw': (131, 568, 170, 609)}, color={'cn': (234, 244, 255), 'en': (234, 244, 255), 'jp': (234, 244, 255), 'tw': (234, 244, 255)}, button={'cn': (131, 568, 170, 609), 'en': (131, 568, 170, 609), 'jp': (131, 568, 170, 609), 'tw': (131, 568, 170, 609)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_133.png', 'en': './assets/en/combat/COMBAT_AUTO_133.png', 'jp': './assets/jp/combat/COMBAT_AUTO_133.png', 'tw': './assets/tw/combat/COMBAT_AUTO_133.png'})
 COMBAT_AUTO_150 = Button(area={'cn': (129, 567, 172, 611), 'en': (129, 567, 172, 611), 'jp': (129, 567, 172, 611), 'tw': (129, 567, 172, 611)}, color={'cn': (238, 247, 255), 'en': (238, 247, 255), 'jp': (238, 247, 255), 'tw': (238, 247, 255)}, button={'cn': (129, 567, 172, 611), 'en': (129, 567, 172, 611), 'jp': (129, 567, 172, 611), 'tw': (129, 567, 172, 611)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_150.png', 'en': './assets/en/combat/COMBAT_AUTO_150.png', 'jp': './assets/jp/combat/COMBAT_AUTO_150.png', 'tw': './assets/tw/combat/COMBAT_AUTO_150.png'})
 COMBAT_AUTO_SWITCH = Button(area={'cn': (18, 38, 36, 56), 'en': (16, 31, 140, 62), 'jp': (18, 36, 54, 57), 'tw': (18, 38, 36, 56)}, color={'cn': (179, 198, 235), 'en': (105, 137, 189), 'jp': (160, 177, 220), 'tw': (179, 198, 235)}, button={'cn': (18, 38, 36, 56), 'en': (16, 31, 140, 62), 'jp': (18, 36, 54, 57), 'tw': (18, 38, 36, 56)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_SWITCH.png', 'en': './assets/en/combat/COMBAT_AUTO_SWITCH.png', 'jp': './assets/jp/combat/COMBAT_AUTO_SWITCH.png', 'tw': './assets/tw/combat/COMBAT_AUTO_SWITCH.png'})
@@ -39,7 +39,6 @@ LOADING_BAR = Button(area={'cn': (33, 676, 1247, 680), 'en': (33, 676, 1247, 680
 MAIN_FLEET_POWER_ZERO = Button(area={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, color={'cn': (63, 79, 98), 'en': (63, 79, 98), 'jp': (63, 79, 98), 'tw': (63, 79, 98)}, button={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, file={'cn': './assets/cn/combat/MAIN_FLEET_POWER_ZERO.png', 'en': './assets/en/combat/MAIN_FLEET_POWER_ZERO.png', 'jp': './assets/jp/combat/MAIN_FLEET_POWER_ZERO.png', 'tw': './assets/tw/combat/MAIN_FLEET_POWER_ZERO.png'})
 MOVE_DOWN = Button(area={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, color={'cn': (21, 28, 57), 'en': (21, 28, 57), 'jp': (21, 28, 57), 'tw': (21, 28, 57)}, button={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, file={'cn': './assets/cn/combat/MOVE_DOWN.png', 'en': './assets/en/combat/MOVE_DOWN.png', 'jp': './assets/jp/combat/MOVE_DOWN.png', 'tw': './assets/tw/combat/MOVE_DOWN.png'})
 MOVE_LEFT_DOWN = Button(area={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, color={'cn': (65, 80, 100), 'en': (65, 80, 100), 'jp': (65, 80, 100), 'tw': (65, 80, 100)}, button={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, file={'cn': './assets/cn/combat/MOVE_LEFT_DOWN.png', 'en': './assets/en/combat/MOVE_LEFT_DOWN.png', 'jp': './assets/jp/combat/MOVE_LEFT_DOWN.png', 'tw': './assets/tw/combat/MOVE_LEFT_DOWN.png'})
-MOVE_LEFT_UP = Button(area={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, file={'cn': './assets/cn/combat/MOVE_LEFT_UP.png', 'en': './assets/cn/combat/MOVE_LEFT_UP.png', 'jp': './assets/cn/combat/MOVE_LEFT_UP.png', 'tw': './assets/cn/combat/MOVE_LEFT_UP.png'})
 NEW_SHIP = Button(area={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, color={'cn': (235, 171, 60), 'en': (235, 171, 60), 'jp': (235, 171, 60), 'tw': (235, 171, 60)}, button={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, file={'cn': './assets/cn/combat/NEW_SHIP.png', 'en': './assets/en/combat/NEW_SHIP.png', 'jp': './assets/jp/combat/NEW_SHIP.png', 'tw': './assets/tw/combat/NEW_SHIP.png'})
 OPTS_INFO_D = Button(area={'cn': (601, 151, 704, 178), 'en': (565, 143, 692, 179), 'jp': (512, 154, 605, 176), 'tw': (602, 152, 702, 177)}, color={'cn': (158, 110, 113), 'en': (171, 116, 110), 'jp': (201, 187, 191), 'tw': (164, 130, 137)}, button={'cn': (583, 605, 677, 628), 'en': (590, 587, 627, 647), 'jp': (574, 596, 685, 635), 'tw': (583, 604, 676, 627)}, file={'cn': './assets/cn/combat/OPTS_INFO_D.png', 'en': './assets/en/combat/OPTS_INFO_D.png', 'jp': './assets/jp/combat/OPTS_INFO_D.png', 'tw': './assets/tw/combat/OPTS_INFO_D.png'})
 QUIT_RECONFIRM = Button(area={'cn': (749, 501, 828, 540), 'en': (761, 495, 818, 523), 'jp': (746, 490, 830, 530), 'tw': (754, 491, 825, 522)}, color={'cn': (207, 140, 133), 'en': (208, 147, 141), 'jp': (203, 138, 132), 'tw': (211, 158, 152)}, button={'cn': (749, 501, 828, 540), 'en': (761, 495, 818, 523), 'jp': (746, 490, 830, 530), 'tw': (754, 491, 825, 522)}, file={'cn': './assets/cn/combat/QUIT_RECONFIRM.png', 'en': './assets/en/combat/QUIT_RECONFIRM.png', 'jp': './assets/jp/combat/QUIT_RECONFIRM.png', 'tw': './assets/tw/combat/QUIT_RECONFIRM.png'})

module/combat/combat_manual.py

@@ -42,20 +42,6 @@ class CombatManual(ModuleBase):
         self.device.long_click(MOVE_LEFT_DOWN, duration=(3.5, 5.5))
         return True
 
-    def handle_combat_stand_still_upper_left(self, auto):
-        """
-        Args:
-            auto (str): Combat auto mode.
-
-        Returns:
-            bool: If executed
-        """
-        if auto != 'hide_in_upper_left':
-            return False
-
-        self.device.long_click(MOVE_LEFT_UP, duration=(1.5, 3.5))
-        return True
-
     def handle_combat_weapon_release(self):
         if self.appear_then_click(READY_AIR_RAID, interval=10):
             return True
@@ -81,8 +67,5 @@ class CombatManual(ModuleBase):
         if self.handle_combat_stand_still_bottom_left(auto):
             self.manual_executed = True
             return True
-        if self.handle_combat_stand_still_upper_left(auto):
-            self.manual_executed = True
-            return True
 
         return False

module/config/argument/args.json

@@ -804,8 +804,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -847,8 +846,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {
@@ -1200,8 +1198,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -1243,8 +1240,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {
@@ -1596,8 +1592,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -1639,8 +1634,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {
@@ -1966,8 +1960,8 @@
         "type": "select",
         "value": "campaign_main",
         "option": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ],
         "display": "hide",
         "option_cn": [
@@ -1980,11 +1974,11 @@
           "event_20240229_cn"
         ],
         "option_tw": [
-          "event_20220728_cn"
+          "event_20260226_cn"
         ],
         "option_bold": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ]
       },
       "Mode": {
@@ -2094,8 +2088,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -2137,8 +2130,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {
@@ -2387,8 +2379,8 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ],
         "option_cn": [
           "event_20240229_cn"
@@ -2400,11 +2392,11 @@
           "event_20240229_cn"
         ],
         "option_tw": [
-          "event_20220728_cn"
+          "event_20260226_cn"
         ],
         "option_bold": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ]
       },
       "Mode": {
@@ -2505,8 +2497,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -2548,8 +2539,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {
@@ -2801,8 +2791,8 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ],
         "option_cn": [
           "event_20240229_cn"
@@ -2814,11 +2804,11 @@
           "event_20240229_cn"
         ],
         "option_tw": [
-          "event_20220728_cn"
+          "event_20260226_cn"
         ],
         "option_bold": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ]
       },
       "Mode": {
@@ -2919,8 +2909,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -2962,8 +2951,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {
@@ -4301,8 +4289,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -4344,8 +4331,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {
@@ -4608,8 +4594,8 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ],
         "option_cn": [
           "event_20240229_cn"
@@ -4621,11 +4607,11 @@
           "event_20240229_cn"
         ],
         "option_tw": [
-          "event_20220728_cn"
+          "event_20260226_cn"
         ],
         "option_bold": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ]
       },
       "Mode": {
@@ -4733,8 +4719,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -4776,8 +4761,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {
@@ -5040,8 +5024,8 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ],
         "option_cn": [
           "event_20240229_cn"
@@ -5053,11 +5037,11 @@
           "event_20240229_cn"
         ],
         "option_tw": [
-          "event_20220728_cn"
+          "event_20260226_cn"
         ],
         "option_bold": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ]
       },
       "Mode": {
@@ -5165,8 +5149,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -5208,8 +5191,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {
@@ -5472,8 +5454,8 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ],
         "option_cn": [
           "event_20240229_cn"
@@ -5485,11 +5467,11 @@
           "event_20240229_cn"
         ],
         "option_tw": [
-          "event_20220728_cn"
+          "event_20260226_cn"
         ],
         "option_bold": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ]
       },
       "Mode": {
@@ -5597,8 +5579,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -5640,8 +5621,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {
@@ -5904,8 +5884,8 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ],
         "option_cn": [
           "event_20240229_cn"
@@ -5917,11 +5897,11 @@
           "event_20240229_cn"
         ],
         "option_tw": [
-          "event_20220728_cn"
+          "event_20260226_cn"
         ],
         "option_bold": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ]
       },
       "Mode": {
@@ -6029,8 +6009,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -6072,8 +6051,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {
@@ -6326,8 +6304,8 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ],
         "option_cn": [
           "event_20240229_cn"
@@ -6339,11 +6317,11 @@
           "event_20240229_cn"
         ],
         "option_tw": [
-          "event_20220728_cn"
+          "event_20260226_cn"
         ],
         "option_bold": [
-          "event_20220728_cn",
+          "event_20240229_cn",
-          "event_20240229_cn"
+          "event_20260226_cn"
         ]
       },
       "Mode": {
@@ -6451,8 +6429,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet1Step": {
@@ -6494,8 +6471,7 @@
           "combat_auto",
           "combat_manual",
           "stand_still_in_the_middle",
-          "hide_in_bottom_left",
+          "hide_in_bottom_left"
-          "hide_in_upper_left"
         ]
       },
       "Fleet2Step": {

module/config/argument/argument.yaml

@@ -185,7 +185,7 @@ Fleet:
     option: [ line_ahead, double_line, diamond ]
   Fleet1Mode:
     value: combat_auto
-    option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left ]
+    option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ]
   Fleet1Step:
     value: 3
     option: [ 2, 3, 4, 5 ]
@@ -197,7 +197,7 @@ Fleet:
     option: [ line_ahead, double_line, diamond ]
   Fleet2Mode:
     value: combat_auto
-    option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left ]
+    option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ]
   Fleet2Step:
     value: 2
     option: [ 2, 3, 4, 5 ]

module/config/config_generated.py

@@ -100,11 +100,11 @@ class GeneratedConfig:
     # Group `Fleet`
     Fleet_Fleet1 = 1  # 1, 2, 3, 4, 5, 6
     Fleet_Fleet1Formation = 'double_line'  # line_ahead, double_line, diamond
-    Fleet_Fleet1Mode = 'combat_auto'  # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left
+    Fleet_Fleet1Mode = 'combat_auto'  # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left
     Fleet_Fleet1Step = 3  # 2, 3, 4, 5
     Fleet_Fleet2 = 2  # 0, 1, 2, 3, 4, 5, 6
     Fleet_Fleet2Formation = 'double_line'  # line_ahead, double_line, diamond
-    Fleet_Fleet2Mode = 'combat_auto'  # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left
+    Fleet_Fleet2Mode = 'combat_auto'  # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left
     Fleet_Fleet2Step = 2  # 2, 3, 4, 5
     Fleet_FleetOrder = 'fleet1_mob_fleet2_boss'  # fleet1_mob_fleet2_boss, fleet1_boss_fleet2_mob, fleet1_all_fleet2_standby, fleet1_standby_fleet2_all
 

module/config/i18n/en-US.json

@@ -958,8 +958,7 @@
       "combat_auto": "combat_auto",
       "combat_manual": "combat_manual",
       "stand_still_in_the_middle": "stand_still_in_the_middle",
-      "hide_in_bottom_left": "hide_in_bottom_left",
+      "hide_in_bottom_left": "hide_in_bottom_left"
-      "hide_in_upper_left": "hide_in_upper_left"
     },
     "Fleet1Step": {
       "name": "Fleet 1 Step Number",
@@ -993,8 +992,7 @@
       "combat_auto": "combat_auto",
       "combat_manual": "combat_manual",
       "stand_still_in_the_middle": "stand_still_in_the_middle",
-      "hide_in_bottom_left": "hide_in_bottom_left",
+      "hide_in_bottom_left": "hide_in_bottom_left"
-      "hide_in_upper_left": "hide_in_upper_left"
     },
     "Fleet2Step": {
       "name": "Fleet 2 Step Number",

module/config/i18n/ja-JP.json

@@ -958,8 +958,7 @@
       "combat_auto": "combat_auto",
       "combat_manual": "combat_manual",
       "stand_still_in_the_middle": "stand_still_in_the_middle",
-      "hide_in_bottom_left": "hide_in_bottom_left",
+      "hide_in_bottom_left": "hide_in_bottom_left"
-      "hide_in_upper_left": "hide_in_upper_left"
     },
     "Fleet1Step": {
       "name": "Fleet.Fleet1Step.name",
@@ -993,8 +992,7 @@
       "combat_auto": "combat_auto",
       "combat_manual": "combat_manual",
       "stand_still_in_the_middle": "stand_still_in_the_middle",
-      "hide_in_bottom_left": "hide_in_bottom_left",
+      "hide_in_bottom_left": "hide_in_bottom_left"
-      "hide_in_upper_left": "hide_in_upper_left"
     },
     "Fleet2Step": {
       "name": "Fleet.Fleet2Step.name",

module/config/i18n/zh-CN.json

@@ -958,8 +958,7 @@
       "combat_auto": "自律战斗",
       "combat_manual": "手操",
       "stand_still_in_the_middle": "中路站桩",
-      "hide_in_bottom_left": "躲左下角",
+      "hide_in_bottom_left": "躲左下角"
-      "hide_in_upper_left": "躲左上角"
     },
     "Fleet1Step": {
       "name": "一队步长",
@@ -993,8 +992,7 @@
       "combat_auto": "自律战斗",
       "combat_manual": "手操",
       "stand_still_in_the_middle": "中路站桩",
-      "hide_in_bottom_left": "躲左下角",
+      "hide_in_bottom_left": "躲左下角"
-      "hide_in_upper_left": "躲左上角"
     },
     "Fleet2Step": {
       "name": "二队步长",

module/config/i18n/zh-TW.json

@@ -765,7 +765,7 @@
       "event_20220414_cn": "復刻-永夜幻光",
       "event_20220428_cn": "復刻虹彩的終幕曲",
       "event_20220526_cn": "泠誓光庭",
-      "event_20220728_cn": "復刻雄鷹的敘事歌",
+      "event_20220728_cn": "雄鷹的敘事歌",
       "event_20220818_cn": "遠匯點作戰",
       "event_20220915_cn": "紫絳槿嵐",
       "event_20221124_cn": "復刻鍊金術士與秘密遺跡群島",
@@ -958,8 +958,7 @@
       "combat_auto": "自律戰鬥",
       "combat_manual": "手動",
       "stand_still_in_the_middle": "中路站樁",
-      "hide_in_bottom_left": "躲左下角",
+      "hide_in_bottom_left": "躲左下角"
-      "hide_in_upper_left": "躲左上角"
     },
     "Fleet1Step": {
       "name": "一隊步幅",
@@ -993,8 +992,7 @@
       "combat_auto": "自律戰鬥",
       "combat_manual": "手動",
       "stand_still_in_the_middle": "中路站樁",
-      "hide_in_bottom_left": "躲左下角",
+      "hide_in_bottom_left": "躲左下角"
-      "hide_in_upper_left": "躲左上角"
     },
     "Fleet2Step": {
       "name": "二隊步幅",

module/minigame/minigame.py

@@ -196,10 +196,6 @@ class Minigame(UI):
             if self.ui_page_appear(page_academy, interval=5):
                 self.device.click(ACADEMY_GOTO_GAME_ROOM)
                 continue
-            # You've reached your monthly limit of Game Tickets, and will not be able to earn any more.
-            # Continue playing the minigame?
-            if self.handle_popup_confirm('MINIGAME_ENTER'):
-                continue
 
         # game room and choose game have same header, go to game room first
         self.go_to_main_page()

module/os_ash/meta.py

@@ -47,7 +47,10 @@ class MetaDigitCounter(DigitCounter):
 class Meta(UI, MapEventHandler):
 
     def digit_ocr_point_and_check(self, button: Button, check_number: int):
-        point_ocr = MetaDigitCounter(button, letter=(235, 235, 235), threshold=160, name='POINT_OCR')
+        if server.server != 'jp':
+            point_ocr = MetaDigitCounter(button, letter=(235, 235, 235), threshold=160, name='POINT_OCR')
+        else:
+            point_ocr = MetaDigitCounter(button, letter=(192, 192, 192), threshold=160, name='POINT_OCR')
         point, _, _ = point_ocr.ocr(self.device.image)
         if point >= check_number:
             return True

module/shop/shop_general.py

@@ -1,15 +1,11 @@
-import re
-
 from module.base.decorator import cached_property
-from module.base.filter import Filter
 from module.logger import logger
 from module.shop.base import ShopItemGrid, ShopItemGrid_250814
 from module.shop.clerk import ShopClerk
 from module.shop.shop_status import ShopStatus
 from module.shop.ui import ShopUI
 
-SKINBOX_POSITION_FILTER = Filter(re.compile(r'^(\d+)$'), ('position',))
+import re
-
 
 class GeneralShop_250814(ShopClerk, ShopUI, ShopStatus):
     gems = 0
@@ -33,13 +29,29 @@ class GeneralShop_250814(ShopClerk, ShopUI, ShopStatus):
         Returns:
             set[int]: 
         """
-        skinbox_filter = self.config.GeneralShop_SkinBoxPositionFilter.strip()
+        raw_filter = self.config.GeneralShop_SkinBoxPositionFilter.strip()
-        if not skinbox_filter:
+        if not raw_filter:
             return None
-        SKINBOX_POSITION_FILTER.load(skinbox_filter)
+        raw_filter = re.sub(r'[＞﹥›˃ᐳ❯]', '>', raw_filter)
-        allowed = {int(pos) for pos in SKINBOX_POSITION_FILTER.filter_raw if pos.isdigit()}
+        allowed = {int(pos) for pos in raw_filter.split('>') if pos.strip().isdigit()}
         logger.attr('SkinBox_filter', ' > '.join([str(pos) for pos in allowed]))
 
+        # raw_filter = raw_filter.replace('，', ',')
+        # allowed = {int(pos) for pos in raw_filter.split(',') if pos.strip().isdigit()}
+        # logger.attr('SkinBox_filter', ', '.join([str(pos) for pos in allowed]))
+
+        # raw_filter = raw_filter.replace('，', ',')
+        # allowed = set()
+        # for item in raw_filter.split(','):
+        #     pos_str = item.strip()
+        #     if not pos_str:
+        #         continue
+        #     if pos_str.isdigit():
+        #         allowed.add(int(pos_str))
+        #         continue
+        #     logger.warning(f"Invalid position index: {pos_str}")
+        # logger.attr('SkinBox_filter', ', '.join([str(pos) for pos in allowed]))
+
         if not allowed:
             logger.warning("No valid positions found")
 

module/tactical/tactical_class.py

@@ -373,7 +373,7 @@ class RewardTacticalClass(Dock):
         if self.appear(RAPID_TRAINING, offset=offset, interval=1):
             self.device.click(RAPID_TRAINING)
             # Clear interval to enter _tactical_books_choose fast
-            self.interval_clear(TACTICAL_CLASS_START, interval=2)
+            self.interval_clear(TACTICAL_CLASS_CANCEL, interval=2)
             return True
 
         return False
@@ -444,7 +444,7 @@ class RewardTacticalClass(Dock):
             # Get finish time
             # sometimes you have TACTICAL_CHECK without black-blurred background
             # TACTICAL_CLASS_CANCEL and TACTICAL_CHECK appears
-            if not self.appear(TACTICAL_CLASS_START, offset=(20, 20)) \
+            if not self.appear(TACTICAL_CLASS_CANCEL, offset=(20, 20)) \
                     and self.appear(TACTICAL_CHECK, offset=(20, 20), interval=2):
                 self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
                 if book_empty:
@@ -495,10 +495,11 @@ class RewardTacticalClass(Dock):
             if self.appear(MISSION_POPUP_GO, offset=self._popup_offset, interval=2):
                 self.device.click(MISSION_POPUP_ACK)
                 continue
-            if self.appear(TACTICAL_CLASS_START, offset=(30, 30), interval=2):
+            if self.appear(TACTICAL_CLASS_CANCEL, offset=(30, 30), interval=2) \
+                    and self.appear(TACTICAL_CLASS_START, offset=(30, 30)):
                 if self._tactical_books_choose():
                     self.dock_select_index = 0
-                    self.interval_reset([TACTICAL_CLASS_START, BOOK_EMPTY_POPUP])
+                    self.interval_reset([TACTICAL_CLASS_CANCEL, BOOK_EMPTY_POPUP])
                     self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
                 else:
                     study_finished = True