Merge branch 'master' into app

Browse Source

...

This commit is contained in:

LmeSzinc

2021-10-15 21:22:41 +08:00

parent 5c22b1555e ef286fed2b

commit 1a683b02a4

24 changed files with 10 additions and 10 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/combat/AUTOMATION_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/handler/VOTE_CANCEL.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_SELECT_PR1.png

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_FALLEN_WINGS.png

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_GLORIOUS_BATTLE.png

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_IRIS_OF_LIGHT_AND_DARK.png

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_WINTERS_CROWN.png

Binary file not shown.

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

BIN

assets/tw/raid/SURUGA_OCR_REMAIN_EASY.png Normal file

Binary file not shown.

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

BIN

assets/tw/raid/SURUGA_OCR_REMAIN_HARD.png Normal file

Binary file not shown.

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

BIN

assets/tw/raid/SURUGA_OCR_REMAIN_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/tw/raid/SURUGA_RAID_EASY.png Normal file

Binary file not shown.

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

BIN

assets/tw/raid/SURUGA_RAID_HARD.png Normal file

Binary file not shown.

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

BIN

assets/tw/raid/SURUGA_RAID_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/tw/ui/RAID_CHECK.png

Binary file not shown.

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