Merge branch 'master' into dev

Browse Source

# Conflicts:
#	module/os/assets.py

...

This commit is contained in:

LmeSzinc

2021-04-16 17:51:18 +08:00

parent 3d96c6377f 9523b3eff8

commit 4f4f296e44

67 changed files with 68 additions and 51 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/jp/combat/AUTOMATION_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/combat/BATTLE_PREPARATION.png

Binary file not shown.

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

BIN

assets/jp/combat/EMERGENCY_REPAIR_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/daemon/AT_SEA.png

Binary file not shown.

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

BIN

assets/jp/daemon/FLEET_PREPARATION.png

Binary file not shown.

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

BIN

assets/jp/daemon/MAP_PREPARATION.png

Binary file not shown.

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

BIN

assets/jp/daily/DAILY_SKIP.png Normal file

Binary file not shown.

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

BIN

assets/jp/exercise/QUIT_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/exercise/QUIT_RECONFIRM.png

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_RED_DOT.png

Binary file not shown.

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

BIN

assets/jp/handler/AUTO_SEARCH_MENU_CONTINUE.png

Binary file not shown.

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

BIN

assets/jp/handler/AUTO_SEARCH_MENU_EXIT.png

Binary file not shown.

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

BIN

assets/jp/handler/GET_MISSION.png

Binary file not shown.

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

BIN

assets/jp/handler/POPUP_CANCEL.png

Binary file not shown.

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

BIN

assets/jp/handler/POPUP_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/map/FLEET_PREPARATION.png

Binary file not shown.

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

BIN

assets/jp/map/MAP_OFFENSIVE.png

Binary file not shown.

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

BIN

assets/jp/map/MAP_PREPARATION.png

Binary file not shown.

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

BIN

assets/jp/map/SWITCH_OVER.png

Binary file not shown.

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

BIN

assets/jp/map/WITHDRAW.png

Binary file not shown.

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

BIN

assets/jp/os/MAP_GOTO_GLOBE.png

Binary file not shown.

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

BIN

assets/jp/os_ash/ASH_ENTER_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/os_ash/BATTLE_STATUS.png

Binary file not shown.

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

BIN

assets/jp/os_ash/HELP_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/research/RESEARCH_FINISHED.png

Binary file not shown.

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

BIN

assets/jp/retire/EQUIP_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/retire/EQUIP_CONFIRM_2.png

Binary file not shown.

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

BIN

assets/jp/retire/IN_RETIREMENT_CHECK.png

Binary file not shown.

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

BIN

assets/jp/retire/ONE_CLICK_RETIREMENT.png

Binary file not shown.

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

BIN

assets/jp/retire/RETIRE_APPEAR_1.png

Binary file not shown.

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

BIN

assets/jp/retire/RETIRE_APPEAR_2.png

Binary file not shown.

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

BIN

assets/jp/retire/RETIRE_APPEAR_3.png

Binary file not shown.

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

BIN

assets/jp/retire/SHIP_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/retire/SHIP_CONFIRM_2.png

Binary file not shown.

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

BIN

assets/jp/retire/SR_SSR_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/reward/COMMISSION_ADVICE.png

Binary file not shown.

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

BIN

assets/jp/reward/COMMISSION_START.png

Binary file not shown.

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

BIN

assets/jp/reward/REWARD_1.png

Binary file not shown.

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

BIN

assets/jp/reward/REWARD_2.png

Binary file not shown.

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

BIN

assets/jp/reward/REWARD_3.png

Binary file not shown.

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

BIN

assets/jp/reward/TACTICAL_CLASS_CANCEL.png

Binary file not shown.

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

BIN

assets/jp/reward/TACTICAL_CLASS_START.png

Binary file not shown.

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

BIN

assets/jp/ui/DORM_INFO.png

Binary file not shown.

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

BIN

assets/jp/ui/FLEET_CHECK.png

Binary file not shown.

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

BIN

assets/jp/ui/REWARD_GOTO_COMMISSION.png

Binary file not shown.

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

BIN

assets/jp/ui/REWARD_GOTO_TACTICAL.png

Binary file not shown.

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