Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2022-11-28 01:14:45 +08:00

parent 85938744e6 46e488e69f

commit 90223d84e1

21 changed files with 133 additions and 30 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 → assets/cn/combat/GET_ITEMS_1_RYZA.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/combat/GET_ITEMS_1_RYZA.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/GET_ITEMS_1_RYZA.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/GET_ITEMS_1_RYZA.png Normal file

Binary file not shown.

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

BIN

assets/jp/combat/GET_ITEMS_1_RYZA.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/jp/combat/GET_ITEMS_1_RYZA.png Normal file

Binary file not shown.

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

BIN

assets/tw/combat/GET_ITEMS_1_RYZA.BUTTON.png Normal file

Binary file not shown.

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