Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

nEEtdo0d

2025-06-15 16:59:21 -04:00

parent 2c75614af6 5fcf1aee95

commit 64c5b5e30f

83 changed files with 662 additions and 153 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/cn/coalition/FLEET_PREPARATION.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/event_hospital/GET_CLUE_TEXT.png Normal file

Binary file not shown.

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

BIN

assets/cn/guild/GUILD_OPERATION_FUND_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/MANJUU_AREA.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/TEMPLATE_MANJUU.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 600 B

BIN

assets/cn/meta_reward/SYNC_ENTER2.png Normal file

Binary file not shown.

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

0

assets/en/war_archives/TEMPLATE_MOONLIT_OVERTURE.png → assets/cn/war_archives/TEMPLATE_MOONLIT_OVERTURE.png

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

BIN

assets/en/meta_reward/SYNC_ENTER.png

Binary file not shown.

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

BIN

assets/en/meta_reward/SYNC_ENTER2.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/DOCK_SELECTED.png

Binary file not shown.

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

BIN

assets/en/reward/MAIL_ENTER.png

Binary file not shown.

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

BIN

assets/jp/retire/DOCK_CHECK.png

Binary file not shown.

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

BIN

assets/jp/tactical/REWAED_2.BUTTON.png

Binary file not shown.

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

BIN

assets/jp/ui/SUPPLY_PACK_CHECK.png

Binary file not shown.

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

BIN

assets/tw/event_hospital/HOSPITAL_BATTLE_PREPARE.png Normal file

Binary file not shown.

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

BIN

assets/tw/event_hospital/TEMPLATE_INVEST.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 766 B

BIN

assets/tw/event_hospital/TEMPLATE_REMAIN_CURRENT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 527 B

BIN

assets/tw/event_hospital/TEMPLATE_REMAIN_TIMES.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 600 B

BIN

assets/tw/retire/EQUIP_CONFIRM.BUTTON.png

Binary file not shown.

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

BIN

assets/tw/retire/EQUIP_CONFIRM.png

Binary file not shown.

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

BIN

assets/tw/retire/EQUIP_CONFIRM_2.png

Binary file not shown.

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

BIN

assets/tw/storage/BOX_AMOUNT_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/tw/storage/BOX_USE.png Normal file

Binary file not shown.

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

BIN

assets/tw/storage/DISASSEMBLE_POPUP_CONFIRM.png Normal file

Binary file not shown.

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