Zuosizhu 0935b58ede Merge branch 'master_lme' ...

# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py

2023-07-15 20:26:12 +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: BATTLE_STATUS_*

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

commission

…

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

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: [TW] MAP_AMBUSH_EVADE (fixed #2444)

2023-04-04 01:40:23 +08:00

hard

…

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

Fix: add RAID_REWARDS.png to fix raid reward problem (#2829)

2023-07-02 15:38:44 +08:00

research

Upd: [TW] QUEUE_CHECK (#2141)

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

retire

Upd: [CN][TW] DOCK_SELECTED (#2729)

2023-06-08 16:33:31 +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: [TW] assets of shop module

2023-07-14 12:03:38 +08:00

sos

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

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

statistics

…

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: Siren templates

2023-05-27 18:56:49 +08:00

ui

Upd: [TW] assets of shop module

2023-07-14 12:03:38 +08:00

war_archives

Merge branch 'dev'

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