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

# Conflicts:
#	module/config/argument/args.json

2026-02-14 13:50:42 +08:00

..

awaken

Fix: Reduce background of SHIP_LEVEL_CHECK (#4513)

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

campaign

fix: log oil resources when battle

2025-09-14 20:26:49 +08:00

coalition

Add: FASHION Coalition assets

2026-01-23 02:40:22 +08:00

combat

Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM

2026-01-23 02:09:08 +08:00

combat_ui

Upd: Battle UI Ancient

2026-02-09 23:31:47 +08:00

commission

…

daily

Add: Emergency module development daily

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

device

add: migrate detect others' login

2025-09-16 23:13:11 +08:00

dorm

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

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

equipment

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

2025-10-01 19:43:59 +08:00

event

Fix: Maritime escort assets of EN mistakenly replace the CNs

2022-01-16 01:19:20 +08:00

event_hospital

Fix: [TW] handle clue popup with text only (#4819)

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

eventstory

Upd: Update new UI 20250814 for server CN, update shop buy supply pack

2025-08-21 23:59:59 +08:00

exercise

Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM

2026-01-23 02:09:08 +08:00

freebies

Del: Remove old mail module

2025-10-17 04:37:45 +08:00

gacha

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

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

gg_handler

add: migrate power limit and exercise delay

2025-09-14 17:57:06 +08:00

guild

fix: patch GUILD_DISPATCH_FLEET_UNFILLED.png

2025-10-18 16:50:14 +08:00

handler

Upd: [CN] USE_DATA_KEY_NOTIFIED asset

2025-11-06 17:11:57 +08:00

hard

…

map

Upd: crop fleet clear assets to avoid collision with info_bar

2025-12-19 03:54:21 +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

Upd: alter commit (c153b23); reduce to single asset in conditions with minimal offset, asset cut should be server transparent (#1527)

2022-10-04 00:25:42 -04:00

os_ash

Add: Allow auto attack dossier (#2579)

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

os_combat

…

os_handler

Fix: slow retrial for MISSION_OVERVIEW_ACCEPT(_SINGLE) (#5487)

2026-02-04 18:26:41 +08:00

os_shop

Feature: New OpsiShop. (#3086)

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

private_quarters

feat: pq add aegir (#5423)

2026-01-16 17:08:24 +08:00

raid

Add: [CN] Spring Auction Adventure (raid_20260212)

2026-02-12 16:44:24 +08:00

research

Upd: Research S8 series assets

2025-07-11 00:02:48 +08:00

retire

Chore: Move BOX_ITEM_* to EQUIP_CONFIRM

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

reward

Fix: Wait until mission list fully loaded

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

shipyard

Fix: OCR_COIN from page_main in shipyard_reward (#5176)

2025-10-01 02:42:59 +08:00

shop

Add: event shop

2025-10-29 16:17:37 +08:00

shop_event

Add: event shop

2025-10-29 16:17:37 +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 B

2025-12-20 19:10:39 +08:00

ui

fix: Temporary New year Academy check

2026-02-12 18:57:07 +08:00

ui_white

Upd: UI switches from page_main_white to page_raid

2025-01-17 13:29:46 +08:00

war_archives

Add: war_archives_20230223_cn (#5479)

2026-01-30 10:56:16 +08:00