调整位置

GameAssist/GameAssist/Assist.cpp

@@ -626,9 +626,9 @@ namespace GameGlobal
 	{
 		TCHAR szName[MAX_PATH] = { 0 };
 		if ( lpName == NULL || lpName[0] == '\0')
-			_stprintf_s(szName, _T("%s%p.bmp"), GameGlobal::g_szTempDir, hWnd);
+			_stprintf_s(szName, _T("%s%p.bmp"), GameGlobal::g_szTempDir, hWnd == NULL ? 0 : hWnd);
 		else
-		_stprintf_s(szName, _T("%s%p-%s.bmp"), GameGlobal::g_szTempDir, hWnd, lpName);
+			_stprintf_s(szName, _T("%s%p-%s.bmp"), GameGlobal::g_szTempDir, hWnd == NULL ? 0 : hWnd, lpName);
 
 		return std::string(szName);
 	}

GameAssist/GameAssist/CAction.cpp

@@ -230,7 +230,7 @@ SRAND(80,120);
 	{
 		CRect rc;
 		SRAND(100, 200);
-		if (ImgAssist::IsMatchIcon(m_hGameWnd, GameGlobal::g_strAppdir + _T("img\\活动\\镜妖\\非战斗中.bmp"), { 630, 25, 805, 45 }, rc)) {
+		if (ImgAssist::IsMatchIcon(m_hGameWnd, GameGlobal::g_strAppdir + _T("img\\活动\\镜妖\\非战斗中.bmp"), { 600, 0, 800, 45 }, rc)) {
 			GameGlobal::DebugLog(_T("Battle：非战斗中"));
 			return false;
 		}
@@ -290,7 +290,7 @@ SRAND(80,120);
 	{
 		CRect rc;
 		BOOL bIsAttack = FALSE;
-		if (ImgAssist::IsMatchIcon(m_hGameWnd, GameGlobal::g_strAppdir + _T("img\\我方攻击2.bmp"), { 720, 85, 806, 120 }, rc)) {
+		if (ImgAssist::IsMatchIcon(m_hGameWnd, GameGlobal::g_strAppdir + _T("img\\我方攻击2.bmp"), { 700, 50, 800, 120 }, rc)) {
 			GameGlobal::DebugLog(_T("IsWattingAttack：我方攻击中……"));
 			bIsAttack = TRUE;
 		}

GameAssist/GameAssist/GameAssistDlg.cpp

@@ -385,10 +385,10 @@ void CGameAssistDlg::OnBnClickedButton2()  //
 	}
 	else
 	{
-		CString strImg;
-		strImg = CTime::GetCurrentTime().Format("%H%M%S-Game.bmp");
-		//ImgAssist::CaptureGameWnd(hWnd, strImg.GetString());
-		ImgAssist::CaptureWnd(hWnd);
+		std::string strImg = GameGlobal::g_szTempDir;
+		strImg.append(_T("½Øͼ½á¹û.bmp"));
+		cv::Mat srcImg = ImgAssist::CaptureWnd(hWnd);
+		cv::imwrite(strImg.c_str(), srcImg);
 	}
 }
 

GameAssist/GameAssist/ImgAssist.cpp

@@ -212,8 +212,8 @@ namespace ImgAssist
 			delete[]pImgData;
 			pImgData = NULL;
 #ifdef DEBUG
-			cv::imwrite("E:\\3.bmp", src);	// 后缀不一样，得到的大小也不一样;
-			cv::imwrite("E:\\3.jpg", src);
+			cv::imwrite(".\\temp\\截图.jpg", src);	// 后缀不一样，得到的大小也不一样;
+			//cv::imwrite("E:\\3.jpg", src);
 #endif
 			return src;
 		}
@@ -250,7 +250,7 @@ namespace ImgAssist
 		if (img.data == NULL)
 			return cv::Mat();
 
-		return cv::Mat();
+		return img;
 	}
 
 	BOOL SetImgThreshold(cv::Mat& srcImg, cv::Mat& thresholdImg, long nThresholdVal, long nMaxThresholdVal, int type)
@@ -330,7 +330,9 @@ namespace ImgAssist
 		cv::Rect roi = cv::Rect(lv_nMaxLoc.x, lv_nMaxLoc.y, cvTempImg.cols, cvTempImg.rows);
 		cv::Mat roiImg = cvSrcImg(roi);
 #ifdef DEBUG
-		cv::imwrite(GameGlobal::BuildImgPath(hWnd, _T("match")), roiImg);
+		TCHAR szName[MAX_PATH] = { 0 };
+		_stprintf_s(szName, _T("%s-match.bmp"), GameGlobal::g_szTempDir);
+		cv::imwrite(szName, roiImg);
 #endif
 		rc.left = lv_nMaxLoc.x - GameGlobal::frameWidth;
 		rc.top = lv_nMaxLoc.y - GameGlobal::titleBarHeight;
@@ -369,7 +371,7 @@ namespace ImgAssist
 
 		// 指定源图片区域来做模块比较,提高效率;
 		cv::Mat imgROI = cvSrcImg(cv::Rect(srcRect.left, srcRect.top, srcRect.right - srcRect.left, srcRect.bottom - srcRect.top));
-		//cv::imwrite(GameGlobal::BuildImgPath(hWnd, _T("roi")), imgROI);
+		cv::imwrite(GameGlobal::BuildImgPath(NULL, _T("roi")), imgROI);
 		/*
 		m_ImgROI = srcImg([&]()-> cv::Rect {
 			// 注意是x,y,w=cols,h=rows
@@ -392,7 +394,9 @@ namespace ImgAssist
 		cv::Rect roi = cv::Rect(lv_nMaxLoc.x, lv_nMaxLoc.y, cvTempImg.cols, cvTempImg.rows);
 		cv::Mat roiImg = imgROI(roi);
 #ifdef DEBUG
-		cv::imwrite(GameGlobal::BuildImgPath(hWnd, _T("match")), roiImg);
+		TCHAR szName[MAX_PATH] = { 0 };
+		_stprintf_s(szName, _T("%s-match.bmp"), GameGlobal::g_szTempDir);
+		cv::imwrite(szName, roiImg);
 #endif
 		matchRect.left = srcRect.left + lv_nMaxLoc.x - GameGlobal::frameWidth;
 		matchRect.top = srcRect.top + lv_nMaxLoc.y - GameGlobal::titleBarHeight;