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

CAPI/python/requirements.txt

@@ -1,2 +1,2 @@
-grpcio==1.51.3
+grpcio==1.53.0
 grpcio-tools==1.51.3

dependency/proto/Protos.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Google.Protobuf.Tools" Version="3.22.1" />
     <PackageReference Include="Grpc" Version="2.46.6" />
     <PackageReference Include="Grpc.Core" Version="2.46.6" />
-    <PackageReference Include="Grpc.Tools" Version="2.52.0">
+    <PackageReference Include="Grpc.Tools" Version="2.53.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

logic/GameClass/GameObj/Character/Skill.cs

@@ -93,7 +93,7 @@ namespace GameClass.GameObj
 
     public class UseRobot : IActiveSkill
     {
-        public int SkillCD => 0;
+        public int SkillCD => GameData.frameDuration;
         public int DurationTime => 0;
         private readonly object commonSkillLock = new object();
         public object ActiveSkillLock => commonSkillLock;

logic/Server/Server.csproj

@@ -13,7 +13,7 @@
     <PackageReference Include="Google.Protobuf" Version="3.22.1" />
     <PackageReference Include="Grpc" Version="2.46.6" />
     <PackageReference Include="Grpc.Core" Version="2.46.6" />
-    <PackageReference Include="Grpc.Tools" Version="2.52.0">
+    <PackageReference Include="Grpc.Tools" Version="2.53.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>