From 7a64f0a2a435e0df8803366c2eb04da5e23d9790 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Wed, 9 Aug 2023 15:30:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=98=E4=BB=A4=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/warorder/api_receive.go | 34 +++++---- pb/storyline_db.pb.go | 2 +- pb/warorder_db.pb.go | 22 ++++-- pb/warorder_msg.pb.go | 127 +++++++++++++++++++------------- 4 files changed, 111 insertions(+), 74 deletions(-) diff --git a/modules/warorder/api_receive.go b/modules/warorder/api_receive.go index 25ec4ab24..62c56c570 100644 --- a/modules/warorder/api_receive.go +++ b/modules/warorder/api_receive.go @@ -95,28 +95,34 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR } return } - if dwarorder.Vip == 0 { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ReqParameterError, - Title: pb.ErrorCode_ReqParameterError.ToString(), - Message: "no vip", - } - return - } + awards = make([]*cfg.Gameatn, 0) for _, v := range confs { if v.Parameter <= dwarorder.Lv { - if warorder.Payprogress < v.Parameter { - awards = append(awards, v.PayReward) + if dwarorder.Freeprogress < v.Parameter { + awards = append(awards, v.FreeReward) ads = append(ads, &pb.UserAssets{ - A: v.PayReward.A, - T: v.PayReward.T, - N: v.PayReward.N, + A: v.FreeReward.A, + T: v.FreeReward.T, + N: v.FreeReward.N, }) } + if dwarorder.Vip > 0 { + if warorder.Payprogress < v.Parameter { + awards = append(awards, v.PayReward) + ads = append(ads, &pb.UserAssets{ + A: v.PayReward.A, + T: v.PayReward.T, + N: v.PayReward.N, + }) + } + } } } - warorder.Payprogress = dwarorder.Lv + dwarorder.Freeprogress = dwarorder.Lv + if dwarorder.Vip > 0 { + dwarorder.Payprogress = dwarorder.Lv + } } if errdata = this.module.DispenseRes(session, awards, true); errdata != nil { diff --git a/pb/storyline_db.pb.go b/pb/storyline_db.pb.go index 9dbdc73ad..9e2d51951 100644 --- a/pb/storyline_db.pb.go +++ b/pb/storyline_db.pb.go @@ -25,7 +25,7 @@ type DBStoryline struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` Cd int64 `protobuf:"varint,3,opt,name=cd,proto3" json:"cd"` //cd 结束时间 Item map[int32]*DBStorylineItem `protobuf:"bytes,4,rep,name=item,proto3" json:"item" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //英雄关卡信息 diff --git a/pb/warorder_db.pb.go b/pb/warorder_db.pb.go index c6ddd062b..61ee236f5 100644 --- a/pb/warorder_db.pb.go +++ b/pb/warorder_db.pb.go @@ -188,7 +188,8 @@ type DreamWarorder struct { Weektime int64 `protobuf:"varint,8,opt,name=weektime,proto3" json:"weektime"` Weektasks []int32 `protobuf:"varint,9,rep,packed,name=weektasks,proto3" json:"weektasks"` Completetasks []int32 `protobuf:"varint,10,rep,packed,name=completetasks,proto3" json:"completetasks"` - Payprogress int32 `protobuf:"varint,11,opt,name=payprogress,proto3" json:"payprogress"` + Freeprogress int32 `protobuf:"varint,11,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取天数 + Payprogress int32 `protobuf:"varint,12,opt,name=payprogress,proto3" json:"payprogress"` } func (x *DreamWarorder) Reset() { @@ -293,6 +294,13 @@ func (x *DreamWarorder) GetCompletetasks() []int32 { return nil } +func (x *DreamWarorder) GetFreeprogress() int32 { + if x != nil { + return x.Freeprogress + } + return 0 +} + func (x *DreamWarorder) GetPayprogress() int32 { if x != nil { return x.Payprogress @@ -335,7 +343,7 @@ var file_warorder_warorder_db_proto_rawDesc = []byte{ 0x0a, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x76, - 0x69, 0x70, 0x22, 0xb1, 0x02, 0x0a, 0x0d, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, + 0x69, 0x70, 0x22, 0xd5, 0x02, 0x0a, 0x0d, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, @@ -352,10 +360,12 @@ var file_warorder_warorder_db_proto_rawDesc = []byte{ 0x03, 0x28, 0x05, 0x52, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, - 0x61, 0x73, 0x6b, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, - 0x65, 0x73, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72, - 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x73, 0x6b, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72, 0x65, 0x65, 0x70, 0x72, 0x6f, 0x67, + 0x72, 0x65, 0x73, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x66, 0x72, 0x65, 0x65, + 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x79, 0x70, + 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, + 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/warorder_msg.pb.go b/pb/warorder_msg.pb.go index b106e7b2f..8c28d6c45 100644 --- a/pb/warorder_msg.pb.go +++ b/pb/warorder_msg.pb.go @@ -73,9 +73,10 @@ type WarorderInfoResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Warorder *Warorder `protobuf:"bytes,1,opt,name=Warorder,proto3" json:"Warorder"` - Dwarorder *DreamWarorder `protobuf:"bytes,2,opt,name=dwarorder,proto3" json:"dwarorder"` - Conlds []*ConIProgress `protobuf:"bytes,3,rep,name=conlds,proto3" json:"conlds"` //子任务进度数据 + Rtype int32 `protobuf:"varint,1,opt,name=rtype,proto3" json:"rtype"` + Warorder *Warorder `protobuf:"bytes,2,opt,name=warorder,proto3" json:"warorder"` + Dwarorder *DreamWarorder `protobuf:"bytes,3,opt,name=dwarorder,proto3" json:"dwarorder"` + Conlds []*ConIProgress `protobuf:"bytes,4,rep,name=conlds,proto3" json:"conlds"` //子任务进度数据 } func (x *WarorderInfoResp) Reset() { @@ -110,6 +111,13 @@ func (*WarorderInfoResp) Descriptor() ([]byte, []int) { return file_warorder_warorder_msg_proto_rawDescGZIP(), []int{1} } +func (x *WarorderInfoResp) GetRtype() int32 { + if x != nil { + return x.Rtype + } + return 0 +} + func (x *WarorderInfoResp) GetWarorder() *Warorder { if x != nil { return x.Warorder @@ -184,9 +192,10 @@ type WarorderReceiveResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Rtype int32 `protobuf:"varint,1,opt,name=rtype,proto3" json:"rtype"` - Info *Warorder `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` - Award []*UserAssets `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励 + Rtype int32 `protobuf:"varint,1,opt,name=rtype,proto3" json:"rtype"` + Info *Warorder `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` + Dwarorder *DreamWarorder `protobuf:"bytes,3,opt,name=dwarorder,proto3" json:"dwarorder"` + Award []*UserAssets `protobuf:"bytes,4,rep,name=award,proto3" json:"award"` //奖励 } func (x *WarorderReceiveResp) Reset() { @@ -235,6 +244,13 @@ func (x *WarorderReceiveResp) GetInfo() *Warorder { return nil } +func (x *WarorderReceiveResp) GetDwarorder() *DreamWarorder { + if x != nil { + return x.Dwarorder + } + return nil +} + func (x *WarorderReceiveResp) GetAward() []*UserAssets { if x != nil { return x.Award @@ -493,46 +509,50 @@ var file_warorder_warorder_msg_proto_rawDesc = []byte{ 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x0f, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x22, 0x8e, 0x01, 0x0a, 0x10, 0x57, 0x61, 0x72, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x08, 0x57, - 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x08, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x09, 0x64, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x09, 0x64, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, - 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x22, 0x2a, 0x0a, 0x12, 0x57, 0x61, 0x72, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, - 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x6d, 0x0a, 0x13, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, - 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, - 0x12, 0x1d, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, - 0x2e, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, - 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, - 0x72, 0x64, 0x22, 0x38, 0x0a, 0x10, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x75, - 0x79, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, - 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x5d, 0x0a, 0x11, - 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x75, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x73, + 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x22, 0xa4, 0x01, 0x0a, 0x10, 0x57, 0x61, 0x72, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, + 0x65, 0x12, 0x25, 0x0a, 0x08, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x08, + 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x09, 0x64, 0x77, 0x61, 0x72, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, + 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x09, 0x64, 0x77, 0x61, + 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, + 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x22, 0x2a, 0x0a, + 0x12, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x22, 0x9b, 0x01, 0x0a, 0x13, 0x57, 0x61, + 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x22, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x41, 0x0a, 0x17, 0x57, - 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, - 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, - 0x74, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x54, - 0x0a, 0x18, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, - 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, - 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, - 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, - 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x65, 0x78, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x09, 0x64, 0x77, 0x61, 0x72, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x65, 0x61, + 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x09, 0x64, 0x77, 0x61, 0x72, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, + 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x38, 0x0a, 0x10, 0x57, 0x61, 0x72, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x42, 0x75, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, + 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, + 0x76, 0x22, 0x5d, 0x0a, 0x11, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x75, 0x79, + 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, + 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x22, 0x0a, 0x04, + 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x65, + 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, + 0x22, 0x41, 0x0a, 0x17, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, + 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x74, 0x69, 0x64, 0x22, 0x54, 0x0a, 0x18, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -563,17 +583,18 @@ var file_warorder_warorder_msg_proto_goTypes = []interface{}{ (*UserAssets)(nil), // 11: UserAssets } var file_warorder_warorder_msg_proto_depIdxs = []int32{ - 8, // 0: WarorderInfoResp.Warorder:type_name -> Warorder + 8, // 0: WarorderInfoResp.warorder:type_name -> Warorder 9, // 1: WarorderInfoResp.dwarorder:type_name -> DreamWarorder 10, // 2: WarorderInfoResp.conlds:type_name -> ConIProgress 8, // 3: WarorderReceiveResp.info:type_name -> Warorder - 11, // 4: WarorderReceiveResp.award:type_name -> UserAssets - 9, // 5: WarorderBuyLvResp.info:type_name -> DreamWarorder - 6, // [6:6] is the sub-list for method output_type - 6, // [6:6] is the sub-list for method input_type - 6, // [6:6] is the sub-list for extension type_name - 6, // [6:6] is the sub-list for extension extendee - 0, // [0:6] is the sub-list for field type_name + 9, // 4: WarorderReceiveResp.dwarorder:type_name -> DreamWarorder + 11, // 5: WarorderReceiveResp.award:type_name -> UserAssets + 9, // 6: WarorderBuyLvResp.info:type_name -> DreamWarorder + 7, // [7:7] is the sub-list for method output_type + 7, // [7:7] is the sub-list for method input_type + 7, // [7:7] is the sub-list for extension type_name + 7, // [7:7] is the sub-list for extension extendee + 0, // [0:7] is the sub-list for field type_name } func init() { file_warorder_warorder_msg_proto_init() }