Merge pull request #1360 from LmeSzinc/dev

Browse Source

PR5 and research queue support

...

This commit is contained in:

LmeSzinc

2022-07-18 12:47:14 +08:00

committed by GitHub

parent 56d5bc2426 26a370b32e

commit 0b5b6f5da8

165 changed files with 1445 additions and 637 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/combat/GET_ITEMS_3_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/cn/gacha/BUILD_TICKET_COUNT.png Normal file

Binary file not shown.

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

BIN

assets/cn/research/ENTRANCE_1.png

Binary file not shown.

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

BIN

assets/cn/research/ENTRANCE_2.png

Binary file not shown.

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

BIN

assets/cn/research/ENTRANCE_3.png

Binary file not shown.

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

BIN

assets/cn/research/ENTRANCE_4.png

Binary file not shown.

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

BIN

assets/cn/research/ENTRANCE_5.png

Binary file not shown.

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

BIN

assets/cn/research/OCR_RESEARCH_1.png

Binary file not shown.

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

BIN

assets/cn/research/OCR_RESEARCH_2.png

Binary file not shown.

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

BIN

assets/cn/research/OCR_RESEARCH_3.png

Binary file not shown.

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

BIN

assets/cn/research/OCR_RESEARCH_4.png

Binary file not shown.

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

BIN

assets/cn/research/OCR_RESEARCH_5.png

Binary file not shown.

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

BIN

assets/cn/research/QUEUE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/cn/research/QUEUE_CLAIM_REWARD.png Normal file

Binary file not shown.

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

BIN

assets/cn/research/QUEUE_REMAIN.png Normal file

Binary file not shown.

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

BIN

assets/cn/research/RESEARCH_GOTO_QUEUE.png Normal file

Binary file not shown.

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

BIN

assets/cn/research/RESEARCH_QUEUE_ADD.png Normal file

Binary file not shown.

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

BIN

assets/cn/research/RESEARCH_START.png

Binary file not shown.

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

BIN

assets/cn/research/RESEARCH_STOP.png

Binary file not shown.

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

BIN

assets/cn/research/RESEARCH_UNAVAILABLE.png

Binary file not shown.

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

BIN

assets/cn/research/SERIES_1.png

Binary file not shown.

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

BIN

assets/cn/research/SERIES_2.png

Binary file not shown.

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

BIN

assets/cn/research/SERIES_3.png

Binary file not shown.

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

BIN

assets/cn/research/SERIES_4.png

Binary file not shown.

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

BIN

assets/cn/research/SERIES_5.png

Binary file not shown.

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

BIN

assets/cn/research/STATUS_1.png

Binary file not shown.

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

BIN

assets/cn/research/STATUS_2.png

Binary file not shown.

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

BIN

assets/cn/research/STATUS_3.png

Binary file not shown.

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

BIN

assets/cn/research/STATUS_4.png

Binary file not shown.

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

BIN

assets/cn/research/STATUS_5.png

Binary file not shown.

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

BIN

assets/cn/research/TEMPLATE_DETAIL.png Normal file

Binary file not shown.

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

BIN

assets/cn/research/TEMPLATE_RUNNING.png Normal file

Binary file not shown.

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

BIN

assets/cn/research/TEMPLATE_WAITING.png Normal file

Binary file not shown.

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

BIN

assets/cn/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png

Binary file not shown.

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

BIN

assets/en/combat/GET_ITEMS_3_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/en/equipment/EQUIPMENT_OPEN.png

Binary file not shown.

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

BIN

assets/en/equipment/EQUIP_1.png

Binary file not shown.

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

BIN

assets/en/equipment/EQUIP_2.png

Binary file not shown.

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

BIN

assets/en/equipment/EQUIP_3.png

Binary file not shown.

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

BIN

assets/en/equipment/EQUIP_OFF.png

Binary file not shown.

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

BIN

assets/en/research/ENTRANCE_1.png

Binary file not shown.

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

BIN

assets/en/research/ENTRANCE_2.png

Binary file not shown.

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

BIN

assets/en/research/ENTRANCE_3.png

Binary file not shown.

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

BIN

assets/en/research/ENTRANCE_4.png

Binary file not shown.

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

BIN

assets/en/research/ENTRANCE_5.png

Binary file not shown.

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

BIN

assets/en/research/OCR_RESEARCH_1.png

Binary file not shown.

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

BIN

assets/en/research/OCR_RESEARCH_2.png

Binary file not shown.

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

BIN

assets/en/research/OCR_RESEARCH_3.png

Binary file not shown.

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

BIN

assets/en/research/OCR_RESEARCH_4.png

Binary file not shown.

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

BIN

assets/en/research/OCR_RESEARCH_5.png

Binary file not shown.

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

BIN

assets/en/research/QUEUE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/en/research/QUEUE_CLAIM_REWARD.png Normal file

Binary file not shown.

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

BIN

assets/en/research/QUEUE_REMAIN.png Normal file

Binary file not shown.

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

BIN

assets/en/research/RESEARCH_GOTO_QUEUE.png Normal file

Binary file not shown.

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

BIN

assets/en/research/RESEARCH_QUEUE_ADD.png Normal file

Binary file not shown.

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

BIN

assets/en/research/RESEARCH_START.png

Binary file not shown.

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

BIN

assets/en/research/RESEARCH_STOP.png

Binary file not shown.

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

BIN

assets/en/research/SERIES_1.png

Binary file not shown.

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

BIN

assets/en/research/SERIES_2.png

Binary file not shown.

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

BIN

assets/en/research/SERIES_3.png

Binary file not shown.

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

BIN

assets/en/research/SERIES_4.png

Binary file not shown.

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

BIN

assets/en/research/SERIES_5.png

Binary file not shown.

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

BIN

assets/en/research/STATUS_1.png

Binary file not shown.

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

BIN

assets/en/research/STATUS_2.png

Binary file not shown.

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

BIN

assets/en/research/STATUS_3.png

Binary file not shown.

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

BIN

assets/en/research/STATUS_4.png

Binary file not shown.

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

BIN

assets/en/research/STATUS_5.png

Binary file not shown.

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

BIN

assets/en/research/TEMPLATE_DETAIL.png Normal file

Binary file not shown.

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

BIN

assets/en/research/TEMPLATE_RUNNING.png Normal file

Binary file not shown.

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

BIN

assets/en/research/TEMPLATE_WAITING.png Normal file

Binary file not shown.

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

BIN

assets/en/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png

Binary file not shown.

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

BIN

assets/en/war_archives/TEMPLATE_EMPYREAL_TRAGICOMEDY.png Normal file

Binary file not shown.

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

BIN

assets/en/war_archives/TEMPLATE_MOONLIT_OVERTURE.png Normal file

Binary file not shown.

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

BIN

assets/en/war_archives/TEMPLATE_PASSIONATE_POLARIS.png Normal file

Binary file not shown.

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

BIN

assets/en/war_archives/TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD.png Normal file

Binary file not shown.

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

BIN

assets/jp/combat/GET_ITEMS_3_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/research/ENTRANCE_1.png

Binary file not shown.

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

BIN

assets/jp/research/ENTRANCE_2.png

Binary file not shown.

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

BIN

assets/jp/research/ENTRANCE_3.png

Binary file not shown.

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

BIN

assets/jp/research/ENTRANCE_4.png

Binary file not shown.

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

BIN

assets/jp/research/ENTRANCE_5.png

Binary file not shown.

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

BIN

assets/jp/research/OCR_RESEARCH_1.png

Binary file not shown.

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

BIN

assets/jp/research/OCR_RESEARCH_2.png

Binary file not shown.

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

BIN

assets/jp/research/OCR_RESEARCH_3.png

Binary file not shown.

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

BIN

assets/jp/research/OCR_RESEARCH_4.png

Binary file not shown.

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

BIN

assets/jp/research/OCR_RESEARCH_5.png

Binary file not shown.

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

BIN

assets/jp/research/QUEUE_REMAIN.png Normal file

Binary file not shown.

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

BIN

assets/jp/research/RESEARCH_GOTO_QUEUE.png Normal file

Binary file not shown.

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

BIN

assets/jp/research/SERIES_1.png

Binary file not shown.

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

BIN

assets/jp/research/SERIES_2.png

Binary file not shown.

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

BIN

assets/jp/research/SERIES_3.png

Binary file not shown.

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

BIN

assets/jp/research/SERIES_4.png

Binary file not shown.

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

BIN

assets/jp/research/SERIES_5.png

Binary file not shown.

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

BIN

assets/jp/research/STATUS_1.png

Binary file not shown.

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

BIN

assets/jp/research/STATUS_2.png

Binary file not shown.

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

BIN

assets/jp/research/STATUS_3.png

Binary file not shown.

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

BIN

assets/jp/research/STATUS_4.png

Binary file not shown.

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

BIN

assets/jp/research/STATUS_5.png

Binary file not shown.

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

BIN

assets/jp/shipyard/SHIPYARD_SERIES_SELECT_CHECK.png

Binary file not shown.

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

BIN

assets/tw/combat/GET_ITEMS_3_CHECK.png Normal file

Binary file not shown.

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

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