0O0o0oOoO00 f64bc96bb2 Merge remote-tracking branch 'LmeSzinc/master' into dev ...

# Conflicts:
#	config/deploy.template-AidLux-cn.yaml
#	config/deploy.template-AidLux.yaml
#	config/deploy.template-cn.yaml
#	config/deploy.template-docker-cn.yaml
#	config/deploy.template-docker.yaml
#	config/deploy.template-linux-cn.yaml
#	config/deploy.template-linux.yaml
#	config/deploy.template.yaml

2025-06-17 13:19:30 +08:00

..

awaken

Add: check leveling in cl1 daily

2025-06-08 13:08:19 +09:00

campaign

Merge branch 'master_lme'

2024-12-20 23:51:48 +08:00

coalition

Chore: cleanup unused assets

2025-05-24 23:08:43 +08:00

combat

Upd: asset COMBAT_AUTO

2025-01-26 21:49:34 +08:00

combat_ui

Upd: Battle UI Seaside

2025-05-22 00:30:26 +08:00

commission

…

daily

Add: Emergency module development daily

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

device

Merge the remaining functions in MoreAlas

2025-04-24 23:30:50 +08:00

dorm

Add: Quick collection of coins and loves in the Dorm. (#3837)

2024-07-03 22:27:22 +08:00

equipment

fix: Adapt to new APIs from upstream

2024-05-19 19:59:03 +08:00

event

…

event_hospital

Merge branch 'master_lme' into dev

2025-05-25 15:18:10 +08:00

eventstory

Add: Do event story, not added to GUI yet

2025-01-02 00:38:28 +08:00

exercise

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-10-25 12:01:29 +08:00

freebies

remove outdated EN -Mail assets, enable EN AUTO-Dossier (#4478)

2025-01-15 23:28:41 +08:00

gacha

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

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

gg_handler

Revert "Add: scroll dock to load all ship's data for changing attribute"

2023-10-19 13:42:22 +08:00

guild

Fix: handle insufficient fund in guild operation

2025-06-06 01:39:18 +08:00

handler

Merge remote-tracking branch 'LmeSzinc/master' into dev

2025-06-17 13:19:30 +08:00

hard

…

map

Merge remote-tracking branch 'refs/remotes/Lme/master' into dev

2024-07-26 08:04:44 +08:00

meowfficer

Upd: Update CN assets which have been omitted

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

meta_reward

Merge pull request #4866 from dragonheart107/assets

2025-06-10 17:56:24 +08:00

minigame

Fix: enter minigame ended at minigame menu (#4758)

2025-05-19 01:48:29 +08:00

os

Add: check leveling in cl1 daily

2025-06-08 13:08:19 +09:00

os_ash

Add: Allow auto attack dossier (#2579)

2023-06-08 22:28:44 +08:00

os_combat

…

os_handler

fix: STRATEGIC_SEARCH_DEVICE_STOP will mis-clicked and switch opsi global map

2025-05-11 19:34:32 +08:00

os_shop

Feature: New OpsiShop. (#3086)

2024-06-17 11:24:40 +08:00

raid

Add: Assets in raid_20250416

2025-01-17 13:06:06 +08:00

research

Upd: Detect research series 7

2024-07-12 00:07:25 +08:00

research_farming

Add: pick out auto research farming from more alas

2024-07-07 11:53:00 +08:00

retire

Merge branch 'master_lme' into dev

2025-05-21 04:17:08 +08:00

reward

Fix: Wait until mission list fully loaded

2025-05-19 02:52:34 +08:00

shipyard

Upd: Series selecting page in shipyard

2024-07-12 00:31:34 +08:00

shop

fix: shop confirm amount buttom (#3001)

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

shop_event

Add: Commission Event Shop

2025-02-23 10:55:41 +08:00

sos

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

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

statistics

…

storage

Chore: Move BOX_ITEM_* to EQUIP_CONFIRM

2025-05-21 02:25:28 +08:00

tactical

Fix: Trying to handle books empty (#3753)

2024-06-11 23:38:43 +08:00

template

Add: chapter SP

2025-05-21 03:02:53 +08:00

ui

Merge branch 'master_lme' into dev

2025-05-21 04:17:08 +08:00

ui_white

Merge branch 'master_lme'

2025-01-19 15:59:20 +08:00

war_archives

Fix: TEMPLATE_MOONLIT_OVERTURE is not defined in assets

2025-05-24 23:12:01 +08:00