Merge pull request #199 from shangfengh/new

fix: 🐛 fix the conflict of EnumType

logic/Server/GameServer.cs

@@ -211,7 +211,7 @@ namespace Server
         {
             MessageOfAll msg = new MessageOfAll();
             //msg.GameTime
-            msg.SubjectLeft = GameData.numOfGeneratorRequiredForRepair - (int)game.GameMap.NumOfRepairedGenerators;
+            msg.SubjectFinished = (int)game.GameMap.NumOfRepairedGenerators;
             //msg.StudentGraduated
             //msg.StudentQuited
             msg.StudentScore = 0;

logic/Server/Server.csproj

@@ -7,6 +7,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Properties\EnumType.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="FrameRateTask" Version="1.2.0" />