Merge branch 'master' into server

.gitignore

@@ -80,6 +80,7 @@
 .vscode
 core*
 /bak/
+/.vs
 /bug.txt
 /output
 /temp
@@ -90,3 +91,6 @@ core*
 /*.bat
 /*.sh
 /*.sql
+/patch.exe.manifest
+/patch.exe
+/diff.exe

gframe/drawing.cpp

@@ -984,7 +984,7 @@ void Game::DrawSpec() {
 			break;
 		}
 		}
-		if (auto_watch_mode && showcardcode < 8 && showcardcode > 0) {
+		if (auto_watch_mode && showcardp < 8 && showcardp > 0 && showcardcode > 100) {
 			mainGame->ShowCardInfo(showcardcode);
 		}
 	}

gframe/duelclient.cpp

@@ -3033,8 +3033,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		}
 		if (auto_watch_mode) {
 			int code = mainGame->dField.chains[ct - 1].chain_card->code;
-			if (code > 0)
-				mainGame->ShowCardInfo(code);
+			mainGame->ShowCardInfo(code);
 		}
 		mainGame->dField.last_chain = false;
 		return true;
@@ -3106,7 +3105,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			int s = BufferIO::ReadInt8(pbuf);
 			/*int ss = */BufferIO::ReadInt8(pbuf);
 			ClientCard* pcard = mainGame->dField.GetCard(c, l, s);
-			if (auto_watch_mode && i == 0 && pcard->code > 0 ) {
+			if (auto_watch_mode && i == 0) {
 				mainGame->ShowCardInfo(pcard->code);
 			}
 			pcard->is_highlighting = true;

gframe/replay_mode.cpp

@@ -238,7 +238,13 @@ void ReplayMode::EndDuel() {
 			mainGame->HideElement(mainGame->wCardSelect);
 		mainGame->PopupElement(mainGame->wMessage);
 		mainGame->gMutex.unlock();
-		mainGame->actionSignal.Wait();
+		if(auto_watch_mode) {
+			mainGame->actionSignal.Wait(2000);
+			mainGame->device->closeDevice();
+		}
+		else {
+			mainGame->actionSignal.Wait();
+		}
 		mainGame->gMutex.lock();
 		mainGame->dInfo.isStarted = false;
 		mainGame->dInfo.isFinished = true;
@@ -315,7 +321,13 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
 			mainGame->PopupElement(mainGame->wMessage);
 			mainGame->gMutex.unlock();
 			mainGame->actionSignal.Reset();
-			mainGame->actionSignal.Wait();
+			if (auto_watch_mode){
+				mainGame->actionSignal.Wait(2000);
+				mainGame->device->closeDevice();
+			}
+			else{
+				mainGame->actionSignal.Wait();
+			}
 			return false;
 		}
 		case MSG_HINT: {

ocgcore @ 4844d300

-Subproject commit da0cd22bbb58d6a871a3f8517eaf91b0bd4fbff5
+Subproject commit 4844d3009f70464ce1af25dd714daf4354139083

script @ 1b6c41a4

-Subproject commit de4b33a6ce6588602ad6c0d3faed6cf4ac3ed2fb
+Subproject commit 1b6c41a45c45607d676c9c81f343711b8c5787ed