Fix: Resolve merge conflict ui/ui.py and ui/assets.py

Browse Source

...

This commit is contained in:

nEEtdo0d

2021-07-18 10:05:21 -04:00

parent 7f6fcaf508 96e388d7ab

commit 0477870c41

59 changed files with 225 additions and 241 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/LOGIN_RETURN_INFO.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/ZONE_SWITCH.png

Binary file not shown.

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

BIN

assets/cn/ui/RESHMENU_GOTO_SHIPYARD.png Normal file

Binary file not shown.

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

BIN

assets/cn/research/RESEARCH_TITLE.png → assets/cn/ui/SHIPYARD_CHECK.png

Binary file not shown.

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

BIN

assets/en/handler/LOGIN_RETURN_INFO.png Normal file

Binary file not shown.

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

BIN

assets/en/os/ZONE_SWITCH.png

Binary file not shown.

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

BIN

assets/en/raid/TICKET_USE_CONFIRM.png

Binary file not shown.

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

BIN

assets/en/research/RESEARCH_TITLE.png

Binary file not shown.

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

BIN

assets/en/reward/MEOWFFICER_TRAIN_FINISH_ALL.png

Binary file not shown.

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

BIN

assets/en/reward/MEOWFFICER_TRAIN_START.png

Binary file not shown.

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

BIN

assets/en/ui/RESEARCH_CHECK.png

Binary file not shown.

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

BIN

assets/en/ui/RESHMENU_CHECK.png

Binary file not shown.

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

BIN

assets/en/ui/RESHMENU_GOTO_SHIPYARD.png Normal file

Binary file not shown.

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

BIN

assets/en/ui/SHIPYARD_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/jp/guild/GUILD_BOSS_AVAILABLE.png

Binary file not shown.

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

BIN

assets/jp/handler/LOGIN_RETURN_INFO.png Normal file

Binary file not shown.

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

BIN

assets/jp/os/ZONE_SWITCH.png

Binary file not shown.

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

BIN

assets/jp/raid/TICKET_USE_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/research/RESEARCH_TITLE.png

Binary file not shown.

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

BIN

assets/jp/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/jp/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/jp/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/jp/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/jp/ui/RESHMENU_GOTO_SHIPYARD.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/SHIPYARD_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/research_blueprint/agir.png Normal file

Binary file not shown.

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

BIN

assets/research_blueprint/anchorage.png Normal file

Binary file not shown.

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

BIN

assets/research_blueprint/august.png Normal file

Binary file not shown.

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

BIN

assets/research_blueprint/hakuryu.png Normal file

Binary file not shown.

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

BIN

assets/research_blueprint/marcopolo.png Normal file

Binary file not shown.

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

BIN

assets/tw/handler/LOGIN_RETURN_INFO.png Normal file

Binary file not shown.

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

BIN

assets/tw/os/ZONE_SWITCH.png

Binary file not shown.

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

BIN

assets/tw/research/RESEARCH_TITLE.png

Binary file not shown.

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

BIN

assets/tw/ui/RESHMENU_GOTO_SHIPYARD.png Normal file

Binary file not shown.

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

BIN

assets/tw/ui/SHIPYARD_CHECK.png Normal file

Binary file not shown.

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