Merge branch 'master' into try_jp

Browse Source

[JP] copy assets from cn

# Conflicts:
#	module/combat/assets.py
#	module/daemon/assets.py
#	module/handler/assets.py
#	module/retire/assets.py
#	module/reward/assets.py

...

This commit is contained in:

ferina8-14

2020-06-13 03:29:35 +09:00

parent 4fd1b7999a 24a00f095e

commit 47adffd1a0

109 changed files with 1684 additions and 337 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_STATUS_B.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/combat/BATTLE_STATUS_B.png Normal file

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_B.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_B.png Normal file

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_D.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_D.png Normal file

Binary file not shown.

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

BIN

assets/cn/combat/OPTS_INFO_D.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/combat/OPTS_INFO_D.png Normal file

Binary file not shown.

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

BIN

assets/cn/reward/COMMISSION_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/cn/reward/COMMISSION_SCROLL_TOP.png Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_CAUGHT_BY_SIREN.png

Binary file not shown.

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

BIN

assets/en/combat/AUTOMATION_CONFIRM.png

Binary file not shown.

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

BIN

assets/en/combat/BATTLE_STATUS_B.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/BATTLE_STATUS_B.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/BATTLE_STATUS_D.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_B.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_B.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_D.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_D.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/OPTS_INFO_D.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/OPTS_INFO_D.png Normal file

Binary file not shown.

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

BIN

assets/en/daemon/AMBUSH_AVOID.BUTTON.png

Binary file not shown.

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

BIN

assets/en/daemon/AMBUSH_AVOID.png

Binary file not shown.

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

BIN

assets/en/handler/GET_MISSION.png

Binary file not shown.

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

BIN

assets/en/handler/INFO_BAR_1.png

Binary file not shown.

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

BIN

assets/en/handler/INFO_BAR_2.png

Binary file not shown.

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

BIN

assets/en/handler/INFO_BAR_3.png

Binary file not shown.

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

BIN

assets/en/handler/MAP_AMBUSH_EVADE.BUTTON.png

Binary file not shown.

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

BIN

assets/en/handler/POPUP_CANCEL.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/handler/POPUP_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/en/handler/STORY_SKIP.png

Binary file not shown.

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

BIN

assets/en/retire/RETIRE_APPEAR_1.png

Binary file not shown.

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

BIN

assets/en/retire/RETIRE_APPEAR_2.png

Binary file not shown.

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

BIN

assets/en/retire/RETIRE_APPEAR_3.png

Binary file not shown.

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

BIN

assets/en/reward/COMMISSION_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/en/reward/COMMISSION_SCROLL_TOP.png Normal file

Binary file not shown.

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

BIN

assets/en/reward/COMMISSION_STOP_SCROLLING.png

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_AMBUSH_EVADE_FAILED.png

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_AMBUSH_EVADE_SUCCESS.png

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_CAUGHT_BY_SIREN.png

Binary file not shown.

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

BIN

assets/jp/combat/BATTLE_STATUS_B.png Normal file

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_B.png Normal file

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_D.png Normal file

Binary file not shown.

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

BIN

assets/jp/combat/OPTS_INFO_D.png Normal file

Binary file not shown.

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

BIN

assets/jp/reward/COMMISSION_SCROLL.png Normal file

Binary file not shown.

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

BIN

assets/jp/reward/COMMISSION_SCROLL_TOP.png Normal file

Binary file not shown.

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