1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 16:29:29 +08:00
Commit Graph

545 Commits

Author SHA1 Message Date
silvergundam
121c621ab8 Fix: meowfficer farming and cl1 2025-03-21 15:53:53 +08:00
silvergundam
4af4cbacfc Add yellow coins limit in the last few days of a month 2025-03-19 17:42:10 +08:00
silvergundam
f4fdde0228 Remove the 71 AP_preserve during OsExplore,because now 71 can't run before OsExplore finished by Lme/master(#4602) 2025-03-14 01:39:26 +08:00
ZuoSiZhu
b82b79988d Merge remote-tracking branch 'lme/master' into dev
# Conflicts:
#	module/config/argument/override.yaml
2025-03-14 00:57:23 +08:00
silvergundam
d7035ca98b Add: Set AP limit to 2000 when Opsi reset less than 6 days 2025-03-07 05:03:40 +08:00
silvergundam
77b124c2d6 Revert: Call abyssal,stronghold,obscure when yellow coins below 35000 2025-03-07 03:48:01 +08:00
silvergundam
1818f5862c Revert: Abyssal,stronghold,obscure AP preserve change 2025-03-07 03:40:16 +08:00
guoh064
9c3bfc7e8d Opt: delay cl1 before os_explore finishes (#4602) 2025-03-05 17:08:16 +08:00
silvergundam
95b1b07062 Fix: Yellow coins preserve in OS Shop 2025-03-04 20:26:31 +08:00
silvergundam
b9dff3e177 Add: Call abyssal,strongholdo,obscure when yellow coins below 35000 2025-03-03 18:35:56 +08:00
silvergundam
6a9da7c890 fix: 71 shouldn't check rest AP during OsExplore 2025-03-02 12:14:35 +08:00
silvergundam
b05f808e3e fix: Yellow coins preserve fix 2025-02-28 16:45:48 +08:00
ZuoSiZhu
39c18d8103 Merge remote-tracking branch 'lme/master' into dev
# Conflicts:
#	deploy/AidLux/0.92/requirements.txt
#	module/campaign/campaign_event.py
#	module/os/map.py
#	module/os_ash/ash.py
#	module/webui/config.py
2025-02-28 11:01:23 +08:00
silvergundam
31b621163b fix: 71 shouldn't run before OsExplore finished even AshBeacon didn't fully collected 2025-02-26 17:54:55 +08:00
silvergundam
baf60da44a remove: delay 71 when 71 AP overmuch 2025-02-26 00:26:03 +08:00
silvergundam
962ef52001 revert: call 71 when MF AP limit in os_run 2025-02-26 00:26:02 +08:00
silvergundam
0bf95ff63b 71 won't run when os explore didnt finish except AP overmuch 2025-02-25 21:09:42 +08:00
silvergundam
4d515d69c9 call abyssal,strongholdo,obscure when AP overmuch 2025-02-25 21:00:19 +08:00
silvergundam
9c152fb5d4 abyssal,strongholdo,obscure AP preserve to MF AP preserve 2025-02-25 20:54:54 +08:00
silvergundam
282cdb028d change meowfficer farming AP preserve to 1000~10000 2025-02-25 20:39:31 +08:00
silvergundam
f9fd566de1 Revert: OS change 2025-02-25 20:07:07 +08:00
silvergundam
1cd751a728 OS change 2025-02-25 15:21:30 +08:00
guoh064
887938ba60 Upd: OCR parameters for JP zone name recognition (#4600) 2025-02-23 22:16:08 +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
xhqss
e7f93d8efe Merge branch 'master_lme'
# Conflicts:
#	module/equipment/equipment.py
2024-12-20 23:51:48 +08:00
LmeSzinc
ba5b853cb9 Refactor: Standardize the use of match_template_color() 2024-12-09 16:09:34 +08:00
LmeSzinc
164db6f4da Chore: Rename "threshold" in template matching to "similarity"
to be differ from the "threshold" in color matching
2024-12-09 15:37:25 +08:00
xhqss
fad84bb0fa Merge branch 'master_lme' 2024-11-15 17:14:11 +08:00
guoh064
1dd263d59d upd: [JP] get_zone_name correction 2024-10-30 12:18:09 +08:00
LA_DI_DA
a2e6986dcd Merge branch 'refs/heads/LmeSzinc/master' into dev
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
2024-10-25 12:01:29 +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
LmeSzinc
b0561ae468 Fix: Wrong area to get combat paused 2024-09-15 23:18:21 +08:00
LA_DI_DA
15dbb46cc3 Merge branch 'refs/heads/LmeSzinc/master' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/exercise/combat.py
#	module/os/map.py
2024-09-15 18:06:15 +08:00
LmeSzinc
d1eeb02bd2 Add: Support Battle UI theme 2024-09-15 04:34:14 +08:00
LA_DI_DA
02fec1598d Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-08-31 11:05:57 +08:00
Air111
78c59bb490 Fix: refresh current zone first if OpsiMeoTargetZone!=0 (#4121) 2024-08-30 18:45:21 +08:00
Zuosizhu
aef67541c5 Add: Option to disable Opsi repair 2024-08-02 17:23:36 +08:00
LA_DI_DA
d9c22966b8 Add: research farming for opsi hazard1 when task's auto search interrupted 2024-07-17 22:57:52 +08:00
LA_DI_DA
356c7f097b Add: research farming for opsi hazard1 2024-07-17 22:36:01 +08:00
LA_DI_DA
6c58ac98ab Fix: syntax error in operation_siren.py 2024-07-06 20:36:29 +08:00
Zuosizhu
1e31cb6de5 Merge branch 'master_lme' into AlasGGdev
# Conflicts:
#	module/campaign/gems_farming.py
#	module/coalition/coalition.py
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/operation_siren.py
#	module/os_handler/os_status.py
2024-06-28 16:01:16 +08:00
霞飛
79edef015f fix: handle sidebar disappear (#3930)
* fix: handle OpsiShop disappear

* docs: add a condition to OpsiShop

* ref: remove useless loop

* fix: exception

* feat: skip to the next month if the new shop do not unlock
2024-06-28 12:18:08 +08:00
LmeSzinc
12bd302deb Reverts test code in commit ea68f68d 2024-06-28 03:23:28 +08:00
LmeSzinc
ea68f68dc9 Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_lock() (#3917) 2024-06-27 22:20:09 +08:00
霞飛
54747a8055 ref: remove functon 2024-06-22 21:43:55 +08:00
霞飛
62bc1ed7f7 ref: remove frequency config and not to judge coins at last day 2024-06-22 21:43:55 +08:00
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev
# Conflicts:
#	alas.py
#	module/os/fleet.py
2024-06-22 20:31:35 +08:00
霞飛
0b97b40c46 Feature: New OpsiShop. (#3086)
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
2024-06-17 11:24:40 +08:00
LmeSzinc
e4653741dd Fix: Failed to enter boss room due to wrong is_question prediction 2024-06-07 09:56:35 +08:00