Merge branch 'master' of github.com:CodeInDreams/A9-Script

CodeInDreams · Jun 20, 2019 · ec17bfd · ec17bfd
2 parents 526a7f3 + ca20d77
commit ec17bfd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/source/A9.ahk b/source/A9.ahk
@@ -96,7 +96,7 @@ REQUEST_Y = 871
 REQUEST_COLOR = 0xFFFFFF
 ; 多人包
 MP_PACK_X = 1233
-MP_PACK_Y = 837
+MP_PACK_Y = 786
 MP_PACK_COLOR = 0x01D9FC
 ; 氮气
 NITRO_X = 1830

diff --git a/source/NEMU.ahk b/source/NEMU.ahk
@@ -18,18 +18,21 @@ APP_OPEN_Y = 217 ; A9图标Y坐标
 
 CloseApp() ; 关闭A9
 {
-	global EMU_AHK_CLASS, APP_CLOSE_X, APP_CLOSE_Y, DELAY_VERY_SHORT, DELAY_MIDDLE
+	global EMU_AHK_CLASS, APP_CLOSE_X, APP_CLOSE_Y, DELAY_SHORT, DELAY_MIDDLE
 	WinActivate ahk_class %EMU_AHK_CLASS%
-	Sleep DELAY_VERY_SHORT
+	Sleep DELAY_SHORT
+	Click %APP_CLOSE_X%, %APP_CLOSE_Y%
 	Click %APP_CLOSE_X%, %APP_CLOSE_Y%
 	Sleep DELAY_MIDDLE
 }
 
 RunApp() ; 启动A9
 {
-	global EMU_AHK_CLASS, APP_INDEX, EMU_HOME_X, EMU_HOME_Y, APP_OPEN_X, APP_OPEN_Y, DELAY_MIDDLE, DELAY_SUPER_LONG
+	global EMU_AHK_CLASS, APP_INDEX, EMU_HOME_X, EMU_HOME_Y, APP_OPEN_X, APP_OPEN_Y, DELAY_MIDDLE, DELAY_LONG, DELAY_SUPER_LONG
 	WinActivate ahk_class %EMU_AHK_CLASS%
+	Sleep DELAY_MIDDLE
 	if APP_INDEX > 1
 		Click %EMU_HOME_X%, %EMU_HOME_Y%
-	RandomClick(APP_OPEN_X, APP_OPEN_Y, DELAY_LONG, DELAY_SUPER_LONG)
+	RandomClick(APP_OPEN_X, APP_OPEN_Y, DELAY_LONG, DELAY_MIDDLE)
+	RandomClick(APP_OPEN_X, APP_OPEN_Y, , DELAY_SUPER_LONG)
 }