538 Commits

Author SHA1 Message Date
POLAR me
07a384cac8 Merge remote-tracking branch 'upstream/master' 2025-04-18 00:36:07 +08:00
LmeSzinc
bfbdbcc774 Fix: [ALAS] handle_app_login shouldn't handle startup retry, scheduler should 2025-04-17 21:38:29 +08:00
POLAR me
3a4e5a310b update(event):更新活动复刻湮烬尘墟
- 更新 args.json 中的事件标识符
- 在 fast_forward.py 中启用 EventC 和 EventD 的任务调用。
2025-03-20 16:09:37 +08:00
POLAR me
d32575229d Merge remote-tracking branch 'upstream/master' 2025-03-17 21:06:41 +08:00
dragonheart107
2a02cb4aa2
Merge pull request #4662 from dragonheart107/Fix--Submarine-asset-en
Upd: Submarine EN assets
2025-03-15 21:27:28 +08:00
POLAR me
ba1a744626 fix(module): 每日 SP 关卡链写错了 2025-02-28 18:18:05 +08:00
POLAR me
50a105b9f2 feat(module): 固定 EventSp 2025-02-28 18:03:18 +08:00
W1NDes
6425147de9 refactor(campaign): 重构活动关卡脚本并移除冗余配置
- 在 A1、B1、C1、D1 关卡脚本中添加 STAGE_INCREASE_CUSTOM 配置项
- 删除 campaign_base.py 中的冗余 CampaignBase 类
- 添加 fast_forward.py 中的事件日常关卡过滤逻辑
2025-02-28 06:34:52 +08:00
POLARme
0cb75e9ef0
Merge pull request #74 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-02-28 06:12:20 +08:00
LmeSzinc
be90d02e52 Upd: Increase from chapter C to D also 2025-02-28 01:58:29 +08:00
LmeSzinc
f79781250c Fix: Avoid potential duplicate STAGE_INCREASE inserting 2025-02-28 00:26:28 +08:00
POLAR me
caf6fd8206 refactor(campaign): 修改活动推图顺序
- 修改 CampaignBase 类,增加 STAGE_INCREASE 属性
- 去除了 fast_forward.py 中的每日活动关卡任务调用CD
2025-02-28 00:07:48 +08:00
LmeSzinc
e222c31fb7 Add: Auto increase from chapter A to B 2025-02-27 23:30:13 +08:00
POLAR me
5536013c26 Merge remote-tracking branch 'upstream/dev' 2025-02-27 22:53:38 +08:00
POLARme
4f794c4697
Merge pull request #71 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-02-23 22:22:13 +08:00
LmeSzinc
0c3a3fa1d6 Fix: Use template match to check account kick 2025-02-20 12:12:19 +08:00
POLAR me
c1362531a8 Merge remote-tracking branch 'upstream/master' 2025-02-13 22:45:16 +08:00
LmeSzinc
4082abda8f Fix: Catch account kicked by server maintenance 2025-02-13 12:43:01 +08:00
POLAR me
af99cc97e1 feat: 新增活动图相关配置项和短猫设置
- 在 StopCondition 中添加 EventSwitch 配置项,用于控制是否在活动图开荒完成后刷PT
- 在 EventDaily 中添加 SyncEmotion 配置项,用于同步心情到活动图2
- 在 OpsiMeowfficerFarming 中添加 IgnoreStory 配置项,用于忽略剧情主线未完成的情况
2025-01-23 02:21:13 +08:00
POLAR me
16c44d1458 Merge remote-tracking branch 'upstream/master' 2025-01-17 14:14:05 +08:00
dragonheart107
44742e3757
Updated EN assets for 2x book (#4516) 2025-01-16 00:08:29 +08:00
POLAR me
70ef04f844 feat(module): 添加战役结束通知功能
- 在 FastForwardHandler 类中增加了战役结束时的通知功能
2025-01-10 21:57:38 +08:00
POLAR me
01e551036e fix(alas): 调整 GameStuckError 的处理逻辑
- 在修改心情报错后,影响了原先的战败报错
2025-01-06 03:32:53 +08:00
POLARme
b5f1a2f0b4
Merge pull request #62 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-01-02 19:06:44 +08:00
LmeSzinc
f434784c6e Add: Do event story, not added to GUI yet
run with `python -m module.eventstory.eventstory`
2025-01-02 00:38:28 +08:00
POLAR me
9811899751 feat(campaign): 添加低心情检测
- 新增低心情检测功能,识别并处理低心情提示
- 当计算误差过大时再报错
2025-01-01 06:07:30 +08:00
POLAR me
1531be5ded Merge branch 'master' into _master 2024-12-28 14:10:41 +08:00
LmeSzinc
1e7aaf5628 Fix: Handle BATTLE_PASS_NEW_SEASON 2024-12-27 00:58:07 +08:00
POLAR me
628814c4b6 feat(Oilkeep): 添加石油平衡功能
- 实现每日领取储藏室石油的功能
2024-12-26 04:23:59 +08:00
POLARme
2771006726
Merge branch 'LmeSzinc:master' into master 2024-12-16 14:39:59 +08:00
Shane (Treasure) Xue
27b92c9b58
Bugfix: to_map_input_name case issue (#4433)
After bugfixes #4423 logic in the function changed and on the line where CAMPAIGN_ is removed the name is actually in lower case. Moved upper case manupulation in order to ensure correct case. 
Upper was not removed considering the function should turn d3 into D3.
Before this bugfix incrementing to the next stage was unusable (eg. 12-2 would be incremented to a strange "n2")

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2024-12-16 00:05:50 +08:00
POLARme
cde0e998ba
Merge branch 'LmeSzinc:master' into master 2024-12-13 10:20:38 +08:00
sui_feng
eb836d1b4f
Fix: correct check_button in add_state() (#4429) 2024-12-13 09:52:45 +08:00
POLAR me
a2251cafb1
Merge branch 'LmeSzinc:master' into master 2024-12-11 12:46:13 +08:00
LmeSzinc
bfdf6e4179 Fix: Redirect stage names like "B-1" to be foolproof 2024-12-11 11:46:23 +08:00
LmeSzinc
4ab8337324 Sync: [ALAS] Refactored Switch.set() 2024-12-11 11:46:19 +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
POLAR me
6782c1be27
Merge branch 'LmeSzinc:master' into master 2024-11-22 22:36:46 +08:00
LmeSzinc
c7908073b2 Upd: [JP] USE_DATA_KEY (fixed #4344) 2024-11-22 22:22:07 +08:00
POLAR me
93cc60b7f2
Merge pull request #51 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-09-26 00:46:23 +08:00
LmeSzinc
cf7b208a4f Upd: [TW] MISSION_POPUP_ACK MISSION_POPUP_GO (#fixed 4228)
Signed-off-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
2024-09-25 11:44:31 +08:00
POLAR me
4b19501b99
Merge pull request #46 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-09-10 13:16:40 +08:00
guoh064
34acf7ed3a
Add: mask for ui_white_main (#4145) 2024-09-09 23:44:48 +08:00
POLAR me
afea3cf253
Merge pull request #43 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-08-25 00:44:34 +08:00
LmeSzinc
ffc956d3c7 Opt: Reduce 2x book confirm timer for faster 2024-08-23 03:00:16 +08:00
LmeSzinc
918e700831 Fix: Enlarge strategy search area since they are shown in 2x4 now (#4108) 2024-08-23 02:59:40 +08:00
POLAR me
0901555cfc
Merge pull request #38 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-07-28 14:20:31 +08:00
LmeSzinc
e2d1d2ff8a Upd: Handle yet another mode switch in event_20240725_cn 2024-07-26 00:23:57 +08:00
POLAR me
19d810d389 Merge branch 'master' into _master 2024-06-29 01:49:50 +08:00