Merge branch 'dev' into comf_fort

Browse Source

...

This commit is contained in:

LmeSzinc

2021-07-24 17:28:15 +08:00

committed by GitHub

parent 5bd518cbc1 e45cd767fd

commit 2685f3ab07

283 changed files with 2028 additions and 216 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/jp/shop/SHOP_BUY_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_BUY_CONFIRM_SELECT.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_CLICK_SAFE_AREA.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_CORE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_GEMS.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_GENERAL_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_GENERAL_SWIPE_END.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_GOLD_COINS.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_GUILD_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_GUILD_COINS.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_GUILD_SWIPE_END.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_MEDAL.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_MERIT.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_MERIT_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_PROTOTYPE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_REFRESH.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_SELECT_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_SELECT_PR1.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_SELECT_PR2.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_SELECT_PR3.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_SELECT_TOTAL_PRICE.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/TEMPLATE_MINUS.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/TEMPLATE_PLUS.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/ACADEMY_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/ACADEMY_GOTO_MUNITIONS.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/BUILD_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/DORMMENU_GOTO_ACADEMY.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/MAIN_GOTO_BUILD.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/MAIN_GOTO_SHOP.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/MUNITIONS_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/SHOP_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/SHOP_GOTO_MUNITIONS.png Normal file

Binary file not shown.

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