Skip to content

Commit 054c9b4

Browse files
AlianBlankAlianBlank
committed
[修改]1. 修改新的ActorType 适配
1 parent 12732c4 commit 054c9b4

File tree

15 files changed

+79
-45
lines changed

15 files changed

+79
-45
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
using GameFrameX.DataBase;
88
using GameFrameX.Monitor.Account;
99
using GameFrameX.Monitor.Player;
10+
using GameFrameX.Setting;
1011
using Random = GameFrameX.Utility.Random;
1112

1213
namespace GameFrameX.Apps.Account.Login.Component
1314
{
14-
[ComponentType(ActorType.Account)]
15+
[ComponentType((ushort)ActorType.Account)]
1516
public sealed class LoginComponent : StateComponent<LoginState>
1617
{
1718
public async Task<LoginState> OnLogin(ReqLogin reqLogin)
@@ -38,7 +39,7 @@ public async Task<PlayerState> OnPlayerCreate(ReqPlayerCreate reqPlayerCreate)
3839
{
3940
PlayerState playerState = new PlayerState
4041
{
41-
Id = ActorIdGenerator.GetActorId((ushort)ActorType.Player),
42+
Id = ActorIdGenerator.GetActorId(GlobalConst.ActorTypePlayer),
4243
AccountId = reqPlayerCreate.Id,
4344
Name = reqPlayerCreate.Name,
4445
Level = (uint)Random.Next(1, 50),

‎GameFrameX.Apps/ActorType.cs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
using GameFrameX.Setting;
2+
3+
namespace GameFrameX.Apps;
4+
5+
/// <summary>
6+
/// 每个服存在多个实例的（如玩家和公会）需要小于Separator
7+
/// 最大id应当小于999
8+
/// Id一旦定义了不应该修改
9+
/// </summary>
10+
public enum ActorType : ushort
11+
{
12+
/// <summary>
13+
/// 空将会被判断为无效值
14+
/// </summary>
15+
None,
16+
17+
/// <summary>
18+
/// 分割线(勿调整,勿用于业务逻辑)
19+
/// </summary>
20+
Separator = GlobalConst.ActorTypeSeparator,
21+
22+
/// <summary>
23+
/// 账号
24+
/// 管理玩家账号信息，如注册、密码找回等。
25+
/// </summary>
26+
Account = 130,
27+
28+
/// <summary>
29+
/// 最大值
30+
/// </summary>
31+
Max = GlobalConst.ActorTypeMax,
32+
}

‎GameFrameX.Apps/GameFrameX.Apps.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="GameFrameX.Core" Version="1.2.0-beta10" />
21-
<PackageReference Include="GameFrameX.Monitor" Version="1.2.0-beta10" />
20+
<PackageReference Include="GameFrameX.Core" Version="1.2.0-beta11" />
21+
<PackageReference Include="GameFrameX.Monitor" Version="1.2.0-beta11" />
2222
</ItemGroup>
2323
</Project>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
using GameFrameX.Apps.Player.Player.Entity;
33
using GameFrameX.Core.Abstractions;
44
using GameFrameX.Monitor.Player;
5+
using GameFrameX.Setting;
56

6-
namespace GameFrameX.Apps.Player.Player.Component
7+
namespace GameFrameX.Apps.Player.Player.Component;
8+
9+
[ComponentType(GlobalConst.ActorTypePlayer)]
10+
public sealed class PlayerComponent : StateComponent<PlayerState>
711
{
8-
[ComponentType(ActorType.Player)]
9-
public sealed class PlayerComponent : StateComponent<PlayerState>
12+
public async Task<PlayerState> OnPlayerLogin(ReqPlayerLogin reqLogin)
1013
{
11-
public async Task<PlayerState> OnPlayerLogin(ReqPlayerLogin reqLogin)
12-
{
13-
MetricsPlayerRegister.LoginCounterOptions.Inc();
14-
return await GameDb.FindAsync<PlayerState>(m => m.Id == reqLogin.Id);
15-
}
14+
MetricsPlayerRegister.LoginCounterOptions.Inc();
15+
return await GameDb.FindAsync<PlayerState>(m => m.Id == reqLogin.Id);
1616
}
1717
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
using GameFrameX.Apps.Player.Role.Bag.Entity;
22
using GameFrameX.Core.Abstractions;
33
using GameFrameX.Core.Components;
4+
using GameFrameX.Setting;
45

5-
namespace GameFrameX.Apps.Player.Role.Bag.Component
6+
namespace GameFrameX.Apps.Player.Role.Bag.Component;
7+
8+
[ComponentType(GlobalConst.ActorTypePlayer)]
9+
public class BagComponent : StateComponent<BagState>
610
{
7-
[ComponentType(ActorType.Player)]
8-
public class BagComponent : StateComponent<BagState>
9-
{
10-
}
1111
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using GameFrameX.Apps.Player.Role.Pet.Entity;
22
using GameFrameX.Core.Abstractions;
3+
using GameFrameX.Setting;
34

4-
namespace GameFrameX.Apps.Player.Role.Pet.Component
5+
namespace GameFrameX.Apps.Player.Role.Pet.Component;
6+
7+
[ComponentType(GlobalConst.ActorTypePlayer)]
8+
public class PetComponent : StateComponent<PetState>
59
{
6-
[ComponentType(ActorType.Player)]
7-
public class PetComponent : StateComponent<PetState>
8-
{
9-
}
1010
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using GameFrameX.Apps.Server.Heart.Entity;
22
using GameFrameX.Core.Abstractions;
3+
using GameFrameX.Setting;
34

45
namespace GameFrameX.Apps.Server.Heart.Component;
56

6-
[ComponentType(ActorType.Server)]
7+
[ComponentType(GlobalConst.ActorTypeServer)]
78
public class HeartBeatComponent : StateComponent<HeartBeatState>
89
{
910
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
using GameFrameX.Apps.Server.Server.Entity;
22
using GameFrameX.Core.Abstractions;
3+
using GameFrameX.Setting;
34

4-
namespace GameFrameX.Apps.Server.Server.Component
5+
namespace GameFrameX.Apps.Server.Server.Component;
6+
7+
[ComponentType(GlobalConst.ActorTypeServer)]
8+
public class ServerComponent : StateComponent<ServerState>
59
{
6-
[ComponentType(ActorType.Server)]
7-
public class ServerComponent : StateComponent<ServerState>
8-
{
9-
/// <summary>
10-
/// 存放在此处的数据不会回存到数据库
11-
/// </summary>
12-
public HashSet<long> OnlineSet = new();
13-
}
10+
/// <summary>
11+
/// 存放在此处的数据不会回存到数据库
12+
/// </summary>
13+
public HashSet<long> OnlineSet = new();
1414
}

‎GameFrameX.CodeGenerator/GameFrameX.CodeGenerator.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="GameFrameX.Core.Abstractions" Version="1.2.0-beta10" />
21-
<PackageReference Include="GameFrameX.Setting" Version="1.2.0-beta10" />
20+
<PackageReference Include="GameFrameX.Core.Abstractions" Version="1.2.0-beta11" />
21+
<PackageReference Include="GameFrameX.Setting" Version="1.2.0-beta11" />
2222
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎GameFrameX.Config/GameFrameX.Config.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="GameFrameX.Core.Config" Version="1.2.0-beta10" />
17-
<PackageReference Include="GameFrameX.Log" Version="1.2.0-beta10" />
16+
<PackageReference Include="GameFrameX.Core.Config" Version="1.2.0-beta11" />
17+
<PackageReference Include="GameFrameX.Log" Version="1.2.0-beta11" />
1818
</ItemGroup>
1919

2020
</Project>

0 commit comments

Comments
 (0)