6644 Commits

Author SHA1 Message Date
LmeSzinc
74bbaf8395 Fix: first ui switch must be ui_ensure 2026-02-18 09:10:55 +08:00
LmeSzinc
d99b759a08 Fix: no poor sleep in fleet_preparation_sidebar_ensure 2026-02-18 09:10:55 +08:00
ArecaSapling
102b7eeaf7
Upd: blueprint purchase for DR5 & PR6 (#5518) 2026-02-18 09:10:41 +08:00
W1NDes
9d82c8cc68 Fix(os): 添加大世界自动寻敌超时机制
- 普通区域12分钟超时,特殊区域30分钟超时
- 战斗/事件/按钮点击时重置计时器
- 超时后抛出ScriptError,人工介入
2026-02-16 04:06:05 +08:00
W1NDes
f94782f1ba Upd(config): regular update config 2026-02-14 17:38:34 +08:00
W1NDes
42ca63c840 Merge remote-tracking branch 'upstream/master' into dev 2026-02-14 17:33:29 +08:00
LmeSzinc
7eb80ca6f4 Upd: [CN] game server 裁决协议 2026-02-14 03:32:47 +08:00
LmeSzinc
9bb8e191ac Upd: [EN][JP][TW] Raid CHANGWU assets 2026-02-14 03:30:49 +08:00
LmeSzinc
efeb222764 Upd: [TW] Event entrance of raid_20260212 2026-02-14 03:06:07 +08:00
W1NDes
01f54171bd Upd(smallevent): 添加任务打卡 2026-02-14 03:05:26 +08:00
LmeSzinc
11405cf0c3 Fix: [EN] check other buttons for page_academy 2026-02-14 03:00:01 +08:00
W1NDes
be6a9fe522 Fix(osFleet): 添加debuff情况下的队伍切换 2026-02-13 22:03:25 +08:00
W1NDes
4f3ab19d7d Upd(raid): 提高共斗每日的优先级 2026-02-13 17:17:16 +08:00
sui-feng-cb
5ab18b27fd Fix: use cnocr for CHANGWU_OCR_REMAIN_* 2026-02-12 20:28:24 +08:00
W1NDes
a48a3fbed0 Fix(raid): 修复每日共斗的剩余次数识别 2026-02-12 20:06:46 +08:00
W1NDes
831ed23717 Upd(config): regular update config 2026-02-12 18:40:48 +08:00
sui-feng-cb
9fd62b7840 Add: [CN] Spring Auction Adventure (raid_20260212) 2026-02-12 18:39:59 +08:00
sui-feng-cb
7e6b87bee8 Add: [CN] Spring Auction Adventure (raid_20260212) 2026-02-12 16:44:24 +08:00
LmeSzinc
7118c30fea Upd: [EN] TEMPLATE_REVELATIONS_OF_DUST 2026-02-09 23:40:21 +08:00
LmeSzinc
7d9e77e4fd Upd: Battle UI Ancient 2026-02-09 23:31:47 +08:00
ArecaSapling
5a32d9444c
Merge pull request #5500 from sui-feng-cb/event_update
Fix: raid_20240328 ex
2026-02-09 23:23:20 +08:00
W1NDes
78c2a9bfe9 Fix(raid): 添加共斗活动低心情处理 2026-02-08 01:51:50 +08:00
W1NDes
9f022c8188 Add(raid): 共斗添加队伍推荐 2026-02-07 02:47:35 +08:00
W1NDes
af654d71e1 Add(raid): 共斗添加stage_increase 2026-02-07 02:31:10 +08:00
W1NDes
ad1c8ad311 Merge remote-tracking branch 'upstream/master' into dev 2026-02-07 01:44:52 +08:00
sui-feng-cb
7e1a2322a6 Fix: use _raid_has_oil_icon for new UI design 2026-02-05 21:44:55 +08:00
sui-feng-cb
a4fec2e2a0 Upd: raid_20240328 rerun 2026-02-05 20:47:33 +08:00
guoh064
eb33bdd747
Fix: slow retrial for MISSION_OVERVIEW_ACCEPT(_SINGLE) (#5487) 2026-02-04 18:26:41 +08:00
W1NDes
0a4c3e82b9 Merge remote-tracking branch 'upstream/master' into dev 2026-01-31 03:32:29 +08:00
LmeSzinc
bb349af001 Upd: [TW] Coalition assets 2026-01-31 03:25:17 +08:00
LmeSzinc
87a031ed97 Upd: [TW] Event entrance of coalition_20260122 2026-01-31 03:18:38 +08:00
W1NDes
803a4068aa Merge remote-tracking branch 'upstream/master' into dev 2026-01-30 20:41:51 +08:00
ArecaSapling
52444569a4
Add: war_archives_20230223_cn (#5479) 2026-01-30 10:56:16 +08:00
W1NDes
1884f0e434 Fix: 修复merge中的重构问题 2026-01-29 23:07:29 +08:00
W1NDes
dc33f42332 Fix(coalition): 修复一些合并错误 2026-01-29 21:14:07 +08:00
W1NDes
951c2c36f6 Upd(config): 刷新在merge未做冲突处理的config 2026-01-29 21:00:47 +08:00
W1NDes
39aa03ca82 Upd(os): 添加在merge中丢失的修改 2026-01-29 20:59:18 +08:00
W1NDes
063c06e950 Merge remote-tracking branch 'upstream/master' into dev 2026-01-29 20:51:12 +08:00
LmeSzinc
f23d4fb681 Fix: Handle map event in port_enter() 2026-01-28 11:29:37 +08:00
LmeSzinc
912c74b8e1 Fix: [ALAS] handle serial like 5555,16384 2026-01-28 03:38:28 +08:00
LmeSzinc
f552360951 Fix: Startup at coalition fleet preparation 2026-01-23 17:43:04 +08:00
LmeSzinc
6d47f626d1 Opt: Disable event if current event type is raid or coalition 2026-01-23 17:39:46 +08:00
LmeSzinc
0b8d1a5b57 Fix: Empty fleet check should after switching fleet mode 2026-01-23 17:26:14 +08:00
guoh064
e01b77c6e5
Fix: more clear _coalition_has_oil_icon usage (#5473) 2026-01-23 17:25:15 +08:00
LmeSzinc
afbdd261e6 Fix: Handle coalition fleet reuse popup 2026-01-23 16:32:38 +08:00
LmeSzinc
f314caa862 Upd: [EN][JP] Coalition FASHION assets 2026-01-23 16:24:56 +08:00
LmeSzinc
43d3fa122c Fix: drop skip_first_screenshot in set_top 2026-01-23 15:53:03 +08:00
guoh064
36e998aed7
Upd: [JP] asset REWARD_2.BUTTON (#5465) 2026-01-23 02:47:59 +08:00
LmeSzinc
b65a951ce4 Add: FASHION Coalition assets 2026-01-23 02:40:22 +08:00
LmeSzinc
c37a52bf9c Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM 2026-01-23 02:09:08 +08:00