Merge branch 'zuosizhu-alas/master'

Browse Source

# Conflicts:
#	module/config/argument/args.json

...

This commit is contained in:

LA_DI_DA

2024-04-17 18:28:09 +08:00

parent c2351ff54e 5281fb1d79

commit 237ddc0675

230 changed files with 4947 additions and 1034 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/campaign/SWITCH_2_EX.png

Binary file not shown.

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

BIN

assets/cn/dorm/DORM_MANAGE.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/FORMATION_1.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/FORMATION_1.png

Binary file not shown.

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

BIN

assets/cn/handler/FORMATION_2.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/FORMATION_2.png

Binary file not shown.

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

BIN

assets/cn/handler/FORMATION_3.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/FORMATION_3.png

Binary file not shown.

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

BIN

assets/cn/handler/LOGIN_ANNOUNCE_2.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/LOGIN_ANNOUNCE_2.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/MISSION_POPUP_ACK.png

Binary file not shown.

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

BIN

assets/cn/handler/MISSION_POPUP_GO.png

Binary file not shown.

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

BIN

assets/cn/os_handler/AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/RPG_GOTO_STAGE.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/RPG_GOTO_STORY.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/RPG_HOME.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/RPG_LEAVE_CITY.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/RPG_RAID_EASY.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/RPG_RAID_EX.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/RPG_RAID_HARD.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/RPG_RAID_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/cn/raid/RPG_STATUS_POPUP.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/TEMPLATE_AULICK.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/TEMPLATE_BOGUE.png

Binary file not shown.

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

BIN

assets/cn/retire/TEMPLATE_CASSIN_1.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/TEMPLATE_CASSIN_2.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/TEMPLATE_DOWNES_1.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/TEMPLATE_DOWNES_2.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/TEMPLATE_FOOTE.png Normal file

Binary file not shown.

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

BIN

assets/cn/retire/TEMPLATE_HERMES.png

Binary file not shown.

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

BIN

assets/cn/retire/TEMPLATE_LANGLEY.png

Binary file not shown.

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

BIN

assets/cn/retire/TEMPLATE_RANGER.png

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_STAGE_CLEAR_SMALL.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_COUNTERATTACK_WITHIN_THE_FJORD.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_THE_SOLOMON_RANGER.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_THE_WAY_HOME_IN_THE_NIGHT.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/BATTLE_PREPARATION.gif

Binary file not shown.

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

BIN

assets/en/dorm/DORM_FEED_ENTER.png

Binary file not shown.

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

BIN

assets/en/dorm/DORM_MANAGE.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/FORMATION_1.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/FORMATION_1.png

Binary file not shown.

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

BIN

assets/en/handler/FORMATION_2.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/FORMATION_2.png

Binary file not shown.

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

BIN

assets/en/handler/FORMATION_3.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/FORMATION_3.png

Binary file not shown.

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

BIN

assets/en/handler/LOGIN_ANNOUNCE_2.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/LOGIN_ANNOUNCE_2.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/RPG_GOTO_STAGE.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/RPG_GOTO_STORY.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/RPG_HOME.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/RPG_LEAVE_CITY.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/RPG_RAID_EASY.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/RPG_RAID_EX.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/RPG_RAID_HARD.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/RPG_RAID_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/en/raid/RPG_STATUS_POPUP.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/TEMPLATE_AULICK.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/TEMPLATE_BOGUE.png

Binary file not shown.

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

BIN

assets/en/retire/TEMPLATE_CASSIN_1.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/TEMPLATE_CASSIN_2.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/TEMPLATE_DOWNES_1.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/TEMPLATE_DOWNES_2.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/TEMPLATE_FOOTE.png Normal file

Binary file not shown.

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

BIN

assets/en/retire/TEMPLATE_HERMES.png

Binary file not shown.

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

BIN

assets/en/retire/TEMPLATE_LANGLEY.png

Binary file not shown.

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

BIN

assets/en/retire/TEMPLATE_RANGER.png

Binary file not shown.

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

BIN

assets/jp/dorm/DORM_MANAGE.png Normal file

Binary file not shown.

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

BIN

assets/jp/handler/FORMATION_1.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/jp/handler/FORMATION_1.png

Binary file not shown.

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

BIN

assets/jp/handler/FORMATION_2.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/jp/handler/FORMATION_2.png

Binary file not shown.

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

BIN

assets/jp/handler/FORMATION_3.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/jp/handler/FORMATION_3.png

Binary file not shown.

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

BIN

assets/jp/handler/LOGIN_ANNOUNCE_2.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/jp/handler/LOGIN_ANNOUNCE_2.png Normal file

Binary file not shown.

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

BIN

assets/jp/os_handler/AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/RPG_GOTO_STAGE.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/RPG_GOTO_STORY.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/RPG_HOME.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/RPG_LEAVE_CITY.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/RPG_RAID_EASY.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/RPG_RAID_EX.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/RPG_RAID_HARD.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/RPG_RAID_NORMAL.png Normal file

Binary file not shown.

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

BIN

assets/jp/raid/RPG_STATUS_POPUP.png Normal file

Binary file not shown.

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

BIN

assets/jp/retire/TEMPLATE_AULICK.png Normal file

Binary file not shown.

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

BIN

assets/jp/retire/TEMPLATE_BOGUE.png

Binary file not shown.

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

BIN

assets/jp/retire/TEMPLATE_CASSIN_1.png Normal file

Binary file not shown.

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

BIN

assets/jp/retire/TEMPLATE_CASSIN_2.png Normal file

Binary file not shown.

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

BIN

assets/jp/retire/TEMPLATE_DOWNES_1.png Normal file

Binary file not shown.

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

BIN

assets/jp/retire/TEMPLATE_DOWNES_2.png Normal file

Binary file not shown.

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

BIN

assets/jp/retire/TEMPLATE_FOOTE.png Normal file

Binary file not shown.

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

BIN

assets/jp/retire/TEMPLATE_HERMES.png

Binary file not shown.

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

BIN

assets/jp/retire/TEMPLATE_LANGLEY.png

Binary file not shown.

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

BIN

assets/jp/retire/TEMPLATE_RANGER.png

Binary file not shown.

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

BIN

assets/shop/medal/SpecializedCore.png Normal file

Binary file not shown.

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

BIN

assets/tw/dorm/DORM_MANAGE.png Normal file

Binary file not shown.

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

BIN

assets/tw/handler/FORMATION_1.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/tw/handler/FORMATION_1.png

Binary file not shown.

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

Some files were not shown because too many files have changed in this diff Show More