Skip to content

Commit 4d1e8ef

Browse files
committed
[修改]1. 修改适配新的协议和结构改动
1 parent d343c15 commit 4d1e8ef

19 files changed

+29
-144
lines changed

GameFrameX.Hotfix/Common/HotfixBridgeByServer.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
using System.Buffers;
22
using System.Net;
33
using GameFrameX.Hotfix.Launcher;
4-
using GameFrameX.Hotfix.StartUp;
54
using GameFrameX.Launcher;
6-
using GameFrameX.Launcher.Common.Session;
7-
using GameFrameX.Launcher.PipelineFilter;
85
using GameFrameX.NetWork;
96
using GameFrameX.NetWork.HTTP;
7+
using GameFrameX.NetWork.Message;
108
using GameFrameX.NetWork.Messages;
119
using GameFrameX.SuperSocket.Connection;
1210
using GameFrameX.SuperSocket.Primitives;

GameFrameX.Hotfix/Launcher/MessageGameDecoderHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GameFrameX.Launcher.StartUp;
1+
using GameFrameX.NetWork.Message;
22

33
namespace GameFrameX.Hotfix.Launcher;
44

GameFrameX.Hotfix/Launcher/MessageGameEncoderHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GameFrameX.Launcher.StartUp;
1+
using GameFrameX.NetWork.Message;
22

33
namespace GameFrameX.Hotfix.Launcher;
44

GameFrameX.Launcher/GameFrameX.Launcher.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<ProjectReference Include="..\DataBaseServer\GameFrameX.DBServer\GameFrameX.DBServer.csproj" />
4141
<ProjectReference Include="..\GameFrameX.Log\GameFrameX.Log.csproj" />
4242
<ProjectReference Include="..\GameFrameX.Monitor\GameFrameX.Monitor.csproj" />
43+
<ProjectReference Include="..\GameFrameX.NetWork.Message\GameFrameX.NetWork.Message.csproj" />
4344
<ProjectReference Include="..\GameFrameX.Proto\GameFrameX.Proto.csproj" />
4445
<ProjectReference Include="..\GameFrameX.ServerManager\GameFrameX.ServerManager.csproj" />
4546
<ProjectReference Include="..\GameFrameX.Utility\GameFrameX.Utility.csproj" />
@@ -57,4 +58,8 @@
5758
<Link>logo.png</Link>
5859
</None>
5960
</ItemGroup>
61+
62+
<ItemGroup>
63+
<Folder Include="PipelineFilter\" />
64+
</ItemGroup>
6065
</Project>

GameFrameX.Launcher/PipelineFilter/MessageObjectPipelineFilter.cs

Lines changed: 0 additions & 30 deletions
This file was deleted.

GameFrameX.Launcher/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Newtonsoft.Json;
66
using Newtonsoft.Json.Converters;
77
using GameFrameX.Monitor;
8+
using GameFrameX.NetWork.Message;
89

910
namespace GameFrameX.Launcher
1011
{
@@ -54,7 +55,7 @@ static async Task Main(string[] args)
5455
JsonSetting();
5556
GlobalSettings.Load<AppSetting>($"Configs/app_config.json");
5657
CacheStateTypeManager.Init();
57-
MessageProtoHelper.Init();
58+
MessageProtoHelper.Init(typeof(MessageProtoHandler).Assembly);
5859

5960
var types = Assembly.GetEntryAssembly()?.GetTypes();
6061
if (types != null)

GameFrameX.Launcher/StartUp/AppStartUpService.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using GameFrameX.Proto.BuiltIn;
1+
using GameFrameX.NetWork.Message;
2+
using GameFrameX.Proto.BuiltIn;
23
using Timer = System.Timers.Timer;
34

45
namespace GameFrameX.Launcher.StartUp;

GameFrameX.Launcher/StartUp/BaseMessageDecoderHandler.cs

Lines changed: 0 additions & 51 deletions
This file was deleted.

GameFrameX.Launcher/StartUp/BaseMessageEncoderHandler.cs

Lines changed: 0 additions & 49 deletions
This file was deleted.

GameFrameX.Launcher/StartUp/Discovery/AppStartUpDiscoveryCenter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GameFrameX.Launcher.PipelineFilter;
1+
using GameFrameX.NetWork.Message;
22
using GameFrameX.Proto.BuiltIn;
33
using GameFrameX.ServerManager;
44

GameFrameX.Launcher/StartUp/Discovery/MessageActorDiscoveryDecoderHandler.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using GameFrameX.NetWork.Message;
2+
13
namespace GameFrameX.Launcher.StartUp.Discovery;
24

35
class MessageActorDiscoveryDecoderHandler : BaseMessageDecoderHandler

GameFrameX.Launcher/StartUp/Discovery/MessageActorDiscoveryEncoderHandler.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using GameFrameX.NetWork.Message;
2+
13
namespace GameFrameX.Launcher.StartUp.Discovery;
24

35
class MessageActorDiscoveryEncoderHandler : BaseMessageEncoderHandler

GameFrameX.Launcher/StartUp/Gateway/AppStartUpGateway.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using GameFrameX.Launcher.PipelineFilter;
2-
using GameFrameX.Launcher.StartUp.Gateway;
1+
using GameFrameX.Launcher.StartUp.Gateway;
2+
using GameFrameX.NetWork.Message;
33
using GameFrameX.Proto.BuiltIn;
44
using GameFrameX.ServerManager;
55
using GameFrameX.SuperSocket.Primitives;

GameFrameX.Launcher/StartUp/Gateway/MessageActorGatewayDecoderHandler.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using GameFrameX.NetWork.Message;
2+
13
namespace GameFrameX.Launcher.StartUp.Gateway;
24

35
class MessageActorGatewayDecoderHandler : BaseMessageDecoderHandler

GameFrameX.Launcher/StartUp/Gateway/MessageActorGatewayEncoderHandler.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using GameFrameX.NetWork.Message;
2+
13
namespace GameFrameX.Launcher.StartUp.Gateway;
24

35
class MessageActorGatewayEncoderHandler : BaseMessageEncoderHandler

GameFrameX.Launcher/StartUp/Router/AppStartUpRouter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GameFrameX.Launcher.PipelineFilter;
1+
using GameFrameX.NetWork.Message;
22
using GameFrameX.Proto.BuiltIn;
33
using GameFrameX.SuperSocket.Primitives;
44
using Microsoft.Extensions.Configuration;

GameFrameX.Launcher/StartUp/Router/AppStartUpRouterByGateWay.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using GameFrameX.Proto.BuiltIn;
1+
using GameFrameX.NetWork.Message;
2+
using GameFrameX.Proto.BuiltIn;
23
using Timer = System.Timers.Timer;
34

45
namespace GameFrameX.Launcher.StartUp.Router;

GameFrameX.Launcher/StartUp/Router/MessageRouterDecoderHandler.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using GameFrameX.NetWork.Message;
2+
13
namespace GameFrameX.Launcher.StartUp.Router;
24

35
/// <summary>

GameFrameX.Launcher/StartUp/Router/MessageRouterEncoderHandler.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using GameFrameX.NetWork.Message;
12
using GameFrameX.ProtoBuf.Net;
23

34
namespace GameFrameX.Launcher.StartUp.Router;
@@ -54,6 +55,4 @@ public override byte[] Handler(IMessage message)
5455
LogHelper.Error("消息对象为空,编码异常");
5556
return null;
5657
}
57-
58-
public override ushort PackageLength { get; } = 2 + 1 + 4 + 4;
5958
}

0 commit comments

Comments
 (0)