diff --git a/modules/arena/api_danreceive.go b/modules/arena/api_danreceive.go new file mode 100644 index 000000000..3cf1514c5 --- /dev/null +++ b/modules/arena/api_danreceive.go @@ -0,0 +1,69 @@ +package arena + +import ( + "fmt" + "go_dreamfactory/comm" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +// 参数校验 +func (this *apiComp) DanReceiveCheck(session comm.IUserSession, req *pb.ArenaDanReceiveReq) (errdata *pb.ErrorData) { + if req.Dan == 0 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + } + return +} + +// /获取自己的排行榜信息 +func (this *apiComp) DanReceive(session comm.IUserSession, req *pb.ArenaDanReceiveReq) (errdata *pb.ErrorData) { + var ( + conf *cfg.GameArenaActiveRewardData + info *pb.DBArenaUser + err error + atno []*pb.UserAtno + ) + if errdata = this.DanReceiveCheck(session, req); errdata != nil { + return + } + if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_CacheReadError.ToString(), + Message: err.Error(), + } + return + } + + if info.Danaward[req.Dan] == 1 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("%d received", req.Dan), + } + return + } + info.Danaward[req.Dan] = 1 + if conf, err = this.module.configure.getActiveRewardById(req.Dan); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + if errdata, atno = this.module.DispenseAtno(session, conf.ExReward, true); errdata != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + session.SendMsg(string(this.module.GetType()), "taskreceive", &pb.ArenaDanReceiveResp{Dan: req.Dan, Award: atno}) + return +} diff --git a/pb/arena_db.pb.go b/pb/arena_db.pb.go index 36bf642bb..19b77f438 100644 --- a/pb/arena_db.pb.go +++ b/pb/arena_db.pb.go @@ -441,32 +441,34 @@ type DBArenaUser 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"` //uid - Uinfo *BaseUserInfo `protobuf:"bytes,3,opt,name=uinfo,proto3" json:"uinfo"` //用户基础 - Integral int32 `protobuf:"varint,4,opt,name=integral,proto3" json:"integral"` //积分 - Dan int32 `protobuf:"varint,5,opt,name=dan,proto3" json:"dan"` //段位 - Attack *DBPlayerBattleFormt `protobuf:"bytes,6,opt,name=attack,proto3" json:"attack"` //进攻阵型 - Defend *DBPlayerBattleFormt `protobuf:"bytes,8,opt,name=defend,proto3" json:"defend"` //防守阵型 - Streak int32 `protobuf:"varint,11,opt,name=streak,proto3" json:"streak"` //连胜 - Attackrate int32 `protobuf:"varint,12,opt,name=attackrate,proto3" json:"attackrate"` //进攻胜率 - Defendrate int32 `protobuf:"varint,13,opt,name=defendrate,proto3" json:"defendrate"` //防守胜率 - Rank int32 `protobuf:"varint,14,opt,name=rank,proto3" json:"rank"` //排名 - Buynum int32 `protobuf:"varint,15,opt,name=buynum,proto3" json:"buynum"` //购买次数 - Record []*DBArenaBattleRecord `protobuf:"bytes,16,rep,name=record,proto3" json:"record"` //战斗记录 - Lastrtickettime int64 `protobuf:"varint,17,opt,name=lastrtickettime,proto3" json:"lastrtickettime"` //最后领劵时间 - Attackwinuum int32 `protobuf:"varint,18,opt,name=attackwinuum,proto3" json:"attackwinuum"` //进攻胜利次数 - Attacktotaluum int32 `protobuf:"varint,19,opt,name=attacktotaluum,proto3" json:"attacktotaluum"` //进攻总次数 - Defendwinuum int32 `protobuf:"varint,20,opt,name=defendwinuum,proto3" json:"defendwinuum"` //防守胜利 - Defendtotaluum int32 `protobuf:"varint,21,opt,name=defendtotaluum,proto3" json:"defendtotaluum"` //防守总 - Loc []float64 `protobuf:"fixed64,22,rep,packed,name=loc,proto3" json:"loc"` //地图索引 匹配系统使用 - Isdef bool `protobuf:"varint,23,opt,name=isdef,proto3" json:"isdef"` //是否设置防守 - Npc map[int32]*DBNpc `protobuf:"bytes,24,rep,name=npc,proto3" json:"npc" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // npc Cd - Prededuction int32 `protobuf:"varint,25,opt,name=prededuction,proto3" json:"prededuction"` //预扣字段 - Dan2 int32 `protobuf:"varint,27,opt,name=dan2,proto3" json:"dan2"` //王者段位是限时的 分段段位 0 表示不存在 - Lastweektime int64 `protobuf:"varint,28,opt,name=lastweektime,proto3" json:"lastweektime"` //上次周结算时间 - Settlementtime int64 `protobuf:"varint,29,opt,name=settlementtime,proto3" json:"settlementtime"` //赛季结算时间 - Tasks map[int32]int32 `protobuf:"bytes,30,rep,name=tasks,proto3" json:"tasks" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //成就任务 + 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"` //uid + Uinfo *BaseUserInfo `protobuf:"bytes,3,opt,name=uinfo,proto3" json:"uinfo"` //用户基础 + Integral int32 `protobuf:"varint,4,opt,name=integral,proto3" json:"integral"` //积分 + Dan int32 `protobuf:"varint,5,opt,name=dan,proto3" json:"dan"` //段位 + Attack *DBPlayerBattleFormt `protobuf:"bytes,6,opt,name=attack,proto3" json:"attack"` //进攻阵型 + Defend *DBPlayerBattleFormt `protobuf:"bytes,8,opt,name=defend,proto3" json:"defend"` //防守阵型 + Streak int32 `protobuf:"varint,11,opt,name=streak,proto3" json:"streak"` //连胜 + Attackrate int32 `protobuf:"varint,12,opt,name=attackrate,proto3" json:"attackrate"` //进攻胜率 + Defendrate int32 `protobuf:"varint,13,opt,name=defendrate,proto3" json:"defendrate"` //防守胜率 + Rank int32 `protobuf:"varint,14,opt,name=rank,proto3" json:"rank"` //排名 + Buynum int32 `protobuf:"varint,15,opt,name=buynum,proto3" json:"buynum"` //购买次数 + Record []*DBArenaBattleRecord `protobuf:"bytes,16,rep,name=record,proto3" json:"record"` //战斗记录 + Lastrtickettime int64 `protobuf:"varint,17,opt,name=lastrtickettime,proto3" json:"lastrtickettime"` //最后领劵时间 + Attackwinuum int32 `protobuf:"varint,18,opt,name=attackwinuum,proto3" json:"attackwinuum"` //进攻胜利次数 + Attacktotaluum int32 `protobuf:"varint,19,opt,name=attacktotaluum,proto3" json:"attacktotaluum"` //进攻总次数 + Defendwinuum int32 `protobuf:"varint,20,opt,name=defendwinuum,proto3" json:"defendwinuum"` //防守胜利 + Defendtotaluum int32 `protobuf:"varint,21,opt,name=defendtotaluum,proto3" json:"defendtotaluum"` //防守总 + Loc []float64 `protobuf:"fixed64,22,rep,packed,name=loc,proto3" json:"loc"` //地图索引 匹配系统使用 + Isdef bool `protobuf:"varint,23,opt,name=isdef,proto3" json:"isdef"` //是否设置防守 + Npc map[int32]*DBNpc `protobuf:"bytes,24,rep,name=npc,proto3" json:"npc" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // npc Cd + Prededuction int32 `protobuf:"varint,25,opt,name=prededuction,proto3" json:"prededuction"` //预扣字段 + Dan2 int32 `protobuf:"varint,27,opt,name=dan2,proto3" json:"dan2"` //王者段位是限时的 分段段位 0 表示不存在 + Lastweektime int64 `protobuf:"varint,28,opt,name=lastweektime,proto3" json:"lastweektime"` //上次周结算时间 + Settlementtime int64 `protobuf:"varint,29,opt,name=settlementtime,proto3" json:"settlementtime"` //赛季结算时间 + Tasks map[int32]int32 `protobuf:"bytes,30,rep,name=tasks,proto3" json:"tasks" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //成就任务 + Danaward map[int32]int32 `protobuf:"bytes,31,rep,name=danaward,proto3" json:"danaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //段位奖励 + Maxdan int32 `protobuf:"varint,32,opt,name=maxdan,proto3" json:"maxdan"` //历史最高段位 } func (x *DBArenaUser) Reset() { @@ -683,6 +685,20 @@ func (x *DBArenaUser) GetTasks() map[int32]int32 { return nil } +func (x *DBArenaUser) GetDanaward() map[int32]int32 { + if x != nil { + return x.Danaward + } + return nil +} + +func (x *DBArenaUser) GetMaxdan() int32 { + if x != nil { + return x.Maxdan + } + return 0 +} + // npc数据 type DBNpc struct { state protoimpl.MessageState @@ -902,7 +918,7 @@ var file_arena_arena_db_proto_rawDesc = []byte{ 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, - 0xd0, 0x07, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x12, + 0xdd, 0x08, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 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, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, @@ -955,7 +971,12 @@ var file_arena_arena_db_proto_rawDesc = []byte{ 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x1e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x1a, 0x3e, 0x0a, 0x08, 0x4e, 0x70, 0x63, 0x45, + 0x79, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x36, 0x0a, 0x08, 0x64, 0x61, 0x6e, 0x61, + 0x77, 0x61, 0x72, 0x64, 0x18, 0x1f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x41, + 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x2e, 0x44, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x64, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x61, 0x78, 0x64, 0x61, 0x6e, 0x18, 0x20, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x6d, 0x61, 0x78, 0x64, 0x61, 0x6e, 0x1a, 0x3e, 0x0a, 0x08, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x52, 0x05, 0x76, @@ -963,26 +984,30 @@ var file_arena_arena_db_proto_rawDesc = []byte{ 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, 0x3d, 0x0a, 0x05, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x63, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, - 0x78, 0x22, 0x44, 0x0a, 0x14, 0x52, 0x50, 0x43, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, - 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, - 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, - 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2a, 0x9f, 0x01, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0d, 0x0a, - 0x09, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, - 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, - 0x44, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, - 0x44, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, - 0x57, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x10, 0x04, - 0x12, 0x11, 0x0a, 0x0d, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, - 0x64, 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x75, - 0x63, 0x63, 0x65, 0x65, 0x64, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x65, 0x76, - 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x64, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x44, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 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, + 0x3d, 0x0a, 0x05, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, + 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x44, + 0x0a, 0x14, 0x52, 0x50, 0x43, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x67, + 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, + 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, + 0x67, 0x72, 0x61, 0x6c, 0x2a, 0x9f, 0x01, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x74, + 0x74, 0x61, 0x63, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x74, 0x74, + 0x61, 0x63, 0x6b, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x66, + 0x65, 0x6e, 0x64, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x66, + 0x65, 0x6e, 0x64, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x57, 0x61, 0x69, + 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x10, 0x04, 0x12, 0x11, 0x0a, + 0x0d, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x05, + 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x75, 0x63, 0x63, 0x65, + 0x65, 0x64, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, + 0x65, 0x45, 0x6e, 0x64, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -998,7 +1023,7 @@ func file_arena_arena_db_proto_rawDescGZIP() []byte { } var file_arena_arena_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 14) +var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_arena_arena_db_proto_goTypes = []interface{}{ (BattleRecordState)(0), // 0: BattleRecordState (*ArenaPlayer)(nil), // 1: ArenaPlayer @@ -1015,34 +1040,36 @@ var file_arena_arena_db_proto_goTypes = []interface{}{ nil, // 12: DBHeroBase.FettersEntry nil, // 13: DBArenaUser.NpcEntry nil, // 14: DBArenaUser.TasksEntry - (*BaseUserInfo)(nil), // 15: BaseUserInfo - (*DBPlayerBattleFormt)(nil), // 16: DBPlayerBattleFormt - (*SkillData)(nil), // 17: SkillData + nil, // 15: DBArenaUser.DanawardEntry + (*BaseUserInfo)(nil), // 16: BaseUserInfo + (*DBPlayerBattleFormt)(nil), // 17: DBPlayerBattleFormt + (*SkillData)(nil), // 18: SkillData } var file_arena_arena_db_proto_depIdxs = []int32{ - 15, // 0: ArenaPlayer.uinfo:type_name -> BaseUserInfo - 16, // 1: ArenaPlayer.defend:type_name -> DBPlayerBattleFormt + 16, // 0: ArenaPlayer.uinfo:type_name -> BaseUserInfo + 17, // 1: ArenaPlayer.defend:type_name -> DBPlayerBattleFormt 7, // 2: DBHeroBase.property:type_name -> DBHeroBase.PropertyEntry 8, // 3: DBHeroBase.addProperty:type_name -> DBHeroBase.AddPropertyEntry 9, // 4: DBHeroBase.juexProperty:type_name -> DBHeroBase.JuexPropertyEntry 10, // 5: DBHeroBase.talentProperty:type_name -> DBHeroBase.TalentPropertyEntry 11, // 6: DBHeroBase.horoscopeProperty:type_name -> DBHeroBase.HoroscopePropertyEntry 12, // 7: DBHeroBase.fetters:type_name -> DBHeroBase.FettersEntry - 17, // 8: DBHeroBase.normalSkill:type_name -> SkillData + 18, // 8: DBHeroBase.normalSkill:type_name -> SkillData 2, // 9: DBArenaBattleRecord.formt:type_name -> DBHeroBase 0, // 10: DBArenaBattleRecord.State:type_name -> BattleRecordState - 15, // 11: DBArenaUser.uinfo:type_name -> BaseUserInfo - 16, // 12: DBArenaUser.attack:type_name -> DBPlayerBattleFormt - 16, // 13: DBArenaUser.defend:type_name -> DBPlayerBattleFormt + 16, // 11: DBArenaUser.uinfo:type_name -> BaseUserInfo + 17, // 12: DBArenaUser.attack:type_name -> DBPlayerBattleFormt + 17, // 13: DBArenaUser.defend:type_name -> DBPlayerBattleFormt 3, // 14: DBArenaUser.record:type_name -> DBArenaBattleRecord 13, // 15: DBArenaUser.npc:type_name -> DBArenaUser.NpcEntry 14, // 16: DBArenaUser.tasks:type_name -> DBArenaUser.TasksEntry - 5, // 17: DBArenaUser.NpcEntry.value:type_name -> DBNpc - 18, // [18:18] is the sub-list for method output_type - 18, // [18:18] is the sub-list for method input_type - 18, // [18:18] is the sub-list for extension type_name - 18, // [18:18] is the sub-list for extension extendee - 0, // [0:18] is the sub-list for field type_name + 15, // 17: DBArenaUser.danaward:type_name -> DBArenaUser.DanawardEntry + 5, // 18: DBArenaUser.NpcEntry.value:type_name -> DBNpc + 19, // [19:19] is the sub-list for method output_type + 19, // [19:19] is the sub-list for method input_type + 19, // [19:19] is the sub-list for extension type_name + 19, // [19:19] is the sub-list for extension extendee + 0, // [0:19] is the sub-list for field type_name } func init() { file_arena_arena_db_proto_init() } @@ -1132,7 +1159,7 @@ func file_arena_arena_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_arena_arena_db_proto_rawDesc, NumEnums: 1, - NumMessages: 14, + NumMessages: 15, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/arena_msg.pb.go b/pb/arena_msg.pb.go index a6e8f226f..64460a8e0 100644 --- a/pb/arena_msg.pb.go +++ b/pb/arena_msg.pb.go @@ -1412,6 +1412,110 @@ func (x *ArenaTaskReceiveResp) GetAward() []*UserAtno { return nil } +//领奖 请求 +type ArenaDanReceiveReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Dan int32 `protobuf:"varint,1,opt,name=dan,proto3" json:"dan"` +} + +func (x *ArenaDanReceiveReq) Reset() { + *x = ArenaDanReceiveReq{} + if protoimpl.UnsafeEnabled { + mi := &file_arena_arena_msg_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ArenaDanReceiveReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ArenaDanReceiveReq) ProtoMessage() {} + +func (x *ArenaDanReceiveReq) ProtoReflect() protoreflect.Message { + mi := &file_arena_arena_msg_proto_msgTypes[26] + 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 ArenaDanReceiveReq.ProtoReflect.Descriptor instead. +func (*ArenaDanReceiveReq) Descriptor() ([]byte, []int) { + return file_arena_arena_msg_proto_rawDescGZIP(), []int{26} +} + +func (x *ArenaDanReceiveReq) GetDan() int32 { + if x != nil { + return x.Dan + } + return 0 +} + +//领奖 请求回应 +type ArenaDanReceiveResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Dan int32 `protobuf:"varint,1,opt,name=dan,proto3" json:"dan"` + Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 +} + +func (x *ArenaDanReceiveResp) Reset() { + *x = ArenaDanReceiveResp{} + if protoimpl.UnsafeEnabled { + mi := &file_arena_arena_msg_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ArenaDanReceiveResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ArenaDanReceiveResp) ProtoMessage() {} + +func (x *ArenaDanReceiveResp) ProtoReflect() protoreflect.Message { + mi := &file_arena_arena_msg_proto_msgTypes[27] + 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 ArenaDanReceiveResp.ProtoReflect.Descriptor instead. +func (*ArenaDanReceiveResp) Descriptor() ([]byte, []int) { + return file_arena_arena_msg_proto_rawDescGZIP(), []int{27} +} + +func (x *ArenaDanReceiveResp) GetDan() int32 { + if x != nil { + return x.Dan + } + return 0 +} + +func (x *ArenaDanReceiveResp) GetAward() []*UserAtno { + if x != nil { + return x.Award + } + return nil +} + //竞技场结算奖励推送 type ArenaSettlementRewardPush struct { state protoimpl.MessageState @@ -1425,7 +1529,7 @@ type ArenaSettlementRewardPush struct { func (x *ArenaSettlementRewardPush) Reset() { *x = ArenaSettlementRewardPush{} if protoimpl.UnsafeEnabled { - mi := &file_arena_arena_msg_proto_msgTypes[26] + mi := &file_arena_arena_msg_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1438,7 +1542,7 @@ func (x *ArenaSettlementRewardPush) String() string { func (*ArenaSettlementRewardPush) ProtoMessage() {} func (x *ArenaSettlementRewardPush) ProtoReflect() protoreflect.Message { - mi := &file_arena_arena_msg_proto_msgTypes[26] + mi := &file_arena_arena_msg_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1451,7 +1555,7 @@ func (x *ArenaSettlementRewardPush) ProtoReflect() protoreflect.Message { // Deprecated: Use ArenaSettlementRewardPush.ProtoReflect.Descriptor instead. func (*ArenaSettlementRewardPush) Descriptor() ([]byte, []int) { - return file_arena_arena_msg_proto_rawDescGZIP(), []int{26} + return file_arena_arena_msg_proto_rawDescGZIP(), []int{28} } func (x *ArenaSettlementRewardPush) GetStype() int32 { @@ -1593,13 +1697,20 @@ var file_arena_arena_msg_proto_rawDesc = []byte{ 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, - 0x52, 0x0a, 0x19, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x74, 0x74, 0x6c, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, - 0x73, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x79, - 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, - 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x26, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x61, 0x6e, 0x52, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x22, 0x48, 0x0a, 0x13, 0x41, 0x72, 0x65, 0x6e, 0x61, + 0x44, 0x61, 0x6e, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, + 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, + 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x22, 0x52, 0x0a, 0x19, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x74, 0x74, 0x6c, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, + 0x0a, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, + 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, + 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1614,7 +1725,7 @@ func file_arena_arena_msg_proto_rawDescGZIP() []byte { return file_arena_arena_msg_proto_rawDescData } -var file_arena_arena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 28) +var file_arena_arena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 30) var file_arena_arena_msg_proto_goTypes = []interface{}{ (*ArenaInfoReq)(nil), // 0: ArenaInfoReq (*ArenaInfoResp)(nil), // 1: ArenaInfoResp @@ -1642,40 +1753,43 @@ var file_arena_arena_msg_proto_goTypes = []interface{}{ (*ArenaPlotRewardResp)(nil), // 23: ArenaPlotRewardResp (*ArenaTaskReceiveReq)(nil), // 24: ArenaTaskReceiveReq (*ArenaTaskReceiveResp)(nil), // 25: ArenaTaskReceiveResp - (*ArenaSettlementRewardPush)(nil), // 26: ArenaSettlementRewardPush - nil, // 27: ArenaPlotRewardResp.NpcEntry - (*DBArenaUser)(nil), // 28: DBArenaUser - (*ArenaPlayer)(nil), // 29: ArenaPlayer - (*BattleFormation)(nil), // 30: BattleFormation - (ErrorCode)(0), // 31: ErrorCode - (*BattleInfo)(nil), // 32: BattleInfo - (*BattleReport)(nil), // 33: BattleReport - (*UserAtno)(nil), // 34: UserAtno - (*DBNpc)(nil), // 35: DBNpc + (*ArenaDanReceiveReq)(nil), // 26: ArenaDanReceiveReq + (*ArenaDanReceiveResp)(nil), // 27: ArenaDanReceiveResp + (*ArenaSettlementRewardPush)(nil), // 28: ArenaSettlementRewardPush + nil, // 29: ArenaPlotRewardResp.NpcEntry + (*DBArenaUser)(nil), // 30: DBArenaUser + (*ArenaPlayer)(nil), // 31: ArenaPlayer + (*BattleFormation)(nil), // 32: BattleFormation + (ErrorCode)(0), // 33: ErrorCode + (*BattleInfo)(nil), // 34: BattleInfo + (*BattleReport)(nil), // 35: BattleReport + (*UserAtno)(nil), // 36: UserAtno + (*DBNpc)(nil), // 37: DBNpc } var file_arena_arena_msg_proto_depIdxs = []int32{ - 28, // 0: ArenaInfoResp.info:type_name -> DBArenaUser - 28, // 1: ArenaOtherInfoResp.info:type_name -> DBArenaUser - 29, // 2: ArenaMatcheResp.players:type_name -> ArenaPlayer - 30, // 3: ArenaChallengeReq.battle:type_name -> BattleFormation - 31, // 4: ArenaChallengeResp.code:type_name -> ErrorCode - 32, // 5: ArenaChallengeResp.info:type_name -> BattleInfo - 33, // 6: ArenaChallengeRewardReq.report:type_name -> BattleReport - 29, // 7: ArenaRankResp.players:type_name -> ArenaPlayer - 28, // 8: ArenaRankResp.info:type_name -> DBArenaUser - 30, // 9: ArenaPlotReq.battle:type_name -> BattleFormation - 31, // 10: ArenaPlotResp.code:type_name -> ErrorCode - 32, // 11: ArenaPlotResp.info:type_name -> BattleInfo - 33, // 12: ArenaPlotRewardReq.report:type_name -> BattleReport - 27, // 13: ArenaPlotRewardResp.npc:type_name -> ArenaPlotRewardResp.NpcEntry - 34, // 14: ArenaTaskReceiveResp.award:type_name -> UserAtno - 34, // 15: ArenaSettlementRewardPush.award:type_name -> UserAtno - 35, // 16: ArenaPlotRewardResp.NpcEntry.value:type_name -> DBNpc - 17, // [17:17] is the sub-list for method output_type - 17, // [17:17] is the sub-list for method input_type - 17, // [17:17] is the sub-list for extension type_name - 17, // [17:17] is the sub-list for extension extendee - 0, // [0:17] is the sub-list for field type_name + 30, // 0: ArenaInfoResp.info:type_name -> DBArenaUser + 30, // 1: ArenaOtherInfoResp.info:type_name -> DBArenaUser + 31, // 2: ArenaMatcheResp.players:type_name -> ArenaPlayer + 32, // 3: ArenaChallengeReq.battle:type_name -> BattleFormation + 33, // 4: ArenaChallengeResp.code:type_name -> ErrorCode + 34, // 5: ArenaChallengeResp.info:type_name -> BattleInfo + 35, // 6: ArenaChallengeRewardReq.report:type_name -> BattleReport + 31, // 7: ArenaRankResp.players:type_name -> ArenaPlayer + 30, // 8: ArenaRankResp.info:type_name -> DBArenaUser + 32, // 9: ArenaPlotReq.battle:type_name -> BattleFormation + 33, // 10: ArenaPlotResp.code:type_name -> ErrorCode + 34, // 11: ArenaPlotResp.info:type_name -> BattleInfo + 35, // 12: ArenaPlotRewardReq.report:type_name -> BattleReport + 29, // 13: ArenaPlotRewardResp.npc:type_name -> ArenaPlotRewardResp.NpcEntry + 36, // 14: ArenaTaskReceiveResp.award:type_name -> UserAtno + 36, // 15: ArenaDanReceiveResp.award:type_name -> UserAtno + 36, // 16: ArenaSettlementRewardPush.award:type_name -> UserAtno + 37, // 17: ArenaPlotRewardResp.NpcEntry.value:type_name -> DBNpc + 18, // [18:18] is the sub-list for method output_type + 18, // [18:18] is the sub-list for method input_type + 18, // [18:18] is the sub-list for extension type_name + 18, // [18:18] is the sub-list for extension extendee + 0, // [0:18] is the sub-list for field type_name } func init() { file_arena_arena_msg_proto_init() } @@ -2001,6 +2115,30 @@ func file_arena_arena_msg_proto_init() { } } file_arena_arena_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ArenaDanReceiveReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_arena_arena_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ArenaDanReceiveResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_arena_arena_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ArenaSettlementRewardPush); i { case 0: return &v.state @@ -2019,7 +2157,7 @@ func file_arena_arena_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_arena_arena_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 28, + NumMessages: 30, NumExtensions: 0, NumServices: 0, },