LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 01:19:25 +08:00
Code Activity
9,052 Commits 12 Branches 0 Tags
7b70ee8f57e245ddc23f745fa3c04400d4e2f73a
Commit Graph

127 Commits

Author SHA1 Message Date
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
Zuosizhu
9934be19fe Merge branch 'master_lme' 
# Conflicts:
#	module/config/config.py
#	submodule/AlasFpyBridge/module/config/config.py
 2023-12-29 14:46:10 +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
hgjazhgj
2f9fda959d Fix: [FPY]change FpyTool.page to tool (#2777) 
* Fix: `Start` button on tool page
私の不始末で多大なご迷惑をお掛けしました
申し訳ございません
謝罪します

* Fix: [FPY]set_stop_event
+ text optimization
Slap to myself a month ago

* Fix: change FpyTool.page to `tool`
 2023-06-18 21:58:20 +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
hgjazhgj
f5c106b70f Fix: Start button on tool page (#2760) 
私の不始末で多大なご迷惑をお掛けしました
申し訳ございません
謝罪します
 2023-06-12 10:07:34 +08:00
LmeSzinc
d6fb157f0e Fix: [FGOpy] Solve merge conflicts 2023-06-12 00:50:24 +08:00
LmeSzinc
ab8c24c2ed Merge branch 'master' into feature 2023-06-12 00:43:49 +08:00
hgjazhgj
c09b614040 Fix: add 'Fpy' prefix to all Fpy arguments and taskgroups if not exist 
to display correct text in i18n
 2023-06-10 06:45:52 +08:00
hgjazhgj
49962747a9 Add: I18N for en and jp 2023-06-09 02:58:23 +08:00
hgjazhgj
9665291fe7 code format 
I promised to finish the development of AlasFpyBridge before 6.4
and now I have done it!
 2023-06-03 22:21:22 +08:00
hgjazhgj
8180eea144 Opt: let Fpy use Alas' adb 2023-06-01 20:18:54 +08:00
hgjazhgj
2621c802d9 Fix: stop FGO-py before join logger thread 2023-05-30 19:59:54 +08:00
hgjazhgj
a88156fced Fix: Misjudging of subprocess state 
due to async output even after "Reason: Finied" printed and a "Warning" instead of "Inactive" displayed on web ui
 2023-05-30 18:07:28 +08:00
hgjazhgj
6e339a5364 Opt: realtime SpecialDrop count 2023-05-28 03:17:47 +08:00
hgjazhgj
f54c722031 Del: outdeted mining 2023-05-28 02:30:26 +08:00
hgjazhgj
bf4caf03b1 Opt: kill OrphanSlayer when sub-subprocess exited 
which there is no need of it any more
 2023-05-28 02:17:51 +08:00
hgjazhgj
102ce3c71e Fix: no detection of spid exist in OrphanSlayer 2023-05-28 02:04:55 +08:00
hgjazhgj
427b27c52d Fix: set FpyMain a higher priority 
to avoid DailyFpSummon run when battle unfinished
 2023-05-28 00:34:39 +08:00
hgjazhgj
bcc5a3227d Opt: text 2023-05-27 23:47:56 +08:00
hgjazhgj
892b73f0bc Opt: pass fpy pid to halt cmd 2023-05-27 23:30:21 +08:00
hgjazhgj
334f6ef20c Fix: orphan process 2023-05-27 23:12:07 +08:00
hgjazhgj
f227b8fbc6 Fix: isProcessExist under Windows 2023-05-27 22:16:37 +08:00
hgjazhgj
b4af10b56b Opt: LaunchPath insted of CmdLine 2023-05-27 21:22:33 +08:00
hgjazhgj
01094d1ae8 Opt: text optimization 2023-05-12 14:57:59 +08:00
hgjazhgj
8f9e48b8e5 Opt: 3 optimization listed below 
+ validate Interval
+ config.multi_set to avoid frequent file write
+ merge BenchTouch and BenchScreen into once
 2023-05-12 14:55:18 +08:00
hgjazhgj
0640732797 Opt: No raw command textarea in FpyBenchmark 2023-05-09 14:40:24 +08:00