LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 13:59:25 +08:00
Code Activity
8,551 Commits 12 Branches 0 Tags
af5bcafcc5ccccbbf8d1db5d86d9b3c8a73da621
Commit Graph

314 Commits

Author SHA1 Message Date
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
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
5f56a2bdb7 Chore: [ALAS] Move func methods to the Alas class 2024-05-30 13:34:24 +08:00
LA_DI_DA
7b81250ec9 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
 2024-04-27 15:56:34 +08:00
LmeSzinc
31da8d42a1 Opt: Early init minitouch and MaaTouch for faster startup 2024-04-15 03:48:37 +08:00
LA-DI-DA
c921b04fe0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2024-01-02 23:06:15 +08:00
LmeSzinc
e77dba1da3 Fix: AzurLaneConfig.bind() should receive a func_list not a set 2023-12-27 00:16:07 +08:00
LA-DI-DA
8ecebef114 Add: higher priority option for OpsiHazard1Leveling 2023-11-11 12:31:58 +08:00
LmeSzinc
39e3f8b221 Merge branch 'master' into feature 2023-09-10 16:35:45 +08:00
LmeSzinc
da02fd6066 Fix: Trying to fix story skip bug on game client 2023-09-10 16:20:39 +08:00
LmeSzinc
f80bd61562 Merge branch 'master' into feature 
# Conflicts:
#	module/config/i18n/zh-TW.json
 2023-08-28 18:12:08 +08:00
LmeSzinc
3637d267ad Fix: ASSETS.ui_mask was released but never reloaded 2023-07-21 23:32:35 +08:00
LmeSzinc
46cc21fe6b Merge branch 'master' into feature 
# Conflicts:
#	module/daemon/uncensored.py
 2023-07-02 17:03:36 +08:00
LmeSzinc
a6a845a36a Fix: Delay OpsiArchive at AP limit (#2785) 2023-07-02 15:59:02 +08:00
LmeSzinc
b14b9af392 Merge branch 'master' into feature 2023-05-07 21:36:38 +08:00
hgjazhgj
b18be2ae2b Fix: Redundant template-maa.maa.json config file (#2551) 2023-05-05 12:29:53 +08:00
LmeSzinc
5acd27ac96 Fix: Bound task Restart due to set sorting 2023-04-26 01:22:48 +08:00
LmeSzinc
043d76480f Add: Start/stop MuMu Player family 2023-04-25 23:03:23 +08:00
LmeSzinc
7ecf3ac502 Add: Coalition task 2023-03-24 04:41:13 +08:00
LmeSzinc
f5f093c67f Opt: Remove OpsiAshBeacon.AshAttack since it should always be True 2023-02-17 23:50:30 +08:00
LmeSzinc
3d174b19cb Opt: Auto-select the fastest screenshot method 2023-02-08 01:42:04 +08:00
LmeSzinc
699d8dd1c8 Opt: Keep enough startup AP for CL1 farming 2023-01-04 20:30:58 +08:00
LmeSzinc
a2cef011a2 Opt: Improve log appearance in OpSi Month Boss 2022-12-23 18:29:33 +08:00
SarContDeli
6f063713df Fix: Wrong log when delay across task 2022-12-20 18:05:38 +08:00
nEEtdo0d
f1e01b3b69 Upd: opsi_task_delay; Opsi archive supports submarine calls 2022-12-11 23:57:14 -05:00
nEEtdo0d
72339a5093 Add: re-instate Opsi archive task, runs weekly as AL devs seemingly add new logger archives after a random scheduled maintenance 2022-12-10 20:26:28 -05:00
nEEtdo0d
1d433efc7b Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-12-01 10:52:40 -05:00
nEEtdo0d
c2d8fad6bb Del: Opsi archive zone monthly task support; currently not a monthly trend maybe will be in the future 2022-12-01 10:41:05 -05:00
LmeSzinc
b8d06b12e5 Add: OpsiCrossMonth, not tested 2022-11-30 01:40:53 +08:00
nEEtdo0d
b625b23717 Fix: os_voucher and os_archive infinite task looping 2022-11-29 10:01:57 -05:00
nEEtdo0d
afc8468e0a Add: Opsi archive zone monthly task support 2022-11-28 00:21:52 -05:00
LmeSzinc
a2081bed34 Revert "Opt: Reduce json writes when recording emotion" 
This reverts commit 61e62edb
 2022-11-01 23:59:13 +08:00
LmeSzinc
61e62edb08 Opt: Reduce json writes when recording emotion 2022-10-30 14:49:30 +08:00
SarContDeli
3c467a51b6 Fix: Configuration missing in MAA 2022-09-17 16:03:23 +08:00
SarContDeli
4372c81fcd Upd: Revert change of config and scheduler 2022-09-17 16:03:00 +08:00
SarContDeli
4b620853fe Add: Add new config 2022-09-17 16:02:06 +08:00
SarContDeli
9ea8396bed Add: submodule management 2022-09-17 16:02:02 +08:00
LmeSzinc
9b4ba2ca21 Opt: Call meta reward if cleared a meta 2022-09-14 01:16:08 +08:00
LmeSzinc
8d4617113c Fix: Sorting tasks in waiting list (#1634) 2022-09-14 00:11:18 +08:00
LmeSzinc
b4cb6b7dba Opt: Proper recon scan CD duration and OneHitMode in dossier 2022-09-12 23:35:19 +08:00
LmeSzinc
1f67a9a109 Add: Get and set config across tasks 2022-09-06 22:20:29 +08:00
Bookbug
b26b6c97d1 Add: TaskBalancer (#1509) 
* CoinManagement added, but malfunction

* CoinManagement added, but malfunction

* CoinManagement:Translation complete

* CoinManagement:ready for testing

* CoinManagement:ready for testing

* CoinControl: Almost done, needs optimization/fix

* Add: CoinControl, done with full test.

* Add: TaskBalancer(experimental)

* Add: TaskBalancer(experimental)

* Remove legacy codes

* Upt: Reform codes(Experimental)

* Add:Task Balancer(Experimental)

* Add:Task Balancer(Experimental)

* Upt: config.py

* Fix: Default value of CheckInterval

* Upd: Minor translation adjustment

* Upd: Minor translation adjustment

* Upd: Revert the enable button and remove the CheckInterval

* Fix: minor translation

* Fix: additional trigger message caused by legacy code

* Add: User-defined delay interval

* Opt: Translation and default value of CoinLimit; Remove user-defined CheckInterval; Reform task sorting logic
 2022-08-24 23:44:49 +08:00
LmeSzinc
11aea6d4d9 Fix: Cancel researches with unsatisfied requirements 
Avoid to add into queue
- Refactor: Split out ResearchSelector
 2022-08-23 02:47:44 +08:00
18870
ec22f748ff Opt: Catch possible exception in config update 
Try to fix - #1172
Format code using black
 2022-07-17 00:38:19 +08:00
SarContDeli
9553a5fae1 Fix: Alas webui shutdown caused by datetime error 2022-06-30 09:55:14 +08:00
LmeSzinc
3a0b5d5536 Opt: Reduce config writes 2022-06-06 23:42:24 +08:00
LmeSzinc
3aafd4a5f2 Opt: Watch user config changes while waiting for new tasks (resolve #1176) 2022-06-05 11:51:01 +08:00
LmeSzinc
f47e7b046e Fix: Duplicate restart at server reset 2022-05-02 16:43:25 +08:00
LmeSzinc
562365afe6 Opt: Lower the priority of task OpsiMeowfficerFarming 2022-05-02 16:32:04 +08:00