diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index 94d7fe6b5..11acb8bf8 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -109,6 +109,19 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal mapData["pagodaId"] = pagoda.PagodaId mapData["type"] = pagoda.Type mapData["data"] = pagoda.Data + // 校验所有塔是否通关 + if !pagoda.Complete { + pagoda.Complete = true + for k, v := range this.module.configure.GetMapFloorData() { + if pagoda.Data[k] != v { + pagoda.Complete = false + break + } + } + if pagoda.Complete { + mapData["complete"] = pagoda.Complete + } + } errdata = this.module.ModifyPagodaData(session.GetUserId(), mapData) session.SendMsg(string(this.module.GetType()), PagodaChallengeOverResp, &pb.PagodaChallengeOverResp{Data: pagoda}) diff --git a/modules/pagoda/api_warorder.go b/modules/pagoda/api_warorder.go index 159af3a34..19e858208 100644 --- a/modules/pagoda/api_warorder.go +++ b/modules/pagoda/api_warorder.go @@ -3,7 +3,6 @@ package pagoda import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -14,117 +13,5 @@ func (this *apiComp) WarOrderCheck(session comm.IUserSession, req *pb.PagodaWarO // 战令领取 func (this *apiComp) WarOrder(session comm.IUserSession, req *pb.PagodaWarOrderReq) (errdata *pb.ErrorData) { - var ( - list *pb.DBPagoda - resCfg []*cfg.Gameatn - res []*pb.UserAssets - vip bool // 是否有特权 - resID []int32 // 当前可领取的id - vipID []int32 // 有vip的情况 可领取的id - mapData map[string]interface{} - bReward bool - ) - mapData = make(map[string]interface{}, 0) - //this.WarOrderCheck(session, req) - - list, _ = this.module.modelPagoda.getPagodaList(session.GetUserId()) - if list.Id == "" { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_PagodaConditionErr, // 领取条件没达到 - Title: pb.ErrorCode_PagodaConditionErr.ToString(), - } - return - } - - payPoint := this.module.configure.GetPassCheckPointByTtype(1) - if payPoint != "" { - // 获取特权信息 - vip = this.module.ModulePrivilege.CheckPrivilege(session, payPoint) - } - - if list.PagodaId < list.PassCheckID { // 层数校验 - //code = pb.ErrorCode_PagodaConditionErr // 领取条件没达到 - //return - bReward = true - } - if vip && bReward { - if list.PagodaId < list.VipPassCheckID { // 层数校验 - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_PagodaConditionErr, // 领取条件没达到 - Title: pb.ErrorCode_PagodaConditionErr.ToString(), - } - return - } - } - conf := this.module.configure.GetPassCheckByTtype(1) - - for _, v := range conf { - if v.Parameter <= list.PassCheckID { - continue - } - if v.Parameter <= list.PagodaId { - resID = append(resID, v.Id) - mapData["passCheckID"] = v.Parameter - list.PassCheckID = v.Parameter - } - } - if vip { - for _, v := range conf { - if v.Parameter <= list.VipPassCheckID { - continue - } - if v.Parameter <= list.PagodaId { - vipID = append(vipID, v.Id) - mapData["vipPassCheckID"] = v.Parameter - list.VipPassCheckID = v.Parameter - } - } - } - for _, v := range resID { - if confCheck := this.module.configure.GetPassCheckByID(v); conf != nil { - resCfg = append(resCfg, confCheck.FreeReward) - - } - } - for _, v := range vipID { - if confCheck := this.module.configure.GetPassCheckByID(v); conf != nil { - resCfg = append(resCfg, confCheck.PayReward) - } - } - // 资源整合 - var totalRes []*cfg.Gameatn - for _, v := range resCfg { - b := false - for _, v1 := range totalRes { - if v.A == v1.A && v.T == v1.T { - b = true - v1.N += v.N - break - } - } - if !b { - totalRes = append(totalRes, v) - } - } - if len(totalRes) > 0 { - if errdata = this.module.DispenseRes(session, totalRes, true); errdata != nil { // 发放奖励 - return - } - } - - // 转成协议格式 - for _, v := range totalRes { - res = append(res, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } - - errdata = this.module.ModifyPagodaData(session.GetUserId(), mapData) - session.SendMsg(string(this.module.GetType()), PagodaWarOrderResp, &pb.PagodaWarOrderResp{ - Data: list, - Itmes: res, - }) return } diff --git a/modules/pagoda/comp_configure.go b/modules/pagoda/comp_configure.go index 912c8132a..aa962a1a7 100644 --- a/modules/pagoda/comp_configure.go +++ b/modules/pagoda/comp_configure.go @@ -17,6 +17,7 @@ const ( game_pagodaseasonreward = "game_pagodaseasonreward.json" game_pagodataskreward = "game_pagodataskreward.json" game_passcheck = "game_passcheck.json" + game_circulate = "game_circulate.json" ) ///配置管理基础组件 @@ -27,6 +28,8 @@ type configureComp struct { _checkType map[int32][]*cfg.GamePassCheckData // key type _mapPagoda map[int32]*cfg.GamePagodaData + _mapFloor map[int32]int32 // key 页签 value 层数 + _mapRace map[int32]*cfg.GameCirculateData // 阵营塔 } //组件初始化接口 @@ -40,6 +43,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp configure.RegisterConfigure(game_passcheck, cfg.NewGamePassCheck, this.LoadPassCheck) configure.RegisterConfigure(game_pagoda, cfg.NewGamePagoda, this.LoadPagoda) + configure.RegisterConfigure(game_circulate, cfg.NewGameCirculate, this.LoadCirculate) return } @@ -165,23 +169,27 @@ func (this *configureComp) GetPagodaConfigData(id int32) (data *cfg.GamePagodaDa } func (this *configureComp) LoadPagoda() { - var err error if v, err := this.GetConfigure(game_pagoda); err == nil { if configure, ok := v.(*cfg.GamePagoda); ok { this.hlock.Lock() defer this.hlock.Unlock() this._mapPagoda = make(map[int32]*cfg.GamePagodaData) + this._mapFloor = make(map[int32]int32) for _, value := range configure.GetDataList() { key := value.Tab<<16 + value.LayerNum this._mapPagoda[key] = value + this._mapFloor[value.Tab] = value.LayerNum } return } } - log.Errorf("get game_pagoda conf err:%v", err) return } +func (this *configureComp) GetMapFloorData() (data map[int32]int32) { + return this._mapFloor +} + func (this *configureComp) GetPagodaConfBytab(tab int32, ly int32) (data *cfg.GamePagoda, err error) { if _, ok := this._mapPagoda[tab<<16+ly]; ok { return @@ -189,3 +197,20 @@ func (this *configureComp) GetPagodaConfBytab(tab int32, ly int32) (data *cfg.Ga err = comm.NewNotFoundConfErr("pagoda", game_pagoda, fmt.Errorf("tab %d ,ly %d not found", tab, ly)) return } + +func (this *configureComp) LoadCirculate() { + + if v, err := this.GetConfigure(game_circulate); err == nil { + if configure, ok := v.(*cfg.GameCirculate); ok { + this.hlock.Lock() + defer this.hlock.Unlock() + this._mapRace = make(map[int32]*cfg.GameCirculateData) + for _, value := range configure.GetDataList() { + this._mapRace[value.Restriction] = value + } + return + } + } + + return +} diff --git a/pb/pagoda_db.pb.go b/pb/pagoda_db.pb.go index 9afe00981..10d435b07 100644 --- a/pb/pagoda_db.pb.go +++ b/pb/pagoda_db.pb.go @@ -25,15 +25,13 @@ type DBPagoda 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 - PagodaId int32 `protobuf:"varint,3,opt,name=pagodaId,proto3" json:"pagodaId" bson:"pagodaId"` //塔层 - Reward map[int32]bool `protobuf:"bytes,4,rep,name=reward,proto3" json:"reward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 是否领奖 - Type int32 `protobuf:"varint,5,opt,name=type,proto3" json:"type"` - Complete bool `protobuf:"varint,6,opt,name=complete,proto3" json:"complete"` // 是否通关 - PassCheckID int32 `protobuf:"varint,7,opt,name=passCheckID,proto3" json:"passCheckID"` // 战令领奖ID - VipPassCheckID int32 `protobuf:"varint,8,opt,name=vipPassCheckID,proto3" json:"vipPassCheckID"` // vip战令领奖ID - Data map[int32]int32 `protobuf:"bytes,9,rep,name=data,proto3" json:"data" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 页签 value 层数 + 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 + PagodaId int32 `protobuf:"varint,3,opt,name=pagodaId,proto3" json:"pagodaId" bson:"pagodaId"` //塔层 + Reward map[int32]bool `protobuf:"bytes,4,rep,name=reward,proto3" json:"reward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 是否领奖 + Type int32 `protobuf:"varint,5,opt,name=type,proto3" json:"type"` + Complete bool `protobuf:"varint,6,opt,name=complete,proto3" json:"complete"` // 是否通关 + Data map[int32]int32 `protobuf:"bytes,7,rep,name=data,proto3" json:"data" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 页签 value 层数 } func (x *DBPagoda) Reset() { @@ -110,20 +108,6 @@ func (x *DBPagoda) GetComplete() bool { return false } -func (x *DBPagoda) GetPassCheckID() int32 { - if x != nil { - return x.PassCheckID - } - return 0 -} - -func (x *DBPagoda) GetVipPassCheckID() int32 { - if x != nil { - return x.VipPassCheckID - } - return 0 -} - func (x *DBPagoda) GetData() map[int32]int32 { if x != nil { return x.Data @@ -259,13 +243,156 @@ func (x *DBPagodaRecord) GetTab() int32 { return 0 } +type DBPagodaRace struct { + state protoimpl.MessageState + 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 + Race map[int32]*RaceData `protobuf:"bytes,3,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 阵营 +} + +func (x *DBPagodaRace) Reset() { + *x = DBPagodaRace{} + if protoimpl.UnsafeEnabled { + mi := &file_pagoda_pagoda_db_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBPagodaRace) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBPagodaRace) ProtoMessage() {} + +func (x *DBPagodaRace) ProtoReflect() protoreflect.Message { + mi := &file_pagoda_pagoda_db_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DBPagodaRace.ProtoReflect.Descriptor instead. +func (*DBPagodaRace) Descriptor() ([]byte, []int) { + return file_pagoda_pagoda_db_proto_rawDescGZIP(), []int{2} +} + +func (x *DBPagodaRace) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBPagodaRace) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBPagodaRace) GetRace() map[int32]*RaceData { + if x != nil { + return x.Race + } + return nil +} + +// 阵营塔数据 +type RaceData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Race int32 `protobuf:"varint,1,opt,name=race,proto3" json:"race"` // 阵营ID 0:循环塔 1: 阵营1 + Buf []int32 `protobuf:"varint,2,rep,packed,name=buf,proto3" json:"buf"` + Rtime int64 `protobuf:"varint,3,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 客户端不用 + Defeat int32 `protobuf:"varint,4,opt,name=defeat,proto3" json:"defeat"` // 今日战胜的次数 + Floor map[int32]int64 `protobuf:"bytes,5,rep,name=floor,proto3" json:"floor" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //key 层数 value 耗时 +} + +func (x *RaceData) Reset() { + *x = RaceData{} + if protoimpl.UnsafeEnabled { + mi := &file_pagoda_pagoda_db_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RaceData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RaceData) ProtoMessage() {} + +func (x *RaceData) ProtoReflect() protoreflect.Message { + mi := &file_pagoda_pagoda_db_proto_msgTypes[3] + 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 RaceData.ProtoReflect.Descriptor instead. +func (*RaceData) Descriptor() ([]byte, []int) { + return file_pagoda_pagoda_db_proto_rawDescGZIP(), []int{3} +} + +func (x *RaceData) GetRace() int32 { + if x != nil { + return x.Race + } + return 0 +} + +func (x *RaceData) GetBuf() []int32 { + if x != nil { + return x.Buf + } + return nil +} + +func (x *RaceData) GetRtime() int64 { + if x != nil { + return x.Rtime + } + return 0 +} + +func (x *RaceData) GetDefeat() int32 { + if x != nil { + return x.Defeat + } + return 0 +} + +func (x *RaceData) GetFloor() map[int32]int64 { + if x != nil { + return x.Floor + } + return nil +} + var File_pagoda_pagoda_db_proto protoreflect.FileDescriptor var file_pagoda_pagoda_db_proto_rawDesc = []byte{ 0x0a, 0x16, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x2f, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x22, 0x8e, 0x03, 0x0a, 0x08, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x12, 0x0e, + 0x6f, 0x22, 0xc4, 0x02, 0x0a, 0x08, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 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, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, @@ -275,39 +402,57 @@ var file_pagoda_pagoda_db_proto_rawDesc = []byte{ 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x70, - 0x61, 0x73, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x12, 0x26, 0x0a, - 0x0e, 0x76, 0x69, 0x70, 0x50, 0x61, 0x73, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x76, 0x69, 0x70, 0x50, 0x61, 0x73, 0x73, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x49, 0x44, 0x12, 0x27, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x09, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x2e, 0x44, - 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x39, - 0x0a, 0x0b, 0x52, 0x65, 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, 0x08, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, - 0x61, 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, 0x87, 0x02, 0x0a, 0x0e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, - 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x6f, 0x64, - 0x61, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x6f, 0x64, - 0x61, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, - 0x6f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, - 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1a, - 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, - 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x61, 0x62, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x27, 0x0a, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x50, 0x61, + 0x67, 0x6f, 0x64, 0x61, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, + 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 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, 0x87, 0x02, 0x0a, 0x0e, 0x44, 0x42, 0x50, + 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x1a, 0x0a, + 0x08, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, + 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, + 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, + 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, + 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, + 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, + 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52, 0x04, + 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, + 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, + 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, + 0x61, 0x62, 0x22, 0xa1, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, + 0x61, 0x63, 0x65, 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, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x61, + 0x63, 0x65, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, + 0x63, 0x65, 0x1a, 0x42, 0x0a, 0x09, 0x52, 0x61, 0x63, 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, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x09, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xc4, 0x01, 0x0a, 0x08, 0x52, 0x61, 0x63, 0x65, 0x44, + 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x75, 0x66, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x62, 0x75, 0x66, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, + 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, + 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x12, 0x2a, 0x0a, 0x05, 0x66, 0x6c, 0x6f, 0x6f, 0x72, + 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x44, 0x61, 0x74, + 0x61, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x66, 0x6c, + 0x6f, 0x6f, 0x72, 0x1a, 0x38, 0x0a, 0x0a, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 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, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -322,23 +467,30 @@ func file_pagoda_pagoda_db_proto_rawDescGZIP() []byte { return file_pagoda_pagoda_db_proto_rawDescData } -var file_pagoda_pagoda_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_pagoda_pagoda_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_pagoda_pagoda_db_proto_goTypes = []interface{}{ (*DBPagoda)(nil), // 0: DBPagoda (*DBPagodaRecord)(nil), // 1: DBPagodaRecord - nil, // 2: DBPagoda.RewardEntry - nil, // 3: DBPagoda.DataEntry - (*LineUp)(nil), // 4: LineUp + (*DBPagodaRace)(nil), // 2: DBPagodaRace + (*RaceData)(nil), // 3: RaceData + nil, // 4: DBPagoda.RewardEntry + nil, // 5: DBPagoda.DataEntry + nil, // 6: DBPagodaRace.RaceEntry + nil, // 7: RaceData.FloorEntry + (*LineUp)(nil), // 8: LineUp } var file_pagoda_pagoda_db_proto_depIdxs = []int32{ - 2, // 0: DBPagoda.reward:type_name -> DBPagoda.RewardEntry - 3, // 1: DBPagoda.data:type_name -> DBPagoda.DataEntry - 4, // 2: DBPagodaRecord.line:type_name -> LineUp - 3, // [3:3] is the sub-list for method output_type - 3, // [3:3] is the sub-list for method input_type - 3, // [3:3] is the sub-list for extension type_name - 3, // [3:3] is the sub-list for extension extendee - 0, // [0:3] is the sub-list for field type_name + 4, // 0: DBPagoda.reward:type_name -> DBPagoda.RewardEntry + 5, // 1: DBPagoda.data:type_name -> DBPagoda.DataEntry + 8, // 2: DBPagodaRecord.line:type_name -> LineUp + 6, // 3: DBPagodaRace.race:type_name -> DBPagodaRace.RaceEntry + 7, // 4: RaceData.floor:type_name -> RaceData.FloorEntry + 3, // 5: DBPagodaRace.RaceEntry.value:type_name -> RaceData + 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_pagoda_pagoda_db_proto_init() } @@ -372,6 +524,30 @@ func file_pagoda_pagoda_db_proto_init() { return nil } } + file_pagoda_pagoda_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBPagodaRace); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pagoda_pagoda_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RaceData); 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{ @@ -379,7 +555,7 @@ func file_pagoda_pagoda_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pagoda_pagoda_db_proto_rawDesc, NumEnums: 0, - NumMessages: 4, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/pagoda_msg.pb.go b/pb/pagoda_msg.pb.go index c189e7818..26e714bf3 100644 --- a/pb/pagoda_msg.pb.go +++ b/pb/pagoda_msg.pb.go @@ -784,6 +784,330 @@ func (x *PagodaWarOrderResp) GetItmes() []*UserAssets { return nil } +// 挑战阵营塔 +type PagodaCallengeRaceReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Race int32 `protobuf:"varint,1,opt,name=race,proto3" json:"race"` //0 循环塔 1 阵营1 ... + Cid int32 `protobuf:"varint,2,opt,name=cid,proto3" json:"cid"` // circularcamptower 表中的id + Battle *BattleFormation `protobuf:"bytes,3,opt,name=battle,proto3" json:"battle"` +} + +func (x *PagodaCallengeRaceReq) Reset() { + *x = PagodaCallengeRaceReq{} + if protoimpl.UnsafeEnabled { + mi := &file_pagoda_pagoda_msg_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PagodaCallengeRaceReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PagodaCallengeRaceReq) ProtoMessage() {} + +func (x *PagodaCallengeRaceReq) ProtoReflect() protoreflect.Message { + mi := &file_pagoda_pagoda_msg_proto_msgTypes[16] + 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 PagodaCallengeRaceReq.ProtoReflect.Descriptor instead. +func (*PagodaCallengeRaceReq) Descriptor() ([]byte, []int) { + return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{16} +} + +func (x *PagodaCallengeRaceReq) GetRace() int32 { + if x != nil { + return x.Race + } + return 0 +} + +func (x *PagodaCallengeRaceReq) GetCid() int32 { + if x != nil { + return x.Cid + } + return 0 +} + +func (x *PagodaCallengeRaceReq) GetBattle() *BattleFormation { + if x != nil { + return x.Battle + } + return nil +} + +type PagodaCallengeRaceResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` + Cid int32 `protobuf:"varint,2,opt,name=cid,proto3" json:"cid"` // 塔的配置id +} + +func (x *PagodaCallengeRaceResp) Reset() { + *x = PagodaCallengeRaceResp{} + if protoimpl.UnsafeEnabled { + mi := &file_pagoda_pagoda_msg_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PagodaCallengeRaceResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PagodaCallengeRaceResp) ProtoMessage() {} + +func (x *PagodaCallengeRaceResp) ProtoReflect() protoreflect.Message { + mi := &file_pagoda_pagoda_msg_proto_msgTypes[17] + 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 PagodaCallengeRaceResp.ProtoReflect.Descriptor instead. +func (*PagodaCallengeRaceResp) Descriptor() ([]byte, []int) { + return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{17} +} + +func (x *PagodaCallengeRaceResp) GetInfo() *BattleInfo { + if x != nil { + return x.Info + } + return nil +} + +func (x *PagodaCallengeRaceResp) GetCid() int32 { + if x != nil { + return x.Cid + } + return 0 +} + +// 挑战Over +type PagodaCallengeRaceOverReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Race int32 `protobuf:"varint,1,opt,name=race,proto3" json:"race"` //0 循环塔 1 阵营1 ... + Cid int32 `protobuf:"varint,2,opt,name=cid,proto3" json:"cid"` // circularcamptower 表中的id + Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报 +} + +func (x *PagodaCallengeRaceOverReq) Reset() { + *x = PagodaCallengeRaceOverReq{} + if protoimpl.UnsafeEnabled { + mi := &file_pagoda_pagoda_msg_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PagodaCallengeRaceOverReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PagodaCallengeRaceOverReq) ProtoMessage() {} + +func (x *PagodaCallengeRaceOverReq) ProtoReflect() protoreflect.Message { + mi := &file_pagoda_pagoda_msg_proto_msgTypes[18] + 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 PagodaCallengeRaceOverReq.ProtoReflect.Descriptor instead. +func (*PagodaCallengeRaceOverReq) Descriptor() ([]byte, []int) { + return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{18} +} + +func (x *PagodaCallengeRaceOverReq) GetRace() int32 { + if x != nil { + return x.Race + } + return 0 +} + +func (x *PagodaCallengeRaceOverReq) GetCid() int32 { + if x != nil { + return x.Cid + } + return 0 +} + +func (x *PagodaCallengeRaceOverReq) GetReport() *BattleReport { + if x != nil { + return x.Report + } + return nil +} + +type PagodaCallengeRaceOverResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Race *RaceData `protobuf:"bytes,1,opt,name=race,proto3" json:"race"` + Reward []*UserAtno `protobuf:"bytes,2,rep,name=reward,proto3" json:"reward"` +} + +func (x *PagodaCallengeRaceOverResp) Reset() { + *x = PagodaCallengeRaceOverResp{} + if protoimpl.UnsafeEnabled { + mi := &file_pagoda_pagoda_msg_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PagodaCallengeRaceOverResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PagodaCallengeRaceOverResp) ProtoMessage() {} + +func (x *PagodaCallengeRaceOverResp) ProtoReflect() protoreflect.Message { + mi := &file_pagoda_pagoda_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 PagodaCallengeRaceOverResp.ProtoReflect.Descriptor instead. +func (*PagodaCallengeRaceOverResp) Descriptor() ([]byte, []int) { + return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{19} +} + +func (x *PagodaCallengeRaceOverResp) GetRace() *RaceData { + if x != nil { + return x.Race + } + return nil +} + +func (x *PagodaCallengeRaceOverResp) GetReward() []*UserAtno { + if x != nil { + return x.Reward + } + return nil +} + +// 获取所有塔的信息 +type PagodaGetRaceReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *PagodaGetRaceReq) Reset() { + *x = PagodaGetRaceReq{} + if protoimpl.UnsafeEnabled { + mi := &file_pagoda_pagoda_msg_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PagodaGetRaceReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PagodaGetRaceReq) ProtoMessage() {} + +func (x *PagodaGetRaceReq) ProtoReflect() protoreflect.Message { + mi := &file_pagoda_pagoda_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 PagodaGetRaceReq.ProtoReflect.Descriptor instead. +func (*PagodaGetRaceReq) Descriptor() ([]byte, []int) { + return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{20} +} + +type PagodaGetRaceResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Race map[int32]*RaceData `protobuf:"bytes,1,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 塔信息 +} + +func (x *PagodaGetRaceResp) Reset() { + *x = PagodaGetRaceResp{} + if protoimpl.UnsafeEnabled { + mi := &file_pagoda_pagoda_msg_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PagodaGetRaceResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PagodaGetRaceResp) ProtoMessage() {} + +func (x *PagodaGetRaceResp) ProtoReflect() protoreflect.Message { + mi := &file_pagoda_pagoda_msg_proto_msgTypes[21] + 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 PagodaGetRaceResp.ProtoReflect.Descriptor instead. +func (*PagodaGetRaceResp) Descriptor() ([]byte, []int) { + return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{21} +} + +func (x *PagodaGetRaceResp) GetRace() map[int32]*RaceData { + if x != nil { + return x.Race + } + return nil +} + var File_pagoda_pagoda_msg_proto protoreflect.FileDescriptor var file_pagoda_pagoda_msg_proto_rawDesc = []byte{ @@ -845,7 +1169,41 @@ var file_pagoda_pagoda_msg_proto_rawDesc = []byte{ 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, - 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x6d, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, + 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x6d, 0x65, 0x73, 0x22, 0x67, 0x0a, 0x15, + 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x61, + 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x4b, 0x0a, 0x16, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, + 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, + 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, + 0x69, 0x64, 0x22, 0x68, 0x0a, 0x19, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x61, 0x6c, 0x6c, + 0x65, 0x6e, 0x67, 0x65, 0x52, 0x61, 0x63, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, + 0x12, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, + 0x61, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, + 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x5e, 0x0a, 0x1a, + 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x61, + 0x63, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x61, + 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x44, + 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, + 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x12, 0x0a, 0x10, + 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71, + 0x22, 0x89, 0x01, 0x0a, 0x11, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x61, + 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, + 0x52, 0x61, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x1a, 0x42, 0x0a, 0x09, 0x52, 0x61, 0x63, 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, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x44, 0x61, 0x74, + 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } @@ -861,48 +1219,64 @@ func file_pagoda_pagoda_msg_proto_rawDescGZIP() []byte { return file_pagoda_pagoda_msg_proto_rawDescData } -var file_pagoda_pagoda_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 16) +var file_pagoda_pagoda_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 23) var file_pagoda_pagoda_msg_proto_goTypes = []interface{}{ - (*PagodaGetListReq)(nil), // 0: PagodaGetListReq - (*PagodaGetListResp)(nil), // 1: PagodaGetListResp - (*PagodaGetRewardReq)(nil), // 2: PagodaGetRewardReq - (*PagodaGetRewardResp)(nil), // 3: PagodaGetRewardResp - (*PagodaChallengeReq)(nil), // 4: PagodaChallengeReq - (*PagodaChallengeResp)(nil), // 5: PagodaChallengeResp - (*PagodaChallengeOverReq)(nil), // 6: PagodaChallengeOverReq - (*PagodaChallengeOverResp)(nil), // 7: PagodaChallengeOverResp - (*PagodaRankListReq)(nil), // 8: PagodaRankListReq - (*PagodaRankListResp)(nil), // 9: PagodaRankListResp - (*PagodaQueryRecordReq)(nil), // 10: PagodaQueryRecordReq - (*PagodaQueryRecordResp)(nil), // 11: PagodaQueryRecordResp - (*PagodaActivateReq)(nil), // 12: PagodaActivateReq - (*PagodaActivateResp)(nil), // 13: PagodaActivateResp - (*PagodaWarOrderReq)(nil), // 14: PagodaWarOrderReq - (*PagodaWarOrderResp)(nil), // 15: PagodaWarOrderResp - (*DBPagoda)(nil), // 16: DBPagoda - (*BattleFormation)(nil), // 17: BattleFormation - (*BattleInfo)(nil), // 18: BattleInfo - (*BattleReport)(nil), // 19: BattleReport - (*DBPagodaRecord)(nil), // 20: DBPagodaRecord - (*UserAssets)(nil), // 21: UserAssets + (*PagodaGetListReq)(nil), // 0: PagodaGetListReq + (*PagodaGetListResp)(nil), // 1: PagodaGetListResp + (*PagodaGetRewardReq)(nil), // 2: PagodaGetRewardReq + (*PagodaGetRewardResp)(nil), // 3: PagodaGetRewardResp + (*PagodaChallengeReq)(nil), // 4: PagodaChallengeReq + (*PagodaChallengeResp)(nil), // 5: PagodaChallengeResp + (*PagodaChallengeOverReq)(nil), // 6: PagodaChallengeOverReq + (*PagodaChallengeOverResp)(nil), // 7: PagodaChallengeOverResp + (*PagodaRankListReq)(nil), // 8: PagodaRankListReq + (*PagodaRankListResp)(nil), // 9: PagodaRankListResp + (*PagodaQueryRecordReq)(nil), // 10: PagodaQueryRecordReq + (*PagodaQueryRecordResp)(nil), // 11: PagodaQueryRecordResp + (*PagodaActivateReq)(nil), // 12: PagodaActivateReq + (*PagodaActivateResp)(nil), // 13: PagodaActivateResp + (*PagodaWarOrderReq)(nil), // 14: PagodaWarOrderReq + (*PagodaWarOrderResp)(nil), // 15: PagodaWarOrderResp + (*PagodaCallengeRaceReq)(nil), // 16: PagodaCallengeRaceReq + (*PagodaCallengeRaceResp)(nil), // 17: PagodaCallengeRaceResp + (*PagodaCallengeRaceOverReq)(nil), // 18: PagodaCallengeRaceOverReq + (*PagodaCallengeRaceOverResp)(nil), // 19: PagodaCallengeRaceOverResp + (*PagodaGetRaceReq)(nil), // 20: PagodaGetRaceReq + (*PagodaGetRaceResp)(nil), // 21: PagodaGetRaceResp + nil, // 22: PagodaGetRaceResp.RaceEntry + (*DBPagoda)(nil), // 23: DBPagoda + (*BattleFormation)(nil), // 24: BattleFormation + (*BattleInfo)(nil), // 25: BattleInfo + (*BattleReport)(nil), // 26: BattleReport + (*DBPagodaRecord)(nil), // 27: DBPagodaRecord + (*UserAssets)(nil), // 28: UserAssets + (*RaceData)(nil), // 29: RaceData + (*UserAtno)(nil), // 30: UserAtno } var file_pagoda_pagoda_msg_proto_depIdxs = []int32{ - 16, // 0: PagodaGetListResp.data:type_name -> DBPagoda - 16, // 1: PagodaGetRewardResp.data:type_name -> DBPagoda - 17, // 2: PagodaChallengeReq.battle:type_name -> BattleFormation - 18, // 3: PagodaChallengeResp.info:type_name -> BattleInfo - 19, // 4: PagodaChallengeOverReq.report:type_name -> BattleReport - 16, // 5: PagodaChallengeOverResp.data:type_name -> DBPagoda - 20, // 6: PagodaRankListResp.ranks:type_name -> DBPagodaRecord - 20, // 7: PagodaQueryRecordResp.data:type_name -> DBPagodaRecord - 16, // 8: PagodaActivateResp.data:type_name -> DBPagoda - 16, // 9: PagodaWarOrderResp.data:type_name -> DBPagoda - 21, // 10: PagodaWarOrderResp.itmes:type_name -> UserAssets - 11, // [11:11] is the sub-list for method output_type - 11, // [11:11] is the sub-list for method input_type - 11, // [11:11] is the sub-list for extension type_name - 11, // [11:11] is the sub-list for extension extendee - 0, // [0:11] is the sub-list for field type_name + 23, // 0: PagodaGetListResp.data:type_name -> DBPagoda + 23, // 1: PagodaGetRewardResp.data:type_name -> DBPagoda + 24, // 2: PagodaChallengeReq.battle:type_name -> BattleFormation + 25, // 3: PagodaChallengeResp.info:type_name -> BattleInfo + 26, // 4: PagodaChallengeOverReq.report:type_name -> BattleReport + 23, // 5: PagodaChallengeOverResp.data:type_name -> DBPagoda + 27, // 6: PagodaRankListResp.ranks:type_name -> DBPagodaRecord + 27, // 7: PagodaQueryRecordResp.data:type_name -> DBPagodaRecord + 23, // 8: PagodaActivateResp.data:type_name -> DBPagoda + 23, // 9: PagodaWarOrderResp.data:type_name -> DBPagoda + 28, // 10: PagodaWarOrderResp.itmes:type_name -> UserAssets + 24, // 11: PagodaCallengeRaceReq.battle:type_name -> BattleFormation + 25, // 12: PagodaCallengeRaceResp.info:type_name -> BattleInfo + 26, // 13: PagodaCallengeRaceOverReq.report:type_name -> BattleReport + 29, // 14: PagodaCallengeRaceOverResp.race:type_name -> RaceData + 30, // 15: PagodaCallengeRaceOverResp.reward:type_name -> UserAtno + 22, // 16: PagodaGetRaceResp.race:type_name -> PagodaGetRaceResp.RaceEntry + 29, // 17: PagodaGetRaceResp.RaceEntry.value:type_name -> RaceData + 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_pagoda_pagoda_msg_proto_init() } @@ -1106,6 +1480,78 @@ func file_pagoda_pagoda_msg_proto_init() { return nil } } + file_pagoda_pagoda_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PagodaCallengeRaceReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pagoda_pagoda_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PagodaCallengeRaceResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pagoda_pagoda_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PagodaCallengeRaceOverReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pagoda_pagoda_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PagodaCallengeRaceOverResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pagoda_pagoda_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PagodaGetRaceReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pagoda_pagoda_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PagodaGetRaceResp); 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{ @@ -1113,7 +1559,7 @@ func file_pagoda_pagoda_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pagoda_pagoda_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 16, + NumMessages: 23, NumExtensions: 0, NumServices: 0, },