初步完成职业挑战

GameAssist/GameAssist/GameAssistDlg.cpp

@@ -717,31 +717,27 @@ void BattleYS(HWND hWnd, const char* lpszJN)
 		// 注：有的人物技能太多，导致会有滚动条：这是有难点;
 		BOOL bRet = FindJNShortCut(lpszJN, KeyValue, SkillTime);
 		DebugLog("快捷键值=%ld", KeyValue);
-		if (KeyValue != -1)
-		{
-			// 快捷键;
-			GAssist::SendKey(hWnd, KeyValue);
-			SRAND(260, 380);
-			// 单击指定位置;
-			GAssist::MouseClick(hWnd, 280, 150);
-			// 将鼠标移动到指定位置;
-			POINT ptDest = { 625, 28 }; // 左上角;
-			GAssist::MouseMove(hWnd, ptDest);
 
-			for (int i = 0; i < 5; i++)
+		// 快捷键;
+		GAssist::SendKey(hWnd, KeyValue);
+		SRAND(350, 650);
+		// 单击指定位置;
+		GAssist::MouseClick(hWnd, 230, 170);
+		SRAND(260, 380);
+		// 将鼠标移动到指定位置;
+		POINT ptDest = { 625, 28 }; // 左上角;
+		GAssist::MouseMove(hWnd, ptDest);
+		while (IsBattle(hWnd))
+		{
+			// 判断是否我方攻击;
+			if (IsWattingAttack(hWnd, 1))
 			{
-				// 判断是否我方攻击;
-				while (!IsWattingAttack(hWnd, 1))
-				{
-					Sleep(RAND(900, 1200));
-				}
-				SRAND(SkillTime, SkillTime + 200);
-				//GAssist::SendKey(hWnd, VK_A, FALSE, TRUE);
+				GAssist::SendKey(hWnd, VK_A, FALSE, TRUE);
 			}
+			SRAND(500, 9000);
 		}
 	}
 
-	if (bBattle) SRAND(SkillTime + 1500, SkillTime + 1600); // 等待切回非战斗;
 	// 右键退出;
 	GAssist::MouseRClick(hWnd);
 }
@@ -780,27 +776,26 @@ void BattleOthers(HWND hWnd, const char* lpszName, const char * lpszSkillName)
 		// 将鼠标移动到指定位置;
 		POINT ptDest = { 625, 28 }; // 左上角;
 		GAssist::MouseMove(hWnd, ptDest);
-		for (int i = 0; i < 6; i++)
+		while (IsBattle(hWnd))
 		{
 			// 判断是否我方攻击;
-			while (!IsWattingAttack(hWnd, 1))
+			if (IsWattingAttack(hWnd, 1))
 			{
-				Sleep(RAND(1000, 1500));
+				GAssist::SendKey(hWnd, VK_A, FALSE, TRUE);
 			}
 
-			GAssist::SendKey(hWnd, VK_A, FALSE, TRUE);
-			//SRAND(SkillTime, SkillTime + 150);
+			SRAND(500, 750);
 		}
 	}
 
-	if (bBattle) SRAND(SkillTime + 1500, SkillTime + 1600); // 等待切回非战斗;
 	// 右键退出;
 	if ( _tcsicmp(lpszName, _T("魂武独侠")) )
 		GAssist::MouseRClick(hWnd);
 	else
 	{
 		// 回到应天府;
-		//ClickDlgSetup(hWnd, _T(""));
+		GAssist::MouseMoveEx(hWnd, { rc.left, rc.top }, { rc.right + rand() % 10, rc.bottom + rand() % 10 });
+		ClickDlgSetup(hWnd, _T("\\img\\gdd\\送我回应天府.bmp"));
 	}
 }
 
@@ -1173,12 +1168,25 @@ void CGameAssistDlg::OnBnClickedButton2()  //
 
 #if 1
 	HWND hProWnd = GAssist::GetProcessMainWnd();
+
+#if 1
+	// 快捷键;
+	GAssist::SendKey(hProWnd, VK_F3);
+	SRAND(350, 650);
+	// 单击指定位置;
+	GAssist::MouseClick(hProWnd, 230, 170);
+	SRAND(260, 380);
+	// 将鼠标移动到指定位置;
+	POINT ptDest = { 625, 28 }; // 左上角;
+	GAssist::MouseMove(hProWnd, ptDest);
+#else
 	//IsWattingAttack(hProWnd, 1);
 	//BattleYS(hProWnd, "缚神诀");
 	char szName[10][32] = { "术士独侠","道士独侠","武师独侠","浪子独侠",
 		"剑客独侠","弓手独侠","禁卫独侠","墨者独侠","巫煞独侠","魂武独侠" };
 
 	BattleOthers(hProWnd, szName[9], _T("缚神诀"));
+#endif
 //	auto FindJNShortCut = [](LPCTSTR lpSkillName)->int {
 //		// 读取文件：jnmap.bin
 //		// 格式：技能=快捷键的键值;