Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2025-05-22 14:23:40 +08:00

parent 79d72c4fa0 f6e0a0bba2

commit 23d4bd308e

85 changed files with 1755 additions and 143 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/combat_ui/PAUSE_Seaside.png Normal file

Binary file not shown.

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

BIN

assets/cn/combat_ui/QUIT_Cyber.png Normal file

Binary file not shown.

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

BIN

assets/cn/combat_ui/QUIT_Seaside.png Normal file

Binary file not shown.

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

BIN

assets/cn/minigame/GOTO_CHOOSE_GAME.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/minigame/GOTO_CHOOSE_GAME.png

Binary file not shown.

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

BIN

assets/cn/retire/EQUIP_CONFIRM.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/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.6 KiB

BIN

assets/cn/retire/EQUIP_CONFIRM_2.png

Binary file not shown.

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

BIN

assets/cn/reward/MISSION_EMPTY.png Normal file

Binary file not shown.

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

BIN

assets/cn/reward/MISSION_SINGLE.png

Binary file not shown.

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

BIN

assets/cn/reward/MISSION_UNFINISH.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/BOX_AMOUNT_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/BOX_AMOUNT_OCR.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/BOX_USE.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/storage/BOX_USE.png

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_RoyalOak.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_Victorious.gif Normal file

Binary file not shown.

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

BIN

assets/en/minigame/GOTO_CHOOSE_GAME.png

Binary file not shown.

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

BIN

assets/en/retire/EQUIP_CONFIRM.png

Binary file not shown.

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

BIN

assets/en/retire/EQUIP_CONFIRM_2.png

Binary file not shown.

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

BIN

assets/en/reward/MISSION_EMPTY.png Normal file

Binary file not shown.

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

BIN

assets/en/reward/MISSION_SINGLE.png

Binary file not shown.

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

BIN

assets/en/reward/MISSION_UNFINISH.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/BOX_AMOUNT_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/BOX_USE.BUTTON.png

Binary file not shown.

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

BIN

assets/en/storage/BOX_USE.png

Binary file not shown.

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

BIN

assets/en/ui/BUILD_CHECK.png

Binary file not shown.

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

BIN

assets/jp/minigame/GOTO_CHOOSE_GAME.png

Binary file not shown.

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

BIN

assets/jp/retire/EQUIP_CONFIRM.BUTTON.png

Binary file not shown.

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

BIN

assets/jp/retire/EQUIP_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/retire/EQUIP_CONFIRM_2.png

Binary file not shown.

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

BIN

assets/jp/reward/MISSION_EMPTY.png Normal file

Binary file not shown.

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

BIN

assets/jp/reward/MISSION_UNFINISH.png Normal file

Binary file not shown.

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

BIN

assets/jp/storage/BOX_AMOUNT_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/jp/storage/BOX_USE.BUTTON.png

Binary file not shown.

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

BIN

assets/jp/storage/BOX_USE.png

Binary file not shown.

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

BIN

assets/tw/combat_ui/QUIT_Cyber.png Normal file

Binary file not shown.

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

BIN

assets/tw/combat_ui/QUIT_New.png

Binary file not shown.

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

BIN

assets/tw/minigame/GOTO_CHOOSE_GAME.png

Binary file not shown.

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