LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 07:19:26 +08:00
Code Activity
9,337 Commits 12 Branches 0 Tags
604da2aaebb3176fb69a0617ce7b6908c4753d3e
Commit Graph

60 Commits

Author SHA1 Message Date
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
LmeSzinc
477f917262 Refactor: deep methods reworked for better performance 2025-03-17 01:39:06 +08:00
xhqss
f33cfab853 Merge branch 'master_lme' 
# Conflicts:
#	module/webui/app.py
 2024-11-21 23:45:00 +08:00
SarContDeli
bd680eb3a8 Add: fake module PIL for webui (#4374) 
* Add: fake module PIL for webui

* Fix: Load runtime before module PIL

* Upd: Error message of MAA loading failure

* Upd: Adjust timing of import fake module
 2024-11-19 12:37:59 +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
mackerel-12138
51136dc2f0 Fix: Skip maa annihilation error task callback temporary (#4231) 
* Fix: Skip maa annihilation error task callback temporary

* optimize error check

* optimize error check

* delete log
 2024-09-23 19:07:31 +08:00
LA_DI_DA
a9afa5487a Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/webui/app.py
 2024-09-13 23:09:32 +08:00
mackerel-12138
0554f026ce Fix: fix maa closedown (#4165) 2024-09-11 01:15:14 +08:00
mackerel-12138
e78100e021 Add: Sarkaz roguelike (#4159) 
* add Sarkaz Roguelike

* add Sarkaz Roguelike
 2024-09-11 01:14:59 +08:00
LA_DI_DA
9b7852478a Fix: maa submodule 2024-08-04 17:26:57 +08:00
Zuosizhu
5123bd9949 Merge branch 'lme_master' 
# Conflicts:
#	README.md
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/equipment/equipment_change.py
 2024-05-19 00:50:11 +08:00
星ノ谷绫沫
2e1da397db Upd: MAA Fight&Recruit (#3736) 
* Upd: MAA Fight&Recruit

* Upd: MAA Fight&Recruit
 2024-05-08 01:01:33 +08:00
星ノ谷绫沫
543154eb8b Upd: MAA Roguelike (#3724) 
* Fix: Wrong params in MAA infrast

* Upd: MAA Roguelike
 2024-05-06 00:47:30 +08:00
Zuosizhu
af1f0a9056 Merge branch 'LmeSzinc:master' into 20230309 2024-05-03 12:58:36 +08:00
星ノ谷绫沫
cf0b8d39c9 Upd: Support MAA v5.2.3-alpha.1.d011.g704145a3d (#3714) 
undefined
 2024-05-02 18:01:32 +08:00
LmeSzinc
0728f51b29 Refactor: Move easy install to deploy/Windows 2023-03-23 00:25:16 +08:00
SarContDeli
a315e14604 Fix: Wrong threshold in MAA infrast (#2356) 2023-03-11 16:59:04 +08:00
LmeSzinc
7f10dab8b2 Opt: [MAA] Call MaaAward after every MaaFight runs 
to avoid reward loss
 2023-03-10 23:34:03 +08:00
SarContDeli
dc7a0c8cd9 Fix: Wrong condition in MAA infrast (#2345) 2023-03-09 20:02:28 +08:00
SarContDeli
cef3c87ed7 Add: Support of build-in infrast config (MAA) 2023-03-09 12:27:39 +08:00
SarContDeli
9a3558bc17 Add: Roguelike support (MAA) 2023-02-22 20:23:26 +08:00
SarContDeli
40dce2d61a Add: Medicine Tactics (MAA) 2023-02-22 20:23:25 +08:00
SarContDeli
8093a09da6 Upd: Update MAA interface 2023-02-22 20:23:24 +08:00
LmeSzinc
f5f093c67f Opt: Remove OpsiAshBeacon.AshAttack since it should always be True 2023-02-17 23:50:30 +08:00
LmeSzinc
f061912d66 Upd: [MAA] Backend url of prts.maa.plus 2023-02-15 20:02:12 +08:00
SarContDeli
2f97a6c819 Add: Maa Reclamation Algorithm (#2210) 2023-02-04 16:47:55 +08:00
LmeSzinc
e2bdc3f059 Add: [MAA] Toggle for MaaFightWeekly (#2198) 2023-02-03 00:10:51 +08:00
SarContDeli
bb44f039d9 Fix: Typo error in MAA interface (#2166) 2023-01-24 22:11:17 +08:00
SarContDeli
96e8f8fbdf Fix: Stuck when server update(MAA) 2023-01-24 21:42:06 +08:00
SarContDeli
62598a0b53 Add: SSSCopilot Support of MAA 2023-01-24 21:41:07 +08:00
LmeSzinc
b81a7849a2 Add: [MAA] Weekly stage fight scheduling (#2125) 2023-01-18 17:23:13 +08:00
SarContDeli
6aa580c570 Fix: Missing timer reset in MAA callback 2023-01-16 17:28:50 +08:00
SarContDeli
a44184a5e8 Fix: Unable to stop MAA when error occurred 2023-01-01 11:42:36 +08:00
SarContDeli
1dc28e253d Add: Support of touch method for MAA 2022-12-27 17:48:33 +08:00
SarContDeli
b12eabc44a Fix: OSError when loading MAA (#2010) 2022-12-18 13:34:45 +08:00
SarContDeli
2395a6055f Upd: Remove invalid visit task in latest MAA 2022-12-16 10:31:27 +08:00
SarContDeli
1664c697fb Upd: Update interface of MAA 2022-12-16 10:28:56 +08:00
SarContDeli
c185da3f22 Add: Credit fight of MAA 2022-12-09 16:27:28 +08:00
SarContDeli
20896b68c3 Add: Multiple server support of MAA 2022-12-09 14:54:16 +08:00
SarContDeli
93e8db17d3 Add: force_shopping_if_credit_full of MAA 2022-11-11 12:44:34 +08:00
Zebartin
98f4533268 Refactor: Remove unused import 2022-11-08 19:05:32 +08:00
Zebartin
ac10a8b4fb Opt: Revert back and set now_time <= end_time 2022-11-08 19:01:58 +08:00
Zebartin
40b3e6f40e Opt: Parse custom infrast periods more delicately 
- Deal with periods crossing different dates, like [20:00, 7:00]
- Delay infrast task as long as possible
 2022-11-08 15:36:32 +08:00
Zebartin
85a752ff1b Refactor: Use static method of ConnectionAttr 2022-11-07 21:16:34 +08:00
Zebartin
0ad88950b0 Opt: Delay infrast task to next day if possible 2022-11-07 20:28:08 +08:00
Zebartin
525ce2ac68 Add: Auto detection of bluestacks serial for MAA 2022-11-07 20:22:31 +08:00
LmeSzinc
9113388b1c Opt: Minor config writing optimization in MAA plugin 2022-11-06 17:16:43 +08:00
SarContDeli
d73336af5a Fix: Unable to override null arguments 2022-11-05 10:57:52 +08:00
SarContDeli
ad61593350 Opt: Optimized logic of MaaMaterial 2022-11-04 20:11:15 +08:00
SarContDeli
32db4ad50f Add: Stage option of MAA 2022-11-04 11:25:51 +08:00