517 Commits

Author SHA1 Message Date
W1NDes
70f6944043 Merge remote-tracking branch 'upstream/master' into dev 2026-02-28 17:53:38 +08:00
W1NDes
92d1543985 Merge remote-tracking branch 'upstream/master' into dev 2026-02-20 01:43:18 +08:00
LmeSzinc
c014140c6e Fix: [CN] Remove more dash-like characters (fixed #5522) 2026-02-19 03:14:09 +08:00
W1NDes
9d82c8cc68 Fix(os): 添加大世界自动寻敌超时机制
- 普通区域12分钟超时,特殊区域30分钟超时
- 战斗/事件/按钮点击时重置计时器
- 超时后抛出ScriptError,人工介入
2026-02-16 04:06:05 +08:00
W1NDes
be6a9fe522 Fix(osFleet): 添加debuff情况下的队伍切换 2026-02-13 22:03:25 +08:00
W1NDes
1884f0e434 Fix: 修复merge中的重构问题 2026-01-29 23:07:29 +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
c37a52bf9c Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM 2026-01-23 02:09:08 +08:00
LmeSzinc
475c2dd2bc Chore: Use new syntax sugar in os_handler 2026-01-22 19:20:29 +08:00
LmeSzinc
d1aed19f8f Refactor: Opsi task managing 2026-01-17 23:48:59 +08:00
W1NDes
5c3d0c73d1 Merge remote-tracking branch 'upstream/master' into dev 2026-01-08 01:01:33 +08:00
LmeSzinc
72b6222a2f Fix: Remove trailing "\/" in zone name (fixed #5417) 2025-12-29 19:12:57 +08:00
W1NDes
5db1b8b8ff Merge remote-tracking branch 'upstream/master' into dev 2025-12-11 16:35:04 +08:00
LmeSzinc
b4ba9e5fd0 Fix: fleet_selector.get() might return 0 2025-12-09 12:28:43 +08:00
guoh064
5bde6242f9 Opt: reset opsi fleet view when cannot find current fleet in current view in OSFleet.question_goto() 2025-12-03 20:26:39 +08:00
guoh064
21c92d95e3 Opt: reset opsi fleet view when homo_loca stuck in OSFleet.question_goto() 2025-12-03 20:21:59 +08:00
W1NDes
418211223f Merge remote-tracking branch 'upstream/master' into dev 2025-11-08 19:17:30 +08:00
LmeSzinc
b44e62f973 Fix: [JP] Randomly missing Katakana 'ー' in liverpool (fixed #5295) 2025-11-07 16:12:03 +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
6840703ba8 Merge remote-tracking branch 'upstream/master' into dev 2025-09-09 01:23:59 +08:00
guoh064
ec4f8d0d4f Revert "Add: continue cl1 if enabled after meowfficerfarming finished. (#2805)"
This reverts commit 4c48b019bc4a2d3af9efcf744e5b788e92ceee8c.
2025-09-05 15:32:50 +08:00
guoh064
ec3d215deb
Merge pull request #5102 from guoh064/jp_os_names
Fix: [JP] get_zone_name after process
2025-09-03 12:29:17 +08:00
W1NDes
2c41b0a454 Merge remote-tracking branch 'upstream/master' into dev 2025-09-02 13:22:26 +08:00
guoh064
f65c0c17e9 Fix: OpsiCrossMonth should not buy oil at meowfficer farming step (#5095) 2025-09-02 00:51:58 +08:00
W1NDes
1da50832ee Add(voucher): 支持自动购买战役信息记录仪以及隐秘海域信息记录仪功能(HiddenZoneDataLogger) 2025-07-11 00:11:35 +08:00
POLARme
c24847fdd6 Merge remote-tracking branch 'upstream/master' 2025-05-19 03:55:10 +08:00
LmeSzinc
d82baea7b9 Fix: Empty failed_zone list because failed function doesn't have return 2025-05-15 18:18:34 +08:00
POLARme
2e4f7f5111 Merge remote-tracking branch 'upstream/master' 2025-05-11 22:24:51 +08:00
LmeSzinc
72d53849b8 Fix: Wait until zone pinned instead of poor wait 2025-05-11 02:04:00 +08:00
LmeSzinc
fb76023a10 Opt: Enhance log messages when OpsiExplore failed 2025-05-11 00:42:56 +08:00
POLAR me
b149e4bc22 Merge remote-tracking branch 'upstream/master' 2025-04-25 00:46:37 +08:00
LmeSzinc
081b659023 Fix: round results when converting coordinates between globe and screen 2025-04-24 23:53:28 +08:00
LmeSzinc
3505fedb6a Fix: Avoid TooManyClickError when receiving abyssal progress rewards (#3664) 2025-04-24 23:51:55 +08:00
LmeSzinc
adeeff9437 Fix: Leave ongoing battles in boss_leave() 2025-04-24 23:43:28 +08:00
POLAR me
2b5fffd80b Merge remote-tracking branch 'upstream/master' 2025-04-22 17:03:01 +08:00
LmeSzinc
445507d7d5 Fix: Keep in map_exit loop if MAP_EXIT still appears 2025-04-21 23:02:47 +08:00
POLARme
f949857e7d
Merge pull request #79 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-03-26 15:10:50 +08:00
guoh064
24fc8e8b15
Merge pull request #4684 from guoh064/jp_zone_name
Upd: ocr params for get_zone_name in JP server
2025-03-26 00:47:34 +08:00
POLARme
d938870bcb
Merge pull request #75 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-03-06 09:25:41 +08:00
guoh064
9c3bfc7e8d
Opt: delay cl1 before os_explore finishes (#4602) 2025-03-05 17:08:16 +08:00
POLARme
4f794c4697
Merge pull request #71 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-02-23 22:22:13 +08:00
guoh064
887938ba60
Upd: OCR parameters for JP zone name recognition (#4600) 2025-02-23 22:16:08 +08:00
POLARme
efad3e259a
Merge branch 'LmeSzinc:master' into master 2025-02-19 01:51:46 +08:00
LmeSzinc
e1b11c0d69 Fix: Subpress handle_exp_info after entering page_main (#4591) 2025-02-19 00:10:31 +08:00
LmeSzinc
8e45d2fa46 Opt: Fast retry GOTO_MAIN after clicking AUTO_SEARCH_REWARD 2025-02-18 23:20:13 +08:00
POLAR me
af99cc97e1 feat: 新增活动图相关配置项和短猫设置
- 在 StopCondition 中添加 EventSwitch 配置项,用于控制是否在活动图开荒完成后刷PT
- 在 EventDaily 中添加 SyncEmotion 配置项,用于同步心情到活动图2
- 在 OpsiMeowfficerFarming 中添加 IgnoreStory 配置项,用于忽略剧情主线未完成的情况
2025-01-23 02:21:13 +08:00
POLAR me
98d5066ea8
Merge branch 'LmeSzinc:master' into master 2024-12-09 23:46:08 +08:00
LmeSzinc
ba5b853cb9 Refactor: Standardize the use of match_template_color() 2024-12-09 16:09:34 +08:00