[修改]1. 修改Core变化的适配

GameFrameX · Jul 19, 2024 · 962c2ed · 962c2ed
1 parent d9ba472
commit 962c2ed
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 22 deletions.
diff --git a/GameFrameX.Apps/Account/Login/Component/LoginComponent.cs b/GameFrameX.Apps/Account/Login/Component/LoginComponent.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using GameFrameX.Apps.Account.Login.Entity;
 using GameFrameX.Core.Abstractions;
+using GameFrameX.Core.Components;
 using GameFrameX.DataBase;
 using GameFrameX.Monitor.Account;
 

diff --git a/GameFrameX.Apps/GlobalUsings.cs b/GameFrameX.Apps/GlobalUsings.cs
@@ -5,7 +5,6 @@
 global using MongoDB.Bson.Serialization.Attributes;
 global using GameFrameX.Core;
 global using GameFrameX.Core.Utility;
-global using GameFrameX.Core.Comps;
 global using GameFrameX.Core.Events;
 global using GameFrameX.Core.Hotfix.Agent;
 global using GameFrameX.Core.Hotfix;

diff --git a/GameFrameX.Apps/Player/Player/Component/PlayerComponent.cs b/GameFrameX.Apps/Player/Player/Component/PlayerComponent.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using GameFrameX.Apps.Player.Player.Entity;
 using GameFrameX.Core.Abstractions;
+using GameFrameX.Core.Components;
 using GameFrameX.Monitor.Player;
 using Random = GameFrameX.Utility.Random;
 

diff --git a/GameFrameX.Apps/Player/Role/Bag/Component/BagComponent.cs b/GameFrameX.Apps/Player/Role/Bag/Component/BagComponent.cs
@@ -1,5 +1,6 @@
 using GameFrameX.Apps.Player.Role.Bag.Entity;
 using GameFrameX.Core.Abstractions;
+using GameFrameX.Core.Components;
 
 namespace GameFrameX.Apps.Player.Role.Bag.Component
 {

diff --git a/GameFrameX.Apps/Player/Role/Pet/Component/PetComponent.cs b/GameFrameX.Apps/Player/Role/Pet/Component/PetComponent.cs
@@ -1,5 +1,6 @@
 using GameFrameX.Apps.Player.Role.Pet.Entity;
 using GameFrameX.Core.Abstractions;
+using GameFrameX.Core.Components;
 
 namespace GameFrameX.Apps.Player.Role.Pet.Component
 {

diff --git a/GameFrameX.Apps/Server/Heart/Component/HeartBeatComponent.cs b/GameFrameX.Apps/Server/Heart/Component/HeartBeatComponent.cs
@@ -1,5 +1,6 @@
 using GameFrameX.Apps.Server.Heart.Entity;
 using GameFrameX.Core.Abstractions;
+using GameFrameX.Core.Components;
 
 namespace GameFrameX.Apps.Server.Heart.Component;
 

diff --git a/GameFrameX.Apps/Server/Server/Component/ServerComponent.cs b/GameFrameX.Apps/Server/Server/Component/ServerComponent.cs
@@ -1,5 +1,6 @@
 using GameFrameX.Apps.Server.Server.Entity;
 using GameFrameX.Core.Abstractions;
+using GameFrameX.Core.Components;
 
 namespace GameFrameX.Apps.Server.Server.Component
 {

diff --git a/GameFrameX.Hotfix/Common/Events/EventDispatcherExtensions.cs b/GameFrameX.Hotfix/Common/Events/EventDispatcherExtensions.cs
@@ -1,5 +1,6 @@
 using GameFrameX.Core.Abstractions;
 using GameFrameX.Core.Abstractions.Agent;
+using GameFrameX.Core.Abstractions.Events;
 
 namespace GameFrameX.Hotfix.Common.Events
 {

diff --git a/GameFrameX.Hotfix/Common/HotfixBridge.cs b/GameFrameX.Hotfix/Common/HotfixBridge.cs
@@ -1,4 +1,5 @@
-using GameFrameX.Hotfix.StartUp;
+using GameFrameX.Core.Components;
+using GameFrameX.Hotfix.StartUp;
 using GameFrameX.Launcher;
 using GameFrameX.Launcher.Common.Session;
 using GameFrameX.NetWork.HTTP;

diff --git a/GameFrameX.Hotfix/GlobalUsings.cs b/GameFrameX.Hotfix/GlobalUsings.cs
@@ -7,7 +7,6 @@
 global using GameFrameX.Core;
 global using GameFrameX.Log;
 global using GameFrameX.Core.Utility;
-global using GameFrameX.Core.Comps;
 global using GameFrameX.Core.Events;
 global using GameFrameX.Core.Hotfix.Agent;
 global using GameFrameX.Core.Hotfix;

diff --git a/GameFrameX.Hotfix/Logic/Account/Login/LoginComponentAgent.cs b/GameFrameX.Hotfix/Logic/Account/Login/LoginComponentAgent.cs
@@ -24,11 +24,11 @@ public async Task OnLogin(INetWorkChannel workChannel, ReqLogin reqLogin)
 
 
             var loginCompAgent = await ActorManager.GetComponentAgent<LoginComponentAgent>();
-            var loginState = await loginCompAgent.Comp.OnLogin(reqLogin);
+            var loginState = await loginCompAgent.OwnerComponent.OnLogin(reqLogin);
             if (loginState == null)
             {
                 var accountId = IdGenerator.GetActorId(ActorType.Account);
-                loginState = await loginCompAgent.Comp.Register(accountId, reqLogin);
+                loginState = await loginCompAgent.OwnerComponent.Register(accountId, reqLogin);
             }
 
             //添加到session

diff --git a/GameFrameX.Hotfix/Logic/Account/Login/ReqLoginHandler.cs b/GameFrameX.Hotfix/Logic/Account/Login/ReqLoginHandler.cs
@@ -1,4 +1,4 @@
-using GameFrameX.Core.Net.BaseHandler;
+using GameFrameX.Core.BaseHandler;
 using GameFrameX.NetWork.Messages;
 
 namespace GameFrameX.Hotfix.Logic.Account.Login

diff --git a/GameFrameX.Hotfix/Logic/Role/Bag/ReqBagInfoHandler.cs b/GameFrameX.Hotfix/Logic/Role/Bag/ReqBagInfoHandler.cs
@@ -1,4 +1,4 @@
-using GameFrameX.Core.Net.BaseHandler;
+using GameFrameX.Core.BaseHandler;
 using GameFrameX.NetWork.Messages;
 
 namespace GameFrameX.Hotfix.Logic.Role.Bag

diff --git a/GameFrameX.Hotfix/Logic/Role/Bag/ReqComposePetHandler.cs b/GameFrameX.Hotfix/Logic/Role/Bag/ReqComposePetHandler.cs
@@ -1,4 +1,4 @@
-using GameFrameX.Core.Net.BaseHandler;
+using GameFrameX.Core.BaseHandler;
 using GameFrameX.NetWork.Messages;
 
 namespace GameFrameX.Hotfix.Logic.Role.Bag

diff --git a/GameFrameX.Hotfix/Logic/Role/Login/PlayerComponentAgent.cs b/GameFrameX.Hotfix/Logic/Role/Login/PlayerComponentAgent.cs
@@ -1,5 +1,6 @@
 using GameFrameX.Apps.Player.Player.Component;
 using GameFrameX.Apps.Player.Player.Entity;
+using GameFrameX.Core.Abstractions.Events;
 using GameFrameX.Hotfix.Logic.Server.Server;
 using GameFrameX.Launcher.Common.Session;
 using GameFrameX.NetWork;
@@ -35,7 +36,7 @@ public async Task OnLogout()
         /// <param name="reqLogin"></param>
         public async Task OnLogin(INetWorkChannel workChannel, ReqPlayerLogin reqLogin)
         {
-            var playerState = await Comp.OnLogin(reqLogin);
+            var playerState = await OwnerComponent.OnLogin(reqLogin);
             if (playerState == null)
             {
                 //角色找不到？
@@ -78,7 +79,7 @@ public async Task OnLogin(INetWorkChannel workChannel, ReqPlayerLogin reqLogin)
         /// <param name="reqPlayerCreate"></param>
         public async Task OnPlayerCreate(INetWorkChannel workChannel, ReqPlayerCreate reqPlayerCreate)
         {
-            var playerState = await Comp.OnPlayerCreate(reqPlayerCreate);
+            var playerState = await OwnerComponent.OnPlayerCreate(reqPlayerCreate);
             RespPlayerCreate respPlayerCreate = new RespPlayerCreate
             {
                 UniqueId = reqPlayerCreate.UniqueId,
@@ -101,7 +102,7 @@ public async Task OnPlayerCreate(INetWorkChannel workChannel, ReqPlayerCreate re
         /// <param name="reqPlayerList"></param>
         public async Task OnGetPlayerList(INetWorkChannel workChannel, ReqPlayerList reqPlayerList)
         {
-            var playerList = await this.Comp.GetPlayerList(reqPlayerList);
+            var playerList = await this.OwnerComponent.GetPlayerList(reqPlayerList);
 
             RespPlayerList respPlayerList = new RespPlayerList
             {

diff --git a/GameFrameX.Hotfix/Logic/Role/Login/ReqPlayerCreateHandler.cs b/GameFrameX.Hotfix/Logic/Role/Login/ReqPlayerCreateHandler.cs
@@ -1,4 +1,4 @@
-using GameFrameX.Core.Net.BaseHandler;
+using GameFrameX.Core.BaseHandler;
 using GameFrameX.NetWork.Messages;
 
 namespace GameFrameX.Hotfix.Logic.Role.Login;

diff --git a/GameFrameX.Hotfix/Logic/Role/Login/ReqPlayerListHandler.cs b/GameFrameX.Hotfix/Logic/Role/Login/ReqPlayerListHandler.cs
@@ -1,4 +1,4 @@
-using GameFrameX.Core.Net.BaseHandler;
+using GameFrameX.Core.BaseHandler;
 using GameFrameX.NetWork.Messages;
 
 namespace GameFrameX.Hotfix.Logic.Role.Login;

diff --git a/GameFrameX.Hotfix/Logic/Role/Login/ReqPlayerLoginHandler.cs b/GameFrameX.Hotfix/Logic/Role/Login/ReqPlayerLoginHandler.cs
@@ -1,4 +1,4 @@
-using GameFrameX.Core.Net.BaseHandler;
+using GameFrameX.Core.BaseHandler;
 using GameFrameX.NetWork.Messages;
 
 namespace GameFrameX.Hotfix.Logic.Role.Login

diff --git a/GameFrameX.Hotfix/Logic/Role/Pet/PetComponentAgent.cs b/GameFrameX.Hotfix/Logic/Role/Pet/PetComponentAgent.cs
@@ -1,5 +1,6 @@
 using GameFrameX.Apps.Player.Role.Pet.Component;
 using GameFrameX.Apps.Player.Role.Pet.Entity;
+using GameFrameX.Core.Abstractions.Events;
 using GameFrameX.Hotfix.Logic.Server.Server;
 
 namespace GameFrameX.Hotfix.Logic.Role.Pet

diff --git a/GameFrameX.Hotfix/Logic/Server/Heart/ReqHeartBeatHandler.cs b/GameFrameX.Hotfix/Logic/Server/Heart/ReqHeartBeatHandler.cs
@@ -1,4 +1,4 @@
-using GameFrameX.Core.Net.BaseHandler;
+using GameFrameX.Core.BaseHandler;
 using GameFrameX.NetWork.Messages;
 
 namespace GameFrameX.Hotfix.Logic.Server.Heart;

diff --git a/GameFrameX.Hotfix/Logic/Server/Server/ServerComponentAgent.cs b/GameFrameX.Hotfix/Logic/Server/Server/ServerComponentAgent.cs
@@ -49,15 +49,15 @@ public override void Active()
         [Discard]
         public virtual ValueTask AddOnlineRole(long roleId)
         {
-            Comp.OnlineSet.Add(roleId);
+            OwnerComponent.OnlineSet.Add(roleId);
             return ValueTask.CompletedTask;
         }
 
         [Service]
         [Discard]
         public virtual ValueTask RemoveOnlineRole(long roleId)
         {
-            Comp.OnlineSet.Remove(roleId);
+            OwnerComponent.OnlineSet.Remove(roleId);
             return ValueTask.CompletedTask;
         }
 
@@ -67,7 +67,7 @@ public static async Task OnlineRoleForeach(Action<PlayerComponentAgent> func)
             var serverComp = await ActorManager.GetComponentAgent<ServerComponentAgent>();
             serverComp.Tell(async () =>
             {
-                foreach (var roleId in serverComp.Comp.OnlineSet)
+                foreach (var roleId in serverComp.OwnerComponent.OnlineSet)
                 {
                     var roleComp = await ActorManager.GetComponentAgent<PlayerComponentAgent>(roleId);
                     roleComp.Tell(() => func(roleComp));
@@ -117,7 +117,7 @@ public virtual Task<int> GetWorldLevel()
         [Service]
         public virtual Task<bool> IsOnline(long roleId)
         {
-            foreach (var id in Comp.OnlineSet)
+            foreach (var id in OwnerComponent.OnlineSet)
             {
                 if (id == roleId)
                     return Task.FromResult(true);

diff --git a/GameFrameX.Launcher/Common/Event/EventAttribute.cs b/GameFrameX.Launcher/Common/Event/EventAttribute.cs
@@ -1,4 +1,5 @@
-using GameFrameX.Core.Events;
+using GameFrameX.Core.Abstractions.Events;
+using GameFrameX.Core.Events;
 
 namespace GameFrameX.Launcher.Common.Event
 {

diff --git a/GameFrameX.Launcher/GlobalUsings.cs b/GameFrameX.Launcher/GlobalUsings.cs
@@ -2,7 +2,6 @@
 global using GameFrameX.Apps;
 global using GameFrameX.Config;
 global using GameFrameX.Core.Actors.Impl;
-global using GameFrameX.Core.Comps;
 global using GameFrameX.Core.Hotfix;
 global using GameFrameX.StartUp;
 global using GameFrameX.DataBase;

diff --git a/GameFrameX.Launcher/StartUp/Game/AppStartUpGame.cs b/GameFrameX.Launcher/StartUp/Game/AppStartUpGame.cs
@@ -1,4 +1,5 @@
-using GameFrameX.DataBase.Mongo;
+using GameFrameX.Core.Components;
+using GameFrameX.DataBase.Mongo;
 
 namespace GameFrameX.Launcher.StartUp.Game
 {