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

256 Commits

Author SHA1 Message Date
LA-DI-DA
cf14ddd1f3 Opt: dispatch account switch from AlasGUI 2023-12-24 18:44:47 +08:00
LA-DI-DA
01ebb24aa0 Fix: type of AccountGroup.start_time 2023-12-24 14:16:16 +08:00
LA-DI-DA
fad620fe32 Adj: switch account thread 2023-12-24 13:56:05 +08:00
LA-DI-DA
2ce7041bdd Fix: style of switch account 2023-12-24 13:52:27 +08:00
LA-DI-DA
e674005ef5 Fix: switch account config watcher 2023-12-24 13:09:51 +08:00
LA-DI-DA
e10569d805 Fix: sync settings of account switch 2023-12-23 16:24:25 +08:00
LA-DI-DA
891cdc9794 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-12-23 11:09:52 +08:00
LA-DI-DA
2e08b76ff1 Add: one click login 2023-12-22 21:06:25 +08:00
LA-DI-DA
d7b597f09e Add: status switch for switch 2023-12-22 20:40:42 +08:00
LA-DI-DA
175e295ba9 Opt: account switch 2023-12-22 15:46:09 +08:00
LA-DI-DA
76c856c250 Add: support of is_loop 2023-12-21 19:48:00 +08:00
LA-DI-DA
c1b9023e76 Add: support of time_limit == 0 2023-12-21 19:31:42 +08:00
LA-DI-DA
812dda048f Rft: account switch 2023-12-21 13:38:34 +08:00
LA-DI-DA
c272cdc0c3 Add: config saved notify 2023-12-21 12:48:52 +08:00
LA-DI-DA
0014580e45 Add: ./config/account.yaml file check 2023-12-21 12:48:25 +08:00
LA-DI-DA
fd94a7c0f7 Fix: bind checkbox and self.enable_switch config 2023-12-21 12:47:37 +08:00
LA-DI-DA
1673a9d61d Add: switch account 2023-12-20 22:26:36 +08:00
Zuosizhu
bb50753c29 Merge branch 'master_lme'
# Conflicts:
#	module/device/device.py
2023-12-16 00:39:48 +08:00
LmeSzinc
a37438bd02 Fix: [ALAS] Checkbox cannot be dynamically updated 2023-12-07 22:35:36 +08:00
Zuosizhu
8981d103c9 Merge branch 'LmeSzinc:master' into 20230309 2023-11-06 10:08:40 +08:00
LmeSzinc
eda63d72f8 Refactor: Config update callback 2023-11-03 03:34:23 +08:00
LmeSzinc
1d1d20fef9 Fix: Validate datetime instead of using regex (#3252) 2023-11-01 02:40:02 +08:00
Zuosizhu
8815928c27 Merge branch 'LmeSzinc:master' into 20230309 2023-10-29 07:01:00 +08:00
LmeSzinc
f7cf9e3bd2 Add: [ALAS] stored and state widgets 2023-10-28 22:03:45 +08:00
Zuosizhu
b842d27611 Merge branch 'master_lme'
# Conflicts:
#	module/map/assets.py
2023-10-26 00:04:07 +08:00
LmeSzinc
6b88d338b5 Merge remote-tracking branch 'origin/dev' into dev 2023-10-22 19:04:05 +08:00
Zuosizhu
934e05a87a Merge branch 'LmeSzinc:master' into 20230309 2023-10-04 17:10:01 +08:00
LmeSzinc
b91bf31bc3 Fix: Update check fallback to classic git pull if git-over-cdn fails (#3164) 2023-10-01 00:34:02 +08:00
Zuosizhu
7bc96058c8 Merge branch 'master_lme'
# Conflicts:
#	deploy/Windows/config.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
2023-09-20 18:52:47 +08:00
LmeSzinc
1b9fd01852 Add: git-over-cdn 2023-09-19 23:14:37 +08:00
Zuosizhu
3b27323132 Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature 2023-09-11 20:24:49 +08:00
LmeSzinc
1ae706f40f Merge branch 'master' into feature 2023-09-08 01:27:28 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme'
# Conflicts:
#	assets/gui/css/light-alas.css
#	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/webui/app.py
2023-09-02 17:47:24 +08:00
18870
736fd52407 Opt: Refine file name processing
- Prevent bypassing disabled button through devtool
- Remove auto export on override import
2023-08-31 03:26:48 +08:00
18870
23d845b69a Opt: Move New config to manage page 2023-08-29 21:08:29 +08:00
18870
a4bd13b2bc Add: Config import/export 2023-08-29 19:56:47 +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
8987c9253b Add: Disable multi-instances on phone cloud environment 2023-08-28 17:30:46 +08:00
Zuosizhu
72730a4147 Merge branch 'LmeSzinc:master' into 20230309 2023-08-08 20:40:20 +08:00
LmeSzinc
f81d53cf68 Fix: Catch RequestHumanTakeover in benchmark 2023-08-05 18:03:50 +08:00
Zuosizhu
7cea084ecb Merge branch 'master_lme'
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/argument/task.yaml
#	module/config/config_updater.py
2023-06-22 01:06:48 +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
Zuosizhu
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +08:00
LmeSzinc
ab8c24c2ed Merge branch 'master' into feature 2023-06-12 00:43:49 +08:00
Zuosizhu
4d1fd01511 Merge branch 'master_lme'
# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py
2023-05-15 17:22:33 +08:00
LmeSzinc
b14b9af392 Merge branch 'master' into feature 2023-05-07 21:36:38 +08:00
hgjazhgj
59263237ab Add: TeamIndex 2023-05-07 09:17:14 +08:00
hgjazhgj
f6d52621fe Add: Submodule AlasFpyBridge (experimental) 2023-05-06 20:58:08 +08:00
hgjazhgj
b18be2ae2b Fix: Redundant template-maa.maa.json config file (#2551) 2023-05-05 12:29:53 +08:00