Merge branch 'gems_farming' into dev

Browse Source

# Conflicts:
#	module/campaign/campaign_ocr.py
#	module/equipment/equipment.py
#	module/guild/base.py

...

This commit is contained in:

LmeSzinc

2021-07-24 17:33:58 +08:00

parent 83b2b49cd6 706ffc8a75

commit e918a5db97

48 changed files with 524 additions and 225 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/retire/SR_SSR_CONFIRM.png → assets/cn/equipment/FLEET_ENTER_FLAGSHIP.png

Binary file not shown.

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

BIN

assets/cn/retire/DOCK_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/tw/retire/SR_SSR_CONFIRM.png → assets/cn/retire/DOCK_SELECTED.png

Binary file not shown.

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

BIN

assets/en/equipment/FLEET_ENTER_FLAGSHIP.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/DOCK_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/DOCK_SELECTED.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/SR_SSR_CONFIRM.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 14 KiB

BIN

assets/jp/equipment/FLEET_ENTER_FLAGSHIP.png Normal file

Binary file not shown.

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

BIN

assets/jp/retire/DOCK_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/jp/retire/DOCK_SELECTED.png Normal file

Binary file not shown.

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

BIN

assets/jp/retire/SR_SSR_CONFIRM.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.1 KiB

BIN

assets/tw/equipment/FLEET_ENTER_FLAGSHIP.png Normal file

Binary file not shown.

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

BIN

assets/tw/retire/DOCK_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/tw/retire/DOCK_SELECTED.png Normal file

Binary file not shown.

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