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

Upd: [EN][JP] COALITION_REWARD_CONFIRM

2023-03-24 14:08:05 +08:00

combat

Upd: [EN] BATTLE_PREPARATION

2024-03-29 09:23:46 +08:00

commission

Fix: [EN] Fix commission "flashing bug"

2022-04-14 13:22:25 -03:00

daily

Add: Emergency module development daily

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

dorm

Upd: [EN] DORM_FEED_ENTER

2024-04-05 17:48:34 +08:00

equipment

Upd: [EN] EQUIPMENT_OPEN

2023-10-27 07:35:19 +08:00

event

Upd: [EN] remove alpha channel in assets

2022-04-12 22:59:48 -04: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

Upd: [EN] _fleet_sidebar

2023-10-20 01:11:59 +08:00

meowfficer

Upd: Update EN meowfficer assets

2023-11-18 14:37:43 +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

Fix: [EN] Update FLEET_* in OpSi

2022-12-16 21:42:36 +08:00

os_ash

Upd: [EN] various assets for server; war_archive, os_ash, template, and handler

2023-06-30 18:00:33 -04:00

os_combat

Upd: [EN] remove alpha channel in assets

2022-04-12 22:59:48 -04:00

os_handler

Upd: [EN] MISSION_OVERVIEW_CHECK

2023-03-17 00:49:43 +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: [EN] shipyard fate assets

2023-01-22 22:33:57 -05: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

updata EN box button (fix#3015) (#3017)

2023-08-15 18:40:55 +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

Upd: [EN] various assets for server; war_archive, os_ash, template, and handler

2023-06-30 18:00:33 -04:00