Merge remote-tracking branch 'Lme/master' into dev

Browse Source

# Conflicts:
#	module/campaign/os_run.py
#	module/config/argument/args.json
#	module/os/operation_siren.py
#	module/retire/assets.py
#	module/shop/shop_reward.py
#	module/shop/ui.py
#	module/ui/assets.py

...

This commit is contained in:

Zuosizhu

2025-10-12 11:28:13 +08:00

parent f64f777631 7dd3479e66

commit 31c99d8953

166 changed files with 274 additions and 473 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/jp/freebies/SHOP_REFRESH.png → assets/cn/combat_ui/PAUSE_Ninja.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 3.2 KiB

BIN

assets/cn/combat_ui/QUIT_Ninja.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.2 KiB

BIN

assets/cn/equipment/EQUIPMENT_OPEN.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.4 KiB After Width:  |  Height:  |  Size: 4.1 KiB

BIN

assets/cn/shipyard/MAIN_OCR_COIN.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.8 KiB

BIN

assets/cn/shop/MEDAL_SHOP_SCROLL_AREA.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.2 KiB

BIN

assets/cn/shop/MEDAL_SHOP_SCROLL_AREA_250814.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.2 KiB After Width:  |  Height:  |  Size: 3.9 KiB

BIN

assets/cn/shop/NAV_GENERAL.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.2 KiB

BIN

assets/cn/shop/NAV_MONTHLY.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.1 KiB

BIN

assets/cn/shop/SHOP_CORE.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/cn/shop/SHOP_CORE_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.4 KiB

BIN

assets/cn/shop/SHOP_GIFT_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.1 KiB

BIN

assets/cn/shop/SHOP_GUILD_COINS.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/cn/shop/SHOP_MEDAL.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/cn/shop/SHOP_MEDAL_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.9 KiB

BIN

assets/cn/shop/SHOP_MERIT.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/cn/shop/SHOP_MERIT_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.9 KiB

BIN

assets/cn/shop/SHOP_META_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.2 KiB

BIN

assets/cn/shop/SHOP_OCR_BALANCE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.5 KiB After Width:  |  Height:  |  Size: 5.5 KiB

BIN

assets/cn/shop/SHOP_PROTOTYPE_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.8 KiB

BIN

assets/cn/shop/SHOP_REFRESH.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 5.7 KiB

BIN

assets/en/shop/SHOP_MERIT_SWIPE_END.png → assets/cn/shop/TAB_CORE_LIMITED.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.7 KiB After Width:  |  Height:  |  Size: 4.3 KiB

BIN

assets/en/shop/SHOP_MEDAL_SWIPE_END.png → assets/cn/shop/TAB_CORE_MONTHLY.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.9 KiB After Width:  |  Height:  |  Size: 4.1 KiB

BIN

assets/cn/shop/TAB_GENERAL.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

assets/cn/shop/TAB_GUILD.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

assets/cn/shop/TAB_MEDAL.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

BIN

assets/cn/shop/TAB_MERIT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

BIN

assets/cn/shop/TAB_META.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

BIN

assets/cn/shop/TAB_PRIZE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.7 KiB

BIN

assets/cn/shop/TAB_PROTOTYPE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

assets/cn/ui/MUNITIONS_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.5 KiB After Width:  |  Height:  |  Size: 5.3 KiB

BIN

assets/cn/ui/SUPPLY_PACK_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.8 KiB After Width:  |  Height:  |  Size: 5.2 KiB

BIN

assets/en/equipment/EQUIPMENT_OPEN.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.1 KiB After Width:  |  Height:  |  Size: 4.0 KiB

BIN

assets/en/freebies/FREE_SUPPLY_PACK.BUTTON.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 15 KiB

BIN

assets/en/freebies/FREE_SUPPLY_PACK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.8 KiB After Width:  |  Height:  |  Size: 5.1 KiB

BIN

assets/en/shop/MEDAL_SHOP_SCROLL_AREA.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.2 KiB

BIN

assets/en/shop/MEDAL_SHOP_SCROLL_AREA_250814.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.9 KiB

BIN

assets/en/shop/NAV_GENERAL.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.5 KiB

BIN

assets/en/shop/NAV_MONTHLY.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.5 KiB

BIN

assets/en/shop/SHOP_CORE.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/en/shop/SHOP_CORE_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.8 KiB

BIN

assets/en/shop/SHOP_GIFT_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.1 KiB

BIN

assets/en/shop/SHOP_GUILD_COINS.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/en/shop/SHOP_MEDAL.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/en/shop/SHOP_MERIT.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/en/shop/SHOP_META_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 11 KiB

BIN

assets/en/shop/SHOP_OCR_BALANCE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

assets/en/shop/SHOP_PROTOTYPE_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 12 KiB

BIN

assets/en/shop/SHOP_REFRESH.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 5.7 KiB

BIN

assets/en/shop/TAB_CORE_LIMITED.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.7 KiB

BIN

assets/en/shop/TAB_CORE_MONTHLY.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/en/shop/TAB_GENERAL.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.7 KiB

BIN

assets/en/shop/TAB_GUILD.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.2 KiB

BIN

assets/en/shop/TAB_MEDAL.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

assets/en/shop/TAB_MERIT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.2 KiB

BIN

assets/en/shop/TAB_META.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

assets/en/shop/TAB_PRIZE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

assets/en/shop/TAB_PROTOTYPE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

assets/en/ui/MUNITIONS_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.9 KiB After Width:  |  Height:  |  Size: 5.7 KiB

BIN

assets/en/ui/SUPPLY_PACK_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.4 KiB After Width:  |  Height:  |  Size: 6.3 KiB

BIN

assets/jp/equipment/EQUIPMENT_OPEN.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.2 KiB After Width:  |  Height:  |  Size: 3.9 KiB

BIN

assets/jp/freebies/MEDAL_SHOP_SCROLL_AREA_250814.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.2 KiB

BIN

assets/jp/freebies/SHOP_OCR_BALANCE.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 5.5 KiB

BIN

assets/jp/shop/MEDAL_SHOP_SCROLL_AREA.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.2 KiB

BIN

assets/jp/shop/NAV_GENERAL.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

assets/jp/shop/NAV_MONTHLY.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

assets/jp/shop/SHOP_CORE.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/jp/shop/SHOP_CORE_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB

BIN

assets/jp/shop/SHOP_GIFT_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 12 KiB

BIN

assets/jp/shop/SHOP_GUILD_COINS.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/jp/shop/SHOP_MEDAL.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/jp/shop/SHOP_MEDAL_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.7 KiB

BIN

assets/jp/shop/SHOP_MERIT.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/jp/shop/SHOP_MERIT_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.8 KiB

BIN

assets/jp/shop/SHOP_META_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 12 KiB

BIN

assets/jp/shop/SHOP_PROTOTYPE_SWIPE_END.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB

BIN

assets/jp/shop/TAB_CORE_LIMITED.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

assets/jp/shop/TAB_CORE_MONTHLY.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

BIN

assets/jp/shop/TAB_GENERAL.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

assets/jp/shop/TAB_GUILD.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.5 KiB

BIN

assets/jp/shop/TAB_MEDAL.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.7 KiB

BIN

assets/jp/shop/TAB_MERIT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

assets/jp/shop/TAB_META.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.7 KiB

BIN

assets/jp/shop/TAB_PRIZE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.0 KiB

BIN

assets/jp/shop/TAB_PROTOTYPE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.1 KiB

BIN

assets/shop/general/BookBlueT2_3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 15 KiB

BIN

assets/shop/general/BookYellowT3_3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 16 KiB

BIN

assets/shop/general/BoxIrisT2_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 19 KiB

BIN

assets/shop/general/BoxSardegnaT2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 19 KiB

BIN

assets/shop/general/BoxSardegnaT2_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 19 KiB

BIN

assets/shop/general/BoxSardegnaT2_3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 19 KiB

BIN

assets/shop/general/BoxT2_3.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 18 KiB

BIN

assets/shop/general/FoodT2_3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

BIN

assets/shop/guild/Chip_4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 19 KiB

BIN

assets/shop/guild/PlateT4_4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

BIN

assets/shop/medal/SpecializedCore_3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 17 KiB

BIN

assets/shop/merit/BoxIrisT2_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

BIN

assets/shop/os/DevelopmentMaterialT1_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 17 KiB

BIN

assets/shop/os/DevelopmentMaterialT2_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

BIN

assets/shop/os/DevelopmentMaterialT3_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

BIN

assets/shop/os/GearDesignPlanT3_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 17 KiB

Some files were not shown because too many files have changed in this diff Show More