Merge branch 'dev' into dockScanner

Browse Source

...

This commit is contained in:

Horizon101011

2022-10-25 18:42:25 +08:00

committed by GitHub

parent 0c5c0f6dbc f32d275fec

commit 34e21beb1f

129 changed files with 1633 additions and 815 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

0

assets/cn/battle_pass/BATTLE_PASS_RED_DOT.png → assets/cn/freebies/BATTLE_PASS_RED_DOT.png

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

0

assets/cn/supply_pack/BUY_CONFIRM.png → assets/cn/freebies/BUY_CONFIRM.png

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

0

assets/cn/data_key/DATA_KEY_COLLECT.png → assets/cn/freebies/DATA_KEY_COLLECT.png

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

0

assets/cn/data_key/DATA_KEY_COLLECTED.png → assets/cn/freebies/DATA_KEY_COLLECTED.png

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

0

assets/cn/supply_pack/FREE_SUPPLY_PACK.BUTTON.png → assets/cn/freebies/FREE_SUPPLY_PACK.BUTTON.png

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

0

assets/cn/supply_pack/FREE_SUPPLY_PACK.png → assets/cn/freebies/FREE_SUPPLY_PACK.png

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

BIN

assets/cn/freebies/MAIL_COLLECT.png Normal file

Binary file not shown.

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

BIN

assets/cn/freebies/MAIL_COLLECTED.png Normal file

Binary file not shown.

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

BIN

assets/cn/freebies/MAIL_DELETE.png Normal file

Binary file not shown.

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

BIN

assets/cn/freebies/MAIL_ENTER.png Normal file

Binary file not shown.

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

0

assets/cn/data_key/OCR_DATA_KEY.png → assets/cn/freebies/OCR_DATA_KEY.png

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

0

assets/cn/battle_pass/PURCHASE_POPUP.png → assets/cn/freebies/PURCHASE_POPUP.png

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

0

assets/cn/battle_pass/REWARD_RECEIVE.png → assets/cn/freebies/REWARD_RECEIVE.png

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

0

assets/cn/battle_pass/REWARD_RECEIVE_SP.png → assets/cn/freebies/REWARD_RECEIVE_SP.png

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

BIN

assets/cn/template/TEMPLATE_SIREN_SheffieldIdol.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png Normal file

Binary file not shown.

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

0

assets/en/battle_pass/BATTLE_PASS_RED_DOT.png → assets/en/freebies/BATTLE_PASS_RED_DOT.png

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

0

assets/en/supply_pack/BUY_CONFIRM.png → assets/en/freebies/BUY_CONFIRM.png

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

0

assets/en/data_key/DATA_KEY_COLLECT.png → assets/en/freebies/DATA_KEY_COLLECT.png

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

0

assets/en/data_key/DATA_KEY_COLLECTED.png → assets/en/freebies/DATA_KEY_COLLECTED.png

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

0

assets/en/supply_pack/FREE_SUPPLY_PACK.BUTTON.png → assets/en/freebies/FREE_SUPPLY_PACK.BUTTON.png

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

0

assets/en/supply_pack/FREE_SUPPLY_PACK.png → assets/en/freebies/FREE_SUPPLY_PACK.png

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

BIN

assets/en/freebies/MAIL_COLLECT.png Normal file

Binary file not shown.

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

BIN

assets/en/freebies/MAIL_COLLECTED.png Normal file

Binary file not shown.

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

BIN

assets/en/freebies/MAIL_DELETE.png Normal file

Binary file not shown.

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

BIN

assets/en/freebies/MAIL_ENTER.png Normal file

Binary file not shown.

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

0

assets/en/data_key/OCR_DATA_KEY.png → assets/en/freebies/OCR_DATA_KEY.png

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

0

assets/en/battle_pass/PURCHASE_POPUP.png → assets/en/freebies/PURCHASE_POPUP.png

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

0

assets/en/battle_pass/REWARD_RECEIVE.png → assets/en/freebies/REWARD_RECEIVE.png

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

0

assets/en/battle_pass/REWARD_RECEIVE_SP.png → assets/en/freebies/REWARD_RECEIVE_SP.png

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

BIN

assets/en/handler/USE_DATA_KEY.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 7.5 KiB

BIN

assets/en/os_handler/ASH_POPUP_CHECK.png

Binary file not shown.

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

BIN

assets/en/reward/MAIL_ENTER.png Normal file

Binary file not shown.

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

0

assets/jp/battle_pass/BATTLE_PASS_RED_DOT.png → assets/jp/freebies/BATTLE_PASS_RED_DOT.png

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

0

assets/jp/supply_pack/BUY_CONFIRM.png → assets/jp/freebies/BUY_CONFIRM.png

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

0

assets/jp/data_key/DATA_KEY_COLLECT.png → assets/jp/freebies/DATA_KEY_COLLECT.png

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

0

assets/jp/data_key/DATA_KEY_COLLECTED.png → assets/jp/freebies/DATA_KEY_COLLECTED.png

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

0

assets/jp/supply_pack/FREE_SUPPLY_PACK.BUTTON.png → assets/jp/freebies/FREE_SUPPLY_PACK.BUTTON.png

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

0

assets/jp/supply_pack/FREE_SUPPLY_PACK.png → assets/jp/freebies/FREE_SUPPLY_PACK.png

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

BIN

assets/jp/freebies/MAIL_ENTER.png Normal file

Binary file not shown.

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

0

assets/jp/data_key/OCR_DATA_KEY.png → assets/jp/freebies/OCR_DATA_KEY.png

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

0

assets/jp/battle_pass/PURCHASE_POPUP.png → assets/jp/freebies/PURCHASE_POPUP.png

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

0

assets/jp/battle_pass/REWARD_RECEIVE.png → assets/jp/freebies/REWARD_RECEIVE.png

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

0

assets/jp/battle_pass/REWARD_RECEIVE_SP.png → assets/jp/freebies/REWARD_RECEIVE_SP.png

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

BIN

assets/jp/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png Normal file

Binary file not shown.

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

BIN

assets/jp/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png Normal file

Binary file not shown.

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

BIN

assets/stats_basic/Gem.png Normal file

Binary file not shown.

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

0

assets/tw/battle_pass/BATTLE_PASS_RED_DOT.png → assets/tw/freebies/BATTLE_PASS_RED_DOT.png

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

0

assets/tw/supply_pack/BUY_CONFIRM.png → assets/tw/freebies/BUY_CONFIRM.png

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

0

assets/tw/data_key/DATA_KEY_COLLECT.png → assets/tw/freebies/DATA_KEY_COLLECT.png

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

0

assets/tw/data_key/DATA_KEY_COLLECTED.png → assets/tw/freebies/DATA_KEY_COLLECTED.png

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

0

assets/tw/supply_pack/FREE_SUPPLY_PACK.BUTTON.png → assets/tw/freebies/FREE_SUPPLY_PACK.BUTTON.png

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

0

assets/tw/supply_pack/FREE_SUPPLY_PACK.png → assets/tw/freebies/FREE_SUPPLY_PACK.png

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

BIN

assets/tw/freebies/MAIL_ENTER.png Normal file

Binary file not shown.

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

0

assets/tw/data_key/OCR_DATA_KEY.png → assets/tw/freebies/OCR_DATA_KEY.png

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

0

assets/tw/battle_pass/PURCHASE_POPUP.png → assets/tw/freebies/PURCHASE_POPUP.png

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