520 Commits

Author SHA1 Message Date
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
LmeSzinc
ec5f0f92a6 Upd: [EN] MOB_MOVE_CANCEL 2024-06-28 09:12:18 +08:00
LmeSzinc
3958373fc4 Upd: [TW] MOB_MOVE_CANCEL (#3922) 2024-06-27 22:51:59 +08:00
POLAR me
42bd5305c2 Merge branch 'master' into 0master 2024-06-10 01:08:45 +08:00
LmeSzinc
eada57f97d Pref: Reduce CPU usage during auto search daemon 2024-06-05 01:15:42 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
POLAR me
f4382b7d1f
Merge pull request #27 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-06-03 12:03:38 +08:00
LmeSzinc
77d48937fc Fix: Handle mail full popup 2024-06-03 10:22:06 +08:00
Air111
1e793295e8 Fix: mob move optimization 2024-06-03 00:04:42 +08:00
POLAR me
d0f680e416
Merge pull request #24 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-05-23 23:18:48 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
POLAR me
2329fb8d67
Merge branch 'LmeSzinc:master' into master 2024-04-27 00:04:07 +08:00
guoh064
41075b4a52
Fix: W15 optimization (#3660)
* Fix: force battle function choice for 15-1/15-2 when clear all

* Add: battle strategy when missing support fleet in W15

* Opt: open strategy once when checking mob move

* Opt: reuse strategy_get_mob_move_remain()
2024-04-22 23:16:39 +08:00
LmeSzinc
89aa1ad7dc Fix: W15 optimizations
- Upd: [CN] MOB_MOVE_CANCEL
- Opt: MAP_SWIPE_MULTIPLY
- Fix: 15-1 did not inherit ConfigBase
2024-04-20 01:57:27 +08:00
guoh064
27693a6762
Add: 15图开荒/周回 (#3563)
* Add: W15 maps extracted

* Add: template for Special Carrier in W15

* Add: method mob_move

* Fix: MapDetectionError in strategy mob move

* Fix: adjacent grid judge condition

* Fix: should focus on location before moving

* Fix: should update view before further operation

* Fix: wait for STRATEGY_OPENED after executing mob move

* Fix: offset for assets in _mob_move()

* Opt: judge if movable before moving camera

* Add: W15 mechanism

* Opt: Rename Special Carrier asset name

* Fix: offset for MOB_MOVE_1/MOB_MOVE_2

* Fix: separate MOB_MOVE_1 and MOB_MOVE_2

* Fix: should use appear_then_click in strategy_mob_move_enter

* Fix: function import in campaign_15_base.py

* Fix: missing assets import

* Fix: missing offset in strategy_mob_move_cancel()

* Fix: should move only once in a campaign

* Temp: modify special carrier filter string to 3E

* Fix: missing self. before 'moved' variable

* Revert "Fix: missing self. before 'moved' variable"

This reverts commit 00f70e0ab55e422898cb90c5d5e54d4e7c989511.

* Revert "Fix: should move only once in a campaign"

This reverts commit b588f5bb07dfc4511f39fa0797fbe160f356d604.

* Fix: force goto special carrier

* Fix: missing return True in battle function

* Fix: enlarge offset of MOB_MOVE_ICON

* Fix: typo in campaing_15_3

* Fix: update view after moving mob

* Fix: should use full_scan_movable since mob moved

* Fix: missing map_data_init() in campaign_15_4.py

* Fix: battle 4 should be done by mob fleet

* Revert "Fix: battle 4 should be done by mob fleet"

This reverts commit 0e2af1ec817b7bc89fe123f03a33ea9ad955973f.

* Fix: should switch to fleet_1 after battle_3

* Add: battle function when using clear mode

* Fix: missing import

* Fix: colliding Config class

* Fix: Config.when should contain all cases

* Opt: pick ammo after third battle in clear mode of 15-4

* Del: old assets CarrierSpecial

* Fix: remake of CarrierSpecial template

* Add: UI mask for W15

* Fix: missing ASSETS import

* Fix: change full_scan_movable() to predict()

* Fix: predict should be done after each move

* Opt: camera_data in W15

* Del: remove predict

* Add: map info process after mob move

* Add: support for multi bosses in _expected_end() for W15

* Opt: show map after moving

* Del: remove redundant import in fleet.py

* Opt: using clear_chosen_enemy() instead of goto() directly

* Fix: should first take screenshot before strategy enter/confirm/cancel

* Add: asset TEMPLATE_SIREN_BOSS

* Opt: Handle first stages of BOSS as Siren in 15-3/15-4

* Fix: missing override map_data

* Add: ignore is_boss prediction for siren boss in 15-3/15-4

* Fix: should not use decorator Config with battle_x functions

* Opt: camera data in 15-4

* Opt: directly overwrite map info into original map_data

* Fix: missing indent block in campaign_15_4.py

* Fix: expect 15-3/15-4 first bosses as siren

* Revert "Add: ignore is_boss prediction for siren boss in 15-3/15-4"

This reverts commit 1104631f92e5df0672dce8c7acaa1eb122731746.

* Revert "Add: asset TEMPLATE_SIREN_BOSS"

This reverts commit a29d6b6b9bfb9d79963adb404ce2091cbfafb810.

* Revert "Add: support for multi bosses in _expected_end() for W15"

This reverts commit 8d357abe5bab79a643e23e8513cefa87d31cb3e8.

* Del: redundent map config

* Fix: recover boss grids

* Del: redundant clear_siren()

* Del: redundant clear_siren() in battle_6

* Add: template for mob move icon

* Opt: enlarge reinforcement fleet mask area for W15

* Opt: method _mob_move

* Upd: TEMPLATE_MOB_MOVE_ICON

* Fix: should have cool time between clicks of grid

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit b3f2dcbc88dbe166470905f33d041b91c2192f57.

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: predict_mob_move_icon

* Fix: 15-2 camera spawn point

* Fix: should update view using self.device.image

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit 92a12596a8f271ec64e249ecb58779d9b64ecea6.

* Del: redundant assets MOB_MOVE_ICON.png

* Fix: using map_is_clear_mode to get real value of clear mode

* Opt: check mob_movable before moving

* Opt: Refactor _mob_move

* Fix: camera_sight in W15

* Opt: move sight to further point in _mob_move
2024-04-19 01:29:17 +08:00
POLAR me
b8a0c792c9
Merge pull request #8 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-04-10 16:02:53 +08:00
guoh064
b81818f030
Opt: load offsets of auto search settings at fleet preparation stage (#3612) 2024-04-08 22:47:44 +08:00
POLAR me
bf533d9c89
Merge pull request #5 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-04-04 09:24:39 +08:00
guoh064
555fb2ad29 Upd: Assets FORMATION to adapt to W15 2024-04-03 17:24:40 +08:00