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

560 Commits

Author SHA1 Message Date
guoh064
7967c3114c Opt: speed up the frequency of opsi level check 2025-06-17 14:43:47 +09:00
guoh064
046e3fb377 Add: delay task after opsi level check passed 2025-06-17 14:41:16 +09:00
guoh064
7cef54d350 Add: check leveling in cl1 daily 2025-06-08 13:08:19 +09:00
ZuoSiZhu
dee0c1484f Merge branch 'master_lme' into dev
# Conflicts:
#	campaign/Readme.md
#	module/base/utils.py
#	module/coalition/assets.py
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/handler/login.py
#	module/retire/dock.py
#	module/retire/enhancement.py
#	module/shop/shop_reward.py
2025-05-21 04:17:08 +08:00
LmeSzinc
d82baea7b9 Fix: Empty failed_zone list because failed function doesn't have return 2025-05-15 18:18:34 +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
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
LmeSzinc
445507d7d5 Fix: Keep in map_exit loop if MAP_EXIT still appears 2025-04-21 23:02:47 +08:00
silvergundam
238a815454 Fix: Meowfficer farming cd 2025-03-28 05:16:38 +08:00
ZuoSiZhu
7e3e97a5d9 Fix: Shit from deep_get 2025-03-28 01:20:07 +08:00
ZuoSiZhu
58a217d98f Merge branch 'master_lme' into dev
# Conflicts:
#	module/webui/app.py
#	module/webui/config.py
2025-03-28 00:23:16 +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
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