Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2021-04-24 15:54:44 +08:00

parent 109876ff97 4a7bb632b5

commit 0af4507384

44 changed files with 752 additions and 24 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/template/TEMPLATE_SIREN_Formidable.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_Gloucester.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_Illustrious.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_Nelson.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_Warspite.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_York.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_Formidable.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_Gloucester.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_Illustrious.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_Nelson.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_Warspite.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_York.gif Normal file

Binary file not shown.

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

BIN

assets/en/ui/DORMMENU_CHECK.png

Binary file not shown.

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

BIN

assets/en/ui/DORMMENU_GOTO_MEOWFFICER.png

Binary file not shown.

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

BIN

assets/jp/daily/DAILY_SKIP.png

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_Formidable.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_Gloucester.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_Illustrious.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_Nelson.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_Warspite.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_York.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_Formidable.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_Gloucester.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_Illustrious.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_Nelson.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_Warspite.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_York.gif Normal file

Binary file not shown.

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