Merge pull request #1598 from LmeSzinc/dev

Browse Source

Add error notify and support E sereis research projects

...

This commit is contained in:

LmeSzinc

2022-09-03 23:23:28 +08:00

committed by GitHub

parent 68f4a430bb 0d101b9d94

commit 45f1421083

129 changed files with 1561 additions and 381 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/research/RESEARCH_QUEUE_ADD.BUTTON.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 10 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/en/campaign/OCR_COIN.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 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/storage/BOX_USE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/BOX_USE.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/en/storage/DISASSEMBLE.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/en/storage/DISASSEMBLE_CANCEL.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/en/storage/DISASSEMBLE_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/DISASSEMBLE_COUNT_OCR.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/en/storage/DISASSEMBLE_POPUP_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/EQUIPMENT_EMPTY.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/en/storage/EQUIPMENT_ENTER.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/en/storage/EQUIPMENT_FILTER.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/en/storage/EQUIPMENT_FILTER_CONFIRM.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/en/storage/EQUIPMENT_FULL.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/MATERIAL_CHECK.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/en/storage/MATERIAL_ENTER.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/MATERIAL_STABLE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/METERIAL_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/TEMPLATE_BOX_T1.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/TEMPLATE_BOX_T2.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/TEMPLATE_BOX_T3.png Normal file

Binary file not shown.

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

BIN

assets/en/storage/TEMPLATE_BOX_T4.png Normal file

Binary file not shown.

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

BIN

assets/en/ui/MAIN_GOTO_STORAGE.png Normal file

Binary file not shown.

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

BIN

assets/en/ui/STORAGE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/campaign/OCR_COIN.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/jp/research/RESEARCH_QUEUE_ADD.png

Binary file not shown.

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

BIN

assets/jp/storage/DISASSEMBLE_COUNT_OCR.png Normal file

Binary file not shown.

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

BIN

assets/jp/storage/EQUIPMENT_EMPTY.png Normal file

Binary file not shown.

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

BIN

assets/jp/storage/MATERIAL_STABLE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/storage/METERIAL_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/jp/storage/TEMPLATE_BOX_T1.png Normal file

Binary file not shown.

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

BIN

assets/jp/storage/TEMPLATE_BOX_T2.png Normal file

Binary file not shown.

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

BIN

assets/jp/storage/TEMPLATE_BOX_T3.png Normal file

Binary file not shown.

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

BIN

assets/jp/storage/TEMPLATE_BOX_T4.png Normal file

Binary file not shown.

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

BIN

assets/tw/campaign/OCR_COIN.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/tw/research/RESEARCH_QUEUE_ADD.png

Binary file not shown.

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

BIN

assets/tw/storage/DISASSEMBLE_COUNT_OCR.png Normal file

Binary file not shown.

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

BIN

assets/tw/storage/EQUIPMENT_EMPTY.png Normal file

Binary file not shown.

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

BIN

assets/tw/storage/MATERIAL_STABLE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/tw/storage/METERIAL_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/tw/storage/TEMPLATE_BOX_T1.png Normal file

Binary file not shown.

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

BIN

assets/tw/storage/TEMPLATE_BOX_T2.png Normal file

Binary file not shown.

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

BIN

assets/tw/storage/TEMPLATE_BOX_T3.png Normal file

Binary file not shown.

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

BIN

assets/tw/storage/TEMPLATE_BOX_T4.png Normal file

Binary file not shown.

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