LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 12:59:25 +08:00
Code Activity
8,659 Commits 12 Branches 0 Tags
feature/plugin
Commit Graph

656 Commits

Author SHA1 Message Date
Zuosizhu
aef67541c5 Add: Option to disable Opsi repair 2024-08-02 17:23: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
2454d2aa2c Opt: Use MaaTouch as default control method 2024-07-25 02:19:45 +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
LA_DI_DA
356c7f097b Add: research farming for opsi hazard1 2024-07-17 22:36:01 +08:00
LA-DI-DA
15c4cc80fe Fix: json format error from merge mistake 2024-07-12 10:21:44 +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
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
2279296b69 Fix: use port 22267 for webui rather than 22367 2024-06-29 00:32:39 +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
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18:59 +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
霞飛
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
xhqss
05a36b6d49 change URL of repository and WebuiPort form 22367 to 22267 2024-05-25 16:37:26 +08:00
LA_DI_DA
72acfd999b fix(AutoRestart): lack of gui setting of InstanceRestart 2024-05-20 22:38:08 +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
LA_DI_DA
4481519a82 Merge branch 'refs/heads/zuosizhu-alas/20230309' into smallkai 2024-05-17 18:09:32 +08:00
星ノ谷绫沫
2e1da397db Upd: MAA Fight&Recruit (#3736) 
* Upd: MAA Fight&Recruit

* Upd: MAA Fight&Recruit
 2024-05-08 01:01:33 +08:00
Air111
c5073e5917 Upd: gui text (#3735) 2024-05-08 01:01:12 +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
LA_DI_DA
928b61978d Add: more setting for click record check 2024-04-28 23:06:32 +08:00
xhqss
bede639aa7 Add: HOMO_STORAGE data for d2/d4 in Divergent Chessboard (#3622) 2024-04-11 22:37:27 +08:00
xhqss
765eeed754 Merge branch '20230309' into smallkai 2024-04-11 22:12:34 +08:00
Zuosizhu
69aebdcf30 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	deploy/Windows/app.py
#	deploy/Windows/config.py
#	deploy/Windows/emulator.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
#	deploy/Windows/template.yaml
#	module/campaign/gems_farming.py
#	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/device/device.py
#	module/device/emulator.py
#	module/device/method/droidcast.py
#	module/device/platform/emulator_base.py
#	module/device/platform/emulator_windows.py
#	module/device/platform/platform_windows.py
#	module/handler/auto_search.py
 2024-04-10 12:22:40 +08:00
ygrzxc
7d574dde8b Add: Change the designated vanguard combination (#3520) 
* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Upd:Update dev's args.json

* Upd:Update dev's args.json

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

---------

Co-authored-by: y y <jaxvuav@163.com>
 2024-04-08 22:49:30 +08:00
LmeSzinc
6987d60c96 Add: Alas.EmulatorInfo settings 2024-03-28 12:44:42 +08:00
LA_DI_DA
5fa39fbf2b Upd: deploy template 2024-03-16 13:21:32 +08:00
LA_DI_DA
e46e97583d Revert "Update deploy template" 
This reverts commit 935e04bd03.
 2024-03-16 13:19:46 +08:00
LA_DI_DA
300a28148a Upd: default ship data 2024-03-04 22:36:21 +08:00
LA_DI_DA
3dba1cf7f9 Add: ship filter for GemsFarming 2024-03-04 22:35:19 +08:00
LA_DI_DA
fb93d4caf8 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-03-02 11:33:53 +08:00
Zuosizhu
dd0d415b67 Merge branch 'LmeSzinc:master' into 20230309 2024-03-02 09:01:48 +08:00
LmeSzinc
ffb38e5d83 Add: Event entrance of Snowrealm Peregrination (event_20240229_cn) 2024-03-01 23:27:03 +08:00
mulaikurisu
4f60d70f9b Merge remote-tracking branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-01-31 18:27:04 +08:00
Zuosizhu
98f02c7fa5 Merge branch 'LmeSzinc:master' into 20230309 2024-01-26 00:25:15 +08:00
RilyLC
c4e3c8966d Upd:[TW]Event:Mirror Involution Rerun (#3449) 2024-01-25 21:32:31 +08:00
LA-DI-DA
7a34a686a6 Adj: flexible consume coins limit 2024-01-16 22:22:39 +08:00