[修改]1. 修改ActorType 适配

Author: AlianBlank

GameFrameX.Apps/Account/Login/Component/LoginComponent.cs

@@ -38,7 +38,7 @@ public async Task<PlayerState> OnPlayerCreate(ReqPlayerCreate reqPlayerCreate)
         {
             PlayerState playerState = new PlayerState
             {
-                Id = ActorIdGenerator.GetActorId(ActorType.Player),
+                Id = ActorIdGenerator.GetActorId((ushort)ActorType.Player),
                 AccountId = reqPlayerCreate.Id,
                 Name = reqPlayerCreate.Name,
                 Level = (uint)Random.Next(1, 50),

GameFrameX.Apps/GameFrameX.Apps.csproj

@@ -17,7 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta9" />
-      <PackageReference Include="GameFrameX.Monitor" Version="1.2.0-beta9" />
+      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta10" />
+      <PackageReference Include="GameFrameX.Monitor" Version="1.2.0-beta10" />
     </ItemGroup>
 </Project>

GameFrameX.CodeGenerator/GameFrameX.CodeGenerator.csproj

@@ -17,8 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GameFrameX.Core.Abstractions" Version="1.2.0-beta9" />
-    <PackageReference Include="GameFrameX.Setting" Version="1.2.0-beta9" />
+    <PackageReference Include="GameFrameX.Core.Abstractions" Version="1.2.0-beta10" />
+    <PackageReference Include="GameFrameX.Setting" Version="1.2.0-beta10" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

GameFrameX.Config/GameFrameX.Config.csproj

@@ -13,8 +13,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.Core.Config" Version="1.2.0-beta9" />
-      <PackageReference Include="GameFrameX.Log" Version="1.2.0-beta9" />
+      <PackageReference Include="GameFrameX.Core.Config" Version="1.2.0-beta10" />
+      <PackageReference Include="GameFrameX.Log" Version="1.2.0-beta10" />
     </ItemGroup>
 
 </Project>

GameFrameX.Hotfix/Common/Events/EventDispatcherExtensions.cs

@@ -19,12 +19,12 @@ public static void Dispatch(this IComponentAgent agent, int evtId, Param args =
             // 自己处理
             SelfHandle(agent, evtId, evt);
 
-            if ((EventId)evtId > EventId.RoleSeparator && agent.OwnerType > ActorType.Separator)
+            if ((EventId)evtId > EventId.RoleSeparator && agent.OwnerType > (ushort)ActorType.Separator)
             {
                 // 全局非玩家事件，抛给所有玩家
                 agent.Tell(()
-                    => ServerComponentAgent.OnlineRoleForeach(role
-                        => role.Dispatch(evtId, args)));
+                               => ServerComponentAgent.OnlineRoleForeach(role
+                                                                             => role.Dispatch(evtId, args)));
             }
 
             static void SelfHandle(IComponentAgent agent, int evtId, Event evt)

GameFrameX.Hotfix/GameFrameX.Hotfix.csproj

@@ -26,8 +26,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta9" />
-      <PackageReference Include="GameFrameX.Core.Abstractions" Version="1.2.0-beta9" />
+      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta10" />
+      <PackageReference Include="GameFrameX.Core.Abstractions" Version="1.2.0-beta10" />
       <PackageReference Include="GameFrameX.SuperSocket.ClientEngine" Version="1.0.1" />
     </ItemGroup>
 

GameFrameX.Hotfix/Logic/Server/Server/ServerComponentAgent.cs

@@ -34,7 +34,7 @@ protected override async Task HandleTimer(ServerComponentAgent agent, Param para
             {
                 LogHelper.Debug($"ServerCompAgent.CrossDayTimeHandler.跨天定时器执行{TimeHelper.CurrentTimeWithFullString()}");
                 await ActorManager.RoleCrossDay(1);
-                await ActorManager.CrossDay(1, ActorType.Server);
+                await ActorManager.CrossDay(1, (ushort)ActorType.Server);
             }
         }
 

GameFrameX.Launcher/GameFrameX.Launcher.csproj

@@ -36,10 +36,10 @@
 
     <ItemGroup>
       <PackageReference Include="CommandLineParser" Version="2.9.1" />
-      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta9" />
-      <PackageReference Include="GameFrameX.NetWork.Message" Version="1.2.0-beta9" />
-      <PackageReference Include="GameFrameX.NetWork.ChannelBase" Version="1.2.0-beta9" />
-      <PackageReference Include="GameFrameX.StartUp" Version="1.2.0-beta9" />
+      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta10" />
+      <PackageReference Include="GameFrameX.NetWork.Message" Version="1.2.0-beta10" />
+      <PackageReference Include="GameFrameX.NetWork.ChannelBase" Version="1.2.0-beta10" />
+      <PackageReference Include="GameFrameX.StartUp" Version="1.2.0-beta10" />
       <PackageReference Include="GameFrameX.SuperSocket.ClientEngine" Version="1.0.1" />
     </ItemGroup>
 </Project>

GameFrameX.Proto/GameFrameX.Proto.csproj

@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.NetWork" Version="1.2.0-beta9" />
+      <PackageReference Include="GameFrameX.NetWork" Version="1.2.0-beta10" />
     </ItemGroup>
 
 </Project>