|
6 | 6 | #AutoIt3Wrapper_UseUpx=y |
7 | 7 | #AutoIt3Wrapper_Res_Comment=Made by Fliegerfaust, Edited for MultiBotRun by ProMac |
8 | 8 | #AutoIt3Wrapper_Res_Description=SelectMultiBotRun for MultiBotRun |
9 | | -#AutoIt3Wrapper_Res_Fileversion=1.0.8.0 |
| 9 | +#AutoIt3Wrapper_Res_Fileversion=1.0.9.0 |
10 | 10 | #AutoIt3Wrapper_Res_LegalCopyright=Fliegerfaust, edited by ProMac |
11 | 11 | #AutoIt3Wrapper_Run_Tidy=y |
12 | 12 | #EndRegion ;**** Directives created by AutoIt3Wrapper_GUI **** |
|
47 | 47 |
|
48 | 48 | Global $g_sBotFile = "multibot.run.exe" |
49 | 49 | Global $g_sBotFileAU3 = "multibot.run.au3" |
50 | | -Global $g_sVersion = "1.0.8" |
| 50 | +Global $g_sVersion = "1.0.9" |
51 | 51 | Global $g_sDirProfiles = @MyDocumentsDir & "\Profiles.ini" |
52 | 52 | Global $g_hGui_Main, $g_hGui_Profile, $g_hGui_Emulator, $g_hGui_Instance, $g_hGui_Dir, $g_hGui_Parameter, $g_hGUI_AutoStart, $g_hGUI_Edit, $g_hListview_Main, $g_hLst_AutoStart, $g_hLog, $g_hProgress, $g_hBtn_Shortcut, $g_hBtn_AutoStart, $g_hContext_Main |
53 | 53 | Global $g_hListview_Instances, $g_hLblUpdateAvailable |
@@ -185,25 +185,31 @@ Func GUI_Main() |
185 | 185 |
|
186 | 186 | _GUICtrlStatusBar_SetText($g_hLog, "Creating new Setup") |
187 | 187 | WinSetOnTop($g_hGui_Main, "", $WINDOWS_ONTOP) |
| 188 | + DebugLog("Creating new Setup") |
188 | 189 |
|
189 | 190 | Do |
190 | 191 | GUISetState(@SW_DISABLE, $g_hGui_Main) |
191 | 192 | $g_aGuiPos_Main = WinGetPos($g_hGui_Main) |
192 | 193 | _GUICtrlStatusBar_SetText($g_hLog, "Select Profile") |
| 194 | + DebugLog("=== GUI_Profile ===") |
193 | 195 | $bSetupStopped = GUI_Profile() |
194 | 196 | If $bSetupStopped Then ExitLoop |
195 | 197 | GUICtrlSetData($g_hProgress, 20) |
| 198 | + DebugLog("=== GUI_Emulator ===") |
196 | 199 | $bSetupStopped = GUI_Emulator() |
197 | 200 | If $bSetupStopped Then ExitLoop |
198 | 201 | GUICtrlSetData($g_hProgress, 40) |
| 202 | + DebugLog("=== GUI_Instance ===") |
199 | 203 | $bSetupStopped = GUI_Instance() |
200 | 204 | If $bSetupStopped Then ExitLoop |
201 | 205 | GUICtrlSetData($g_hProgress, 60) |
| 206 | + DebugLog("=== GUI_DIR ===") |
202 | 207 | $bSetupStopped = GUI_DIR() |
203 | 208 | If $bSetupStopped Then ExitLoop |
204 | 209 | GUICtrlSetData($g_hProgress, 80) |
205 | 210 | $bSetupStopped = GUI_PARAMETER() |
206 | 211 | If $bSetupStopped Then ExitLoop |
| 212 | + DebugLog("=== Setup Created ===") |
207 | 213 | _GUICtrlStatusBar_SetText($g_hLog, "Setup Created!") |
208 | 214 | Until 1 |
209 | 215 |
|
@@ -309,7 +315,7 @@ Func GUI_Instance() |
309 | 315 | GUISetState(@SW_HIDE, $g_hGui_Instance) |
310 | 316 |
|
311 | 317 | Switch $g_sSelectedEmulator |
312 | | - Case "BlueStacks", "BlueStacks5" |
| 318 | + Case "BlueStacks" |
313 | 319 | Return |
314 | 320 | Case "Bluestacks5" |
315 | 321 | GUISetState(@SW_SHOW, $g_hGui_Instance) |
@@ -1040,9 +1046,10 @@ EndFunc ;==>GetNoxRtPath |
1040 | 1046 |
|
1041 | 1047 | Func GetBlueStacksPath() |
1042 | 1048 | $sBlueStacksPath = RegRead($HKLM & "\SOFTWARE\BlueStacks_nxt", "InstallDir") |
| 1049 | + DebugLog(" $sBlueStacksPath ?" & $sBlueStacksPath) |
1043 | 1050 | $sPlusMode = RegRead($HKLM & "\SOFTWARE\BlueStacks_nxt\", "Engine") = "plus" |
1044 | | - $sFrontend = "HD-Frontend.exe" |
1045 | | - If $sPlusMode Then $sFrontend = "HD-Plus-Frontend.exe" |
| 1051 | + $sFrontend = "HD-Player.exe" |
| 1052 | + If $sPlusMode Then $sFrontend = "HD-Plus-Player.exe" |
1046 | 1053 | If $sBlueStacksPath = "" And FileExists(@ProgramFilesDir & "\BlueStacks_nxt\" & $sFrontend) = 1 Then |
1047 | 1054 | $sBlueStacksPath = @ProgramFilesDir & "\BlueStacks_nxt\" |
1048 | 1055 | EndIf |
@@ -1091,8 +1098,8 @@ Func IsAndroidInstalled($sAndroid) |
1091 | 1098 | DebugLog("BlueStacks") |
1092 | 1099 | $sPath = GetBlueStacksPath() |
1093 | 1100 | $bPlusMode = RegRead($HKLM & "\SOFTWARE\BlueStacks_nxt\", "Engine") = "plus" |
1094 | | - $sFile = "HD-Frontend.exe" |
1095 | | - If $bPlusMode Then $sFile = "HD-Plus-Frontend.exe" |
| 1101 | + $sFile = "HD-Player.exe" |
| 1102 | + If $bPlusMode Then $sFile = "HD-Plus-Player.exe" |
1096 | 1103 | Case "iTools" |
1097 | 1104 | DebugLog("iTools") |
1098 | 1105 | $sPath = GetiToolsPath() |
|
0 commit comments