diff --git a/comm/core.go b/comm/core.go index 66b111795..cdc712507 100644 --- a/comm/core.go +++ b/comm/core.go @@ -32,6 +32,7 @@ const ( EquipmentType = "equi" //武器资源 VipType = "vip" //vip AtlasType = "atlas" //铁匠铺资源 + PandaType = "panda" //熊猫武馆资源 ) type Autogenerated struct { diff --git a/modules/fitness/api.go b/modules/fitness/api.go index a76bd68a9..0155f3ac0 100644 --- a/modules/fitness/api.go +++ b/modules/fitness/api.go @@ -12,13 +12,13 @@ API type apiComp struct { modules.MCompGate service core.IService - module *Forum + module *Fitness } //组件初始化接口 func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.MCompGate.Init(service, module, comp, options) - this.module = module.(*Forum) + this.module = module.(*Fitness) this.service = service return } diff --git a/modules/fitness/api_confirm.go b/modules/fitness/api_confirm.go index a56ee57e6..04d9c9053 100644 --- a/modules/fitness/api_confirm.go +++ b/modules/fitness/api_confirm.go @@ -16,6 +16,9 @@ func (this *apiComp) ConfirmCheck(session comm.IUserSession, req *pb.FitnessConf ///练功请求 func (this *apiComp) Confirm(session comm.IUserSession, req *pb.FitnessConfirmReq) (code pb.ErrorCode, data proto.Message) { - session.SendMsg(string(this.module.GetType()), "info", &pb.FitnessConfirmResp{}) + this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ + "globalbuff": req.Buffid, + }) + session.SendMsg(string(this.module.GetType()), "confirm", &pb.FitnessConfirmResp{Buffid: req.Buffid}) return } diff --git a/modules/fitness/api_getbuff.go b/modules/fitness/api_getbuff.go index a2ff4e2a0..38dcc7cd5 100644 --- a/modules/fitness/api_getbuff.go +++ b/modules/fitness/api_getbuff.go @@ -3,6 +3,7 @@ package fitness import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "google.golang.org/protobuf/proto" ) @@ -15,7 +16,20 @@ func (this *apiComp) GetBuffCheck(session comm.IUserSession, req *pb.FitnessGetB ///练功请求 func (this *apiComp) GetBuff(session comm.IUserSession, req *pb.FitnessGetBuffReq) (code pb.ErrorCode, data proto.Message) { + var ( + mryl *cfg.GamePandamasMrylData + buff *cfg.GamePandamasBuffData + err error + ) - session.SendMsg(string(this.module.GetType()), "info", &pb.FitnessGetBuffResp{}) + if mryl, err = this.module.configure.getPandamasMryl(req.Posture); err != nil { + code = pb.ErrorCode_ConfigNoFound + return + } + if buff, err = this.module.configure.getGamePandamasBuff(mryl.BuffGroup); err != nil { + code = pb.ErrorCode_ConfigNoFound + return + } + session.SendMsg(string(this.module.GetType()), "buff", &pb.FitnessGetBuffResp{Buffid: buff.Id}) return } diff --git a/modules/fitness/configure.go b/modules/fitness/configure.go index cea26d2f9..c397a16fb 100644 --- a/modules/fitness/configure.go +++ b/modules/fitness/configure.go @@ -1,13 +1,19 @@ package fitness import ( + "fmt" + "go_dreamfactory/comm" "go_dreamfactory/modules" + "go_dreamfactory/sys/configure" + cfg "go_dreamfactory/sys/configure/structs" + "sync" "go_dreamfactory/lego/core" ) const ( - game_equipment = "game_equipment.json" + game_pandamasmryl = "game_pandamasmryl.json" + game_pandamasbuff = "game_pandamasbuff.json" ) /* @@ -15,11 +21,75 @@ const ( */ type configureComp struct { modules.MCompConfigure + module *Fitness + lock sync.RWMutex + buffs map[int32][]*cfg.GamePandamasBuffData } //组件初始化接口 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.MCompConfigure.Init(service, module, comp, options) - + this.module = module.(*Fitness) + this.LoadConfigure(game_pandamasmryl, cfg.NewGamePandamasMryl) + configure.RegisterConfigure(game_pandamasbuff, cfg.NewGamePandamasBuff, func() { + this.lock.Lock() + if v, err := this.GetConfigure(game_pandamasbuff); err != nil { + this.module.Errorf("err:%v", err) + this.lock.Unlock() + return + } else { + this.buffs = make(map[int32][]*cfg.GamePandamasBuffData) + for _, v := range v.(*cfg.GamePandamasBuff).GetDataList() { + if this.buffs[v.BuffGroup] == nil { + this.buffs[v.Id] = make([]*cfg.GamePandamasBuffData, 0) + } + this.buffs[v.BuffGroup] = append(this.buffs[v.BuffGroup], v) + } + } + this.lock.Unlock() + }) + return +} + +func (this *configureComp) getPandamasMryl(id int32) (configure *cfg.GamePandamasMrylData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_pandamasmryl); err != nil { + this.module.Errorln(err) + return + } else { + if configure, ok = v.(*cfg.GamePandamasMryl).GetDataMap()[id]; !ok { + err = fmt.Errorf("not found:%d ", id) + this.module.Errorln(err) + return + } + } + return +} + +//随机获取buff权重 +func (this *configureComp) getGamePandamasBuff(groupid int32) (configure *cfg.GamePandamasBuffData, err error) { + var ( + group []*cfg.GamePandamasBuffData + weight []int32 + index int32 + ok bool + ) + this.lock.RLock() + group, ok = this.buffs[groupid] + this.lock.RUnlock() + if !ok { + err = fmt.Errorf("no found groupid:%d", groupid) + this.module.Errorln(err) + return + } + weight = make([]int32, len(group)) + for i, v := range group { + weight[i] = v.P + } + index = comm.GetRandW(weight) + configure = group[index] return } diff --git a/modules/fitness/modelFitness.go b/modules/fitness/modelFitness.go index 779cec8f2..c86982cb7 100644 --- a/modules/fitness/modelFitness.go +++ b/modules/fitness/modelFitness.go @@ -11,14 +11,14 @@ import ( */ type modelFitnessComp struct { modules.MCompModel - module *Forum + module *Fitness } //组件初始化接口 func (this *modelFitnessComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { this.TableName = comm.TableForum this.MCompModel.Init(service, module, comp, opt) - this.module = module.(*Forum) + this.module = module.(*Fitness) //创建uid索引 diff --git a/modules/fitness/module.go b/modules/fitness/module.go index 0b7717068..b82785a17 100644 --- a/modules/fitness/module.go +++ b/modules/fitness/module.go @@ -12,11 +12,11 @@ import ( 开发:李伟 */ func NewModule() core.IModule { - m := new(Forum) + m := new(Fitness) return m } -type Forum struct { +type Fitness struct { modules.ModuleBase api_comp *apiComp configure *configureComp @@ -24,18 +24,18 @@ type Forum struct { } //模块名 -func (this *Forum) GetType() core.M_Modules { +func (this *Fitness) GetType() core.M_Modules { return comm.ModuleFitness } //模块初始化接口 注册用户创建角色事件 -func (this *Forum) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { +func (this *Fitness) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) return } //装备组件 -func (this *Forum) OnInstallComp() { +func (this *Fitness) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) diff --git a/modules/modulebase.go b/modules/modulebase.go index b5a841694..36bb3c221 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -385,6 +385,7 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat equips map[string]uint32 // 装备 vip map[string]int32 // vip atlas map[string]int32 // + panda map[string]int32 // 熊猫武馆资源 ) items = make(map[string]int32, 0) heros = make(map[string]int32, 0) @@ -409,6 +410,8 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat vip[v.T] += v.N case comm.AtlasType: atlas[v.T] = 1 + case comm.PandaType: + panda[v.T] = 1 default: this.Errorf("not found res type") // 找不到资源类型 } diff --git a/modules/practice/api_expulsion.go b/modules/practice/api_expulsion.go index 26af378c4..23f1e15e6 100644 --- a/modules/practice/api_expulsion.go +++ b/modules/practice/api_expulsion.go @@ -16,6 +16,6 @@ func (this *apiComp) ExpulsionCheck(session comm.IUserSession, req *pb.PracticeE ///练功请求 驱逐 func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpulsionReq) (code pb.ErrorCode, data proto.Message) { - session.SendMsg(string(this.module.GetType()), "loot", &pb.PracticeExpulsionResp{}) + session.SendMsg(string(this.module.GetType()), "expulsion", &pb.PracticeExpulsionResp{}) return } diff --git a/modules/practice/api_friendromm.go b/modules/practice/api_friendromm.go new file mode 100644 index 000000000..149d184b8 --- /dev/null +++ b/modules/practice/api_friendromm.go @@ -0,0 +1,28 @@ +package practice + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +//参数校验 +func (this *apiComp) FriendRommCheck(session comm.IUserSession, req *pb.PracticeFriendRommReq) (code pb.ErrorCode) { + + return +} + +///练功请求 +func (this *apiComp) FriendRomm(session comm.IUserSession, req *pb.PracticeFriendRommReq) (code pb.ErrorCode, data proto.Message) { + var ( + err error + room *pb.DBPracticeRoom + ) + if room, err = this.module.modelPandata.queryUserMartialhall(req.Fuid); err != nil { + code = pb.ErrorCode_DBError + return + } + session.SendMsg(string(this.module.GetType()), "friendromm", &pb.PracticeFriendRommResp{Info: room}) + return +} diff --git a/modules/practice/api_receive.go b/modules/practice/api_receive.go index d48dd4e19..62a5be905 100644 --- a/modules/practice/api_receive.go +++ b/modules/practice/api_receive.go @@ -16,6 +16,6 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.PracticeRec ///练功请求 奖励 func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveReq) (code pb.ErrorCode, data proto.Message) { - session.SendMsg(string(this.module.GetType()), "loot", &pb.PracticeReceiveResp{}) + session.SendMsg(string(this.module.GetType()), "receive", &pb.PracticeReceiveResp{}) return } diff --git a/pb/practice_msg.pb.go b/pb/practice_msg.pb.go index 72dc7c597..aac77863d 100644 --- a/pb/practice_msg.pb.go +++ b/pb/practice_msg.pb.go @@ -107,6 +107,102 @@ func (x *PracticeInfoResp) GetInfo() *DBPracticeRoom { return nil } +///请求好友武馆房间信息 +type PracticeFriendRommReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Fuid string `protobuf:"bytes,1,opt,name=fuid,proto3" json:"fuid"` +} + +func (x *PracticeFriendRommReq) Reset() { + *x = PracticeFriendRommReq{} + if protoimpl.UnsafeEnabled { + mi := &file_practice_practice_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PracticeFriendRommReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PracticeFriendRommReq) ProtoMessage() {} + +func (x *PracticeFriendRommReq) ProtoReflect() protoreflect.Message { + mi := &file_practice_practice_msg_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 PracticeFriendRommReq.ProtoReflect.Descriptor instead. +func (*PracticeFriendRommReq) Descriptor() ([]byte, []int) { + return file_practice_practice_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *PracticeFriendRommReq) GetFuid() string { + if x != nil { + return x.Fuid + } + return "" +} + +///请求好友武馆房间信息 回应 +type PracticeFriendRommResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Info *DBPracticeRoom `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` +} + +func (x *PracticeFriendRommResp) Reset() { + *x = PracticeFriendRommResp{} + if protoimpl.UnsafeEnabled { + mi := &file_practice_practice_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PracticeFriendRommResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PracticeFriendRommResp) ProtoMessage() {} + +func (x *PracticeFriendRommResp) ProtoReflect() protoreflect.Message { + mi := &file_practice_practice_msg_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 PracticeFriendRommResp.ProtoReflect.Descriptor instead. +func (*PracticeFriendRommResp) Descriptor() ([]byte, []int) { + return file_practice_practice_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *PracticeFriendRommResp) GetInfo() *DBPracticeRoom { + if x != nil { + return x.Info + } + return nil +} + ///升级请求 type PracticeUpgradeReq struct { state protoimpl.MessageState @@ -119,7 +215,7 @@ type PracticeUpgradeReq struct { func (x *PracticeUpgradeReq) Reset() { *x = PracticeUpgradeReq{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[2] + mi := &file_practice_practice_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -132,7 +228,7 @@ func (x *PracticeUpgradeReq) String() string { func (*PracticeUpgradeReq) ProtoMessage() {} func (x *PracticeUpgradeReq) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[2] + mi := &file_practice_practice_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -145,7 +241,7 @@ func (x *PracticeUpgradeReq) ProtoReflect() protoreflect.Message { // Deprecated: Use PracticeUpgradeReq.ProtoReflect.Descriptor instead. func (*PracticeUpgradeReq) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{2} + return file_practice_practice_msg_proto_rawDescGZIP(), []int{4} } func (x *PracticeUpgradeReq) GetIndex() int32 { @@ -167,7 +263,7 @@ type PracticeUpgradeResp struct { func (x *PracticeUpgradeResp) Reset() { *x = PracticeUpgradeResp{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[3] + mi := &file_practice_practice_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -180,7 +276,7 @@ func (x *PracticeUpgradeResp) String() string { func (*PracticeUpgradeResp) ProtoMessage() {} func (x *PracticeUpgradeResp) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[3] + mi := &file_practice_practice_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -193,7 +289,7 @@ func (x *PracticeUpgradeResp) ProtoReflect() protoreflect.Message { // Deprecated: Use PracticeUpgradeResp.ProtoReflect.Descriptor instead. func (*PracticeUpgradeResp) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{3} + return file_practice_practice_msg_proto_rawDescGZIP(), []int{5} } func (x *PracticeUpgradeResp) GetIndex() int32 { @@ -225,7 +321,7 @@ type PracticePracticeReq struct { func (x *PracticePracticeReq) Reset() { *x = PracticePracticeReq{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[4] + mi := &file_practice_practice_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -238,7 +334,7 @@ func (x *PracticePracticeReq) String() string { func (*PracticePracticeReq) ProtoMessage() {} func (x *PracticePracticeReq) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[4] + mi := &file_practice_practice_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -251,7 +347,7 @@ func (x *PracticePracticeReq) ProtoReflect() protoreflect.Message { // Deprecated: Use PracticePracticeReq.ProtoReflect.Descriptor instead. func (*PracticePracticeReq) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{4} + return file_practice_practice_msg_proto_rawDescGZIP(), []int{6} } func (x *PracticePracticeReq) GetIndex() int32 { @@ -296,7 +392,7 @@ type PracticePracticeResp struct { func (x *PracticePracticeResp) Reset() { *x = PracticePracticeResp{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[5] + mi := &file_practice_practice_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -309,7 +405,7 @@ func (x *PracticePracticeResp) String() string { func (*PracticePracticeResp) ProtoMessage() {} func (x *PracticePracticeResp) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[5] + mi := &file_practice_practice_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -322,7 +418,7 @@ func (x *PracticePracticeResp) ProtoReflect() protoreflect.Message { // Deprecated: Use PracticePracticeResp.ProtoReflect.Descriptor instead. func (*PracticePracticeResp) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{5} + return file_practice_practice_msg_proto_rawDescGZIP(), []int{7} } func (x *PracticePracticeResp) GetIndex() int32 { @@ -368,7 +464,7 @@ type PracticeLootReq struct { func (x *PracticeLootReq) Reset() { *x = PracticeLootReq{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[6] + mi := &file_practice_practice_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -381,7 +477,7 @@ func (x *PracticeLootReq) String() string { func (*PracticeLootReq) ProtoMessage() {} func (x *PracticeLootReq) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[6] + mi := &file_practice_practice_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -394,7 +490,7 @@ func (x *PracticeLootReq) ProtoReflect() protoreflect.Message { // Deprecated: Use PracticeLootReq.ProtoReflect.Descriptor instead. func (*PracticeLootReq) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{6} + return file_practice_practice_msg_proto_rawDescGZIP(), []int{8} } func (x *PracticeLootReq) GetFriend() string { @@ -439,7 +535,7 @@ type PracticeLootResp struct { func (x *PracticeLootResp) Reset() { *x = PracticeLootResp{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[7] + mi := &file_practice_practice_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -452,7 +548,7 @@ func (x *PracticeLootResp) String() string { func (*PracticeLootResp) ProtoMessage() {} func (x *PracticeLootResp) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[7] + mi := &file_practice_practice_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -465,7 +561,7 @@ func (x *PracticeLootResp) ProtoReflect() protoreflect.Message { // Deprecated: Use PracticeLootResp.ProtoReflect.Descriptor instead. func (*PracticeLootResp) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{7} + return file_practice_practice_msg_proto_rawDescGZIP(), []int{9} } func (x *PracticeLootResp) GetFriend() string { @@ -506,7 +602,7 @@ type PracticeExpulsionReq struct { func (x *PracticeExpulsionReq) Reset() { *x = PracticeExpulsionReq{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[8] + mi := &file_practice_practice_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -519,7 +615,7 @@ func (x *PracticeExpulsionReq) String() string { func (*PracticeExpulsionReq) ProtoMessage() {} func (x *PracticeExpulsionReq) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[8] + mi := &file_practice_practice_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -532,7 +628,7 @@ func (x *PracticeExpulsionReq) ProtoReflect() protoreflect.Message { // Deprecated: Use PracticeExpulsionReq.ProtoReflect.Descriptor instead. func (*PracticeExpulsionReq) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{8} + return file_practice_practice_msg_proto_rawDescGZIP(), []int{10} } type PracticeExpulsionResp struct { @@ -544,7 +640,7 @@ type PracticeExpulsionResp struct { func (x *PracticeExpulsionResp) Reset() { *x = PracticeExpulsionResp{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[9] + mi := &file_practice_practice_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -557,7 +653,7 @@ func (x *PracticeExpulsionResp) String() string { func (*PracticeExpulsionResp) ProtoMessage() {} func (x *PracticeExpulsionResp) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[9] + mi := &file_practice_practice_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -570,7 +666,7 @@ func (x *PracticeExpulsionResp) ProtoReflect() protoreflect.Message { // Deprecated: Use PracticeExpulsionResp.ProtoReflect.Descriptor instead. func (*PracticeExpulsionResp) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{9} + return file_practice_practice_msg_proto_rawDescGZIP(), []int{11} } ///领取收益 @@ -586,7 +682,7 @@ type PracticeReceiveReq struct { func (x *PracticeReceiveReq) Reset() { *x = PracticeReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[10] + mi := &file_practice_practice_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -599,7 +695,7 @@ func (x *PracticeReceiveReq) String() string { func (*PracticeReceiveReq) ProtoMessage() {} func (x *PracticeReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[10] + mi := &file_practice_practice_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -612,7 +708,7 @@ func (x *PracticeReceiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use PracticeReceiveReq.ProtoReflect.Descriptor instead. func (*PracticeReceiveReq) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{10} + return file_practice_practice_msg_proto_rawDescGZIP(), []int{12} } func (x *PracticeReceiveReq) GetIndex() int32 { @@ -638,7 +734,7 @@ type PracticeReceiveResp struct { func (x *PracticeReceiveResp) Reset() { *x = PracticeReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[11] + mi := &file_practice_practice_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -651,7 +747,7 @@ func (x *PracticeReceiveResp) String() string { func (*PracticeReceiveResp) ProtoMessage() {} func (x *PracticeReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[11] + mi := &file_practice_practice_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -664,7 +760,7 @@ func (x *PracticeReceiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use PracticeReceiveResp.ProtoReflect.Descriptor instead. func (*PracticeReceiveResp) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{11} + return file_practice_practice_msg_proto_rawDescGZIP(), []int{13} } var File_practice_practice_msg_proto protoreflect.FileDescriptor @@ -678,51 +774,57 @@ var file_practice_practice_msg_proto_rawDesc = []byte{ 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, - 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2a, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, - 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, + 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2b, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, + 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x6f, 0x6d, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x12, + 0x0a, 0x04, 0x66, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x75, + 0x69, 0x64, 0x22, 0x3d, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x52, 0x6f, 0x6d, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, + 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, + 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, + 0x6f, 0x22, 0x2a, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x70, 0x67, + 0x72, 0x61, 0x64, 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, 0x22, 0x3b, 0x0a, + 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x6d, 0x0a, 0x13, 0x50, 0x72, + 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 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, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x74, + 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, + 0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x6e, 0x0a, 0x14, 0x50, 0x72, 0x61, + 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x74, + 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, + 0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x6b, 0x0a, 0x0f, 0x50, 0x72, 0x61, + 0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, + 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x63, + 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x63, 0x68, + 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x6c, 0x0a, 0x10, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, + 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, + 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, + 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x70, 0x72, 0x6f, 0x70, 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, 0x17, 0x0a, 0x15, + 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, + 0x6e, 0x52, 0x65, 0x73, 0x70, 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, 0x22, 0x3b, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x70, 0x67, - 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, - 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0e, - 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x6d, - 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, - 0x63, 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, 0x12, 0x0a, 0x04, 0x68, - 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, - 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, - 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x6e, 0x0a, - 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, - 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x68, - 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, - 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, - 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x6b, 0x0a, - 0x0f, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x71, - 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07, - 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, - 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x22, 0x6c, 0x0a, 0x10, 0x50, 0x72, - 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, - 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, - 0x61, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, - 0x63, 0x68, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x70, 0x72, 0x6f, 0x70, 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, 0x17, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, - 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 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, 0x15, 0x0a, - 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 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, 0x15, 0x0a, 0x13, 0x50, 0x72, 0x61, + 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -737,29 +839,32 @@ func file_practice_practice_msg_proto_rawDescGZIP() []byte { return file_practice_practice_msg_proto_rawDescData } -var file_practice_practice_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12) +var file_practice_practice_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14) var file_practice_practice_msg_proto_goTypes = []interface{}{ - (*PracticeInfoReq)(nil), // 0: PracticeInfoReq - (*PracticeInfoResp)(nil), // 1: PracticeInfoResp - (*PracticeUpgradeReq)(nil), // 2: PracticeUpgradeReq - (*PracticeUpgradeResp)(nil), // 3: PracticeUpgradeResp - (*PracticePracticeReq)(nil), // 4: PracticePracticeReq - (*PracticePracticeResp)(nil), // 5: PracticePracticeResp - (*PracticeLootReq)(nil), // 6: PracticeLootReq - (*PracticeLootResp)(nil), // 7: PracticeLootResp - (*PracticeExpulsionReq)(nil), // 8: PracticeExpulsionReq - (*PracticeExpulsionResp)(nil), // 9: PracticeExpulsionResp - (*PracticeReceiveReq)(nil), // 10: PracticeReceiveReq - (*PracticeReceiveResp)(nil), // 11: PracticeReceiveResp - (*DBPracticeRoom)(nil), // 12: DBPracticeRoom + (*PracticeInfoReq)(nil), // 0: PracticeInfoReq + (*PracticeInfoResp)(nil), // 1: PracticeInfoResp + (*PracticeFriendRommReq)(nil), // 2: PracticeFriendRommReq + (*PracticeFriendRommResp)(nil), // 3: PracticeFriendRommResp + (*PracticeUpgradeReq)(nil), // 4: PracticeUpgradeReq + (*PracticeUpgradeResp)(nil), // 5: PracticeUpgradeResp + (*PracticePracticeReq)(nil), // 6: PracticePracticeReq + (*PracticePracticeResp)(nil), // 7: PracticePracticeResp + (*PracticeLootReq)(nil), // 8: PracticeLootReq + (*PracticeLootResp)(nil), // 9: PracticeLootResp + (*PracticeExpulsionReq)(nil), // 10: PracticeExpulsionReq + (*PracticeExpulsionResp)(nil), // 11: PracticeExpulsionResp + (*PracticeReceiveReq)(nil), // 12: PracticeReceiveReq + (*PracticeReceiveResp)(nil), // 13: PracticeReceiveResp + (*DBPracticeRoom)(nil), // 14: DBPracticeRoom } var file_practice_practice_msg_proto_depIdxs = []int32{ - 12, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 14, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom + 14, // 1: PracticeFriendRommResp.info:type_name -> DBPracticeRoom + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name } func init() { file_practice_practice_msg_proto_init() } @@ -794,7 +899,7 @@ func file_practice_practice_msg_proto_init() { } } file_practice_practice_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeUpgradeReq); i { + switch v := v.(*PracticeFriendRommReq); i { case 0: return &v.state case 1: @@ -806,7 +911,7 @@ func file_practice_practice_msg_proto_init() { } } file_practice_practice_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeUpgradeResp); i { + switch v := v.(*PracticeFriendRommResp); i { case 0: return &v.state case 1: @@ -818,7 +923,7 @@ func file_practice_practice_msg_proto_init() { } } file_practice_practice_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticePracticeReq); i { + switch v := v.(*PracticeUpgradeReq); i { case 0: return &v.state case 1: @@ -830,7 +935,7 @@ func file_practice_practice_msg_proto_init() { } } file_practice_practice_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticePracticeResp); i { + switch v := v.(*PracticeUpgradeResp); i { case 0: return &v.state case 1: @@ -842,7 +947,7 @@ func file_practice_practice_msg_proto_init() { } } file_practice_practice_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeLootReq); i { + switch v := v.(*PracticePracticeReq); i { case 0: return &v.state case 1: @@ -854,7 +959,7 @@ func file_practice_practice_msg_proto_init() { } } file_practice_practice_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeLootResp); i { + switch v := v.(*PracticePracticeResp); i { case 0: return &v.state case 1: @@ -866,7 +971,7 @@ func file_practice_practice_msg_proto_init() { } } file_practice_practice_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeExpulsionReq); i { + switch v := v.(*PracticeLootReq); i { case 0: return &v.state case 1: @@ -878,7 +983,7 @@ func file_practice_practice_msg_proto_init() { } } file_practice_practice_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeExpulsionResp); i { + switch v := v.(*PracticeLootResp); i { case 0: return &v.state case 1: @@ -890,7 +995,7 @@ func file_practice_practice_msg_proto_init() { } } file_practice_practice_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeReceiveReq); i { + switch v := v.(*PracticeExpulsionReq); i { case 0: return &v.state case 1: @@ -902,6 +1007,30 @@ func file_practice_practice_msg_proto_init() { } } file_practice_practice_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PracticeExpulsionResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_practice_practice_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PracticeReceiveReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_practice_practice_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*PracticeReceiveResp); i { case 0: return &v.state @@ -920,7 +1049,7 @@ func file_practice_practice_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_practice_practice_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 12, + NumMessages: 14, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index dd8075b3a..2f94e09a3 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -57,6 +57,7 @@ type DBUserExpand struct { SociatyTicket int32 `protobuf:"varint,33,opt,name=sociatyTicket,proto3" json:"sociatyTicket" bson:"sociatyTicket"` //公会boss挑战券数量 Mline map[int32]int32 `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 key难度val是关卡ID SuiteId []int32 `protobuf:"varint,35,rep,packed,name=suiteId,proto3" json:"suiteId" bson:"suiteId"` // 套装Id + Globalbuff int32 `protobuf:"varint,36,opt,name=globalbuff,proto3" json:"globalbuff" bson:"globalbuff"` // 全局buff } func (x *DBUserExpand) Reset() { @@ -308,11 +309,18 @@ func (x *DBUserExpand) GetSuiteId() []int32 { return nil } +func (x *DBUserExpand) GetGlobalbuff() int32 { + if x != nil { + return x.Globalbuff + } + return 0 +} + var File_userexpand_proto protoreflect.FileDescriptor var file_userexpand_proto_rawDesc = []byte{ 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x8c, 0x0a, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, + 0x74, 0x6f, 0x22, 0xac, 0x0a, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 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, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, @@ -385,7 +393,9 @@ var file_userexpand_proto_rawDesc = []byte{ 0x32, 0x18, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6d, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x23, 0x20, 0x03, - 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, + 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x67, + 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x18, 0x24, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x0a, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, 0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 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,