Merge branch 'dev' into fpy

Browse Source

...

This commit is contained in:

hgjazhgj

2023-05-27 19:12:05 +08:00

parent 01094d1ae8 d98f04d5bf

commit 742e34c8d0

481 changed files with 4972 additions and 720 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_A.png

Binary file not shown.

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

BIN

assets/cn/combat/BATTLE_STATUS_B.png

Binary file not shown.

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

BIN

assets/cn/combat/BATTLE_STATUS_C.png

Binary file not shown.

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

BIN

assets/cn/combat/BATTLE_STATUS_D.png

Binary file not shown.

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

BIN

assets/cn/combat/BATTLE_STATUS_S.png

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_A.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_A.png

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_B.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_B.png

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_C.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_C.png

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_D.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_D.png

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_S.BUTTON.png

Binary file not shown.

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

BIN

assets/cn/combat/EXP_INFO_S.png

Binary file not shown.

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

BIN

assets/cn/exercise/CLICK_SAFE_AREA.png

Binary file not shown.

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

BIN

assets/cn/shop/SHOP_CORE_SWIPE_END.png Normal file

Binary file not shown.

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

BIN

assets/cn/shop/SHOP_META_SWIPE_END.png Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_META_DOCK_RED_DOT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 248 B

BIN

assets/cn/template/TEMPLATE_SIREN_AbyssalBoss4.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_AbyssalBoss5.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_STAGE_GREEN_CLEAR.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_AURORA_NOCTIS.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_NORTHERN_OVERTURE.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/BATTLE_STATUS_A.png

Binary file not shown.

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

BIN

assets/en/combat/BATTLE_STATUS_B.png

Binary file not shown.

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

BIN

assets/en/combat/BATTLE_STATUS_C.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.0 KiB 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: 9.2 KiB After Width:  |  Height:  |  Size: 9.9 KiB

BIN

assets/en/combat/BATTLE_STATUS_S.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_A.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_A.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_B.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_B.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_C.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_C.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_D.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_D.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_S.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_S.png

Binary file not shown.

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

BIN

assets/en/exercise/CLICK_SAFE_AREA.png

Binary file not shown.

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

BIN

assets/en/shop/SHOP_CORE_SWIPE_END.png Normal file

Binary file not shown.

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

BIN

assets/en/shop/SHOP_META_SWIPE_END.png Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_META_DOCK_RED_DOT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 248 B

BIN

assets/en/template/TEMPLATE_SIREN_AbyssalBoss4.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_AbyssalBoss5.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_STAGE_GREEN_CLEAR.png Normal file

Binary file not shown.

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

BIN

assets/jp/combat/BATTLE_STATUS_A.png

Binary file not shown.

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

BIN

assets/jp/combat/BATTLE_STATUS_B.png

Binary file not shown.

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

BIN

assets/jp/combat/BATTLE_STATUS_C.png

Binary file not shown.

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

BIN

assets/jp/combat/BATTLE_STATUS_D.png

Binary file not shown.

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

BIN

assets/jp/combat/BATTLE_STATUS_S.png

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_A.BUTTON.png

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_A.png

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_B.BUTTON.png

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_B.png

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_C.BUTTON.png

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_C.png

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_D.BUTTON.png

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_D.png

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_S.BUTTON.png

Binary file not shown.

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

BIN

assets/jp/combat/EXP_INFO_S.png

Binary file not shown.

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

BIN

assets/jp/exercise/CLICK_SAFE_AREA.png

Binary file not shown.

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

BIN

assets/jp/gacha/BUILD_CUBE_COUNT.png

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_CORE_SWIPE_END.png Normal file

Binary file not shown.

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

BIN

assets/jp/shop/SHOP_META_SWIPE_END.png Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_META_DOCK_RED_DOT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 248 B

BIN

assets/jp/template/TEMPLATE_SIREN_AbyssalBoss4.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_AbyssalBoss5.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_STAGE_GREEN_CLEAR.png Normal file

Binary file not shown.

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

BIN

assets/tw/combat/BATTLE_STATUS_A.png

Binary file not shown.

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

BIN

assets/tw/combat/BATTLE_STATUS_B.png

Binary file not shown.

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

BIN

assets/tw/combat/BATTLE_STATUS_C.png

Binary file not shown.

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

BIN

assets/tw/combat/BATTLE_STATUS_D.png

Binary file not shown.

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

BIN

assets/tw/combat/BATTLE_STATUS_S.png

Binary file not shown.

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

BIN

assets/tw/combat/EXP_INFO_A.BUTTON.png

Binary file not shown.

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

BIN

assets/tw/combat/EXP_INFO_A.png

Binary file not shown.

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

BIN

assets/tw/combat/EXP_INFO_B.BUTTON.png

Binary file not shown.

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

BIN

assets/tw/combat/EXP_INFO_B.png

Binary file not shown.

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

BIN

assets/tw/combat/EXP_INFO_C.BUTTON.png

Binary file not shown.

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

BIN

assets/tw/combat/EXP_INFO_C.png

Binary file not shown.

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

BIN

assets/tw/combat/EXP_INFO_D.BUTTON.png

Binary file not shown.

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

BIN

assets/tw/combat/EXP_INFO_D.png

Binary file not shown.

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

BIN

assets/tw/combat/EXP_INFO_S.BUTTON.png

Binary file not shown.

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

BIN

assets/tw/combat/EXP_INFO_S.png

Binary file not shown.

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

BIN

assets/tw/exercise/CLICK_SAFE_AREA.png

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_META_DOCK_RED_DOT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 248 B

BIN

assets/tw/template/TEMPLATE_SIREN_AbyssalBoss4.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_AbyssalBoss5.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_STAGE_GREEN_CLEAR.png Normal file

Binary file not shown.

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