Zuosizhu b8d12c405f Merge branch 'master_lme' into brocore_dev ...

# Conflicts:
#	config/template.json
#	module/awaken/awaken.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/menu.json
#	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

2025-07-25 11:46:23 +08:00

..

awaken

Upd: [JP][TW] Awaken assets

2025-01-19 03:19:28 +08:00

campaign

Merge branch 'master_lme'

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

coalition

Upd: UI page switching

2025-06-27 00:10:44 +08:00

combat

Upd: asset COMBAT_AUTO

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

combat_ui

Upd: [TW] QUIT_Cyber and QUIT_New in different font weight (fixed #4798)

2025-05-18 16:16:05 +08:00

commission

…

daily

Add: Emergency module development daily

2023-03-17 00:34:02 +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

Upd: [TW] hospital assets (#4819)

2025-05-23 20:57:31 +08:00

exercise

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

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

freebies

Upd: [TW] Battle pass assets

2025-01-16 18:30:19 +08:00

gacha

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

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

guild

Upd: OCR_GUILD_OPERATIONS_PROGRESS (fixed #4549)

2025-02-12 01:53:08 +08:00

handler

Fix: Emulator no respond (#4947)

2025-07-17 22:44:28 +08:00

hard

…

map

Add: Switch mode in map preparation

2024-07-26 02:20:15 +08:00

meowfficer

Upd:[TW]Update Meowfficer assets (#3341)

2023-12-08 18:02:31 +08:00

minigame

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

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

os

…

os_ash

[TW]Fix ash beacons and shipyard (#2999)

2023-08-11 19:06:10 +08:00

os_combat

…

os_handler

Fix: current ap blocked by info bar (#4100)

2024-08-20 02:25:44 +08:00

os_shop

Feature: New OpsiShop. (#3086)

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

private_quarters

Add: [EN] Private Quarters support New Jersey; implement _pq_goto_room_seek and adapt asset's varying y-position for pq_interact

2025-06-15 17:09:52 -04:00

raid

[TW] Event: Spring Fashion Festa (#4539)

2025-01-27 17:56:45 +08:00

research

Upd: Detect research series 7

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

retire

Upd: [TW] BOX assets (#4879)

2025-06-14 01:31:41 +08:00

reward

Upd: [TW] assets for _reward_wait_mission_list

2025-07-10 02:41:31 +08:00

shipyard

Merge Lme/Master into dev

2024-07-22 16:45:29 +08:00

shop

Upd: [TW] SHOP_BUY_CONFIRM_AMOUNT

2023-10-17 18:27:14 +08:00

sos

…

statistics

…

storage

Upd: [TW] BOX assets (#4879)

2025-06-14 01:31:41 +08:00

tactical

Fix: Trying to handle books empty (#3753)

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

template

Add: Chapter T

2025-07-24 23:35:47 +08:00

ui

Merge branch 'master_lme' into brocore_dev

2025-07-11 23:03:05 +08:00

ui_white

Add: page_dock

2025-01-04 03:05:05 +08:00

war_archives

Opt: search archives entrance (#4284)

2024-10-16 12:50:23 +08:00