Merge branch 'dev' into mail_reward

Browse Source

...

This commit is contained in:

LmeSzinc

2022-10-23 17:03:32 +08:00

committed by GitHub

parent 79b6293d16 2960bf068f

commit bb61f2f9b6

62 changed files with 1087 additions and 378 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_SheffieldIdol.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 645 B

BIN

assets/cn/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/USE_DATA_KEY.png

Binary file not shown.

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

BIN

assets/en/os_handler/ASH_POPUP_CHECK.png

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png Normal file

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png Normal file

Binary file not shown.

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