From 32086143e729802b46e3ac65d19fad1506336a94 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 16 Aug 2022 10:10:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=86=8A=E7=8C=AB=E6=AD=A6?= =?UTF-8?q?=E9=A6=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/martialhall/api_practice.go | 20 ++ modules/martialhall/configure.go | 2 +- modules/martialhall/modelMartialhall.go | 33 +++ modules/redis/core.go | 11 - modules/redis/expiredcomp.go | 90 ------- modules/redis/module.go | 45 ---- pb/martialhall_db.pb.go | 261 ++++++++++++++++++- pb/martialhall_msg.pb.go | 320 +++++------------------- 8 files changed, 369 insertions(+), 413 deletions(-) create mode 100644 modules/martialhall/api_practice.go create mode 100644 modules/martialhall/modelMartialhall.go delete mode 100644 modules/redis/core.go delete mode 100644 modules/redis/expiredcomp.go delete mode 100644 modules/redis/module.go diff --git a/modules/martialhall/api_practice.go b/modules/martialhall/api_practice.go new file mode 100644 index 000000000..c494cb932 --- /dev/null +++ b/modules/martialhall/api_practice.go @@ -0,0 +1,20 @@ +package martialhall + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +//参数校验 +func (this *apiComp) PracticeCheck(session comm.IUserSession, req *pb.MartialhallPracticeReq) (code pb.ErrorCode) { + + return +} + +///练功请求 +func (this *apiComp) Practice(session comm.IUserSession, req *pb.MartialhallPracticeReq) (code pb.ErrorCode, data proto.Message) { + + return +} diff --git a/modules/martialhall/configure.go b/modules/martialhall/configure.go index 1338d4fdf..4d398e554 100644 --- a/modules/martialhall/configure.go +++ b/modules/martialhall/configure.go @@ -17,7 +17,7 @@ type configureComp struct { //组件初始化接口 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.ModuleCompBase.Init(service, module, comp, options) + this.MCompConfigure.Init(service, module, comp, options) return } diff --git a/modules/martialhall/modelMartialhall.go b/modules/martialhall/modelMartialhall.go new file mode 100644 index 000000000..ca1aea5e3 --- /dev/null +++ b/modules/martialhall/modelMartialhall.go @@ -0,0 +1,33 @@ +package martialhall + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +///论坛 数据组件 +type modelMartialhall struct { + modules.MCompModel +} + +//组件初始化接口 +func (this *modelMartialhall) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { + this.TableName = comm.TableMartialhall + this.MCompModel.Init(service, module, comp, opt) + //创建uid索引 + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) + return +} + +///询用户的练功房信息 +func (this *modelMartialhall) queryUserMartialhall(uid string) (result *pb.DBMartialhall) { + + return +} diff --git a/modules/redis/core.go b/modules/redis/core.go deleted file mode 100644 index af4e52def..000000000 --- a/modules/redis/core.go +++ /dev/null @@ -1,11 +0,0 @@ -package redis - -import ( - "time" -) - -type ModelDataExpired struct { - key string //主key - keys map[string]struct{} //数据集合 - expired time.Time //过期时间 -} diff --git a/modules/redis/expiredcomp.go b/modules/redis/expiredcomp.go deleted file mode 100644 index 101c0ba67..000000000 --- a/modules/redis/expiredcomp.go +++ /dev/null @@ -1,90 +0,0 @@ -package redis - -import ( - "context" - "go_dreamfactory/lego/core" - "go_dreamfactory/lego/core/cbase" - "go_dreamfactory/lego/sys/redis" - "sync" - "time" -) - -///过期数据管理组件 -type ExpiredComp struct { - cbase.ModuleCompBase - redis redis.ISys - mu sync.RWMutex - data map[string]*ModelDataExpired -} - -//组件初始化接口 -func (this *ExpiredComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { - this.ModuleCompBase.Init(service, module, comp, opt) - this.data = make(map[string]*ModelDataExpired, 1024) - return -} - -func (this *ExpiredComp) Start() (err error) { - err = this.ModuleCompBase.Start() - go this.run() - return -} - -func (this *ExpiredComp) UpDateModel(key string, childs map[string]struct{}, expired time.Duration) { - this.mu.RLock() - exp, ok := this.data[key] - this.mu.RUnlock() - if ok { - exp.keys = childs - exp.expired = time.Now().Add(expired) - } else { - exp = &ModelDataExpired{ - key: key, - keys: childs, - expired: time.Now().Add(expired), - } - this.mu.Lock() - this.data[key] = exp - this.mu.Unlock() - } -} - -//定时清理过期数据 -func (this *ExpiredComp) run() { - timer := time.NewTicker(time.Minute * 1) - defer timer.Stop() - for { - select { - case <-timer.C: - this.scanning() - break - } - } -} - -//扫描过期 -func (this *ExpiredComp) scanning() { - now := time.Now() - this.mu.Lock() - temp := make([]*ModelDataExpired, 0, len(this.data)) - for k, v := range this.data { - if v.expired.Before(now) { //过期 - temp = append(temp, v) - delete(this.data, k) - } - } - this.mu.Unlock() - ctx := context.Background() - pipe := this.redis.Pipeline() - for _, v := range temp { - pipe.Del(ctx, v.key) - if v.keys != nil { - for k1, _ := range v.keys { - pipe.Del(ctx, k1) - } - } - } - if _, err := pipe.Exec(ctx); err != nil { - - } -} diff --git a/modules/redis/module.go b/modules/redis/module.go deleted file mode 100644 index 4be430c57..000000000 --- a/modules/redis/module.go +++ /dev/null @@ -1,45 +0,0 @@ -package redis - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/lego/core" - "go_dreamfactory/modules" - "time" -) - -/* -模块名:缓存管理 -描述:处理缓存数据过期问题 -开发:李伟 -*/ -func NewModule() core.IModule { - m := new(Redis) - return m -} - -type Redis struct { - modules.ModuleBase - expiredComp *ExpiredComp -} - -//模块名 -func (this *Redis) GetType() core.M_Modules { - return comm.ModuleEquipment -} - -//模块初始化接口 注册用户创建角色事件 -func (this *Redis) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { - err = this.ModuleBase.Init(service, module, options) - return -} - -//装备组件 -func (this *Redis) OnInstallComp() { - this.ModuleBase.OnInstallComp() - this.expiredComp = this.RegisterComp(new(ExpiredComp)).(*ExpiredComp) -} - -//更新缓存数据过期时间 -func (this *Redis) UpDateModel(key string, childs map[string]struct{}, expired time.Duration) { - this.expiredComp.UpDateModel(key, childs, expired) -} diff --git a/pb/martialhall_db.pb.go b/pb/martialhall_db.pb.go index f0387673a..4be91c188 100644 --- a/pb/martialhall_db.pb.go +++ b/pb/martialhall_db.pb.go @@ -10,6 +10,7 @@ import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" + sync "sync" ) const ( @@ -19,22 +20,236 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +///练功柱子 +type DBPillar struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Isunlock bool `protobuf:"varint,1,opt,name=isunlock,proto3" json:"isunlock"` //是否解锁 + Currhero string `protobuf:"bytes,2,opt,name=currhero,proto3" json:"currhero"` //当前练功英雄 + Reward []*UserAssets `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward"` //奖励 +} + +func (x *DBPillar) Reset() { + *x = DBPillar{} + if protoimpl.UnsafeEnabled { + mi := &file_martialhall_martialhall_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBPillar) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBPillar) ProtoMessage() {} + +func (x *DBPillar) ProtoReflect() protoreflect.Message { + mi := &file_martialhall_martialhall_db_proto_msgTypes[0] + 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 DBPillar.ProtoReflect.Descriptor instead. +func (*DBPillar) Descriptor() ([]byte, []int) { + return file_martialhall_martialhall_db_proto_rawDescGZIP(), []int{0} +} + +func (x *DBPillar) GetIsunlock() bool { + if x != nil { + return x.Isunlock + } + return false +} + +func (x *DBPillar) GetCurrhero() string { + if x != nil { + return x.Currhero + } + return "" +} + +func (x *DBPillar) GetReward() []*UserAssets { + if x != nil { + return x.Reward + } + return nil +} + +//练功房 +type DBMartialhall struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //组件id + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id + Lv int32 `protobuf:"varint,3,opt,name=lv,proto3" json:"lv"` //武馆等级 + Pillar1 *DBPillar `protobuf:"bytes,4,opt,name=pillar1,proto3" json:"pillar1"` //柱子1 + Pillar2 *DBPillar `protobuf:"bytes,5,opt,name=pillar2,proto3" json:"pillar2"` //柱子2 + Pillar3 *DBPillar `protobuf:"bytes,6,opt,name=pillar3,proto3" json:"pillar3"` //柱子3 + Pillar4 *DBPillar `protobuf:"bytes,7,opt,name=pillar4,proto3" json:"pillar4"` //柱子4 + Pillar5 *DBPillar `protobuf:"bytes,8,opt,name=pillar5,proto3" json:"pillar5"` //柱子5 +} + +func (x *DBMartialhall) Reset() { + *x = DBMartialhall{} + if protoimpl.UnsafeEnabled { + mi := &file_martialhall_martialhall_db_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBMartialhall) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBMartialhall) ProtoMessage() {} + +func (x *DBMartialhall) ProtoReflect() protoreflect.Message { + mi := &file_martialhall_martialhall_db_proto_msgTypes[1] + 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 DBMartialhall.ProtoReflect.Descriptor instead. +func (*DBMartialhall) Descriptor() ([]byte, []int) { + return file_martialhall_martialhall_db_proto_rawDescGZIP(), []int{1} +} + +func (x *DBMartialhall) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBMartialhall) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBMartialhall) GetLv() int32 { + if x != nil { + return x.Lv + } + return 0 +} + +func (x *DBMartialhall) GetPillar1() *DBPillar { + if x != nil { + return x.Pillar1 + } + return nil +} + +func (x *DBMartialhall) GetPillar2() *DBPillar { + if x != nil { + return x.Pillar2 + } + return nil +} + +func (x *DBMartialhall) GetPillar3() *DBPillar { + if x != nil { + return x.Pillar3 + } + return nil +} + +func (x *DBMartialhall) GetPillar4() *DBPillar { + if x != nil { + return x.Pillar4 + } + return nil +} + +func (x *DBMartialhall) GetPillar5() *DBPillar { + if x != nil { + return x.Pillar5 + } + return nil +} + var File_martialhall_martialhall_db_proto protoreflect.FileDescriptor var file_martialhall_martialhall_db_proto_rawDesc = []byte{ 0x0a, 0x20, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x2f, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, + 0x0a, 0x08, 0x44, 0x42, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, + 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, + 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x72, 0x68, 0x65, + 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x72, 0x68, 0x65, + 0x72, 0x6f, 0x12, 0x23, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, + 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0xfa, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x4d, 0x61, + 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 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, 0x0e, 0x0a, 0x02, 0x6c, + 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x23, 0x0a, 0x07, 0x70, + 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, + 0x42, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x31, + 0x12, 0x23, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, + 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x12, 0x23, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x50, 0x69, 0x6c, 0x6c, 0x61, + 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x12, 0x23, 0x0a, 0x07, 0x70, 0x69, + 0x6c, 0x6c, 0x61, 0x72, 0x34, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, + 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x34, 0x12, + 0x23, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x35, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x09, 0x2e, 0x44, 0x42, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, + 0x6c, 0x61, 0x72, 0x35, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } -var file_martialhall_martialhall_db_proto_goTypes = []interface{}{} +var ( + file_martialhall_martialhall_db_proto_rawDescOnce sync.Once + file_martialhall_martialhall_db_proto_rawDescData = file_martialhall_martialhall_db_proto_rawDesc +) + +func file_martialhall_martialhall_db_proto_rawDescGZIP() []byte { + file_martialhall_martialhall_db_proto_rawDescOnce.Do(func() { + file_martialhall_martialhall_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_martialhall_martialhall_db_proto_rawDescData) + }) + return file_martialhall_martialhall_db_proto_rawDescData +} + +var file_martialhall_martialhall_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_martialhall_martialhall_db_proto_goTypes = []interface{}{ + (*DBPillar)(nil), // 0: DBPillar + (*DBMartialhall)(nil), // 1: DBMartialhall + (*UserAssets)(nil), // 2: UserAssets +} var file_martialhall_martialhall_db_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name + 2, // 0: DBPillar.reward:type_name -> UserAssets + 0, // 1: DBMartialhall.pillar1:type_name -> DBPillar + 0, // 2: DBMartialhall.pillar2:type_name -> DBPillar + 0, // 3: DBMartialhall.pillar3:type_name -> DBPillar + 0, // 4: DBMartialhall.pillar4:type_name -> DBPillar + 0, // 5: DBMartialhall.pillar5:type_name -> DBPillar + 6, // [6:6] is the sub-list for method output_type + 6, // [6:6] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 6, // [6:6] is the sub-list for extension extendee + 0, // [0:6] is the sub-list for field type_name } func init() { file_martialhall_martialhall_db_proto_init() } @@ -42,18 +257,46 @@ func file_martialhall_martialhall_db_proto_init() { if File_martialhall_martialhall_db_proto != nil { return } + file_comm_proto_init() + if !protoimpl.UnsafeEnabled { + file_martialhall_martialhall_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBPillar); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_martialhall_martialhall_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBMartialhall); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_martialhall_martialhall_db_proto_rawDesc, NumEnums: 0, - NumMessages: 0, + NumMessages: 2, NumExtensions: 0, NumServices: 0, }, GoTypes: file_martialhall_martialhall_db_proto_goTypes, DependencyIndexes: file_martialhall_martialhall_db_proto_depIdxs, + MessageInfos: file_martialhall_martialhall_db_proto_msgTypes, }.Build() File_martialhall_martialhall_db_proto = out.File file_martialhall_martialhall_db_proto_rawDesc = nil diff --git a/pb/martialhall_msg.pb.go b/pb/martialhall_msg.pb.go index 95ffbfa7b..20d137b71 100644 --- a/pb/martialhall_msg.pb.go +++ b/pb/martialhall_msg.pb.go @@ -20,173 +20,19 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -///武馆进入请求 -type MartialhallIntoReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *MartialhallIntoReq) Reset() { - *x = MartialhallIntoReq{} - if protoimpl.UnsafeEnabled { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MartialhallIntoReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MartialhallIntoReq) ProtoMessage() {} - -func (x *MartialhallIntoReq) ProtoReflect() protoreflect.Message { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[0] - 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 MartialhallIntoReq.ProtoReflect.Descriptor instead. -func (*MartialhallIntoReq) Descriptor() ([]byte, []int) { - return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{0} -} - -///武馆进入请求 回应 -type MartialhallIntoResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *MartialhallIntoResp) Reset() { - *x = MartialhallIntoResp{} - if protoimpl.UnsafeEnabled { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MartialhallIntoResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MartialhallIntoResp) ProtoMessage() {} - -func (x *MartialhallIntoResp) ProtoReflect() protoreflect.Message { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[1] - 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 MartialhallIntoResp.ProtoReflect.Descriptor instead. -func (*MartialhallIntoResp) Descriptor() ([]byte, []int) { - return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{1} -} - -///用户进入武馆推送 -type MartialhallUserIntoPush struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *MartialhallUserIntoPush) Reset() { - *x = MartialhallUserIntoPush{} - if protoimpl.UnsafeEnabled { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MartialhallUserIntoPush) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MartialhallUserIntoPush) ProtoMessage() {} - -func (x *MartialhallUserIntoPush) ProtoReflect() protoreflect.Message { - mi := &file_martialhall_martialhall_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 MartialhallUserIntoPush.ProtoReflect.Descriptor instead. -func (*MartialhallUserIntoPush) Descriptor() ([]byte, []int) { - return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{2} -} - -///用户离开武馆推送 -type MartialhallUserLeavePush struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *MartialhallUserLeavePush) Reset() { - *x = MartialhallUserLeavePush{} - if protoimpl.UnsafeEnabled { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MartialhallUserLeavePush) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MartialhallUserLeavePush) ProtoMessage() {} - -func (x *MartialhallUserLeavePush) ProtoReflect() protoreflect.Message { - mi := &file_martialhall_martialhall_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 MartialhallUserLeavePush.ProtoReflect.Descriptor instead. -func (*MartialhallUserLeavePush) Descriptor() ([]byte, []int) { - return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{3} -} - ///练功请求 type MartialhallPracticeReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + + Pillar int32 `protobuf:"varint,1,opt,name=pillar,proto3" json:"pillar"` //柱子 } func (x *MartialhallPracticeReq) Reset() { *x = MartialhallPracticeReq{} if protoimpl.UnsafeEnabled { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[4] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -199,7 +45,7 @@ func (x *MartialhallPracticeReq) String() string { func (*MartialhallPracticeReq) ProtoMessage() {} func (x *MartialhallPracticeReq) ProtoReflect() protoreflect.Message { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[4] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -212,7 +58,14 @@ func (x *MartialhallPracticeReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MartialhallPracticeReq.ProtoReflect.Descriptor instead. func (*MartialhallPracticeReq) Descriptor() ([]byte, []int) { - return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{4} + return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{0} +} + +func (x *MartialhallPracticeReq) GetPillar() int32 { + if x != nil { + return x.Pillar + } + return 0 } ///练功请求 回应 @@ -225,7 +78,7 @@ type MartialhallPracticeResp struct { func (x *MartialhallPracticeResp) Reset() { *x = MartialhallPracticeResp{} if protoimpl.UnsafeEnabled { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[5] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -238,7 +91,7 @@ func (x *MartialhallPracticeResp) String() string { func (*MartialhallPracticeResp) ProtoMessage() {} func (x *MartialhallPracticeResp) ProtoReflect() protoreflect.Message { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[5] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -251,7 +104,7 @@ func (x *MartialhallPracticeResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MartialhallPracticeResp.ProtoReflect.Descriptor instead. func (*MartialhallPracticeResp) Descriptor() ([]byte, []int) { - return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{5} + return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{1} } ///领取 请求 @@ -259,12 +112,14 @@ type MartialhallReceiveReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + + Pillar int32 `protobuf:"varint,1,opt,name=pillar,proto3" json:"pillar"` } func (x *MartialhallReceiveReq) Reset() { *x = MartialhallReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[6] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -277,7 +132,7 @@ func (x *MartialhallReceiveReq) String() string { func (*MartialhallReceiveReq) ProtoMessage() {} func (x *MartialhallReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[6] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -290,7 +145,14 @@ func (x *MartialhallReceiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MartialhallReceiveReq.ProtoReflect.Descriptor instead. func (*MartialhallReceiveReq) Descriptor() ([]byte, []int) { - return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{6} + return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *MartialhallReceiveReq) GetPillar() int32 { + if x != nil { + return x.Pillar + } + return 0 } ///领取 回应 @@ -303,7 +165,7 @@ type MartialhallReceiveResp struct { func (x *MartialhallReceiveResp) Reset() { *x = MartialhallReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[7] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -316,7 +178,7 @@ func (x *MartialhallReceiveResp) String() string { func (*MartialhallReceiveResp) ProtoMessage() {} func (x *MartialhallReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[7] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -329,7 +191,7 @@ func (x *MartialhallReceiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MartialhallReceiveResp.ProtoReflect.Descriptor instead. func (*MartialhallReceiveResp) Descriptor() ([]byte, []int) { - return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{7} + return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{3} } ///升级 请求 @@ -342,7 +204,7 @@ type MartialhallUpgradeReq struct { func (x *MartialhallUpgradeReq) Reset() { *x = MartialhallUpgradeReq{} if protoimpl.UnsafeEnabled { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[8] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -355,7 +217,7 @@ func (x *MartialhallUpgradeReq) String() string { func (*MartialhallUpgradeReq) ProtoMessage() {} func (x *MartialhallUpgradeReq) ProtoReflect() protoreflect.Message { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[8] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -368,7 +230,7 @@ func (x *MartialhallUpgradeReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MartialhallUpgradeReq.ProtoReflect.Descriptor instead. func (*MartialhallUpgradeReq) Descriptor() ([]byte, []int) { - return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{8} + return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{4} } ///升级 请求回应 @@ -381,7 +243,7 @@ type MartialhallUpgradeResp struct { func (x *MartialhallUpgradeResp) Reset() { *x = MartialhallUpgradeResp{} if protoimpl.UnsafeEnabled { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[9] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -394,7 +256,7 @@ func (x *MartialhallUpgradeResp) String() string { func (*MartialhallUpgradeResp) ProtoMessage() {} func (x *MartialhallUpgradeResp) ProtoReflect() protoreflect.Message { - mi := &file_martialhall_martialhall_msg_proto_msgTypes[9] + mi := &file_martialhall_martialhall_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -407,7 +269,7 @@ func (x *MartialhallUpgradeResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MartialhallUpgradeResp.ProtoReflect.Descriptor instead. func (*MartialhallUpgradeResp) Descriptor() ([]byte, []int) { - return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{9} + return file_martialhall_martialhall_msg_proto_rawDescGZIP(), []int{5} } var File_martialhall_martialhall_msg_proto protoreflect.FileDescriptor @@ -415,24 +277,20 @@ var File_martialhall_martialhall_msg_proto protoreflect.FileDescriptor var file_martialhall_martialhall_msg_proto_rawDesc = []byte{ 0x0a, 0x21, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x2f, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0x14, 0x0a, 0x12, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, - 0x6c, 0x6c, 0x49, 0x6e, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x15, 0x0a, 0x13, 0x4d, 0x61, 0x72, - 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x70, - 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, - 0x73, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x22, 0x1a, 0x0a, 0x18, 0x4d, - 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x65, - 0x61, 0x76, 0x65, 0x50, 0x75, 0x73, 0x68, 0x22, 0x18, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, - 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, - 0x71, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, - 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x17, 0x0a, 0x15, - 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x52, 0x65, 0x71, 0x22, 0x18, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, - 0x68, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, - 0x17, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x70, - 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x18, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, - 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, - 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x6f, 0x74, 0x6f, 0x22, 0x30, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, + 0x6c, 0x6c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, + 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, + 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, + 0x68, 0x61, 0x6c, 0x6c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x22, 0x2f, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x52, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x69, 0x6c, + 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, + 0x72, 0x22, 0x18, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, + 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x17, 0x0a, 0x15, 0x4d, + 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, + 0x65, 0x52, 0x65, 0x71, 0x22, 0x18, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, + 0x61, 0x6c, 0x6c, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -447,18 +305,14 @@ func file_martialhall_martialhall_msg_proto_rawDescGZIP() []byte { return file_martialhall_martialhall_msg_proto_rawDescData } -var file_martialhall_martialhall_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_martialhall_martialhall_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_martialhall_martialhall_msg_proto_goTypes = []interface{}{ - (*MartialhallIntoReq)(nil), // 0: MartialhallIntoReq - (*MartialhallIntoResp)(nil), // 1: MartialhallIntoResp - (*MartialhallUserIntoPush)(nil), // 2: MartialhallUserIntoPush - (*MartialhallUserLeavePush)(nil), // 3: MartialhallUserLeavePush - (*MartialhallPracticeReq)(nil), // 4: MartialhallPracticeReq - (*MartialhallPracticeResp)(nil), // 5: MartialhallPracticeResp - (*MartialhallReceiveReq)(nil), // 6: MartialhallReceiveReq - (*MartialhallReceiveResp)(nil), // 7: MartialhallReceiveResp - (*MartialhallUpgradeReq)(nil), // 8: MartialhallUpgradeReq - (*MartialhallUpgradeResp)(nil), // 9: MartialhallUpgradeResp + (*MartialhallPracticeReq)(nil), // 0: MartialhallPracticeReq + (*MartialhallPracticeResp)(nil), // 1: MartialhallPracticeResp + (*MartialhallReceiveReq)(nil), // 2: MartialhallReceiveReq + (*MartialhallReceiveResp)(nil), // 3: MartialhallReceiveResp + (*MartialhallUpgradeReq)(nil), // 4: MartialhallUpgradeReq + (*MartialhallUpgradeResp)(nil), // 5: MartialhallUpgradeResp } var file_martialhall_martialhall_msg_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type @@ -475,54 +329,6 @@ func file_martialhall_martialhall_msg_proto_init() { } if !protoimpl.UnsafeEnabled { file_martialhall_martialhall_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MartialhallIntoReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_martialhall_martialhall_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MartialhallIntoResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_martialhall_martialhall_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MartialhallUserIntoPush); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_martialhall_martialhall_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MartialhallUserLeavePush); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_martialhall_martialhall_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MartialhallPracticeReq); i { case 0: return &v.state @@ -534,7 +340,7 @@ func file_martialhall_martialhall_msg_proto_init() { return nil } } - file_martialhall_martialhall_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_martialhall_martialhall_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MartialhallPracticeResp); i { case 0: return &v.state @@ -546,7 +352,7 @@ func file_martialhall_martialhall_msg_proto_init() { return nil } } - file_martialhall_martialhall_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_martialhall_martialhall_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MartialhallReceiveReq); i { case 0: return &v.state @@ -558,7 +364,7 @@ func file_martialhall_martialhall_msg_proto_init() { return nil } } - file_martialhall_martialhall_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_martialhall_martialhall_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MartialhallReceiveResp); i { case 0: return &v.state @@ -570,7 +376,7 @@ func file_martialhall_martialhall_msg_proto_init() { return nil } } - file_martialhall_martialhall_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_martialhall_martialhall_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MartialhallUpgradeReq); i { case 0: return &v.state @@ -582,7 +388,7 @@ func file_martialhall_martialhall_msg_proto_init() { return nil } } - file_martialhall_martialhall_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_martialhall_martialhall_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MartialhallUpgradeResp); i { case 0: return &v.state @@ -601,7 +407,7 @@ func file_martialhall_martialhall_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_martialhall_martialhall_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 10, + NumMessages: 6, NumExtensions: 0, NumServices: 0, },