Merge branch 'refs/heads/LmeSzinc/master' into dev

# Conflicts: # module/campaign/campaign_status.py # module/exercise/combat.py # module/retire/dock.py # module/retire/enhancement.py
2026-05-15 03:19:25 +08:00 · 2024-10-25 12:00:50 +08:00
parent e8525ffaf0 25b5349fd3
commit a2e6986dcd
217 changed files with 538 additions and 642 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,9 @@ cmake-build-*/
 # IntelliJ
 out/

+# Visual Studio
+.vs
+
 # mpeltonen/sbt-idea plugin
 .idea_modules/

--- a/assets/cn/exercise/ATTACKER_HP_AREA_New.png
+++ b/assets/cn/exercise/ATTACKER_HP_AREA_New.png
--- a/assets/cn/exercise/DEFENDER_HP_AREA_New.png
+++ b/assets/cn/exercise/DEFENDER_HP_AREA_New.png
--- a/assets/cn/freebies/REWARD_RECEIVE_WHITE.png
+++ b/assets/cn/freebies/REWARD_RECEIVE_WHITE.png
--- a/assets/cn/ui/BATTLE_PASS_CHECK.png
+++ b/assets/cn/ui/BATTLE_PASS_CHECK.png
--- a/assets/cn/war_archives/TEMPLATE_ASHEN_SIMULACRUM.png
+++ b/assets/cn/war_archives/TEMPLATE_ASHEN_SIMULACRUM.png
--- a/assets/cn/war_archives/TEMPLATE_AURORA_NOCTIS.png
+++ b/assets/cn/war_archives/TEMPLATE_AURORA_NOCTIS.png
--- a/assets/cn/war_archives/TEMPLATE_COUNTERATTACK_WITHIN_THE_FJORD.png
+++ b/assets/cn/war_archives/TEMPLATE_COUNTERATTACK_WITHIN_THE_FJORD.png
--- a/assets/cn/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png
+++ b/assets/cn/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png
--- a/assets/cn/war_archives/TEMPLATE_CRIMSON_ECHOES.png
+++ b/assets/cn/war_archives/TEMPLATE_CRIMSON_ECHOES.png
--- a/assets/cn/war_archives/TEMPLATE_DAEDALIAN_HYMN.png
+++ b/assets/cn/war_archives/TEMPLATE_DAEDALIAN_HYMN.png
--- a/assets/cn/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png
+++ b/assets/cn/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png
--- a/assets/cn/war_archives/TEMPLATE_DREAMWAKERS_BUTTERFLY.png
+++ b/assets/cn/war_archives/TEMPLATE_DREAMWAKERS_BUTTERFLY.png
--- a/assets/cn/war_archives/TEMPLATE_EMPYREAL_TRAGICOMEDY.png
+++ b/assets/cn/war_archives/TEMPLATE_EMPYREAL_TRAGICOMEDY.png
--- a/assets/cn/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png
+++ b/assets/cn/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png
--- a/assets/cn/war_archives/TEMPLATE_FALLEN_WINGS.png
+++ b/assets/cn/war_archives/TEMPLATE_FALLEN_WINGS.png
--- a/assets/cn/war_archives/TEMPLATE_GLORIOUS_BATTLE.png
+++ b/assets/cn/war_archives/TEMPLATE_GLORIOUS_BATTLE.png
--- a/assets/cn/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png
+++ b/assets/cn/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png
--- a/assets/cn/war_archives/TEMPLATE_INVERTED_ORTHANT.png
+++ b/assets/cn/war_archives/TEMPLATE_INVERTED_ORTHANT.png
--- a/assets/cn/war_archives/TEMPLATE_IRIS_OF_LIGHT_AND_DARK.png
+++ b/assets/cn/war_archives/TEMPLATE_IRIS_OF_LIGHT_AND_DARK.png
--- a/assets/cn/war_archives/TEMPLATE_KHOROVOD_OF_DAWNS_RIME.png
+++ b/assets/cn/war_archives/TEMPLATE_KHOROVOD_OF_DAWNS_RIME.png
--- a/assets/cn/war_archives/TEMPLATE_MICROLAYER_MEDLEY.png
+++ b/assets/cn/war_archives/TEMPLATE_MICROLAYER_MEDLEY.png
--- a/assets/cn/war_archives/TEMPLATE_MIRROR_INVOLUTION.png
+++ b/assets/cn/war_archives/TEMPLATE_MIRROR_INVOLUTION.png
--- a/assets/cn/war_archives/TEMPLATE_NORTHERN_OVERTURE.png
+++ b/assets/cn/war_archives/TEMPLATE_NORTHERN_OVERTURE.png
--- a/assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png
+++ b/assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png
--- a/assets/cn/war_archives/TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD.png
+++ b/assets/cn/war_archives/TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD.png
--- a/assets/cn/war_archives/TEMPLATE_SKYBOUND_ORATORIO.png
+++ b/assets/cn/war_archives/TEMPLATE_SKYBOUND_ORATORIO.png
--- a/assets/cn/war_archives/TEMPLATE_STARS_OF_THE_SHIMMERING_FJORD.png
+++ b/assets/cn/war_archives/TEMPLATE_STARS_OF_THE_SHIMMERING_FJORD.png
--- a/assets/cn/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png
+++ b/assets/cn/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png
--- a/assets/cn/war_archives/TEMPLATE_SUNDERED_BLUE.png
+++ b/assets/cn/war_archives/TEMPLATE_SUNDERED_BLUE.png
--- a/assets/cn/war_archives/TEMPLATE_SWIRLING_CHERRY_BLOSSOMS.png
+++ b/assets/cn/war_archives/TEMPLATE_SWIRLING_CHERRY_BLOSSOMS.png
--- a/assets/cn/war_archives/TEMPLATE_THE_ENIGMA_AND_THE_SHARK.png
+++ b/assets/cn/war_archives/TEMPLATE_THE_ENIGMA_AND_THE_SHARK.png
--- a/assets/cn/war_archives/TEMPLATE_THE_FLAME_TOUCHED_DAGGER.png
+++ b/assets/cn/war_archives/TEMPLATE_THE_FLAME_TOUCHED_DAGGER.png
--- a/assets/cn/war_archives/TEMPLATE_THE_SOLOMON_RANGER.png
+++ b/assets/cn/war_archives/TEMPLATE_THE_SOLOMON_RANGER.png
--- a/assets/cn/war_archives/TEMPLATE_THE_WAY_HOME_IN_THE_NIGHT.png
+++ b/assets/cn/war_archives/TEMPLATE_THE_WAY_HOME_IN_THE_NIGHT.png
--- a/assets/cn/war_archives/TEMPLATE_TOWER_OF_TRANSCENDENCE.png
+++ b/assets/cn/war_archives/TEMPLATE_TOWER_OF_TRANSCENDENCE.png
--- a/assets/cn/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png
+++ b/assets/cn/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png
--- a/assets/cn/war_archives/TEMPLATE_UPON_THE_SHIMMERING_BLUE.png
+++ b/assets/cn/war_archives/TEMPLATE_UPON_THE_SHIMMERING_BLUE.png
--- a/assets/cn/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png
+++ b/assets/cn/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png
--- a/assets/cn/war_archives/TEMPLATE_WINTERS_CROWN.png
+++ b/assets/cn/war_archives/TEMPLATE_WINTERS_CROWN.png
--- a/assets/en/combat_ui/QUIT.png
+++ b/assets/en/combat_ui/QUIT.png
--- a/assets/en/combat_ui/QUIT_Iridescent_Fantasy.png
+++ b/assets/en/combat_ui/QUIT_Iridescent_Fantasy.png
--- a/assets/en/combat_ui/QUIT_New.png
+++ b/assets/en/combat_ui/QUIT_New.png
--- a/assets/en/exercise/ATTACKER_HP_AREA_New.png
+++ b/assets/en/exercise/ATTACKER_HP_AREA_New.png
--- a/assets/en/exercise/DEFENDER_HP_AREA_New.png
+++ b/assets/en/exercise/DEFENDER_HP_AREA_New.png
--- a/assets/en/freebies/REWARD_RECEIVE_WHITE.png
+++ b/assets/en/freebies/REWARD_RECEIVE_WHITE.png
--- a/assets/en/ui/BATTLE_PASS_CHECK.png
+++ b/assets/en/ui/BATTLE_PASS_CHECK.png
--- a/assets/jp/combat_ui/QUIT.png
+++ b/assets/jp/combat_ui/QUIT.png
--- a/assets/jp/commission/COMMISSION_ADVICE.BUTTON.png
+++ b/assets/jp/commission/COMMISSION_ADVICE.BUTTON.png
--- a/assets/jp/commission/COMMISSION_ADVICE.png
+++ b/assets/jp/commission/COMMISSION_ADVICE.png
--- a/assets/jp/commission/COMMISSION_START.BUTTON.png
+++ b/assets/jp/commission/COMMISSION_START.BUTTON.png
--- a/assets/jp/commission/COMMISSION_START.png
+++ b/assets/jp/commission/COMMISSION_START.png
--- a/assets/jp/daily/OCR_REMAIN.png
+++ b/assets/jp/daily/OCR_REMAIN.png
--- a/assets/jp/dorm/DORM_FURNITURE_BUY_ALL.png
+++ b/assets/jp/dorm/DORM_FURNITURE_BUY_ALL.png
--- a/assets/jp/dorm/DORM_FURNITURE_BUY_CONFIRM.png
+++ b/assets/jp/dorm/DORM_FURNITURE_BUY_CONFIRM.png
--- a/assets/jp/dorm/DORM_FURNITURE_BUY_SET.png
+++ b/assets/jp/dorm/DORM_FURNITURE_BUY_SET.png
--- a/assets/jp/dorm/DORM_FURNITURE_DETAILS_ENTER.png
+++ b/assets/jp/dorm/DORM_FURNITURE_DETAILS_ENTER.png
--- a/assets/jp/exercise/ATTACKER_HP_AREA_New.png
+++ b/assets/jp/exercise/ATTACKER_HP_AREA_New.png
--- a/assets/jp/exercise/DEFENDER_HP_AREA_New.png
+++ b/assets/jp/exercise/DEFENDER_HP_AREA_New.png
--- a/assets/jp/freebies/MAIL_BATCH_CLAIM.png
+++ b/assets/jp/freebies/MAIL_BATCH_CLAIM.png
--- a/assets/jp/freebies/MAIL_BATCH_DELETE.png
+++ b/assets/jp/freebies/MAIL_BATCH_DELETE.png
--- a/assets/jp/freebies/REWARD_RECEIVE_WHITE.png
+++ b/assets/jp/freebies/REWARD_RECEIVE_WHITE.png
--- a/assets/jp/research/RESEARCH_COST_CHECKER.png
+++ b/assets/jp/research/RESEARCH_COST_CHECKER.png
--- a/assets/jp/retire/DOCK_AMOUNT.png
+++ b/assets/jp/retire/DOCK_AMOUNT.png
--- a/assets/jp/retire/TEMPLATE_IN_BATTLE.png
+++ b/assets/jp/retire/TEMPLATE_IN_BATTLE.png
--- a/assets/jp/retire/TEMPLATE_IN_COMMISSION.png
+++ b/assets/jp/retire/TEMPLATE_IN_COMMISSION.png
--- a/assets/jp/storage/BOX_USE.BUTTON.png
+++ b/assets/jp/storage/BOX_USE.BUTTON.png
--- a/assets/jp/storage/BOX_USE.png
+++ b/assets/jp/storage/BOX_USE.png
--- a/assets/jp/storage/MATERIAL_CHECK.png
+++ b/assets/jp/storage/MATERIAL_CHECK.png
--- a/assets/jp/tactical/OCR_SKILL_EXP.png
+++ b/assets/jp/tactical/OCR_SKILL_EXP.png
--- a/assets/jp/ui/BATTLE_PASS_CHECK.png
+++ b/assets/jp/ui/BATTLE_PASS_CHECK.png
--- a/assets/jp/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png
+++ b/assets/jp/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png
--- a/assets/jp/war_archives/TEMPLATE_CRIMSON_ECHOES.png
+++ b/assets/jp/war_archives/TEMPLATE_CRIMSON_ECHOES.png
--- a/assets/jp/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png
+++ b/assets/jp/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png
--- a/assets/jp/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png
+++ b/assets/jp/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png
--- a/assets/jp/war_archives/TEMPLATE_FALLEN_WINGS.png
+++ b/assets/jp/war_archives/TEMPLATE_FALLEN_WINGS.png
--- a/assets/jp/war_archives/TEMPLATE_GLORIOUS_BATTLE.png
+++ b/assets/jp/war_archives/TEMPLATE_GLORIOUS_BATTLE.png
--- a/assets/jp/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png
+++ b/assets/jp/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png
--- a/assets/jp/war_archives/TEMPLATE_IRIS_OF_LIGHT_AND_DARK.png
+++ b/assets/jp/war_archives/TEMPLATE_IRIS_OF_LIGHT_AND_DARK.png
--- a/assets/jp/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png
+++ b/assets/jp/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png
--- a/assets/jp/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png
+++ b/assets/jp/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png
--- a/assets/jp/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png
+++ b/assets/jp/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png
--- a/assets/jp/war_archives/TEMPLATE_WINTERS_CROWN.png
+++ b/assets/jp/war_archives/TEMPLATE_WINTERS_CROWN.png
--- a/assets/tw/coalition/ACADEMY_EASY.png
+++ b/assets/tw/coalition/ACADEMY_EASY.png
--- a/assets/tw/coalition/ACADEMY_EX.png
+++ b/assets/tw/coalition/ACADEMY_EX.png
--- a/assets/tw/coalition/ACADEMY_HARD.png
+++ b/assets/tw/coalition/ACADEMY_HARD.png
--- a/assets/tw/coalition/ACADEMY_MODE_BATTLE.png
+++ b/assets/tw/coalition/ACADEMY_MODE_BATTLE.png
--- a/assets/tw/coalition/ACADEMY_MODE_STORY.png
+++ b/assets/tw/coalition/ACADEMY_MODE_STORY.png
--- a/assets/tw/coalition/ACADEMY_NORMAL.png
+++ b/assets/tw/coalition/ACADEMY_NORMAL.png
--- a/assets/tw/coalition/ACADEMY_SP.png
+++ b/assets/tw/coalition/ACADEMY_SP.png
--- a/assets/tw/coalition/ACADEMY_SWITCH_MULTI.png
+++ b/assets/tw/coalition/ACADEMY_SWITCH_MULTI.png
--- a/assets/tw/coalition/ACADEMY_SWITCH_SINGLE.png
+++ b/assets/tw/coalition/ACADEMY_SWITCH_SINGLE.png
--- a/assets/tw/coalition/ACEDEMY_FLEET_PREPARATION.png
+++ b/assets/tw/coalition/ACEDEMY_FLEET_PREPARATION.png
--- a/assets/tw/coalition/COALITION_ACADEMY_CAMPAIGN_CHECK.png
+++ b/assets/tw/coalition/COALITION_ACADEMY_CAMPAIGN_CHECK.png
--- a/assets/tw/coalition/COALITION_ACADEMY_MAIN_CHECK.png
+++ b/assets/tw/coalition/COALITION_ACADEMY_MAIN_CHECK.png
--- a/assets/tw/coalition/FROSTFALL_FLEET_PREPARATION.BUTTON.png
+++ b/assets/tw/coalition/FROSTFALL_FLEET_PREPARATION.BUTTON.png
--- a/assets/tw/coalition/FROSTFALL_FLEET_PREPARATION.png
+++ b/assets/tw/coalition/FROSTFALL_FLEET_PREPARATION.png
--- a/assets/tw/coalition/FROSTFALL_MODE_BATTLE.png
+++ b/assets/tw/coalition/FROSTFALL_MODE_BATTLE.png
--- a/assets/tw/coalition/FROSTFALL_MODE_STORY.png
+++ b/assets/tw/coalition/FROSTFALL_MODE_STORY.png
--- a/assets/tw/coalition/FROSTFALL_SWITCH_MULTI.png
+++ b/assets/tw/coalition/FROSTFALL_SWITCH_MULTI.png
--- a/Show More
+++ b/Show More