GameFrameX
/
GameFrameX.Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Blank 2024-09-04 18:13:09 +08:00
parent 1421abacc2
commit 9822cae1d8
11 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GameFrameX.Hotfix/Common/Events/EventDispatcherExtensions.cs
View File

@ -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
{

9
GameFrameX.Hotfix/GameFrameX.Hotfix.csproj
View File

@ -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>

3
GameFrameX.Hotfix/GlobalUsings.cs
View File

@ -15,4 +15,5 @@ global using GameFrameX.Core.Actors;
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;

2
GameFrameX.Hotfix/Logic/Http/GetOnlinePlayerHttpHandler.cs
View File

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

2
GameFrameX.Hotfix/Logic/Http/GetOnlinePlayerListHttpHandler.cs
View File

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

2
GameFrameX.Hotfix/Logic/Http/KickOffLineByUserIdPlayerHttpHandler.cs
View File

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

5
GameFrameX.Hotfix/Logic/Role/Bag/BagComponentAgent.cs
View File

@ -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
{

9
GameFrameX.Hotfix/Logic/Role/Login/PlayerComponentAgent.cs
View File

@ -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 @@ namespace GameFrameX.Hotfix.Logic.Role.Login
}
// 更新连接会话数据
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);

4
GameFrameX.Hotfix/Logic/Role/Pet/PetComponentAgent.cs
View File

@ -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
{

1
GameFrameX.Hotfix/Logic/Server/Heart/ReqHeartBeatHandler.cs
View File

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

5
GameFrameX.Hotfix/StartUp/AppStartUpHotfixGameByMain.cs
View File

@ -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;