更新协议工具，重新导出协议

Ganlei4052 · Aug 19, 2023 · 3f0e308 · 3f0e308
1 parent 15446d8
commit 3f0e308
Show file tree

Hide file tree

Showing 68 changed files with 181 additions and 394 deletions.
diff --git a/Geek.Server.App/Common/AppStartUp.cs b/Geek.Server.App/Common/AppStartUp.cs
@@ -7,8 +7,7 @@
 using NLog;
 using NLog.Config;
 using NLog.LayoutRenderers;
-using PolymorphicMessagePack;
-using Protocol;
+using PolymorphicMessagePack; 
 
 namespace Geek.Server.App.Common
 {

diff --git a/Geek.Server.Generate/PolymorphicRegister.cs b/Geek.Server.Generate/PolymorphicRegister.cs
@@ -1,4 +1,4 @@
-namespace Protocol
+namespace Geek.Server.Proto
 {
     public partial class PolymorphicRegister
     {

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.A.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.A.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 
 namespace Geek.Server.Proto

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.B.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.B.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 
 namespace Geek.Server.Proto

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.HearBeat.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.HearBeat.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 
 namespace Geek.Server.Proto

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.MoveMessage.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.MoveMessage.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 using System.Collections.Generic;
 

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.Place.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.Place.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 using System.Collections.Generic;
 

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ReqBagInfo.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ReqBagInfo.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 using System.Collections.Generic;
 

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ReqComposePet.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ReqComposePet.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 using System.Collections.Generic;
 

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ReqLogin.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ReqLogin.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 
 namespace Geek.Server.Proto

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ReqSellItem.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ReqSellItem.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 using System.Collections.Generic;
 

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ReqUseItem.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ReqUseItem.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 using System.Collections.Generic;
 

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ResBagInfo.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ResBagInfo.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 using System.Collections.Generic;
 

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ResComposePet.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ResComposePet.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 using System.Collections.Generic;
 

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ResErrorCode.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ResErrorCode.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 
 namespace Geek.Server.Proto

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ResItemChange.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ResItemChange.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 using System.Collections.Generic;
 

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ResLevelUp.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ResLevelUp.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 
 namespace Geek.Server.Proto

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ResLogin.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ResLogin.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 
 namespace Geek.Server.Proto

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.ResPrompt.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.ResPrompt.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 
 namespace Geek.Server.Proto

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.TestStruct.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.TestStruct.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 
 namespace Geek.Server.Proto

diff --git a/Geek.Server.Generate/Proto/Geek.Server.Proto.UserInfo.cs b/Geek.Server.Generate/Proto/Geek.Server.Proto.UserInfo.cs
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 using MessagePack;
 
 namespace Geek.Server.Proto

diff --git a/Geek.Server.Generate/Proto/MsgFactory.cs b/Geek.Server.Generate/Proto/MsgFactory.cs
@@ -1,7 +1,7 @@
 //auto generated, do not modify it
 
 using System;
-namespace Protocol
+namespace Geek.Server.Proto
 {
 	public class MsgFactory
 	{

diff --git a/Geek.Server.Generate/Proto/PolymorphicRegisterGen.cs b/Geek.Server.Generate/Proto/PolymorphicRegisterGen.cs
@@ -1,5 +1,5 @@
 using PolymorphicMessagePack;
-namespace Protocol
+namespace Geek.Server.Proto
 {
 	public partial class PolymorphicRegister
 	{

diff --git a/Geek.Server.Hotfix/Common/HotfixBridge.cs b/Geek.Server.Hotfix/Common/HotfixBridge.cs
@@ -10,8 +10,7 @@
 using Geek.Server.Core.Timer;
 using Geek.Server.Core.Utils;
 using Microsoft.AspNetCore.Connections;
-using PolymorphicMessagePack;
-using Protocol;
+using PolymorphicMessagePack; 
 
 namespace Server.Logic.Common
 {

diff --git a/Geek.Server.TestPressure/Logic/ClientLengthPrefixedProtocol.cs b/Geek.Server.TestPressure/Logic/ClientLengthPrefixedProtocol.cs
@@ -1,8 +1,7 @@
 using Bedrock.Framework;
 using Bedrock.Framework.Protocols;
 using Geek.Server.Core.Net.BaseHandler;
-using MessagePack;
-using Protocol;
+using MessagePack; 
 using System.Buffers;
 using System.Diagnostics;
 

diff --git a/Geek.Server.TestPressure/Program.cs b/Geek.Server.TestPressure/Program.cs
@@ -1,8 +1,7 @@
 
 using Geek.Server.Core.Actors;
 using Geek.Server.TestPressure.Logic;
-using PolymorphicMessagePack;
-using Protocol;
+using PolymorphicMessagePack; 
 using System.Net.WebSockets;
 using System.Text;
 

diff --git a/Tools/Geek.MsgPackTool/Geek.Proto.dll b/Tools/Geek.MsgPackTool/Geek.Proto.dll
diff --git a/Tools/Geek.MsgPackTool/Geek/MsgFactory.liquid b/Tools/Geek.MsgPackTool/Geek/MsgFactory.liquid
@@ -1,7 +1,7 @@
 //auto generated, do not modify it
 
 using System;
-namespace Protocol
+namespace Geek.Server.Proto
 {
 	public class MsgFactory
 	{

diff --git a/Tools/Geek.MsgPackTool/Geek/Proto.liquid b/Tools/Geek.MsgPackTool/Geek/Proto.liquid
@@ -1,6 +1,5 @@
 //auto generated, do not modify it
 
-using Protocol;
 {{~ for using in usings ~}}
 using {{using}};
 {{~ end ~}}

diff --git a/Tools/Geek.MsgPackTool/Geek/Register.liquid b/Tools/Geek.MsgPackTool/Geek/Register.liquid
@@ -1,5 +1,5 @@
 using PolymorphicMessagePack;
-namespace Protocol
+namespace Geek.Server.Proto
 {
 	public partial class PolymorphicRegister
 	{

diff --git a/Tools/Geek.MsgPackTool/MessagePack.Generator.dll b/Tools/Geek.MsgPackTool/MessagePack.Generator.dll
diff --git a/Tools/Geek.MsgPackTool/MessagePack.Generator.exe b/Tools/Geek.MsgPackTool/MessagePack.Generator.exe