sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-23 05:08:01 +08:00
Code Activity

Tweaks: Added improvements on Easy_Install

Browse Source 
- Now it will be more difficult to occur mistake by user.
- Added GIT to winpython.
- Now alas.bat only use binarys embedded in python-3.7.6.amd64 folder
This commit is contained in:
whoamikyo
2020-06-24 09:26:13 -03:00
parent ab1f416819
commit 8471b2cb4d
2 changed files with 209 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
alas.bat
View File

@@ -1,7 +1,10 @@
@SETLOCAL EnableExtensions EnableDelayedExpansion
@echo off
title ALAS run
call adb kill-server > nul 2>&1
SET ADB=%~dp0python-3.7.6.amd64\Lib\site-packages\adbutils\binaries\adb.exe
SET PYTHON=%~dp0python-3.7.6.amd64\python.exe
call %ADB% kill-server > nul 2>&1
set SCREENSHOT_FOLDER=%~dp0screenshots
if not exist %SCREENSHOT_FOLDER% (
@@ -34,7 +37,7 @@ REM
set /p ADB_PORT=<adb_port.ini
echo connecting at %ADB_PORT%
adb connect %ADB_PORT%
call %ADB% connect %ADB_PORT%
::echo initializing uiautomator2
::%~dp0python-3.7.6.amd64/python.exe -m uiautomator2 init
@@ -77,24 +80,25 @@ goto alas
)
:en
call %~dp0python-3.7.6.amd64/python.exe --version >nul
call %PYTHON% --version >nul
if %errorlevel% == 0 (
echo Python Found! Proceeding..
echo Opening alas_en.pyw...
%~dp0python-3.7.6.amd64/python.exe alas_en.pyw
call %PYTHON% alas_en.pyw
) else (
echo :: it was not possible to open alas_en.pyw, make sure you have a folder python-3.7.6.amd64
echo :: inside AzurLaneAutoScript folder.
echo.
pause > NUL
)
PowerShell -Command "Start-Sleep -s 10" > nul 2>&1
goto alas
:cn
call %~dp0python-3.7.6.amd64/python.exe --version >nul
call %PYTHON% --version >nul
if %errorlevel% == 0 (
echo Python Found! Proceeding..
echo Opening alas_en.pyw...
%~dp0python-3.7.6.amd64/python.exe alas_cn.pyw
call %PYTHON% alas_cn.pyw
) else (
echo :: it was not possible to open alas_cn.pyw, make sure you have a folder python-3.7.6.amd64
echo :: inside AzurLaneAutoScript folder.
@@ -103,11 +107,11 @@ goto alas
)
goto alas
:jp
call %~dp0python-3.7.6.amd64/python.exe --version >nul
call %PYTHON% --version >nul
if %errorlevel% == 0 (
echo Python Found! Proceeding..
echo Opening alas_en.pyw...
%~dp0python-3.7.6.amd64/python.exe alas_jp.pyw
call %PYTHON% alas_jp.pyw
) else (
echo :: it was not possible to open alas_jp.pyw, make sure you have a folder python-3.7.6.amd64
echo :: inside AzurLaneAutoScript folder.