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

699 Commits

Author SHA1 Message Date
Zuosizhu
aef67541c5 Add: Option to disable Opsi repair 2024-08-02 17:23:36 +08:00
LA_DI_DA
7e273a0ca7 Fix: update new event in Event2 2024-07-26 11:59:36 +08:00
Zuosizhu
1d85336ba4 Merge remote-tracking branch 'refs/remotes/Lme/master' into dev
# Conflicts:
#	module/device/method/adb.py
#	module/device/screenshot.py
2024-07-26 08:04:44 +08:00
LmeSzinc
bec185c855 Add: Event entrance of Interlude of Illusions (event_20240725_cn) 2024-07-25 23:37:48 +08:00
LmeSzinc
2454d2aa2c Opt: Use MaaTouch as default control method 2024-07-25 02:19:45 +08:00
LmeSzinc
733bb89b2d Add: [ALAS] Add ldopengl setting 2024-07-25 02:16:34 +08:00
LA_DI_DA
be68cd03fe Merge branch 'refs/heads/feature/player-level-and-exp' into dev 2024-07-21 12:54:27 +08:00
LA_DI_DA
327225e74d Add: show player info in dashboard
commits:
Adj: rename update player info function

Fix: use play exp record to check time

Add: show exp and level of player in dashboard
2024-07-21 12:53:55 +08:00
Zuosizhu
ae45257731 Adj: Fuck FleetNumberInHardMode Setting, bind it with FleetOrder 2024-07-20 15:10:27 +08:00
Zuosizhu
4ad4b064ee Fix: Cvl to bc/bb with common bb problem about Nevada 2024-07-20 12:56:32 +08:00
Zuosizhu
ad6d508013 Add: Options for an easier way of changing ShipType 2024-07-19 19:27:52 +08:00
LA_DI_DA
a12a831419 Merge branch 'refs/heads/lme-alas/master' into dev
# Conflicts:
#	alas.py
2024-07-18 23:12:53 +08:00
LmeSzinc
e66b2a84b0 Add: Claim mails in task freebies
- TODO: [JP][TW] Update mail assets
2024-07-18 22:48:40 +08:00
梦念逍遥
6a0466d842 Add: Event Pledge of the Radiant Court Rerun (#4001)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2024-07-18 21:38:27 +08:00
LA_DI_DA
356c7f097b Add: research farming for opsi hazard1 2024-07-17 22:36:01 +08:00
LA_DI_DA
95a3fe236b Add: 7th research for ResearchFarming 2024-07-17 17:38:48 +08:00
ReLU
fceeff25e0 Merge remote-tracking branch 'upstream/master' into dev 2024-07-12 03:54:22 +08:00
LmeSzinc
5ee7f9118e Add: Series 7 filter 2024-07-12 00:24:36 +08:00
RilyLC
ec1ae2cb3e Upd:[TW]Event:Tower of Transcendence Rerun (#3981)
* docs: update game configs

* Upd:[TW]Event:Tower of Transcendence Rerun

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: 霞飛 <saarchaffee@qq.com>
2024-07-11 22:11:37 +08:00
Zuosizhu
6448f9174f Add: PR7 gui settings 2024-07-11 16:36:41 +08:00
Zuosizhu
106d46dc0a Fix: all the shit chasing me from last year 2024-07-08 03:23:53 +08:00
LA-DI-DA
23152493b1 Add: pick out auto research farming from more alas 2024-07-07 11:53:00 +08:00
LA_DI_DA
c25ea046c6 Upd: update args.json and other files 2024-07-06 19:14:14 +08:00
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
LmeSzinc
9bdfdb6447 Fix: Override mode in CoalitionSp 2024-06-28 01:54:38 +08:00
LmeSzinc
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18:59 +08:00
LmeSzinc
6bdfbc3dcd Add: Event entrance of coalition_20240627 2024-06-27 23:34:39 +08:00
RilyLC
d1b16a99c2 Upd:[TW]Event:Tempesta and the Fountain of Youth (#3933)
* Fix: Skip first screenshot in tools

since you cannot run benchmark before benckmarked

* Fix: Lower HOMO_CANNY_THRESHOLD in event_20220428_cn

to fit maps in 2024

* Fix: Random background of chapter A hits EXP_INFO_B

* Upd:[TW]Event:Tempesta and the Fountain of Youth

---------

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2024-06-27 19:59:16 +08:00
LmeSzinc
b9730d4cd2 Opt: Add default filter in OpsiShop 2024-06-23 18:09:19 +08:00
霞飛
62bc1ed7f7 ref: remove frequency config and not to judge coins at last day 2024-06-22 21:43:55 +08:00
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev
# Conflicts:
#	alas.py
#	module/os/fleet.py
2024-06-22 20:31:35 +08:00
LmeSzinc
86d6c36670 Merge branch 'master' into dev 2024-06-21 01:50:05 +08:00
Air111
473a7b626c Add: Event Rondo at Rainbow's End Rerun (#3902) 2024-06-20 19:00:11 +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
Air111
a70d4c4675 Upd: add CommonDD option (#3786)
* Upd: add dd combination z20_or_z21

* Upd: add dd option favourite

* Opt: use fation to filter Z20 or Z21
2024-06-14 03:39:20 +08:00
RilyLC
f70bb61ee6 Upd:[TW]Event:Sundered Blue Rerun (#3886) 2024-06-13 22:32:35 +08:00
pull[bot]
c85c6582e1 Merge pull request #15 from LmeSzinc/master
[pull] smallkai from LmeSzinc:master
2024-05-24 03:30:45 +00:00
LmeSzinc
c8322b5187 Upd: [TW] Event event_20230525_cn 2024-05-24 03:20:07 +08:00
LA_DI_DA
41794891df Merge branch 'refs/heads/smallkai-dev' into smallkai
# Conflicts:
#	module/config/argument/args.json
#	module/config/i18n/zh-CN.json
2024-05-23 12:53:42 +08:00
LA_DI_DA
880a1834ec Merge branch 'refs/heads/zuosizhu-alas/20230309' into smallkai-dev
# Conflicts:
#	README.md
#	module/equipment/equipment.py
#	module/equipment/equipment_change.py
2024-05-23 12:51:24 +08:00
xhqss
584c58c3c2 Correct config 2024-05-23 08:29:30 +08:00
xhqss
c0c4913353 Merge branch '20230309' into smallkai
# Conflicts:
#	module/config/i18n/zh-CN.json
2024-05-23 08:25:21 +08:00
Zuosizhu
ddcfbb0a97 Merge branch 'master_lme'
# Conflicts:
#	README.md
#	deploy/adb.py
#	deploy/pip.py
#	module/daily/equipment.py
2024-05-23 02:31:29 +08:00
LmeSzinc
b85d646a84 Add: Event entrance of Light of the Martyrium (event_20240521_cn) 2024-05-21 22:53:12 +08:00
LA_DI_DA
72acfd999b fix(AutoRestart): lack of gui setting of InstanceRestart 2024-05-20 22:38:08 +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
LA_DI_DA
85e4f8e15e Merge branch 'refs/heads/lme-alas/master' into smallkai
# Conflicts:
#	README.md
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/equipment/equipment.py
#	module/equipment/equipment_change.py
2024-05-17 18:38:32 +08:00
rilylc
bbe601b687 Upd:[TW]Event:Upon the Shimmering Blue Rerun 2024-05-09 18:58:41 +08:00
Air111
c5073e5917 Upd: gui text (#3735) 2024-05-08 01:01:12 +08:00
LA_DI_DA
928b61978d Add: more setting for click record check 2024-04-28 23:06:32 +08:00