Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2021-04-27 16:28:29 +08:00

parent 127212b204 0b101fe588

commit 470308db52

17 changed files with 14 additions and 14 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/campaign/SWITCH_2_EX.png

Binary file not shown.

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

BIN

assets/tw/combat/OPTS_INFO_D.BUTTON.png

Binary file not shown.

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

BIN

assets/tw/retire/DOCK_CHECK.png

Binary file not shown.

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

BIN

assets/tw/retire/DOCK_EMPTY.png

Binary file not shown.

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

BIN

assets/tw/retire/DOCK_FILTER.png

Binary file not shown.

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

BIN

assets/tw/retire/DOCK_FILTER_CONFIRM.png

Binary file not shown.

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

BIN

assets/tw/retire/ENHANCE_CONFIRM.png

Binary file not shown.

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

BIN

assets/tw/retire/ENHANCE_RECOMMEND.png

Binary file not shown.

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

BIN

assets/tw/retire/EQUIP_CONFIRM.png

Binary file not shown.

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

BIN

assets/tw/retire/EQUIP_CONFIRM_2.png

Binary file not shown.

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

BIN

assets/tw/retire/SHIP_CONFIRM.png

Binary file not shown.

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

BIN

assets/tw/retire/SHIP_CONFIRM_2.png

Binary file not shown.

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

BIN

assets/tw/retire/SHIP_DETAIL_CHECK.png

Binary file not shown.

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

BIN

assets/tw/retire/SORTING_CLICK.png

Binary file not shown.

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