W1NDes
8a0d8e8d10
Fix(event): 修复en的活动界面确认—pt_icon不匹配
2026-04-25 19:22:23 +08:00
W1NDes
35fa06dcaa
Merge remote-tracking branch 'upstream/master' into dev
2026-04-25 02:04:58 +08:00
ArecaSapling
9e58a9d8d4
Upd: [EN] asset EVENT_20201126_ENTRANCE_TEMP ( #5630 )
2026-04-24 23:58:11 +08:00
W1NDes
b41f85556b
Merge remote-tracking branch 'upstream/master' into dev
2026-04-24 21:58:58 +08:00
guoh064
f6b44d6582
Add: event entrance for dual event 20201126/20260417
2026-04-24 14:52:43 +08:00
guoh064
89f69079f1
Add: distangle Gemsfarming.Campaign.Event from Event.Campaign.Event for multi event
2026-04-23 15:59:17 +08:00
W1NDes
b4f08afa3b
Merge remote-tracking branch 'upstream/master' into dev
2026-04-18 23:38:12 +08:00
LmeSzinc
45faa7c46d
Add: Chapter SP
2026-04-18 02:54:46 +08:00
LmeSzinc
8ce450a42b
Add: MAP_CHAPTER_SWITCH_20241219_SPEX
2026-04-18 00:57:22 +08:00
W1NDes
8e8bb6818a
Merge remote-tracking branch 'upstream/master' into dev
2026-03-27 01:12:36 +08:00
LmeSzinc
d99af8fb07
Add: Chapter T HT
2026-03-26 23:04:52 +08:00
W1NDes
70f6944043
Merge remote-tracking branch 'upstream/master' into dev
2026-02-28 17:53:38 +08:00
LmeSzinc
07bf9d9947
Fix: Handle wrong OCR error like "I4-4" ( #5532 )
2026-02-28 03:42:27 +08:00
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