Merge branch 'master' into try_jp
[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
BIN
assets/cn/combat/BATTLE_STATUS_B.BUTTON.png
Normal file
|
After Width: | Height: | Size: 9.7 KiB |
BIN
assets/cn/combat/BATTLE_STATUS_B.png
Normal file
|
After Width: | Height: | Size: 9.2 KiB |
BIN
assets/cn/combat/EXP_INFO_B.BUTTON.png
Normal file
|
After Width: | Height: | Size: 9.7 KiB |
BIN
assets/cn/combat/EXP_INFO_B.png
Normal file
|
After Width: | Height: | Size: 8.8 KiB |
BIN
assets/cn/combat/EXP_INFO_D.BUTTON.png
Normal file
|
After Width: | Height: | Size: 6.5 KiB |
BIN
assets/cn/combat/EXP_INFO_D.png
Normal file
|
After Width: | Height: | Size: 7.5 KiB |
BIN
assets/cn/combat/OPTS_INFO_D.BUTTON.png
Normal file
|
After Width: | Height: | Size: 7.5 KiB |
BIN
assets/cn/combat/OPTS_INFO_D.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
assets/cn/reward/COMMISSION_SCROLL.png
Normal file
|
After Width: | Height: | Size: 7.7 KiB |
BIN
assets/cn/reward/COMMISSION_SCROLL_TOP.png
Normal file
|
After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
BIN
assets/en/combat/BATTLE_STATUS_B.BUTTON.png
Normal file
|
After Width: | Height: | Size: 9.7 KiB |
BIN
assets/en/combat/BATTLE_STATUS_B.png
Normal file
|
After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 9.9 KiB |
BIN
assets/en/combat/EXP_INFO_B.BUTTON.png
Normal file
|
After Width: | Height: | Size: 9.7 KiB |
BIN
assets/en/combat/EXP_INFO_B.png
Normal file
|
After Width: | Height: | Size: 8.8 KiB |
BIN
assets/en/combat/EXP_INFO_D.BUTTON.png
Normal file
|
After Width: | Height: | Size: 6.5 KiB |
BIN
assets/en/combat/EXP_INFO_D.png
Normal file
|
After Width: | Height: | Size: 7.5 KiB |
BIN
assets/en/combat/OPTS_INFO_D.BUTTON.png
Normal file
|
After Width: | Height: | Size: 7.5 KiB |
BIN
assets/en/combat/OPTS_INFO_D.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 13 KiB |
BIN
assets/en/reward/COMMISSION_SCROLL.png
Normal file
|
After Width: | Height: | Size: 9.1 KiB |
BIN
assets/en/reward/COMMISSION_SCROLL_TOP.png
Normal file
|
After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 4.0 KiB |
BIN
assets/jp/combat/BATTLE_STATUS_B.png
Normal file
|
After Width: | Height: | Size: 9.2 KiB |
BIN
assets/jp/combat/EXP_INFO_B.png
Normal file
|
After Width: | Height: | Size: 8.8 KiB |
BIN
assets/jp/combat/EXP_INFO_D.png
Normal file
|
After Width: | Height: | Size: 7.5 KiB |
BIN
assets/jp/combat/OPTS_INFO_D.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
assets/jp/reward/COMMISSION_SCROLL.png
Normal file
|
After Width: | Height: | Size: 7.7 KiB |
BIN
assets/jp/reward/COMMISSION_SCROLL_TOP.png
Normal file
|
After Width: | Height: | Size: 5.4 KiB |