[同步]1. 同步主代码的变更

Author: AlianBlank

GameFrameX.Hotfix/Common/Events/EventDispatcherExtensions.cs

@@ -1,7 +1,7 @@
-using GameFrameX.Apps.Common.Event;
-using GameFrameX.Core.Abstractions;
+using GameFrameX.Core.Abstractions;
 using GameFrameX.Core.Abstractions.Agent;
 using GameFrameX.Core.Abstractions.Events;
+using GameFrameX.Launcher.Common.Event;
 
 namespace GameFrameX.Hotfix.Common.Events
 {

GameFrameX.Hotfix/GameFrameX.Hotfix.csproj

@@ -21,16 +21,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\GameFrameX.Apps\GameFrameX.Apps.csproj" />
-        <ProjectReference Include="..\GameFrameX.Core.Abstractions\GameFrameX.Core.Abstractions.csproj" />
-        <ProjectReference Include="..\GameFrameX.Launcher\GameFrameX.Launcher.csproj" />
-        <ProjectReference Include="..\GameFrameX.Core\GameFrameX.Core.csproj" />
-        <ProjectReference Include="..\GameFrameX.NetWork.HTTP\GameFrameX.NetWork.HTTP.csproj" />
-        <ProjectReference Include="..\GameFrameX.Utility\GameFrameX.Utility.csproj" />
         <ProjectReference Include="..\GameFrameX.CodeGenerator\GameFrameX.CodeGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\GameFrameX.Launcher\GameFrameX.Launcher.csproj" />
     </ItemGroup>
 
     <ItemGroup>
+      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta1" />
+      <PackageReference Include="GameFrameX.Core.Abstractions" Version="1.2.0-beta1" />
       <PackageReference Include="GameFrameX.SuperSocket.ClientEngine" Version="1.0.1" />
     </ItemGroup>
 

GameFrameX.Hotfix/GlobalUsings.cs

@@ -15,4 +15,5 @@
 global using GameFrameX.Core.Timer;
 global using GameFrameX.Setting;
 global using GameFrameX.Extension;
-global using GameFrameX.Utility;
+global using GameFrameX.Utility;
+global using GameFrameX.NetWork.Abstractions;

GameFrameX.Hotfix/Logic/Http/GetOnlinePlayerHttpHandler.cs

@@ -1,4 +1,4 @@
-using GameFrameX.Apps.Common.Session;
+using GameFrameX.Launcher.Common.Session;
 using GameFrameX.NetWork.HTTP;
 
 namespace GameFrameX.Hotfix.Logic.Http

GameFrameX.Hotfix/Logic/Http/GetOnlinePlayerListHttpHandler.cs

@@ -1,4 +1,4 @@
-using GameFrameX.Apps.Common.Session;
+using GameFrameX.Launcher.Common.Session;
 using GameFrameX.NetWork.HTTP;
 
 namespace GameFrameX.Hotfix.Logic.Http;

GameFrameX.Hotfix/Logic/Http/KickOffLineByUserIdPlayerHttpHandler.cs

@@ -1,4 +1,4 @@
-using GameFrameX.Apps.Common.Session;
+using GameFrameX.Launcher.Common.Session;
 using GameFrameX.NetWork.HTTP;
 
 namespace GameFrameX.Hotfix.Logic.Http;

GameFrameX.Hotfix/Logic/Role/Bag/BagComponentAgent.cs

@@ -1,8 +1,7 @@
-using GameFrameX.Apps.Common.Event;
-using GameFrameX.Apps.Player.Role.Bag.Component;
+using GameFrameX.Apps.Player.Role.Bag.Component;
 using GameFrameX.Apps.Player.Role.Bag.Entity;
 using GameFrameX.Hotfix.Common.Events;
-using GameFrameX.NetWork.Abstractions;
+using GameFrameX.Launcher.Common.Event;
 
 namespace GameFrameX.Hotfix.Logic.Role.Bag
 {

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

@@ -1,10 +1,9 @@
-using GameFrameX.Apps.Common.Event;
-using GameFrameX.Apps.Common.Session;
-using GameFrameX.Apps.Player.Player.Component;
+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.NetWork;
+using GameFrameX.Launcher.Common.Event;
+using GameFrameX.Launcher.Common.Session;
 
 namespace GameFrameX.Hotfix.Logic.Role.Login
 {
@@ -44,7 +43,7 @@ public async Task OnPlayerLogin(INetWorkChannel workChannel, ReqPlayerLogin reqL
             }
 
             // 更新连接会话数据
-            var session = SessionManager.Get(workChannel.Session.SessionID);
+            var session = SessionManager.Get(workChannel.GameAppSession.SessionID);
             session.SetRoleId(playerState.Id);
             session.SetSign(playerState.Id.ToString());
             session.SetActorId(ActorId);

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

@@ -1,8 +1,8 @@
-using GameFrameX.Apps.Common.Event;
-using GameFrameX.Apps.Player.Role.Pet.Component;
+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;
+using GameFrameX.Launcher.Common.Event;
 
 namespace GameFrameX.Hotfix.Logic.Role.Pet
 {

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

@@ -1,5 +1,4 @@
 using GameFrameX.Core.BaseHandler;
-using GameFrameX.NetWork.Messages;
 
 namespace GameFrameX.Hotfix.Logic.Server.Heart;
 

GameFrameX.Hotfix/StartUp/AppStartUpHotfixGameByMain.cs

@@ -1,6 +1,5 @@
-using GameFrameX.Apps.Common.Session;
-using GameFrameX.Config;
-using GameFrameX.Config.item;
+using GameFrameX.Config;
+using GameFrameX.Launcher.Common.Session;
 using GameFrameX.NetWork;
 using GameFrameX.NetWork.Abstractions;
 using GameFrameX.NetWork.HTTP;