From 373a3d2e6e4fd6e775cb6afd8cdd352f9c978846 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 30 Nov 2022 16:31:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=AD=A6=E5=AE=98?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/martialhall/api_receive.go | 2 +- pb/hero_msg.pb.go | 52 ++++++++++++++++++++++++++---- pb/martialhall_msg.pb.go | 46 +++++++++++++++----------- 3 files changed, 74 insertions(+), 26 deletions(-) diff --git a/modules/martialhall/api_receive.go b/modules/martialhall/api_receive.go index 3f5d549af..d50c24508 100644 --- a/modules/martialhall/api_receive.go +++ b/modules/martialhall/api_receive.go @@ -78,6 +78,6 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.MartialhallRecei this.module.modelMartialhall.Change(session.GetUserId(), map[string]interface{}{ filed: pillar, }) - session.SendMsg(string(this.module.GetType()), "receive", &pb.MartialhallReceiveResp{}) + session.SendMsg(string(this.module.GetType()), "receive", &pb.MartialhallReceiveResp{Pillar: req.Pillar}) return } diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index b5cc4bc27..5eb2759dd 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -1652,8 +1652,10 @@ type HeroDrawCardFloorResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Star4 int32 `protobuf:"varint,1,opt,name=star4,proto3" json:"star4"` - Star5 int32 `protobuf:"varint,2,opt,name=star5,proto3" json:"star5"` + Star4 int32 `protobuf:"varint,1,opt,name=star4,proto3" json:"star4"` + Star5 int32 `protobuf:"varint,2,opt,name=star5,proto3" json:"star5"` + Onebuy int32 `protobuf:"varint,3,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数 + Tenbuy int32 `protobuf:"varint,4,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数 } func (x *HeroDrawCardFloorResp) Reset() { @@ -1702,6 +1704,20 @@ func (x *HeroDrawCardFloorResp) GetStar5() int32 { return 0 } +func (x *HeroDrawCardFloorResp) GetOnebuy() int32 { + if x != nil { + return x.Onebuy + } + return 0 +} + +func (x *HeroDrawCardFloorResp) GetTenbuy() int32 { + if x != nil { + return x.Tenbuy + } + return 0 +} + // 英雄融合 type HeroFusionReq struct { state protoimpl.MessageState @@ -2165,7 +2181,9 @@ type HeroBuyResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - IsSucc bool `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"` + IsSucc bool `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"` + Onebuy int32 `protobuf:"varint,3,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数 + Tenbuy int32 `protobuf:"varint,4,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数 } func (x *HeroBuyResp) Reset() { @@ -2207,6 +2225,20 @@ func (x *HeroBuyResp) GetIsSucc() bool { return false } +func (x *HeroBuyResp) GetOnebuy() int32 { + if x != nil { + return x.Onebuy + } + return 0 +} + +func (x *HeroBuyResp) GetTenbuy() int32 { + if x != nil { + return x.Tenbuy + } + return 0 +} + var File_hero_hero_msg_proto protoreflect.FileDescriptor var file_hero_hero_msg_proto_rawDesc = []byte{ @@ -2354,11 +2386,14 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x16, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, 0x6c, - 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x22, 0x43, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, + 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x22, 0x73, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x22, 0x92, 0x01, 0x0a, 0x0d, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x16, 0x0a, 0x06, 0x6f, + 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, + 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x22, 0x92, 0x01, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x02, @@ -2398,9 +2433,12 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x0a, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x79, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52, + 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x55, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x6f, + 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, + 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/pb/martialhall_msg.pb.go b/pb/martialhall_msg.pb.go index 7047e141c..451829e8a 100644 --- a/pb/martialhall_msg.pb.go +++ b/pb/martialhall_msg.pb.go @@ -280,6 +280,8 @@ type MartialhallReceiveResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + + Pillar int32 `protobuf:"varint,1,opt,name=pillar,proto3" json:"pillar"` } func (x *MartialhallReceiveResp) Reset() { @@ -314,6 +316,13 @@ func (*MartialhallReceiveResp) Descriptor() ([]byte, []int) { return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{5} } +func (x *MartialhallReceiveResp) GetPillar() int32 { + if x != nil { + return x.Pillar + } + return 0 +} + ///升级 请求 type MartialhallUpgradeReq struct { state protoimpl.MessageState @@ -539,25 +548,26 @@ var file_martialhall_martialhall_msg_proto_rawDesc = []byte{ 0x6c, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2f, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x22, 0x18, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, + 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x22, 0x30, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, - 0x73, 0x70, 0x22, 0x17, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, - 0x6c, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x54, 0x0a, 0x16, 0x4d, - 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, - 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x22, 0x0a, - 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, - 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x52, 0x04, 0x69, 0x6e, 0x66, - 0x6f, 0x22, 0x2e, 0x0a, 0x14, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, - 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x69, 0x6c, - 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, - 0x72, 0x22, 0x53, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, - 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, - 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, - 0x63, 0x63, 0x12, 0x22, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, - 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x22, 0x17, 0x0a, 0x15, 0x4d, 0x61, + 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, + 0x52, 0x65, 0x71, 0x22, 0x54, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, + 0x6c, 0x6c, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, + 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, + 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x22, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, + 0x61, 0x6c, 0x6c, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2e, 0x0a, 0x14, 0x4d, 0x61, 0x72, + 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, + 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x22, 0x53, 0x0a, 0x15, 0x4d, 0x61, 0x72, + 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x22, 0x0a, 0x04, 0x69, 0x6e, + 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x72, + 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( From d3a18884b8e8acaa2acefb985abd2b2931cc9650 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 30 Nov 2022 19:01:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BE=81=E7=BB=8A=E6=BF=80=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_gourmet.json | 974 +++++++++++++++++----- modules/hero/api_awaken.go | 6 + modules/hero/api_buy.go | 6 +- modules/library/api_activationfetter.go | 2 +- modules/mainline/api_challengeover.go | 10 + modules/user/api_login.go | 15 - pb/errorcode.pb.go | 411 ++++----- pb/hero_msg.pb.go | 25 +- stress/robot/robot.go | 8 +- sys/configure/structs/game.GourmetData.go | 25 +- 10 files changed, 1019 insertions(+), 463 deletions(-) diff --git a/bin/json/game_gourmet.json b/bin/json/game_gourmet.json index c14af617d..9f17a005d 100644 --- a/bin/json/game_gourmet.json +++ b/bin/json/game_gourmet.json @@ -5,7 +5,10 @@ "skill_type": 1, "initial": 1, "level": 1, - "colour_level_affix": 10101, + "colour_level_affix": { + "key": "gourmet_lv1", + "text": "马马虎虎" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -32,11 +35,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10001, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix1", + "text": "无" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -64,7 +74,10 @@ "skill_type": 1, "initial": 0, "level": 2, - "colour_level_affix": 10102, + "colour_level_affix": { + "key": "gourmet_lv2", + "text": "可圈可点" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -91,11 +104,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -123,7 +143,10 @@ "skill_type": 1, "initial": 0, "level": 3, - "colour_level_affix": 10103, + "colour_level_affix": { + "key": "gourmet_lv3", + "text": "孰能生巧" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -150,11 +173,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -182,7 +212,10 @@ "skill_type": 1, "initial": 0, "level": 4, - "colour_level_affix": 10104, + "colour_level_affix": { + "key": "gourmet_lv4", + "text": "驾轻就熟" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -209,11 +242,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -241,7 +281,10 @@ "skill_type": 1, "initial": 0, "level": 5, - "colour_level_affix": 10105, + "colour_level_affix": { + "key": "gourmet_lv5", + "text": "得心应手" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -268,11 +311,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -300,7 +350,10 @@ "skill_type": 1, "initial": 0, "level": 6, - "colour_level_affix": 10106, + "colour_level_affix": { + "key": "gourmet_lv6", + "text": "游刃有余" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -327,11 +380,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -359,7 +419,10 @@ "skill_type": 1, "initial": 0, "level": 7, - "colour_level_affix": 10107, + "colour_level_affix": { + "key": "gourmet_lv7", + "text": "匠心独运" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -386,11 +449,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -418,7 +488,10 @@ "skill_type": 1, "initial": 0, "level": 8, - "colour_level_affix": 10108, + "colour_level_affix": { + "key": "gourmet_lv8", + "text": "神乎其技" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -445,11 +518,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10004, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -477,7 +557,10 @@ "skill_type": 1, "initial": 1, "level": 1, - "colour_level_affix": 10101, + "colour_level_affix": { + "key": "gourmet_lv1", + "text": "马马虎虎" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -504,11 +587,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10001, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix1", + "text": "无" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -536,7 +626,10 @@ "skill_type": 1, "initial": 0, "level": 2, - "colour_level_affix": 10102, + "colour_level_affix": { + "key": "gourmet_lv2", + "text": "可圈可点" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -563,11 +656,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -595,7 +695,10 @@ "skill_type": 1, "initial": 0, "level": 3, - "colour_level_affix": 10103, + "colour_level_affix": { + "key": "gourmet_lv3", + "text": "孰能生巧" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -622,11 +725,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -654,7 +764,10 @@ "skill_type": 1, "initial": 0, "level": 4, - "colour_level_affix": 10104, + "colour_level_affix": { + "key": "gourmet_lv4", + "text": "驾轻就熟" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -681,11 +794,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -713,7 +833,10 @@ "skill_type": 1, "initial": 0, "level": 5, - "colour_level_affix": 10105, + "colour_level_affix": { + "key": "gourmet_lv5", + "text": "得心应手" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -740,11 +863,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -772,7 +902,10 @@ "skill_type": 1, "initial": 0, "level": 6, - "colour_level_affix": 10106, + "colour_level_affix": { + "key": "gourmet_lv6", + "text": "游刃有余" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -799,11 +932,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -831,7 +971,10 @@ "skill_type": 1, "initial": 0, "level": 7, - "colour_level_affix": 10107, + "colour_level_affix": { + "key": "gourmet_lv7", + "text": "匠心独运" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -858,11 +1001,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -890,7 +1040,10 @@ "skill_type": 1, "initial": 0, "level": 8, - "colour_level_affix": 10108, + "colour_level_affix": { + "key": "gourmet_lv8", + "text": "神乎其技" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -917,11 +1070,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10004, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -949,7 +1109,10 @@ "skill_type": 1, "initial": 1, "level": 1, - "colour_level_affix": 10101, + "colour_level_affix": { + "key": "gourmet_lv1", + "text": "马马虎虎" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -976,11 +1139,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10001, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix1", + "text": "无" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -1008,7 +1178,10 @@ "skill_type": 1, "initial": 0, "level": 2, - "colour_level_affix": 10102, + "colour_level_affix": { + "key": "gourmet_lv2", + "text": "可圈可点" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1035,11 +1208,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -1067,7 +1247,10 @@ "skill_type": 1, "initial": 0, "level": 3, - "colour_level_affix": 10103, + "colour_level_affix": { + "key": "gourmet_lv3", + "text": "孰能生巧" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1094,11 +1277,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1126,7 +1316,10 @@ "skill_type": 1, "initial": 0, "level": 4, - "colour_level_affix": 10104, + "colour_level_affix": { + "key": "gourmet_lv4", + "text": "驾轻就熟" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1153,11 +1346,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1185,7 +1385,10 @@ "skill_type": 1, "initial": 0, "level": 5, - "colour_level_affix": 10105, + "colour_level_affix": { + "key": "gourmet_lv5", + "text": "得心应手" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1212,11 +1415,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1244,7 +1454,10 @@ "skill_type": 1, "initial": 0, "level": 6, - "colour_level_affix": 10106, + "colour_level_affix": { + "key": "gourmet_lv6", + "text": "游刃有余" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1271,11 +1484,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1303,7 +1523,10 @@ "skill_type": 1, "initial": 0, "level": 7, - "colour_level_affix": 10107, + "colour_level_affix": { + "key": "gourmet_lv7", + "text": "匠心独运" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1330,11 +1553,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1362,7 +1592,10 @@ "skill_type": 1, "initial": 0, "level": 8, - "colour_level_affix": 10108, + "colour_level_affix": { + "key": "gourmet_lv8", + "text": "神乎其技" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1389,11 +1622,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10004, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1421,7 +1661,10 @@ "skill_type": 1, "initial": 1, "level": 1, - "colour_level_affix": 10101, + "colour_level_affix": { + "key": "gourmet_lv1", + "text": "马马虎虎" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1448,11 +1691,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10001, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix1", + "text": "无" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -1480,7 +1730,10 @@ "skill_type": 1, "initial": 0, "level": 2, - "colour_level_affix": 10102, + "colour_level_affix": { + "key": "gourmet_lv2", + "text": "可圈可点" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1507,11 +1760,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -1539,7 +1799,10 @@ "skill_type": 1, "initial": 0, "level": 3, - "colour_level_affix": 10103, + "colour_level_affix": { + "key": "gourmet_lv3", + "text": "孰能生巧" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1566,11 +1829,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1598,7 +1868,10 @@ "skill_type": 1, "initial": 0, "level": 4, - "colour_level_affix": 10104, + "colour_level_affix": { + "key": "gourmet_lv4", + "text": "驾轻就熟" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1625,11 +1898,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1657,7 +1937,10 @@ "skill_type": 1, "initial": 0, "level": 5, - "colour_level_affix": 10105, + "colour_level_affix": { + "key": "gourmet_lv5", + "text": "得心应手" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1684,11 +1967,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1716,7 +2006,10 @@ "skill_type": 1, "initial": 0, "level": 6, - "colour_level_affix": 10106, + "colour_level_affix": { + "key": "gourmet_lv6", + "text": "游刃有余" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1743,11 +2036,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1775,7 +2075,10 @@ "skill_type": 1, "initial": 0, "level": 7, - "colour_level_affix": 10107, + "colour_level_affix": { + "key": "gourmet_lv7", + "text": "匠心独运" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1802,11 +2105,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1834,7 +2144,10 @@ "skill_type": 1, "initial": 0, "level": 8, - "colour_level_affix": 10108, + "colour_level_affix": { + "key": "gourmet_lv8", + "text": "神乎其技" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1861,11 +2174,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10004, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1893,7 +2213,10 @@ "skill_type": 2, "initial": 1, "level": 1, - "colour_level_affix": 10201, + "colour_level_affix": { + "key": "gourmet_cook1", + "text": "1级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -1904,7 +2227,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -1926,7 +2260,10 @@ "skill_type": 2, "initial": 0, "level": 2, - "colour_level_affix": 10202, + "colour_level_affix": { + "key": "gourmet_cook2", + "text": "2级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -1937,7 +2274,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -1959,7 +2307,10 @@ "skill_type": 2, "initial": 0, "level": 3, - "colour_level_affix": 10203, + "colour_level_affix": { + "key": "gourmet_cook3", + "text": "3级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -1970,7 +2321,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -1992,7 +2354,10 @@ "skill_type": 2, "initial": 0, "level": 4, - "colour_level_affix": 10204, + "colour_level_affix": { + "key": "gourmet_cook4", + "text": "4级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2003,7 +2368,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2025,7 +2401,10 @@ "skill_type": 2, "initial": 0, "level": 5, - "colour_level_affix": 10205, + "colour_level_affix": { + "key": "gourmet_cook5", + "text": "5级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2036,7 +2415,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2058,7 +2448,10 @@ "skill_type": 2, "initial": 0, "level": 6, - "colour_level_affix": 10206, + "colour_level_affix": { + "key": "gourmet_cook6", + "text": "6级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2069,7 +2462,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2091,7 +2495,10 @@ "skill_type": 2, "initial": 0, "level": 7, - "colour_level_affix": 10207, + "colour_level_affix": { + "key": "gourmet_cook7", + "text": "7级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2102,7 +2509,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2124,7 +2542,10 @@ "skill_type": 2, "initial": 0, "level": 8, - "colour_level_affix": 10208, + "colour_level_affix": { + "key": "gourmet_cook8", + "text": "8级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2135,7 +2556,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2157,7 +2589,10 @@ "skill_type": 2, "initial": 0, "level": 9, - "colour_level_affix": 10209, + "colour_level_affix": { + "key": "gourmet_cook9", + "text": "9级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2168,7 +2603,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2190,7 +2636,10 @@ "skill_type": 2, "initial": 0, "level": 10, - "colour_level_affix": 10210, + "colour_level_affix": { + "key": "gourmet_cook10", + "text": "10级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2201,7 +2650,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2223,7 +2683,10 @@ "skill_type": 2, "initial": 0, "level": 11, - "colour_level_affix": 10211, + "colour_level_affix": { + "key": "gourmet_cook11", + "text": "11级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2234,7 +2697,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2256,7 +2730,10 @@ "skill_type": 2, "initial": 0, "level": 12, - "colour_level_affix": 10212, + "colour_level_affix": { + "key": "gourmet_cook12", + "text": "12级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2267,7 +2744,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2289,7 +2777,10 @@ "skill_type": 2, "initial": 0, "level": 13, - "colour_level_affix": 10213, + "colour_level_affix": { + "key": "gourmet_cook13", + "text": "13级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2300,7 +2791,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2322,7 +2824,10 @@ "skill_type": 2, "initial": 0, "level": 14, - "colour_level_affix": 10214, + "colour_level_affix": { + "key": "gourmet_cook14", + "text": "14级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2333,7 +2838,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2355,7 +2871,10 @@ "skill_type": 2, "initial": 0, "level": 15, - "colour_level_affix": 10215, + "colour_level_affix": { + "key": "gourmet_cook15", + "text": "15级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2366,7 +2885,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 3bcee9c12..93d084f24 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -48,6 +48,12 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c code = pb.ErrorCode_ConfigNoFound return } + + //条件判断 + if awakenData.Condition > _hero.Lv { + code = pb.ErrorCode_HeroLvNoEnough + return + } // 消耗校验 code = this.module.ConsumeRes(session, awakenData.Phaseneed, true) if code != pb.ErrorCode_Success { diff --git a/modules/hero/api_buy.go b/modules/hero/api_buy.go index d2454fc9a..df951e7cc 100644 --- a/modules/hero/api_buy.go +++ b/modules/hero/api_buy.go @@ -118,6 +118,10 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T)) } } - session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{IsSucc: true}) + session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{ + IsSucc: true, + Onebuy: record.Onebuy + req.BuyCount, + Tenbuy: record.Tenbuy + req.BuyCount, + }) return } diff --git a/modules/library/api_activationfetter.go b/modules/library/api_activationfetter.go index 8eb217f3e..6dadef94b 100644 --- a/modules/library/api_activationfetter.go +++ b/modules/library/api_activationfetter.go @@ -37,7 +37,7 @@ func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.Library mapData["activation"] = fetter.Activation // 激活的时候算一下 当前羁绊等级 list := this.module.modelFetter.getHeroFetterList(session.GetUserId()) - conf := this.configure.GetLibraryFetter(fetter.Fid, 1) + conf := this.module.configure.GetLibraryFetter(fetter.Fid, 1) var minLv int32 for _, v1 := range conf.Hid { for _, v := range list { diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index ff7d95496..eb4489b97 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -24,6 +24,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh var ( mainline *pb.DBMainline // 当前章节信息 res []*cfg.Gameatn // 小章节奖励 + isWin bool ) res = make([]*cfg.Gameatn, 0) @@ -43,6 +44,15 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh code = pb.ErrorCode_MainlineNotFindChapter return } + // 校验通过 + code, isWin = this.module.battle.CheckBattleReport(session, req.Report) + if code != pb.ErrorCode_Success { + return + } + if !isWin { // 战斗失败直接返回 + code = pb.ErrorCode_BattleNoWin + return + } for _, v := range mainline.BranchID { if v == int32(req.MainlineId) { // 重复挑战 code = pb.ErrorCode_MainlineNotFindChapter diff --git a/modules/user/api_login.go b/modules/user/api_login.go index f4f8c15c2..027017ade 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -144,7 +144,6 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod // 初始化随机任务数据 // this.module.ModuleRtask.InitCondiData(user.Uid) - //this.Sign(session, &pb.UserSignReq{}) // 日常登录任务 this.module.ModuleRtask.SendToRtask(session, comm.Rtype7, 1) @@ -162,20 +161,6 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod Check: false, Reward: false, } - // fj := make([]*pb.UserAssets, 0) - // atn1 := &pb.UserAssets{ - // A: "hero", - // T: "25001", - // N: 1, - // } - // atn2 := &pb.UserAssets{ - // A: "attr", - // T: "gold", - // N: 10000, - // } - // fj = append(fj, atn1) - // fj = append(fj, atn2) - // mail.Items = fj this.mail.CreateNewMail(session, mail) return diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 82c35bc70..10a0656a8 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -117,6 +117,7 @@ const ( ErrorCode_DrawCardTypeNotFound ErrorCode = 1322 // 抽卡类型不匹配 ErrorCode_HeroMaxSkillLv ErrorCode = 1323 // 达到最大技能等级 ErrorCode_HeroAlreadyKongFuStatus ErrorCode = 1324 // 已经是练功状态 + ErrorCode_HeroLvNoEnough ErrorCode = 1325 // 英雄等级不足 // equipment ErrorCode_EquipmentOnFoundEquipment ErrorCode = 1400 // 未找到武器 ErrorCode_EquipmentLvlimitReached ErrorCode = 1401 // 武器等级已达上限 @@ -368,6 +369,7 @@ var ( 1322: "DrawCardTypeNotFound", 1323: "HeroMaxSkillLv", 1324: "HeroAlreadyKongFuStatus", + 1325: "HeroLvNoEnough", 1400: "EquipmentOnFoundEquipment", 1401: "EquipmentLvlimitReached", 1402: "EquipmentIsWorn", @@ -592,6 +594,7 @@ var ( "DrawCardTypeNotFound": 1322, "HeroMaxSkillLv": 1323, "HeroAlreadyKongFuStatus": 1324, + "HeroLvNoEnough": 1325, "EquipmentOnFoundEquipment": 1400, "EquipmentLvlimitReached": 1401, "EquipmentIsWorn": 1402, @@ -759,7 +762,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xcb, 0x27, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xe0, 0x27, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -875,208 +878,210 @@ var file_errorcode_proto_rawDesc = []byte{ 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10, 0xab, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4b, - 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a, 0x12, 0x1e, - 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75, - 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c, - 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d, - 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x14, 0x0a, 0x0f, - 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73, 0x57, 0x6f, 0x72, 0x6e, 0x10, - 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4e, - 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xfb, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 0x4d, - 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, - 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, - 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, 0x12, - 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, - 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, 0x0b, - 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x65, - 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, 0x4d, - 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, - 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, - 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, - 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, - 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, - 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, - 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, - 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, - 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, - 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, - 0x68, 0x65, 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, - 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, - 0x6b, 0x54, 0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, 0x0b, - 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, 0x11, - 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xcb, - 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, - 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, - 0x6f, 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, - 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, - 0x45, 0x72, 0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, - 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, 0x50, - 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, 0x12, - 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, - 0x72, 0x64, 0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, - 0x64, 0x61, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, 0xef, - 0x0e, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, - 0x4e, 0x6f, 0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, 0x15, - 0x0a, 0x10, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x55, - 0x73, 0x65, 0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, - 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x12, - 0x1a, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, - 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd3, 0x0f, 0x12, 0x19, 0x0a, 0x14, 0x47, - 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, - 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, - 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xb6, 0x10, 0x12, 0x12, - 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, - 0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x55, 0x6e, 0x46, 0x69, 0x6e, - 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x12, 0x11, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, - 0x6b, 0x4e, 0x6f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x9b, 0x11, 0x12, 0x12, 0x0a, 0x0d, 0x52, - 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x10, 0x9c, 0x11, 0x12, - 0x15, 0x0a, 0x10, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x46, 0x69, 0x6e, - 0x69, 0x73, 0x68, 0x10, 0x9d, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, - 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9e, 0x11, 0x12, 0x13, - 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x4c, 0x61, 0x73, 0x74, 0x4f, 0x6e, 0x65, - 0x10, 0x9f, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, - 0x69, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xa0, 0x11, 0x12, 0x10, 0x0a, 0x0b, 0x56, - 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xfd, 0x11, 0x12, 0x13, 0x0a, - 0x0e, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, - 0xfe, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, - 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, 0x11, 0x12, 0x1c, 0x0a, 0x17, 0x56, 0x69, - 0x6b, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x80, 0x12, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, - 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, - 0x64, 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, - 0x61, 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, - 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x55, - 0x70, 0x10, 0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, - 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xe4, - 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, 0x16, - 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x4a, - 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x20, 0x0a, 0x1b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, - 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x62, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x73, 0x10, 0xe7, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, - 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, - 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x17, - 0x0a, 0x12, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, - 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, - 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, - 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x4f, 0x70, - 0x65, 0x6e, 0x10, 0xac, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, - 0x72, 0x79, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, - 0xad, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, - 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, - 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, - 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, - 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x10, 0x90, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, - 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x91, - 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x4c, - 0x76, 0x10, 0xf1, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4e, - 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf2, 0x15, 0x12, 0x16, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, - 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xf3, 0x15, - 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, - 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, - 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x61, - 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x10, 0x0a, 0x0b, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xd6, 0x16, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, - 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xb8, 0x17, 0x12, 0x11, - 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xb9, - 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, 0x6d, - 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, 0x14, - 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x65, 0x6d, 0x62, 0x65, - 0x72, 0x10, 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, - 0x6f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, - 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, 0x12, 0x13, - 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, - 0x10, 0xbe, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, - 0x69, 0x74, 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x41, 0x67, 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x16, 0x0a, 0x10, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, - 0x10, 0xba, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, - 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 0x10, 0xbb, 0xea, 0x01, 0x12, - 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, - 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xbc, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xbd, 0xea, 0x01, 0x12, 0x15, - 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x75, 0x73, - 0x65, 0x10, 0xbe, 0xea, 0x01, 0x12, 0x11, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x53, 0x69, 0x67, 0x6e, 0x10, 0xbf, 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc0, 0xea, 0x01, 0x12, 0x14, 0x0a, - 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, - 0xc1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, - 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xc2, 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, - 0x10, 0xc3, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, - 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, - 0xc4, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc5, 0xea, 0x01, - 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, - 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xc6, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x10, - 0xc7, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x65, - 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xc9, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, 0x10, 0xca, 0xea, 0x01, - 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x79, 0x4c, - 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcb, 0xea, 0x01, 0x12, 0x1b, 0x0a, - 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x56, 0x61, 0x6c, 0x69, - 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xcc, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f, 0x45, - 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcd, 0xea, 0x01, 0x12, 0x1c, 0x0a, 0x16, 0x53, 0x6f, 0x63, - 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x10, 0xce, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, 0xcf, 0xea, 0x01, 0x12, - 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, - 0x69, 0x73, 0x74, 0x10, 0xd0, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x10, - 0xd1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, - 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xd2, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, - 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, - 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, - 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, - 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, - 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, - 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, - 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, - 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, - 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, - 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, - 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, - 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, - 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, - 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, - 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, - 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, - 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, - 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12, 0x19, 0x0a, - 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73, 0x74, 0x43, 0x44, - 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69, 0x76, - 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad, 0x1b, - 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65, 0x6e, - 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, - 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, - 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, - 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, - 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, - 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, - 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, - 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, - 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, - 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, - 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, - 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, - 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, - 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, - 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, - 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, - 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a, 0x12, 0x13, + 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, + 0x10, 0xad, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, + 0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, + 0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, + 0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, + 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73, + 0x57, 0x6f, 0x72, 0x6e, 0x10, 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, + 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xfb, 0x0a, + 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, + 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, + 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, + 0x64, 0x10, 0xdd, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, + 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, + 0x6e, 0x64, 0x10, 0xdf, 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, + 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, + 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a, + 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, + 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, + 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, + 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, + 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, + 0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, + 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, + 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, + 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, + 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11, + 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9, + 0x0c, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79, + 0x10, 0xca, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x10, 0xcb, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, + 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12, + 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, + 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, + 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, 0x72, 0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50, + 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, + 0x12, 0x12, 0x0a, 0x0d, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, + 0x72, 0x10, 0xed, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, + 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a, + 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x45, 0x72, 0x72, 0x10, 0xef, 0x0e, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, + 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, + 0x10, 0xd0, 0x0f, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, + 0x6c, 0x6c, 0x49, 0x6e, 0x55, 0x73, 0x65, 0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, + 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, + 0x64, 0x10, 0xd2, 0x0f, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, + 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd3, 0x0f, + 0x12, 0x19, 0x0a, 0x14, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47, + 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76, + 0x10, 0xb6, 0x10, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, + 0x73, 0x68, 0x65, 0x64, 0x10, 0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, + 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x12, 0x11, 0x0a, + 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x9b, 0x11, + 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x65, + 0x64, 0x10, 0x9c, 0x11, 0x12, 0x15, 0x0a, 0x10, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x65, + 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x9d, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, + 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, + 0x10, 0x9e, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x4c, 0x61, + 0x73, 0x74, 0x4f, 0x6e, 0x65, 0x10, 0x9f, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, + 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xa0, 0x11, + 0x12, 0x10, 0x0a, 0x0b, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, + 0xfd, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, + 0x54, 0x79, 0x70, 0x65, 0x10, 0xfe, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, + 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, 0x11, 0x12, + 0x1c, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, + 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x80, 0x12, 0x12, 0x1a, 0x0a, + 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, 0x73, 0x45, + 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, + 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, + 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, + 0x44, 0x61, 0x72, 0x65, 0x55, 0x70, 0x10, 0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, + 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, + 0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, + 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, + 0x10, 0xe5, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, + 0x73, 0x79, 0x4e, 0x6f, 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x20, 0x0a, 0x1b, 0x4d, + 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x73, 0x10, 0xe7, 0x12, 0x12, 0x18, 0x0a, + 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, + 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, + 0x10, 0xa9, 0x14, 0x12, 0x17, 0x0a, 0x12, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, + 0x4e, 0x6f, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, + 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, + 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, 0x1b, 0x0a, + 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, + 0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x10, 0xac, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, + 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x10, 0xad, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, + 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, + 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, + 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, + 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x90, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x75, 0x6e, 0x74, + 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x10, 0x91, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, + 0x79, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xf1, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, + 0x72, 0x61, 0x72, 0x79, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf2, 0x15, 0x12, 0x16, 0x0a, + 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x10, 0xf3, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, + 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, + 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, + 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x10, 0x0a, 0x0b, + 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xd6, 0x16, 0x12, 0x13, + 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, + 0x10, 0xb8, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, + 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, + 0x10, 0xba, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, + 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, + 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, + 0x10, 0xbd, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, + 0x73, 0x6d, 0x69, 0x73, 0x73, 0x10, 0xbe, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, + 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, + 0x17, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, + 0x61, 0x72, 0x61, 0x6d, 0x73, 0x10, 0xba, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, + 0x10, 0xbb, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, + 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xbc, 0xea, 0x01, 0x12, 0x14, 0x0a, + 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, + 0xbd, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, + 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, 0xbe, 0xea, 0x01, 0x12, 0x11, 0x0a, 0x0b, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x10, 0xbf, 0xea, 0x01, 0x12, 0x13, 0x0a, + 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc0, + 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, + 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xc2, 0xea, 0x01, 0x12, + 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, + 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc3, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, + 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc4, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x64, 0x10, 0xc5, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xc6, 0xea, + 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x10, 0xc7, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xc9, 0xea, 0x01, 0x12, + 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, + 0x64, 0x10, 0xca, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x41, 0x70, 0x70, 0x79, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcb, + 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, + 0x6b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xcc, 0xea, 0x01, 0x12, + 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, + 0x74, 0x79, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcd, 0xea, 0x01, 0x12, 0x1c, + 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, + 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xce, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, + 0x10, 0xcf, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, + 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xd0, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, + 0x6f, 0x77, 0x65, 0x64, 0x10, 0xd1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xd2, 0xea, 0x01, 0x12, + 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, + 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, + 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, + 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, + 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, + 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, + 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, + 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, + 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, + 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, + 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, + 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, + 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, + 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, + 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, + 0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, + 0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, + 0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, + 0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, + 0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x14, + 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, + 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, + 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, + 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x14, 0x0a, 0x0f, + 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, + 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, + 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, + 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, + 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, + 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, + 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, + 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, + 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, + 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, + 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, + 0x6b, 0x10, 0xbd, 0x1e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 94a001121..5eb2759dd 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -2181,7 +2181,9 @@ type HeroBuyResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - IsSucc bool `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"` + IsSucc bool `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"` + Onebuy int32 `protobuf:"varint,3,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数 + Tenbuy int32 `protobuf:"varint,4,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数 } func (x *HeroBuyResp) Reset() { @@ -2223,6 +2225,20 @@ func (x *HeroBuyResp) GetIsSucc() bool { return false } +func (x *HeroBuyResp) GetOnebuy() int32 { + if x != nil { + return x.Onebuy + } + return 0 +} + +func (x *HeroBuyResp) GetTenbuy() int32 { + if x != nil { + return x.Tenbuy + } + return 0 +} + var File_hero_hero_msg_proto protoreflect.FileDescriptor var file_hero_hero_msg_proto_rawDesc = []byte{ @@ -2417,9 +2433,12 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x0a, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x79, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52, + 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x55, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x6f, + 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, + 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/stress/robot/robot.go b/stress/robot/robot.go index 1fec9510e..4343f9ffd 100644 --- a/stress/robot/robot.go +++ b/stress/robot/robot.go @@ -2,11 +2,14 @@ package robot import ( "bytes" + "crypto/rand" "encoding/json" "fmt" "go_dreamfactory/comm" "io" + "math/big" "os" + "strconv" "go_dreamfactory/pb" @@ -230,8 +233,11 @@ func (r *Robot) Create() bool { mainType := "user" subType := "create" msg := &pb.UserMessage{MainType: mainType, SubType: subType} + n2, _ := rand.Int(rand.Reader, big.NewInt(1000000)) + + name := strconv.Itoa(int(n2.Int64() + 100000)) rsp := &pb.UserCreateReq{ - NickName: "001", + NickName: name, Figure: 100, Gender: 0, } diff --git a/sys/configure/structs/game.GourmetData.go b/sys/configure/structs/game.GourmetData.go index 3e6ea5cdf..e85ac159b 100644 --- a/sys/configure/structs/game.GourmetData.go +++ b/sys/configure/structs/game.GourmetData.go @@ -16,7 +16,7 @@ type GameGourmetData struct { SkillType int32 Initial int32 Level int32 - ColourLevelAffix int32 + ColourLevelAffix string Name string Needtime int32 Display int32 @@ -24,7 +24,9 @@ type GameGourmetData struct { DeliciousIcon string SkillIcon string Item []*Gameatn - ItemColourAffix []int32 + ItemColourAffix1 string + ItemColourAffix2 string + ItemColourAffix3 string DeliciousConsume []*Gameatn SkillConsume []*Gameatn Using int32 @@ -44,7 +46,7 @@ func (_v *GameGourmetData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_type"].(float64); !_ok_ { err = errors.New("skill_type error"); return }; _v.SkillType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["initial"].(float64); !_ok_ { err = errors.New("initial error"); return }; _v.Initial = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["colour_level_affix"].(float64); !_ok_ { err = errors.New("colour_level_affix error"); return }; _v.ColourLevelAffix = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["colour_level_affix"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ColourLevelAffix error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ColourLevelAffix, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needtime"].(float64); !_ok_ { err = errors.New("needtime error"); return }; _v.Needtime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["display"].(float64); !_ok_ { err = errors.New("display error"); return }; _v.Display = int32(_tempNum_) } @@ -65,20 +67,9 @@ func (_v *GameGourmetData)Deserialize(_buf map[string]interface{}) (err error) { } } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["item_colour_affix"].([]interface{}); !_ok_ { err = errors.New("item_colour_affix error"); return } - - _v.ItemColourAffix = make([]int32, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ int32 - { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } - _v.ItemColourAffix = append(_v.ItemColourAffix, _list_v_) - } - } - + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["item_colour_affix1"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix1 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix1, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["item_colour_affix2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix2 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix2, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["item_colour_affix3"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix3 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix3, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _arr_ []interface{} var _ok_ bool