Merge branch 'master' into gems_farming

Browse Source

...

This commit is contained in:

LmeSzinc

2021-07-08 23:02:37 +08:00

parent 0275f05537 a8f0642b5b

commit 082b738a17

47 changed files with 369 additions and 335 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

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/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

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