Merge branch 'master' into dev-minigame-for-pr

Browse Source

# Conflicts:
#	module/ui/assets.py

...

This commit is contained in:

yypsybs

2023-09-01 17:58:39 +08:00

parent 0e5bebd25f c987eb68cb

commit fd9777940b

52 changed files with 591 additions and 158 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/tw/coalition/COALITION_REWARD_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/tw/coalition/FLEET_NOT_PREPARED.png Normal file

Binary file not shown.

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

BIN

assets/tw/coalition/FLEET_PREPARATION.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/tw/coalition/FLEET_PREPARATION.png Normal file

Binary file not shown.

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

BIN

assets/tw/coalition/FLEET_SWITCH_MULTI.png Normal file

Binary file not shown.

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

BIN

assets/tw/coalition/FLEET_SWITCH_SINGLE.png Normal file

Binary file not shown.

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

BIN

assets/tw/coalition/FROSTFALL_EX.png

Binary file not shown.

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

BIN

assets/tw/coalition/FROSTFALL_SP.png

Binary file not shown.

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

BIN

assets/tw/coalition/FROSTFALL_TC1.png

Binary file not shown.

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

BIN

assets/tw/coalition/FROSTFALL_TC2.png

Binary file not shown.

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

BIN

assets/tw/coalition/FROSTFALL_TC3.png

Binary file not shown.

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

BIN

assets/tw/ui/COALITION_CHECK.png Normal file

Binary file not shown.

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