1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 09:59:25 +08:00
Commit Graph

61 Commits

Author SHA1 Message Date
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
LA_DI_DA
02fec1598d Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-08-31 11:05:57 +08:00
LmeSzinc
714c1ce455 Fix: Wait is_current_ap_visible with timeout 2024-08-20 02:33:25 +08:00
guoh064
6a10ddf8df Fix: current ap blocked by info bar (#4100) 2024-08-20 02:25:44 +08:00
LA_DI_DA
89be3580ec Merge branch 'refs/heads/LmeSzinc/master' into dev
# Conflicts:
#	module/ui/page.py
2024-08-17 21:48:52 +08:00
guoh064
c79d84e174 Opt: Check total ap to prevent meaningless ap box usage (#4020)
* Fix: predict_enemy_genre in event_20220526_cn rerun (#4005)

* Opt: Check total ap to prevent meaningless ap box usage

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com>
2024-08-17 00:43:25 +08:00
Zuosizhu
fa276716d1 Merge branch 'master_lme'
# Conflicts:
#	alas.py
2023-04-20 01:25:28 +08:00
LmeSzinc
cb2b398546 Fix: Reset timeout timer in action_point_safe_get() 2023-04-19 20:54:38 +08:00
guoh064
64db1406a0 Fix: Handle 2 Infobars covering action_point ocr (#2503) 2023-04-19 20:48:20 +08:00
LmeSzinc
7bb5c15788 Fix: Recheck AP boxes when having OCR error 2023-04-14 19:08:44 +08:00
Zuosizhu
038483cac3 Merge branch 'LmeSzinc:master' into 20230309 2023-04-13 20:37:10 +08:00
LmeSzinc
9560913ef1 Fix: Recheck AP boxes when having OCR error 2023-04-13 18:46:06 +08:00
Zuosizhu
0a419cb876 Refactor: the way to call LogRes 2023-02-14 02:21:43 +08:00
Zuosizhu
d8bd81be88 Fix: Reduce config write. Part2 2023-02-10 18:51:03 +08:00
Zuosizhu
13e5333569 Refactor: resource record and dashboard display 2023-02-07 10:48:11 +08:00
Zuosizhu
5aa1e7d00a Fix: Meet part of LmeSzinc's demand 2023-02-06 10:52:51 +08:00
MengNianxiaoyao
f760a99812 Feature: Dashboard update for further features 2023-02-04 11:23:26 +08:00
LmeSzinc
14e04069d9 Fix: Get action points buy remain with retries 2023-01-14 20:44:27 +08:00
LmeSzinc
c5b1d75009 Fix: Handle random OCR error in action points 2023-01-13 21:22:28 +08:00
SarContDeli
d87b63f9de Fix: Overconsumption of AP by meowfficer farming (#2098) 2023-01-09 20:46:53 +08:00
LmeSzinc
699d8dd1c8 Opt: Keep enough startup AP for CL1 farming 2023-01-04 20:30:58 +08:00
LmeSzinc
264a34683f Merge branch 'bug_fix' into dev 2023-01-03 03:19:36 +08:00
LmeSzinc
1c0425aa7b Fix: Handle AUTO_SEARCH_REWARD in action_point_enter() 2023-01-03 02:35:47 +08:00
LmeSzinc
89af9a60a8 Fix: More accurate action_point_safe_get() condition 2022-12-29 18:17:16 +08:00
LmeSzinc
a820633129 Merge branch 'master' into dev 2022-12-28 18:24:53 +08:00
LmeSzinc
6e0f53bd6d Fix: Handle get items in action_point_enter
Remove unused argument `quit` in handle_os_auto_search_map_option
2022-12-28 16:58:46 +08:00
LmeSzinc
a2cef011a2 Opt: Improve log appearance in OpSi Month Boss 2022-12-23 18:29:33 +08:00
YJGeng-Iriy
49b15eafd6 Merge branch 'master' into opsi_month_boss 2022-12-21 00:09:20 +08:00
VirtualTowel
1faffbbf96 Fix: Some adjustment 2022-12-18 22:35:50 +08:00
VirtualTowel
4f2ff1a164 Fix: Reduce action points waste 2022-12-18 22:00:11 +08:00
YJGeng-Iriy
525ed082b3 optimize the code of opsi_month_boss 2022-12-17 17:10:35 +08:00
LmeSzinc
b37666416c Fix: Empty array of action point amount in action_point_update() 2022-12-15 01:50:44 +08:00
YJGeng-Iriy
757fc88f7e Merge branch 'master' into opsi_month_boss 2022-12-12 19:47:59 +08:00
LmeSzinc
9bca3ef32a Opt: Limit situations to buy AP when running CL1 2022-12-12 18:07:30 +08:00
YJGeng-Iriy
a361d8ad0d opsi month boss init 2022-12-11 20:59:16 +08:00
LmeSzinc
8e71e6d274 Fix: Use action_point_safe_get in action_point_use 2022-12-10 23:05:23 +08:00
LmeSzinc
3392b5a99f Opt: Add missing name of handle_popup_confirm() calls 2022-12-05 23:16:16 +08:00
SarContDeli
1f38e92e02 Add: hazard 1 leveling 2022-11-12 00:05:30 +08:00
Bookbug
9ab069d729 Add: ActionPoint limit (#1696) (#1706)
* Opt: ActionPointBuyLimit

* Add multi-lang translation

* Solve null return

* Disable but preserve old format

* Rewrite minor translation; reform buy functions

* Add attr redirection

* Update action_point.py

* Fix:missing os_handler.py

* Fix:replace str with bool

* Fix:replace str with bool

* Fix:replace str with bool

* Fix:replace str with bool
2022-10-13 22:39:34 +08:00
SarContDeli
82a282db09 Fix: Wrong action point value of action point box 2022-08-24 23:46:51 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
LmeSzinc
f4d798e3d7 Refactor: handle_action_point, easier to understand 2022-01-21 00:40:04 +08:00
LmeSzinc
770363caf1 Fix: Trying to buy action points multiple times 2021-12-07 23:39:54 +08:00
LmeSzinc
4a392407a0 Opt: Uniform the name of zone types in OpSi
obscured to obscure
siren logger to abyssal
2021-12-06 23:41:23 +08:00
LmeSzinc
a52826594e Refactor: OS module
- Refactor OS explore, able to run without 5000 oil item
- Fix: Screenshot interval recover
2021-09-26 17:40:38 +08:00
LmeSzinc
2777f00584 Add: Obscure finish in OS fully auto 2021-08-22 00:16:40 +08:00
LmeSzinc
e6facc606a Opt: Cache ButtonGrid.buttons and add move() crop() 2021-06-29 23:04:19 +08:00
noname94
11170ffa64 Fix: [JP] OCR_ACTION_POINT_BUY_REMAIN not recognized
because the color of these digits in JP is different from that in other servers.
2021-05-24 08:34:28 +09:00
LmeSzinc
f9f5694a30 Fix: Out of action point boxes 2021-04-30 23:16:23 +08:00