diff --git a/campaign/Readme.md b/campaign/Readme.md index ce757ea59..99068ffbc 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -304,3 +304,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20260618 | event 20240521 cn | Light of the Martyrium Rerun | 复刻绽放于辉光之城 | Light of the Martyrium Rerun | 赫輝のマルティリウム(復刻) | - | | 20260625 | event 20230223 cn | Revelations of Dust | - | - | - | 復刻湮燼塵墟 | | 20260625 | event 20260625 cn | Miracle by Midnight | 美梦巡演奇妙夜 | Miracle by Midnight | 幻夢のカヴァルカード | - | +| 20260703 | coalition 20230323 | Frostfall | - | - | - | 極地風暴 | diff --git a/config/template.json b/config/template.json index 97b2eae14..a0331255e 100644 --- a/config/template.json +++ b/config/template.json @@ -742,7 +742,7 @@ "ClearAfterSinking": false }, "Coalition": { - "Mode": "hard", + "Mode": "tc3", "Fleet": "single" }, "StopCondition": { @@ -1478,7 +1478,8 @@ }, "Meowfficer": { "BuyAmount": 1, - "FortChoreMeowfficer": true + "FortChoreMeowfficer": true, + "OverflowCoins": -1 }, "MeowfficerTrain": { "Enable": false, diff --git a/module/config/argument/args.json b/module/config/argument/args.json index fda46ecc2..df4ad0496 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -3666,6 +3666,7 @@ "type": "state", "value": "campaign_main", "option": [ + "coalition_20230323", "coalition_20260122" ], "option_cn": [ @@ -3678,9 +3679,10 @@ "coalition_20260122" ], "option_tw": [ - "coalition_20260122" + "coalition_20230323" ], "option_bold": [ + "coalition_20230323", "coalition_20260122" ] }, @@ -3727,11 +3729,12 @@ "Coalition": { "Mode": { "type": "select", - "value": "hard", + "value": "tc3", "option": [ - "easy", - "normal", - "hard" + "tc1", + "tc2", + "tc3", + "ex" ] }, "Fleet": { @@ -7026,6 +7029,7 @@ "type": "select", "value": "campaign_main", "option": [ + "coalition_20230323", "coalition_20260122" ], "option_cn": [ @@ -7038,9 +7042,10 @@ "coalition_20260122" ], "option_tw": [ - "coalition_20260122" + "coalition_20230323" ], "option_bold": [ + "coalition_20230323", "coalition_20260122" ] }, @@ -7089,10 +7094,11 @@ "type": "select", "value": "sp", "option": [ - "easy", - "normal", - "hard", - "sp" + "tc1", + "tc2", + "tc3", + "sp", + "ex" ], "display": "hide" }, diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 1e4df14bd..896fac529 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -348,8 +348,8 @@ MaritimeEscort: Enable: true Coalition: Mode: - value: hard - option: [ easy, normal, hard, sp ] + value: tc3 + option: [ tc1, tc2, tc3, sp, ex ] Fleet: value: single option: [ single, multi ] diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index 8af6d75c7..e88d9d3dc 100644 --- a/module/config/argument/override.yaml +++ b/module/config/argument/override.yaml @@ -237,7 +237,7 @@ Coalition: ClearAfterSinking: false Coalition: Mode: - option: [ easy, normal, hard ] + option: [ tc1, tc2, tc3, ex ] StopCondition: MapAchievement: non_stop StageIncrease: false diff --git a/module/config/config_generated.py b/module/config/config_generated.py index ad8797472..dad9fee48 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -202,7 +202,7 @@ class GeneratedConfig: MaritimeEscort_Enable = True # Group `Coalition` - Coalition_Mode = 'hard' # easy, normal, hard, sp + Coalition_Mode = 'tc3' # tc1, tc2, tc3, sp, ex Coalition_Fleet = 'single' # single, multi # Group `Commission` diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 2b233d124..08cf19040 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -83,7 +83,7 @@ "help": "" }, "Coalition": { - "name": "Light & Shadow Fashion Shoot", + "name": "Frostfall", "help": "" }, "MaritimeEscort": { @@ -119,7 +119,7 @@ "help": "" }, "CoalitionSp": { - "name": "Light & Shadow Fashion Shoot SP", + "name": "Frostfall SP", "help": "" }, "Commission": { @@ -1453,10 +1453,11 @@ "Mode": { "name": "Mode", "help": "SP needs to use event daily SP to run", - "easy": "Easy", - "normal": "Normal", - "hard": "Hard", - "sp": "SP" + "tc1": "tc1", + "tc2": "tc2", + "tc3": "tc3", + "sp": "sp", + "ex": "ex" }, "Fleet": { "name": "Fleet", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index cf46e24d8..56ef011d6 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -83,7 +83,7 @@ "help": "" }, "Coalition": { - "name": "特集写真-撮影進行中", + "name": "星霜海嵐", "help": "" }, "MaritimeEscort": { @@ -119,7 +119,7 @@ "help": "" }, "CoalitionSp": { - "name": "特集写真-撮影進行中SP", + "name": "星霜海嵐SP", "help": "" }, "Commission": { @@ -1453,10 +1453,11 @@ "Mode": { "name": "Coalition.Mode.name", "help": "Coalition.Mode.help", - "easy": "easy", - "normal": "normal", - "hard": "hard", - "sp": "sp" + "tc1": "tc1", + "tc2": "tc2", + "tc3": "tc3", + "sp": "sp", + "ex": "ex" }, "Fleet": { "name": "Coalition.Fleet.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 3dd215f03..34112ba25 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -83,7 +83,7 @@ "help": "" }, "Coalition": { - "name": "光影风尚-拍摄进行时", + "name": "极地风暴", "help": "" }, "MaritimeEscort": { @@ -119,7 +119,7 @@ "help": "" }, "CoalitionSp": { - "name": "光影风尚-拍摄进行时SP", + "name": "极地风暴每日SP", "help": "" }, "Commission": { @@ -1453,10 +1453,11 @@ "Mode": { "name": "难度", "help": "SP图需要使用活动每日SP运行", - "easy": "简单", - "normal": "普通", - "hard": "困难", - "sp": "SP" + "tc1": "tc1", + "tc2": "tc2", + "tc3": "tc3", + "sp": "sp", + "ex": "ex" }, "Fleet": { "name": "出击队伍", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index e703b46d9..a98b2fe59 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -83,7 +83,7 @@ "help": "" }, "Coalition": { - "name": "光影風尚-拍攝進行時", + "name": "極地風暴", "help": "" }, "MaritimeEscort": { @@ -119,7 +119,7 @@ "help": "" }, "CoalitionSp": { - "name": "光影風尚-拍攝進行時SP", + "name": "極地風暴SP", "help": "" }, "Commission": { @@ -1453,10 +1453,11 @@ "Mode": { "name": "難度", "help": "SP圖需要使用活動每日SP運行", - "easy": "簡單", - "normal": "普通", - "hard": "困難", - "sp": "SP" + "tc1": "tc1", + "tc2": "tc2", + "tc3": "tc3", + "sp": "sp", + "ex": "ex" }, "Fleet": { "name": "出擊隊伍", diff --git a/module/device/method/nemu_ipc.py b/module/device/method/nemu_ipc.py index 556255f32..243a4e201 100644 --- a/module/device/method/nemu_ipc.py +++ b/module/device/method/nemu_ipc.py @@ -225,6 +225,8 @@ class NemuIpcImpl: os.path.abspath(os.path.join(nemu_folder, './shell/sdk/external_renderer_ipc.dll')), # MuMuPlayer12 5.0 os.path.abspath(os.path.join(nemu_folder, './nx_device/12.0/shell/sdk/external_renderer_ipc.dll')), + # MuMuPlayer12 6.0 + os.path.abspath(os.path.join(nemu_folder, './nx_main/sdk/external_renderer_ipc.dll')), ] self.lib = None for ipc_dll in list_dll: diff --git a/module/map/map_operation.py b/module/map/map_operation.py index 36a31eb0e..13710d7fa 100644 --- a/module/map/map_operation.py +++ b/module/map/map_operation.py @@ -235,6 +235,9 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand logger.warning('Entered map with is_combat_loading appeared') break else: + if hasattr(self, 'is_combat_loading') and self.is_combat_loading(): + logger.warning('Entered map with is_combat_loading appeared') + break if self.handle_in_map_with_enemy_searching(): # self.handle_map_after_combat_story() break diff --git a/module/ui/page.py b/module/ui/page.py index 224e753d8..a22e334df 100644 --- a/module/ui/page.py +++ b/module/ui/page.py @@ -132,10 +132,10 @@ page_campaign.link(button=CAMPAIGN_GOTO_EVENT, destination=page_sp) # Coalition # FROSTFALL -# page_coalition = Page(FROSTFALL_COALITION_CHECK) -# page_coalition.link(button=GOTO_MAIN, destination=page_main) -# page_coalition.link(button=BACK_ARROW, destination=page_campaign_menu) -# page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition) +page_coalition = Page(FROSTFALL_COALITION_CHECK) +page_coalition.link(button=GOTO_MAIN, destination=page_main) +page_coalition.link(button=BACK_ARROW, destination=page_campaign_menu) +page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition) # ACADEMY # page_coalition_menu = Page(COALITION_ACADEMY_MAIN_CHECK) # page_coalition_menu.link(button=COALITION_ACADEMY_HOME, destination=page_main) @@ -155,10 +155,10 @@ page_campaign.link(button=CAMPAIGN_GOTO_EVENT, destination=page_sp) # page_coalition.link(button=BACK_ARROW, destination=page_campaign_menu) # page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition) # FASHION -page_coalition = Page(FASHION_COALITION_CHECK) -page_coalition.link(button=GOTO_MAIN, destination=page_main) -page_coalition.link(button=BACK_ARROW, destination=page_campaign_menu) -page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition) +# page_coalition = Page(FASHION_COALITION_CHECK) +# page_coalition.link(button=GOTO_MAIN, destination=page_main) +# page_coalition.link(button=BACK_ARROW, destination=page_campaign_menu) +# page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition) # Operation Siren page_os = Page(OS_CHECK)