diff --git a/comm/imodule.go b/comm/imodule.go index be7fbc276..2645c7be8 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -490,6 +490,7 @@ type ( GetGlobalConf() *cfg.GameGlobalData GetPriceGroupCost(pricegroupId int32, purchase int32) (res []*cfg.Gameatn, err error) + GetHeroConfig(heroCfgId string) (conf *cfg.GameHeroData, err error) GetPriceGroupLen(pricegroupId int32) (count int32, err error) GetGrormetLlame(id string) (data int32, err error) } diff --git a/modules/practice/api_expulsion.go b/modules/practice/api_expulsion.go index 30dad520f..d3c77d445 100644 --- a/modules/practice/api_expulsion.go +++ b/modules/practice/api_expulsion.go @@ -10,13 +10,13 @@ import ( "time" ) -//参数校验 +// 参数校验 func (this *apiComp) ExpulsionCheck(session comm.IUserSession, req *pb.PracticeExpulsionReq) (errdata *pb.ErrorData) { return } -///练功请求 驱逐 +// /练功请求 驱逐 func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpulsionReq) (errdata *pb.ErrorData) { var ( err error @@ -225,8 +225,8 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls }, pillar.Uid) // } - froom.Knapsack[pillar.Teacher] = 0 - froom.Knapsack[pillar.Prop] = 0 + froom.Knapsack[pillar.Teacher].State = 0 + froom.Knapsack[pillar.Prop].State = 0 pillar.Hero = "" pillar.Teacher = "" pillar.Prop = "" diff --git a/modules/practice/api_loot.go b/modules/practice/api_loot.go index 762df7c56..02627e2d3 100644 --- a/modules/practice/api_loot.go +++ b/modules/practice/api_loot.go @@ -8,13 +8,13 @@ import ( "time" ) -//参数校验 +// 参数校验 func (this *apiComp) LootCheck(session comm.IUserSession, req *pb.PracticeLootReq) (errdata *pb.ErrorData) { return } -///练功请求 蹭馆 +// /练功请求 蹭馆 func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (errdata *pb.ErrorData) { var ( err error @@ -59,14 +59,14 @@ func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (e return } if req.Teacher != "" { - if room.Knapsack[req.Teacher] == 1 { //已经被使用 + if room.Knapsack[req.Teacher].State == 1 { //已经被使用 errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, Title: pb.ErrorCode_ReqParameterError.ToString(), } return } - room.Knapsack[req.Teacher] = 1 + room.Knapsack[req.Teacher].State = 1 if tconfigure, err = this.module.configure.getGamePandamasJx(req.Teacher); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, @@ -79,14 +79,14 @@ func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (e froom.Pillarf.Teacher = req.Teacher } if req.Prop != "" { - if room.Knapsack[req.Prop] == 1 { //已经被使用 + if room.Knapsack[req.Prop].State == 1 { //已经被使用 errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, Title: pb.ErrorCode_ReqParameterError.ToString(), } return } - room.Knapsack[req.Prop] = 1 + room.Knapsack[req.Prop].State = 1 if pconfigure, err = this.module.configure.getGamePandamasJx(req.Teacher); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, diff --git a/modules/practice/api_practice.go b/modules/practice/api_practice.go index 443b06c32..3305ca5b5 100644 --- a/modules/practice/api_practice.go +++ b/modules/practice/api_practice.go @@ -22,6 +22,7 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic err error room *pb.DBPracticeRoom hero *pb.DBHero + heroconf *cfg.GameHeroData pillar *pb.DBPracticePillar pillarconfigure *cfg.GamePandamasMzData tconfigure *cfg.GamePandamasJxData @@ -45,7 +46,7 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic } return } - if tconfigure, err = this.module.configure.getGamePandamasJx(req.Teacher); err != nil { + if heroconf, err = this.module.ModuleTools.GetHeroConfig(hero.HeroID); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, Title: pb.ErrorCode_ConfigNoFound.ToString(), @@ -102,14 +103,16 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic } if req.Teacher != "" { - if room.Knapsack[req.Teacher] == 1 { //已经被使用 + if room.Knapsack[req.Teacher].State == 1 { //已经被使用 errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ReqParameterError, - Title: pb.ErrorCode_ReqParameterError.ToString(), + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("the teacher:%s is working", req.Teacher), } return } - room.Knapsack[req.Teacher] = 1 + + room.Knapsack[req.Teacher].State = 1 if tconfigure, err = this.module.configure.getGamePandamasJx(req.Teacher); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, @@ -118,6 +121,34 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic } return } + + if !utils.IsToday(room.Knapsack[req.Teacher].Lastusetime) { + room.Knapsack[req.Teacher].Usenum = 0 + } + + if room.Knapsack[req.Teacher].Usenum >= tconfigure.Limitation { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("the teacher:%s use to Limit", req.Teacher), + } + return + } + room.Knapsack[req.Teacher].Usenum++ + if tconfigure.Race != heroconf.Race { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("the teacher race:%d and the herorace:%d is race no can use", tconfigure.Race, heroconf.Race), + } + } + if tconfigure.Job != heroconf.Job { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("the teacher job:%d and the hero job:%d is race no can use", tconfigure.Job, heroconf.Job), + } + } if tconfigure.BanHero == hero.HeroID { //禁止使用 errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, @@ -126,18 +157,18 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic } return } - extra += tconfigure.Duration + extra += int32(float64(pillarconfigure.PlacementDuration) * float64(tconfigure.Duration) / float64(1000)) pillar.Teacher = req.Teacher } if req.Prop != "" { - if room.Knapsack[req.Prop] == 1 { //已经被使用 + if room.Knapsack[req.Prop].State == 1 { //已经被使用 errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, Title: pb.ErrorCode_ReqParameterError.ToString(), } return } - room.Knapsack[req.Prop] = 1 + room.Knapsack[req.Prop].State = 1 if pconfigure, err = this.module.configure.getGamePandamasJx(req.Prop); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, @@ -146,7 +177,36 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic } return } - extra += pconfigure.Duration + + if !utils.IsToday(room.Knapsack[req.Prop].Lastusetime) { + room.Knapsack[req.Teacher].Usenum = 0 + } + + if room.Knapsack[req.Prop].Usenum >= tconfigure.Limitation { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("the prop:%s use to Limit", req.Prop), + } + return + } + room.Knapsack[req.Prop].Usenum++ + + if pconfigure.Race != heroconf.Race { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("the teacher race:%d and the herorace:%d is race no can use", tconfigure.Race, heroconf.Race), + } + } + if pconfigure.Job != heroconf.Job { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("the teacher job:%d and the hero job:%d is race no can use", tconfigure.Job, heroconf.Job), + } + } + extra += int32(float64(pillarconfigure.PlacementDuration) * float64(pconfigure.Duration) / float64(1000)) pillar.Prop = req.Prop } pillar.Hero = req.Hero diff --git a/modules/practice/api_receive.go b/modules/practice/api_receive.go index 4cdc7221f..cf7d8d047 100644 --- a/modules/practice/api_receive.go +++ b/modules/practice/api_receive.go @@ -11,13 +11,13 @@ import ( "time" ) -//参数校验 +// 参数校验 func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.PracticeReceiveReq) (errdata *pb.ErrorData) { return } -///练功请求 奖励 +// /练功请求 奖励 func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveReq) (errdata *pb.ErrorData) { var ( @@ -241,8 +241,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR if errdata = this.module.DispenseRes(session, append(ants1, ants2...), true); errdata != nil { return } - room.Knapsack[pillar.Teacher] = 0 - room.Knapsack[pillar.Prop] = 0 + room.Knapsack[pillar.Teacher].State = 0 + room.Knapsack[pillar.Prop].State = 0 pillar.Hero = "" pillar.Teacher = "" pillar.Prop = "" diff --git a/modules/practice/modelPandata.go b/modules/practice/modelPandata.go index 2dd348375..5b3152d7f 100644 --- a/modules/practice/modelPandata.go +++ b/modules/practice/modelPandata.go @@ -44,7 +44,7 @@ func (this *modelPandata) queryUserMartialhall(uid string) (result *pb.DBPractic Id: primitive.NewObjectID().Hex(), Uid: uid, Full: make(map[int32]int32), - Knapsack: make(map[string]int32), + Knapsack: make(map[string]*pb.DBPracticeRes), Gymaction: 0, Gymrefresh: 0, Pillar1: &pb.DBPracticePillar{Index: 1, Isunlock: 0, Lv: 1}, @@ -88,7 +88,7 @@ func (this *modelPandata) queryrooms(uids []string) (results []*pb.DBPracticeRoo Id: primitive.NewObjectID().Hex(), Uid: v, Full: make(map[int32]int32), - Knapsack: make(map[string]int32), + Knapsack: make(map[string]*pb.DBPracticeRes), Gymaction: 0, Gymrefresh: 0, Pillar1: &pb.DBPracticePillar{Index: 1, Isunlock: 2, Lv: 1}, diff --git a/modules/practice/module.go b/modules/practice/module.go index f58a3b4b0..60ce1f0d6 100644 --- a/modules/practice/module.go +++ b/modules/practice/module.go @@ -116,7 +116,12 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32 } id = make([]string, 0) for k, _ := range items { - room.Knapsack[k] = 0 + room.Knapsack[k] = &pb.DBPracticeRes{ + Pid: k, + State: 0, + Usenum: 0, + Lastusetime: 0, + } id = append(id, k) this.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), k) } @@ -139,7 +144,7 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32 Id: primitive.NewObjectID().Hex(), Uid: session.GetUserId(), Full: make(map[int32]int32), - Knapsack: make(map[string]int32), + Knapsack: make(map[string]*pb.DBPracticeRes), Gymaction: 0, Gymrefresh: 0, Pillar1: &pb.DBPracticePillar{Index: 1, Isunlock: 0, Lv: 1}, @@ -152,7 +157,12 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32 } id = make([]string, 0) for k, _ := range items { - room.Knapsack[k] = 0 + room.Knapsack[k] = &pb.DBPracticeRes{ + Pid: k, + State: 0, + Usenum: 0, + Lastusetime: 0, + } id = append(id, k) this.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), k) } @@ -168,7 +178,12 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32 } else { id = make([]string, 0) for k, _ := range items { - room.Knapsack[k] = 0 + room.Knapsack[k] = &pb.DBPracticeRes{ + Pid: k, + State: 0, + Usenum: 0, + Lastusetime: 0, + } id = append(id, k) this.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), k) } @@ -282,6 +297,8 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) { Name: reduser.Name, Unionname: redsociaty, Figure: reduser.Figure, + Sex: reduser.Gender, + Skin: reduser.CurSkin, End: configure.Now().Add(time.Minute * time.Duration(this.ModuleTools.GetGlobalConf().PandamasTiguandiaoxiangCd)).Unix(), }) } @@ -310,6 +327,8 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) { Name: buleuser.Name, Unionname: bulesociaty, Figure: buleuser.Figure, + Sex: reduser.Gender, + Skin: reduser.CurSkin, End: configure.Now().Add(time.Minute * time.Duration(this.ModuleTools.GetGlobalConf().PandamasTiguandiaoxiangCd)).Unix(), }) } diff --git a/modules/tools/comp_configure.go b/modules/tools/comp_configure.go index 2a85caf59..54b95a592 100644 --- a/modules/tools/comp_configure.go +++ b/modules/tools/comp_configure.go @@ -33,7 +33,7 @@ const ( game_food = "game_breakingbad.json" ) -///配置管理基础组件 +// /配置管理基础组件 type MCompConfigure struct { cbase.ModuleCompBase hlock sync.RWMutex @@ -56,7 +56,7 @@ type MCompConfigure struct { _price map[int32][]*cfg.GamePricegroupData } -//组件初始化接口 +// 组件初始化接口 func (this *MCompConfigure) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.ModuleCompBase.Init(service, module, comp, options) err = this.LoadConfigure(game_global, cfg.NewGameGlobal) @@ -293,7 +293,7 @@ func (this *MCompConfigure) LoadConfigure(name string, fn interface{}) (err erro return configure.RegisterConfigure(name, fn, nil) } -//加载一个配置文件 +// 加载一个配置文件 func (this *MCompConfigure) LoadDropData() { if v, err := this.GetConfigure(game_drop); err == nil { if configure, ok := v.(*cfg.GameDrop); ok { @@ -320,7 +320,7 @@ func (this *MCompConfigure) LoadDropData() { return } -//加载多个配置文件 +// 加载多个配置文件 func (this *MCompConfigure) LoadMultiConfigure(confs map[string]interface{}) (err error) { for k, v := range confs { err = configure.RegisterConfigure(k, v, nil) @@ -332,12 +332,12 @@ func (this *MCompConfigure) LoadMultiConfigure(confs map[string]interface{}) (er return } -//读取配置数据 +// 读取配置数据 func (this *MCompConfigure) GetConfigure(name string) (v interface{}, err error) { return configure.GetConfigure(name) } -//全局配置 +// 全局配置 func (this *MCompConfigure) GetGlobalConf() *cfg.GameGlobalData { var ( configure *cfg.GameGlobal @@ -426,15 +426,15 @@ func (this *MCompConfigure) GetDropReward(dropId int32) (result []*cfg.Gameatn) } // 获取英雄原始星级 -func (this *MCompConfigure) GetHeroConfig(heroCfgId string) *cfg.GameHeroData { +func (this *MCompConfigure) GetHeroConfig(heroCfgId string) (conf *cfg.GameHeroData, err error) { if v, err := this.GetConfigure(new_hero); err == nil { if configure, ok := v.(*cfg.GameHero); ok { if v, ok := configure.GetDataMap()[heroCfgId]; ok { - return v + return v, nil } } } - return nil + return nil, comm.NewNotFoundConfErr("英雄模块", new_hero, heroCfgId) } // 获取英雄原始星级 @@ -492,7 +492,7 @@ func (this *MCompConfigure) GetHeroConfigData() (data []*cfg.GameHeroData) { return nil } -//读取物品配置 +// 读取物品配置 func (this *MCompConfigure) GetItemConfigureData(id string) (item *cfg.GameItemData, err error) { var ( v interface{} diff --git a/modules/tools/module.go b/modules/tools/module.go index 54bb2e9a1..572229058 100644 --- a/modules/tools/module.go +++ b/modules/tools/module.go @@ -17,29 +17,34 @@ type Tools struct { configure *MCompConfigure } -//模块名 +// 模块名 func (this *Tools) GetType() core.M_Modules { return comm.ModuleTools } -//模块初始化接口 注册用户创建角色事件 +// 模块初始化接口 注册用户创建角色事件 func (this *Tools) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) return } -//模块初始化接口 注册用户创建角色事件 +// 模块初始化接口 注册用户创建角色事件 func (this *Tools) Start() (err error) { err = this.ModuleBase.Start() return } -//装备组件 +// 装备组件 func (this *Tools) OnInstallComp() { this.ModuleBase.OnInstallComp() this.configure = this.RegisterComp(new(MCompConfigure)).(*MCompConfigure) } +// 读取英雄配置 +func (this *Tools) GetHeroConfig(heroCfgId string) (conf *cfg.GameHeroData, err error) { + conf, err = this.configure.GetHeroConfig(heroCfgId) + return +} func (this *Tools) GetGroupDataByLottery(lotteryId int32, vipLv int32, lv int32) (items []*cfg.Gameatn) { items = this.configure.GetGroupDataByLottery(lotteryId, vipLv, lv) return diff --git a/pb/battle_struct.pb.go b/pb/battle_struct.pb.go index fc76ee585..a67a1724d 100644 --- a/pb/battle_struct.pb.go +++ b/pb/battle_struct.pb.go @@ -32,6 +32,7 @@ const ( EffectTipsType_Not_Action EffectTipsType = 6 //无法行动 EffectTipsType_Purification EffectTipsType = 7 //净化 EffectTipsType_Disperse EffectTipsType = 8 //驱散 + EffectTipsType_Gain_round EffectTipsType = 9 //获得回合 ) // Enum value maps for EffectTipsType. @@ -46,6 +47,7 @@ var ( 6: "Not_Action", 7: "Purification", 8: "Disperse", + 9: "Gain_round", } EffectTipsType_value = map[string]int32{ "Eff_Success": 0, @@ -57,6 +59,7 @@ var ( "Not_Action": 6, "Purification": 7, "Disperse": 8, + "Gain_round": 9, } ) @@ -1824,7 +1827,7 @@ var file_battle_battle_struct_proto_rawDesc = []byte{ 0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x9b, 0x01, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0xab, 0x01, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d, @@ -1834,7 +1837,8 @@ var file_battle_battle_struct_proto_rawDesc = []byte{ 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, 0x73, - 0x65, 0x10, 0x08, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75, 0x6e, + 0x64, 0x10, 0x09, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/pb/practice_db.pb.go b/pb/practice_db.pb.go index 80eff96ba..d221b8b19 100644 --- a/pb/practice_db.pb.go +++ b/pb/practice_db.pb.go @@ -230,7 +230,9 @@ type DBPracticeStatuer struct { Figure int32 `protobuf:"varint,2,opt,name=figure,proto3" json:"figure"` Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name"` Unionname string `protobuf:"bytes,4,opt,name=unionname,proto3" json:"unionname"` - End int64 `protobuf:"varint,5,opt,name=end,proto3" json:"end"` + Sex int32 `protobuf:"varint,5,opt,name=sex,proto3" json:"sex"` + Skin string `protobuf:"bytes,6,opt,name=skin,proto3" json:"skin"` + End int64 `protobuf:"varint,7,opt,name=end,proto3" json:"end"` } func (x *DBPracticeStatuer) Reset() { @@ -293,6 +295,20 @@ func (x *DBPracticeStatuer) GetUnionname() string { return "" } +func (x *DBPracticeStatuer) GetSex() int32 { + if x != nil { + return x.Sex + } + return 0 +} + +func (x *DBPracticeStatuer) GetSkin() string { + if x != nil { + return x.Skin + } + return "" +} + func (x *DBPracticeStatuer) GetEnd() int64 { if x != nil { return x.End @@ -300,36 +316,108 @@ func (x *DBPracticeStatuer) GetEnd() int64 { return 0 } +//武官资源数据 +type DBPracticeRes struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Pid string `protobuf:"bytes,1,opt,name=pid,proto3" json:"pid"` + State int32 `protobuf:"varint,2,opt,name=state,proto3" json:"state"` //0 未使用 1 正在使用 + Usenum int32 `protobuf:"varint,3,opt,name=usenum,proto3" json:"usenum"` //已使用次数 + Lastusetime int64 `protobuf:"varint,4,opt,name=lastusetime,proto3" json:"lastusetime"` //最后使用时间 +} + +func (x *DBPracticeRes) Reset() { + *x = DBPracticeRes{} + if protoimpl.UnsafeEnabled { + mi := &file_practice_practice_db_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBPracticeRes) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBPracticeRes) ProtoMessage() {} + +func (x *DBPracticeRes) ProtoReflect() protoreflect.Message { + mi := &file_practice_practice_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 DBPracticeRes.ProtoReflect.Descriptor instead. +func (*DBPracticeRes) Descriptor() ([]byte, []int) { + return file_practice_practice_db_proto_rawDescGZIP(), []int{3} +} + +func (x *DBPracticeRes) GetPid() string { + if x != nil { + return x.Pid + } + return "" +} + +func (x *DBPracticeRes) GetState() int32 { + if x != nil { + return x.State + } + return 0 +} + +func (x *DBPracticeRes) GetUsenum() int32 { + if x != nil { + return x.Usenum + } + return 0 +} + +func (x *DBPracticeRes) GetLastusetime() int64 { + if x != nil { + return x.Lastusetime + } + return 0 +} + //练功房 type DBPracticeRoom 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"` //用户id - Gymaction int32 `protobuf:"varint,3,opt,name=gymaction,proto3" json:"gymaction"` //健身房动作 - Gymrefresh int32 `protobuf:"varint,4,opt,name=gymrefresh,proto3" json:"gymrefresh"` //健身房刷新次数 - Lastrefresh int64 `protobuf:"varint,5,opt,name=lastrefresh,proto3" json:"lastrefresh"` //最后刷新时间 - Full map[int32]int32 `protobuf:"bytes,6,rep,name=full,proto3" json:"full" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //满级登记 - Knapsack map[string]int32 `protobuf:"bytes,7,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源 - Pillar1 *DBPracticePillar `protobuf:"bytes,8,opt,name=pillar1,proto3" json:"pillar1"` //柱子1 - Pillar2 *DBPracticePillar `protobuf:"bytes,9,opt,name=pillar2,proto3" json:"pillar2"` //柱子2 - Pillar3 *DBPracticePillar `protobuf:"bytes,10,opt,name=pillar3,proto3" json:"pillar3"` //柱子3 - Pillarf *DBPracticePillar `protobuf:"bytes,11,opt,name=pillarf,proto3" json:"pillarf"` //好友柱子 - Statuers []*DBPracticeStatuer `protobuf:"bytes,12,rep,name=statuers,proto3" json:"statuers"` //武馆雕像 - Currnpc int32 `protobuf:"varint,13,opt,name=currnpc,proto3" json:"currnpc"` //当前npc - Npcstate int32 `protobuf:"varint,14,opt,name=npcstate,proto3" json:"npcstate"` //npc状态 -1未开启 0 未挑战 1 挑战失败 2挑战成功 3 CD中 - Refresh int64 `protobuf:"varint,15,opt,name=refresh,proto3" json:"refresh"` //刷新时间 - Battlenum int32 `protobuf:"varint,16,opt,name=battlenum,proto3" json:"battlenum"` //战斗次数 - Captain int32 `protobuf:"varint,17,opt,name=captain,proto3" json:"captain"` //战斗征信队长位 - Formation []*BattleRole `protobuf:"bytes,18,rep,name=formation,proto3" json:"formation"` //战斗阵型 + 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"` //用户id + Gymaction int32 `protobuf:"varint,3,opt,name=gymaction,proto3" json:"gymaction"` //健身房动作 + Gymrefresh int32 `protobuf:"varint,4,opt,name=gymrefresh,proto3" json:"gymrefresh"` //健身房刷新次数 + Lastrefresh int64 `protobuf:"varint,5,opt,name=lastrefresh,proto3" json:"lastrefresh"` //最后刷新时间 + Full map[int32]int32 `protobuf:"bytes,6,rep,name=full,proto3" json:"full" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //满级登记 + Knapsack map[string]*DBPracticeRes `protobuf:"bytes,7,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //资源 + Pillar1 *DBPracticePillar `protobuf:"bytes,8,opt,name=pillar1,proto3" json:"pillar1"` //柱子1 + Pillar2 *DBPracticePillar `protobuf:"bytes,9,opt,name=pillar2,proto3" json:"pillar2"` //柱子2 + Pillar3 *DBPracticePillar `protobuf:"bytes,10,opt,name=pillar3,proto3" json:"pillar3"` //柱子3 + Pillarf *DBPracticePillar `protobuf:"bytes,11,opt,name=pillarf,proto3" json:"pillarf"` //好友柱子 + Statuers []*DBPracticeStatuer `protobuf:"bytes,12,rep,name=statuers,proto3" json:"statuers"` //武馆雕像 + Currnpc int32 `protobuf:"varint,13,opt,name=currnpc,proto3" json:"currnpc"` //当前npc + Npcstate int32 `protobuf:"varint,14,opt,name=npcstate,proto3" json:"npcstate"` //npc状态 -1未开启 0 未挑战 1 挑战失败 2挑战成功 3 CD中 + Refresh int64 `protobuf:"varint,15,opt,name=refresh,proto3" json:"refresh"` //刷新时间 + Battlenum int32 `protobuf:"varint,16,opt,name=battlenum,proto3" json:"battlenum"` //战斗次数 + Captain int32 `protobuf:"varint,17,opt,name=captain,proto3" json:"captain"` //战斗征信队长位 + Formation []*BattleRole `protobuf:"bytes,18,rep,name=formation,proto3" json:"formation"` //战斗阵型 } func (x *DBPracticeRoom) Reset() { *x = DBPracticeRoom{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_db_proto_msgTypes[3] + mi := &file_practice_practice_db_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -342,7 +430,7 @@ func (x *DBPracticeRoom) String() string { func (*DBPracticeRoom) ProtoMessage() {} func (x *DBPracticeRoom) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_db_proto_msgTypes[3] + mi := &file_practice_practice_db_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -355,7 +443,7 @@ func (x *DBPracticeRoom) ProtoReflect() protoreflect.Message { // Deprecated: Use DBPracticeRoom.ProtoReflect.Descriptor instead. func (*DBPracticeRoom) Descriptor() ([]byte, []int) { - return file_practice_practice_db_proto_rawDescGZIP(), []int{3} + return file_practice_practice_db_proto_rawDescGZIP(), []int{4} } func (x *DBPracticeRoom) GetId() string { @@ -400,7 +488,7 @@ func (x *DBPracticeRoom) GetFull() map[int32]int32 { return nil } -func (x *DBPracticeRoom) GetKnapsack() map[string]int32 { +func (x *DBPracticeRoom) GetKnapsack() map[string]*DBPracticeRes { if x != nil { return x.Knapsack } @@ -496,7 +584,7 @@ type DBPracticeQiecuoInvite struct { func (x *DBPracticeQiecuoInvite) Reset() { *x = DBPracticeQiecuoInvite{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_db_proto_msgTypes[4] + mi := &file_practice_practice_db_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -509,7 +597,7 @@ func (x *DBPracticeQiecuoInvite) String() string { func (*DBPracticeQiecuoInvite) ProtoMessage() {} func (x *DBPracticeQiecuoInvite) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_db_proto_msgTypes[4] + mi := &file_practice_practice_db_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -522,7 +610,7 @@ func (x *DBPracticeQiecuoInvite) ProtoReflect() protoreflect.Message { // Deprecated: Use DBPracticeQiecuoInvite.ProtoReflect.Descriptor instead. func (*DBPracticeQiecuoInvite) Descriptor() ([]byte, []int) { - return file_practice_practice_db_proto_rawDescGZIP(), []int{4} + return file_practice_practice_db_proto_rawDescGZIP(), []int{5} } func (x *DBPracticeQiecuoInvite) GetUid() string { @@ -556,7 +644,7 @@ type DBPracticeQiecuoRecord struct { func (x *DBPracticeQiecuoRecord) Reset() { *x = DBPracticeQiecuoRecord{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_db_proto_msgTypes[5] + mi := &file_practice_practice_db_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -569,7 +657,7 @@ func (x *DBPracticeQiecuoRecord) String() string { func (*DBPracticeQiecuoRecord) ProtoMessage() {} func (x *DBPracticeQiecuoRecord) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_db_proto_msgTypes[5] + mi := &file_practice_practice_db_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -582,7 +670,7 @@ func (x *DBPracticeQiecuoRecord) ProtoReflect() protoreflect.Message { // Deprecated: Use DBPracticeQiecuoRecord.ProtoReflect.Descriptor instead. func (*DBPracticeQiecuoRecord) Descriptor() ([]byte, []int) { - return file_practice_practice_db_proto_rawDescGZIP(), []int{5} + return file_practice_practice_db_proto_rawDescGZIP(), []int{6} } func (x *DBPracticeQiecuoRecord) GetId() string { @@ -656,7 +744,7 @@ var file_practice_practice_db_proto_rawDesc = []byte{ 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x74, 0x22, 0x81, 0x01, 0x0a, 0x11, 0x44, + 0x09, 0x52, 0x07, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x74, 0x22, 0xa7, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, @@ -664,73 +752,84 @@ var file_practice_practice_db_proto_rawDesc = []byte{ 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, - 0x65, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x89, - 0x06, 0x0a, 0x0e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, - 0x6d, 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, 0x1c, 0x0a, 0x09, 0x67, 0x79, 0x6d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x79, 0x6d, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, - 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, - 0x65, 0x73, 0x68, 0x12, 0x2d, 0x0a, 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, - 0x6f, 0x6d, 0x2e, 0x46, 0x75, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x66, 0x75, - 0x6c, 0x6c, 0x12, 0x39, 0x0a, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x07, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, - 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x12, 0x2b, 0x0a, - 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x31, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, + 0x73, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x12, + 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6b, + 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x03, 0x65, 0x6e, 0x64, 0x22, 0x71, 0x0a, 0x0d, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, + 0x63, 0x65, 0x52, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, + 0x06, 0x75, 0x73, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x75, + 0x73, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x75, 0x73, 0x65, + 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, + 0x75, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x99, 0x06, 0x0a, 0x0e, 0x44, 0x42, 0x50, 0x72, + 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 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, 0x1c, 0x0a, 0x09, + 0x67, 0x79, 0x6d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x09, 0x67, 0x79, 0x6d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x79, + 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, + 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, + 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x2d, 0x0a, 0x04, + 0x66, 0x75, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, + 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x46, 0x75, 0x6c, 0x6c, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x12, 0x39, 0x0a, 0x08, 0x6b, + 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, + 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x4b, + 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, + 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, + 0x31, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, + 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, + 0x61, 0x72, 0x31, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, + 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, + 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x18, 0x0a, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, + 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x12, 0x2b, 0x0a, + 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, - 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x31, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, - 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, - 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, - 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, - 0x72, 0x33, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, - 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, - 0x6c, 0x61, 0x72, 0x33, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x18, - 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, - 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, - 0x66, 0x12, 0x2e, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x73, 0x18, 0x0c, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, - 0x53, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x52, 0x08, 0x73, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, - 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x72, 0x6e, 0x70, 0x63, 0x18, 0x0d, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x72, 0x6e, 0x70, 0x63, 0x12, 0x1a, 0x0a, 0x08, 0x6e, - 0x70, 0x63, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, - 0x70, 0x63, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, - 0x73, 0x68, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, - 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x10, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x6e, 0x75, 0x6d, 0x12, - 0x18, 0x0a, 0x07, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x12, 0x29, 0x0a, 0x09, 0x66, 0x6f, 0x72, - 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x37, 0x0a, 0x09, 0x46, 0x75, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, - 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x48, 0x0a, 0x16, 0x44, 0x42, + 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x12, 0x2e, 0x0a, 0x08, 0x73, 0x74, + 0x61, 0x74, 0x75, 0x65, 0x72, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, + 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, + 0x52, 0x08, 0x73, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, + 0x72, 0x72, 0x6e, 0x70, 0x63, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, + 0x72, 0x6e, 0x70, 0x63, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x70, 0x63, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x70, 0x63, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x0f, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x61, 0x70, 0x74, + 0x61, 0x69, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x61, 0x70, 0x74, 0x61, + 0x69, 0x6e, 0x12, 0x29, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, + 0x6c, 0x65, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x37, 0x0a, + 0x09, 0x46, 0x75, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, + 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, + 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0x48, 0x0a, 0x16, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, + 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xb5, 0x01, + 0x0a, 0x16, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, + 0x75, 0x6f, 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, 0x31, 0x0a, 0x07, 0x74, 0x61, + 0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x49, 0x6e, - 0x76, 0x69, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, - 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, - 0x74, 0x61, 0x6d, 0x70, 0x22, 0xb5, 0x01, 0x0a, 0x16, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, - 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 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, 0x31, 0x0a, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, - 0x69, 0x65, 0x63, 0x75, 0x6f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x52, 0x07, 0x74, 0x61, 0x72, - 0x67, 0x65, 0x74, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x06, - 0x62, 0x61, 0x74, 0x74, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x61, - 0x74, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x76, 0x69, 0x74, 0x65, 0x52, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x12, 0x16, 0x0a, + 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x69, 0x64, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, + 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x6d, + 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -745,33 +844,35 @@ func file_practice_practice_db_proto_rawDescGZIP() []byte { return file_practice_practice_db_proto_rawDescData } -var file_practice_practice_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_practice_practice_db_proto_msgTypes = make([]protoimpl.MessageInfo, 9) var file_practice_practice_db_proto_goTypes = []interface{}{ (*DBPracticePillar)(nil), // 0: DBPracticePillar (*DBPracticeTeacher)(nil), // 1: DBPracticeTeacher (*DBPracticeStatuer)(nil), // 2: DBPracticeStatuer - (*DBPracticeRoom)(nil), // 3: DBPracticeRoom - (*DBPracticeQiecuoInvite)(nil), // 4: DBPracticeQiecuoInvite - (*DBPracticeQiecuoRecord)(nil), // 5: DBPracticeQiecuoRecord - nil, // 6: DBPracticeRoom.FullEntry - nil, // 7: DBPracticeRoom.KnapsackEntry - (*BattleRole)(nil), // 8: BattleRole + (*DBPracticeRes)(nil), // 3: DBPracticeRes + (*DBPracticeRoom)(nil), // 4: DBPracticeRoom + (*DBPracticeQiecuoInvite)(nil), // 5: DBPracticeQiecuoInvite + (*DBPracticeQiecuoRecord)(nil), // 6: DBPracticeQiecuoRecord + nil, // 7: DBPracticeRoom.FullEntry + nil, // 8: DBPracticeRoom.KnapsackEntry + (*BattleRole)(nil), // 9: BattleRole } var file_practice_practice_db_proto_depIdxs = []int32{ - 6, // 0: DBPracticeRoom.full:type_name -> DBPracticeRoom.FullEntry - 7, // 1: DBPracticeRoom.knapsack:type_name -> DBPracticeRoom.KnapsackEntry - 0, // 2: DBPracticeRoom.pillar1:type_name -> DBPracticePillar - 0, // 3: DBPracticeRoom.pillar2:type_name -> DBPracticePillar - 0, // 4: DBPracticeRoom.pillar3:type_name -> DBPracticePillar - 0, // 5: DBPracticeRoom.pillarf:type_name -> DBPracticePillar - 2, // 6: DBPracticeRoom.statuers:type_name -> DBPracticeStatuer - 8, // 7: DBPracticeRoom.formation:type_name -> BattleRole - 4, // 8: DBPracticeQiecuoRecord.targets:type_name -> DBPracticeQiecuoInvite - 9, // [9:9] is the sub-list for method output_type - 9, // [9:9] is the sub-list for method input_type - 9, // [9:9] is the sub-list for extension type_name - 9, // [9:9] is the sub-list for extension extendee - 0, // [0:9] is the sub-list for field type_name + 7, // 0: DBPracticeRoom.full:type_name -> DBPracticeRoom.FullEntry + 8, // 1: DBPracticeRoom.knapsack:type_name -> DBPracticeRoom.KnapsackEntry + 0, // 2: DBPracticeRoom.pillar1:type_name -> DBPracticePillar + 0, // 3: DBPracticeRoom.pillar2:type_name -> DBPracticePillar + 0, // 4: DBPracticeRoom.pillar3:type_name -> DBPracticePillar + 0, // 5: DBPracticeRoom.pillarf:type_name -> DBPracticePillar + 2, // 6: DBPracticeRoom.statuers:type_name -> DBPracticeStatuer + 9, // 7: DBPracticeRoom.formation:type_name -> BattleRole + 5, // 8: DBPracticeQiecuoRecord.targets:type_name -> DBPracticeQiecuoInvite + 3, // 9: DBPracticeRoom.KnapsackEntry.value:type_name -> DBPracticeRes + 10, // [10:10] is the sub-list for method output_type + 10, // [10:10] is the sub-list for method input_type + 10, // [10:10] is the sub-list for extension type_name + 10, // [10:10] is the sub-list for extension extendee + 0, // [0:10] is the sub-list for field type_name } func init() { file_practice_practice_db_proto_init() } @@ -818,7 +919,7 @@ func file_practice_practice_db_proto_init() { } } file_practice_practice_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBPracticeRoom); i { + switch v := v.(*DBPracticeRes); i { case 0: return &v.state case 1: @@ -830,7 +931,7 @@ func file_practice_practice_db_proto_init() { } } file_practice_practice_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBPracticeQiecuoInvite); i { + switch v := v.(*DBPracticeRoom); i { case 0: return &v.state case 1: @@ -842,6 +943,18 @@ func file_practice_practice_db_proto_init() { } } file_practice_practice_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBPracticeQiecuoInvite); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_practice_practice_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBPracticeQiecuoRecord); i { case 0: return &v.state @@ -860,7 +973,7 @@ func file_practice_practice_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_practice_practice_db_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 9, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/practice_msg.pb.go b/pb/practice_msg.pb.go index e0640e67f..3eabe0e3f 100644 --- a/pb/practice_msg.pb.go +++ b/pb/practice_msg.pb.go @@ -739,8 +739,8 @@ type PracticeExpulsionResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Pillar *DBPracticePillar `protobuf:"bytes,1,opt,name=pillar,proto3" json:"pillar"` - Knapsack map[string]int32 `protobuf:"bytes,2,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源 + Pillar *DBPracticePillar `protobuf:"bytes,1,opt,name=pillar,proto3" json:"pillar"` + Knapsack map[string]*DBPracticeRes `protobuf:"bytes,2,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //资源 } func (x *PracticeExpulsionResp) Reset() { @@ -782,7 +782,7 @@ func (x *PracticeExpulsionResp) GetPillar() *DBPracticePillar { return nil } -func (x *PracticeExpulsionResp) GetKnapsack() map[string]int32 { +func (x *PracticeExpulsionResp) GetKnapsack() map[string]*DBPracticeRes { if x != nil { return x.Knapsack } @@ -795,9 +795,9 @@ type PracticeBeExpulsionPush struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Fuid string `protobuf:"bytes,1,opt,name=fuid,proto3" json:"fuid"` - Pillar *DBPracticePillar `protobuf:"bytes,2,opt,name=pillar,proto3" json:"pillar"` - Knapsack map[string]int32 `protobuf:"bytes,3,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源 + Fuid string `protobuf:"bytes,1,opt,name=fuid,proto3" json:"fuid"` + Pillar *DBPracticePillar `protobuf:"bytes,2,opt,name=pillar,proto3" json:"pillar"` + Knapsack map[string]*DBPracticeRes `protobuf:"bytes,3,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //资源 } func (x *PracticeBeExpulsionPush) Reset() { @@ -846,7 +846,7 @@ func (x *PracticeBeExpulsionPush) GetPillar() *DBPracticePillar { return nil } -func (x *PracticeBeExpulsionPush) GetKnapsack() map[string]int32 { +func (x *PracticeBeExpulsionPush) GetKnapsack() map[string]*DBPracticeRes { if x != nil { return x.Knapsack } @@ -914,8 +914,8 @@ type PracticeReceiveResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Pillar *DBPracticePillar `protobuf:"bytes,1,opt,name=pillar,proto3" json:"pillar"` - Knapsack map[string]int32 `protobuf:"bytes,2,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源 + Pillar *DBPracticePillar `protobuf:"bytes,1,opt,name=pillar,proto3" json:"pillar"` + Knapsack map[string]*DBPracticeRes `protobuf:"bytes,2,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //资源 } func (x *PracticeReceiveResp) Reset() { @@ -957,7 +957,7 @@ func (x *PracticeReceiveResp) GetPillar() *DBPracticePillar { return nil } -func (x *PracticeReceiveResp) GetKnapsack() map[string]int32 { +func (x *PracticeReceiveResp) GetKnapsack() map[string]*DBPracticeRes { if x != nil { return x.Knapsack } @@ -2225,7 +2225,7 @@ var file_practice_practice_msg_proto_rawDesc = []byte{ 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, - 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xc1, 0x01, 0x0a, 0x15, 0x50, + 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xd1, 0x01, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, @@ -2234,10 +2234,11 @@ var file_practice_practice_msg_proto_rawDesc = []byte{ 0x0b, 0x32, 0x24, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, - 0x6b, 0x1a, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, + 0x6b, 0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0xd9, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, + 0x52, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe9, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x42, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x75, 0x69, 0x64, 0x12, 0x29, @@ -2247,15 +2248,16 @@ var file_practice_practice_msg_proto_rawDesc = []byte{ 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x42, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x1a, 0x3b, 0x0a, + 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x42, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 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, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0xbd, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0xcd, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, @@ -2264,10 +2266,11 @@ var file_practice_practice_msg_proto_rawDesc = []byte{ 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, - 0x6b, 0x1a, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, + 0x6b, 0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x3f, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, + 0x52, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3f, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x68, @@ -2424,6 +2427,7 @@ var file_practice_practice_msg_proto_goTypes = []interface{}{ (ErrorCode)(0), // 50: ErrorCode (*BattleInfo)(nil), // 51: BattleInfo (*BattleReport)(nil), // 52: BattleReport + (*DBPracticeRes)(nil), // 53: DBPracticeRes } var file_practice_practice_msg_proto_depIdxs = []int32{ 46, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom @@ -2444,11 +2448,14 @@ var file_practice_practice_msg_proto_depIdxs = []int32{ 51, // 15: PracticeNPCBattkleResp.info:type_name -> BattleInfo 52, // 16: PracticeNPCBattkleFinishReq.report:type_name -> BattleReport 46, // 17: PracticeFriendRommResp.InfosEntry.value:type_name -> DBPracticeRoom - 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 + 53, // 18: PracticeExpulsionResp.KnapsackEntry.value:type_name -> DBPracticeRes + 53, // 19: PracticeBeExpulsionPush.KnapsackEntry.value:type_name -> DBPracticeRes + 53, // 20: PracticeReceiveResp.KnapsackEntry.value:type_name -> DBPracticeRes + 21, // [21:21] is the sub-list for method output_type + 21, // [21:21] is the sub-list for method input_type + 21, // [21:21] is the sub-list for extension type_name + 21, // [21:21] is the sub-list for extension extendee + 0, // [0:21] is the sub-list for field type_name } func init() { file_practice_practice_msg_proto_init() }