Merge pull request #414 from eesast/dev

fix the bug that the map will not be refreshed at the beginning of a game

.github/workflows/upload_COS.yml

@@ -113,6 +113,9 @@ jobs:
         name: my-artifact
         path: ./THUAI6
 
+    - name: Remove ReadMe.md
+      run: rm ./docs/README.md
+
     - name: Markdown to PDF and HTML
       uses: BaileyJM02/markdown-to-pdf@v1.2.0
       with:
@@ -145,12 +148,14 @@ jobs:
         rm ./THUAI6/win/win64/WindowsBase.dll
         rm ./THUAI6/win/win64/Debug/grpc_csharp_ext.x64.dll
         rm ./THUAI6/win/win64/grpc_csharp_ext.x64.dll
-
         rm -r ./THUAI6/win/CAPI/cpp/grpc 
+        rm -r ./THUAI6/win/CAPI/cpp/spdlog
         rm -r ./THUAI6/win/CAPI/cpp/tclap
         rm -r ./THUAI6/linux/CAPI/cpp/grpc 
+        rm -r ./THUAI6/linux/CAPI/cpp/spdlog
         rm -r ./THUAI6/linux/CAPI/cpp/tclap
         rm -r ./THUAI6/osx/CAPI/cpp/grpc 
+        rm -r ./THUAI6/osx/CAPI/cpp/spdlog
         rm -r ./THUAI6/osx/CAPI/cpp/tclap
         
         rm ./THUAI6/linux/linux64/System.*.dll
@@ -159,6 +164,8 @@ jobs:
         rm ./THUAI6/osx/osx64/Debug/System.*.dll
         rm ./THUAI6/win/win64/System.*.dll
         rm ./THUAI6/win/win64/Debug/System.*.dll
+        rm ./THUAI6/linux/linux64/*.so
+        rm ./THUAI6/linux/linux64/Debug/*.so
     
     - name: Upload COS
       uses: zkqiang/tencent-cos-action@v0.1.0

dependency/proto/Protos.csproj

@@ -14,8 +14,8 @@
   </ItemGroup>-->
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.22.1" />
-    <PackageReference Include="Google.Protobuf.Tools" Version="3.22.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.22.3" />
+    <PackageReference Include="Google.Protobuf.Tools" Version="3.22.3" />
     <PackageReference Include="Grpc" Version="2.46.6" />
     <PackageReference Include="Grpc.Core" Version="2.46.6" />
     <PackageReference Include="Grpc.Tools" Version="2.53.0">

logic/Client/Client.csproj

@@ -19,7 +19,7 @@
   <ItemGroup>
 	<PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="FrameRateTask" Version="1.2.0" />
-    <PackageReference Include="Google.Protobuf" Version="3.22.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.22.3" />
     <PackageReference Include="Grpc" Version="2.46.6" />
     <PackageReference Include="Grpc.Core" Version="2.46.6" />
   </ItemGroup>

logic/Client/MainWindow.xaml.cs

@@ -300,6 +300,24 @@ namespace Client
             }
         }
 
+        private void ZoomMapAtFirst()
+        {
+            for (int i = 0; i < 50; i++)
+            {
+                for (int j = 0; j < 50; j++)
+                {
+                    if (mapPatches[i, j] != null)
+                    {
+                        mapPatches[i, j].Width = UpperLayerOfMap.ActualWidth / 50;
+                        mapPatches[i, j].Height = UpperLayerOfMap.ActualHeight / 50;
+                        mapPatches[i, j].HorizontalAlignment = HorizontalAlignment.Left;
+                        mapPatches[i, j].VerticalAlignment = VerticalAlignment.Top;
+                        mapPatches[i, j].Margin = new Thickness(UpperLayerOfMap.ActualWidth / 50 * j, UpperLayerOfMap.ActualHeight / 50 * i, 0, 0);
+                    }
+                }
+            }
+        }
+
         private void DrawMap()
         {
             for (int i = 0; i < defaultMap.GetLength(0); i++)
@@ -750,7 +768,10 @@ namespace Client
                             StatusBarsOfCircumstance.SetValue(data, gateOpened, isEmergencyDrawed, isEmergencyOpened, playerID, isPlaybackMode);
                         }
                         if (!hasDrawed && mapFlag)
+                        {
                             DrawMap();
+                            ZoomMapAtFirst();
+                        }
                         foreach (var data in listOfHuman)
                         {
                             if (data.StudentType != StudentType.Robot)

logic/ClientTest/ClientTest.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.22.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.22.3" />
     <PackageReference Include="Grpc" Version="2.46.6" />
     <PackageReference Include="Grpc.Core" Version="2.46.6" />
   </ItemGroup>

logic/Preparation/Preparation.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.22.1" />
+		<PackageReference Include="Google.Protobuf" Version="3.22.3" />
 	</ItemGroup>
 
 	<ItemGroup>

logic/Server/Server.csproj

@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="FrameRateTask" Version="1.2.0" />
-    <PackageReference Include="Google.Protobuf" Version="3.22.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.22.3" />
     <PackageReference Include="Grpc" Version="2.46.6" />
     <PackageReference Include="Grpc.Core" Version="2.46.6" />
     <PackageReference Include="Grpc.Tools" Version="2.53.0">

playback/Playback/Playback.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.22.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.22.3" />
   </ItemGroup>
 
   <ItemGroup>