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

57 Commits

Author SHA1 Message Date
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
LmeSzinc
79747e86ab Fix: Fleet switch is never watched in auto search (#3866) 2024-06-12 00:14:16 +08:00
LmeSzinc
eada57f97d Pref: Reduce CPU usage during auto search daemon 2024-06-05 01:15:42 +08:00
xhqss
c0c4913353 Merge branch '20230309' into smallkai
# Conflicts:
#	module/config/i18n/zh-CN.json
2024-05-23 08:25:21 +08:00
Zuosizhu
ddcfbb0a97 Merge branch 'master_lme'
# Conflicts:
#	README.md
#	deploy/adb.py
#	deploy/pip.py
#	module/daily/equipment.py
2024-05-23 02:31:29 +08:00
LmeSzinc
254e9422ed Fix: auto_search_moving ends with is_combat_executing 2024-05-23 01:44:31 +08:00
LA-DI-DA
a65f53b966 Merge branch 'lme-alas/master' into smallkai
# Conflicts:
#	module/map/assets.py
2023-10-19 23:00:39 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LmeSzinc
f23c960b97 Fix: Actively clear stuck records in combat 2023-10-14 21:03:58 +08:00
LA-DI-DA
833a80b584 Fix(tmp): inappropriate lv32 trigger when using "GemsFarming" which set to hard mode map 2023-09-15 20:09:52 +08:00
Zuosizhu
1e12176684 Fix: Multiple coin ocr in auto search combat 2023-03-28 17:44:16 +08:00
Zuosizhu
2bc586ce57 Merge branch 'master_lme'
# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/campaign_status.py
2023-03-04 03:11:41 +08:00
Bookbug
45373c52b8 Fix: TaskBalancer malfunctioning caused by ocr failure (#2295)
* Fix: Cannot OCR coin when using auto search(#2289)

* Merge TaskBalancer into StopCondition

* Add: Avoid zero OCR in coin

* Restruct function due to operator precedence

* Merge bug_fix into coin_autocheck

* Fix: Dumb error caused by no parameter

* Fix: Minor bugs
2023-03-03 22:19:07 +08:00
Zuosizhu
b072baa596 Merge branch 'master_lme'
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	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/retire/retirement.py
2023-02-20 12:35:43 +08:00
LmeSzinc
d191d16649 Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn 2023-02-18 01:19:04 +08:00
Zuosizhu
9d6dc4f822 Fix: Dashboard record oil and coin between two battles in auto_search battles 2023-02-10 17:23:20 +08:00
Zuosizhu
d6f0b32462 Revert "Fix: Temporary Fix Logging. Fxxk Noob Manjuu"
This reverts commit b3992cab1f.
2023-02-10 14:08:03 +08:00
Zuosizhu
b3992cab1f Fix: Temporary Fix Logging. Fxxk Noob Manjuu 2023-02-10 01:31:05 +08:00
LmeSzinc
cd628162bc Fix: Auto search is not skipping GET_SHIP (#1914) 2022-11-30 12:41:52 +08:00
LmeSzinc
59183aeff1 Fix: Oil limit too low 2022-11-29 21:15:51 +08:00
LmeSzinc
5c70364353 Refactor: Abstract CampaignStatus class and fix task balancer in Raid 2022-10-30 14:49:04 +08:00
LmeSzinc
0b35815bd4 Fix: Handle buff banner covering oil numbers in event 2022-09-16 23:09:24 +08:00
LmeSzinc
eb80f05ff5 Fix: Handle war archive story unlock popups in auto search 2022-09-11 20:53:18 +08:00
LmeSzinc
f28d0c0c29 Fix: Clear click record on each battle and each campaign (fixed #447) 2022-06-05 08:35:21 +08:00
LmeSzinc
23cf1acd1a Fix: map_offensive_auto_search is not working with fleet lock disabled 2022-03-29 21:47:39 +08:00
LmeSzinc
f9c4939821 Fix: Trying to fix the auto search bug on AL game client (#947) 2022-03-26 23:25:46 +08:00
LmeSzinc
5951d05f90 Fix: Trying to fix the auto search bug on AL game client (#947) 2022-03-23 20:57:17 +08:00
LmeSzinc
ff3cbbe6e5 Fix: Trying to handle auto search strike after exiting from retirement 2022-02-25 19:24:10 +08:00
LmeSzinc
7b0981fd48 Add: Screenshot interval in non-combat to help reduce CPU 2022-02-02 00:46:06 +08:00
LmeSzinc
62bba1b25c Fix: Story skip in auto search 2021-12-31 02:25:01 +08:00
LmeSzinc
b554a39351 Refactor: Fleet switching and fleet reverse
- Revert swipe limit of ensure_edge_insight
2021-11-06 22:25:14 +08:00
nEEtdo0d
7a4804541f Fix: submarine settings for auto search and opsi obscure 2021-11-03 20:46:12 -04:00
Cola
261b938aea Fix:check oil in auto search 2021-10-23 23:40:16 +08:00
LmeSzinc
7a53f608aa Merge branch 'master' into app 2021-10-16 17:49:53 +08:00
LmeSzinc
e272c2e664 Fix: Handle vote popup in auto search status 2021-10-16 17:16:58 +08:00
LmeSzinc
a70bef7efa Merge branch 'master' into app
# Conflicts:
#	module/combat/auto_search_combat.py
2021-10-14 20:49:04 +08:00
LmeSzinc
e3b9761043 Fix: More vote handlers 2021-10-14 20:41:04 +08:00
LmeSzinc
01d49bb752 Merge branch 'master' into app 2021-10-14 17:48:12 +08:00
LmeSzinc
6e2b418ddd Fix: AUTO_SEARCH_ON/OFF assets, handle vote popup 2021-10-14 17:37:02 +08:00
LmeSzinc
9f47fb9bc2 Merge branch 'master' into app
# Conflicts:
#	module/combat/auto_search_combat.py
2021-09-20 18:02:52 +08:00
LmeSzinc
fb33dfb884 Fix: Handle lost connection popup when game client is sending battle results 2021-09-20 18:01:15 +08:00
LmeSzinc
57c15e6ebb Fix: Solve merge conflicts
- Fix typo UrgentCube-1:45
- Add auto mode control in auto search
2021-09-18 00:26:21 +08:00
LmeSzinc
5dd0459de9 Refactor: Gems farming configs
- Opt: Avoid clicking AUTO_SEARCH_MAP_OPTION_OFF after ignore low emotion warn
- Opt: Skip map cat attack in auto search
2021-09-16 03:53:57 +08:00
LmeSzinc
abdfbb713a Refactor: Rename auto search configs
- Refactor device/app configs
- Fix: Research finish detection
2021-09-15 23:50:30 +08:00
Cyunmi
15e8acaa4a resolve conversation 2021-08-14 21:48:21 +08:00
Cyunmi
fda815b7d0 fix auto search combat status when low emotion 2021-08-14 16:15:08 +08:00
Cyunmi
3836824929 add low emotion confirm in auto search 2021-08-14 00:56:57 +08:00
Cyunmi
3d8e92c4f3 get flag ship lv in auto search 2021-08-13 20:54:01 +08:00
LmeSzinc
9abe459fdc Fix: Lock new ships in auto search combat 2021-07-23 16:03:52 +08:00
LmeSzinc
ae570058bd Fix: Detect auto search menu in every steps of auto search
- Fix: Increase timer in mission submit
2021-05-04 14:59:36 +08:00