diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 87ee4886c..485e882a6 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -57,7 +57,6 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq } return } - this.module.api.SelectDraw(session, nil) } if heroRecord, err = this.module.modelRecord.GetHeroRecord(session.GetUserId()); err != nil { errdata = &pb.ErrorData{ diff --git a/modules/hero/api_selectdraw.go b/modules/hero/api_selectdraw.go deleted file mode 100644 index 0d2fe9809..000000000 --- a/modules/hero/api_selectdraw.go +++ /dev/null @@ -1,231 +0,0 @@ -package hero - -import ( - "fmt" - "go_dreamfactory/comm" - "go_dreamfactory/pb" - cfg "go_dreamfactory/sys/configure/structs" -) - -//参数校验 -func (this *apiComp) SelectDrawCheck(session comm.IUserSession, req *pb.HeroSelectDrawReq) (errdata *pb.ErrorData) { - return -} - -func (this *apiComp) SelectDraw(session comm.IUserSession, req *pb.HeroSelectDrawReq) (errdata *pb.ErrorData) { - var ( - err error - drawType int32 - heroRecord *pb.DBHeroRecord - cfgGlobal *cfg.GameGlobalData // 全局配置 - - szCards []string // 最终抽到的卡牌 - drawCount int32 // 抽卡次数 - costRes []*cfg.Gameatn // 消耗 - star4Count int32 // 10连抽4星数量 - star5Count int32 // 10连抽5星数量 - strPool []string // 10连跨多个卡池情况 - update map[string]interface{} - drawConf *cfg.GameDrawPoolData - dCount int32 - IsBaodiPool bool // 是否是保底卡池 - appointmap map[int32]string // 指定次数抽卡到指定卡池 - ) - - if heroRecord, err = this.module.modelRecord.GetHeroRecord(session.GetUserId()); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_DBError, - Title: pb.ErrorCode_DBError.ToString(), - Message: err.Error(), - } - return - } - if heroRecord.Newcomplete { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_HeroSelectDrawComplete, - Title: pb.ErrorCode_HeroSelectDrawComplete.ToString(), - } - return - } - cfgGlobal = this.module.ModuleTools.GetGlobalConf() // 读取抽卡配置文件 - if cfgGlobal == nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: fmt.Sprintf("GetGlobalConf not found"), - } - return - } - - if cfgGlobal.NewDrawcardAttemptsNums <= heroRecord.Selectcount { // 次数校验 - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_HeroSelectMaxCount, - Title: pb.ErrorCode_HeroSelectMaxCount.ToString(), - } - return - } - drawType = comm.DrawCardTypeNew // 抽卡类型 1 - drawCount = 10 // 10连 - update = make(map[string]interface{}) - appointmap = make(map[int32]string) - szCards = make([]string, 0) - - // 准备数据 - ///////////////////////////////////// - drawConf, err = this.module.configure.GetHeroDrawConfigByType(drawType) // 获取新的抽卡配置 - if err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ReqParameterError, - Title: pb.ErrorCode_ReqParameterError.ToString(), - Message: err.Error(), - } - return - } - - for _, v := range drawConf.RecruitmentType { - appointmap[v.K] = v.S // 指定次抽数据 - } - - //////////////////////////////////////////////////////// - - if true { // 普通卡池抽卡 - ////// 获取消耗 - if costRes, errdata = this.module.modelHero.CheckDrawCardRes(session, drawConf, 0, drawCount); errdata != nil { - return - } - dCount = heroRecord.Count[drawType] // 获取当前阵容抽卡次数 - // 校验是否达到保底卡池 - if drawConf.Protect >= dCount { - IsBaodiPool = true - } - ///// 获取消耗 end - for i := 1; i <= int(drawCount); i++ { // 一张一张的抽 - heroRecord.Race[drawType] += 1 - dCount++ - heroRecord.Baodi5[drawType]++ - heroRecord.Baodi4[drawType]++ - if v, ok := appointmap[dCount]; ok { // 优先校验是否是指定抽 - strPool = append(strPool, v) //找到了 - continue - } - Is5Star := false - starWeight := []int32{drawConf.Star3w, drawConf.Star4w, drawConf.Star5w} // 随机获取三星 - if drawConf.Permission != -1 && heroRecord.Baodi5[drawType] > 0 { // 橙权递增 - starWeight[2] += this.module.configure.GetHeroDrawWeightConfigById(drawConf.Permission, heroRecord.Baodi5[drawType]) - } - starIndex := comm.GetRandW(starWeight) // 3 4 5 星索引 - if IsBaodiPool { - if starIndex == 0 { - strPool = append(strPool, drawConf.P3pool) - } else if starIndex == 1 { - star4Count++ - heroRecord.Baodi4[drawType] = 0 - strPool = append(strPool, drawConf.P4pool) - } else if starIndex == 2 { - star5Count++ - heroRecord.Baodi5[drawType] = 0 - strPool = append(strPool, drawConf.P5pool) - Is5Star = true - } - } else { - if starIndex == 0 { - strPool = append(strPool, drawConf.N3pool) - } else if starIndex == 1 { - star4Count++ - heroRecord.Baodi4[drawType] = 0 - strPool = append(strPool, drawConf.N4pool) - } else if starIndex == 2 { - star5Count++ - heroRecord.Baodi5[drawType] = 0 - strPool = append(strPool, drawConf.N5pool) - Is5Star = true - } - } - // 判断是否必出5星 - if heroRecord.Baodi5[drawType] >= drawConf.Baidi5 && !Is5Star { - heroRecord.Baodi5[drawType] = 0 - star5Count++ - if IsBaodiPool { - strPool[len(strPool)-1] = drawConf.P5pool - } else { - strPool[len(strPool)-1] = drawConf.N5pool - } - Is5Star = true - continue - } - // 判断是否必出4星 - if heroRecord.Baodi4[drawType] >= drawConf.Baodi4 { - heroRecord.Baodi4[drawType] = 0 - star4Count++ - if IsBaodiPool { - strPool[len(strPool)-1] = drawConf.P4pool - } else { - strPool[len(strPool)-1] = drawConf.N4pool - } - continue - } - - if star4Count >= cfgGlobal.Draw10Star4Max { // 10连抽最大4星数量 - if IsBaodiPool { - strPool[len(strPool)-1] = drawConf.P3pool - } else { - strPool[len(strPool)-1] = drawConf.N3pool - } - } - if star5Count >= cfgGlobal.Draw10Star5Max { // 10连抽最大5星数量 - if IsBaodiPool { - strPool[len(strPool)-1] = drawConf.P3pool - } else { - strPool[len(strPool)-1] = drawConf.N3pool - } - } - } - } - // 通过卡池获得最终的英雄 - for _, v := range strPool { - card, err := this.module.configure.GetHeroByPool(v) - if err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), - } - return - } - szCards = append(szCards, card) - } - - // 消耗道具 - if errdata = this.module.ConsumeRes(session, costRes, true); errdata != nil { - return - } - heroRecord.Totalcount += dCount - heroRecord.Daycount += dCount - - heroRecord.Count[drawType] = dCount - update["drawcount"] = dCount - update["count"] = heroRecord.Count - update["totalcount"] = heroRecord.Totalcount - update["race"] = heroRecord.Race - update["daycount"] = heroRecord.Daycount - update["baodi4"] = heroRecord.Baodi4 - update["baodi5"] = heroRecord.Baodi5 - // 抽卡次数+1 - heroRecord.Selectcount += 1 - heroRecord.Cur = szCards - update["selectcount"] = heroRecord.Selectcount - update["cur"] = heroRecord.Cur - if err = this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_DBError, - Title: pb.ErrorCode_DBError.String(), - Message: err.Error(), - } - return - } - - session.SendMsg(string(this.module.GetType()), "selectdraw", &pb.HeroSelectDrawResp{ - Record: heroRecord, - }) - return -} diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index b0461f5f8..97c7d4f9f 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -2054,92 +2054,6 @@ func (x *HeroAppointHeroResp) GetHeroid() string { return "" } -// 选择抽卡协议 -type HeroSelectDrawReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *HeroSelectDrawReq) Reset() { - *x = HeroSelectDrawReq{} - if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[39] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *HeroSelectDrawReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*HeroSelectDrawReq) ProtoMessage() {} - -func (x *HeroSelectDrawReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[39] - 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 HeroSelectDrawReq.ProtoReflect.Descriptor instead. -func (*HeroSelectDrawReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{39} -} - -type HeroSelectDrawResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Record *DBHeroRecord `protobuf:"bytes,1,opt,name=record,proto3" json:"record"` // 扩展数据 -} - -func (x *HeroSelectDrawResp) Reset() { - *x = HeroSelectDrawResp{} - if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[40] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *HeroSelectDrawResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*HeroSelectDrawResp) ProtoMessage() {} - -func (x *HeroSelectDrawResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[40] - 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 HeroSelectDrawResp.ProtoReflect.Descriptor instead. -func (*HeroSelectDrawResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{40} -} - -func (x *HeroSelectDrawResp) GetRecord() *DBHeroRecord { - if x != nil { - return x.Record - } - return nil -} - type HeroSaveCardReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2151,7 +2065,7 @@ type HeroSaveCardReq struct { func (x *HeroSaveCardReq) Reset() { *x = HeroSaveCardReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[41] + mi := &file_hero_hero_msg_proto_msgTypes[39] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2164,7 +2078,7 @@ func (x *HeroSaveCardReq) String() string { func (*HeroSaveCardReq) ProtoMessage() {} func (x *HeroSaveCardReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[41] + mi := &file_hero_hero_msg_proto_msgTypes[39] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2177,7 +2091,7 @@ func (x *HeroSaveCardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroSaveCardReq.ProtoReflect.Descriptor instead. func (*HeroSaveCardReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{41} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{39} } func (x *HeroSaveCardReq) GetIndex() int32 { @@ -2198,7 +2112,7 @@ type HeroSaveCardResp struct { func (x *HeroSaveCardResp) Reset() { *x = HeroSaveCardResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[42] + mi := &file_hero_hero_msg_proto_msgTypes[40] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2211,7 +2125,7 @@ func (x *HeroSaveCardResp) String() string { func (*HeroSaveCardResp) ProtoMessage() {} func (x *HeroSaveCardResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[42] + mi := &file_hero_hero_msg_proto_msgTypes[40] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2224,7 +2138,7 @@ func (x *HeroSaveCardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroSaveCardResp.ProtoReflect.Descriptor instead. func (*HeroSaveCardResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{42} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{40} } func (x *HeroSaveCardResp) GetRecord() *DBHeroRecord { @@ -2246,7 +2160,7 @@ type HeroSelectCardReq struct { func (x *HeroSelectCardReq) Reset() { *x = HeroSelectCardReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[43] + mi := &file_hero_hero_msg_proto_msgTypes[41] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2259,7 +2173,7 @@ func (x *HeroSelectCardReq) String() string { func (*HeroSelectCardReq) ProtoMessage() {} func (x *HeroSelectCardReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[43] + mi := &file_hero_hero_msg_proto_msgTypes[41] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2272,7 +2186,7 @@ func (x *HeroSelectCardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroSelectCardReq.ProtoReflect.Descriptor instead. func (*HeroSelectCardReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{43} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{41} } func (x *HeroSelectCardReq) GetIndex() int32 { @@ -2294,7 +2208,7 @@ type HeroSelectCardResp struct { func (x *HeroSelectCardResp) Reset() { *x = HeroSelectCardResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[44] + mi := &file_hero_hero_msg_proto_msgTypes[42] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2307,7 +2221,7 @@ func (x *HeroSelectCardResp) String() string { func (*HeroSelectCardResp) ProtoMessage() {} func (x *HeroSelectCardResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[44] + mi := &file_hero_hero_msg_proto_msgTypes[42] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2320,7 +2234,7 @@ func (x *HeroSelectCardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroSelectCardResp.ProtoReflect.Descriptor instead. func (*HeroSelectCardResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{44} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{42} } func (x *HeroSelectCardResp) GetRecord() *DBHeroRecord { @@ -2532,27 +2446,22 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, - 0x22, 0x13, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x44, 0x72, - 0x61, 0x77, 0x52, 0x65, 0x71, 0x22, 0x3b, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x65, 0x6c, - 0x65, 0x63, 0x74, 0x44, 0x72, 0x61, 0x77, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x72, - 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, - 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x22, 0x27, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x61, 0x76, 0x65, 0x43, 0x61, - 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x39, 0x0a, 0x10, 0x48, - 0x65, 0x72, 0x6f, 0x53, 0x61, 0x76, 0x65, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x25, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, - 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x29, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x65, - 0x6c, 0x65, 0x63, 0x74, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, - 0x78, 0x22, 0x5a, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x43, - 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, - 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x1d, - 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x41, - 0x74, 0x6e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x27, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x61, 0x76, 0x65, 0x43, 0x61, 0x72, 0x64, + 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x39, 0x0a, 0x10, 0x48, 0x65, 0x72, + 0x6f, 0x53, 0x61, 0x76, 0x65, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, + 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, + 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x22, 0x29, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x65, 0x6c, 0x65, + 0x63, 0x74, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, + 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, + 0x5a, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x43, 0x61, 0x72, + 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x1d, 0x0a, 0x04, + 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x41, 0x74, 0x6e, + 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2567,7 +2476,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { return file_hero_hero_msg_proto_rawDescData } -var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 51) +var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 49) var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroInfoReq)(nil), // 0: HeroInfoReq (*HeroInfoResp)(nil), // 1: HeroInfoResp @@ -2608,57 +2517,54 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroPeachRewardResp)(nil), // 36: HeroPeachRewardResp (*HeroAppointHeroReq)(nil), // 37: HeroAppointHeroReq (*HeroAppointHeroResp)(nil), // 38: HeroAppointHeroResp - (*HeroSelectDrawReq)(nil), // 39: HeroSelectDrawReq - (*HeroSelectDrawResp)(nil), // 40: HeroSelectDrawResp - (*HeroSaveCardReq)(nil), // 41: HeroSaveCardReq - (*HeroSaveCardResp)(nil), // 42: HeroSaveCardResp - (*HeroSelectCardReq)(nil), // 43: HeroSelectCardReq - (*HeroSelectCardResp)(nil), // 44: HeroSelectCardResp - nil, // 45: HeroStrengthenUplvReq.ItemEntry - nil, // 46: HeroStrengthenUpSkillReq.ItemEntry - nil, // 47: HeroPropertyPush.PropertyEntry - nil, // 48: HeroPropertyPush.AddPropertyEntry - nil, // 49: HeroFusionReq.HerosEntry - nil, // 50: HeroPeachRewardResp.PeachEntry - (*DBHero)(nil), // 51: DBHero - (*UserAtno)(nil), // 52: UserAtno - (*DBHeroRecord)(nil), // 53: DBHeroRecord - (*DBHeroTalent)(nil), // 54: DBHeroTalent + (*HeroSaveCardReq)(nil), // 39: HeroSaveCardReq + (*HeroSaveCardResp)(nil), // 40: HeroSaveCardResp + (*HeroSelectCardReq)(nil), // 41: HeroSelectCardReq + (*HeroSelectCardResp)(nil), // 42: HeroSelectCardResp + nil, // 43: HeroStrengthenUplvReq.ItemEntry + nil, // 44: HeroStrengthenUpSkillReq.ItemEntry + nil, // 45: HeroPropertyPush.PropertyEntry + nil, // 46: HeroPropertyPush.AddPropertyEntry + nil, // 47: HeroFusionReq.HerosEntry + nil, // 48: HeroPeachRewardResp.PeachEntry + (*DBHero)(nil), // 49: DBHero + (*UserAtno)(nil), // 50: UserAtno + (*DBHeroRecord)(nil), // 51: DBHeroRecord + (*DBHeroTalent)(nil), // 52: DBHeroTalent } var file_hero_hero_msg_proto_depIdxs = []int32{ - 51, // 0: HeroInfoResp.base:type_name -> DBHero - 51, // 1: HeroListResp.list:type_name -> DBHero - 45, // 2: HeroStrengthenUplvReq.item:type_name -> HeroStrengthenUplvReq.ItemEntry - 51, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero - 51, // 4: HeroStrengthenUpStarResp.hero:type_name -> DBHero - 46, // 5: HeroStrengthenUpSkillReq.item:type_name -> HeroStrengthenUpSkillReq.ItemEntry - 51, // 6: HeroStrengthenUpSkillResp.hero:type_name -> DBHero - 51, // 7: HeroAwakenResp.hero:type_name -> DBHero - 47, // 8: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry - 48, // 9: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry - 51, // 10: HeroLockResp.hero:type_name -> DBHero - 51, // 11: HeroGetSpecifiedResp.hero:type_name -> DBHero - 52, // 12: AtnoData.atno:type_name -> UserAtno + 49, // 0: HeroInfoResp.base:type_name -> DBHero + 49, // 1: HeroListResp.list:type_name -> DBHero + 43, // 2: HeroStrengthenUplvReq.item:type_name -> HeroStrengthenUplvReq.ItemEntry + 49, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero + 49, // 4: HeroStrengthenUpStarResp.hero:type_name -> DBHero + 44, // 5: HeroStrengthenUpSkillReq.item:type_name -> HeroStrengthenUpSkillReq.ItemEntry + 49, // 6: HeroStrengthenUpSkillResp.hero:type_name -> DBHero + 49, // 7: HeroAwakenResp.hero:type_name -> DBHero + 45, // 8: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry + 46, // 9: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry + 49, // 10: HeroLockResp.hero:type_name -> DBHero + 49, // 11: HeroGetSpecifiedResp.hero:type_name -> DBHero + 50, // 12: AtnoData.atno:type_name -> UserAtno 19, // 13: HeroDrawCardResp.data:type_name -> AtnoData - 52, // 14: HeroDrawCardResp.wish:type_name -> UserAtno - 53, // 15: HeroDrawCardResp.record:type_name -> DBHeroRecord - 51, // 16: HeroChangePush.list:type_name -> DBHero - 53, // 17: HeroDrawCardFloorResp.record:type_name -> DBHeroRecord - 49, // 18: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry - 54, // 19: HeroTalentListResp.telnet:type_name -> DBHeroTalent - 54, // 20: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent - 54, // 21: HeroTalentResetResp.telnet:type_name -> DBHeroTalent - 50, // 22: HeroPeachRewardResp.peach:type_name -> HeroPeachRewardResp.PeachEntry - 52, // 23: HeroPeachRewardResp.atno:type_name -> UserAtno - 53, // 24: HeroSelectDrawResp.record:type_name -> DBHeroRecord - 53, // 25: HeroSaveCardResp.record:type_name -> DBHeroRecord - 53, // 26: HeroSelectCardResp.record:type_name -> DBHeroRecord - 19, // 27: HeroSelectCardResp.atno:type_name -> AtnoData - 28, // [28:28] is the sub-list for method output_type - 28, // [28:28] is the sub-list for method input_type - 28, // [28:28] is the sub-list for extension type_name - 28, // [28:28] is the sub-list for extension extendee - 0, // [0:28] is the sub-list for field type_name + 50, // 14: HeroDrawCardResp.wish:type_name -> UserAtno + 51, // 15: HeroDrawCardResp.record:type_name -> DBHeroRecord + 49, // 16: HeroChangePush.list:type_name -> DBHero + 51, // 17: HeroDrawCardFloorResp.record:type_name -> DBHeroRecord + 47, // 18: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry + 52, // 19: HeroTalentListResp.telnet:type_name -> DBHeroTalent + 52, // 20: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent + 52, // 21: HeroTalentResetResp.telnet:type_name -> DBHeroTalent + 48, // 22: HeroPeachRewardResp.peach:type_name -> HeroPeachRewardResp.PeachEntry + 50, // 23: HeroPeachRewardResp.atno:type_name -> UserAtno + 51, // 24: HeroSaveCardResp.record:type_name -> DBHeroRecord + 51, // 25: HeroSelectCardResp.record:type_name -> DBHeroRecord + 19, // 26: HeroSelectCardResp.atno:type_name -> AtnoData + 27, // [27:27] is the sub-list for method output_type + 27, // [27:27] is the sub-list for method input_type + 27, // [27:27] is the sub-list for extension type_name + 27, // [27:27] is the sub-list for extension extendee + 0, // [0:27] is the sub-list for field type_name } func init() { file_hero_hero_msg_proto_init() } @@ -3138,30 +3044,6 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroSelectDrawReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hero_hero_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroSelectDrawResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hero_hero_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroSaveCardReq); i { case 0: return &v.state @@ -3173,7 +3055,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroSaveCardResp); i { case 0: return &v.state @@ -3185,7 +3067,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroSelectCardReq); i { case 0: return &v.state @@ -3197,7 +3079,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroSelectCardResp); i { case 0: return &v.state @@ -3216,7 +3098,7 @@ func file_hero_hero_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 51, + NumMessages: 49, NumExtensions: 0, NumServices: 0, },