497 Commits

Author SHA1 Message Date
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
POLAR me
b149e4bc22 Merge remote-tracking branch 'upstream/master' 2025-04-25 00:46:37 +08:00
LmeSzinc
c1eb1e47cc Add: Chapter T 2025-04-24 23:43:28 +08:00
LmeSzinc
c95816ecf7 Add: MAP_CHAPTER_SWITCH_20241219_SP to handle sp events 2025-04-24 22:49:31 +08:00
POLARme
c6ce066257
Merge pull request #80 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-03-28 05:27:15 +08:00
LmeSzinc
8321182fdc Fix: Disable task hospital when event is over 2025-03-28 04:00:17 +08:00
POLAR me
bf80ad39e2 refactor(deep_get): Three changes in the new module config.deep 2025-03-17 21:08:31 +08:00
POLAR me
cd5ddf34c6 Merge remote-tracking branch 'upstream/master' 2025-03-11 15:39:20 +08:00
guoh064
edb8bcb5c7
Fix: vanguard_change logic (#4636)
* Add: support list types limitations in Ship class

* Opt: get_common_rarity_dd logic

get_common_rarity_dd should always check all available
ships and not just the ones in the current fleet.
2025-03-10 23:30:02 +08:00
qinsgit
c857ed4e22
Fix: spelling mistakes (#4648)
Co-authored-by: qinsgit <123123123@qq.com>
2025-03-10 23:28:12 +08:00
POLAR me
c1362531a8 Merge remote-tracking branch 'upstream/master' 2025-02-13 22:45:16 +08:00
LmeSzinc
fc90b8e72b Fix: Disable raid tasks if another event is ongoing 2025-02-13 12:50:29 +08:00
W1NDes
f7eb6d2034 refactor(oilkeep): 重构石油检测逻辑
- 移除冗余的 get_oil 方法,改为继承UI类CampaignStatus
- 优化油量检测流程,增加多次尝试以确保准确性
- 修复jp-servrer的石油读取
2025-02-09 22:10:16 +08:00
POLAR me
0d02f4a374 fix(module/campaign): 移除测试时的 handle_map_stop 调用 2025-01-23 02:46:40 +08:00
POLAR me
af99cc97e1 feat: 新增活动图相关配置项和短猫设置
- 在 StopCondition 中添加 EventSwitch 配置项,用于控制是否在活动图开荒完成后刷PT
- 在 EventDaily 中添加 SyncEmotion 配置项,用于同步心情到活动图2
- 在 OpsiMeowfficerFarming 中添加 IgnoreStory 配置项,用于忽略剧情主线未完成的情况
2025-01-23 02:21:13 +08:00
POLAR me
ad6617c1af Merge remote-tracking branch 'upstream/master' 2025-01-12 00:37:38 +08:00
LmeSzinc
2176fdf803 Fix: Getting index of a digit chapter when looking for a non-digit chapter (#4504) 2025-01-10 02:27:51 +08:00
POLARme
3d3d4c2ae8
Merge pull request #64 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-01-07 20:19:09 +08:00
sui_feng
9b61faf308
Fix: z20_or_z21 should be filtered by any ship (#4494) 2025-01-07 11:19:21 +08:00
W1NDes
843360b6d8 refactor(campaign): 修改心情检测队伍判定
- 第一舰队第二舰队不是官方名字,舰队名是可以自定义的,所以现在根据出击方式判断。
2025-01-06 02:18:49 +08:00
POLAR me
f7ae053713 Merge remote-tracking branch 'upstream/master' 2025-01-05 06:11:10 +08:00
LmeSzinc
4a2eb4470c Opt: Combine dock filter operations to skip waiting dock loaded 2025-01-04 00:02:29 +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
3be9adc485 Fix: Switch handler in campaign_ensure_aside_20241219 2025-01-02 01:04:51 +08:00
LmeSzinc
72142c698b Chore: campaign_set_chapter_20241219 should use wrapped methods 2025-01-02 00:12:48 +08:00
POLAR me
9811899751 feat(campaign): 添加低心情检测
- 新增低心情检测功能,识别并处理低心情提示
- 当计算误差过大时再报错
2025-01-01 06:07:30 +08:00
POLAR me
628814c4b6 feat(Oilkeep): 添加石油平衡功能
- 实现每日领取储藏室石油的功能
2024-12-26 04:23:59 +08:00
POLAR me
dcb7912e93 feat(campaign): SP图、活动图3还有WalkStep
- 添加了SP图的配置文件
- 添加了活动图3的配置文件
- 修改了舰队行走错误处理逻辑
2024-12-24 22:10:34 +08:00
POLARme
283782cf35
Merge pull request #60 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-12-21 12:58:01 +08:00
LmeSzinc
7b4a716273 Add: Chapter SP
- Spilt map config MAP_CHAPTER_SWITCH_20241219 and MAP_HAS_MODE_SWITCH
2024-12-20 23:31:49 +08:00
POLAR me
bd6a8896af Merge branch 'dev' into _master 2024-12-20 22:46:49 +08:00
LmeSzinc
cc2cf0d046 Refactor: Abstract chapter switches from 20240725 to 20241219 2024-12-20 22:24:47 +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
6782c1be27
Merge branch 'LmeSzinc:master' into master 2024-11-22 22:36:46 +08:00
LmeSzinc
64b3122127 Add: Chapter T 2024-11-22 21:25:41 +08:00
POLAR me
b07f64ed3e
Merge pull request #58 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-10-26 01:53:53 +08:00
LmeSzinc
1024f5063d Add: CHAPTER_SWITCH_20241024 2024-10-25 22:31:20 +08:00
LmeSzinc
847dcd847b Add: Chapter T 2024-10-25 19:37:55 +08:00
W1NDes
ed9bbc4793 修复了OCR_COIN从Button类变成Digit类导致的主线图金币读取报错 2024-10-13 00:13:42 +08:00
POLAR me
5cb17fdbf8 Merge branch 'master' into _master 2024-10-12 20:26:52 +08:00
guoh064
e89063bade
Jp font 20241011 (#4272)
* tmp: [JP] commission assets

* tmp: [JP] asset RESEARCH_COST_CHECKER

* tmp: [JP] assets in mail batch

* tmp: [JP] opsi get_zone_name color

* tmp: [JP] get_coin and get_oil color

* tmp: [JP] ash_collect_status and get_yellow_coins color

* upd: [JP] resize commission assets recognize size
2024-10-12 14:29:01 +08:00
POLAR me
32daf3c1f1
Merge pull request #52 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-10-01 21:45:38 +08:00
Air111
3ad070d6f1
Fix: ensure not at war archives campaign in ui_goto_event (#4237) 2024-09-29 12:09:42 +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
weeswelai
cb2ca4375d
Upd: In some events, ensure_auto_search_exit enters a dead loop (#4227) 2024-09-23 19:14:12 +08:00
POLAR me
23095d31e9
Merge pull request #44 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-08-31 01:11:11 +08:00