Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2022-11-25 02:29:03 +08:00

parent e6cd0043cf d55ede30a8

commit 85938744e6

50 changed files with 1443 additions and 52 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/campaign/SWITCH_1_HARD_ALCHEMIST.png Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_BBalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_CAalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_CLalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_CValchemist.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_DDalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/en/campaign/SWITCH_1_NORMAL.png

Binary file not shown.

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

BIN

assets/en/freebies/MAIL_EMPTY.png Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_BBalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_CAalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_CLalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_CValchemist.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_DDalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/jp/freebies/MAIL_EMPTY.png Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_BBalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_CAalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_CLalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_CValchemist.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_DDalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_BBalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_CAalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_CLalchemist.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_CValchemist.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_DDalchemist.gif Normal file

Binary file not shown.

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