mmorpg/public
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat 修改usn类型为string

Browse Source
This commit is contained in:
DESKTOP-V763RJ7\Administrator
2026-01-11 15:58:16 +08:00
parent 63c8fb678c
commit 6bc9f18199
36 changed files with 2054 additions and 702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Proto/ServerClient/gen/client/Action.cs
View File

@@ -28,11 +28,11 @@ public static partial class ActionReflection {
"bhIQCghTZXF1ZW5jZRgBIAEoDRIRCglUaW1lc3RhbXAYAiABKAMSGQoGQWN0",
"aW9uGAMgASgOMgkuQWN0aW9uSUQSDAoERGlyWBgEIAEoERIMCgREaXJZGAUg",
"ASgREg8KB1NraWxsSUQYBiABKAUiMQoMUG9zaXRpb25JbmZvEgsKA1VTThgB",
"IAEoAxIJCgFYGAIgASgREgkKAVkYAyABKBEiKwoMUzJDX1Bvc2l0aW9uEhsK",
"IAEoCRIJCgFYGAIgASgREgkKAVkYAyABKBEiKwoMUzJDX1Bvc2l0aW9uEhsK",
"BEluZm8YASADKAsyDS5Qb3NpdGlvbkluZm8qSwoIQWN0aW9uSUQSFQoRQUNU",
"SU9OX0lEX0lOVkFMSUQQABISCg5BQ1RJT05fSURfTU9WRRABEhQKEEFDVElP",
"Tl9JRF9BVFRBQ0sQAkIXWhVjb21tb24vcHJvdG8vc2Mvc2NfcGJiBnByb3Rv",
"Mw=="));
"Tl9JRF9BVFRBQ0sQAkI0WjJnaXQuaGxzcS5hc2lhL21tb3JwZy9zZXJ2aWNl",
"LWNvbW1vbi9wcm90by9zYy9zY19wYmIGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::ScCommonReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ActionID), }, null, new pbr::GeneratedClrTypeInfo[] {
@@ -902,13 +902,13 @@ public sealed partial class PositionInfo : pb::IMessage<PositionInfo>
/// <summary>Field number for the "USN" field.</summary>
public const int USNFieldNumber = 1;
private long uSN_;
private string uSN_ = "";
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public long USN {
public string USN {
get { return uSN_; }
set {
uSN_ = value;
uSN_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
@@ -961,7 +961,7 @@ public sealed partial class PositionInfo : pb::IMessage<PositionInfo>
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public override int GetHashCode() {
int hash = 1;
if (USN != 0L) hash ^= USN.GetHashCode();
if (USN.Length != 0) hash ^= USN.GetHashCode();
if (X != 0) hash ^= X.GetHashCode();
if (Y != 0) hash ^= Y.GetHashCode();
if (_unknownFields != null) {
@@ -982,9 +982,9 @@ public sealed partial class PositionInfo : pb::IMessage<PositionInfo>
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
output.WriteRawMessage(this);
#else
if (USN != 0L) {
output.WriteRawTag(8);
output.WriteInt64(USN);
if (USN.Length != 0) {
output.WriteRawTag(10);
output.WriteString(USN);
}
if (X != 0) {
output.WriteRawTag(16);
@@ -1004,9 +1004,9 @@ public sealed partial class PositionInfo : pb::IMessage<PositionInfo>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
if (USN != 0L) {
output.WriteRawTag(8);
output.WriteInt64(USN);
if (USN.Length != 0) {
output.WriteRawTag(10);
output.WriteString(USN);
}
if (X != 0) {
output.WriteRawTag(16);
@@ -1026,8 +1026,8 @@ public sealed partial class PositionInfo : pb::IMessage<PositionInfo>
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public int CalculateSize() {
int size = 0;
if (USN != 0L) {
size += 1 + pb::CodedOutputStream.ComputeInt64Size(USN);
if (USN.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(USN);
}
if (X != 0) {
size += 1 + pb::CodedOutputStream.ComputeSInt32Size(X);
@@ -1047,7 +1047,7 @@ public sealed partial class PositionInfo : pb::IMessage<PositionInfo>
if (other == null) {
return;
}
if (other.USN != 0L) {
if (other.USN.Length != 0) {
USN = other.USN;
}
if (other.X != 0) {
@@ -1071,8 +1071,8 @@ public sealed partial class PositionInfo : pb::IMessage<PositionInfo>
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
break;
case 8: {
USN = input.ReadInt64();
case 10: {
USN = input.ReadString();
break;
}
case 16: {
@@ -1098,8 +1098,8 @@ public sealed partial class PositionInfo : pb::IMessage<PositionInfo>
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
break;
case 8: {
USN = input.ReadInt64();
case 10: {
USN = input.ReadString();
break;
}
case 16: {

3
Proto/ServerClient/gen/client/Define.cs
View File

@@ -28,7 +28,8 @@ public static partial class DefineReflection {
"X0tJQ0tfT1VUEAESFwoTTUVTU0FHRV9JRF9RVUVVRV9VUBACEhwKGE1FU1NB",
"R0VfSURfTE9HSU5fU1VDQ0VTUxADEh0KGU1FU1NBR0VfSURfRU5URVJfSU5T",
"VEFOQ0UQZRIVChFNRVNTQUdFX0lEX0FDVElPThBmEhcKE01FU1NBR0VfSURf",
"UE9TSVRJT04QZ0IXWhVjb21tb24vcHJvdG8vc2Mvc2NfcGJiBnByb3RvMw=="));
"UE9TSVRJT04QZ0I0WjJnaXQuaGxzcS5hc2lhL21tb3JwZy9zZXJ2aWNlLWNv",
"bW1vbi9wcm90by9zYy9zY19wYmIGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::ScCommonReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::MessageID), }, null, new pbr::GeneratedClrTypeInfo[] {

4
Proto/ServerClient/gen/client/ScCommon.cs
View File

@@ -22,8 +22,8 @@ public static partial class ScCommonReflection {
static ScCommonReflection() {
byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat(
"Cg9zY19jb21tb24ucHJvdG9CG1oZY29tbW9uL3Byb3RvL3NjL3NjX2NvbW1v",
"bmIGcHJvdG8z"));
"Cg9zY19jb21tb24ucHJvdG9COFo2Z2l0Lmhsc3EuYXNpYS9tbW9ycGcvc2Vy",
"dmljZS1jb21tb24vcHJvdG8vc2Mvc2NfY29tbW9uYgZwcm90bzM="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(null, null, null));

4
Proto/ServerClient/gen/client/Service.cs
View File

@@ -29,8 +29,8 @@ public static partial class ServiceReflection {
"VkFMSUQQABIfChtLSUNLX09VVF9JRF9EVVBMSUNBVEVfTE9HSU4QARIbChdL",
"SUNLX09VVF9JRF9TRVJWRVJfQlVTWRACEhwKGEtJQ0tfT1VUX0lEX1NFUlZF",
"Ul9DTE9TRRADEh0KGUtJQ0tfT1VUX0lEX1FVRVVFX1VQX0ZVTEwQBBIdChlL",
"SUNLX09VVF9JRF9UT0tFTl9JTlZBTElEEAVCF1oVY29tbW9uL3Byb3RvL3Nj",
"L3NjX3BiYgZwcm90bzM="));
"SUNLX09VVF9JRF9UT0tFTl9JTlZBTElEEAVCNFoyZ2l0Lmhsc3EuYXNpYS9t",
"bW9ycGcvc2VydmljZS1jb21tb24vcHJvdG8vc2Mvc2NfcGJiBnByb3RvMw=="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::ScCommonReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::KickOutID), }, null, new pbr::GeneratedClrTypeInfo[] {

8
Proto/ServerClient/gen/common/proto/sc/sc_common/sc_common.pb.go → Proto/ServerClient/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common/sc_common.pb.go
View File

@@ -23,9 +23,11 @@ var File_sc_common_proto protoreflect.FileDescriptor
var file_sc_common_proto_rawDesc = []byte{
0x0a, 0x0f, 0x73, 0x63, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x42, 0x1b, 0x5a, 0x19, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x2f, 0x73, 0x63, 0x2f, 0x73, 0x63, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x6f, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x2e, 0x68, 0x6c, 0x73, 0x71, 0x2e, 0x61, 0x73,
0x69, 0x61, 0x2f, 0x6d, 0x6d, 0x6f, 0x72, 0x70, 0x67, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
0x65, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73,
0x63, 0x2f, 0x73, 0x63, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
}
var file_sc_common_proto_goTypes = []interface{}{}

22
Proto/ServerClient/gen/common/proto/sc/sc_pb/action.pb.go → Proto/ServerClient/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/action.pb.go
View File

@@ -7,7 +7,7 @@
package sc_pb
import (
_ "common/proto/sc/sc_common"
_ "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -259,9 +259,9 @@ type PositionInfo struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
USN int64 `protobuf:"varint,1,opt,name=USN,proto3" json:"USN,omitempty"`
X int32 `protobuf:"zigzag32,2,opt,name=X,proto3" json:"X,omitempty"`
Y int32 `protobuf:"zigzag32,3,opt,name=Y,proto3" json:"Y,omitempty"`
USN string `protobuf:"bytes,1,opt,name=USN,proto3" json:"USN,omitempty"`
X int32 `protobuf:"zigzag32,2,opt,name=X,proto3" json:"X,omitempty"`
Y int32 `protobuf:"zigzag32,3,opt,name=Y,proto3" json:"Y,omitempty"`
}
func (x *PositionInfo) Reset() {
@@ -296,11 +296,11 @@ func (*PositionInfo) Descriptor() ([]byte, []int) {
return file_action_proto_rawDescGZIP(), []int{3}
}
func (x *PositionInfo) GetUSN() int64 {
func (x *PositionInfo) GetUSN() string {
if x != nil {
return x.USN
}
return 0
return ""
}
func (x *PositionInfo) GetX() int32 {
@@ -388,7 +388,7 @@ var file_action_proto_rawDesc = []byte{
0x12, 0x18, 0x0a, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x06, 0x20, 0x01, 0x28,
0x05, 0x52, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x22, 0x3c, 0x0a, 0x0c, 0x50, 0x6f,
0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x53,
0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x55, 0x53, 0x4e, 0x12, 0x0c, 0x0a, 0x01,
0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x53, 0x4e, 0x12, 0x0c, 0x0a, 0x01,
0x58, 0x18, 0x02, 0x20, 0x01, 0x28, 0x11, 0x52, 0x01, 0x58, 0x12, 0x0c, 0x0a, 0x01, 0x59, 0x18,
0x03, 0x20, 0x01, 0x28, 0x11, 0x52, 0x01, 0x59, 0x22, 0x31, 0x0a, 0x0c, 0x53, 0x32, 0x43, 0x5f,
0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f,
@@ -398,9 +398,11 @@ var file_action_proto_rawDesc = []byte{
0x4e, 0x5f, 0x49, 0x44, 0x5f, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x00, 0x12, 0x12,
0x0a, 0x0e, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x49, 0x44, 0x5f, 0x4d, 0x4f, 0x56, 0x45,
0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x49, 0x44, 0x5f,
0x41, 0x54, 0x54, 0x41, 0x43, 0x4b, 0x10, 0x02, 0x42, 0x17, 0x5a, 0x15, 0x63, 0x6f, 0x6d, 0x6d,
0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x63, 0x2f, 0x73, 0x63, 0x5f, 0x70,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x41, 0x54, 0x54, 0x41, 0x43, 0x4b, 0x10, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x2e,
0x68, 0x6c, 0x73, 0x71, 0x2e, 0x61, 0x73, 0x69, 0x61, 0x2f, 0x6d, 0x6d, 0x6f, 0x72, 0x70, 0x67,
0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x63, 0x2f, 0x73, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

10
Proto/ServerClient/gen/common/proto/sc/sc_pb/define.pb.go → Proto/ServerClient/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/define.pb.go
View File

@@ -7,7 +7,7 @@
package sc_pb
import (
_ "common/proto/sc/sc_common"
_ "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -158,9 +158,11 @@ var file_define_proto_rawDesc = []byte{
0x4e, 0x43, 0x45, 0x10, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45,
0x5f, 0x49, 0x44, 0x5f, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x66, 0x12, 0x17, 0x0a, 0x13,
0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x49, 0x44, 0x5f, 0x50, 0x4f, 0x53, 0x49, 0x54,
0x49, 0x4f, 0x4e, 0x10, 0x67, 0x42, 0x17, 0x5a, 0x15, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x63, 0x2f, 0x73, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x49, 0x4f, 0x4e, 0x10, 0x67, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x2e, 0x68, 0x6c, 0x73,
0x71, 0x2e, 0x61, 0x73, 0x69, 0x61, 0x2f, 0x6d, 0x6d, 0x6f, 0x72, 0x70, 0x67, 0x2f, 0x73, 0x65,
0x72, 0x76, 0x69, 0x63, 0x65, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x2f, 0x73, 0x63, 0x2f, 0x73, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
}
var (

10
Proto/ServerClient/gen/common/proto/sc/sc_pb/service.pb.go → Proto/ServerClient/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/service.pb.go
View File

@@ -7,7 +7,7 @@
package sc_pb
import (
_ "common/proto/sc/sc_common"
_ "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -249,9 +249,11 @@ var file_service_proto_rawDesc = []byte{
0x54, 0x5f, 0x49, 0x44, 0x5f, 0x51, 0x55, 0x45, 0x55, 0x45, 0x5f, 0x55, 0x50, 0x5f, 0x46, 0x55,
0x4c, 0x4c, 0x10, 0x04, 0x12, 0x1d, 0x0a, 0x19, 0x4b, 0x49, 0x43, 0x4b, 0x5f, 0x4f, 0x55, 0x54,
0x5f, 0x49, 0x44, 0x5f, 0x54, 0x4f, 0x4b, 0x45, 0x4e, 0x5f, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49,
0x44, 0x10, 0x05, 0x42, 0x17, 0x5a, 0x15, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x63, 0x2f, 0x73, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x33,
0x44, 0x10, 0x05, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x2e, 0x68, 0x6c, 0x73, 0x71, 0x2e,
0x61, 0x73, 0x69, 0x61, 0x2f, 0x6d, 0x6d, 0x6f, 0x72, 0x70, 0x67, 0x2f, 0x73, 0x65, 0x72, 0x76,
0x69, 0x63, 0x65, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x2f, 0x73, 0x63, 0x2f, 0x73, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
}
var (

4
Proto/ServerClient/sources/action.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto3";
option go_package = "common/proto/sc/sc_pb";
option go_package = "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb";
import "sc_common.proto";
// MESSAGE_ID_ENTER_INSTANCE
@@ -28,7 +28,7 @@ message C2S_Action {
// MESSAGE_ID_POSITION
message PositionInfo {
int64 USN = 1;
string USN = 1;
sint32 X = 2;
sint32 Y = 3;
}

2
Proto/ServerClient/sources/define.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto3";
option go_package = "common/proto/sc/sc_pb";
option go_package = "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb";
import "sc_common.proto";
enum MessageID {

2
Proto/ServerClient/sources/sc_common.proto
View File

@@ -1,3 +1,3 @@
syntax = "proto3";
option go_package = "common/proto/sc/sc_common";
option go_package = "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common";

2
Proto/ServerClient/sources/service.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto3";
option go_package = "common/proto/sc/sc_pb";
option go_package = "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb";
import "sc_common.proto";
// MESSAGE_ID_KICK_OUT