Merge branch 'dev'

Browse Source

# Conflicts:
#	module/meowfficer/assets.py

...

This commit is contained in:

LmeSzinc

2022-02-06 12:31:54 +08:00

parent c01a37eeb6 35ec778be8

commit ef173788a5

135 changed files with 3762 additions and 1379 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/USER_AGREEMENT_SCROLL.png

Binary file not shown.

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

BIN

assets/tw/handler/LOGIN_CONFIRM.png → assets/cn/os/ZONE_LOCKED.png

Binary file not shown.

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

BIN

assets/cn/war_archives/WAR_ARCHIVES_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/LOGIN_CONFIRM.png

Binary file not shown.

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

BIN

assets/cn/handler/LOGIN_CONFIRM.png → assets/en/os/ZONE_LOCKED.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/en/war_archives/WAR_ARCHIVES_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/jp/handler/LOGIN_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/handler/USER_AGREEMENT_SCROLL.png → assets/jp/os/ZONE_LOCKED.png

Binary file not shown.

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

BIN

assets/jp/war_archives/WAR_ARCHIVES_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/tw/handler/USER_AGREEMENT_SCROLL.png

Binary file not shown.

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

BIN

assets/en/handler/USER_AGREEMENT_SCROLL.png → assets/tw/os/ZONE_LOCKED.png

Binary file not shown.

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

BIN

assets/tw/war_archives/WAR_ARCHIVES_SCROLL.png Normal file

Binary file not shown.

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