Zuosizhu f505061384 Merge branch 'master_lme' ...

# Conflicts:
#	module/campaign/assets.py
#	module/campaign/campaign_status.py

2023-03-25 00:05:17 +08:00

..

campaign

Merge branch 'master_lme'

2023-03-25 00:05:17 +08:00

coalition

Add: Coalition task

2023-03-24 04:41:13 +08:00

combat

Upd: [JP] BATTLE_PREPARATION

2023-01-18 23:17:49 +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

Fix: Delay task Dorm according to number of ships in dorm (fixed #2119)

2023-01-28 18:11:28 +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

Fix: [TW] exercise assets

2022-09-03 15:24:13 +08:00

freebies

Upd: [EN] Another MAIL_EMPTY

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

gacha

Fix: Wrong OCR result for build ticket count

2022-08-06 19:39:57 +08:00

guild

Upd: [TW] EXP_INFO_CF (fixed #1310)

2022-07-09 21:49:36 +08:00

handler

Fix: Handle another STORY_SKIP (#2284)

2023-02-24 21:25:36 +08:00

hard

'TW服的畫面截圖'

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

map

Upd: [TW] FLEET_*_ADVICE

2023-03-11 03:56:46 +08:00

meowfficer

Fix: Check meowfficer level before enhancing (#2211)

2023-02-14 00:11:36 +08:00

os

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

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

os_ash

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

2023-01-13 23:45:41 +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

Revert: [TW] Revert IRIS_OCR_PT

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

research

Upd: [TW] QUEUE_CHECK (#2141)

2023-01-18 22:23:30 +08:00

retire

Upd: EQUIP_CONFIRM

2023-02-26 20:53:56 +08:00

reward

Mov: reward mail support to separate module

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

shipyard

Upd: [CN][TW] SHIPYARD_LEVEL_NOT_ENOUGH_FATE

2023-02-11 16:41:16 +08:00

shop

Upd: [CN] Voucher shop assets and translation

2022-12-05 22:31:53 +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: Revelations of Dust chapter AC

2023-02-23 22:15:39 +08:00

ui

Upd: [TW] raid assets

2023-03-23 21:52:41 +08:00

war_archives

Merge branch 'dev'

2022-02-06 12:31:54 +08:00