Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2022-02-25 23:38:54 +08:00

parent 9cf2bdfaa8 61058c1cf9

commit f1253aa3d6

100 changed files with 2670 additions and 871 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/map/MAP_CAT_ATTACK_MIRROR.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/SELECT_ARCHIVE.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/ZONE_ARCHIVE.png Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_Kiev.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_Soobrazitelny.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_Volga.gif Normal file

Binary file not shown.

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

BIN

assets/en/handler/SUBMARINE_MOVE_CANCEL.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/SUBMARINE_MOVE_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/en/map/MAP_CAT_ATTACK_MIRROR.png Normal file

Binary file not shown.

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

BIN

assets/en/meta_reward/META_REWARD_NOTICE.png Normal file

Binary file not shown.

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

BIN

assets/en/meta_reward/REWARD_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/en/meta_reward/REWARD_ENTER.png Normal file

Binary file not shown.

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

BIN

assets/en/meta_reward/REWARD_RECEIVE.png Normal file

Binary file not shown.

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

BIN

assets/en/os_handler/OS_GAME_TIPS.png Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_Kiev.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_Soobrazitelny.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_Volga.gif Normal file

Binary file not shown.

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

BIN

assets/en/ui/RESHMENU_GOTO_META.png Normal file

Binary file not shown.

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

BIN

assets/jp/map/MAP_CAT_ATTACK_MIRROR.png Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_Kiev.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_Soobrazitelny.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_Volga.gif Normal file

Binary file not shown.

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

BIN

assets/shop/cost/Medal_3.png Normal file

Binary file not shown.

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

BIN

assets/tw/map/MAP_CAT_ATTACK_MIRROR.png Normal file

Binary file not shown.

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

BIN

assets/tw/supply_pack/BUY_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/tw/supply_pack/FREE_SUPPLY_PACK.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/tw/supply_pack/FREE_SUPPLY_PACK.png Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_Kiev.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_Soobrazitelny.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_Volga.gif Normal file

Binary file not shown.

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

BIN

assets/tw/ui/SHOP_CHECK.png

Binary file not shown.

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

BIN

assets/tw/ui/SHOP_GOTO_SUPPLY_PACK.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/tw/ui/SUPPLY_PACK_CHECK.png Normal file

Binary file not shown.

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