544 Commits

Author	SHA1	Message	Date
W1NDes	1884f0e434	Fix: 修复merge中的重构问题	2026-01-29 23:07:29 +08:00
W1NDes	063c06e950	Merge remote-tracking branch 'upstream/master' into dev	2026-01-29 20:51:12 +08:00
LmeSzinc	6d47f626d1	Opt: Disable event if current event type is raid or coalition	2026-01-23 17:39:46 +08:00
LmeSzinc	75af8e39be	Perf: No campaign object caching to release memory	2026-01-17 23:49:06 +08:00
W1NDes	a4b5d153bd	Upd(Event): 添加开荒初始关卡的重置	2025-12-19 14:14:55 +08:00
W1NDes	5db1b8b8ff	Merge remote-tracking branch 'upstream/master' into dev	2025-12-11 16:35:04 +08:00
LmeSzinc	fbb936f081	Del: Remove ship equipment change as lack of maintenance	2025-12-09 12:39:28 +08:00
W1NDes	84180c679b	Merge remote-tracking branch 'upstream/master' into dev	2025-10-24 01:32:49 +08:00
LmeSzinc	767f13ae62	Add: Chapter T	2025-10-24 00:52:46 +08:00
W1NDes	c54f03b29d	Merge remote-tracking branch 'upstream/master' into dev	2025-10-16 20:15:54 +08:00
sui_feng	d89094b396	Add: war_archives_20231026_cn (#5221)	2025-10-16 19:46:24 +08:00
W1NDes	084fd0f1d2	Merge remote-tracking branch 'upstream/master' into dev	2025-10-11 19:06:34 +08:00
LmeSzinc	4347616d55	Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins (#5020) ... * Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins * Revert "Add: continue cl1 if enabled after meowfficerfarming finished. (#2805)" This reverts commit 4c48b019bc4a2d3af9efcf744e5b788e92ceee8c.	2025-10-11 00:42:05 +08:00
W1NDes	5a3c002cfb	Revert "Fix(get_logRes): 修复ui错误导致的石油金币读取异常" ... This reverts commit 3cdbc7d95bb28df577640ddfecc03c1f8bc826e0.	2025-09-27 21:28:38 +08:00
W1NDes	3cdbc7d95b	Fix(get_logRes): 修复ui错误导致的石油金币读取异常	2025-09-26 16:04:41 +08:00
W1NDes	b521ea1055	Merge remote-tracking branch 'upstream/master' into dev	2025-09-13 23:14:40 +08:00
LmeSzinc	bd217b739b	Fix: Shorten ASIDE_SWITCH_20241219 unknown_timer	2025-09-13 20:39:11 +08:00
W1NDes	edd39486a8	Merge remote-tracking branch 'upstream/master' into dev	2025-09-13 19:25:29 +08:00
LmeSzinc	6ed5709db4	Fix: Fallback MapAchievement since event doesn't have thread indicator	2025-09-13 03:14:40 +08:00
guoh064	31fa8ae3a5	Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins	2025-09-05 14:32:37 +08:00
W1NDes	bbd173622d	fix(OCR_COIN)：修复OCR_COIN的一次冲突	2025-08-27 07:58:08 +08:00
W1NDes	3a9351099d	Merge remote-tracking branch 'upstream/master'	2025-08-24 00:00:24 +08:00
dragonheart107	6d3acaaddb	Fix: Exercise item during battle (#5059) ... * Fix: event log * Fix: random artefacts during exercise mistaken as Items * Fix: small tweak	2025-08-23 22:26:48 +08:00
W1NDes	cb0442f59c	Merge remote-tracking branch 'upstream/master'	2025-08-17 22:59:10 +08:00
LmeSzinc	9fe7a79213	Add: Chapter T	2025-08-15 23:25:53 +08:00
W1NDes	74f9fa91e7	feat(eventSp): 处理今日SP图次数已到上限的情况	2025-08-15 21:31:01 +08:00
W1NDes	cfdc9fcc9a	feat(event): 新增奇渊下的秘密活动入口文件 ... - 仅限周回模式	2025-08-15 17:02:59 +08:00
W1NDes	bfd7bcd2b7	Merge remote-tracking branch 'upstream/master'	2025-08-08 02:13:18 +08:00
guoh064	f714e2b575	Fix: Include GEMS_FARMINGS in event time limit task list	2025-08-07 17:29:41 +08:00
nEEtdo0d	b4cceb7f8e	Upd: [EN] event current and rerun check icons; other button_extract output	2025-08-02 13:32:52 -04:00
W1NDes	0370fcee52	Merge remote-tracking branch 'upstream/dev'	2025-07-29 21:32:34 +08:00
guoh064	4c8ecff046	Add: ui_goto_event for event 20221124 cn and event 20250724 cn	2025-07-29 17:31:37 +08:00
W1NDes	e646586c32	Merge remote-tracking branch 'upstream/master'	2025-07-25 01:59:57 +08:00
LmeSzinc	becf0ec1d9	Fix: Able to do stage loop TS	2025-07-25 01:09:15 +08:00
LmeSzinc	b13e92694b	Add: Chapter TS	2025-07-25 00:17:30 +08:00
LmeSzinc	6188bd069c	Add: Chapter SP	2025-07-24 23:41:15 +08:00
LmeSzinc	021cc4e26d	Add: Chapter T	2025-07-24 23:35:47 +08:00
W1NDes	16a9d4d6d7	Feat(FleetInspect): 添加舰队检查功能及相关配置项	2025-07-17 00:10:44 +08:00
W1NDes	b60bd51323	Fix(Research_inspect): 修改变量名	2025-07-16 23:42:19 +08:00
W1NDes	241f67fb47	Feat(RegularInspect): 将研究检查重规划为定期检查	2025-07-16 23:34:25 +08:00
W1NDes	c628bf59d8	Fix(ReasearchCheck): 添加科研检查开关和7日任务结束限制	2025-07-16 21:43:10 +08:00
W1NDes	4e7722cc17	Feat(ResearchCheck): 添加科研船经验进度检查和领取 From OxcC	2025-07-15 19:11:50 +08:00
W1NDes	1da50832ee	Add(voucher): 支持自动购买战役信息记录仪以及隐秘海域信息记录仪功能(HiddenZoneDataLogger)	2025-07-11 00:11:35 +08:00
W1NDes	fb39493307	Fix(coalition)：修改连战新读取油量的方法	2025-07-01 03:25:40 +08:00
W1NDes	2033f8fb98	Fix(CampaignRun): 修复OCR图像参数	2025-06-25 01:25:49 +08:00
POLARme	1edc27b9a9	Fix(Emotion): 添加了角色名过长情况下的红脸判断	2025-06-24 03:40:33 +08:00
POLARme	1b96d8039d	Fix(campaign_ui)：修复了空报错情况下的异常处理	2025-06-23 00:59:51 +08:00
POLARme	3fb7fe8048	Fix(Event)：修复在已通过一次性关卡后的关卡递进错误	2025-06-20 13:40:42 +08:00
POLARme	49d55d7b77	Merge remote-tracking branch 'upstream/master'	2025-05-29 23:36:32 +08:00
LmeSzinc	6d7e43974a	Fix: handle game tips that infos skin feature when entering dock	2025-05-29 22:48:01 +08:00