diff --git a/Client.cs b/Client.cs
index fde6302..0275686 100644
--- a/Client.cs
+++ b/Client.cs
@@ -1,5 +1,6 @@
using Fleck;
using System;
+using battle;
using pb = global::Google.Protobuf;
namespace BattleServer
@@ -14,13 +15,8 @@ namespace BattleServer
public Client(IWebSocketConnection _socket)
{
socket = _socket;
- socket.OnMessage = domessage;
socket.OnBinary = doBinary;
}
- private void domessage(string message)
- {
-
- }
///
/// 接收rpc数据
@@ -28,7 +24,7 @@ namespace BattleServer
///
private void doBinary(byte[] message)
{
- Pb.RpcMessage msg = Deserialize(message);
+ Pb.BattleRpcMessage msg = Deserialize(message);
Task.Run(() =>
{
handle(msg);
@@ -40,9 +36,16 @@ namespace BattleServer
/// 处理远程请求
///
///
- private void handle(Pb.RpcMessage msg)
+ private void handle(Pb.BattleRpcMessage msg)
{
-
+ Console.WriteLine("收到战斗消息:{0}", msg.ToString());
+ int end = battle.Manager.CheckBattle((int)msg.Rid);
+ Console.WriteLine("CheckBattle:{0}", end);
+ Pb.BattleTestMessage message = new Pb.BattleTestMessage();
+ message.Id = "123123";
+ message.Msg = "succ";
+ msg.Data = pb.WellKnownTypes.Any.Pack(message);
+ socket.Send(Serialization(msg));
}
@@ -59,6 +62,19 @@ namespace BattleServer
return msg;
}
-
+ ///
+ /// 反序列化protobuf
+ ///
+ ///
+ ///
+ ///
+ public static byte[] Serialization(T msg) where T : pb.IMessage, new()
+ {
+ byte[] result = new byte[msg.CalculateSize()];
+ pb.CodedOutputStream output = new pb.CodedOutputStream(result);
+ msg.WriteTo(output);
+ output.CheckNoSpaceLeft();
+ return result;
+ }
}
}
\ No newline at end of file
diff --git a/Program.cs b/Program.cs
index 72554ed..5e6fac8 100644
--- a/Program.cs
+++ b/Program.cs
@@ -8,10 +8,10 @@ namespace BattleServer
{
static void Main(string[] args)
{
- // Console.WriteLine("BattleServer Start!");
+ Console.WriteLine("BattleServer Start!");
+ Service service = new Service();
+ Console.ReadKey();
- // Console.ReadKey();
-
}
}
}
\ No newline at end of file
diff --git a/Service.cs b/Service.cs
index 54e7e1b..2e9279e 100644
--- a/Service.cs
+++ b/Service.cs
@@ -23,6 +23,7 @@ namespace BattleServer
private void onAccept(IWebSocketConnection webSocket)
{
Client client = new Client(webSocket);
+ Console.WriteLine("新的连接对象进入{0}", client.ToString());
clients.Add(client);
}
}
diff --git a/bin/Debug/net6.0/Fleck.dll b/bin/Debug/net6.0/Fleck.dll
new file mode 100644
index 0000000..bc0b959
Binary files /dev/null and b/bin/Debug/net6.0/Fleck.dll differ
diff --git a/bin/Debug/net6.0/Google.Protobuf.dll b/bin/Debug/net6.0/Google.Protobuf.dll
new file mode 100644
index 0000000..7c4f4f8
Binary files /dev/null and b/bin/Debug/net6.0/Google.Protobuf.dll differ
diff --git a/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
new file mode 100644
index 0000000..7d8769b
Binary files /dev/null and b/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll differ
diff --git a/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll b/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll
new file mode 100644
index 0000000..cdcb266
Binary files /dev/null and b/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll differ
diff --git a/bin/Debug/net6.0/battle.dll b/bin/Debug/net6.0/battle.dll
new file mode 100644
index 0000000..c2bb95b
Binary files /dev/null and b/bin/Debug/net6.0/battle.dll differ
diff --git a/bin/Debug/net6.0/dfbattle.deps.json b/bin/Debug/net6.0/dfbattle.deps.json
index a8b12b5..81b1f7b 100644
--- a/bin/Debug/net6.0/dfbattle.deps.json
+++ b/bin/Debug/net6.0/dfbattle.deps.json
@@ -7,9 +7,58 @@
"targets": {
".NETCoreApp,Version=v6.0": {
"dfbattle/1.0.0": {
+ "dependencies": {
+ "Fleck": "1.2.0",
+ "Google.Protobuf": "3.21.9",
+ "Microsoft.Extensions.DependencyInjection": "2.1.1",
+ "battle": "1.0.0.0"
+ },
"runtime": {
"dfbattle.dll": {}
}
+ },
+ "Fleck/1.2.0": {
+ "runtime": {
+ "lib/netcoreapp2.0/Fleck.dll": {
+ "assemblyVersion": "1.2.0.0",
+ "fileVersion": "1.2.0.0"
+ }
+ }
+ },
+ "Google.Protobuf/3.21.9": {
+ "runtime": {
+ "lib/net5.0/Google.Protobuf.dll": {
+ "assemblyVersion": "3.21.9.0",
+ "fileVersion": "3.21.9.0"
+ }
+ }
+ },
+ "Microsoft.Extensions.DependencyInjection/2.1.1": {
+ "dependencies": {
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.1"
+ },
+ "runtime": {
+ "lib/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.dll": {
+ "assemblyVersion": "2.1.1.0",
+ "fileVersion": "2.1.1.18157"
+ }
+ }
+ },
+ "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": {
+ "runtime": {
+ "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {
+ "assemblyVersion": "2.1.1.0",
+ "fileVersion": "2.1.1.18157"
+ }
+ }
+ },
+ "battle/1.0.0.0": {
+ "runtime": {
+ "battle.dll": {
+ "assemblyVersion": "1.0.0.0",
+ "fileVersion": "1.0.0.0"
+ }
+ }
}
}
},
@@ -18,6 +67,39 @@
"type": "project",
"serviceable": false,
"sha512": ""
+ },
+ "Fleck/1.2.0": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-bPLXn6QbLAFoviur6XbrKB0Zn6x04E8VibHXyHZeJsoC7bkUl5DVtzM5cZgDuqHkIrBqAXJyTNJwSNIc6wBJ2Q==",
+ "path": "fleck/1.2.0",
+ "hashPath": "fleck.1.2.0.nupkg.sha512"
+ },
+ "Google.Protobuf/3.21.9": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-OTpFujTgkmqMLbg3KT7F/iuKi1rg6s5FCS2M9XcVLDn40zL8wgXm37CY/F6MeOEXKjdcnXGCN/h7oyMkVydVsg==",
+ "path": "google.protobuf/3.21.9",
+ "hashPath": "google.protobuf.3.21.9.nupkg.sha512"
+ },
+ "Microsoft.Extensions.DependencyInjection/2.1.1": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-RVdgNWT/73M0eCpreGpWv5NmbHFGQzzW+G7nChK8ej84m+d1nzeWrtqcRYnEpKNx3B8V/Uek4tNP0WCaCNjYnQ==",
+ "path": "microsoft.extensions.dependencyinjection/2.1.1",
+ "hashPath": "microsoft.extensions.dependencyinjection.2.1.1.nupkg.sha512"
+ },
+ "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-MgYpU5cwZohUMKKg3sbPhvGG+eAZ/59E9UwPwlrUkyXU+PGzqwZg9yyQNjhxuAWmoNoFReoemeCku50prYSGzA==",
+ "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.1",
+ "hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512"
+ },
+ "battle/1.0.0.0": {
+ "type": "reference",
+ "serviceable": false,
+ "sha512": ""
}
}
}
\ No newline at end of file
diff --git a/bin/Debug/net6.0/dfbattle.dll b/bin/Debug/net6.0/dfbattle.dll
index 4627d3f..4d25f13 100644
Binary files a/bin/Debug/net6.0/dfbattle.dll and b/bin/Debug/net6.0/dfbattle.dll differ
diff --git a/bin/Debug/net6.0/dfbattle.pdb b/bin/Debug/net6.0/dfbattle.pdb
index 907940e..5fed785 100644
Binary files a/bin/Debug/net6.0/dfbattle.pdb and b/bin/Debug/net6.0/dfbattle.pdb differ
diff --git a/bin/release/net6.0/Fleck.dll b/bin/release/net6.0/Fleck.dll
new file mode 100644
index 0000000..bc0b959
Binary files /dev/null and b/bin/release/net6.0/Fleck.dll differ
diff --git a/bin/release/net6.0/Google.Protobuf.dll b/bin/release/net6.0/Google.Protobuf.dll
new file mode 100644
index 0000000..7c4f4f8
Binary files /dev/null and b/bin/release/net6.0/Google.Protobuf.dll differ
diff --git a/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
new file mode 100644
index 0000000..7d8769b
Binary files /dev/null and b/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll differ
diff --git a/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.dll b/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.dll
new file mode 100644
index 0000000..cdcb266
Binary files /dev/null and b/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.dll differ
diff --git a/bin/release/net6.0/battle.dll b/bin/release/net6.0/battle.dll
new file mode 100644
index 0000000..c2bb95b
Binary files /dev/null and b/bin/release/net6.0/battle.dll differ
diff --git a/bin/release/net6.0/dfbattle.deps.json b/bin/release/net6.0/dfbattle.deps.json
new file mode 100644
index 0000000..81b1f7b
--- /dev/null
+++ b/bin/release/net6.0/dfbattle.deps.json
@@ -0,0 +1,105 @@
+{
+ "runtimeTarget": {
+ "name": ".NETCoreApp,Version=v6.0",
+ "signature": ""
+ },
+ "compilationOptions": {},
+ "targets": {
+ ".NETCoreApp,Version=v6.0": {
+ "dfbattle/1.0.0": {
+ "dependencies": {
+ "Fleck": "1.2.0",
+ "Google.Protobuf": "3.21.9",
+ "Microsoft.Extensions.DependencyInjection": "2.1.1",
+ "battle": "1.0.0.0"
+ },
+ "runtime": {
+ "dfbattle.dll": {}
+ }
+ },
+ "Fleck/1.2.0": {
+ "runtime": {
+ "lib/netcoreapp2.0/Fleck.dll": {
+ "assemblyVersion": "1.2.0.0",
+ "fileVersion": "1.2.0.0"
+ }
+ }
+ },
+ "Google.Protobuf/3.21.9": {
+ "runtime": {
+ "lib/net5.0/Google.Protobuf.dll": {
+ "assemblyVersion": "3.21.9.0",
+ "fileVersion": "3.21.9.0"
+ }
+ }
+ },
+ "Microsoft.Extensions.DependencyInjection/2.1.1": {
+ "dependencies": {
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.1"
+ },
+ "runtime": {
+ "lib/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.dll": {
+ "assemblyVersion": "2.1.1.0",
+ "fileVersion": "2.1.1.18157"
+ }
+ }
+ },
+ "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": {
+ "runtime": {
+ "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {
+ "assemblyVersion": "2.1.1.0",
+ "fileVersion": "2.1.1.18157"
+ }
+ }
+ },
+ "battle/1.0.0.0": {
+ "runtime": {
+ "battle.dll": {
+ "assemblyVersion": "1.0.0.0",
+ "fileVersion": "1.0.0.0"
+ }
+ }
+ }
+ }
+ },
+ "libraries": {
+ "dfbattle/1.0.0": {
+ "type": "project",
+ "serviceable": false,
+ "sha512": ""
+ },
+ "Fleck/1.2.0": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-bPLXn6QbLAFoviur6XbrKB0Zn6x04E8VibHXyHZeJsoC7bkUl5DVtzM5cZgDuqHkIrBqAXJyTNJwSNIc6wBJ2Q==",
+ "path": "fleck/1.2.0",
+ "hashPath": "fleck.1.2.0.nupkg.sha512"
+ },
+ "Google.Protobuf/3.21.9": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-OTpFujTgkmqMLbg3KT7F/iuKi1rg6s5FCS2M9XcVLDn40zL8wgXm37CY/F6MeOEXKjdcnXGCN/h7oyMkVydVsg==",
+ "path": "google.protobuf/3.21.9",
+ "hashPath": "google.protobuf.3.21.9.nupkg.sha512"
+ },
+ "Microsoft.Extensions.DependencyInjection/2.1.1": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-RVdgNWT/73M0eCpreGpWv5NmbHFGQzzW+G7nChK8ej84m+d1nzeWrtqcRYnEpKNx3B8V/Uek4tNP0WCaCNjYnQ==",
+ "path": "microsoft.extensions.dependencyinjection/2.1.1",
+ "hashPath": "microsoft.extensions.dependencyinjection.2.1.1.nupkg.sha512"
+ },
+ "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-MgYpU5cwZohUMKKg3sbPhvGG+eAZ/59E9UwPwlrUkyXU+PGzqwZg9yyQNjhxuAWmoNoFReoemeCku50prYSGzA==",
+ "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.1",
+ "hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512"
+ },
+ "battle/1.0.0.0": {
+ "type": "reference",
+ "serviceable": false,
+ "sha512": ""
+ }
+ }
+}
\ No newline at end of file
diff --git a/bin/release/net6.0/dfbattle.dll b/bin/release/net6.0/dfbattle.dll
new file mode 100644
index 0000000..e2671eb
Binary files /dev/null and b/bin/release/net6.0/dfbattle.dll differ
diff --git a/bin/release/net6.0/dfbattle.exe b/bin/release/net6.0/dfbattle.exe
new file mode 100644
index 0000000..864f1f2
Binary files /dev/null and b/bin/release/net6.0/dfbattle.exe differ
diff --git a/bin/release/net6.0/dfbattle.pdb b/bin/release/net6.0/dfbattle.pdb
new file mode 100644
index 0000000..862d1f9
Binary files /dev/null and b/bin/release/net6.0/dfbattle.pdb differ
diff --git a/bin/release/net6.0/dfbattle.runtimeconfig.json b/bin/release/net6.0/dfbattle.runtimeconfig.json
new file mode 100644
index 0000000..e7b3b03
--- /dev/null
+++ b/bin/release/net6.0/dfbattle.runtimeconfig.json
@@ -0,0 +1,12 @@
+{
+ "runtimeOptions": {
+ "tfm": "net6.0",
+ "framework": {
+ "name": "Microsoft.NETCore.App",
+ "version": "6.0.0"
+ },
+ "configProperties": {
+ "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+ }
+ }
+}
\ No newline at end of file
diff --git a/dfbattle.csproj b/dfbattle.csproj
index 1a5551c..9f35942 100644
--- a/dfbattle.csproj
+++ b/dfbattle.csproj
@@ -11,5 +11,10 @@
-
+
+
+
+ E:\c#\dfbattle\lib\battle.dll
+
+
diff --git a/lib/battle.dll b/lib/battle.dll
new file mode 100644
index 0000000..c2bb95b
Binary files /dev/null and b/lib/battle.dll differ
diff --git a/obj/Debug/net6.0/dfbattle.assets.cache b/obj/Debug/net6.0/dfbattle.assets.cache
index 2b32cf2..16bdb9d 100644
Binary files a/obj/Debug/net6.0/dfbattle.assets.cache and b/obj/Debug/net6.0/dfbattle.assets.cache differ
diff --git a/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache b/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache
index 5bc15e6..5fab63d 100644
Binary files a/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache and b/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache differ
diff --git a/obj/Debug/net6.0/dfbattle.csproj.CopyComplete b/obj/Debug/net6.0/dfbattle.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
diff --git a/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache b/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache
index b5a73c5..2f91bd0 100644
--- a/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache
+++ b/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-e2d38b4f8971f223869a8c99d5ae024a414a4f80
+14c7a867eefd9ec59ba8e8d78710cb0814087f7a
diff --git a/obj/Debug/net6.0/dfbattle.csproj.FileListAbsolute.txt b/obj/Debug/net6.0/dfbattle.csproj.FileListAbsolute.txt
index fe253fa..56d392e 100644
--- a/obj/Debug/net6.0/dfbattle.csproj.FileListAbsolute.txt
+++ b/obj/Debug/net6.0/dfbattle.csproj.FileListAbsolute.txt
@@ -13,3 +13,9 @@ E:\c#\dfbattle\obj\Debug\net6.0\refint\dfbattle.dll
E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.pdb
E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.genruntimeconfig.cache
E:\c#\dfbattle\obj\Debug\net6.0\ref\dfbattle.dll
+E:\c#\dfbattle\bin\Debug\net6.0\Fleck.dll
+E:\c#\dfbattle\bin\Debug\net6.0\Google.Protobuf.dll
+E:\c#\dfbattle\obj\Debug\net6.0\dfbattle.csproj.CopyComplete
+E:\c#\dfbattle\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.dll
+E:\c#\dfbattle\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+E:\c#\dfbattle\bin\Debug\net6.0\battle.dll
diff --git a/obj/Debug/net6.0/dfbattle.dll b/obj/Debug/net6.0/dfbattle.dll
index 4627d3f..4d25f13 100644
Binary files a/obj/Debug/net6.0/dfbattle.dll and b/obj/Debug/net6.0/dfbattle.dll differ
diff --git a/obj/Debug/net6.0/dfbattle.pdb b/obj/Debug/net6.0/dfbattle.pdb
index 907940e..5fed785 100644
Binary files a/obj/Debug/net6.0/dfbattle.pdb and b/obj/Debug/net6.0/dfbattle.pdb differ
diff --git a/obj/Debug/net6.0/ref/dfbattle.dll b/obj/Debug/net6.0/ref/dfbattle.dll
index a934f9f..f21f323 100644
Binary files a/obj/Debug/net6.0/ref/dfbattle.dll and b/obj/Debug/net6.0/ref/dfbattle.dll differ
diff --git a/obj/Debug/net6.0/refint/dfbattle.dll b/obj/Debug/net6.0/refint/dfbattle.dll
index a934f9f..f21f323 100644
Binary files a/obj/Debug/net6.0/refint/dfbattle.dll and b/obj/Debug/net6.0/refint/dfbattle.dll differ
diff --git a/obj/dfbattle.csproj.nuget.dgspec.json b/obj/dfbattle.csproj.nuget.dgspec.json
index 26a6e0d..6c954a6 100644
--- a/obj/dfbattle.csproj.nuget.dgspec.json
+++ b/obj/dfbattle.csproj.nuget.dgspec.json
@@ -45,6 +45,10 @@
"Google.Protobuf": {
"target": "Package",
"version": "[3.21.9, )"
+ },
+ "Microsoft.Extensions.DependencyInjection": {
+ "target": "Package",
+ "version": "[2.1.1, )"
}
},
"imports": [
diff --git a/obj/project.assets.json b/obj/project.assets.json
index bd77e61..d4a0f70 100644
--- a/obj/project.assets.json
+++ b/obj/project.assets.json
@@ -19,6 +19,27 @@
"runtime": {
"lib/net5.0/Google.Protobuf.dll": {}
}
+ },
+ "Microsoft.Extensions.DependencyInjection/2.1.1": {
+ "type": "package",
+ "dependencies": {
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.1"
+ },
+ "compile": {
+ "lib/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.dll": {}
+ },
+ "runtime": {
+ "lib/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.dll": {}
+ }
+ },
+ "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": {
+ "type": "package",
+ "compile": {
+ "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {}
+ },
+ "runtime": {
+ "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {}
+ }
}
}
},
@@ -60,12 +81,43 @@
"lib/netstandard2.0/Google.Protobuf.pdb",
"lib/netstandard2.0/Google.Protobuf.xml"
]
+ },
+ "Microsoft.Extensions.DependencyInjection/2.1.1": {
+ "sha512": "RVdgNWT/73M0eCpreGpWv5NmbHFGQzzW+G7nChK8ej84m+d1nzeWrtqcRYnEpKNx3B8V/Uek4tNP0WCaCNjYnQ==",
+ "type": "package",
+ "path": "microsoft.extensions.dependencyinjection/2.1.1",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "lib/net461/Microsoft.Extensions.DependencyInjection.dll",
+ "lib/net461/Microsoft.Extensions.DependencyInjection.xml",
+ "lib/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.dll",
+ "lib/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.xml",
+ "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.dll",
+ "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.xml",
+ "microsoft.extensions.dependencyinjection.2.1.1.nupkg.sha512",
+ "microsoft.extensions.dependencyinjection.nuspec"
+ ]
+ },
+ "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": {
+ "sha512": "MgYpU5cwZohUMKKg3sbPhvGG+eAZ/59E9UwPwlrUkyXU+PGzqwZg9yyQNjhxuAWmoNoFReoemeCku50prYSGzA==",
+ "type": "package",
+ "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.1",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
+ "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
+ "microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512",
+ "microsoft.extensions.dependencyinjection.abstractions.nuspec"
+ ]
}
},
"projectFileDependencyGroups": {
"net6.0": [
"Fleck >= 1.2.0",
- "Google.Protobuf >= 3.21.9"
+ "Google.Protobuf >= 3.21.9",
+ "Microsoft.Extensions.DependencyInjection >= 2.1.1"
]
},
"packageFolders": {
@@ -112,6 +164,10 @@
"Google.Protobuf": {
"target": "Package",
"version": "[3.21.9, )"
+ },
+ "Microsoft.Extensions.DependencyInjection": {
+ "target": "Package",
+ "version": "[2.1.1, )"
}
},
"imports": [
diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache
index 61c74cf..f029ff3 100644
--- a/obj/project.nuget.cache
+++ b/obj/project.nuget.cache
@@ -1,11 +1,13 @@
{
"version": 2,
- "dgSpecHash": "s9XIzWQ6HRV29gxJPILhV4DPvFYneeFqjFz7eLOSIrOeL1EmSxlxD4wgKwKlxq0Bw79nFNhIwrWdojuZ2uwodA==",
+ "dgSpecHash": "VO0R/XQyS76+ZkXQorQMd280Mq8lkrP2i7CJgDcHc4ABsHSzY5bI4nBsXRZTBMY4GqAdOz9zJURXRNlw7DOuQA==",
"success": true,
"projectFilePath": "E:\\c#\\dfbattle\\dfbattle.csproj",
"expectedPackageFiles": [
"C:\\Users\\liwei1dao\\.nuget\\packages\\fleck\\1.2.0\\fleck.1.2.0.nupkg.sha512",
- "C:\\Users\\liwei1dao\\.nuget\\packages\\google.protobuf\\3.21.9\\google.protobuf.3.21.9.nupkg.sha512"
+ "C:\\Users\\liwei1dao\\.nuget\\packages\\google.protobuf\\3.21.9\\google.protobuf.3.21.9.nupkg.sha512",
+ "C:\\Users\\liwei1dao\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\2.1.1\\microsoft.extensions.dependencyinjection.2.1.1.nupkg.sha512",
+ "C:\\Users\\liwei1dao\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\2.1.1\\microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512"
],
"logs": []
}
\ No newline at end of file
diff --git a/obj/release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs b/obj/release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs
new file mode 100644
index 0000000..36203c7
--- /dev/null
+++ b/obj/release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+//
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = "")]
diff --git a/obj/release/net6.0/apphost.exe b/obj/release/net6.0/apphost.exe
new file mode 100644
index 0000000..864f1f2
Binary files /dev/null and b/obj/release/net6.0/apphost.exe differ
diff --git a/obj/release/net6.0/dfbattle.AssemblyInfo.cs b/obj/release/net6.0/dfbattle.AssemblyInfo.cs
new file mode 100644
index 0000000..554606f
--- /dev/null
+++ b/obj/release/net6.0/dfbattle.AssemblyInfo.cs
@@ -0,0 +1,22 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("dfbattle")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("release")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("dfbattle")]
+[assembly: System.Reflection.AssemblyTitleAttribute("dfbattle")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+
+// 由 MSBuild WriteCodeFragment 类生成。
+
diff --git a/obj/release/net6.0/dfbattle.AssemblyInfoInputs.cache b/obj/release/net6.0/dfbattle.AssemblyInfoInputs.cache
new file mode 100644
index 0000000..e34547a
--- /dev/null
+++ b/obj/release/net6.0/dfbattle.AssemblyInfoInputs.cache
@@ -0,0 +1 @@
+90e72506fa6a5e4bb11238e13048bb74d1a90769
diff --git a/obj/release/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig b/obj/release/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig
new file mode 100644
index 0000000..006f536
--- /dev/null
+++ b/obj/release/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig
@@ -0,0 +1,10 @@
+is_global = true
+build_property.TargetFramework = net6.0
+build_property.TargetPlatformMinVersion =
+build_property.UsingMicrosoftNETSdkWeb =
+build_property.ProjectTypeGuids =
+build_property.InvariantGlobalization =
+build_property.PlatformNeutralAssembly =
+build_property._SupportedPlatformList = Linux,macOS,Windows
+build_property.RootNamespace = dfbattle
+build_property.ProjectDir = E:\c#\dfbattle\
diff --git a/obj/release/net6.0/dfbattle.GlobalUsings.g.cs b/obj/release/net6.0/dfbattle.GlobalUsings.g.cs
new file mode 100644
index 0000000..8578f3d
--- /dev/null
+++ b/obj/release/net6.0/dfbattle.GlobalUsings.g.cs
@@ -0,0 +1,8 @@
+//
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.IO;
+global using global::System.Linq;
+global using global::System.Net.Http;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;
diff --git a/obj/release/net6.0/dfbattle.assets.cache b/obj/release/net6.0/dfbattle.assets.cache
new file mode 100644
index 0000000..90af081
Binary files /dev/null and b/obj/release/net6.0/dfbattle.assets.cache differ
diff --git a/obj/release/net6.0/dfbattle.csproj.AssemblyReference.cache b/obj/release/net6.0/dfbattle.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..cd31488
Binary files /dev/null and b/obj/release/net6.0/dfbattle.csproj.AssemblyReference.cache differ
diff --git a/obj/release/net6.0/dfbattle.csproj.CopyComplete b/obj/release/net6.0/dfbattle.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
diff --git a/obj/release/net6.0/dfbattle.csproj.CoreCompileInputs.cache b/obj/release/net6.0/dfbattle.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..f390a6c
--- /dev/null
+++ b/obj/release/net6.0/dfbattle.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+4a93511b18f2551159384e9f5cc8fc0ca4e14681
diff --git a/obj/release/net6.0/dfbattle.csproj.FileListAbsolute.txt b/obj/release/net6.0/dfbattle.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..c890cd1
--- /dev/null
+++ b/obj/release/net6.0/dfbattle.csproj.FileListAbsolute.txt
@@ -0,0 +1,21 @@
+E:\c#\dfbattle\bin\release\net6.0\dfbattle.exe
+E:\c#\dfbattle\bin\release\net6.0\dfbattle.deps.json
+E:\c#\dfbattle\bin\release\net6.0\dfbattle.runtimeconfig.json
+E:\c#\dfbattle\bin\release\net6.0\dfbattle.dll
+E:\c#\dfbattle\bin\release\net6.0\dfbattle.pdb
+E:\c#\dfbattle\bin\release\net6.0\Fleck.dll
+E:\c#\dfbattle\bin\release\net6.0\Google.Protobuf.dll
+E:\c#\dfbattle\bin\release\net6.0\Microsoft.Extensions.DependencyInjection.dll
+E:\c#\dfbattle\bin\release\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+E:\c#\dfbattle\bin\release\net6.0\battle.dll
+E:\c#\dfbattle\obj\release\net6.0\dfbattle.csproj.AssemblyReference.cache
+E:\c#\dfbattle\obj\release\net6.0\dfbattle.GeneratedMSBuildEditorConfig.editorconfig
+E:\c#\dfbattle\obj\release\net6.0\dfbattle.AssemblyInfoInputs.cache
+E:\c#\dfbattle\obj\release\net6.0\dfbattle.AssemblyInfo.cs
+E:\c#\dfbattle\obj\release\net6.0\dfbattle.csproj.CoreCompileInputs.cache
+E:\c#\dfbattle\obj\release\net6.0\dfbattle.csproj.CopyComplete
+E:\c#\dfbattle\obj\release\net6.0\dfbattle.dll
+E:\c#\dfbattle\obj\release\net6.0\refint\dfbattle.dll
+E:\c#\dfbattle\obj\release\net6.0\dfbattle.pdb
+E:\c#\dfbattle\obj\release\net6.0\dfbattle.genruntimeconfig.cache
+E:\c#\dfbattle\obj\release\net6.0\ref\dfbattle.dll
diff --git a/obj/release/net6.0/dfbattle.dll b/obj/release/net6.0/dfbattle.dll
new file mode 100644
index 0000000..e2671eb
Binary files /dev/null and b/obj/release/net6.0/dfbattle.dll differ
diff --git a/obj/release/net6.0/dfbattle.genruntimeconfig.cache b/obj/release/net6.0/dfbattle.genruntimeconfig.cache
new file mode 100644
index 0000000..afb5705
--- /dev/null
+++ b/obj/release/net6.0/dfbattle.genruntimeconfig.cache
@@ -0,0 +1 @@
+b1c5d5d045f62e57123c8a694c181e97e73282cc
diff --git a/obj/release/net6.0/dfbattle.pdb b/obj/release/net6.0/dfbattle.pdb
new file mode 100644
index 0000000..862d1f9
Binary files /dev/null and b/obj/release/net6.0/dfbattle.pdb differ
diff --git a/obj/release/net6.0/ref/dfbattle.dll b/obj/release/net6.0/ref/dfbattle.dll
new file mode 100644
index 0000000..0610845
Binary files /dev/null and b/obj/release/net6.0/ref/dfbattle.dll differ
diff --git a/obj/release/net6.0/refint/dfbattle.dll b/obj/release/net6.0/refint/dfbattle.dll
new file mode 100644
index 0000000..0610845
Binary files /dev/null and b/obj/release/net6.0/refint/dfbattle.dll differ
diff --git a/pb/Comm.cs b/pb/Comm.cs
index 4512512..763659c 100644
--- a/pb/Comm.cs
+++ b/pb/Comm.cs
@@ -24,12 +24,16 @@ namespace Pb {
static CommReflection() {
byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat(
- "Cgpjb21tLnByb3RvEgJwYiI3CgpScGNNZXNzYWdlEgsKA3JpZBgBIAEoBBIO",
- "CgZtZXRob2QYAiABKAkSDAoEZGF0YRgDIAEoDGIGcHJvdG8z"));
+ "Cgpjb21tLnByb3RvEgJwYhoZZ29vZ2xlL3Byb3RvYnVmL2FueS5wcm90byJT",
+ "ChBCYXR0bGVScGNNZXNzYWdlEgsKA3JpZBgBIAEoBBIOCgZtZXRob2QYAiAB",
+ "KAkSIgoERGF0YRgDIAEoCzIULmdvb2dsZS5wcm90b2J1Zi5BbnkiLAoRQmF0",
+ "dGxlVGVzdE1lc3NhZ2USCgoCaWQYASABKAkSCwoDbXNnGAIgASgJYgZwcm90",
+ "bzM="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
- new pbr::FileDescriptor[] { },
+ new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.AnyReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
- new pbr::GeneratedClrTypeInfo(typeof(global::Pb.RpcMessage), global::Pb.RpcMessage.Parser, new[]{ "Rid", "Method", "Data" }, null, null, null, null)
+ new pbr::GeneratedClrTypeInfo(typeof(global::Pb.BattleRpcMessage), global::Pb.BattleRpcMessage.Parser, new[]{ "Rid", "Method", "Data" }, null, null, null, null),
+ new pbr::GeneratedClrTypeInfo(typeof(global::Pb.BattleTestMessage), global::Pb.BattleTestMessage.Parser, new[]{ "Id", "Msg" }, null, null, null, null)
}));
}
#endregion
@@ -39,16 +43,16 @@ namespace Pb {
///
///公用消息结构代码
///
- public sealed partial class RpcMessage : pb::IMessage
+ public sealed partial class BattleRpcMessage : pb::IMessage
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
, pb::IBufferMessage
#endif
{
- private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new RpcMessage());
+ private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new BattleRpcMessage());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
- public static pb::MessageParser Parser { get { return _parser; } }
+ public static pb::MessageParser Parser { get { return _parser; } }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
@@ -64,7 +68,7 @@ namespace Pb {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
- public RpcMessage() {
+ public BattleRpcMessage() {
OnConstruction();
}
@@ -72,17 +76,17 @@ namespace Pb {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
- public RpcMessage(RpcMessage other) : this() {
+ public BattleRpcMessage(BattleRpcMessage other) : this() {
rid_ = other.rid_;
method_ = other.method_;
- data_ = other.data_;
+ data_ = other.data_ != null ? other.data_.Clone() : null;
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
- public RpcMessage Clone() {
- return new RpcMessage(this);
+ public BattleRpcMessage Clone() {
+ return new BattleRpcMessage(this);
}
/// Field number for the "rid" field.
@@ -115,30 +119,27 @@ namespace Pb {
}
}
- /// Field number for the "data" field.
+ /// Field number for the "Data" field.
public const int DataFieldNumber = 3;
- private pb::ByteString data_ = pb::ByteString.Empty;
- ///
- ///数据
- ///
+ private global::Google.Protobuf.WellKnownTypes.Any data_;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
- public pb::ByteString Data {
+ public global::Google.Protobuf.WellKnownTypes.Any Data {
get { return data_; }
set {
- data_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ data_ = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public override bool Equals(object other) {
- return Equals(other as RpcMessage);
+ return Equals(other as BattleRpcMessage);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
- public bool Equals(RpcMessage other) {
+ public bool Equals(BattleRpcMessage other) {
if (ReferenceEquals(other, null)) {
return false;
}
@@ -147,7 +148,7 @@ namespace Pb {
}
if (Rid != other.Rid) return false;
if (Method != other.Method) return false;
- if (Data != other.Data) return false;
+ if (!object.Equals(Data, other.Data)) return false;
return Equals(_unknownFields, other._unknownFields);
}
@@ -157,7 +158,7 @@ namespace Pb {
int hash = 1;
if (Rid != 0UL) hash ^= Rid.GetHashCode();
if (Method.Length != 0) hash ^= Method.GetHashCode();
- if (Data.Length != 0) hash ^= Data.GetHashCode();
+ if (data_ != null) hash ^= Data.GetHashCode();
if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode();
}
@@ -184,9 +185,9 @@ namespace Pb {
output.WriteRawTag(18);
output.WriteString(Method);
}
- if (Data.Length != 0) {
+ if (data_ != null) {
output.WriteRawTag(26);
- output.WriteBytes(Data);
+ output.WriteMessage(Data);
}
if (_unknownFields != null) {
_unknownFields.WriteTo(output);
@@ -206,9 +207,9 @@ namespace Pb {
output.WriteRawTag(18);
output.WriteString(Method);
}
- if (Data.Length != 0) {
+ if (data_ != null) {
output.WriteRawTag(26);
- output.WriteBytes(Data);
+ output.WriteMessage(Data);
}
if (_unknownFields != null) {
_unknownFields.WriteTo(ref output);
@@ -226,8 +227,8 @@ namespace Pb {
if (Method.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(Method);
}
- if (Data.Length != 0) {
- size += 1 + pb::CodedOutputStream.ComputeBytesSize(Data);
+ if (data_ != null) {
+ size += 1 + pb::CodedOutputStream.ComputeMessageSize(Data);
}
if (_unknownFields != null) {
size += _unknownFields.CalculateSize();
@@ -237,7 +238,7 @@ namespace Pb {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
- public void MergeFrom(RpcMessage other) {
+ public void MergeFrom(BattleRpcMessage other) {
if (other == null) {
return;
}
@@ -247,8 +248,11 @@ namespace Pb {
if (other.Method.Length != 0) {
Method = other.Method;
}
- if (other.Data.Length != 0) {
- Data = other.Data;
+ if (other.data_ != null) {
+ if (data_ == null) {
+ Data = new global::Google.Protobuf.WellKnownTypes.Any();
+ }
+ Data.MergeFrom(other.Data);
}
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
}
@@ -274,7 +278,10 @@ namespace Pb {
break;
}
case 26: {
- Data = input.ReadBytes();
+ if (data_ == null) {
+ Data = new global::Google.Protobuf.WellKnownTypes.Any();
+ }
+ input.ReadMessage(Data);
break;
}
}
@@ -301,7 +308,236 @@ namespace Pb {
break;
}
case 26: {
- Data = input.ReadBytes();
+ if (data_ == null) {
+ Data = new global::Google.Protobuf.WellKnownTypes.Any();
+ }
+ input.ReadMessage(Data);
+ break;
+ }
+ }
+ }
+ }
+ #endif
+
+ }
+
+ public sealed partial class BattleTestMessage : pb::IMessage
+ #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+ , pb::IBufferMessage
+ #endif
+ {
+ private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new BattleTestMessage());
+ private pb::UnknownFieldSet _unknownFields;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public static pb::MessageParser Parser { get { return _parser; } }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public static pbr::MessageDescriptor Descriptor {
+ get { return global::Pb.CommReflection.Descriptor.MessageTypes[1]; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ pbr::MessageDescriptor pb::IMessage.Descriptor {
+ get { return Descriptor; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public BattleTestMessage() {
+ OnConstruction();
+ }
+
+ partial void OnConstruction();
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public BattleTestMessage(BattleTestMessage other) : this() {
+ id_ = other.id_;
+ msg_ = other.msg_;
+ _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public BattleTestMessage Clone() {
+ return new BattleTestMessage(this);
+ }
+
+ /// Field number for the "id" field.
+ public const int IdFieldNumber = 1;
+ private string id_ = "";
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public string Id {
+ get { return id_; }
+ set {
+ id_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
+ /// Field number for the "msg" field.
+ public const int MsgFieldNumber = 2;
+ private string msg_ = "";
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public string Msg {
+ get { return msg_; }
+ set {
+ msg_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public override bool Equals(object other) {
+ return Equals(other as BattleTestMessage);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public bool Equals(BattleTestMessage other) {
+ if (ReferenceEquals(other, null)) {
+ return false;
+ }
+ if (ReferenceEquals(other, this)) {
+ return true;
+ }
+ if (Id != other.Id) return false;
+ if (Msg != other.Msg) return false;
+ return Equals(_unknownFields, other._unknownFields);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public override int GetHashCode() {
+ int hash = 1;
+ if (Id.Length != 0) hash ^= Id.GetHashCode();
+ if (Msg.Length != 0) hash ^= Msg.GetHashCode();
+ if (_unknownFields != null) {
+ hash ^= _unknownFields.GetHashCode();
+ }
+ return hash;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public override string ToString() {
+ return pb::JsonFormatter.ToDiagnosticString(this);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public void WriteTo(pb::CodedOutputStream output) {
+ #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+ output.WriteRawMessage(this);
+ #else
+ if (Id.Length != 0) {
+ output.WriteRawTag(10);
+ output.WriteString(Id);
+ }
+ if (Msg.Length != 0) {
+ output.WriteRawTag(18);
+ output.WriteString(Msg);
+ }
+ if (_unknownFields != null) {
+ _unknownFields.WriteTo(output);
+ }
+ #endif
+ }
+
+ #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+ if (Id.Length != 0) {
+ output.WriteRawTag(10);
+ output.WriteString(Id);
+ }
+ if (Msg.Length != 0) {
+ output.WriteRawTag(18);
+ output.WriteString(Msg);
+ }
+ if (_unknownFields != null) {
+ _unknownFields.WriteTo(ref output);
+ }
+ }
+ #endif
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public int CalculateSize() {
+ int size = 0;
+ if (Id.Length != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeStringSize(Id);
+ }
+ if (Msg.Length != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeStringSize(Msg);
+ }
+ if (_unknownFields != null) {
+ size += _unknownFields.CalculateSize();
+ }
+ return size;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public void MergeFrom(BattleTestMessage other) {
+ if (other == null) {
+ return;
+ }
+ if (other.Id.Length != 0) {
+ Id = other.Id;
+ }
+ if (other.Msg.Length != 0) {
+ Msg = other.Msg;
+ }
+ _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ public void MergeFrom(pb::CodedInputStream input) {
+ #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+ input.ReadRawMessage(this);
+ #else
+ uint tag;
+ while ((tag = input.ReadTag()) != 0) {
+ switch(tag) {
+ default:
+ _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+ break;
+ case 10: {
+ Id = input.ReadString();
+ break;
+ }
+ case 18: {
+ Msg = input.ReadString();
+ break;
+ }
+ }
+ }
+ #endif
+ }
+
+ #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+ void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+ uint tag;
+ while ((tag = input.ReadTag()) != 0) {
+ switch(tag) {
+ default:
+ _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+ break;
+ case 10: {
+ Id = input.ReadString();
+ break;
+ }
+ case 18: {
+ Msg = input.ReadString();
break;
}
}