LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 14:29:26 +08:00
Code Activity
8,552 Commits 12 Branches 0 Tags
6448f9174fb117eff0485852e678d4e4b9b071c8
Commit Graph

385 Commits

Author SHA1 Message Date
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
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
霞飛
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
LA_DI_DA
eb066faf92 Merge branch 'refs/heads/smallkai' into smallkai-dev 2024-05-19 19:59:21 +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
Air111
c5073e5917 Upd: gui text (#3735) 2024-05-08 01:01:12 +08:00
LA_DI_DA
9fc3556a28 Merge branch 'smallkai' into smallkai-dev 2024-04-28 23:21:45 +08:00
LA_DI_DA
928b61978d Add: more setting for click record check 2024-04-28 23:06:32 +08:00
LA_DI_DA
7b81250ec9 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
 2024-04-27 15:56:34 +08:00
LA_DI_DA
02587d5f16 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2024-04-27 15:45:38 +08:00
Zuosizhu
4486c8cff6 Merge branch 'LmeSzinc:master' into 20230309 2024-04-15 23:25:52 +08:00
LmeSzinc
c928654a36 Del: Remove nemu_ipc controls cuz bad swipes on slow PCs 2024-04-13 23:33:49 +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
LA_DI_DA
541737d81d Add: restart instance 2024-04-10 11:31:23 +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
78adcbbc7d Opt: No android versions selecting in benchmark 2024-04-08 04:11:50 +08:00
LmeSzinc
2e81cb7dc1 Add: Click method nemu_ipc 2024-04-08 03:14:33 +08:00
LmeSzinc
501d0e6a7f Add: ScreenshotMethod option nemu_ipc 2024-03-28 19:17:16 +08:00
LmeSzinc
6987d60c96 Add: Alas.EmulatorInfo settings 2024-03-28 12:44:42 +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
bef5d22d1a Merge branch 'zuosizhu-alas/20230309' into smallkai 2024-02-01 15:52:19 +08:00
Zuosizhu
edccf21374 Merge branch 'LmeSzinc:master' into 20230309 2024-01-31 22:10:18 +08:00
guoh064
e148c9f2ae Upd: Shipyard argument (PR4 and DR3) 2024-01-31 22:06:56 +08:00
LA-DI-DA
7a34a686a6 Adj: flexible consume coins limit 2024-01-16 22:22:39 +08:00
LA-DI-DA
b335329c3c Rmv: lock limit of change ship's type 2024-01-12 00:32:29 +08:00
LA-DI-DA
c45954c4b0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 
# Conflicts:
#	module/device/device.py
 2023-12-23 11:07:19 +08:00
Zuosizhu
ac2b891229 Merge branch 'LmeSzinc:master' into 20230309 2023-12-23 09:15:12 +08:00
weeswelai
56fe530310 Add: Buy time-limited furniture in dorm. 2023-12-23 00:32:30 +08:00
LA-DI-DA
8ecebef114 Add: higher priority option for OpsiHazard1Leveling 2023-11-11 12:31:58 +08:00
LA-DI-DA
5a8182256e Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/override.yaml
 2023-10-29 12:03:28 +08:00
Zuosizhu
8815928c27 Merge branch 'LmeSzinc:master' into 20230309 2023-10-29 07:01:00 +08:00
LmeSzinc
75a58f5640 Opt: [ALAS] Turn type lock to type state 2023-10-28 22:03:47 +08:00
LA-DI-DA
0f600f7b52 Add: timeout setting of changing ship's type and attribute 2023-10-19 16:20:30 +08:00
LA-DI-DA
bcd8dbc1ce Revert "Add: user setting of scrolling dock and scrolling fleet" 
This reverts commit 3f3da4ff85.
 2023-10-19 13:42:06 +08:00
LA-DI-DA
8322140284 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/gg_handler/gg_handler.py
 2023-10-15 22:08:23 +08:00
LA-DI-DA
3f3da4ff85 Add: user setting of scrolling dock and scrolling fleet 2023-10-13 11:46:10 +08:00
LA-DI-DA
4caa2e2aec Add: timeout setting of enabling gg 2023-10-12 22:35:54 +08:00
LA-DI-DA
afa68adf00 Add: change ship's attribute 2023-10-11 11:19:21 +08:00
LA-DI-DA
e3db31de2e Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-09-30 16:50:09 +08:00
LA-DI-DA
b077bf9719 Add: change ship type for GemsFarming when set C or D map 2023-09-30 16:50:01 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme' 
# Conflicts:
#	module/device/method/droidcast.py
 2023-09-28 18:09:13 +08:00