Merge branch 'LmeSzinc:gems_farming' into gems_farming

Browse Source

...

This commit is contained in:

Cyumxi

2021-07-22 20:18:53 +08:00

committed by GitHub

parent bdd4105235 068fafbc30

commit e61a2f1627

108 changed files with 863 additions and 539 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/handler/AUTO_SEARCH_MENU_CONTINUE.png

Binary file not shown.

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

BIN

assets/cn/handler/AUTO_SEARCH_MENU_EXIT.png

Binary file not shown.

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

BIN

assets/cn/handler/BOOK_BOX_AUTO.png

Binary file not shown.

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

BIN

assets/cn/handler/BOOK_CHECK_AUTO.png

Binary file not shown.

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

BIN

assets/cn/os_handler/AUTO_SEARCH_REWARD.png

Binary file not shown.

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

0

assets/cn/raid/OCR_REMAIN_EASY.png → assets/cn/raid/ESSEX_OCR_REMAIN_EASY.png

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

0

assets/cn/raid/OCR_REMAIN_HARD.png → assets/cn/raid/ESSEX_OCR_REMAIN_HARD.png

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

0

assets/cn/raid/OCR_REMAIN_NORMAL.png → assets/cn/raid/ESSEX_OCR_REMAIN_NORMAL.png

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

0

assets/cn/raid/RAID_EASY.png → assets/cn/raid/ESSEX_RAID_EASY.png

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

0

assets/cn/raid/RAID_HARD.png → assets/cn/raid/ESSEX_RAID_HARD.png

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

0

assets/cn/raid/RAID_NORMAL.png → assets/cn/raid/ESSEX_RAID_NORMAL.png

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

BIN

assets/cn/raid/SURUGA_OCR_REMAIN_EASY.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/SURUGA_OCR_REMAIN_HARD.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/SURUGA_OCR_REMAIN_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/SURUGA_RAID_EASY.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/SURUGA_RAID_HARD.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/SURUGA_RAID_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/TICKET_USE_CONFIRM.png

Binary file not shown.

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

BIN

assets/cn/ui/MEOWFFICER_INFO.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_MENU_CONTINUE.png

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_MENU_EXIT.png

Binary file not shown.

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

BIN

assets/en/handler/BOOK_BOX_AUTO.png

Binary file not shown.

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

BIN

assets/en/handler/BOOK_CHECK_AUTO.png

Binary file not shown.

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

BIN

assets/en/os_handler/AUTO_SEARCH_REWARD.png

Binary file not shown.

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

0

assets/en/raid/OCR_REMAIN_EASY.png → assets/en/raid/ESSEX_OCR_REMAIN_EASY.png

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

0

assets/en/raid/OCR_REMAIN_HARD.png → assets/en/raid/ESSEX_OCR_REMAIN_HARD.png

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

0

assets/en/raid/OCR_REMAIN_NORMAL.png → assets/en/raid/ESSEX_OCR_REMAIN_NORMAL.png

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

0

assets/en/raid/RAID_EASY.png → assets/en/raid/ESSEX_RAID_EASY.png

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

0

assets/en/raid/RAID_HARD.png → assets/en/raid/ESSEX_RAID_HARD.png

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

0

assets/en/raid/RAID_NORMAL.png → assets/en/raid/ESSEX_RAID_NORMAL.png

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

BIN

assets/en/raid/SURUGA_OCR_REMAIN_EASY.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/SURUGA_OCR_REMAIN_HARD.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/SURUGA_OCR_REMAIN_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/SURUGA_RAID_EASY.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/SURUGA_RAID_HARD.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/SURUGA_RAID_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/en/ui/MEOWFFICER_INFO.png Normal file

Binary file not shown.

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

BIN

assets/jp/handler/AUTO_SEARCH_MENU_CONTINUE.png

Binary file not shown.

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

BIN

assets/jp/handler/AUTO_SEARCH_MENU_EXIT.png

Binary file not shown.

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

BIN

assets/jp/handler/BOOK_BOX_AUTO.png

Binary file not shown.

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

BIN

assets/jp/handler/BOOK_BOX_PREP.png

Binary file not shown.

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

BIN

assets/jp/handler/BOOK_CHECK_AUTO.png

Binary file not shown.

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

BIN

assets/jp/handler/BOOK_CHECK_PREP.png

Binary file not shown.

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

BIN

assets/jp/os_handler/AUTO_SEARCH_REWARD.png

Binary file not shown.

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

0

assets/jp/raid/OCR_REMAIN_EASY.png → assets/jp/raid/ESSEX_OCR_REMAIN_EASY.png

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

0

assets/jp/raid/OCR_REMAIN_HARD.png → assets/jp/raid/ESSEX_OCR_REMAIN_HARD.png

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

0

assets/jp/raid/OCR_REMAIN_NORMAL.png → assets/jp/raid/ESSEX_OCR_REMAIN_NORMAL.png

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

0

assets/jp/raid/RAID_EASY.png → assets/jp/raid/ESSEX_RAID_EASY.png

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

0

assets/jp/raid/RAID_HARD.png → assets/jp/raid/ESSEX_RAID_HARD.png

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

0

assets/jp/raid/RAID_NORMAL.png → assets/jp/raid/ESSEX_RAID_NORMAL.png

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

BIN

assets/jp/raid/SURUGA_OCR_REMAIN_EASY.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/SURUGA_OCR_REMAIN_HARD.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/SURUGA_OCR_REMAIN_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/SURUGA_RAID_EASY.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/SURUGA_RAID_HARD.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/SURUGA_RAID_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/MEOWFFICER_INFO.png Normal file

Binary file not shown.

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

BIN

assets/tw/handler/AUTO_SEARCH_MENU_CONTINUE.png

Binary file not shown.

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

BIN

assets/tw/handler/AUTO_SEARCH_MENU_EXIT.png

Binary file not shown.

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

0

assets/tw/raid/OCR_REMAIN_EASY.png → assets/tw/raid/ESSEX_OCR_REMAIN_EASY.png

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

0

assets/tw/raid/OCR_REMAIN_HARD.png → assets/tw/raid/ESSEX_OCR_REMAIN_HARD.png

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

0

assets/tw/raid/OCR_REMAIN_NORMAL.png → assets/tw/raid/ESSEX_OCR_REMAIN_NORMAL.png

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

0

assets/tw/raid/RAID_EASY.png → assets/tw/raid/ESSEX_RAID_EASY.png

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

0

assets/tw/raid/RAID_HARD.png → assets/tw/raid/ESSEX_RAID_HARD.png

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

0

assets/tw/raid/RAID_NORMAL.png → assets/tw/raid/ESSEX_RAID_NORMAL.png

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

BIN

assets/tw/reward/MEOWFFICER_BUY.png

Binary file not shown.

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

BIN

assets/tw/reward/MEOWFFICER_BUY_ENTER.png

Binary file not shown.

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

BIN

assets/tw/reward/MEOWFFICER_BUY_SKIP.png

Binary file not shown.

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

BIN

assets/tw/reward/MEOWFFICER_CONFIRM.png

Binary file not shown.

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

BIN

assets/tw/reward/MEOWFFICER_TRAIN_COMPLETE.png

Binary file not shown.

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

BIN

assets/tw/reward/MEOWFFICER_TRAIN_FILL_QUEUE.png

Binary file not shown.

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

BIN

assets/tw/reward/MEOWFFICER_TRAIN_FINISH_ALL.png

Binary file not shown.

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

BIN

assets/tw/reward/MEOWFFICER_TRAIN_START.png

Binary file not shown.

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

BIN

assets/tw/reward/OCR_MEOWFFICER.png

Binary file not shown.

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

BIN

assets/tw/reward/OCR_MEOWFFICER_CAPACITY.png

Binary file not shown.

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

BIN

assets/tw/reward/OCR_MEOWFFICER_CHOOSE.png

Binary file not shown.

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

BIN

assets/tw/reward/OCR_MEOWFFICER_COINS.png

Binary file not shown.

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

BIN

assets/tw/ui/MEOWFFICER_CHECK.png

Binary file not shown.

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

BIN

assets/tw/ui/MEOWFFICER_INFO.png Normal file

Binary file not shown.

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

BIN

assets/tw/ui/TACTICAL_CHECK.png

Binary file not shown.

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