diff --git a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_gateway.pb.go b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_gateway.pb.go similarity index 98% rename from Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_gateway.pb.go rename to Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_gateway.pb.go index 302d9b1..4a5b323 100644 --- a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_gateway.pb.go +++ b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_gateway.pb.go @@ -7,7 +7,7 @@ package grpc_pb import ( - _ "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/rs/rs_common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -211,7 +211,7 @@ var File_service_gateway_proto protoreflect.FileDescriptor var file_service_gateway_proto_rawDesc = []byte{ 0x0a, 0x15, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, - 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, + 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x72, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x57, 0x0a, 0x0b, 0x54, 0x6f, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x53, 0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x53, 0x4e, 0x12, 0x1c, 0x0a, 0x09, 0x4d, 0x65, 0x73, @@ -231,7 +231,7 @@ var file_service_gateway_proto_rawDesc = []byte{ 0x65, 0x73, 0x70, 0x22, 0x00, 0x42, 0x36, 0x5a, 0x34, 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, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x74, 0x6f, 0x2f, 0x72, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_gateway_grpc.pb.go b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_gateway_grpc.pb.go similarity index 100% rename from Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_gateway_grpc.pb.go rename to Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_gateway_grpc.pb.go diff --git a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_scene.pb.go b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_scene.pb.go similarity index 99% rename from Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_scene.pb.go rename to Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_scene.pb.go index b678564..e6c9c0f 100644 --- a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_scene.pb.go +++ b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_scene.pb.go @@ -7,7 +7,7 @@ package grpc_pb import ( - _ "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/rs/rs_common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -377,7 +377,7 @@ var File_service_scene_proto protoreflect.FileDescriptor var file_service_scene_proto_rawDesc = []byte{ 0x0a, 0x13, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x72, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5c, 0x0a, 0x08, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x53, 0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x53, 0x4e, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, @@ -416,7 +416,7 @@ var file_service_scene_proto_rawDesc = []byte{ 0x0b, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x28, 0x01, 0x42, 0x36, 0x5a, 0x34, 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, 0x73, + 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x72, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_scene_grpc.pb.go b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_scene_grpc.pb.go similarity index 100% rename from Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_scene_grpc.pb.go rename to Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_scene_grpc.pb.go diff --git a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_user.pb.go b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_user.pb.go similarity index 99% rename from Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_user.pb.go rename to Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_user.pb.go index 4e96118..7155f03 100644 --- a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_user.pb.go +++ b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_user.pb.go @@ -7,7 +7,7 @@ package grpc_pb import ( - _ "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/rs/rs_common" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -547,7 +547,7 @@ var File_service_user_proto protoreflect.FileDescriptor var file_service_user_proto_rawDesc = []byte{ 0x0a, 0x12, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, + 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x72, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x34, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, @@ -611,7 +611,7 @@ var file_service_user_proto_rawDesc = []byte{ 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x36, 0x5a, 0x34, 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, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x74, 0x6f, 0x2f, 0x72, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_user.pb.gw.go b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_user.pb.gw.go similarity index 100% rename from Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_user.pb.gw.go rename to Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_user.pb.gw.go diff --git a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_user_grpc.pb.go b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_user_grpc.pb.go similarity index 100% rename from Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb/service_user_grpc.pb.go rename to Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb/service_user_grpc.pb.go diff --git a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common/ss_common.pb.go b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/rs_common/rs_common.pb.go similarity index 68% rename from Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common/ss_common.pb.go rename to Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/rs_common/rs_common.pb.go index 186d174..1071439 100644 --- a/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common/ss_common.pb.go +++ b/Proto/RpcServer/gen/git.hlsq.asia/mmorpg/service-common/proto/rs/rs_common/rs_common.pb.go @@ -2,9 +2,9 @@ // versions: // protoc-gen-go v1.32.0 // protoc v4.25.1 -// source: ss_common.proto +// source: rs_common.proto -package ss_common +package rs_common import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -32,7 +32,7 @@ type ErrorInfo struct { func (x *ErrorInfo) Reset() { *x = ErrorInfo{} if protoimpl.UnsafeEnabled { - mi := &file_ss_common_proto_msgTypes[0] + mi := &file_rs_common_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *ErrorInfo) String() string { func (*ErrorInfo) ProtoMessage() {} func (x *ErrorInfo) ProtoReflect() protoreflect.Message { - mi := &file_ss_common_proto_msgTypes[0] + mi := &file_rs_common_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *ErrorInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use ErrorInfo.ProtoReflect.Descriptor instead. func (*ErrorInfo) Descriptor() ([]byte, []int) { - return file_ss_common_proto_rawDescGZIP(), []int{0} + return file_rs_common_proto_rawDescGZIP(), []int{0} } func (x *ErrorInfo) GetCode() int32 { @@ -75,37 +75,37 @@ func (x *ErrorInfo) GetMsg() string { return "" } -var File_ss_common_proto protoreflect.FileDescriptor +var File_rs_common_proto protoreflect.FileDescriptor -var file_ss_common_proto_rawDesc = []byte{ - 0x0a, 0x0f, 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, +var file_rs_common_proto_rawDesc = []byte{ + 0x0a, 0x0f, 0x72, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x31, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 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, 0x73, 0x2f, 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, + 0x6f, 0x2f, 0x72, 0x73, 0x2f, 0x72, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_ss_common_proto_rawDescOnce sync.Once - file_ss_common_proto_rawDescData = file_ss_common_proto_rawDesc + file_rs_common_proto_rawDescOnce sync.Once + file_rs_common_proto_rawDescData = file_rs_common_proto_rawDesc ) -func file_ss_common_proto_rawDescGZIP() []byte { - file_ss_common_proto_rawDescOnce.Do(func() { - file_ss_common_proto_rawDescData = protoimpl.X.CompressGZIP(file_ss_common_proto_rawDescData) +func file_rs_common_proto_rawDescGZIP() []byte { + file_rs_common_proto_rawDescOnce.Do(func() { + file_rs_common_proto_rawDescData = protoimpl.X.CompressGZIP(file_rs_common_proto_rawDescData) }) - return file_ss_common_proto_rawDescData + return file_rs_common_proto_rawDescData } -var file_ss_common_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_ss_common_proto_goTypes = []interface{}{ +var file_rs_common_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_rs_common_proto_goTypes = []interface{}{ (*ErrorInfo)(nil), // 0: ErrorInfo } -var file_ss_common_proto_depIdxs = []int32{ +var file_rs_common_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -113,13 +113,13 @@ var file_ss_common_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_ss_common_proto_init() } -func file_ss_common_proto_init() { - if File_ss_common_proto != nil { +func init() { file_rs_common_proto_init() } +func file_rs_common_proto_init() { + if File_rs_common_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_ss_common_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_rs_common_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ErrorInfo); i { case 0: return &v.state @@ -136,18 +136,18 @@ func file_ss_common_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_ss_common_proto_rawDesc, + RawDescriptor: file_rs_common_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_ss_common_proto_goTypes, - DependencyIndexes: file_ss_common_proto_depIdxs, - MessageInfos: file_ss_common_proto_msgTypes, + GoTypes: file_rs_common_proto_goTypes, + DependencyIndexes: file_rs_common_proto_depIdxs, + MessageInfos: file_rs_common_proto_msgTypes, }.Build() - File_ss_common_proto = out.File - file_ss_common_proto_rawDesc = nil - file_ss_common_proto_goTypes = nil - file_ss_common_proto_depIdxs = nil + File_rs_common_proto = out.File + file_rs_common_proto_rawDesc = nil + file_rs_common_proto_goTypes = nil + file_rs_common_proto_depIdxs = nil } diff --git a/Proto/RpcServer/gen/ss_common.swagger.json b/Proto/RpcServer/gen/rs_common.swagger.json similarity index 95% rename from Proto/RpcServer/gen/ss_common.swagger.json rename to Proto/RpcServer/gen/rs_common.swagger.json index dfc1a16..be9cdd4 100644 --- a/Proto/RpcServer/gen/ss_common.swagger.json +++ b/Proto/RpcServer/gen/rs_common.swagger.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "title": "ss_common.proto", + "title": "rs_common.proto", "version": "version not set" }, "consumes": [ diff --git a/Proto/RpcServer/gen_proto.bat b/Proto/RpcServer/gen_proto.bat deleted file mode 100644 index 80d28a8..0000000 --- a/Proto/RpcServer/gen_proto.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off - -if not exist "./gen" ( - mkdir "./gen" -) - -protoc ^ ---proto_path=./sources ^ ---go_out=./gen ^ ---go-grpc_out=./gen ^ ---grpc-gateway_out=./gen ^ ---openapiv2_out=./gen ^ -./sources/*.proto \ No newline at end of file diff --git a/Proto/RpcServer/gen_proto.ps1 b/Proto/RpcServer/gen_proto.ps1 new file mode 100644 index 0000000..d62d129 --- /dev/null +++ b/Proto/RpcServer/gen_proto.ps1 @@ -0,0 +1,12 @@ +$gen = "gen" +if (!(Test-Path $gen)) { mkdir $gen | Out-Null } + +$files = Get-ChildItem sources/*.proto | ForEach-Object { $_.Name } + +protoc ` + --proto_path=sources ` + --go_out=$gen ` + --go-grpc_out=$gen ` + --grpc-gateway_out=$gen ` + --openapiv2_out=$gen ` + $files \ No newline at end of file diff --git a/Proto/RpcServer/sources/ss_common.proto b/Proto/RpcServer/sources/rs_common.proto similarity index 50% rename from Proto/RpcServer/sources/ss_common.proto rename to Proto/RpcServer/sources/rs_common.proto index c3a0a73..c674ecb 100644 --- a/Proto/RpcServer/sources/ss_common.proto +++ b/Proto/RpcServer/sources/rs_common.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common"; +option go_package = "git.hlsq.asia/mmorpg/service-common/proto/rs/rs_common"; message ErrorInfo { int32 Code = 1; diff --git a/Proto/RpcServer/sources/service_gateway.proto b/Proto/RpcServer/sources/service_gateway.proto index 4fedab2..ae8139a 100644 --- a/Proto/RpcServer/sources/service_gateway.proto +++ b/Proto/RpcServer/sources/service_gateway.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -option go_package = "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb"; -import "ss_common.proto"; +option go_package = "git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"; +import "rs_common.proto"; service Gateway { // 发送消息到客户端 diff --git a/Proto/RpcServer/sources/service_scene.proto b/Proto/RpcServer/sources/service_scene.proto index ecdb0d5..e38ef63 100644 --- a/Proto/RpcServer/sources/service_scene.proto +++ b/Proto/RpcServer/sources/service_scene.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -option go_package = "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb"; -import "ss_common.proto"; +option go_package = "git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"; +import "rs_common.proto"; service Scene { rpc Enter(EnterReq) returns (EnterResp) {} diff --git a/Proto/RpcServer/sources/service_user.proto b/Proto/RpcServer/sources/service_user.proto index eaab692..bb7247a 100644 --- a/Proto/RpcServer/sources/service_user.proto +++ b/Proto/RpcServer/sources/service_user.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -option go_package = "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb"; -import "ss_common.proto"; +option go_package = "git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"; +import "rs_common.proto"; import "google/api/annotations.proto"; service User { diff --git a/Proto/SocketServer/gen/client/Action.cs b/Proto/SocketServer/gen/client/Action.cs index 92fbbdf..05d649d 100644 --- a/Proto/SocketServer/gen/client/Action.cs +++ b/Proto/SocketServer/gen/client/Action.cs @@ -22,7 +22,7 @@ public static partial class ActionReflection { static ActionReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CgxhY3Rpb24ucHJvdG8aD3NjX2NvbW1vbi5wcm90byInChFDMlNfRW50ZXJJ", + "CgxhY3Rpb24ucHJvdG8aD3NzX2NvbW1vbi5wcm90byInChFDMlNfRW50ZXJJ", "bnN0YW5jZRISCgpJbnN0YW5jZUlEGAEgASgFIjAKEVMyQ19FbnRlckluc3Rh", "bmNlEhsKBEluZm8YASABKAsyDS5Qb3NpdGlvbkluZm8ieQoKQzJTX0FjdGlv", "bhIQCghTZXF1ZW5jZRgBIAEoDRIRCglUaW1lc3RhbXAYAiABKAMSGQoGQWN0", @@ -32,9 +32,9 @@ public static partial class ActionReflection { "BEluZm8YASADKAsyDS5Qb3NpdGlvbkluZm8qSwoIQWN0aW9uSUQSFQoRQUNU", "SU9OX0lEX0lOVkFMSUQQABISCg5BQ1RJT05fSURfTU9WRRABEhQKEEFDVElP", "Tl9JRF9BVFRBQ0sQAkI0WjJnaXQuaGxzcS5hc2lhL21tb3JwZy9zZXJ2aWNl", - "LWNvbW1vbi9wcm90by9zYy9zY19wYmIGcHJvdG8z")); + "LWNvbW1vbi9wcm90by9zcy9zc19wYmIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::ScCommonReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::SsCommonReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ActionID), }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::C2S_EnterInstance), global::C2S_EnterInstance.Parser, new[]{ "InstanceID" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::S2C_EnterInstance), global::S2C_EnterInstance.Parser, new[]{ "Info" }, null, null, null, null), diff --git a/Proto/SocketServer/gen/client/Define.cs b/Proto/SocketServer/gen/client/Define.cs index 552c49e..af9e5b4 100644 --- a/Proto/SocketServer/gen/client/Define.cs +++ b/Proto/SocketServer/gen/client/Define.cs @@ -22,16 +22,16 @@ public static partial class DefineReflection { static DefineReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CgxkZWZpbmUucHJvdG8aD3NjX2NvbW1vbi5wcm90byIyCgdNZXNzYWdlEhYK", + "CgxkZWZpbmUucHJvdG8aD3NzX2NvbW1vbi5wcm90byIyCgdNZXNzYWdlEhYK", "AklEGAEgASgOMgouTWVzc2FnZUlEEg8KB1BheWxvYWQYAiABKAwqwgEKCU1l", "c3NhZ2VJRBIWChJNRVNTQUdFX0lEX0lOVkFMSUQQABIXChNNRVNTQUdFX0lE", "X0tJQ0tfT1VUEAESFwoTTUVTU0FHRV9JRF9RVUVVRV9VUBACEhwKGE1FU1NB", "R0VfSURfTE9HSU5fU1VDQ0VTUxADEh0KGU1FU1NBR0VfSURfRU5URVJfSU5T", "VEFOQ0UQZRIVChFNRVNTQUdFX0lEX0FDVElPThBmEhcKE01FU1NBR0VfSURf", "UE9TSVRJT04QZ0I0WjJnaXQuaGxzcS5hc2lhL21tb3JwZy9zZXJ2aWNlLWNv", - "bW1vbi9wcm90by9zYy9zY19wYmIGcHJvdG8z")); + "bW1vbi9wcm90by9zcy9zc19wYmIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::ScCommonReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::SsCommonReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::MessageID), }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Message), global::Message.Parser, new[]{ "ID", "Payload" }, null, null, null, null) })); diff --git a/Proto/SocketServer/gen/client/Service.cs b/Proto/SocketServer/gen/client/Service.cs index ca0d3e4..1afb2f4 100644 --- a/Proto/SocketServer/gen/client/Service.cs +++ b/Proto/SocketServer/gen/client/Service.cs @@ -22,7 +22,7 @@ public static partial class ServiceReflection { static ServiceReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cg1zZXJ2aWNlLnByb3RvGg9zY19jb21tb24ucHJvdG8iJQoLUzJDX0tpY2tP", + "Cg1zZXJ2aWNlLnByb3RvGg9zc19jb21tb24ucHJvdG8iJQoLUzJDX0tpY2tP", "dXQSFgoCSUQYASABKA4yCi5LaWNrT3V0SUQiIwoLUzJDX1F1ZXVlVXASFAoM", "UXVldWVVcENvdW50GAEgASgFIiYKEFMyQ19Mb2dpblN1Y2Nlc3MSEgoKSW5z", "dGFuY2VJRBgBIAEoBSq+AQoJS2lja091dElEEhcKE0tJQ0tfT1VUX0lEX0lO", @@ -30,9 +30,9 @@ public static partial class ServiceReflection { "SUNLX09VVF9JRF9TRVJWRVJfQlVTWRACEhwKGEtJQ0tfT1VUX0lEX1NFUlZF", "Ul9DTE9TRRADEh0KGUtJQ0tfT1VUX0lEX1FVRVVFX1VQX0ZVTEwQBBIdChlL", "SUNLX09VVF9JRF9UT0tFTl9JTlZBTElEEAVCNFoyZ2l0Lmhsc3EuYXNpYS9t", - "bW9ycGcvc2VydmljZS1jb21tb24vcHJvdG8vc2Mvc2NfcGJiBnByb3RvMw==")); + "bW9ycGcvc2VydmljZS1jb21tb24vcHJvdG8vc3Mvc3NfcGJiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::ScCommonReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::SsCommonReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::KickOutID), }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::S2C_KickOut), global::S2C_KickOut.Parser, new[]{ "ID" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::S2C_QueueUp), global::S2C_QueueUp.Parser, new[]{ "QueueUpCount" }, null, null, null, null), diff --git a/Proto/SocketServer/gen/client/ScCommon.cs b/Proto/SocketServer/gen/client/SsCommon.cs similarity index 70% rename from Proto/SocketServer/gen/client/ScCommon.cs rename to Proto/SocketServer/gen/client/SsCommon.cs index f699d73..f57700c 100644 --- a/Proto/SocketServer/gen/client/ScCommon.cs +++ b/Proto/SocketServer/gen/client/SsCommon.cs @@ -1,6 +1,6 @@ // // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: sc_common.proto +// source: ss_common.proto // #pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code @@ -9,21 +9,21 @@ using pb = global::Google.Protobuf; using pbc = global::Google.Protobuf.Collections; using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; -/// Holder for reflection information generated from sc_common.proto -public static partial class ScCommonReflection { +/// Holder for reflection information generated from ss_common.proto +public static partial class SsCommonReflection { #region Descriptor - /// File descriptor for sc_common.proto + /// File descriptor for ss_common.proto public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; - static ScCommonReflection() { + static SsCommonReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cg9zY19jb21tb24ucHJvdG9COFo2Z2l0Lmhsc3EuYXNpYS9tbW9ycGcvc2Vy", - "dmljZS1jb21tb24vcHJvdG8vc2Mvc2NfY29tbW9uYgZwcm90bzM=")); + "Cg9zc19jb21tb24ucHJvdG9COFo2Z2l0Lmhsc3EuYXNpYS9tbW9ycGcvc2Vy", + "dmljZS1jb21tb24vcHJvdG8vc3Mvc3NfY29tbW9uYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, null)); diff --git a/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common/sc_common.pb.go b/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common/ss_common.pb.go similarity index 64% rename from Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common/sc_common.pb.go rename to Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common/ss_common.pb.go index 65d2c4f..28b12a8 100644 --- a/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common/sc_common.pb.go +++ b/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common/ss_common.pb.go @@ -2,9 +2,9 @@ // versions: // protoc-gen-go v1.32.0 // protoc v4.25.1 -// source: sc_common.proto +// source: ss_common.proto -package sc_common +package ss_common import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -19,19 +19,19 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -var File_sc_common_proto protoreflect.FileDescriptor +var File_ss_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, +var file_ss_common_proto_rawDesc = []byte{ + 0x0a, 0x0f, 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 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, + 0x73, 0x2f, 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } -var file_sc_common_proto_goTypes = []interface{}{} -var file_sc_common_proto_depIdxs = []int32{ +var file_ss_common_proto_goTypes = []interface{}{} +var file_ss_common_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -39,26 +39,26 @@ var file_sc_common_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_sc_common_proto_init() } -func file_sc_common_proto_init() { - if File_sc_common_proto != nil { +func init() { file_ss_common_proto_init() } +func file_ss_common_proto_init() { + if File_ss_common_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_sc_common_proto_rawDesc, + RawDescriptor: file_ss_common_proto_rawDesc, NumEnums: 0, NumMessages: 0, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_sc_common_proto_goTypes, - DependencyIndexes: file_sc_common_proto_depIdxs, + GoTypes: file_ss_common_proto_goTypes, + DependencyIndexes: file_ss_common_proto_depIdxs, }.Build() - File_sc_common_proto = out.File - file_sc_common_proto_rawDesc = nil - file_sc_common_proto_goTypes = nil - file_sc_common_proto_depIdxs = nil + File_ss_common_proto = out.File + file_ss_common_proto_rawDesc = nil + file_ss_common_proto_goTypes = nil + file_ss_common_proto_depIdxs = nil } diff --git a/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/action.pb.go b/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb/action.pb.go similarity index 98% rename from Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/action.pb.go rename to Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb/action.pb.go index a383b1f..cf9e13a 100644 --- a/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/action.pb.go +++ b/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb/action.pb.go @@ -4,10 +4,10 @@ // protoc v4.25.1 // source: action.proto -package sc_pb +package ss_pb import ( - _ "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -368,7 +368,7 @@ var File_action_proto protoreflect.FileDescriptor var file_action_proto_rawDesc = []byte{ 0x0a, 0x0c, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, - 0x73, 0x63, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, + 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x33, 0x0a, 0x11, 0x43, 0x32, 0x53, 0x5f, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, @@ -401,7 +401,7 @@ var file_action_proto_rawDesc = []byte{ 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, 0x2f, 0x73, 0x73, 0x2f, 0x73, 0x73, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/define.pb.go b/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb/define.pb.go similarity index 97% rename from Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/define.pb.go rename to Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb/define.pb.go index 2c6ace2..36fb014 100644 --- a/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/define.pb.go +++ b/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb/define.pb.go @@ -4,10 +4,10 @@ // protoc v4.25.1 // source: define.proto -package sc_pb +package ss_pb import ( - _ "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -141,7 +141,7 @@ var File_define_proto protoreflect.FileDescriptor var file_define_proto_rawDesc = []byte{ 0x0a, 0x0c, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, - 0x73, 0x63, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, + 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3f, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x44, 0x52, 0x02, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, @@ -161,7 +161,7 @@ var file_define_proto_rawDesc = []byte{ 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, 0x2f, 0x73, 0x73, 0x2f, 0x73, 0x73, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/service.pb.go b/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb/service.pb.go similarity index 98% rename from Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/service.pb.go rename to Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb/service.pb.go index 6f1e240..49d5397 100644 --- a/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb/service.pb.go +++ b/Proto/SocketServer/gen/git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb/service.pb.go @@ -4,10 +4,10 @@ // protoc v4.25.1 // source: service.proto -package sc_pb +package ss_pb import ( - _ "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common" + _ "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -227,7 +227,7 @@ var File_service_proto protoreflect.FileDescriptor var file_service_proto_rawDesc = []byte{ 0x0a, 0x0d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x0f, 0x73, 0x63, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x0f, 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x29, 0x0a, 0x0b, 0x53, 0x32, 0x43, 0x5f, 0x4b, 0x69, 0x63, 0x6b, 0x4f, 0x75, 0x74, 0x12, 0x1a, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x4b, 0x69, 0x63, 0x6b, 0x4f, 0x75, 0x74, 0x49, 0x44, 0x52, 0x02, 0x49, 0x44, 0x22, 0x31, 0x0a, 0x0b, 0x53, @@ -252,7 +252,7 @@ var file_service_proto_rawDesc = []byte{ 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, + 0x2f, 0x73, 0x73, 0x2f, 0x73, 0x73, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/Proto/SocketServer/gen_proto.bat b/Proto/SocketServer/gen_proto.bat deleted file mode 100644 index f617dec..0000000 --- a/Proto/SocketServer/gen_proto.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off - -if not exist "./gen" ( - mkdir "./gen" -) - -protoc --proto_path=./sources --go_out=./gen ./sources/*.proto - -if not exist "./gen/client" ( - mkdir "./gen/client" -) -protoc --proto_path=./sources --csharp_out=./gen/client ./sources/*.proto \ No newline at end of file diff --git a/Proto/SocketServer/gen_proto.ps1 b/Proto/SocketServer/gen_proto.ps1 new file mode 100644 index 0000000..62f31ad --- /dev/null +++ b/Proto/SocketServer/gen_proto.ps1 @@ -0,0 +1,17 @@ +$gen = "gen" +if (!(Test-Path $gen)) { mkdir $gen | Out-Null } + +$files = Get-ChildItem sources/*.proto | ForEach-Object { $_.Name } + +protoc ` + --proto_path=sources ` + --go_out=$gen ` + $files + +$clientDir = "$gen/client" +if (!(Test-Path $clientDir)) { mkdir $clientDir | Out-Null } + +protoc ` + --proto_path=sources ` + --csharp_out=$clientDir ` + $files \ No newline at end of file diff --git a/Proto/SocketServer/sources/action.proto b/Proto/SocketServer/sources/action.proto index cd478f9..630fca1 100644 --- a/Proto/SocketServer/sources/action.proto +++ b/Proto/SocketServer/sources/action.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -option go_package = "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb"; -import "sc_common.proto"; +option go_package = "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb"; +import "ss_common.proto"; // MESSAGE_ID_ENTER_INSTANCE message C2S_EnterInstance { diff --git a/Proto/SocketServer/sources/define.proto b/Proto/SocketServer/sources/define.proto index c8ac37d..8d9e991 100644 --- a/Proto/SocketServer/sources/define.proto +++ b/Proto/SocketServer/sources/define.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -option go_package = "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb"; -import "sc_common.proto"; +option go_package = "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb"; +import "ss_common.proto"; enum MessageID { MESSAGE_ID_INVALID = 0; diff --git a/Proto/SocketServer/sources/service.proto b/Proto/SocketServer/sources/service.proto index 0259fa9..f13ce2c 100644 --- a/Proto/SocketServer/sources/service.proto +++ b/Proto/SocketServer/sources/service.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -option go_package = "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb"; -import "sc_common.proto"; +option go_package = "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_pb"; +import "ss_common.proto"; // MESSAGE_ID_KICK_OUT enum KickOutID { diff --git a/Proto/SocketServer/sources/sc_common.proto b/Proto/SocketServer/sources/ss_common.proto similarity index 86% rename from Proto/SocketServer/sources/sc_common.proto rename to Proto/SocketServer/sources/ss_common.proto index fb137da..40ea943 100644 --- a/Proto/SocketServer/sources/sc_common.proto +++ b/Proto/SocketServer/sources/ss_common.proto @@ -1,3 +1,3 @@ syntax = "proto3"; -option go_package = "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_common"; \ No newline at end of file +option go_package = "git.hlsq.asia/mmorpg/service-common/proto/ss/ss_common"; \ No newline at end of file