[修改]1. 修改ActorType 的定义方式

Author: AlianBlank

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

@@ -7,11 +7,12 @@
 using GameFrameX.DataBase;
 using GameFrameX.Monitor.Account;
 using GameFrameX.Monitor.Player;
+using GameFrameX.Setting;
 using Random = GameFrameX.Utility.Random;
 
 namespace GameFrameX.Apps.Account.Login.Component
 {
-    [ComponentType(ActorType.Account)]
+    [ComponentType((ushort)ActorType.Account)]
     public sealed class LoginComponent : StateComponent<LoginState>
     {
         public async Task<LoginState> OnLogin(ReqLogin reqLogin)
@@ -38,7 +39,7 @@ public async Task<PlayerState> OnPlayerCreate(ReqPlayerCreate reqPlayerCreate)
         {
             PlayerState playerState = new PlayerState
             {
-                Id = ActorIdGenerator.GetActorId((ushort)ActorType.Player),
+                Id = ActorIdGenerator.GetActorId(GlobalConst.ActorTypePlayer),
                 AccountId = reqPlayerCreate.Id,
                 Name = reqPlayerCreate.Name,
                 Level = (uint)Random.Next(1, 50),

GameFrameX.Apps/ActorType.cs

@@ -0,0 +1,32 @@
+using GameFrameX.Setting;
+
+namespace GameFrameX.Apps;
+
+/// <summary>
+/// 每个服存在多个实例的（如玩家和公会）需要小于Separator
+/// 最大id应当小于999
+/// Id一旦定义了不应该修改
+/// </summary>
+public enum ActorType : ushort
+{
+    /// <summary>
+    /// 空将会被判断为无效值
+    /// </summary>
+    None,
+
+    /// <summary>
+    /// 分割线(勿调整,勿用于业务逻辑)
+    /// </summary>
+    Separator = GlobalConst.ActorTypeSeparator,
+
+    /// <summary>
+    /// 账号
+    /// 管理玩家账号信息，如注册、密码找回等。
+    /// </summary>
+    Account = 130,
+
+    /// <summary>
+    /// 最大值
+    /// </summary>
+    Max = GlobalConst.ActorTypeMax,
+}

GameFrameX.Apps/Player/Player/Component/PlayerComponent.cs

@@ -4,16 +4,16 @@
 using GameFrameX.Core.Abstractions.Attribute;
 using GameFrameX.Core.Components;
 using GameFrameX.Monitor.Player;
+using GameFrameX.Setting;
 
-namespace GameFrameX.Apps.Player.Player.Component
+namespace GameFrameX.Apps.Player.Player.Component;
+
+[ComponentType(GlobalConst.ActorTypePlayer)]
+public sealed class PlayerComponent : StateComponent<PlayerState>
 {
-    [ComponentType(ActorType.Player)]
-    public sealed class PlayerComponent : StateComponent<PlayerState>
+    public async Task<PlayerState> OnPlayerLogin(ReqPlayerLogin reqLogin)
     {
-        public async Task<PlayerState> OnPlayerLogin(ReqPlayerLogin reqLogin)
-        {
-            MetricsPlayerRegister.LoginCounterOptions.Inc();
-            return await GameDb.FindAsync<PlayerState>(m => m.Id == reqLogin.Id);
-        }
+        MetricsPlayerRegister.LoginCounterOptions.Inc();
+        return await GameDb.FindAsync<PlayerState>(m => m.Id == reqLogin.Id);
     }
 }

GameFrameX.Apps/Player/Role/Bag/Component/BagComponent.cs

@@ -2,11 +2,11 @@
 using GameFrameX.Core.Abstractions;
 using GameFrameX.Core.Abstractions.Attribute;
 using GameFrameX.Core.Components;
+using GameFrameX.Setting;
 
-namespace GameFrameX.Apps.Player.Role.Bag.Component
+namespace GameFrameX.Apps.Player.Role.Bag.Component;
+
+[ComponentType(GlobalConst.ActorTypePlayer)]
+public class BagComponent : StateComponent<BagState>
 {
-    [ComponentType(ActorType.Player)]
-    public class BagComponent : StateComponent<BagState>
-    {
-    }
 }

GameFrameX.Apps/Player/Role/Pet/Component/PetComponent.cs

@@ -2,11 +2,11 @@
 using GameFrameX.Core.Abstractions;
 using GameFrameX.Core.Abstractions.Attribute;
 using GameFrameX.Core.Components;
+using GameFrameX.Setting;
 
-namespace GameFrameX.Apps.Player.Role.Pet.Component
+namespace GameFrameX.Apps.Player.Role.Pet.Component;
+
+[ComponentType(GlobalConst.ActorTypePlayer)]
+public class PetComponent : StateComponent<PetState>
 {
-    [ComponentType(ActorType.Player)]
-    public class PetComponent : StateComponent<PetState>
-    {
-    }
 }

GameFrameX.Apps/Server/Heart/Component/HeartBeatComponent.cs

@@ -2,10 +2,11 @@
 using GameFrameX.Core.Abstractions;
 using GameFrameX.Core.Abstractions.Attribute;
 using GameFrameX.Core.Components;
+using GameFrameX.Setting;
 
 namespace GameFrameX.Apps.Server.Heart.Component;
 
-[ComponentType(ActorType.Server)]
+[ComponentType(GlobalConst.ActorTypeServer)]
 public class HeartBeatComponent : StateComponent<HeartBeatState>
 {
 }

GameFrameX.Apps/Server/Server/Component/ServerComponent.cs

@@ -2,15 +2,15 @@
 using GameFrameX.Core.Abstractions;
 using GameFrameX.Core.Abstractions.Attribute;
 using GameFrameX.Core.Components;
+using GameFrameX.Setting;
 
-namespace GameFrameX.Apps.Server.Server.Component
+namespace GameFrameX.Apps.Server.Server.Component;
+
+[ComponentType(GlobalConst.ActorTypeServer)]
+public class ServerComponent : StateComponent<ServerState>
 {
-    [ComponentType(ActorType.Server)]
-    public class ServerComponent : StateComponent<ServerState>
-    {
-        /// <summary>
-        /// 存放在此处的数据不会回存到数据库
-        /// </summary>
-        public HashSet<long> OnlineSet = new();
-    }
+    /// <summary>
+    /// 存放在此处的数据不会回存到数据库
+    /// </summary>
+    public HashSet<long> OnlineSet = new();
 }

GameFrameX.Core.Abstractions/ActorType.cs

@@ -1,4 +1,6 @@
-namespace GameFrameX.Core.Abstractions.Attribute;
+using GameFrameX.Setting;
+
+namespace GameFrameX.Core.Abstractions.Attribute;
 
 /// <summary>
 /// 组件类型标记
@@ -11,23 +13,15 @@ public class ComponentTypeAttribute : System.Attribute
     /// </summary>
     public ushort Type { get; }
 
-    /// <summary>
-    /// 组件类型
-    /// </summary>
-    /// <param name="type">组件类型</param>
-    public ComponentTypeAttribute(ActorType type) : this((ushort)type)
-    {
-    }
-
     /// <summary>
     /// 组件类型
     /// </summary>
     /// <param name="type">组件类型,值应大于0且小于ActorType.Max并且不为ActorType.Separator</param>
     public ComponentTypeAttribute(ushort type)
     {
-        if (type is 0 or (ushort)ActorType.Separator || type >= (ushort)ActorType.Max)
+        if (type is 0 or GlobalConst.ActorTypeSeparator || type >= GlobalConst.ActorTypeMax)
         {
-            throw new InvalidDataException($"无效的组件类型 {type},值应大于{ActorType.None}且小于{ActorType.Max}和不为{ActorType.Separator}");
+            throw new InvalidDataException($"无效的组件类型 {type},值应大于{GlobalConst.ActorTypeNone}且小于{GlobalConst.ActorTypeMax}和不为{GlobalConst.ActorTypeSeparator}");
         }
 
         Type = type;

GameFrameX.Core.Abstractions/Attribute/ComponentTypeAttribute.cs

@@ -5,6 +5,7 @@
 using GameFrameX.Core.Actors.Impl;
 using GameFrameX.Core.Components;
 using GameFrameX.Log;
+using GameFrameX.Setting;
 
 namespace GameFrameX.Core.Actors;
 
@@ -110,7 +111,7 @@ public Actor(long id, ushort type)
         Type = type;
         WorkerActor = new WorkerActor(id);
 
-        if (type < (ushort)ActorType.Separator)
+        if (type < GlobalConst.ActorTypeSeparator)
         {
             Tell(() => SetAutoRecycle(true));
         }