Merge branch 'dev' of github.com:eesast/THUAI6 into dev

CAPI/API/include/AI.h

@@ -28,4 +28,4 @@ public:
     void play(IButcherAPI& api) override;
 };
 
-#endif
+#endif

CAPI/API/include/API.h

@@ -367,4 +367,4 @@ private:
     ILogic& logic;
 };
 
-#endif
+#endif

CAPI/API/include/constants.h

@@ -5,4 +5,4 @@
 namespace Constants
 {
 }
-#endif
+#endif

CAPI/API/include/logic.h

@@ -151,4 +151,4 @@ public:
     void Main(CreateAIFunc createAI, std::string IP, std::string port, bool level, std::string filename);
 };
 
-#endif
+#endif

CAPI/API/include/state.h

@@ -25,4 +25,4 @@ struct State
     std::vector<int64_t> guids;
 };
 
-#endif
+#endif

CAPI/API/include/utils.hpp

@@ -297,4 +297,4 @@ namespace THUAI62Proto
     }
 }  // namespace THUAI62Proto
 
-#endif
+#endif

CAPI/API/src/DebugAPI.cpp

@@ -308,4 +308,4 @@ void HumanDebugAPI::Play(IAI& ai)
 void ButcherDebugAPI::Play(IAI& ai)
 {
     ai.play(*this);
-}
+}

CAPI/API/src/logic.cpp

@@ -233,7 +233,7 @@ void Logic::LoadBuffer(protobuf::MessageToClient& message)
         bufferState->gamemap = Proto2THUAI6::Protobuf2THUAI6Map(message.map_message());
         if (playerType == THUAI6::PlayerType::HumanPlayer)
         {
-            for (auto item : message.human_message())
+            for (const auto& item : message.human_message())
             {
                 if (item.player_id() == playerID)
                 {
@@ -241,7 +241,7 @@ void Logic::LoadBuffer(protobuf::MessageToClient& message)
                 }
                 bufferState->humans.push_back(Proto2THUAI6::Protobuf2THUAI6Human(item));
             }
-            for (auto item : message.butcher_message())
+            for (const auto& item : message.butcher_message())
             {
                 int vr = this->bufferState->humanSelf->viewRange;
                 int deltaX = item.x() - this->bufferState->humanSelf->x;
@@ -277,7 +277,7 @@ void Logic::LoadBuffer(protobuf::MessageToClient& message)
         }
         else
         {
-            for (auto item : message.butcher_message())
+            for (const auto& item : message.butcher_message())
             {
                 if (item.player_id() == playerID)
                 {
@@ -285,7 +285,7 @@ void Logic::LoadBuffer(protobuf::MessageToClient& message)
                 }
                 bufferState->butchers.push_back(Proto2THUAI6::Protobuf2THUAI6Butcher(item));
             }
-            for (auto item : message.human_message())
+            for (const auto& item : message.human_message())
             {
                 int vr = this->bufferState->butcherSelf->viewRange;
                 int deltaX = item.x() - this->bufferState->butcherSelf->x;
@@ -319,7 +319,7 @@ void Logic::LoadBuffer(protobuf::MessageToClient& message)
                 }
             }
         }
-        for (auto item : message.prop_message())
+        for (const auto& item : message.prop_message())
             bufferState->props.push_back(Proto2THUAI6::Protobuf2THUAI6Prop(item));
         if (asynchronous)
         {

CAPI/API/src/main.cpp

@@ -83,4 +83,4 @@ std::unique_ptr<IAI> CreateAI()
 int main(int argc, char* argv[])
 {
     return THUAI6Main(argc, argv, CreateAI);
-}
+}

dependency/proto/Protos.csproj

@@ -14,7 +14,7 @@
   </ItemGroup>-->
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.21.11" />
+    <PackageReference Include="Google.Protobuf" Version="3.21.12" />
     <PackageReference Include="Google.Protobuf.Tools" Version="3.21.12" />
     <PackageReference Include="Grpc" Version="2.46.5" />
     <PackageReference Include="Grpc.Core" Version="2.46.5" />

logic/ClientTest/ClientTest.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.21.11" />
+    <PackageReference Include="Google.Protobuf" Version="3.21.12" />
     <PackageReference Include="Grpc" Version="2.46.5" />
     <PackageReference Include="Grpc.Core" Version="2.46.5" />
   </ItemGroup>

logic/Server/Server.csproj

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="FrameRateTask" Version="1.2.0" />
-    <PackageReference Include="Google.Protobuf" Version="3.21.11" />
+    <PackageReference Include="Google.Protobuf" Version="3.21.12" />
     <PackageReference Include="Grpc" Version="2.46.5" />
     <PackageReference Include="Grpc.Core" Version="2.46.5" />
     <PackageReference Include="Grpc.Tools" Version="2.51.0">