Merge branch 'LmeSzinc/master' into asset

Browse Source

...

This commit is contained in:

Ray

2021-08-09 08:58:38 +08:00

parent bb04db4e1e 8e5e7ecd1e

commit b0ebc690b3

45 changed files with 29 additions and 21 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/shop/SELECT_MINUS.png Normal file

Binary file not shown.

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

BIN

assets/cn/shop/SELECT_PLUS.png Normal file

Binary file not shown.

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

BIN

assets/cn/shop/SHOP_BUY_CONFIRM_SELECT.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.4 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

assets/cn/shop/SHOP_CLICK_SAFE_AREA.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 5.8 KiB

BIN

assets/cn/shop/SHOP_SELECT_CHECK.png

Binary file not shown.

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

BIN

assets/cn/shop/TEMPLATE_MINUS.png

Binary file not shown.

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

BIN

assets/cn/shop/TEMPLATE_PLUS.png

Binary file not shown.

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

BIN

assets/en/shop/SELECT_MINUS.png Normal file

Binary file not shown.

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

BIN

assets/en/shop/SELECT_PLUS.png Normal file

Binary file not shown.

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

BIN

assets/en/shop/SHOP_CLICK_SAFE_AREA.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 5.8 KiB

BIN

assets/en/shop/SHOP_SELECT_CHECK.png

Binary file not shown.

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

BIN

assets/en/shop/TEMPLATE_MINUS.png

Binary file not shown.

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

BIN

assets/en/shop/TEMPLATE_PLUS.png

Binary file not shown.

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

BIN

assets/guild_shop_cn/BookT2.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/BookT3.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/BoxT3.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/BoxT4.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/CatT1.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/CatT2.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/CatT3.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/Chips.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/FoodT5.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/FoodT6.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/PRBP.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/PlateT2.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/PlateT3.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/PlateT4.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/RetrofitT2.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/RetrofitT3.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/ShipT2.png Normal file

Binary file not shown.

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

BIN

assets/guild_shop_cn/ShipT3.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SELECT_MINUS.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SELECT_PLUS.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_CLICK_SAFE_AREA.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 5.8 KiB

BIN

assets/jp/shop/SHOP_SELECT_CHECK.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 21 KiB

BIN

assets/jp/shop/TEMPLATE_MINUS.png

Binary file not shown.

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

BIN

assets/jp/shop/TEMPLATE_PLUS.png

Binary file not shown.

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

BIN

assets/tw/shop/SELECT_MINUS.png Normal file

Binary file not shown.

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

BIN

assets/tw/shop/SELECT_PLUS.png Normal file

Binary file not shown.

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

BIN

assets/tw/shop/SHOP_CLICK_SAFE_AREA.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 5.8 KiB

BIN

assets/tw/shop/SHOP_SELECT_CHECK.png

Binary file not shown.

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

BIN

assets/tw/shop/TEMPLATE_MINUS.png

Binary file not shown.

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

BIN

assets/tw/shop/TEMPLATE_PLUS.png

Binary file not shown.

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