From f9a86206289973a4125e4f57f4c09f5f893d4a60 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Thu, 10 Oct 2024 13:21:43 +0800 Subject: [PATCH] update --- data/i18n/languages.json | 2 + protocol/doc.md | 3 + protocol/upgrade/upgrade.pb.go | 360 +++++++++++++++++++++++++++++++++ protocol/upgrade/upgrade.proto | 27 +++ protocol/webapi/common.pb.go | 166 +++++++++++---- protocol/webapi/common.proto | 158 ++++++++------- 6 files changed, 605 insertions(+), 111 deletions(-) create mode 100644 protocol/upgrade/upgrade.pb.go create mode 100644 protocol/upgrade/upgrade.proto diff --git a/data/i18n/languages.json b/data/i18n/languages.json index 35281a4..4ca5e24 100644 --- a/data/i18n/languages.json +++ b/data/i18n/languages.json @@ -10,4 +10,6 @@ "MatchAward": "{\"zh\":\"恭喜您获得电话预付卡“%v$”话费充值奖励,兑换码:%v,请尽快使用\",\"vi\":\"Chúc mừng bạn đã nhận được Thẻ trả trước ĐT “%v$” phần thưởng nạp tiền tín dụng ĐT, mã đổi thưởng %v xin sử dụng ngay lập tức\",\"en\":\"Congratulations, you have received the phone prepaid card “%v$” mobile credit top-up reward, redemption code: %v please use it immediately.\",\"kh\":\"សូមអបអរសាទរ អ្នកទទួលបានរង្វាន់កាតបញ្ចូលទូរស័ព្ទ កាតទូរស័ព្ទបង់ប្រាក់ជាមុន “%v$”លេខកូដដោះដូរ %v សូមប្រើវាភ្លាមៗ\"}", "PermitAwardTitle": "{\"zh\":\"通行证排行奖励\",\"vi\":\"Vượt qua phần thưởng xếp hạng\",\"en\":\"Pass Ranking Rewards\",\"kh\":\"រង្វាន់ចំណាត់ថ្នាក់ឆ្លងកាត់\"}", "PermitAward": "{\"zh\":\"恭喜您在上个赛季通行证排行中名次达到%v名，排行奖励已发放，请查收\",\"vi\":\"Chúc mừng bạn đã đạt được %v trong bảng xếp hạng vượt qua. Phần thưởng xếp hạng đã được phân phối, vui lòng kiểm tra.\",\"en\":\"Congratulations on reaching %vth place in the pass ranking. Ranking rewards have been issued. Please check.\",\"kh\":\"សូមអបអរសាទរចំពោះការឈានដល់ចំណាត់ថ្នាក់ទី %v ក្នុងចំណាត់ថ្នាក់ឆ្លងកាត់។ រង្វាន់ចំណាត់ថ្នាក់ត្រូវបានចេញ។ សូមត្រួតពិនិត្យ។\"}" + "UpgradeTitle": "{\"zh\":\"升级奖励\",\"vi\":\"Phần thưởng nâng cấp\",\"en\":\"Upgrade rewards\",\"kh\":\"រង្វាន់បង់ប្រាក់\"}", + "Upgrade": "" } \ No newline at end of file diff --git a/protocol/doc.md b/protocol/doc.md index 6d8f4f4..2b387fc 100644 --- a/protocol/doc.md +++ b/protocol/doc.md @@ -75,6 +75,9 @@ - 2580~2599 - 2900~2999 +### upgrade.proto +- 3100~3199 + ## gamesrv ### fish diff --git a/protocol/upgrade/upgrade.pb.go b/protocol/upgrade/upgrade.pb.go new file mode 100644 index 0000000..91923ae --- /dev/null +++ b/protocol/upgrade/upgrade.pb.go @@ -0,0 +1,360 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.27.1-devel +// protoc v3.19.4 +// source: upgrade.proto + +package upgrade + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type PacketID int32 + +const ( + // 3100~3199 + PacketID_PacketID_Zero PacketID = 0 + PacketID_PACKET_CSClientUpgrades PacketID = 3100 + PacketID_PACKET_SCClientUpgrades PacketID = 3101 +) + +// Enum value maps for PacketID. +var ( + PacketID_name = map[int32]string{ + 0: "PacketID_Zero", + 3100: "PACKET_CSClientUpgrades", + 3101: "PACKET_SCClientUpgrades", + } + PacketID_value = map[string]int32{ + "PacketID_Zero": 0, + "PACKET_CSClientUpgrades": 3100, + "PACKET_SCClientUpgrades": 3101, + } +) + +func (x PacketID) Enum() *PacketID { + p := new(PacketID) + *p = x + return p +} + +func (x PacketID) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (PacketID) Descriptor() protoreflect.EnumDescriptor { + return file_upgrade_proto_enumTypes[0].Descriptor() +} + +func (PacketID) Type() protoreflect.EnumType { + return &file_upgrade_proto_enumTypes[0] +} + +func (x PacketID) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use PacketID.Descriptor instead. +func (PacketID) EnumDescriptor() ([]byte, []int) { + return file_upgrade_proto_rawDescGZIP(), []int{0} +} + +type PropInfo struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ItemId int32 `protobuf:"varint,1,opt,name=ItemId,proto3" json:"ItemId,omitempty"` //物品ID + ItemNum int64 `protobuf:"varint,2,opt,name=ItemNum,proto3" json:"ItemNum,omitempty"` //物品数量 +} + +func (x *PropInfo) Reset() { + *x = PropInfo{} + if protoimpl.UnsafeEnabled { + mi := &file_upgrade_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PropInfo) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PropInfo) ProtoMessage() {} + +func (x *PropInfo) ProtoReflect() protoreflect.Message { + mi := &file_upgrade_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PropInfo.ProtoReflect.Descriptor instead. +func (*PropInfo) Descriptor() ([]byte, []int) { + return file_upgrade_proto_rawDescGZIP(), []int{0} +} + +func (x *PropInfo) GetItemId() int32 { + if x != nil { + return x.ItemId + } + return 0 +} + +func (x *PropInfo) GetItemNum() int64 { + if x != nil { + return x.ItemNum + } + return 0 +} + +// 客户端升级奖励 +//PACKET_CSClientUpgrades +type CSClientUpgrades struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *CSClientUpgrades) Reset() { + *x = CSClientUpgrades{} + if protoimpl.UnsafeEnabled { + mi := &file_upgrade_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CSClientUpgrades) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CSClientUpgrades) ProtoMessage() {} + +func (x *CSClientUpgrades) ProtoReflect() protoreflect.Message { + mi := &file_upgrade_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CSClientUpgrades.ProtoReflect.Descriptor instead. +func (*CSClientUpgrades) Descriptor() ([]byte, []int) { + return file_upgrade_proto_rawDescGZIP(), []int{1} +} + +//PACKET_SCClientUpgrades +type SCClientUpgrades struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + On bool `protobuf:"varint,1,opt,name=On,proto3" json:"On,omitempty"` // 是否开启 + OnForce bool `protobuf:"varint,2,opt,name=OnForce,proto3" json:"OnForce,omitempty"` // 是否强制升级(没有关闭按钮) + Award []*PropInfo `protobuf:"bytes,3,rep,name=Award,proto3" json:"Award,omitempty"` // 奖励 + Version int32 `protobuf:"varint,4,opt,name=Version,proto3" json:"Version,omitempty"` // 版本号 +} + +func (x *SCClientUpgrades) Reset() { + *x = SCClientUpgrades{} + if protoimpl.UnsafeEnabled { + mi := &file_upgrade_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SCClientUpgrades) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SCClientUpgrades) ProtoMessage() {} + +func (x *SCClientUpgrades) ProtoReflect() protoreflect.Message { + mi := &file_upgrade_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SCClientUpgrades.ProtoReflect.Descriptor instead. +func (*SCClientUpgrades) Descriptor() ([]byte, []int) { + return file_upgrade_proto_rawDescGZIP(), []int{2} +} + +func (x *SCClientUpgrades) GetOn() bool { + if x != nil { + return x.On + } + return false +} + +func (x *SCClientUpgrades) GetOnForce() bool { + if x != nil { + return x.OnForce + } + return false +} + +func (x *SCClientUpgrades) GetAward() []*PropInfo { + if x != nil { + return x.Award + } + return nil +} + +func (x *SCClientUpgrades) GetVersion() int32 { + if x != nil { + return x.Version + } + return 0 +} + +var File_upgrade_proto protoreflect.FileDescriptor + +var file_upgrade_proto_rawDesc = []byte{ + 0x0a, 0x0d, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x07, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x22, 0x3c, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x70, + 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, + 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49, + 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x22, 0x12, 0x0a, 0x10, 0x43, 0x53, 0x43, 0x6c, 0x69, 0x65, + 0x6e, 0x74, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x73, 0x22, 0x7f, 0x0a, 0x10, 0x53, 0x43, + 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x73, 0x12, 0x0e, + 0x0a, 0x02, 0x4f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x18, + 0x0a, 0x07, 0x4f, 0x6e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x07, 0x4f, 0x6e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, + 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, + 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, + 0x64, 0x12, 0x18, 0x0a, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2a, 0x59, 0x0a, 0x08, 0x50, + 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x61, 0x63, 0x6b, 0x65, + 0x74, 0x49, 0x44, 0x5f, 0x5a, 0x65, 0x72, 0x6f, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, + 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x70, 0x67, + 0x72, 0x61, 0x64, 0x65, 0x73, 0x10, 0x9c, 0x18, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, + 0x45, 0x54, 0x5f, 0x53, 0x43, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x70, 0x67, 0x72, 0x61, + 0x64, 0x65, 0x73, 0x10, 0x9d, 0x18, 0x42, 0x27, 0x5a, 0x25, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, + 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_upgrade_proto_rawDescOnce sync.Once + file_upgrade_proto_rawDescData = file_upgrade_proto_rawDesc +) + +func file_upgrade_proto_rawDescGZIP() []byte { + file_upgrade_proto_rawDescOnce.Do(func() { + file_upgrade_proto_rawDescData = protoimpl.X.CompressGZIP(file_upgrade_proto_rawDescData) + }) + return file_upgrade_proto_rawDescData +} + +var file_upgrade_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_upgrade_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_upgrade_proto_goTypes = []interface{}{ + (PacketID)(0), // 0: upgrade.PacketID + (*PropInfo)(nil), // 1: upgrade.PropInfo + (*CSClientUpgrades)(nil), // 2: upgrade.CSClientUpgrades + (*SCClientUpgrades)(nil), // 3: upgrade.SCClientUpgrades +} +var file_upgrade_proto_depIdxs = []int32{ + 1, // 0: upgrade.SCClientUpgrades.Award:type_name -> upgrade.PropInfo + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_upgrade_proto_init() } +func file_upgrade_proto_init() { + if File_upgrade_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_upgrade_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PropInfo); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_upgrade_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CSClientUpgrades); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_upgrade_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SCClientUpgrades); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_upgrade_proto_rawDesc, + NumEnums: 1, + NumMessages: 3, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_upgrade_proto_goTypes, + DependencyIndexes: file_upgrade_proto_depIdxs, + EnumInfos: file_upgrade_proto_enumTypes, + MessageInfos: file_upgrade_proto_msgTypes, + }.Build() + File_upgrade_proto = out.File + file_upgrade_proto_rawDesc = nil + file_upgrade_proto_goTypes = nil + file_upgrade_proto_depIdxs = nil +} diff --git a/protocol/upgrade/upgrade.proto b/protocol/upgrade/upgrade.proto new file mode 100644 index 0000000..d115005 --- /dev/null +++ b/protocol/upgrade/upgrade.proto @@ -0,0 +1,27 @@ +syntax = "proto3"; +package upgrade; +option go_package = "mongo.games.com/game/protocol/upgrade"; + +enum PacketID { + // 3100~3199 + PacketID_Zero = 0; + PACKET_CSClientUpgrades = 3100; + PACKET_SCClientUpgrades = 3101; +} + +message PropInfo{ + int32 ItemId = 1;//物品ID + int64 ItemNum = 2;//物品数量 +} + +// 客户端升级奖励 +//PACKET_CSClientUpgrades +message CSClientUpgrades{ +} +//PACKET_SCClientUpgrades +message SCClientUpgrades{ + bool On = 1; // 是否开启 + bool OnForce = 2; // 是否强制升级(没有关闭按钮) + repeated PropInfo Award = 3; // 奖励 + int32 Version = 4; // 版本号 +} \ No newline at end of file diff --git a/protocol/webapi/common.pb.go b/protocol/webapi/common.pb.go index 5a17a03..c26ae0b 100644 --- a/protocol/webapi/common.pb.go +++ b/protocol/webapi/common.pb.go @@ -8921,6 +8921,78 @@ func (x *RoomConfigSystem) GetOn() int32 { return 0 } +// etcd /game/client_upgrade +type ClientUpgrade struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Platform string `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台 + On int32 `protobuf:"varint,2,opt,name=On,proto3" json:"On,omitempty"` // 开关 1开启 2关闭 + OnForce int32 `protobuf:"varint,3,opt,name=OnForce,proto3" json:"OnForce,omitempty"` // 强制升级开关 1开启 2关闭 + Reward []*ItemInfo `protobuf:"bytes,4,rep,name=Reward,proto3" json:"Reward,omitempty"` // 奖励 +} + +func (x *ClientUpgrade) Reset() { + *x = ClientUpgrade{} + if protoimpl.UnsafeEnabled { + mi := &file_common_proto_msgTypes[93] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ClientUpgrade) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ClientUpgrade) ProtoMessage() {} + +func (x *ClientUpgrade) ProtoReflect() protoreflect.Message { + mi := &file_common_proto_msgTypes[93] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ClientUpgrade.ProtoReflect.Descriptor instead. +func (*ClientUpgrade) Descriptor() ([]byte, []int) { + return file_common_proto_rawDescGZIP(), []int{93} +} + +func (x *ClientUpgrade) GetPlatform() string { + if x != nil { + return x.Platform + } + return "" +} + +func (x *ClientUpgrade) GetOn() int32 { + if x != nil { + return x.On + } + return 0 +} + +func (x *ClientUpgrade) GetOnForce() int32 { + if x != nil { + return x.OnForce + } + return 0 +} + +func (x *ClientUpgrade) GetReward() []*ItemInfo { + if x != nil { + return x.Reward + } + return nil +} + var File_common_proto protoreflect.FileDescriptor var file_common_proto_rawDesc = []byte{ @@ -10319,10 +10391,18 @@ var file_common_proto_rawDesc = []byte{ 0x26, 0x0a, 0x0e, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x6e, 0x18, 0x0e, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, - 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x22, 0x7f, 0x0a, 0x0d, 0x43, 0x6c, 0x69, 0x65, 0x6e, + 0x74, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, + 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, + 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x6e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x4f, 0x6e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x28, + 0x0a, 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, + 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, + 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -10337,7 +10417,7 @@ func file_common_proto_rawDescGZIP() []byte { return file_common_proto_rawDescData } -var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 103) +var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 104) var file_common_proto_goTypes = []interface{}{ (*MysqlDbSetting)(nil), // 0: webapi.MysqlDbSetting (*MongoDbSetting)(nil), // 1: webapi.MongoDbSetting @@ -10432,32 +10512,33 @@ var file_common_proto_goTypes = []interface{}{ (*RoomType)(nil), // 90: webapi.RoomType (*RoomConfig)(nil), // 91: webapi.RoomConfig (*RoomConfigSystem)(nil), // 92: webapi.RoomConfigSystem - nil, // 93: webapi.Platform.BindTelRewardEntry - nil, // 94: webapi.PlayerData.RankScoreEntry - nil, // 95: webapi.ItemShop.AwardEntry - nil, // 96: webapi.VIPcfg.AwardEntry - nil, // 97: webapi.VIPcfg.Privilege1Entry - nil, // 98: webapi.VIPcfg.Privilege7Entry - nil, // 99: webapi.VIPcfg.Privilege9Entry - nil, // 100: webapi.ActInviteConfig.PayScoreEntry - nil, // 101: webapi.SkinLevel.UpItemEntry - nil, // 102: webapi.SkinItem.UnlockParamEntry - (*server.DB_GameFree)(nil), // 103: server.DB_GameFree - (*server.DB_GameItem)(nil), // 104: server.DB_GameItem + (*ClientUpgrade)(nil), // 93: webapi.ClientUpgrade + nil, // 94: webapi.Platform.BindTelRewardEntry + nil, // 95: webapi.PlayerData.RankScoreEntry + nil, // 96: webapi.ItemShop.AwardEntry + nil, // 97: webapi.VIPcfg.AwardEntry + nil, // 98: webapi.VIPcfg.Privilege1Entry + nil, // 99: webapi.VIPcfg.Privilege7Entry + nil, // 100: webapi.VIPcfg.Privilege9Entry + nil, // 101: webapi.ActInviteConfig.PayScoreEntry + nil, // 102: webapi.SkinLevel.UpItemEntry + nil, // 103: webapi.SkinItem.UnlockParamEntry + (*server.DB_GameFree)(nil), // 104: server.DB_GameFree + (*server.DB_GameItem)(nil), // 105: server.DB_GameItem } var file_common_proto_depIdxs = []int32{ 2, // 0: webapi.Platform.Leaderboard:type_name -> webapi.RankSwitch 3, // 1: webapi.Platform.ClubConfig:type_name -> webapi.ClubConfig 4, // 2: webapi.Platform.ThirdGameMerchant:type_name -> webapi.ThirdGame - 93, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry + 94, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry 6, // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus - 103, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree + 104, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree 8, // 6: webapi.PlatformGameConfig.DbGameFrees:type_name -> webapi.GameFree 0, // 7: webapi.PlatformDbConfig.Mysql:type_name -> webapi.MysqlDbSetting 1, // 8: webapi.PlatformDbConfig.MongoDb:type_name -> webapi.MongoDbSetting 1, // 9: webapi.PlatformDbConfig.MongoDbLog:type_name -> webapi.MongoDbSetting - 103, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree - 94, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry + 104, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree + 95, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry 32, // 12: webapi.PlayerData.Items:type_name -> webapi.ItemInfo 14, // 13: webapi.PlayerData.RoleUnlockList:type_name -> webapi.ModInfo 14, // 14: webapi.PlayerData.PetUnlockList:type_name -> webapi.ModInfo @@ -10470,7 +10551,7 @@ var file_common_proto_depIdxs = []int32{ 32, // 21: webapi.ExchangeShop.Items:type_name -> webapi.ItemInfo 25, // 22: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop 29, // 23: webapi.ExchangeShopList.Weight:type_name -> webapi.ShopWeight - 95, // 24: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry + 96, // 24: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry 30, // 25: webapi.ItemShopList.List:type_name -> webapi.ItemShop 32, // 26: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo 33, // 27: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward @@ -10491,14 +10572,14 @@ var file_common_proto_depIdxs = []int32{ 38, // 42: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate 48, // 43: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree 48, // 44: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree - 96, // 45: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry - 97, // 46: webapi.VIPcfg.Privilege1:type_name -> webapi.VIPcfg.Privilege1Entry - 98, // 47: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry - 99, // 48: webapi.VIPcfg.Privilege9:type_name -> webapi.VIPcfg.Privilege9Entry + 97, // 45: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry + 98, // 46: webapi.VIPcfg.Privilege1:type_name -> webapi.VIPcfg.Privilege1Entry + 99, // 47: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry + 100, // 48: webapi.VIPcfg.Privilege9:type_name -> webapi.VIPcfg.Privilege9Entry 51, // 49: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg 38, // 50: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate 55, // 51: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig - 100, // 52: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry + 101, // 52: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry 62, // 53: webapi.ActInviteConfig.Awards1:type_name -> webapi.RankAward 62, // 54: webapi.ActInviteConfig.Awards2:type_name -> webapi.RankAward 62, // 55: webapi.ActInviteConfig.Awards3:type_name -> webapi.RankAward @@ -10515,12 +10596,12 @@ var file_common_proto_depIdxs = []int32{ 69, // 66: webapi.DiamondLotteryData.Info:type_name -> webapi.DiamondLotteryInfo 70, // 67: webapi.DiamondLotteryData.Players:type_name -> webapi.DiamondLotteryPlayers 72, // 68: webapi.DiamondLotteryConfig.LotteryData:type_name -> webapi.DiamondLotteryData - 104, // 69: webapi.ItemConfig.Items:type_name -> server.DB_GameItem + 105, // 69: webapi.ItemConfig.Items:type_name -> server.DB_GameItem 32, // 70: webapi.RankAwardInfo.Item:type_name -> webapi.ItemInfo 75, // 71: webapi.RankTypeInfo.Award:type_name -> webapi.RankAwardInfo 76, // 72: webapi.RankTypeConfig.Info:type_name -> webapi.RankTypeInfo - 101, // 73: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry - 102, // 74: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry + 102, // 73: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry + 103, // 74: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry 78, // 75: webapi.SkinItem.Levels:type_name -> webapi.SkinLevel 79, // 76: webapi.SkinConfig.Items:type_name -> webapi.SkinItem 82, // 77: webapi.AwardLogConfig.AwardLog:type_name -> webapi.AwardLogData @@ -10529,11 +10610,12 @@ var file_common_proto_depIdxs = []int32{ 87, // 80: webapi.MachineConfig.Info:type_name -> webapi.MachineInfo 32, // 81: webapi.RoomConfig.Cost:type_name -> webapi.ItemInfo 32, // 82: webapi.RoomConfig.Reward:type_name -> webapi.ItemInfo - 83, // [83:83] is the sub-list for method output_type - 83, // [83:83] is the sub-list for method input_type - 83, // [83:83] is the sub-list for extension type_name - 83, // [83:83] is the sub-list for extension extendee - 0, // [0:83] is the sub-list for field type_name + 32, // 83: webapi.ClientUpgrade.Reward:type_name -> webapi.ItemInfo + 84, // [84:84] is the sub-list for method output_type + 84, // [84:84] is the sub-list for method input_type + 84, // [84:84] is the sub-list for extension type_name + 84, // [84:84] is the sub-list for extension extendee + 0, // [0:84] is the sub-list for field type_name } func init() { file_common_proto_init() } @@ -11658,6 +11740,18 @@ func file_common_proto_init() { return nil } } + file_common_proto_msgTypes[93].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ClientUpgrade); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -11665,7 +11759,7 @@ func file_common_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_common_proto_rawDesc, NumEnums: 0, - NumMessages: 103, + NumMessages: 104, NumExtensions: 0, NumServices: 0, }, diff --git a/protocol/webapi/common.proto b/protocol/webapi/common.proto index 02a6e8b..f2986c8 100644 --- a/protocol/webapi/common.proto +++ b/protocol/webapi/common.proto @@ -90,7 +90,7 @@ message Platform { bool IsCanUserBindPromoter = 33; //是否允许用户手动绑定推广员 int32 UserBindPromoterPrize = 34; //手动绑定奖励 string MerchantKey = 35;//商户秘钥 - map BindTelReward = 36; // 绑定手机奖励；奖励id：数量 + map BindTelReward = 36; // 绑定手机奖励；奖励id：数量 } // 游戏状态结构 @@ -190,7 +190,7 @@ message PlayerData{ int64 PlayerPoolUpper = 41; // 个人水池上限值 int64 PlayerPoolLower = 42; // 个人水池下限值 int64 PlayerPoolRate = 43; // 个人水池控制值 - map RankScore = 44; // 排位积分 1 tienlen排位积分 + map RankScore = 44; // 排位积分 1 tienlen排位积分 int64 RoleAdded = 45;//人物加成 int64 VipAdded = 46;//VIP加成 int64 VipExp = 47;//VIP经验 @@ -298,7 +298,7 @@ message CoinPoolSetting{ int32 LowerOddsMax = 12; // 下线最大概率 int32 ProfitRate = 13;//营收比例，千分比 int64 ResetTime = 14; // 重置时间 - int32 Switch =15; // 开关 0开启 1关闭 + int32 Switch = 15; // 开关 0开启 1关闭 int64 CoinValue = 16; // 当前水位 int64 ProfitPool = 17; // 收益池水位 int32 CtrlRate = 18; //调节赔率，万分比 @@ -364,8 +364,8 @@ message CommonNotice { int32 CategoryType = 9; string ImgUrl = 10; int32 NoticeId = 11; - int32 IsLoop=12; - int32 LoopTime=13; + int32 IsLoop = 12; + int32 LoopTime = 13; repeated string OnChannelName = 14; string Url = 15; } @@ -390,15 +390,15 @@ message ExchangeShop { int32 NotVipDayMaxLimit = 13;//非VIP每日限购 int32 VipShopLimit = 14;//VIP限购总数 int32 NotVipShopLimit = 15;//非VIP限购总数 - int32 ShopType = 16; //商品类型 + int32 ShopType = 16; //商品类型 repeated TelChargeData TelData = 17; repeated ItemInfo Items = 18; } message TelChargeData{ - int32 Id = 1; - string Name = 2; - string Url = 3; + int32 Id = 1; + string Name = 2; + string Url = 3; } //兑换类型 @@ -406,7 +406,7 @@ message ExchangeType{ int32 Price = 1; // 消耗V卡数量 int32 JPrice = 2; //消耗金券数量 int32 Cash = 3; //消耗现金数量 - int32 DPrice = 4; //消耗娃娃卡数量 + int32 DPrice = 4; //消耗娃娃卡数量 int32 Id = 5; //行数 } @@ -418,11 +418,11 @@ message ExchangeShopList{ } message ShopWeight{ - int32 ShopType = 1; - int32 Weight = 2; - string Name = 3; - int32 IsShow = 4; - repeated int32 Location = 5; // 显示位置 + int32 ShopType = 1; + int32 Weight = 2; + string Name = 3; + int32 IsShow = 4; + repeated int32 Location = 5; // 显示位置 } @@ -444,8 +444,8 @@ message ItemShop { int32 Amount = 15; // 货币金额 int32 ConstType = 16; // 购买消耗类型 1，金币 2，钻石 3，美金 4，柬埔寨币 repeated int32 CostArea = 17; //消耗区间 - map Award = 18; //加赠物品 - int32 VipLevel =19; //Vip等级限制 + map Award = 18; //加赠物品 + int32 VipLevel = 19; //Vip等级限制 int32 Ratio = 20; //权重 int32 EndTime = 21; //新手礼包结束时间间隔 bool FirstSwitch = 22; //首冲翻倍开关 @@ -499,7 +499,7 @@ message GameMatchDate { repeated string OnChannelName = 23; // 开启的渠道名称 int32 CardType = 24; // 手机卡类型 int32 ShowId = 25; // 比赛区分 - int32 AwardNum = 26; //比赛奖励剩余数量 + int32 AwardNum = 26; //比赛奖励剩余数量 int32 AudienceSwitch = 27; // 观战开关 1开启 2关闭 } @@ -624,23 +624,23 @@ message WelfareContinuousPayDataList{ message VIPcfg { int32 VipId = 1; // 序号 - map Award = 2; // 道具 + map Award = 2; // 道具 int32 VipEx = 3; // VIP经验 int64 Price = 4; // 金额 - map Privilege1 = 5; //特权1 VIP比赛场免费次数 + map Privilege1 = 5; //特权1 VIP比赛场免费次数 repeated int32 Privilege2 = 6; //每日金币 0金币值 1充值金额 repeated int32 Privilege3 = 7; int32 Privilege4 = 8; int32 Privilege5 = 9; int32 Privilege6 = 10; - map Privilege7 = 11; + map Privilege7 = 11; int32 Privilege7Price = 12; int32 Privilege8 = 13; repeated int32 RewardOutlineID = 14; int32 ShopId2 = 15; int32 ShopId7 = 16; int32 MatchFreeTimes = 17; // vip比赛场免费次数 - map Privilege9 = 18; // vip免费礼包，每个vip等级领取一次 + map Privilege9 = 18; // vip免费礼包，每个vip等级领取一次 } // etcd /game/VIPcfg VIP配置 @@ -667,9 +667,9 @@ message EntrySwitch{ } message ChessRankConfig { - string Name = 1; // 段位名称 - int32 Score = 2; // 积分 - repeated WelfareDate Item = 3; // 道具 + string Name = 1; // 段位名称 + int32 Score = 2; // 积分 + repeated WelfareDate Item = 3; // 道具 } message ChessRankcfgData{ @@ -735,7 +735,7 @@ message ActInviteConfig { string Platform = 1; int64 BindScore = 2; // 绑定积分 int64 RechargeScore = 3; // 充值积分，一个玩家最多给上级贡献一次 - map PayScore = 4; // 充值积分；充值金额：获得积分 + map PayScore = 4; // 充值积分；充值金额：获得积分 repeated int64 Rates = 5; // 返佣比例；多级按顺序给 repeated RankAward Awards1 = 6; // 周榜奖励列表 repeated RankAward Awards2 = 7; // 周榜奖励列表 @@ -787,36 +787,36 @@ message ActPermitConfig{ //钻石抽奖 message DiamondLotteryInfo{ - int32 Id = 1; - int32 Type = 2; - string Name = 3; - int32 ItemId = 4; - int32 Grade = 5; - int32 Oddrate =6; + int32 Id = 1; + int32 Type = 2; + string Name = 3; + int32 ItemId = 4; + int32 Grade = 5; + int32 Oddrate = 6; } //钻石抽奖白名单 message DiamondLotteryPlayers{ - int32 uid = 1; - int32 Count = 2; //抽奖次数 - repeated AwardData Award = 3; //配置表里的奖励ID + int32 uid = 1; + int32 Count = 2; //抽奖次数 + repeated AwardData Award = 3; //配置表里的奖励ID } message AwardData{ - int32 AwardId = 1; - int32 Weight = 2; + int32 AwardId = 1; + int32 Weight = 2; } message DiamondLotteryData{ - string Channel = 1; //渠道 - repeated DiamondLotteryInfo Info = 2; - int32 MaxScore = 3; //保底奖励最大值 - int32 DiamondNum = 4; //单次抽奖消耗钻石数量 - repeated DiamondLotteryPlayers Players = 5;//白名单 - + string Channel = 1; //渠道 + repeated DiamondLotteryInfo Info = 2; + int32 MaxScore = 3; //保底奖励最大值 + int32 DiamondNum = 4; //单次抽奖消耗钻石数量 + repeated DiamondLotteryPlayers Players = 5;//白名单 + } // etcd /game/diamond_lottery message DiamondLotteryConfig{ - string Platform = 1; // 平台 - repeated DiamondLotteryData LotteryData = 2; + string Platform = 1; // 平台 + repeated DiamondLotteryData LotteryData = 2; } // etcd /game/item @@ -826,19 +826,19 @@ message ItemConfig { } message RankAwardInfo{ - int32 Id =1; - int32 RankType =2; - int32 RankLevelId = 3; - repeated ItemInfo Item = 4; // 道具 + int32 Id = 1; + int32 RankType = 2; + int32 RankLevelId = 3; + repeated ItemInfo Item = 4; // 道具 } message RankTypeInfo{ - int32 Id =1; - int32 Order = 2; - string RankName = 3; - int32 RankType = 4; - int32 TurnOff = 5; //奖励开关 - repeated RankAwardInfo Award= 6; + int32 Id = 1; + int32 Order = 2; + string RankName = 3; + int32 RankType = 4; + int32 TurnOff = 5; //奖励开关 + repeated RankAwardInfo Award = 6; } //etcd /game/RankType message RankTypeConfig{ @@ -847,7 +847,7 @@ message RankTypeConfig{ } message SkinLevel { int32 Level = 1; // 等级 - map UpItem = 2; // 升级所需道具 + map UpItem = 2; // 升级所需道具 int32 SkillId = 3; // 技能id int32 SkillLevel = 4; // 技能等级 int32 SkillValue = 5; // 技能属性值 @@ -856,7 +856,7 @@ message SkinLevel { message SkinItem { int32 Id = 1; // 皮肤id int32 UnlockType = 2; // 解锁类型 0默认使用 1自动使用道具解锁并使用 2使用道具解锁 - map UnlockParam = 3; // 解锁所需道具 + map UnlockParam = 3; // 解锁所需道具 int32 IsUpgrade = 4; // 升级开关 1开启 2关闭 int32 SkillType = 5; // 技能生效类型 0获得后生效 1穿戴生效 repeated SkinLevel Levels = 6; // 等级列表 @@ -864,27 +864,27 @@ message SkinItem { // etcd /game/skin_config message SkinConfig { - string Platform = 1; // 平台 - repeated SkinItem Items = 2; // 皮肤列表 + string Platform = 1; // 平台 + repeated SkinItem Items = 2; // 皮肤列表 } // etcd /game/awardlog_config message AwardLogConfig{ - string Platform = 1; // 平台 - repeated AwardLogData AwardLog =2; - repeated AnnouncerLogInfo AnnouncerLog = 3; - + string Platform = 1; // 平台 + repeated AwardLogData AwardLog = 2; + repeated AnnouncerLogInfo AnnouncerLog = 3; + } message AwardLogData{ - int32 TypeId = 1; //1话费 2实物 - int32 SortId = 2; //排序類型 1-数量 2-序号 - repeated AwardLogInfo AwardLog =3; + int32 TypeId = 1; //1话费 2实物 + int32 SortId = 2; //排序類型 1-数量 2-序号 + repeated AwardLogInfo AwardLog = 3; } message AwardLogInfo{ int32 ItemId = 2; //道具ID - int64 Num = 4; //数量 - string Url = 5; //话费icon - int32 Order = 6; //序号 + int64 Num = 4; //数量 + string Url = 5; //话费icon + int32 Order = 6; //序号 } //实时播报 @@ -893,7 +893,7 @@ message AnnouncerLogInfo{ string Name = 2; //玩家名字 string Phone = 3; //电话 int32 ItemId = 4; //获得物品ID - int32 TypeId = 5; //1-话费 2-实物 + int32 TypeId = 5; //1-话费 2-实物 } // etcd /game/guide_config @@ -906,17 +906,17 @@ message GuideConfig { //娃娃机配置视频 // etcd /game/machine_config message MachineConfig{ - string Platform = 1; // 平台 - repeated MachineInfo Info = 2; + string Platform = 1; // 平台 + repeated MachineInfo Info = 2; } message MachineInfo{ int32 MachineId = 1; //娃娃机Id int64 AppId = 2; string ServerSecret = 3; string StreamId = 4; - int32 CostItemNum = 5; //消耗道具数量 - int32 ItemId = 6; //获得道具Id - int32 ItemNum = 7; //获得道具数量 + int32 CostItemNum = 5; //消耗道具数量 + int32 ItemId = 6; //获得道具Id + int32 ItemNum = 7; //获得道具数量 string IconAddr = 8;//图片地址 string Name = 9;//场次名字 } @@ -979,4 +979,12 @@ message RoomConfigSystem{ int32 AutoCreate = 12; // 自动创建开关 1开启 2关闭 int32 AutoCreateTime = 13; // 自动创建时间间隔，单位秒 int32 On = 14; // 开关 1开启 2关闭 +} + +// etcd /game/client_upgrade +message ClientUpgrade{ + string Platform = 1; // 平台 + int32 On = 2; // 开关 1开启 2关闭 + int32 OnForce = 3; // 强制升级开关 1开启 2关闭 + repeated ItemInfo Reward = 4; // 奖励 } \ No newline at end of file