Fix: fixed bluestacks hyper-v multi-instance support

alas.bat

@@ -62,6 +62,7 @@ call command\Get.bat DeployMode
 
 :: Start of Deployment
 set "pipLog=%root%\toolkit\log\pip_update_log_%datetime%.log"
+set "pipLogFolder=%root%\toolkit\log\"
 if "%IsUsingGit%"=="yes" if "%DeployMode%"=="unknown" ( xcopy /Y toolkit\config .git\ > NUL )
 call :UpdateChecker_Alas
 title ^| Alas Run Tool V3 ^| Branch: %BRANCH% ^| Git hash: %LAST_LOCAL_GIT% ^| commit date: %GIT_CTIME% ^|
@@ -219,12 +220,9 @@ if "%KeepLocalChanges%"=="disable" (
    %gitBin% reset --hard %source%/%Branch%
    %gitBin% pull --ff-only %source% %Branch%
    echo == ^| DONE!
-   if "%AutoMode%"=="enable" ( 
+   echo. & echo == ^| Please re-run this batch to make the settings take effect.
-   echo. & echo == ^| Press any key to proceed to %DefaultServer%
+   echo == ^| Please re-run the "alas.bat" to make the settings take effect.
-   goto %DefaultServer% )
+   goto PleaseRerun
-   echo == ^| Press any key to proceed
-   pause > NUL
-   goto MENU
 ) else (
    echo == ^| GIT Found in %gitBin% Proceeding
    echo == ^| Updating from %source% repository..
@@ -232,16 +230,11 @@ if "%KeepLocalChanges%"=="disable" (
    %gitBin% pull %source% %Branch%
    %gitBin% stash pop
    echo == ^| DONE!
-   if "%AutoMode%"=="enable" ( 
+   echo == ^| DONE!
-   echo. & echo == ^| Press any key to proceed to %DefaultServer% Server
+   echo. & echo == ^| Please re-run this batch to make the settings take effect.
-   goto %DefaultServer% ) 
+   echo == ^| Please re-run the "alas.bat" to make the settings take effect.
-   echo == ^| Press any key to proceed
+   goto PleaseRerun
-   pause > NUL
-   goto MENU
 )
-echo. & echo == ^| Please re-run this batch to make the settings take effect.
-echo == ^| Please re-run the "alas.bat" to make the settings take effect.
-goto PleaseRerun
 
 
 :update_toolkit
@@ -882,23 +875,36 @@ goto :eof
 :CheckBsBeta
 call :process_checker
 if "%RealtimeMode%"=="disable" ( goto AdbConnect )
-for /f skip^=1^ tokens^=17^ delims^=^" %%a in ('tasklist /fi "imagename eq bluestacks.exe" /fo:csv /v /fi "status ne NOT RESPONDING"') do ( set WINDOW=%%a )
+if Not "%DefaultBluestacksInstance%"=="unknown" ( goto CheckBsBeta2)
-rem set WINDOW=%WINDOW:"=%
+echo =======================================================================================================================
-set WINDOW=%WINDOW: =%
+echo == ^| Please input which instance of your Bluestacks Hyper-V Beta you will use
-if not "%WINDOW%"=="BlueStacks" (
+echo == ^| if you have only one Bluestacks Hyper-V Beta instance type 0 or press Enter
-   set WINDOW=%WINDOW:~10,1%
+echo == ^| the first instance will always be 0, and the subsequent ones will follow the numerical order
-   echo == BlueStacks instance %WINDOW% detected
+echo =======================================================================================================================
-) else (
+set DefaultBluestacksInstance=0
-   echo == Bluestacks instance 1 detected
+set /p DefaultBluestacksInstance= Please input the instance of your Bluestacks Hyper-V Beta
-)
+call command\Config.bat DefaultBluestacksInstance %DefaultBluestacksInstance%
-if "%WINDOW%"=="BlueStacks" (
+rem if /i "%DefaultBluestacksInstance%"=="C" ( goto Emulator_Setup )
-   set folderName=Android 
+echo =======================================================================================================================
-   ) else ( 
+rem for /f skip^=1^ tokens^=17^ delims^=^" %%a in ('tasklist /fi "imagename eq bluestacks.exe" /fo:csv /v /fi "status ne NOT RESPONDING"') do ( set WINDOW=%%a )
-      set folderName=Android_%WINDOW% 
+rem rem set WINDOW=%WINDOW:"=%
-      )
+rem set WINDOW=%WINDOW: =%
+rem if not "%WINDOW%"=="BlueStacks" (
+rem    set WINDOW=%WINDOW:~10,1%
+rem    echo == BlueStacks instance %WINDOW% detected
+rem ) else (
+rem    echo == Bluestacks instance 1 detected
+rem )
+rem if "%WINDOW%"=="BlueStacks" (
+rem    set folderName=Android 
+rem    ) else ( 
+rem       set folderName=Android_%WINDOW% 
+rem       )
+:CheckBsBeta2
+if "%DefaultBluestacksInstance%"=="0" ( set folderName=Android ) else ( set folderName=Android_%DefaultBluestacksInstance% )
 set HYPERVREG=HKEY_LOCAL_MACHINE\SOFTWARE\BlueStacks_bgp64_hyperv\Guests\%folderName%\Config
 set HYPERVREG=%HYPERVREG: =%
-echo == Connecting with realtime mode...
+echo == ^| Connecting with realtime mode...
 
 for /f "tokens=3" %%a in ('reg query %HYPERVREG% /v BstAdbPort') do (set /a port = %%a)
 set SerialRealtime=127.0.0.1:%port%
@@ -906,7 +912,7 @@ echo ===========================================================================
 if "%KillServer%"=="enable" (
    %adbBin% kill-server > nul 2>&1
    )
-echo == connecting at %SerialRealtime%
+echo == ^| connecting at %SerialRealtime% in Bluestacks instance: %DefaultBluestacksInstance%
 %adbBin% connect %SerialRealtime% > nul
 if "%FirstRun%"=="yes" (
    call command\Config.bat Serial %SerialRealtime%
@@ -918,12 +924,12 @@ if "%FirstRun%"=="yes" (
    call command\Config.bat Serial %SerialRealtime%
 )
 echo =======================================================================================================================
-echo == Old Serial:      %SerialAlas%
+echo == ^| Old Serial:      %SerialAlas%
-echo == New Serial:      %SerialRealtime%
+echo == ^| New Serial:      %SerialRealtime%
 echo =======================================================================================================================
 %pyBin% -m uiautomator2 init
 echo =======================================================================================================================
-echo == The connection was Successful on SERIAL: %SerialRealtime%
+echo == ^| The connection was Successful on SERIAL: %SerialRealtime%
 goto :eof
 
 rem ================= FUNCTIONS =================
@@ -1027,7 +1033,7 @@ if %LAST_LOCAL_GIT% == %sha% (
    echo == ^| Current Local Branch:   ^| %BRANCH%
    echo =======================================================================================================================
    echo. && echo == ^| Deleting older .PNG under Log folder, it may take while, it depends on the amount of files you have...
-   forfiles /P %logFolder% /S /M *.png /D -3 /C "cmd /c del @PATH" 2>nul
+   forfiles /P %logFolder% /S /M *.png /D -3 /C "cmd /c del @PATH" 2>nul && forfiles /P %pipLogFolder% /S /M *.log /D -7 /C "cmd /c del @PATH" 2>nul
    echo == Your ALAS is updated, Press any to continue or wait...
    timeout /t 5 >nul
    goto :eof

command/Config.bat

@@ -31,6 +31,7 @@ if NOT exist %cfg_Deploy% (
     echo NetTest = disable
     echo KeepLocalChanges = disable
     echo RealtimeMode = disable
+    echo DefaultBluestacksInstance = unknown
     echo AdbConnect = enable
     echo AdbKillServer = enable
     echo Serial = %SerialDeploy%
@@ -156,6 +157,15 @@ for /f "delims=" %%i in (%cfg_Deploy%.bak) do (
 )
 goto :eof
 
+
+:Config_DefaultBluestacksInstance
+for /f "delims=" %%i in (%cfg_Deploy%.bak) do (
+    set "cfg_Content=%%i"
+    echo %%i | findstr "DefaultBluestacksInstance" >NUL && ( set "cfg_Content=DefaultBluestacksInstance = %DefaultBluestacksInstance%" )
+    echo !cfg_Content!>>%cfg_Deploy%
+)
+goto :eof
+
 :Config_KeepLocalChanges
 for /f "delims=" %%i in (%cfg_Deploy%.bak) do (
     set "cfg_Temp=%%i"

command/Get.bat

@@ -52,6 +52,9 @@ if exist config\deploy.ini ( goto CheckFields )
     for /f "tokens=3 delims= " %%i in ('findstr /i "IsUsingGit" config\deploy.ini') do ( set "IsUsingGit=%%i" )
     for /f "tokens=3 delims= " %%i in ('findstr /i "KeepLocalChanges" config\deploy.ini') do ( set "KeepLocalChanges=%%i" )
     for /f "tokens=3 delims= " %%i in ('findstr /i "RealtimeMode" config\deploy.ini') do ( set "RealtimeMode=%%i" )
+    findstr /i "DefaultBluestacksInstance" config\deploy.ini>nul
+    if "%errorlevel%" == "1" ( ( echo DefaultBluestacksInstance = unknown)>>config\deploy.ini )
+    for /f "tokens=3 delims= " %%i in ('findstr /i "DefaultBluestacksInstance" config\deploy.ini') do ( set "DefaultBluestacksInstance=%%i" )
     for /f "tokens=3 delims= " %%i in ('findstr /i "Branch" config\deploy.ini') do ( set "Branch=%%i" )
     for /f "tokens=3 delims= " %%i in ('findstr /i "AdbConnect" config\deploy.ini') do ( set "AdbConnect=%%i" )
     for /f "tokens=3 delims= " %%i in ('findstr /i "Serial" config\deploy.ini') do ( set "SerialDeploy=%%i" )

module/campaign/campaign_base.py

@@ -141,7 +141,7 @@ class CampaignBase(CampaignUI, Map, AutoSearchCombat):
                     self.auto_search_execute_a_battle()
             except CampaignEnd:
                 logger.hr('Campaign end')
-                self.device.send_notification('AzurLaneAutoScript', 'Campaign end')
+                self.device.send_notification('AzurLaneAutoScript', 'Map cleared')
                 return True
 
         # Exception

module/handler/login.py

@@ -86,6 +86,7 @@ class LoginHandler(Combat):
                 continue
 
         logger.warning('Login failed more than 3')
+        self.device.send_notification('AzurLaneAutoScript', 'Login failed more than 3')
         raise ScriptError('Login failed more than 3')
 
     def app_restart(self):
@@ -127,6 +128,7 @@ class LoginHandler(Combat):
     def handle_game_stuck(self):
         logger.warning(f'{self.config.PACKAGE_NAME} will be restart in 10 seconds')
         logger.warning('If you are playing by hand, please stop Alas')
+        self.device.send_notification('AzurLaneAutoScript', 'Game stucked, will be restart in 10 seconds')
         self.device.sleep(10)
 
         self.app_restart()

module/map/fleet.py

@@ -269,6 +269,7 @@ class Fleet(Camera, AmbushHandler):
                     continue
 
                 if self.handle_walk_out_of_step():
+                    self.device.send_notification('AzurLaneAutoScript', 'Walk out of step error, please check GUI.')
                     raise MapWalkError('walk_out_of_step')
 
                 # Arrive