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

583 Commits

Author SHA1 Message Date
Zuosizhu
b97212d2d2 Adj: configable AP preserve method. 2026-01-31 21:14:49 +08:00
Zuosizhu
b504cea519 Adj: allow map rescan for os_init. 2026-01-27 13:24:33 +08:00
Zuosizhu
723c7be10b Fix: merge faults and delete Lme's shit 2026-01-27 13:23:27 +08:00
Zuosizhu
d1174a7d88 Merge remote-tracking branch 'Lme/master' into unrefactor
# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/os_run.py
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/os/operation_siren.py
#	module/os_handler/mission.py
#	module/webui/app.py
2026-01-24 14:18:46 +08:00
LmeSzinc
c37a52bf9c Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM 2026-01-23 02:09:08 +08:00
LmeSzinc
475c2dd2bc Chore: Use new syntax sugar in os_handler 2026-01-22 19:20:29 +08:00
LmeSzinc
d1aed19f8f Refactor: Opsi task managing 2026-01-17 23:48:59 +08:00
LmeSzinc
72b6222a2f Fix: Remove trailing "\/" in zone name (fixed #5417) 2025-12-29 19:12:57 +08:00
silvergundam
87942af94d Set new "AP limit" when Opsi reset less than 6 days,day0=300,day1=700,day2=1200,day3=1800,day4=2400,day5=3000. 2025-12-28 17:14:31 +08:00
xhqss
a5dc9328c9 Merge branch 'master_lme' into dev
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/os_shop/shop.py
2025-12-19 15:13:21 +08:00
LmeSzinc
b4ba9e5fd0 Fix: fleet_selector.get() might return 0 2025-12-09 12:28:43 +08:00
guoh064
5bde6242f9 Opt: reset opsi fleet view when cannot find current fleet in current view in OSFleet.question_goto() 2025-12-03 20:26:39 +08:00
guoh064
21c92d95e3 Opt: reset opsi fleet view when homo_loca stuck in OSFleet.question_goto() 2025-12-03 20:21:59 +08:00
xhqss
ad07ec150b Merge branch 'master_lme' into dev
# Conflicts:
#	module/config/argument/args.json
#	module/shop/ui.py
2025-11-07 18:11:22 +08:00
LmeSzinc
b44e62f973 Fix: [JP] Randomly missing Katakana 'ー' in liverpool (fixed #5295) 2025-11-07 16:12:03 +08:00
Zuosizhu
31c99d8953 Merge remote-tracking branch 'Lme/master' into dev
# Conflicts:
#	module/campaign/os_run.py
#	module/config/argument/args.json
#	module/os/operation_siren.py
#	module/retire/assets.py
#	module/shop/shop_reward.py
#	module/shop/ui.py
#	module/ui/assets.py
2025-10-12 11:28:13 +08:00
LmeSzinc
4347616d55 Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins (#5020)
* Opt: call cl1 if enabled if meowfficerfarming ends with enough yellow coins

* Revert "Add: continue cl1 if enabled after meowfficerfarming finished. (#2805)"

This reverts commit 4c48b019bc.
2025-10-11 00:42:05 +08:00
silvergundam
da25e5c919 Fix: action point limit to maxsize 2025-09-14 02:19:03 +08:00
0O0o0oOoO00
f65933e89a Merge branch 'Lme/master' into dev
# Conflicts:
#	README.md
#	module/config/argument/args.json
2025-09-13 23:04:47 +08:00
guoh064
ec4f8d0d4f Revert "Add: continue cl1 if enabled after meowfficerfarming finished. (#2805)"
This reverts commit 4c48b019bc.
2025-09-05 15:32:50 +08:00
guoh064
ec3d215deb Merge pull request #5102 from guoh064/jp_os_names
Fix: [JP] get_zone_name after process
2025-09-03 12:29:17 +08:00
guoh064
f65c0c17e9 Fix: OpsiCrossMonth should not buy oil at meowfficer farming step (#5095) 2025-09-02 00:51:58 +08:00
0O0o0oOoO00
10a62a79b5 add: add scheduler watcher to tasks 2025-08-06 18:12:49 +08:00
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