Merge branch 'dev' into Iss777

Browse Source

...

This commit is contained in:

LmeSzinc

2022-04-23 15:48:33 +08:00

committed by GitHub

parent 66a0324e4b d30da01a10

commit f9e9ea856a

1304 changed files with 38395 additions and 27966 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/dorm/DORM_FEED_CHECK.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/cn/handler/BATTLE_PASS_NOTICE.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/cn/handler/MONTHLY_PASS_NOTICE.png Normal file

Binary file not shown.

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

BIN

assets/cn/map/MAP_CAT_ATTACK_MIRROR.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_APPLY_LOCK.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_APPLY_UNLOCK.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_CANCEL.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_ENHANCE_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_ENHANCE_ENTER.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_FEED_CANCEL.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_FEED_CONFIRM.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_FEED_ENTER.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_GET_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_GOLD_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_PURPLE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/MEOWFFICER_STATUS.png

Binary file not shown.

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

BIN

assets/cn/meowfficer/OCR_MEOWFFICER_FEED.png Normal file

Binary file not shown.

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

BIN

assets/cn/meowfficer/OCR_MEOWFFICER_QUEUE.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/FLEET_EMP_DEBUFF.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/SELECT_ARCHIVE.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/ZONE_ARCHIVE.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_handler/EXCHANGE_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_handler/MISSION_OVERVIEW_ACCEPT_SINGLE.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_handler/RESET_FLEET_PREPARATION.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_handler/RESET_FLEET_PREPARATION.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_handler/RESET_TICKET_POPUP.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_handler/RESET_TICKET_POPUP.png Normal file

Binary file not shown.

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

BIN

assets/cn/tactical/OCR_SKILL_EXP.png

Binary file not shown.

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

BIN

assets/cn/tactical/TACTICAL_CLASS_CANCEL.png

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_Kiev.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_Soobrazitelny.gif Normal file

Binary file not shown.

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

0

assets/cn/template/TEMPLATE_SIREN_U552.gif → assets/cn/template/TEMPLATE_SIREN_U522.gif

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

BIN

assets/cn/template/TEMPLATE_SIREN_Volga.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_STAGE_CLEAR.png

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_STAGE_HALF_PERCENT.png

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_STAGE_PERCENT.png

Binary file not shown.

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

BIN

assets/cn/ui/CAMPAIGN_MENU_GOTO_CAMPAIGN.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/ui/CAMPAIGN_MENU_GOTO_CAMPAIGN.png

Binary file not shown.

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

BIN

assets/cn/ui/MAIN_GOTO_CAMPAIGN.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/ui/MAIN_GOTO_CAMPAIGN.png

Binary file not shown.

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

BIN

assets/cn/ui/MAIN_GOTO_DORMMENU.png

Binary file not shown.

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

BIN

assets/cn/ui/MAIN_GOTO_FLEET.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/ui/MAIN_GOTO_FLEET.png

Binary file not shown.

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

BIN

assets/cn/ui/MAIN_GOTO_RAID.png

Binary file not shown.

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

BIN

assets/cn/ui/MAIN_GOTO_RESHMENU.png

Binary file not shown.

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

BIN

assets/cn/ui/WAR_ARCHIVES_GOTO_CAMPAIGN.png

Binary file not shown.

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

BIN

assets/cn/ui/WAR_ARCHIVES_GOTO_CAMPAIGN_MENU.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_ASHEN_SIMULACRUM.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD.png Normal file

Binary file not shown.

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

BIN

assets/en/battle_pass/REWARD_RECEIVE_SP.png

Binary file not shown.

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

BIN

assets/en/campaign/SWITCH_1_HARD.png

Binary file not shown.

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

BIN

assets/en/campaign/SWITCH_1_NORMAL.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.9 KiB After Width:  |  Height:  |  Size: 5.1 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: 7.2 KiB

BIN

assets/en/combat/AUTOMATION_SWITCH.png

Binary file not shown.

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

BIN

assets/en/combat/BATTLE_PREPARATION.png

Binary file not shown.

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

BIN

assets/en/combat/BATTLE_STATUS_A.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/BATTLE_STATUS_B.BUTTON.png

Binary file not shown.

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

BIN

assets/en/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: 4.0 KiB

BIN

assets/en/combat/BATTLE_STATUS_S.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/BATTLE_STATUS_S.png

Binary file not shown.

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

BIN

assets/en/combat/COMBAT_AUTO_SWITCH.png

Binary file not shown.

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

BIN

assets/en/combat/EMERGENCY_REPAIR_CONFIRM.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_A.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_B.BUTTON.png

Binary file not shown.

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

BIN

assets/en/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: 3.6 KiB

BIN

assets/en/combat/EXP_INFO_C.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/EXP_INFO_D.BUTTON.png

Binary file not shown.

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

BIN

assets/en/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: 4.9 KiB

BIN

assets/en/combat/EXP_INFO_S.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/GET_ITEMS_1.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/GET_ITEMS_1.png

Binary file not shown.

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

BIN

assets/en/combat/GET_ITEMS_2.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/GET_ITEMS_2.png

Binary file not shown.

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

BIN

assets/en/combat/GET_ITEMS_3.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/GET_ITEMS_3.png

Binary file not shown.

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

BIN

assets/en/combat/GET_SHIP.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/OPTS_INFO_D.BUTTON.png

Binary file not shown.

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

BIN

assets/en/combat/OPTS_INFO_D.png

Binary file not shown.

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

BIN

assets/en/combat/PAUSE.BUTTON.png

Binary file not shown.

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

BIN

assets/en/commission/COMMISSION_ADVICE.png

Binary file not shown.

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

BIN

assets/en/commission/COMMISSION_DAILY.png

Binary file not shown.

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

BIN

assets/en/commission/COMMISSION_START.png

Binary file not shown.

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

BIN

assets/en/commission/COMMISSION_URGENT.png

Binary file not shown.

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

BIN

assets/en/commission/EXP_INFO_S_REWARD.png

Binary file not shown.

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

BIN

assets/en/commission/REWARD_1.png

Binary file not shown.

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

BIN

assets/en/daily/DAILY_ENTER.png

Binary file not shown.

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

BIN

assets/en/daily/DAILY_ENTER_CHECK.png

Binary file not shown.

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

BIN

assets/en/daily/DAILY_LOCKED.png

Binary file not shown.

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

BIN

assets/en/daily/DAILY_MISSION_1.png

Binary file not shown.

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

BIN

assets/en/daily/DAILY_MISSION_2.png

Binary file not shown.

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

BIN

assets/en/daily/DAILY_MISSION_3.png

Binary file not shown.

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

BIN

assets/en/daily/DAILY_NEXT.png

Binary file not shown.

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

BIN

assets/en/daily/DAILY_PREV.png

Binary file not shown.

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

BIN

assets/en/daily/DAILY_SKIP.png

Binary file not shown.

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

BIN

assets/en/data_key/DATA_KEY_COLLECT.png

Binary file not shown.

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

BIN

assets/en/data_key/DATA_KEY_COLLECTED.png

Binary file not shown.

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

BIN

assets/en/data_key/OCR_DATA_KEY.png

Binary file not shown.

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

BIN

assets/en/dorm/DORM_FEED_CHECK.png

Binary file not shown.

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

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