LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 21:29:25 +08:00
Code Activity
9,611 Commits 12 Branches 0 Tags
bff32b75e7eb316b48ea7f05a0ee8cf00a2b3ca5
Commit Graph

104 Commits

Author SHA1 Message Date
xhqss
0339fe9dcc Merge branch 'master_lme' into dev 
# Conflicts:
#	module/event_hospital/assets.py
 2025-05-25 15:18:10 +08:00
travellerse
14ff6ab8ae Upd: [MAA] Update MaaFight.Series values and options to include DISABLE and AUTO (#4827) 2025-05-24 23:07:34 +08: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
32ece7a1a3 Fix: [MAA] Enum adblite_enabled get renamed 2025-04-19 23:12:37 +08:00
LmeSzinc
644750917d Upd: [MAA] Update enum class (fixed #4723) 2025-04-19 22:05:27 +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
LmeSzinc
dfb2db800f Pref: Reduce deep_get in config_update 
since deep_iter yields the value already
 2025-03-17 02:08:19 +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
xhqss
fad84bb0fa Merge branch 'master_lme' 2024-11-15 17:14:11 +08:00
SarContDeli
6cddaf420f Fix: Compatible with new versions of maa (#4366) 2024-11-10 09:17:33 +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
mackerel-12138
b1f64fb5b8 Add: enable maa OnePushConfig (#4156) 2024-09-10 00:16:59 +08:00
LA_DI_DA
02fec1598d Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-08-31 11:05:57 +08:00
dragonheart107
cd49c9b9c4 MAA Submodule i18n EN US partial language UI polish (#4113) 
* Add files via upload

* Add files via upload

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-08-23 02:21:17 +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
108e0d7da9 Fix: Plugins should bind a func list (#3390) 2023-12-29 09:50:27 +08:00
LmeSzinc
f80bd61562 Merge branch 'master' into feature 
# Conflicts:
#	module/config/i18n/zh-TW.json
 2023-08-28 18:12:08 +08:00
Ozhika
95c5df9636 Upd: [MAA] Support Sami roguelike settings (#2976) 
* Upd: [MAA] Support Sami roguelike settings

* Upd: [MAA] Support Sami roguelike settings

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-08-06 01:47:37 +08:00
LmeSzinc
cece55fbcd Opt: [MAA] Allow MaaPath to MAA.exe 2023-08-05 17:29:06 +08:00
LmeSzinc
46cc21fe6b Merge branch 'master' into feature 
# Conflicts:
#	module/daemon/uncensored.py
 2023-07-02 17:03:36 +08:00
LmeSzinc
3badbbd32d Fix: [MAA] MaaCopilot is a tool page 2023-06-20 21:58:57 +08:00
LmeSzinc
093a6efba0 Merge branch 'dev' into feature 
# Conflicts:
#	module/config/argument/task.yaml
 2023-06-17 22:19:05 +08:00
LmeSzinc
0c37354ed5 Opt: List tasks instead of collapsing them in submodules 2023-06-17 22:11:19 +08:00
LmeSzinc
5acd27ac96 Fix: Bound task Restart due to set sorting 2023-04-26 01:22:48 +08:00
LmeSzinc
0728f51b29 Refactor: Move easy install to deploy/Windows 2023-03-23 00:25:16 +08:00
LmeSzinc
9e4bb4b064 Opt: Show tips if MaaEmulator.MaaPath is not configured 2023-03-12 14:42:29 +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
da5ab2fdb7 Opt: Adjust Blacklist of MaaMall 2023-03-09 12:39:11 +08:00
SarContDeli
cef3c87ed7 Add: Support of build-in infrast config (MAA) 2023-03-09 12:27:39 +08:00
SarContDeli
18669453f3 Fix: Unable to get activity level (MAA) 2023-03-09 11:15:37 +08:00
LmeSzinc
8969b425c4 Fix: [MAA] Disable adb-lite 2023-03-03 03:03:14 +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