1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Commit Graph

192 Commits

Author SHA1 Message Date
LmeSzinc
c0c5e8822a Refactor: Emulator searching 2022-10-01 01:11:07 +08:00
LmeSzinc
28f91a80a8 Add: Set deploy configs in command line 2022-09-30 23:00:13 +08:00
LmeSzinc
0047f24945
Merge pull request #1666 from Suwmlee/master
Add: auto-run config in deploy
2022-09-25 00:29:45 +08:00
SarContDeli
83efa13327 Opt: Auto handle git config corruption 2022-09-22 20:34:00 +08:00
Mathhew
e776ae2964 chore: fix uppercase 2022-09-22 14:07:16 +08:00
Mathhew
ebe60a48ea Fix: multi-config auto-run in deploy.yaml 2022-09-21 09:51:16 +08:00
LmeSzinc
3a61bec3e3 Fix: Missing import error catch when importing uiautomator2 2022-09-20 00:27:30 +08:00
Mathhew
acc4fab614 Add: auto-run config in deploy
Auto-run specified config when startup
2022-09-19 17:52:18 +08:00
LmeSzinc
f1ef87ca50 Merge branch 'master' into dev
# Conflicts:
#	module/device/emulator.py
2022-09-02 00:13:11 +08:00
n0k0m3
66fe166c30 feat: Dockerfile for Podman
Prepare `Dockerfile` for `podman` deployment instead of `docker`

Close #1569, will break docker and docker compose deployment

Co-authored-by: jellllly420 <64725601+jellllly420@users.noreply.github.com>
2022-08-28 20:47:29 -04:00
18870
c71838b091 Add: Error notify 2022-08-19 18:30:04 +08:00
n0k0m3
b5aaf22702
Fix adb server version mismatch
Use `adb` 1.0.41 from latest `platform-tools` for docker deployment
2022-08-07 13:05:55 -04:00
LmeSzinc
2ff351c2aa Fix: Replace adb from LDPlayer 2022-08-06 18:22:02 +08:00
18870
ccc6953265 Revert update dependency rich (fix #1463) 2022-07-31 15:41:54 +08:00
18870
5d7b0e86f5 Fix: Run requirement generator 2022-07-31 00:18:53 +08:00
LmeSzinc
95f5404c66 Merge branch 'master' into phone_cloud 2022-07-13 23:25:46 +08:00
LmeSzinc
2ff85ccf43 Dep: Remove atomicwrites dependency, copy-paste it into ALAS
Atomicwrites changed back and forth in one day, I'm sick of playing games with it, so just make it work permanently
2022-07-09 20:55:09 +08:00
18870
45f7dbcc5a Fix: Update dependency atomicwrites
https://github.com/untitaker/python-atomicwrites/issues/61
2022-07-09 11:09:39 +08:00
LmeSzinc
eb56b82b06 Merge branch 'dev' into phone_cloud 2022-07-05 21:58:18 +08:00
LmeSzinc
1509af6e5a Merge branch 'dev' into phone_cloud 2022-07-04 00:44:53 +08:00
LmeSzinc
620e6510bc Refactor: Split out ConnectionAttr and refactor minitouch command builder
- Upgrade uiautomator2 to 2.16.17 to fix bugs
- Use numpy.frombuffer() since numpy.fromstring() is deprecated
2022-07-04 00:44:44 +08:00
18870
297b0267ca Opt: Generate random ssh username 2022-07-03 15:45:37 +08:00
18870
4fbefd73c2 Opt: Show ssh exec not found 2022-07-02 15:01:01 +08:00
18870
39da66e054 Add: Remote access service 2022-07-01 22:48:53 +08:00
LmeSzinc
1b65a919d5 Fix: Add another uninstall registry path to search emulators 2022-06-26 18:02:14 +08:00
LmeSzinc
d3f3447afe Fix: Typo in EmulatorConnect._execute() 2022-06-26 17:03:49 +08:00
SarContDeli
beaedf4414 Opt: Optimized the hint of update failed 2022-06-26 12:06:00 +08:00
SarContDeli
8ada3f13db Opt: Optimized output when execute 'taskkill' 2022-06-25 23:30:29 +08:00
18870
079a3a8c61 Opt: Use logger in deploy 2022-06-25 20:24:34 +08:00
n0k0m3
5593fc3796 Init uiautomator2 to prevent minitouch init error 2022-06-22 10:03:34 -04:00
n0k0m3
43e9ac29d8 remap to non-root user 2022-06-21 20:25:34 -04:00
n0k0m3
f54a386ece .dockerignore optimize build context 2022-06-20 18:04:34 -04:00
n0k0m3
214d0b42c1 Add explicit requirement file for docker deploy 2022-06-20 18:04:12 -04:00
n0k0m3
0acefb1349 Move docker to deploy 2022-06-20 18:02:06 -04:00
18870
f1a42832fd Fix: Convert CheckUpdateInterval type (fixed #1203)
Fix: Update datetime regex
2022-06-09 23:47:28 +08:00
LmeSzinc
389f9c4234 Fix: Avoid using global proxies when installing u2 2022-06-09 22:00:35 +08:00
LmeSzinc
db602addc4 Fix: Remove git lock before fetching updates 2022-06-07 01:47:15 +08:00
LmeSzinc
db58202263 Fix: Cleanup after subprocess.Popen.communicate() 2022-06-07 01:35:53 +08:00
18870
50bbba5672 Fix: Option to disable reloader
Fix: Require password when password is null
2022-06-04 17:40:26 +08:00
18870
5fa62d8144 Opt: Refactor deploy config 2022-06-03 21:28:44 +08:00
18870
349a51ec4f Opt: Clear old reloader codes 2022-06-03 16:24:04 +08:00
LmeSzinc
0cc06921af Dep: Show help message when getting ModuleNotFoundError: No module named 'progress.bar' 2022-05-27 23:40:39 +08:00
LmeSzinc
0bc1b829ae Dep: AidLux requirements.txt update 2022-05-27 23:21:49 +08:00
LmeSzinc
3c46d68974 Dep: adbutils==0.11.0 2022-05-15 21:58:04 +08:00
LmeSzinc
dd8bcf113a Fix: Add help message to fix adbutils install error 2022-05-08 16:46:06 +08:00
LmeSzinc
7c16b633e2 Fix: Linebreaks in generated files 2022-04-23 12:18:53 +08:00
18870
304b65bc2c Opt: Allow custom cdn 2022-04-17 19:49:04 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
SarContDeli
100c02ed62 Fix: The behavior of saving the configuration will be atomic 2022-03-31 19:57:05 +08:00
LmeSzinc
26d160a8fe Fix: GUI update failed due to wrong dependency naming (#972) 2022-03-29 23:34:35 +08:00
saicatedoan
12fe5d9a92 Modified the way to realize the WSA solution
Fix:A rare situation caused the game to shut down during restart in WSA solution
2022-03-17 14:06:33 +08:00
18870
ef2fe1cb13 Upd: Requirements for AidLux 2022-03-14 14:28:40 +08:00
18870
cc29c0c713 Opt: Standalone OCR service 2022-03-12 22:34:01 +08:00
LmeSzinc
cadfb40353 Opt: Add help text when getting AssertionError in uiautomator2 installation 2022-03-10 12:15:16 +08:00
LmeSzinc
8640e92a89 Opt: Hide deploy template to reduce confusion of config/deploy.yaml and deploy/template/deploy.yaml 2022-02-11 22:56:08 +08:00
LmeSzinc
f7073fbff3 Opt: Shorten the show of deploy config
- Fix: requirements.txt with <space>
2022-02-10 00:18:43 +08:00
LmeSzinc
7594f02444 Opt: Kill ADB from more emulators 2022-02-09 18:55:19 +08:00
LmeSzinc
2f4b335599 Revert "Fix: Handle filepath with spaces in RequirementsFile"
This reverts commit d855b576
2022-02-06 18:10:52 +08:00
LmeSzinc
d855b57692 Fix: Handle filepath with spaces in RequirementsFile 2022-02-06 17:34:17 +08:00
LmeSzinc
aec03ec069 Fix: Decode error when killing adb 2022-02-06 14:06:39 +08:00
LmeSzinc
35ec778be8 Fix: Kill adb directly instead of using "adb kill-server" 2022-02-06 02:42:28 +08:00
LmeSzinc
3a35df69fd Fix: Minor issues when running Alas on AidLux+VMOS
- Redundant "" in pip_install
- Hide Hermit after accessibility service turned on
2022-02-06 01:29:17 +08:00
LmeSzinc
91ff16c8f6 Dep: Add templates for deploy.yaml 2022-02-03 23:46:48 +08:00
LmeSzinc
58ffdd7b0d Dep: Requirements.txt for AidLux 2022-02-03 22:16:18 +08:00
LmeSzinc
4bf8455ae8 Fix: Split installer to avoid importing winreg on other platforms
- Fix: Handle a random wmic exception
2022-01-17 21:50:40 +08:00
LmeSzinc
b92ee81e3f Fis: Handle missing pywin32 2022-01-17 13:04:11 +08:00
MrGuoRanDuo
dd632b8aaa Fix:executable_path maybe None 2022-01-16 14:08:29 +08:00
LmeSzinc
186c78eae9 Add: Option to toggle DPI scaling 2022-01-16 12:18:13 +08:00
LmeSzinc
0c9355abc1 Fix: Git pull should before alas kill 2022-01-15 21:41:08 +08:00
LmeSzinc
0c5cc41336 Opt: Use win32com to search processes instead of wimc
because wimc has been removed in the latest windows 11
2022-01-15 20:24:46 +08:00
LmeSzinc
a66718d768 Fix: Double check the case of process_name 2022-01-15 17:53:01 +08:00
LmeSzinc
aba18b8afe Add: app.asar auto update
- Kill existing alas.exe and python.exe before start
2022-01-15 16:03:24 +08:00
18870
c808a7bc9f Opt: Add an option to disable reload 2022-01-14 21:34:54 +08:00
18870
c8a95970d5 Opt: Show commit info in updater 2022-01-12 22:27:56 +08:00
18870
1d716b27f1 Opt: Remake updater 2022-01-10 22:24:51 +08:00
18870
3055ab1536 Add: API Token 2022-01-10 15:05:34 +08:00
18870
e0d38cfff4 Add: Check update 2022-01-09 18:59:25 +08:00
18870
d0dd24bd59 Add: IPv6 support 2022-01-07 00:04:40 +08:00
18870
d15fbbac79 Fix: Typo in 39bc1ecc 2021-12-31 20:57:29 +08:00
18870
70200c1e9a Opt: Self host assets 2021-12-31 20:49:48 +08:00
LmeSzinc
bd4f5d08e3 Fix: Git stash pop failed if there isn't any local changes 2021-12-31 15:50:10 +08:00
18870
39bc1ecc13 Upd: [CN] meowfficer assets
not sure whether other server changed after maintain, so cn only

opt: hide password in deploy log
2021-12-23 17:53:33 +08:00
18870
8ab9b14b17 Fix: Convert null to empty string
DeployConfig.to_bool() can't convert None

dbc44aa296
2021-12-17 21:22:58 +08:00
18870
dbc44aa296 Add: Remember the last used theme (#821)
- Add: Password in deploy config
- Opt: Parse yaml value null into None
2021-12-17 19:43:47 +08:00
LmeSzinc
5d75391e06 Add: Remember the last used translation 2021-11-07 17:22:32 +08:00
LmeSzinc
9c9445fb32 Fix: [CN] UnicodeEncodeError after git init in AzurLaneUncensored
- Opt: Show logs in AzurLaneUncensored using monkey patch
2021-10-29 20:19:04 +08:00
LmeSzinc
e6551b579e Fix: Typo brunch -> branch 2021-10-28 01:08:49 +08:00
LmeSzinc
8d63d534c8 Upd: Change deploy settings from app to master 2021-10-28 00:03:27 +08:00
LmeSzinc
87a0afb325 Fix: Minor grammar typo in installer help 2021-10-27 17:53:11 +08:00
LmeSzinc
069e29226c Fix: Minor installer refactor mistake 2021-10-26 23:31:55 +08:00
LmeSzinc
649aa491c9 Add: [CN] AzurLaneUncensored support 2021-10-26 23:09:21 +08:00
LmeSzinc
5c034edef9 Add: Auto installer 2021-10-23 21:28:07 +08:00