From 9d100dbfdb842d5e2a83fdbc92abb66f4543ef66 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 27 Jul 2023 14:48:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B7=A5=E4=BC=9A=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E8=BD=AC=E5=8F=91=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_bufflottery.json | 8 +- bin/json/game_msgdistrib.json | 2 +- modules/guildgve/api_challengefinish.go | 2 +- modules/guildgve/api_setfire.go | 2 +- modules/wtask/api_exchange.go | 22 +++ pb/wtask_db.pb.go | 111 +++++++------ pb/wtask_msg.pb.go | 198 ++++++++++++++++++++---- 7 files changed, 261 insertions(+), 84 deletions(-) create mode 100644 modules/wtask/api_exchange.go diff --git a/bin/json/game_bufflottery.json b/bin/json/game_bufflottery.json index 86ae5eae1..0bb90c1f3 100644 --- a/bin/json/game_bufflottery.json +++ b/bin/json/game_bufflottery.json @@ -2,7 +2,7 @@ { "Id": 1, "GroupId": 300001, - "buffID": 125004311, + "buffID": 770076113, "GroupNum": 3, "BuffWt": 50, "TypeWt": 50 @@ -10,7 +10,7 @@ { "Id": 2, "GroupId": 300001, - "buffID": 125004312, + "buffID": 770077113, "GroupNum": 3, "BuffWt": 50, "TypeWt": 50 @@ -18,7 +18,7 @@ { "Id": 3, "GroupId": 300001, - "buffID": 135006211, + "buffID": 770070113, "GroupNum": 3, "BuffWt": 50, "TypeWt": 50 @@ -26,7 +26,7 @@ { "Id": 4, "GroupId": 300002, - "buffID": 151513212, + "buffID": 770071113, "GroupNum": 1, "BuffWt": 50, "TypeWt": 50 diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json index 6dd8b3adf..a73b4e01a 100644 --- a/bin/json/game_msgdistrib.json +++ b/bin/json/game_msgdistrib.json @@ -132,7 +132,7 @@ "describe": "好友排行" }, { - "msgid": "uniongve", + "msgid": "guildgve", "open": true, "routrules": "~/worker", "describe": "工会boos战" diff --git a/modules/guildgve/api_challengefinish.go b/modules/guildgve/api_challengefinish.go index bd8b8ab61..9fa7bc074 100644 --- a/modules/guildgve/api_challengefinish.go +++ b/modules/guildgve/api_challengefinish.go @@ -125,7 +125,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve }) } } - v.Record = append(v.Record) + v.Record = append(v.Record, record) go this.module.modelGuildGve.booshpchangepush(req.Guildid, info) if v.Hp < 0 { v.Hp = 0 diff --git a/modules/guildgve/api_setfire.go b/modules/guildgve/api_setfire.go index 1b39cfedf..ed9a45eed 100644 --- a/modules/guildgve/api_setfire.go +++ b/modules/guildgve/api_setfire.go @@ -50,6 +50,6 @@ func (this *apiComp) SetFire(session comm.IUserSession, req *pb.GuildGveSetFireR return } go this.module.modelGuildGve.infochangepush(req.Guildid, info) - session.SendMsg(string(this.module.GetType()), "info", &pb.GuildGveInfoResp{Info: info}) + session.SendMsg(string(this.module.GetType()), "setfire", &pb.GuildGveSetFireResp{}) return } diff --git a/modules/wtask/api_exchange.go b/modules/wtask/api_exchange.go new file mode 100644 index 000000000..91b71bf31 --- /dev/null +++ b/modules/wtask/api_exchange.go @@ -0,0 +1,22 @@ +package wtask + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +// 参数校验 +func (this *apiComp) ExchangeCheck(session comm.IUserSession, req *pb.WTaskExchangeReq) (errdata *pb.ErrorData) { + + return +} + +// /获取系统公告 +func (this *apiComp) Exchange(session comm.IUserSession, req *pb.WTaskExchangeReq) (errdata *pb.ErrorData) { + var () + if errdata = this.ExchangeCheck(session, req); errdata != nil { + return + } + + return +} diff --git a/pb/wtask_db.pb.go b/pb/wtask_db.pb.go index f5271cdb7..684232ae2 100644 --- a/pb/wtask_db.pb.go +++ b/pb/wtask_db.pb.go @@ -26,15 +26,16 @@ type DBWTask struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - 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" bson:"uid"` //玩家ID - Currchapter int32 `protobuf:"varint,3,opt,name=currchapter,proto3" json:"currchapter"` //当前所在章节 - Activations []int32 `protobuf:"varint,4,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表 - Accepts []int32 `protobuf:"varint,5,rep,packed,name=accepts,proto3" json:"accepts"` //已接取任务列表 - Completes []int32 `protobuf:"varint,6,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表 - Groups map[int32]int32 `protobuf:"bytes,7,rep,name=groups,proto3" json:"groups" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //任务组状态 key表示组id value:0 任务组未完成 1:任务组已完成 2:任务组奖励已领取 - Boxs map[int32]*DBWTaskBox `protobuf:"bytes,8,rep,name=boxs,proto3" json:"boxs" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //世界宝箱 - Dailytaskgroup int32 `protobuf:"varint,9,opt,name=dailytaskgroup,proto3" json:"dailytaskgroup"` //日常任务组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" bson:"uid"` //玩家ID + Currchapter int32 `protobuf:"varint,3,opt,name=currchapter,proto3" json:"currchapter"` //当前所在章节 + Activations []int32 `protobuf:"varint,4,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表 + Accepts []int32 `protobuf:"varint,5,rep,packed,name=accepts,proto3" json:"accepts"` //已接取任务列表 + Completes []int32 `protobuf:"varint,6,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表 + Groups map[int32]int32 `protobuf:"bytes,7,rep,name=groups,proto3" json:"groups" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //任务组状态 key表示组id value:0 任务组未完成 1:任务组已完成 2:任务组奖励已领取 + Boxs map[int32]*DBWTaskBox `protobuf:"bytes,8,rep,name=boxs,proto3" json:"boxs" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //世界宝箱 + Exchange map[int32]int32 `protobuf:"bytes,9,rep,name=exchange,proto3" json:"exchange" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //兑换记录 每日重置 + Dailytaskgroup int32 `protobuf:"varint,10,opt,name=dailytaskgroup,proto3" json:"dailytaskgroup"` //日常任务组id } func (x *DBWTask) Reset() { @@ -125,6 +126,13 @@ func (x *DBWTask) GetBoxs() map[int32]*DBWTaskBox { return nil } +func (x *DBWTask) GetExchange() map[int32]int32 { + if x != nil { + return x.Exchange + } + return nil +} + func (x *DBWTask) GetDailytaskgroup() int32 { if x != nil { return x.Dailytaskgroup @@ -240,8 +248,8 @@ var File_wtask_wtask_db_proto protoreflect.FileDescriptor var file_wtask_wtask_db_proto_rawDesc = []byte{ 0x0a, 0x14, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, - 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa6, - 0x03, 0x0a, 0x07, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x97, + 0x04, 0x0a, 0x07, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, @@ -256,31 +264,38 @@ var file_wtask_wtask_db_proto_rawDesc = []byte{ 0x73, 0x6b, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x42, - 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x12, 0x26, - 0x0a, 0x0e, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, - 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x1a, 0x44, 0x0a, 0x09, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x12, 0x32, + 0x0a, 0x08, 0x65, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x16, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x45, 0x78, 0x63, 0x68, 0x61, + 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x65, 0x78, 0x63, 0x68, 0x61, 0x6e, + 0x67, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, + 0x72, 0x6f, 0x75, 0x70, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x64, 0x61, 0x69, 0x6c, + 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x09, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x45, + 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x70, 0x0a, 0x0a, 0x44, 0x42, 0x57, 0x54, + 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x12, 0x29, 0x0a, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, + 0x78, 0x2e, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, + 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0b, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x70, 0x0a, 0x0a, 0x44, 0x42, 0x57, 0x54, 0x61, - 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x12, 0x29, 0x0a, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, - 0x2e, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, - 0x1a, 0x37, 0x0a, 0x09, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x46, 0x0a, 0x0b, 0x44, 0x42, 0x57, - 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, - 0x6e, 0x6c, 0x64, 0x73, 0x18, 0x02, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x46, 0x0a, 0x0b, 0x44, 0x42, + 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x63, + 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18, 0x02, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -295,27 +310,29 @@ func file_wtask_wtask_db_proto_rawDescGZIP() []byte { return file_wtask_wtask_db_proto_rawDescData } -var file_wtask_wtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_wtask_wtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_wtask_wtask_db_proto_goTypes = []interface{}{ (*DBWTask)(nil), // 0: DBWTask (*DBWTaskBox)(nil), // 1: DBWTaskBox (*DBWTaskItem)(nil), // 2: DBWTaskItem nil, // 3: DBWTask.GroupsEntry nil, // 4: DBWTask.BoxsEntry - nil, // 5: DBWTaskBox.BoxsEntry - (*ConIProgress)(nil), // 6: ConIProgress + nil, // 5: DBWTask.ExchangeEntry + nil, // 6: DBWTaskBox.BoxsEntry + (*ConIProgress)(nil), // 7: ConIProgress } var file_wtask_wtask_db_proto_depIdxs = []int32{ 3, // 0: DBWTask.groups:type_name -> DBWTask.GroupsEntry 4, // 1: DBWTask.boxs:type_name -> DBWTask.BoxsEntry - 5, // 2: DBWTaskBox.boxs:type_name -> DBWTaskBox.BoxsEntry - 6, // 3: DBWTaskItem.conlds:type_name -> ConIProgress - 1, // 4: DBWTask.BoxsEntry.value:type_name -> DBWTaskBox - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 5, // 2: DBWTask.exchange:type_name -> DBWTask.ExchangeEntry + 6, // 3: DBWTaskBox.boxs:type_name -> DBWTaskBox.BoxsEntry + 7, // 4: DBWTaskItem.conlds:type_name -> ConIProgress + 1, // 5: DBWTask.BoxsEntry.value:type_name -> DBWTaskBox + 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 } func init() { file_wtask_wtask_db_proto_init() } @@ -368,7 +385,7 @@ func file_wtask_wtask_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_wtask_wtask_db_proto_rawDesc, NumEnums: 0, - NumMessages: 6, + NumMessages: 7, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go index b125ba159..be5b009c1 100644 --- a/pb/wtask_msg.pb.go +++ b/pb/wtask_msg.pb.go @@ -1051,6 +1051,110 @@ func (x *WTaskBoxReceiveResp) GetAward() []*UserAssets { return nil } +//世界任务兑换物品 请求 +type WTaskExchangeReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Eid int32 `protobuf:"varint,1,opt,name=eid,proto3" json:"eid"` +} + +func (x *WTaskExchangeReq) Reset() { + *x = WTaskExchangeReq{} + if protoimpl.UnsafeEnabled { + mi := &file_wtask_wtask_msg_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WTaskExchangeReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WTaskExchangeReq) ProtoMessage() {} + +func (x *WTaskExchangeReq) ProtoReflect() protoreflect.Message { + mi := &file_wtask_wtask_msg_proto_msgTypes[19] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WTaskExchangeReq.ProtoReflect.Descriptor instead. +func (*WTaskExchangeReq) Descriptor() ([]byte, []int) { + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{19} +} + +func (x *WTaskExchangeReq) GetEid() int32 { + if x != nil { + return x.Eid + } + return 0 +} + +//世界任务兑换物品 请求 +type WTaskExchangeResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Eid int32 `protobuf:"varint,1,opt,name=eid,proto3" json:"eid"` + Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 +} + +func (x *WTaskExchangeResp) Reset() { + *x = WTaskExchangeResp{} + if protoimpl.UnsafeEnabled { + mi := &file_wtask_wtask_msg_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WTaskExchangeResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WTaskExchangeResp) ProtoMessage() {} + +func (x *WTaskExchangeResp) ProtoReflect() protoreflect.Message { + mi := &file_wtask_wtask_msg_proto_msgTypes[20] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WTaskExchangeResp.ProtoReflect.Descriptor instead. +func (*WTaskExchangeResp) Descriptor() ([]byte, []int) { + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{20} +} + +func (x *WTaskExchangeResp) GetEid() int32 { + if x != nil { + return x.Eid + } + return 0 +} + +func (x *WTaskExchangeResp) GetAward() []*UserAssets { + if x != nil { + return x.Award + } + return nil +} + var File_wtask_wtask_msg_proto protoreflect.FileDescriptor var file_wtask_wtask_msg_proto_rawDesc = []byte{ @@ -1159,6 +1263,13 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{ 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 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, 0x24, + 0x0a, 0x10, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, + 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x65, 0x69, 0x64, 0x22, 0x48, 0x0a, 0x11, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x63, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, + 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } @@ -1175,7 +1286,7 @@ func file_wtask_wtask_msg_proto_rawDescGZIP() []byte { return file_wtask_wtask_msg_proto_rawDescData } -var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21) +var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 23) var file_wtask_wtask_msg_proto_goTypes = []interface{}{ (*WTaskInfoReq)(nil), // 0: WTaskInfoReq (*WTaskInfoResp)(nil), // 1: WTaskInfoResp @@ -1196,36 +1307,39 @@ var file_wtask_wtask_msg_proto_goTypes = []interface{}{ (*WTaskBoxChangePush)(nil), // 16: WTaskBoxChangePush (*WTaskBoxReceiveReq)(nil), // 17: WTaskBoxReceiveReq (*WTaskBoxReceiveResp)(nil), // 18: WTaskBoxReceiveResp - nil, // 19: WTaskFinishResp.GroupsEntry - nil, // 20: WTaskBoxChangePush.BoxsEntry - (*DBWTask)(nil), // 21: DBWTask - (*DBWTaskItem)(nil), // 22: DBWTaskItem - (*UserAssets)(nil), // 23: UserAssets - (*BattleFormation)(nil), // 24: BattleFormation - (*BattleInfo)(nil), // 25: BattleInfo - (*BattleReport)(nil), // 26: BattleReport - (*DBWTaskBox)(nil), // 27: DBWTaskBox + (*WTaskExchangeReq)(nil), // 19: WTaskExchangeReq + (*WTaskExchangeResp)(nil), // 20: WTaskExchangeResp + nil, // 21: WTaskFinishResp.GroupsEntry + nil, // 22: WTaskBoxChangePush.BoxsEntry + (*DBWTask)(nil), // 23: DBWTask + (*DBWTaskItem)(nil), // 24: DBWTaskItem + (*UserAssets)(nil), // 25: UserAssets + (*BattleFormation)(nil), // 26: BattleFormation + (*BattleInfo)(nil), // 27: BattleInfo + (*BattleReport)(nil), // 28: BattleReport + (*DBWTaskBox)(nil), // 29: DBWTaskBox } var file_wtask_wtask_msg_proto_depIdxs = []int32{ - 21, // 0: WTaskInfoResp.info:type_name -> DBWTask - 22, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem - 22, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem - 22, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem - 23, // 4: WTaskFinishResp.award:type_name -> UserAssets - 19, // 5: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry - 23, // 6: WTaskChapterRewardResp.award:type_name -> UserAssets - 22, // 7: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem - 24, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation - 25, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo - 26, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport - 20, // 11: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry - 23, // 12: WTaskBoxReceiveResp.award:type_name -> UserAssets - 27, // 13: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox - 14, // [14:14] is the sub-list for method output_type - 14, // [14:14] is the sub-list for method input_type - 14, // [14:14] is the sub-list for extension type_name - 14, // [14:14] is the sub-list for extension extendee - 0, // [0:14] is the sub-list for field type_name + 23, // 0: WTaskInfoResp.info:type_name -> DBWTask + 24, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem + 24, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem + 24, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem + 25, // 4: WTaskFinishResp.award:type_name -> UserAssets + 21, // 5: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry + 25, // 6: WTaskChapterRewardResp.award:type_name -> UserAssets + 24, // 7: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem + 26, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation + 27, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo + 28, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport + 22, // 11: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry + 25, // 12: WTaskBoxReceiveResp.award:type_name -> UserAssets + 25, // 13: WTaskExchangeResp.award:type_name -> UserAssets + 29, // 14: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox + 15, // [15:15] is the sub-list for method output_type + 15, // [15:15] is the sub-list for method input_type + 15, // [15:15] is the sub-list for extension type_name + 15, // [15:15] is the sub-list for extension extendee + 0, // [0:15] is the sub-list for field type_name } func init() { file_wtask_wtask_msg_proto_init() } @@ -1465,6 +1579,30 @@ func file_wtask_wtask_msg_proto_init() { return nil } } + file_wtask_wtask_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WTaskExchangeReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_wtask_wtask_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WTaskExchangeResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1472,7 +1610,7 @@ func file_wtask_wtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_wtask_wtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 21, + NumMessages: 23, NumExtensions: 0, NumServices: 0, },