Skip to content

Commit 962c2ed

Browse files
AlianBlankAlianBlank
committed
[修改]1. 修改Core变化的适配
1 parent d9ba472 commit 962c2ed

24 files changed

+31
-22
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Threading.Tasks;
22
using GameFrameX.Apps.Account.Login.Entity;
33
using GameFrameX.Core.Abstractions;
4+
using GameFrameX.Core.Components;
45
using GameFrameX.DataBase;
56
using GameFrameX.Monitor.Account;
67

‎GameFrameX.Apps/GlobalUsings.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
global using MongoDB.Bson.Serialization.Attributes;
66
global using GameFrameX.Core;
77
global using GameFrameX.Core.Utility;
8-
global using GameFrameX.Core.Comps;
98
global using GameFrameX.Core.Events;
109
global using GameFrameX.Core.Hotfix.Agent;
1110
global using GameFrameX.Core.Hotfix;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Threading.Tasks;
22
using GameFrameX.Apps.Player.Player.Entity;
33
using GameFrameX.Core.Abstractions;
4+
using GameFrameX.Core.Components;
45
using GameFrameX.Monitor.Player;
56
using Random = GameFrameX.Utility.Random;
67

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using GameFrameX.Apps.Player.Role.Bag.Entity;
22
using GameFrameX.Core.Abstractions;
3+
using GameFrameX.Core.Components;
34

45
namespace GameFrameX.Apps.Player.Role.Bag.Component
56
{

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

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

45
namespace GameFrameX.Apps.Player.Role.Pet.Component
56
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using GameFrameX.Apps.Server.Heart.Entity;
22
using GameFrameX.Core.Abstractions;
3+
using GameFrameX.Core.Components;
34

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using GameFrameX.Apps.Server.Server.Entity;
22
using GameFrameX.Core.Abstractions;
3+
using GameFrameX.Core.Components;
34

45
namespace GameFrameX.Apps.Server.Server.Component
56
{

‎GameFrameX.Hotfix/Common/Events/EventDispatcherExtensions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using GameFrameX.Core.Abstractions;
22
using GameFrameX.Core.Abstractions.Agent;
3+
using GameFrameX.Core.Abstractions.Events;
34

45
namespace GameFrameX.Hotfix.Common.Events
56
{

‎GameFrameX.Hotfix/Common/HotfixBridge.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using GameFrameX.Hotfix.StartUp;
1+
using GameFrameX.Core.Components;
2+
using GameFrameX.Hotfix.StartUp;
23
using GameFrameX.Launcher;
34
using GameFrameX.Launcher.Common.Session;
45
using GameFrameX.NetWork.HTTP;

‎GameFrameX.Hotfix/GlobalUsings.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
global using GameFrameX.Core;
88
global using GameFrameX.Log;
99
global using GameFrameX.Core.Utility;
10-
global using GameFrameX.Core.Comps;
1110
global using GameFrameX.Core.Events;
1211
global using GameFrameX.Core.Hotfix.Agent;
1312
global using GameFrameX.Core.Hotfix;

‎GameFrameX.Hotfix/Logic/Account/Login/LoginComponentAgent.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ public async Task OnLogin(INetWorkChannel workChannel, ReqLogin reqLogin)
2424

2525

2626
var loginCompAgent = await ActorManager.GetComponentAgent<LoginComponentAgent>();
27-
var loginState = await loginCompAgent.Comp.OnLogin(reqLogin);
27+
var loginState = await loginCompAgent.OwnerComponent.OnLogin(reqLogin);
2828
if (loginState == null)
2929
{
3030
var accountId = IdGenerator.GetActorId(ActorType.Account);
31-
loginState = await loginCompAgent.Comp.Register(accountId, reqLogin);
31+
loginState = await loginCompAgent.OwnerComponent.Register(accountId, reqLogin);
3232
}
3333

3434
//添加到session

‎GameFrameX.Hotfix/Logic/Account/Login/ReqLoginHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GameFrameX.Core.Net.BaseHandler;
1+
using GameFrameX.Core.BaseHandler;
22
using GameFrameX.NetWork.Messages;
33

44
namespace GameFrameX.Hotfix.Logic.Account.Login

‎GameFrameX.Hotfix/Logic/Role/Bag/ReqBagInfoHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GameFrameX.Core.Net.BaseHandler;
1+
using GameFrameX.Core.BaseHandler;
22
using GameFrameX.NetWork.Messages;
33

44
namespace GameFrameX.Hotfix.Logic.Role.Bag

‎GameFrameX.Hotfix/Logic/Role/Bag/ReqComposePetHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GameFrameX.Core.Net.BaseHandler;
1+
using GameFrameX.Core.BaseHandler;
22
using GameFrameX.NetWork.Messages;
33

44
namespace GameFrameX.Hotfix.Logic.Role.Bag

‎GameFrameX.Hotfix/Logic/Role/Login/PlayerComponentAgent.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using GameFrameX.Apps.Player.Player.Component;
22
using GameFrameX.Apps.Player.Player.Entity;
3+
using GameFrameX.Core.Abstractions.Events;
34
using GameFrameX.Hotfix.Logic.Server.Server;
45
using GameFrameX.Launcher.Common.Session;
56
using GameFrameX.NetWork;
@@ -35,7 +36,7 @@ public async Task OnLogout()
3536
/// <param name="reqLogin"></param>
3637
public async Task OnLogin(INetWorkChannel workChannel, ReqPlayerLogin reqLogin)
3738
{
38-
var playerState = await Comp.OnLogin(reqLogin);
39+
var playerState = await OwnerComponent.OnLogin(reqLogin);
3940
if (playerState == null)
4041
{
4142
//角色找不到？
@@ -78,7 +79,7 @@ public async Task OnLogin(INetWorkChannel workChannel, ReqPlayerLogin reqLogin)
7879
/// <param name="reqPlayerCreate"></param>
7980
public async Task OnPlayerCreate(INetWorkChannel workChannel, ReqPlayerCreate reqPlayerCreate)
8081
{
81-
var playerState = await Comp.OnPlayerCreate(reqPlayerCreate);
82+
var playerState = await OwnerComponent.OnPlayerCreate(reqPlayerCreate);
8283
RespPlayerCreate respPlayerCreate = new RespPlayerCreate
8384
{
8485
UniqueId = reqPlayerCreate.UniqueId,
@@ -101,7 +102,7 @@ public async Task OnPlayerCreate(INetWorkChannel workChannel, ReqPlayerCreate re
101102
/// <param name="reqPlayerList"></param>
102103
public async Task OnGetPlayerList(INetWorkChannel workChannel, ReqPlayerList reqPlayerList)
103104
{
104-
var playerList = await this.Comp.GetPlayerList(reqPlayerList);
105+
var playerList = await this.OwnerComponent.GetPlayerList(reqPlayerList);
105106

106107
RespPlayerList respPlayerList = new RespPlayerList
107108
{

‎GameFrameX.Hotfix/Logic/Role/Login/ReqPlayerCreateHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GameFrameX.Core.Net.BaseHandler;
1+
using GameFrameX.Core.BaseHandler;
22
using GameFrameX.NetWork.Messages;
33

44
namespace GameFrameX.Hotfix.Logic.Role.Login;

‎GameFrameX.Hotfix/Logic/Role/Login/ReqPlayerListHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GameFrameX.Core.Net.BaseHandler;
1+
using GameFrameX.Core.BaseHandler;
22
using GameFrameX.NetWork.Messages;
33

44
namespace GameFrameX.Hotfix.Logic.Role.Login;

‎GameFrameX.Hotfix/Logic/Role/Login/ReqPlayerLoginHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GameFrameX.Core.Net.BaseHandler;
1+
using GameFrameX.Core.BaseHandler;
22
using GameFrameX.NetWork.Messages;
33

44
namespace GameFrameX.Hotfix.Logic.Role.Login

‎GameFrameX.Hotfix/Logic/Role/Pet/PetComponentAgent.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using GameFrameX.Apps.Player.Role.Pet.Component;
22
using GameFrameX.Apps.Player.Role.Pet.Entity;
3+
using GameFrameX.Core.Abstractions.Events;
34
using GameFrameX.Hotfix.Logic.Server.Server;
45

56
namespace GameFrameX.Hotfix.Logic.Role.Pet

‎GameFrameX.Hotfix/Logic/Server/Heart/ReqHeartBeatHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GameFrameX.Core.Net.BaseHandler;
1+
using GameFrameX.Core.BaseHandler;
22
using GameFrameX.NetWork.Messages;
33

44
namespace GameFrameX.Hotfix.Logic.Server.Heart;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ public override void Active()
4949
[Discard]
5050
public virtual ValueTask AddOnlineRole(long roleId)
5151
{
52-
Comp.OnlineSet.Add(roleId);
52+
OwnerComponent.OnlineSet.Add(roleId);
5353
return ValueTask.CompletedTask;
5454
}
5555

5656
[Service]
5757
[Discard]
5858
public virtual ValueTask RemoveOnlineRole(long roleId)
5959
{
60-
Comp.OnlineSet.Remove(roleId);
60+
OwnerComponent.OnlineSet.Remove(roleId);
6161
return ValueTask.CompletedTask;
6262
}
6363

@@ -67,7 +67,7 @@ public static async Task OnlineRoleForeach(Action<PlayerComponentAgent> func)
6767
var serverComp = await ActorManager.GetComponentAgent<ServerComponentAgent>();
6868
serverComp.Tell(async () =>
6969
{
70-
foreach (var roleId in serverComp.Comp.OnlineSet)
70+
foreach (var roleId in serverComp.OwnerComponent.OnlineSet)
7171
{
7272
var roleComp = await ActorManager.GetComponentAgent<PlayerComponentAgent>(roleId);
7373
roleComp.Tell(() => func(roleComp));
@@ -117,7 +117,7 @@ public virtual Task<int> GetWorldLevel()
117117
[Service]
118118
public virtual Task<bool> IsOnline(long roleId)
119119
{
120-
foreach (var id in Comp.OnlineSet)
120+
foreach (var id in OwnerComponent.OnlineSet)
121121
{
122122
if (id == roleId)
123123
return Task.FromResult(true);

‎GameFrameX.Launcher/Common/Event/EventAttribute.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using GameFrameX.Core.Events;
1+
using GameFrameX.Core.Abstractions.Events;
2+
using GameFrameX.Core.Events;
23

34
namespace GameFrameX.Launcher.Common.Event
45
{

‎GameFrameX.Launcher/GlobalUsings.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
global using GameFrameX.Apps;
33
global using GameFrameX.Config;
44
global using GameFrameX.Core.Actors.Impl;
5-
global using GameFrameX.Core.Comps;
65
global using GameFrameX.Core.Hotfix;
76
global using GameFrameX.StartUp;
87
global using GameFrameX.DataBase;

‎GameFrameX.Launcher/StartUp/Game/AppStartUpGame.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using GameFrameX.DataBase.Mongo;
1+
using GameFrameX.Core.Components;
2+
using GameFrameX.DataBase.Mongo;
23

34
namespace GameFrameX.Launcher.StartUp.Game
45
{

0 commit comments

Comments
 (0)