sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-05-16 17:19:40 +08:00
Code Activity

Merge pull request #48 from whoamikyo/master

Browse Source 
Added disclaimer to Easy_Install-V2
This commit is contained in:
LmeSzinc
2020-06-23 03:59:01 +08:00
committed by GitHub
parent 7352d17f38 e122602252
commit 7957f9feec
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Easy_Install-V2.bat
View File

@@ -137,10 +137,12 @@ goto menu
echo. echo.
echo :: This update only will work if you downloaded ALAS with this file using option 2. clone echo :: This update only will work if you downloaded ALAS with this file using option 2. clone
echo. echo.
echo ::DISCLAIMER echo ::DISCLAIMER::
echo IF YOU GET THE FOLLOWING ERROR: echo IF YOU GET THE FOLLOWING ERROR:
echo "error: Your local changes to the following files would be overwritten by merge:Easy_Install-V2.bat" echo "error: Your local changes to the following files would be overwritten by merge:Easy_Install-V2.bat"
echo YOU NEED RE-DOWNLOAD ONLY Easy_Install-V2.bat FILE FROM REPOSITORY AND OVERWRITTEN THE OLD FOR NEW FILE echo YOU NEED RE-DOWNLOAD ONLY Easy_Install-V2.bat FILE FROM REPOSITORY AND OVERWRITTEN THE OLD FOR NEW FILE
echo
echo YOU NEED RUN UPDATER INSIDE AzurLaneAutoScript FOLDER
echo. echo.
echo 1. https://github.com/LmeSzinc/AzurLaneAutoScript (Main Repo, When in doubt, use it) echo 1. https://github.com/LmeSzinc/AzurLaneAutoScript (Main Repo, When in doubt, use it)
echo 2. https://github.com/whoamikyo/AzurLaneAutoScript (Mirrored Fork) echo 2. https://github.com/whoamikyo/AzurLaneAutoScript (Mirrored Fork)

8
dev_tools.bat
View File

@@ -90,10 +90,10 @@ SET name=%time%
SET /P name= SET /P name=
IF /I '%name%'=='exit' goto EOF IF /I '%name%'=='exit' goto EOF
IF /I '%name%'=='alas' goto dev_menu IF /I '%name%'=='alas' goto dev_menu
adb -s %ADB% shell mkdir /sdcard/dcim/Screenshot 2>nul adb -s %ADB_PORT% shell mkdir /sdcard/dcim/Screenshot 2>nul
adb -s %ADB% shell screencap -p /sdcard/dcim/Screenshot/%name%.png adb -s %ADB_PORT% shell screencap -p /sdcard/dcim/Screenshot/%name%.png
adb -s %ADB% pull /sdcard/dcim/Screenshot/%name%.png %SCREENSHOT_FOLDER%\%name%.png adb -s %ADB_PORT% pull /sdcard/dcim/Screenshot/%name%.png %SCREENSHOT_FOLDER%\%name%.png
adb -s %ADB% shell rm /sdcard/dcim/Screenshot/%name%.png adb -s %ADB_PORT% shell rm /sdcard/dcim/Screenshot/%name%.png
echo. echo.
echo The file %name%.png has been copied to ./screenshots/ directory echo The file %name%.png has been copied to ./screenshots/ directory
echo. echo.