初步实现方块移动后的还原

Leslie-Ke · Jul 29, 2024 · 7324537 · 7324537
1 parent 038c7a3
commit 7324537
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 7 deletions.
diff --git a/...a148a85-559e-4035-bbcb-3f04bbf4ca13.vsidx → ...ae8b93f-197e-4fdf-81b6-395c85ed6fcd.vsidx b/...a148a85-559e-4035-bbcb-3f04bbf4ca13.vsidx → ...ae8b93f-197e-4fdf-81b6-395c85ed6fcd.vsidx
diff --git a/.vs/我的消消乐/FileContentIndex/a4124648-82cd-4eda-bc78-f161512b72b8.vsidx b/.vs/我的消消乐/FileContentIndex/a4124648-82cd-4eda-bc78-f161512b72b8.vsidx
diff --git a/.vs/我的消消乐/FileContentIndex/e11f7fcf-154e-48d9-aeb4-a7290dd9829d.vsidx b/.vs/我的消消乐/FileContentIndex/e11f7fcf-154e-48d9-aeb4-a7290dd9829d.vsidx
diff --git a/.vs/我的消消乐/v17/.suo b/.vs/我的消消乐/v17/.suo
diff --git a/.vs/我的消消乐/v17/Browse.VC.db b/.vs/我的消消乐/v17/Browse.VC.db
diff --git a/.vs/我的消消乐/v17/ipch/AutoPCH/b63fb6d5f4d0e8f3/TOOLS.ipch b/.vs/我的消消乐/v17/ipch/AutoPCH/b63fb6d5f4d0e8f3/TOOLS.ipch
diff --git a/x64/Release/我的消消乐.exe b/x64/Release/我的消消乐.exe
diff --git a/x64/Release/我的消消乐.pdb b/x64/Release/我的消消乐.pdb
diff --git a/我的消消乐/main.cpp b/我的消消乐/main.cpp
@@ -37,6 +37,9 @@ struct block{
 int posX1, posY1;//第一次单击的行和列
 int posX2, posY2;//第二次单击的行和列
 
+bool isMoving;//表示当前是否在移动
+bool isSwap; //当单击两个相邻的方块后设置为true
+
 void init() {
 	//创建游戏窗口
 	initgraph(WIN_WIDHT, WIN_HEIGHT, 1);
@@ -67,6 +70,8 @@ void init() {
 	}
 
 	click = 0;
+	isMoving = false;
+	isSwap = false;
 }
 
 void updateWindow() {
@@ -121,6 +126,7 @@ void userClick() {
 			if (abs(posX2 - posX1) + abs(posY2 - posY1) == 1) {
 				exchange(posY1, posX1, posY2, posX2);
 				click = 0;
+				isSwap = true;
 				//后续音效
 			}
 			else {
@@ -134,26 +140,39 @@ void userClick() {
 }
 
 void move() {
+	isMoving = false;
 	for (int i = ROWS; i > 0; i--) {
 		for (int j = 1; j <= COLS; j++) {
 			struct block* p = &map[i][j];
+
+			int dx, dy;
 			for (int k = 0; k < 4; k++) {
 
 				int x = off_x + (p->col - 1) * (block_size + 5);
 				int y = off_y + (p->row - 1) * (block_size + 5);
 
-				int dx = p->x - x;
-				int dy = p->y - y;
+				dx = p->x - x;
+				dy = p->y - y;
 
 				if (dx) p->x -= dx / abs(dx);
 				if (dy) p->y -= dy / abs(dy);
 			}
+
+			if (dx || dy) isMoving = true;
 		}
 	}
 }
 
 void huanYuan() {
+	//发生移动后，而且这个单向移动已经结束
+	if (isSwap && !isMoving) {
+		//如果没有匹配到三个或者三个以上的方块，就设置还原
+		if (1) {//后续优化，先完成还原的基础逻辑代码
+			exchange(posY1, posX1, posY2, posX2);
+		}
 
+		isSwap = false;
+	}
 }
 int main() {
 	init();//初始化

diff --git a/我的消消乐/x64/Release/main.obj b/我的消消乐/x64/Release/main.obj
diff --git a/我的消消乐/x64/Release/vc143.pdb b/我的消消乐/x64/Release/vc143.pdb
diff --git a/我的消消乐/x64/Release/我的消消乐.iobj b/我的消消乐/x64/Release/我的消消乐.iobj
diff --git a/我的消消乐/x64/Release/我的消消乐.ipdb b/我的消消乐/x64/Release/我的消消乐.ipdb
diff --git a/我的消消乐/x64/Release/我的消消乐.log b/我的消消乐/x64/Release/我的消消乐.log
@@ -1,8 +1,8 @@
   main.cpp
-D:\vscode\我的消消乐\我的消消乐\main.cpp(54,12): warning C4244: “参数”: 从“time_t”转换到“unsigned int”，可能丢失数据
+D:\vscode\我的消消乐\我的消消乐\main.cpp(58,12): warning C4244: “参数”: 从“time_t”转换到“unsigned int”，可能丢失数据
   正在生成代码
-  1 of 18 functions ( 5.6%) were compiled, the rest were copied from previous compilation.
+  2 of 18 functions (11.1%) were compiled, the rest were copied from previous compilation.
     0 functions were new in current compilation
-    1 functions had inline decision re-evaluated but remain unchanged
+    0 functions had inline decision re-evaluated but remain unchanged
   已完成代码的生成
   我的消消乐.vcxproj -> D:\vscode\我的消消乐\x64\Release\我的消消乐.exe
diff --git a/我的消消乐/我的消消乐.vcxproj.filters b/我的消消乐/我的消消乐.vcxproj.filters
@@ -15,10 +15,10 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="tools.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="tools.cpp">
+    <ClCompile Include="main.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
   </ItemGroup>