Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2021-04-13 15:23:19 +08:00

parent cc2e0ec53c 1833031a9f

commit 338c4dea94

44 changed files with 68 additions and 21 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/handler/BOOK_OFF_AUTO.png Normal file

Binary file not shown.

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

0

assets/cn/handler/BOOK_OFF.png → assets/cn/handler/BOOK_OFF_PREP.png

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

BIN

assets/cn/handler/BOOK_ON_AUTO.png Normal file

Binary file not shown.

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

0

assets/cn/handler/BOOK_ON.png → assets/cn/handler/BOOK_ON_PREP.png

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

BIN

assets/cn/os/MAP_OVERVIEW.png Normal file

Binary file not shown.

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

BIN

assets/cn/ui/OS_CHECK.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/handler/BOOK_OFF_AUTO.png Normal file

Binary file not shown.

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

0

assets/en/handler/BOOK_OFF.png → assets/en/handler/BOOK_OFF_PREP.png

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

BIN

assets/en/handler/BOOK_ON_AUTO.png Normal file

Binary file not shown.

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

0

assets/en/handler/BOOK_ON.png → assets/en/handler/BOOK_ON_PREP.png

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

BIN

assets/en/os/MAP_OVERVIEW.png Normal file

Binary file not shown.

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

BIN

assets/en/os_handler/GET_MEOWFFICER_ITEMS_1.png

Binary file not shown.

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

BIN

assets/en/os_handler/GET_MEOWFFICER_ITEMS_2.png

Binary file not shown.

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

BIN

assets/en/ui/OS_CHECK.png

Binary file not shown.

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

BIN

assets/en/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png

Binary file not shown.

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

BIN

assets/jp/handler/BOOK_OFF_AUTO.png Normal file

Binary file not shown.

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

0

assets/jp/handler/BOOK_OFF.png → assets/jp/handler/BOOK_OFF_PREP.png

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

BIN

assets/jp/handler/BOOK_ON_AUTO.png Normal file

Binary file not shown.

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

0

assets/jp/handler/BOOK_ON.png → assets/jp/handler/BOOK_ON_PREP.png

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

BIN

assets/jp/os/MAP_OVERVIEW.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/OS_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 4.8 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: 2.9 KiB After Width:  |  Height:  |  Size: 3.7 KiB

BIN

assets/tw/handler/BOOK_OFF_AUTO.png Normal file

Binary file not shown.

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

0

assets/tw/handler/BOOK_OFF.png → assets/tw/handler/BOOK_OFF_PREP.png

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

BIN

assets/tw/handler/BOOK_ON_AUTO.png Normal file

Binary file not shown.

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

0

assets/tw/handler/BOOK_ON.png → assets/tw/handler/BOOK_ON_PREP.png

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

BIN

assets/tw/os/MAP_OVERVIEW.png Normal file

Binary file not shown.

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

BIN

assets/tw/ui/OS_CHECK.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/tw/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png

Binary file not shown.

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