Merge branch 'dev' into meta_reward

Browse Source

...

This commit is contained in:

guoh064

2023-08-12 14:29:31 +08:00

committed by GitHub

parent e74df69b29 cc92d60b0a

commit a3af072035

57 changed files with 115 additions and 43 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/tw/os_ash/ASH_SHOWDOWN.png Normal file

Binary file not shown.

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

BIN

assets/tw/os_ash/DOSSIER_LIST.png Normal file

Binary file not shown.

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

BIN

assets/tw/research/TEMPLATE_S1.png Normal file

Binary file not shown.

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

BIN

assets/tw/research/TEMPLATE_S2.png Normal file

Binary file not shown.

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

BIN

assets/tw/research/TEMPLATE_S3.png Normal file

Binary file not shown.

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

BIN

assets/tw/research/TEMPLATE_S4.png Normal file

Binary file not shown.

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

BIN

assets/tw/research/TEMPLATE_S4_2.png Normal file

Binary file not shown.

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

BIN

assets/tw/research/TEMPLATE_S5.png Normal file

Binary file not shown.

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

BIN

assets/tw/research/TEMPLATE_S6.png Normal file

Binary file not shown.

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

BIN

assets/tw/shipyard/SHIPYARD_CONFIRM_DEV.png

Binary file not shown.

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

BIN

assets/tw/shipyard/SHIPYARD_LEVEL_NOT_ENOUGH_DEV.png Normal file

Binary file not shown.

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