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

Fix: [JP] Asset problem caused by UI hotfix (#2400)

2023-03-24 22:46:18 +08:00

combat

Upd: BATTLE_STATUS_*

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

commission

Upd: [JP] REWARD_* assets

2022-08-19 00:14:32 +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

Fix: Delete unused ui action; Rename button

2022-08-06 16:40:47 +08:00

event

Upd: [JP] ESCORT_* assets

2022-01-16 15:19:02 +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: [EN][JP] BATTLE_STATUS_CF, EXP_INFO_CF

2023-06-10 01:39:23 +08:00

handler

Upd: Assets FORMATION to adapt to W15

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

hard

…

map

Fix: [JP] SUBMARINE_BAR

2023-10-22 21:51:52 +08:00

meowfficer

Upd: [JP] Meowfficer assets (#3291)

2023-11-19 18:55:51 +08:00

meta_reward

Del: unused DOSSIER_REWARD_NOTICE.png

2023-09-09 08:53:51 +08:00

minigame

Opt: Choose minigame by scroll

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

os

Upd: alter commit (c153b23); reduce to single asset in conditions with minimal offset, asset cut should be server transparent (#1527)

2022-10-04 00:25:42 -04:00

os_ash

Upd: BEACON_REWARD to handle poor english on buttons (#2109)

2023-01-13 23:45:41 +08:00

os_combat

…

os_handler

Fix: [CN][JP] Handle bugged AUTO_SEARCH_OS_MAP_OPTION_OFF button

2024-03-21 18:35:48 +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

Upd: Copy SHIPYARD_SERIES_SELECT_CHECK to all servers

2022-07-18 01:11:40 +08:00

shop

fix: shop confirm amount buttom (#3001)

2023-08-11 19:05:52 +08:00

sos

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

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

statistics

…

storage

Upd: Replace MATERIAL_CHECK.png with different version

2022-12-10 19:51:43 +08:00

tactical

Fix: [EN] Unable to detect META skill list

2022-09-25 02:39:45 +08:00

template

Add: Chapter SP

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

ui

Upd: [EN][JP] Sync DORMMENU assets

2024-02-06 19:22:22 +08:00

war_archives

Smaller templates to prevent weird stuck

2022-10-17 01:04:21 +08:00