Merge branch 'dev' into dockScanner

Browse Source

...

This commit is contained in:

Horizon101011

2022-09-14 10:32:54 +08:00

committed by GitHub

parent 4b765eac5f 398fc97a96

commit e1f50c64cb

281 changed files with 3035 additions and 976 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/campaign/OCR_COIN.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/AUTO_SEARCH_MENU_CONTINUE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/AUTO_SEARCH_MENU_CONTINUE.png

Binary file not shown.

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

BIN

assets/cn/handler/AUTO_SEARCH_MENU_EXIT.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/AUTO_SEARCH_MENU_EXIT.png

Binary file not shown.

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

BIN

assets/cn/os_ash/ASH_CHECK.png

Binary file not shown.

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

BIN

assets/cn/os_ash/ASH_ENTER_CONFIRM.png

Binary file not shown.

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

BIN

assets/cn/os_ash/ASH_ENTRANCE.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/os_ash/ASH_SHOWDOWN.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/os_ash/BEACON_ENTER.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/os_ash/BEACON_ENTER.png

Binary file not shown.

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

BIN

assets/cn/os_ash/DOSSIER_LIST.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_AUTO_ATTACKING.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_AUTO_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_BEACON_DATA.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_BEACON_FLAG.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_BEGIN_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_BEGIN_ENTRANCE.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_DAMAGE.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_DOSSIER_DATA.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_DOSSIER_FLAG.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_ENTRANCE.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_INNER_PAGE_DAMAGE.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_INNER_PAGE_NOT_DAMAGE.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_MAIN_BEACON_ENTRANCE.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/META_MAIN_DOSSIER_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/BEACON_HP_PERCENTAGE.png → assets/cn/os_ash/META_MAIN_DOSSIER_ENTRANCE.png

Binary file not shown.

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

BIN

assets/cn/research/RESEARCH_QUEUE_ADD.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/RETIRE_SETTING_1.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/RETIRE_SETTING_2.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/RETIRE_SETTING_3.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/RETIRE_SETTING_4.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/RETIRE_SETTING_5_ALL.png Normal file

Binary file not shown.

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

BIN

assets/jp/os_ash/BEACON_HP_PERCENTAGE.png → assets/cn/retire/RETIRE_SETTING_5_PRESERVE.png

Binary file not shown.

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

BIN

assets/cn/retire/RETIRE_SETTING_ENTER.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/RETIRE_SETTING_QUIT.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/BOX_USE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/BOX_USE.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/DISASSEMBLE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/DISASSEMBLE.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/DISASSEMBLE_CANCEL.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/DISASSEMBLE_CANCEL.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/DISASSEMBLE_CONFIRM.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/DISASSEMBLE_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/DISASSEMBLE_COUNT_OCR.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/DISASSEMBLE_POPUP_CONFIRM.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/DISASSEMBLE_POPUP_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/EQUIPMENT_EMPTY.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/EQUIPMENT_ENTER.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/EQUIPMENT_ENTER.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/EQUIPMENT_FILTER.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/EQUIPMENT_FILTER.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/EQUIPMENT_FILTER_CONFIRM.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/EQUIPMENT_FILTER_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/EQUIPMENT_FULL.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/EQUIPMENT_FULL.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/MATERIAL_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/MATERIAL_ENTER.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/MATERIAL_ENTER.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/MATERIAL_STABLE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/METERIAL_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/TEMPLATE_BOX_T1.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/TEMPLATE_BOX_T2.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/TEMPLATE_BOX_T3.png Normal file

Binary file not shown.

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

BIN

assets/cn/storage/TEMPLATE_BOX_T4.png Normal file

Binary file not shown.

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

BIN

assets/cn/ui/MAIN_GOTO_STORAGE.png Normal file

Binary file not shown.

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

BIN

assets/cn/ui/STORAGE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_THE_ENIGMA_AND_THE_SHARK.png Normal file

Binary file not shown.

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

BIN

assets/en/campaign/OCR_COIN.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_MENU_CONTINUE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_MENU_CONTINUE.png

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_MENU_EXIT.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_MENU_EXIT.png

Binary file not shown.

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

BIN

assets/en/os_ash/ASH_CHECK.png

Binary file not shown.

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

BIN

assets/en/os_ash/ASH_ENTER_CONFIRM.png

Binary file not shown.

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

BIN

assets/en/os_ash/ASH_ENTRANCE.BUTTON.png

Binary file not shown.

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

BIN

assets/en/os_ash/ASH_ENTRANCE.png

Binary file not shown.

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

BIN

assets/en/os_ash/ASH_SHOWDOWN.BUTTON.png

Binary file not shown.

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

BIN

assets/en/os_ash/BEACON_ENTER.BUTTON.png

Binary file not shown.

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

BIN

assets/en/os_ash/BEACON_ENTER.png

Binary file not shown.

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

BIN

assets/en/os_ash/DOSSIER_LIST.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_AUTO_ATTACKING.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_AUTO_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_BEACON_DATA.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_BEACON_FLAG.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_BEGIN_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_ash/ASH_ENTRANCE.png → assets/en/os_ash/META_BEGIN_ENTRANCE.png

Binary file not shown.

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

BIN

assets/en/os_ash/META_DAMAGE.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_DOSSIER_DATA.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_DOSSIER_FLAG.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_ENTRANCE.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_INNER_PAGE_DAMAGE.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_INNER_PAGE_NOT_DAMAGE.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_MAIN_BEACON_ENTRANCE.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/META_MAIN_DOSSIER_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/os_ash/BEACON_HP_PERCENTAGE.png → assets/en/os_ash/META_MAIN_DOSSIER_ENTRANCE.png

Binary file not shown.

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

BIN

assets/en/os_handler/RESET_TICKET_POPUP.png

Binary file not shown.

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

BIN

assets/en/research/RESEARCH_QUEUE_ADD.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/RETIRE_SETTING_ENTER.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/RETIRE_SETTING_QUIT.png Normal file

Binary file not shown.

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

Some files were not shown because too many files have changed in this diff Show More