LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 19:59:30 +08:00
Code Activity
7,388 Commits 12 Branches 0 Tags
f93b3b3db5c94a3ee40afc59cd3ee419eef215b0
Commit Graph

538 Commits

Author SHA1 Message Date
LA-DI-DA
77e35a4f94 Update deploy template 2023-07-17 20:01:14 +08:00
LA-DI-DA
84b2dde422 Merge branch 'wait' into smallkai 
# Conflicts:
#	README.md
#	alas.py
#	assets/cn/gg_handler/BUTTON_GG_ENTER_POS.png
#	assets/cn/gg_handler/BUTTON_GG_TAB_SEARCH_POS.png
#	assets/gui/css/alas.css
#	config/template.json
#	module/campaign/assets.py
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/task.yaml
#	module/config/config_updater.py
#	module/config/i18n/ja-JP.json
#	module/log_res/log_res.py
 2023-07-17 18:45:43 +08:00
Zuosizhu
0935b58ede Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py
 2023-07-15 20:26:12 +08:00
LA-DI-DA
d984ec5a2c Merge branch 'lme-alas/master' into wait 2023-07-15 10:21:26 +08:00
LmeSzinc
8ca8d81814 Add: PR6 gui settings 2023-07-13 22:59:12 +08:00
Zuosizhu
b34d2afc1a Merge branch 'LmeSzinc:master' into 20230309 2023-06-30 19:51:52 +08:00
LA-DI-DA
c77a769842 Merge branch 'lme-alas/master' into wait 2023-06-29 20:35:12 +08:00
霞飛
d73ec47031 feat: headless environment support (#2782) 
* chore(linux): config template for Linux

* feat: Linux configuration template updater

* feat: headless requirements updater

* chore: Sorted by dictionary order

* chore: Remove useless dependencies.

* chore: remove cache operation.
 2023-06-24 19:09:24 +08:00
LA-DI-DA
2846c3cf42 Merge branch 'lme-alas/master' into wait 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/config_updater.py
 2023-06-20 22:42:40 +08:00
Zuosizhu
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +08:00
LA-DI-DA
bbcd8c898d Merge branch 'lme-alas/master' into wait 2023-06-11 22:45:14 +08:00
LmeSzinc
44b0cad4bd Merge pull request #2556 from hgjazhgj/fpy 
Add: Submodule AlasFpyBridge (experimental)
 2023-06-11 19:25:41 +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
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00
LmeSzinc
bfc020621e Del: Remove task SOS 2023-06-08 23:25:37 +08:00
Fisher Tipsy
ab0c8d0b85 Add: Allow auto attack dossier (#2579) 2023-06-08 22:28:44 +08:00
Zuosizhu
1b2e230274 Merge branch 'LmeSzinc:master' into 20230309 2023-06-08 21:43:02 +08:00
LA-DI-DA
ce4a2cfd31 Merge branch 'lme-alas/master' into wait 
# Conflicts:
#	config/deploy.template-cn.yaml
 2023-06-08 17:08:58 +08:00
LmeSzinc
54e3675371 Merge pull request #2730 from LmeSzinc/dev 
Bug fix
 2023-06-08 16:55:11 +08:00
LmeSzinc
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +08:00
Zuosizhu
ed4d51851c Merge branch 'LmeSzinc:master' into 20230309 2023-06-04 20:03:28 +08:00
LmeSzinc
82a9506214 Upd: [CN] Git mirrors 2023-06-04 18:14:28 +08:00
LmeSzinc
93b9bbc498 Upd: [CN] Git mirrors 2023-06-04 17:19:45 +08:00
LmeSzinc
90c6ddc8c7 Upd: [CN] Git mirrors 2023-06-04 17:15:43 +08:00
LA-DI-DA
fe77ef61bb Merge branch 'zuosizhu-alas/master' into wait 2023-06-04 15:37:37 +08:00
LmeSzinc
593698c526 Upd: [CN] Git mirrors 2023-06-04 02:44:24 +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
b4af10b56b Opt: LaunchPath insted of CmdLine 2023-05-27 21:22:33 +08:00
hgjazhgj
742e34c8d0 Merge branch 'dev' into fpy 2023-05-27 19:12:05 +08:00
LA-DI-DA
a799968991 Merge branch 'lme-alas/master' into wait 2023-05-17 19:46:47 +08:00
Zuosizhu
9a908c3757 Merge branch 'LmeSzinc:master' into 20230309 2023-05-16 22:08:54 +08:00
Zuosizhu
72047f9802 Merge branch 'LmeSzinc:master' into master 2023-05-16 22:08:43 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +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
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
LA-DI-DA
81f98084b0 Merge branch 'lme-alas/master' into wait 2023-04-28 23:43:29 +08:00
Zuosizhu
53cfc78a11 Merge branch 'LmeSzinc:master' into 20230309 2023-04-28 20:50:44 +08:00
Zuosizhu
6ba40f3e94 Merge branch 'LmeSzinc:master' into master 2023-04-28 20:50:37 +08:00
guoh064
8746a0ada3 Opt: Only Delay 12 hours for Hazard1leveling (#2530) 2023-04-28 01:10:53 +08:00
Zuosizhu
d2e395dc3a Fix: All 2023 to 2020 in datetime 2023-04-28 01:06:46 +08:00
LmeSzinc
391be3ce51 Gui: Move down CoalitionSp in event daily tasks 2023-04-28 00:52:38 +08:00
Zuosizhu
bb5f4ef34d Fix: Lost args 2023-04-14 10:35:43 +08:00
LA-DI-DA
989d0577c8 Merge branch 'lme-alas/master' into wait 2023-04-12 20:12:16 +08:00
Zuosizhu
cacc828f08 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/exercise/assets.py
#	module/exercise/exercise.py
 2023-04-12 15:25:30 +08:00
Zuosizhu
48f5f79c8d Merge branch 'LmeSzinc:master' into master 2023-04-12 14:32:08 +08:00
LmeSzinc
37f932688e Opt: Move down task Coalition since the event is over 2023-04-11 22:21:08 +08:00
LmeSzinc
f72ab22af8 Merge pull request #2423 from guoh064/dev 
Opt: Clear exercise attempts after final recovery (#2184)
 2023-04-11 21:51:12 +08:00