Merge branch 'dev' into event_checker

Browse Source

...

This commit is contained in:

bookbug666

2023-01-25 00:53:07 +08:00

parent 8862dda1b5 a5c0b2abb9

commit 76ed84264f

107 changed files with 1090 additions and 160 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/BATTLE_PREPARATION.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/combat/BATTLE_PREPARATION.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/cn/os_ash/BEACON_REWARD.png

Binary file not shown.

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

BIN

assets/cn/raid/KUYBYSHEY_OCR_PT.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/KUYBYSHEY_OCR_REMAIN_EASY.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/KUYBYSHEY_OCR_REMAIN_HARD.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/KUYBYSHEY_OCR_REMAIN_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/KUYBYSHEY_RAID_EASY.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/KUYBYSHEY_RAID_HARD.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/KUYBYSHEY_RAID_NORMAL.png Normal file

Binary file not shown.

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

0

assets/en/combat/BATTLE_PREPARATION.png → assets/en/combat/BATTLE_PREPARATION.BUTTON.png

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

BIN

assets/en/combat/BATTLE_PREPARATION.gif Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/en/os_ash/BEACON_REWARD.png

Binary file not shown.

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

BIN

assets/en/raid/KUYBYSHEY_OCR_PT.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/KUYBYSHEY_OCR_REMAIN_EASY.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/KUYBYSHEY_OCR_REMAIN_HARD.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/KUYBYSHEY_OCR_REMAIN_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/KUYBYSHEY_RAID_EASY.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/KUYBYSHEY_RAID_HARD.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/KUYBYSHEY_RAID_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/en/ui/RAID_CHECK.png

Binary file not shown.

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

BIN

assets/jp/combat/BATTLE_PREPARATION.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/jp/combat/BATTLE_PREPARATION.png

Binary file not shown.

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

BIN

assets/jp/meowfficer/MEOWFFICER_GET_CHECK.png

Binary file not shown.

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

BIN

assets/jp/os_ash/BEACON_REWARD.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/jp/os_ash/BEACON_REWARD.png

Binary file not shown.

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

BIN

assets/jp/raid/KUYBYSHEY_OCR_PT.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/KUYBYSHEY_OCR_REMAIN_EASY.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/KUYBYSHEY_OCR_REMAIN_HARD.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/KUYBYSHEY_OCR_REMAIN_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/KUYBYSHEY_RAID_EASY.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/KUYBYSHEY_RAID_HARD.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/KUYBYSHEY_RAID_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/RAID_CHECK.png

Binary file not shown.

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

BIN

assets/tw/combat/BATTLE_PREPARATION.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/tw/combat/BATTLE_PREPARATION.png

Binary file not shown.

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

BIN

assets/tw/os_ash/BEACON_REWARD.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/tw/os_ash/BEACON_REWARD.png

Binary file not shown.

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

BIN

assets/tw/os_handler/OS_FLEET_LOCKED.png

Binary file not shown.

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

BIN

assets/tw/os_handler/OS_FLEET_UNLOCKED.png

Binary file not shown.

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

BIN

assets/tw/raid/BRISTOL_OCR_REMAIN_EASY.png Normal file

Binary file not shown.

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

BIN

assets/tw/raid/BRISTOL_OCR_REMAIN_HARD.png Normal file

Binary file not shown.

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

BIN

assets/tw/raid/BRISTOL_OCR_REMAIN_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/tw/raid/BRISTOL_RAID_EASY.png Normal file

Binary file not shown.

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

BIN

assets/tw/raid/BRISTOL_RAID_HARD.png Normal file

Binary file not shown.

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

BIN

assets/tw/raid/BRISTOL_RAID_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/tw/research/QUEUE_CHECK.png

Binary file not shown.

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

BIN

assets/tw/ui/RAID_CHECK.png

Binary file not shown.

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