Merge pull request #1768 from LmeSzinc/bug_fix

Bug fix

config/template.maa.json

@@ -172,6 +172,7 @@
       "ServerUpdate": "04:00"
     },
     "MaaRoguelike": {
+      "Theme": "Phantom",
       "Mode": 0,
       "StartsCount": 9999999,
       "InvestmentsCount": 9999999,

module/handler/assets.py

@@ -72,8 +72,8 @@
 STRATEGY_OPENED = Button(area={'cn': (1176, 366, 1275, 393), 'en': (1176, 366, 1276, 393), 'jp': (1178, 367, 1273, 391), 'tw': (1176, 366, 1275, 392)}, color={'cn': (128, 155, 218), 'en': (108, 139, 210), 'jp': (156, 176, 223), 'tw': (126, 153, 218)}, button={'cn': (1060, 406, 1092, 485), 'en': (1060, 406, 1092, 485), 'jp': (1060, 406, 1092, 485), 'tw': (1060, 406, 1092, 485)}, file={'cn': './assets/cn/handler/STRATEGY_OPENED.png', 'en': './assets/en/handler/STRATEGY_OPENED.png', 'jp': './assets/jp/handler/STRATEGY_OPENED.png', 'tw': './assets/tw/handler/STRATEGY_OPENED.png'})
 SUBMARINE_HUNT_OFF = Button(area={'cn': (1200, 415, 1262, 477), 'en': (1200, 415, 1262, 477), 'jp': (1200, 415, 1262, 477), 'tw': (1200, 415, 1262, 477)}, color={'cn': (125, 127, 132), 'en': (125, 127, 132), 'jp': (125, 127, 132), 'tw': (125, 127, 132)}, button={'cn': (1200, 415, 1262, 477), 'en': (1200, 415, 1262, 477), 'jp': (1200, 415, 1262, 477), 'tw': (1200, 415, 1262, 477)}, file={'cn': './assets/cn/handler/SUBMARINE_HUNT_OFF.png', 'en': './assets/en/handler/SUBMARINE_HUNT_OFF.png', 'jp': './assets/jp/handler/SUBMARINE_HUNT_OFF.png', 'tw': './assets/tw/handler/SUBMARINE_HUNT_OFF.png'})
 SUBMARINE_HUNT_ON = Button(area={'cn': (1200, 415, 1262, 477), 'en': (1200, 415, 1262, 477), 'jp': (1200, 415, 1262, 477), 'tw': (1200, 415, 1262, 477)}, color={'cn': (124, 125, 132), 'en': (124, 125, 132), 'jp': (124, 125, 132), 'tw': (124, 125, 132)}, button={'cn': (1200, 415, 1262, 477), 'en': (1200, 415, 1262, 477), 'jp': (1200, 415, 1262, 477), 'tw': (1200, 415, 1262, 477)}, file={'cn': './assets/cn/handler/SUBMARINE_HUNT_ON.png', 'en': './assets/en/handler/SUBMARINE_HUNT_ON.png', 'jp': './assets/jp/handler/SUBMARINE_HUNT_ON.png', 'tw': './assets/tw/handler/SUBMARINE_HUNT_ON.png'})
-SUBMARINE_MOVE_CANCEL = Button(area={'cn': (891, 647, 1005, 673), 'en': (911, 650, 984, 667), 'jp': (889, 645, 1008, 675), 'tw': (891, 647, 1005, 673)}, color={'cn': (219, 172, 167), 'en': (211, 162, 158), 'jp': (198, 141, 133), 'tw': (219, 172, 167)}, button={'cn': (891, 647, 1005, 673), 'en': (911, 650, 984, 667), 'jp': (889, 645, 1008, 675), 'tw': (891, 647, 1005, 673)}, file={'cn': './assets/cn/handler/SUBMARINE_MOVE_CANCEL.png', 'en': './assets/en/handler/SUBMARINE_MOVE_CANCEL.png', 'jp': './assets/jp/handler/SUBMARINE_MOVE_CANCEL.png', 'tw': './assets/cn/handler/SUBMARINE_MOVE_CANCEL.png'})
-SUBMARINE_MOVE_CONFIRM = Button(area={'cn': (1103, 646, 1218, 674), 'en': (1101, 650, 1222, 667), 'jp': (1101, 645, 1220, 675), 'tw': (1103, 646, 1218, 674)}, color={'cn': (157, 185, 222), 'en': (163, 184, 219), 'jp': (131, 172, 218), 'tw': (157, 185, 222)}, button={'cn': (1103, 646, 1218, 674), 'en': (1101, 650, 1222, 667), 'jp': (1101, 645, 1220, 675), 'tw': (1103, 646, 1218, 674)}, file={'cn': './assets/cn/handler/SUBMARINE_MOVE_CONFIRM.png', 'en': './assets/en/handler/SUBMARINE_MOVE_CONFIRM.png', 'jp': './assets/jp/handler/SUBMARINE_MOVE_CONFIRM.png', 'tw': './assets/cn/handler/SUBMARINE_MOVE_CONFIRM.png'})
+SUBMARINE_MOVE_CANCEL = Button(area={'cn': (891, 647, 1005, 673), 'en': (911, 650, 984, 667), 'jp': (889, 645, 1008, 675), 'tw': (889, 646, 1006, 674)}, color={'cn': (219, 172, 167), 'en': (211, 162, 158), 'jp': (198, 141, 133), 'tw': (215, 164, 161)}, button={'cn': (891, 647, 1005, 673), 'en': (911, 650, 984, 667), 'jp': (889, 645, 1008, 675), 'tw': (889, 646, 1006, 674)}, file={'cn': './assets/cn/handler/SUBMARINE_MOVE_CANCEL.png', 'en': './assets/en/handler/SUBMARINE_MOVE_CANCEL.png', 'jp': './assets/jp/handler/SUBMARINE_MOVE_CANCEL.png', 'tw': './assets/tw/handler/SUBMARINE_MOVE_CANCEL.png'})
+SUBMARINE_MOVE_CONFIRM = Button(area={'cn': (1103, 646, 1218, 674), 'en': (1101, 650, 1222, 667), 'jp': (1101, 645, 1220, 675), 'tw': (1102, 646, 1220, 674)}, color={'cn': (157, 185, 222), 'en': (163, 184, 219), 'jp': (131, 172, 218), 'tw': (156, 182, 220)}, button={'cn': (1103, 646, 1218, 674), 'en': (1101, 650, 1222, 667), 'jp': (1101, 645, 1220, 675), 'tw': (1102, 646, 1220, 674)}, file={'cn': './assets/cn/handler/SUBMARINE_MOVE_CONFIRM.png', 'en': './assets/en/handler/SUBMARINE_MOVE_CONFIRM.png', 'jp': './assets/jp/handler/SUBMARINE_MOVE_CONFIRM.png', 'tw': './assets/tw/handler/SUBMARINE_MOVE_CONFIRM.png'})
 SUBMARINE_MOVE_ENTER = Button(area={'cn': (1109, 511, 1169, 571), 'en': (1109, 511, 1169, 571), 'jp': (1109, 511, 1169, 571), 'tw': (1109, 511, 1169, 571)}, color={'cn': (106, 107, 114), 'en': (106, 107, 114), 'jp': (106, 107, 114), 'tw': (106, 107, 114)}, button={'cn': (1109, 511, 1169, 571), 'en': (1109, 511, 1169, 571), 'jp': (1109, 511, 1169, 571), 'tw': (1109, 511, 1169, 571)}, file={'cn': './assets/cn/handler/SUBMARINE_MOVE_ENTER.png', 'en': './assets/en/handler/SUBMARINE_MOVE_ENTER.png', 'jp': './assets/jp/handler/SUBMARINE_MOVE_ENTER.png', 'tw': './assets/tw/handler/SUBMARINE_MOVE_ENTER.png'})
 SUBMARINE_VIEW_OFF = Button(area={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, color={'cn': (156, 156, 158), 'en': (156, 156, 158), 'jp': (156, 156, 158), 'tw': (156, 156, 158)}, button={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, file={'cn': './assets/cn/handler/SUBMARINE_VIEW_OFF.png', 'en': './assets/en/handler/SUBMARINE_VIEW_OFF.png', 'jp': './assets/jp/handler/SUBMARINE_VIEW_OFF.png', 'tw': './assets/tw/handler/SUBMARINE_VIEW_OFF.png'})
 SUBMARINE_VIEW_ON = Button(area={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, color={'cn': (177, 178, 179), 'en': (177, 178, 179), 'jp': (177, 178, 179), 'tw': (177, 178, 179)}, button={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, 1170, 468), 'jp': (1140, 435, 1170, 468), 'tw': (1140, 435, 1170, 468)}, file={'cn': './assets/cn/handler/SUBMARINE_VIEW_ON.png', 'en': './assets/en/handler/SUBMARINE_VIEW_ON.png', 'jp': './assets/jp/handler/SUBMARINE_VIEW_ON.png', 'tw': './assets/tw/handler/SUBMARINE_VIEW_ON.png'})

module/os_ash/ash.py

@@ -62,20 +62,13 @@ def handle_battle_preparation(self):
         if self.appear(BEACON_EMPTY, offset=(20, 20)):
             logger.info("Ash beacon already empty.")
             raise AshBeaconFinished
+        if self.appear(ASH_SHOWDOWN, offset=(20, 20)):
+            logger.info("Ash beacon already at ASH_SHOWDOWN.")
+            raise AshBeaconFinished
 
         return False
 
     def combat(self, *args, expected_end=None, **kwargs):
-        end = expected_end
-        if end is not None and callable(end):
-            def expected_end():
-                if end():
-                    logger.info('Meta combat finished and in correct page.')
-                    return True
-                if self.appear(BATTLE_PREPARATION, offset=(30, 30), interval=2):
-                    logger.info('Wrong click into battle preparation page')
-                    self.device.click(BACK_ARROW)
-                    return False
         try:
             super().combat(*args, expected_end=expected_end, **kwargs)
         except AshBeaconFinished:

module/os_ash/meta.py

@@ -119,9 +119,19 @@ def _make_an_attack(self):
             out: in_meta, ASH_START or BEACON_REWARD
         """
         logger.hr('Begin meta combat', level=2)
+
+        def expected_end():
+            if self.appear(BATTLE_PREPARATION, offset=(30, 30), interval=2):
+                logger.info('Wrong click into battle preparation page')
+                self.device.click(BACK_ARROW)
+                return False
+            if self._in_meta_page():
+                logger.info('Meta combat finished and in correct page.')
+                return True
+
         # Attack
         combat = AshCombat(config=self.config, device=self.device)
-        combat.combat(expected_end=self._in_meta_page, save_get_items=False, emotion_reduce=False)
+        combat.combat(expected_end=expected_end, save_get_items=False, emotion_reduce=False)
 
     def _handle_ash_beacon_reward(self, skip_first_screenshot=True):
         """
@@ -427,9 +437,25 @@ def _make_an_attack(self):
             out: in_meta_assist
         """
         logger.hr('Begin meta assist combat', level=2)
+
+        def expected_end():
+            if self.appear(BATTLE_PREPARATION, offset=(30, 30), interval=2):
+                logger.info('Wrong click into battle preparation page')
+                self.device.click(BACK_ARROW)
+                return False
+            # AL redirects to unfinished self beacon after assist, so switch back
+            if self.appear_then_click(BEACON_LIST, offset=(-20, -5, 300, 5), interval=2):
+                return False
+            if self.appear(ASH_SHOWDOWN, offset=(30, 30), interval=2):
+                logger.info('Meta combat finished at ASH_SHOWDOWN.')
+                self.device.click(META_MAIN_BEACON_ENTRANCE)
+            if self._in_meta_assist_page():
+                logger.info('Meta combat finished and in correct page.')
+                return True
+
         # Attack
         combat = AshCombat(config=self.config, device=self.device)
-        combat.combat(expected_end=self._in_meta_assist_page, save_get_items=False, emotion_reduce=False)
+        combat.combat(expected_end=expected_end, save_get_items=False, emotion_reduce=False)
 
     def _ensure_meta_level(self):
         """
@@ -461,9 +487,6 @@ def _ensure_meta_level(self):
         logger.info('Find a beacon in level:' + str(current))
 
     def _in_meta_assist_page(self):
-        # AL redirects to unfinished self beacon after assist, so switch back
-        if self.appear_then_click(BEACON_LIST, offset=(-20, -5, 300, 5), interval=2):
-            return False
         return self.appear(BEACON_MY, offset=(20, 20))
 
     def _ensure_meta_assist_page(self, skip_first_screenshot=True):
@@ -481,7 +504,7 @@ def _ensure_meta_assist_page(self, skip_first_screenshot=True):
                 continue
             if self.appear_then_click(META_ENTRANCE, offset=(20, 300), interval=2):
                 continue
-            if self.appear(ASH_SHOWDOWN, offset=(20, 20)):
+            if self.appear(ASH_SHOWDOWN, offset=(20, 20), interval=2):
                 self.device.click(META_MAIN_BEACON_ENTRANCE)
                 logger.info('In meta page main')
                 continue

module/research/assets.py

@@ -44,7 +44,7 @@
 RESEARCH_RUNNING = Button(area={'cn': (313, 556, 362, 619), 'en': (313, 556, 362, 619), 'jp': (313, 556, 362, 619), 'tw': (313, 556, 362, 619)}, color={'cn': (124, 126, 131), 'en': (124, 126, 131), 'jp': (124, 126, 131), 'tw': (124, 126, 131)}, button={'cn': (313, 556, 362, 619), 'en': (313, 556, 362, 619), 'jp': (313, 556, 362, 619), 'tw': (313, 556, 362, 619)}, file={'cn': './assets/cn/research/RESEARCH_RUNNING.png', 'en': './assets/en/research/RESEARCH_RUNNING.png', 'jp': './assets/jp/research/RESEARCH_RUNNING.png', 'tw': './assets/tw/research/RESEARCH_RUNNING.png'})
 RESEARCH_START = Button(area={'cn': (445, 569, 568, 597), 'en': (459, 571, 556, 591), 'jp': (423, 556, 596, 608), 'tw': (444, 566, 569, 597)}, color={'cn': (173, 211, 242), 'en': (140, 188, 231), 'jp': (109, 163, 219), 'tw': (175, 212, 242)}, button={'cn': (445, 569, 568, 597), 'en': (459, 571, 556, 591), 'jp': (423, 556, 596, 608), 'tw': (444, 566, 569, 597)}, file={'cn': './assets/cn/research/RESEARCH_START.png', 'en': './assets/en/research/RESEARCH_START.png', 'jp': './assets/jp/research/RESEARCH_START.png', 'tw': './assets/tw/research/RESEARCH_START.png'})
 RESEARCH_STOP = Button(area={'cn': (329, 561, 485, 602), 'en': (349, 574, 464, 592), 'jp': (333, 561, 488, 604), 'tw': (327, 560, 488, 604)}, color={'cn': (228, 138, 117), 'en': (231, 152, 141), 'jp': (225, 138, 117), 'tw': (227, 141, 118)}, button={'cn': (329, 561, 485, 602), 'en': (349, 574, 464, 592), 'jp': (333, 561, 488, 604), 'tw': (327, 560, 488, 604)}, file={'cn': './assets/cn/research/RESEARCH_STOP.png', 'en': './assets/en/research/RESEARCH_STOP.png', 'jp': './assets/jp/research/RESEARCH_STOP.png', 'tw': './assets/tw/research/RESEARCH_STOP.png'})
-RESEARCH_UNAVAILABLE = Button(area={'cn': (509, 569, 568, 597), 'en': (459, 572, 556, 591), 'jp': (449, 569, 566, 596), 'tw': (440, 565, 576, 601)}, color={'cn': (185, 191, 194), 'en': (152, 178, 200), 'jp': (169, 184, 208), 'tw': (156, 181, 203)}, button={'cn': (509, 569, 568, 597), 'en': (459, 572, 556, 591), 'jp': (449, 569, 566, 596), 'tw': (440, 565, 576, 601)}, file={'cn': './assets/cn/research/RESEARCH_UNAVAILABLE.png', 'en': './assets/en/research/RESEARCH_UNAVAILABLE.png', 'jp': './assets/jp/research/RESEARCH_UNAVAILABLE.png', 'tw': './assets/tw/research/RESEARCH_UNAVAILABLE.png'})
+RESEARCH_UNAVAILABLE = Button(area={'cn': (509, 569, 568, 597), 'en': (459, 572, 556, 591), 'jp': (449, 569, 566, 596), 'tw': (444, 566, 569, 596)}, color={'cn': (185, 191, 194), 'en': (152, 178, 200), 'jp': (169, 184, 208), 'tw': (179, 190, 210)}, button={'cn': (509, 569, 568, 597), 'en': (459, 572, 556, 591), 'jp': (449, 569, 566, 596), 'tw': (444, 566, 569, 596)}, file={'cn': './assets/cn/research/RESEARCH_UNAVAILABLE.png', 'en': './assets/en/research/RESEARCH_UNAVAILABLE.png', 'jp': './assets/jp/research/RESEARCH_UNAVAILABLE.png', 'tw': './assets/tw/research/RESEARCH_UNAVAILABLE.png'})
 RESET_AVAILABLE = Button(area={'cn': (1153, 662, 1227, 679), 'en': (1099, 648, 1238, 693), 'jp': (1101, 650, 1236, 690), 'tw': (1102, 651, 1235, 691)}, color={'cn': (101, 118, 152), 'en': (62, 84, 110), 'jp': (74, 88, 121), 'tw': (67, 82, 116)}, button={'cn': (1153, 662, 1227, 679), 'en': (1099, 648, 1238, 693), 'jp': (1101, 650, 1236, 690), 'tw': (1102, 651, 1235, 691)}, file={'cn': './assets/cn/research/RESET_AVAILABLE.png', 'en': './assets/en/research/RESET_AVAILABLE.png', 'jp': './assets/jp/research/RESET_AVAILABLE.png', 'tw': './assets/tw/research/RESET_AVAILABLE.png'})
 SERIES_1 = Button(area={'cn': (86, 154, 113, 173), 'en': (86, 154, 113, 173), 'jp': (86, 154, 113, 173), 'tw': (86, 154, 113, 173)}, color={'cn': (197, 108, 91), 'en': (197, 108, 91), 'jp': (197, 108, 91), 'tw': (197, 108, 91)}, button={'cn': (86, 154, 113, 173), 'en': (86, 154, 113, 173), 'jp': (86, 154, 113, 173), 'tw': (86, 154, 113, 173)}, file={'cn': './assets/cn/research/SERIES_1.png', 'en': './assets/en/research/SERIES_1.png', 'jp': './assets/jp/research/SERIES_1.png', 'tw': './assets/tw/research/SERIES_1.png'})
 SERIES_2 = Button(area={'cn': (301, 122, 332, 144), 'en': (301, 122, 332, 144), 'jp': (301, 122, 332, 144), 'tw': (301, 122, 332, 144)}, color={'cn': (199, 112, 96), 'en': (199, 112, 96), 'jp': (199, 112, 96), 'tw': (199, 112, 96)}, button={'cn': (301, 122, 332, 144), 'en': (301, 122, 332, 144), 'jp': (301, 122, 332, 144), 'tw': (301, 122, 332, 144)}, file={'cn': './assets/cn/research/SERIES_2.png', 'en': './assets/en/research/SERIES_2.png', 'jp': './assets/jp/research/SERIES_2.png', 'tw': './assets/tw/research/SERIES_2.png'})

submodule/AlasMaaBridge/module/config/argument/args.json

@@ -584,6 +584,14 @@
       }
     },
     "MaaRoguelike": {
+      "Theme": {
+        "type": "select",
+        "value": "Phantom",
+        "option": [
+          "Phantom",
+          "Mizuki"
+        ]
+      },
       "Mode": {
         "type": "select",
         "value": 0,
@@ -608,6 +616,9 @@
         "type": "select",
         "value": "指挥分队",
         "option": [
+          "心胜于物分队",
+          "物尽其用分队",
+          "以人为本分队",
           "指挥分队",
           "集群分队",
           "后勤分队",

submodule/AlasMaaBridge/module/config/argument/argument.yaml

@@ -102,6 +102,9 @@ MaaMall:
     type: textarea
 
 MaaRoguelike:
+  Theme:
+    value: Phantom
+    option: [Phantom, Mizuki]
   Mode:
     value: 0
     option: [0, 1]
@@ -110,7 +113,7 @@ MaaRoguelike:
   StopWhenInvestmentFull: false
   Squad:
     value: 指挥分队
-    option: [指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队]
+    option: [心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队]
   Roles:
     value: 取长补短
     option: [先手必胜, 稳扎稳打, 取长补短, 随心所欲]

submodule/AlasMaaBridge/module/config/config_generated.py

@@ -73,11 +73,12 @@ class GeneratedConfig:
     MaaMall_BlackList = '碳 > 家具'
 
     # Group `MaaRoguelike`
+    MaaRoguelike_Theme = 'Phantom'  # Phantom, Mizuki
     MaaRoguelike_Mode = 0  # 0, 1
     MaaRoguelike_StartsCount = 9999999
     MaaRoguelike_InvestmentsCount = 9999999
     MaaRoguelike_StopWhenInvestmentFull = False
-    MaaRoguelike_Squad = '指挥分队'  # 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队
+    MaaRoguelike_Squad = '指挥分队'  # 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队
     MaaRoguelike_Roles = '取长补短'  # 先手必胜, 稳扎稳打, 取长补短, 随心所欲
     MaaRoguelike_CoreChar = None
 

submodule/AlasMaaBridge/module/config/i18n/en-US.json

@@ -311,6 +311,12 @@
       "name": "MaaRoguelike._info.name",
       "help": "MaaRoguelike._info.help"
     },
+    "Theme": {
+      "name": "MaaRoguelike.Theme.name",
+      "help": "MaaRoguelike.Theme.help",
+      "Phantom": "Phantom",
+      "Mizuki": "Mizuki"
+    },
     "Mode": {
       "name": "MaaRoguelike.Mode.name",
       "help": "MaaRoguelike.Mode.help",
@@ -332,6 +338,9 @@
     "Squad": {
       "name": "MaaRoguelike.Squad.name",
       "help": "MaaRoguelike.Squad.help",
+      "心胜于物分队": "心胜于物分队",
+      "物尽其用分队": "物尽其用分队",
+      "以人为本分队": "以人为本分队",
       "指挥分队": "指挥分队",
       "集群分队": "集群分队",
       "后勤分队": "后勤分队",

submodule/AlasMaaBridge/module/config/i18n/ja-JP.json

@@ -311,6 +311,12 @@
       "name": "MaaRoguelike._info.name",
       "help": "MaaRoguelike._info.help"
     },
+    "Theme": {
+      "name": "MaaRoguelike.Theme.name",
+      "help": "MaaRoguelike.Theme.help",
+      "Phantom": "Phantom",
+      "Mizuki": "Mizuki"
+    },
     "Mode": {
       "name": "MaaRoguelike.Mode.name",
       "help": "MaaRoguelike.Mode.help",
@@ -332,6 +338,9 @@
     "Squad": {
       "name": "MaaRoguelike.Squad.name",
       "help": "MaaRoguelike.Squad.help",
+      "心胜于物分队": "心胜于物分队",
+      "物尽其用分队": "物尽其用分队",
+      "以人为本分队": "以人为本分队",
       "指挥分队": "指挥分队",
       "集群分队": "集群分队",
       "后勤分队": "后勤分队",

submodule/AlasMaaBridge/module/config/i18n/zh-CN.json

@@ -311,6 +311,12 @@
       "name": "肉鸽设置",
       "help": ""
     },
+    "Theme": {
+      "name": "肉鸽主题",
+      "help": "",
+      "Phantom": "傀影与猩红血钻",
+      "Mizuki": "水月与深蓝之树"
+    },
     "Mode": {
       "name": "策略",
       "help": "",
@@ -332,6 +338,9 @@
     "Squad": {
       "name": "开局分队",
       "help": "",
+      "心胜于物分队": "心胜于物分队",
+      "物尽其用分队": "物尽其用分队",
+      "以人为本分队": "以人为本分队",
       "指挥分队": "指挥分队",
       "集群分队": "集群分队",
       "后勤分队": "后勤分队",

submodule/AlasMaaBridge/module/config/i18n/zh-TW.json

@@ -311,6 +311,12 @@
       "name": "MaaRoguelike._info.name",
       "help": "MaaRoguelike._info.help"
     },
+    "Theme": {
+      "name": "MaaRoguelike.Theme.name",
+      "help": "MaaRoguelike.Theme.help",
+      "Phantom": "Phantom",
+      "Mizuki": "Mizuki"
+    },
     "Mode": {
       "name": "MaaRoguelike.Mode.name",
       "help": "MaaRoguelike.Mode.help",
@@ -332,6 +338,9 @@
     "Squad": {
       "name": "MaaRoguelike.Squad.name",
       "help": "MaaRoguelike.Squad.help",
+      "心胜于物分队": "心胜于物分队",
+      "物尽其用分队": "物尽其用分队",
+      "以人为本分队": "以人为本分队",
       "指挥分队": "指挥分队",
       "集群分队": "集群分队",
       "后勤分队": "后勤分队",