Zuosizhu 69aebdcf30 Merge branch 'master_lme' ...

# Conflicts:
#	config/template.json
#	deploy/Windows/app.py
#	deploy/Windows/config.py
#	deploy/Windows/emulator.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
#	deploy/Windows/template.yaml
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/device/device.py
#	module/device/emulator.py
#	module/device/method/droidcast.py
#	module/device/platform/emulator_base.py
#	module/device/platform/emulator_windows.py
#	module/device/platform/platform_windows.py
#	module/handler/auto_search.py

2024-04-10 12:22:40 +08:00

..

campaign

Merge branch 'master_lme'

2023-08-19 09:23:28 +08:00

coalition

Update tw assets for Frostfall (#3051)

2023-08-25 12:38:19 +08:00

combat

Upd: BATTLE_STATUS_*

2023-05-26 00:55:35 +08:00

commission

Refactor: Rename main configs

2021-09-15 23:32:31 +08:00

daily

Add: Emergency module development daily

2023-03-17 00:34:02 +08:00

dorm

Opt: reset dorm view before dorm_collect (#3510)

2024-04-03 23:42:20 +08:00

equipment

Upd: [TW] EQUIPMENT_OPEN and EQUIPMENT_CLOSE

2022-10-25 12:42:12 +08:00

event

Add: Maritime escort

2022-01-15 22:17:34 +08:00

exercise

Upd: EXP_INFO_* and the exercise one

2023-05-25 21:45:19 +08:00

freebies

Upd: [EN] Another MAIL_EMPTY

2023-01-01 17:04:39 +08:00

gacha

Fix: Error caused by empty build queue (#2816)

2023-06-30 15:32:41 +08:00

guild

Upd: [CN] BATTLE_STATUS_CF, EXP_INFO_CF

2023-06-09 00:19:01 +08:00

handler

Upd: Assets FORMATION to adapt to W15

2024-04-03 17:24:40 +08:00

hard

'TW服的畫面截圖'

2020-10-26 20:26:10 +08:00

map

Upd: [TW] MAP_OFFENSIVE and SWITCH_OVER (#3544)

2024-03-21 18:21:15 +08:00

meowfficer

Upd:[TW]Update Meowfficer assets (#3341)

2023-12-08 18:02:31 +08:00

minigame

Opt: Choose minigame by scroll

2023-08-08 00:03:41 +08:00

os

Fix: [TW] MAP_NAME, it should as long as CN

2023-01-03 02:33:45 +08:00

os_ash

[TW]Fix ash beacons and shipyard (#2999)

2023-08-11 19:06:10 +08:00

os_combat

fix:[tw]os_combat assets

2022-11-08 11:55:39 +08:00

os_handler

Upd: [TW] OS_FLEET_LOCKED and OS_FLEET_UNLOCKED

2023-01-17 23:03:38 +08:00

raid

Fix: Swapped RPG_RAID_EASY and RPG_RAID_NORMAL

2024-03-29 03:21:10 +08:00

research

Fix: get_research_series() (#2975)

2023-08-06 17:40:43 +08:00

retire

fix: ship template assets bit error (#3618)

2024-04-09 11:23:16 +08:00

reward

Mov: reward mail support to separate module

2022-10-16 01:01:15 -04:00

shipyard

[TW]Fix ash beacons and shipyard (#2999)

2023-08-11 19:06:10 +08:00

shop

Upd: [TW] SHOP_BUY_CONFIRM_AMOUNT

2023-10-17 18:27:14 +08:00

sos

Fix: [EN] Confirm button in SOS signal search list

2022-12-07 01:38:57 +08:00

statistics

'TW服的畫面截圖'

2020-10-26 20:26:10 +08:00

storage

Upd: Copy static storage assets to all servers

2022-08-23 01:14:44 +08:00

tactical

Upd: [TW] SKILL_CONFIRM

2023-01-09 21:01:45 +08:00

template

Add: Chapter SP

2024-03-02 03:34:24 +08:00

ui

Upd:[TW]Event:Reflections of the Oasis (#3574)

2024-03-21 19:33:21 +08:00

war_archives

Upd:[TW]war_archives assets (#3490)

2024-02-18 01:37:15 +08:00