1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 08:19:27 +08:00
Commit Graph

14 Commits

Author SHA1 Message Date
Zuosizhu
1e31cb6de5 Merge branch 'master_lme' into AlasGGdev
# Conflicts:
#	module/campaign/gems_farming.py
#	module/coalition/coalition.py
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/operation_siren.py
#	module/os_handler/os_status.py
2024-06-28 16:01:16 +08:00
霞飛
ad6cb7fab0 chore: move functions and expand expressions 2024-06-22 21:43:55 +08:00
霞飛
62bc1ed7f7 ref: remove frequency config and not to judge coins at last day 2024-06-22 21:43:55 +08:00
霞飛
0b97b40c46 Feature: New OpsiShop. (#3086)
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
2024-06-17 11:24:40 +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
LmeSzinc
26851c1473 Fix: Don't wait tasks of tomorrow 2023-04-11 21:47:03 +08:00
Zuosizhu
b072baa596 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/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/retire/retirement.py
2023-02-20 12:35:43 +08:00
LmeSzinc
f5f093c67f Opt: Remove OpsiAshBeacon.AshAttack since it should always be True 2023-02-17 23:50:30 +08:00
Zuosizhu
e1811c1ac0 Fix: value log error 2023-02-14 08:10:18 +08:00
Zuosizhu
13e5333569 Refactor: resource record and dashboard display 2023-02-07 10:48:11 +08:00
Zuosizhu
5aa1e7d00a Fix: Meet part of LmeSzinc's demand 2023-02-06 10:52:51 +08:00
MengNianxiaoyao
81729e076c Feature: Dashboard update for further features 2023-02-04 11:24:09 +08:00
LmeSzinc
d80b261b5b Fix: Missing break in get_yellow_coins() (fixed #2190) 2023-02-01 00:04:51 +08:00
LmeSzinc
6471d219fd Refactor: Abstract OSStatus class 2023-01-29 22:46:35 +08:00