diff --git a/cmd/robot/task.go b/cmd/robot/task.go index 7049a825e..e799ca6ef 100644 --- a/cmd/robot/task.go +++ b/cmd/robot/task.go @@ -17,9 +17,9 @@ var ( subType: task.TaskSubTypeList, req: &pb.TaskListReq{ //设置任务类型 - // TaskTag: int32(comm.TASK_DAILY), //每天任务 + TaskTag: int32(comm.TASK_DAILY), //每天任务 // TaskTag: int32(comm.TASK_WEEKLY), //周任务 - TaskTag: int32(comm.TASK_ACHIEVE), + // TaskTag: int32(comm.TASK_ACHIEVE), // TaskTag: int32(comm.TASK_STRATEGY), }, rsp: &pb.TaskListResp{}, @@ -40,7 +40,7 @@ var ( subType: task.TaskSubTypeReceive, req: &pb.TaskReceiveReq{ TaskTag: int32(comm.TASK_DAILY), - Id: "62de35b92f462b70c1105ac5", + Id: "62dfee653be162da508224a4", }, rsp: &pb.TaskReceiveResp{}, // enabled: true, @@ -61,10 +61,11 @@ var ( print: func(rsp proto.Message) { out := rsp.(*pb.TaskActiveListResp) for _, v := range out.List { - fmt.Printf("%v 活跃值:%v\n", v, out.Active) + fmt.Printf("%v \n", v) } + fmt.Printf("玩家活跃度 :%v \n", out.Active) }, - // enabled: true, + enabled: true, }, { desc: "活跃度领取", mainType: string(comm.ModuleTask), diff --git a/comm/imodule.go b/comm/imodule.go index 4062fdf8b..1e8608167 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -62,6 +62,10 @@ type ( AddAttributeValue(session IUserSession, attr string, add int32, bPush bool) (code pb.ErrorCode) //用户改变事件 EventUserChanged(session IUserSession) + //获取用户expand + GetUserExpand(uid string) (result *pb.DBUserExpand, err error) + //更新用户expand + ChanageUserExpand(uid string, value map[string]interface{}) error } //武器模块 IEquipment interface { diff --git a/modules/task/api_activelist.go b/modules/task/api_activelist.go index 09de6d024..cb52255d7 100644 --- a/modules/task/api_activelist.go +++ b/modules/task/api_activelist.go @@ -28,7 +28,19 @@ func (this *apiComp) ActiveList(session comm.IUserSession, req *pb.TaskActiveLis } }() - resp.Active = this.moduleTask.modelTask.countActive(session.GetUserId(), comm.TaskTag(req.TaskTag)) + // resp.Active = this.moduleTask.modelTask.countActive(session.GetUserId(), comm.TaskTag(req.TaskTag)) + expand, err := this.moduleTask.ModuleUser.GetUserExpand(session.GetUserId()) + if err != nil { + code = pb.ErrorCode_DBError + return + } + + if req.TaskTag == int32(comm.TASK_DAILY) { + resp.Active = expand.Activeday + } else if req.TaskTag == int32(comm.TASK_WEEKLY) { + resp.Active = expand.Activeweek + } + //遍历活跃度奖励表 resp.List = this.moduleTask.modelTaskActive.getActiveListByTag(session.GetUserId(), comm.TaskTag(req.TaskTag)) diff --git a/modules/task/api_receive.go b/modules/task/api_receive.go index 745a58948..5b2afd9c0 100644 --- a/modules/task/api_receive.go +++ b/modules/task/api_receive.go @@ -48,6 +48,25 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) return } + //更新活跃度 + ue, err := this.moduleTask.ModuleUser.GetUserExpand(session.GetUserId()) + if err != nil { + code = pb.ErrorCode_DBError + return + } + if ue != nil { + update := make(map[string]interface{}) + if comm.TaskTag(req.TaskTag) == comm.TASK_DAILY { + update["activeday"] = ue.Activeday + conf.Active + } else if comm.TaskTag(req.TaskTag) == comm.TASK_WEEKLY { + update["activeweek"] = ue.Activeweek + conf.Active + } + if err = this.moduleTask.ModuleUser.ChanageUserExpand(session.GetUserId(), update); err != nil { + code = pb.ErrorCode_DBError + return + } + } + //奖励 if code = this.moduleTask.DispenseRes(session, conf.Reword, true); code != pb.ErrorCode_Success { return diff --git a/modules/task/model_active.go b/modules/task/model_active.go index d956b59d9..70fbf22e7 100644 --- a/modules/task/model_active.go +++ b/modules/task/model_active.go @@ -97,10 +97,15 @@ func (this *ModelTaskActive) receiveHandle(uid, id string, conf *cfg.Game_active return } //玩家活跃度数 - userActiveTotal := this.moduleTask.modelTask.countActive(uid, taskTag) + // userActiveTotal := this.moduleTask.modelTask.countActive(uid, taskTag) + ue, err := this.moduleTask.ModuleUser.GetUserExpand(uid) + if err != nil { + code = pb.ErrorCode_DBError + return + } if ua.Received == 0 { //未领取 - if userActiveTotal >= conf.Active { + if ue.Activeday >= conf.Active { //更新玩家领取状态 update := map[string]interface{}{ "received": 1, //标识已领取 diff --git a/modules/user/module.go b/modules/user/module.go index bf6bf2ece..86376335e 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -174,6 +174,7 @@ func (this *User) GetUserRecordData(uid string, typeValue int32, parmare int32) return } +// 用户事件变化 func (this *User) EventUserChanged(session comm.IUserSession) { ul := new(UserListen) user := this.GetUser(session.GetUserId()) @@ -184,3 +185,11 @@ func (this *User) EventUserChanged(session comm.IUserSession) { } this.modelUser.eventApp.Dispatch(comm.EventUserChanged, ul) } + +func (this *User) GetUserExpand(uid string) (result *pb.DBUserExpand, err error) { + return this.modelUser.GetUserExpand(uid) +} + +func (this *User) ChanageUserExpand(uid string, value map[string]interface{}) error { + return this.modelUser.ChanageUserExpand(uid, value) +} diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index b38281522..232a280e2 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -380,6 +380,8 @@ type DBUserExpand struct { Tujian map[string]bool `protobuf:"bytes,8,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 图鉴 CurFigure int32 `protobuf:"varint,9,opt,name=curFigure,proto3" json:"curFigure"` //当前形象 Preinstall map[int32]*Figure `protobuf:"bytes,10,rep,name=preinstall,proto3" json:"preinstall" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //形象预设 + Activeday int32 `protobuf:"varint,11,opt,name=activeday,proto3" json:"activeday"` //日活跃度 + Activeweek int32 `protobuf:"varint,12,opt,name=activeweek,proto3" json:"activeweek"` //周活跃度 } func (x *DBUserExpand) Reset() { @@ -484,6 +486,20 @@ func (x *DBUserExpand) GetPreinstall() map[int32]*Figure { return nil } +func (x *DBUserExpand) GetActiveday() int32 { + if x != nil { + return x.Activeday + } + return 0 +} + +func (x *DBUserExpand) GetActiveweek() int32 { + if x != nil { + return x.Activeweek + } + return 0 +} + var File_userexpand_proto protoreflect.FileDescriptor var file_userexpand_proto_rawDesc = []byte{ @@ -512,7 +528,7 @@ var file_userexpand_proto_rawDesc = []byte{ 0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70, - 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0x8f, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, + 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0xcd, 0x04, 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, @@ -537,16 +553,20 @@ var file_userexpand_proto_rawDesc = []byte{ 0x74, 0x61, 0x6c, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, - 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, - 0x1a, 0x46, 0x0a, 0x0f, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 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, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x64, + 0x61, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, + 0x64, 0x61, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x77, 0x65, 0x65, + 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x77, + 0x65, 0x65, 0x6b, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46, + 0x0a, 0x0f, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 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, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/userrecord.pb.go b/pb/userrecord.pb.go index 286d69329..b82da2b37 100644 --- a/pb/userrecord.pb.go +++ b/pb/userrecord.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.0 // protoc v3.20.0 -// source: hero/userrecord.proto +// source: userrecord.proto package pb @@ -32,7 +32,7 @@ type Floor struct { func (x *Floor) Reset() { *x = Floor{} if protoimpl.UnsafeEnabled { - mi := &file_hero_userrecord_proto_msgTypes[0] + mi := &file_userrecord_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *Floor) String() string { func (*Floor) ProtoMessage() {} func (x *Floor) ProtoReflect() protoreflect.Message { - mi := &file_hero_userrecord_proto_msgTypes[0] + mi := &file_userrecord_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *Floor) ProtoReflect() protoreflect.Message { // Deprecated: Use Floor.ProtoReflect.Descriptor instead. func (*Floor) Descriptor() ([]byte, []int) { - return file_hero_userrecord_proto_rawDescGZIP(), []int{0} + return file_userrecord_proto_rawDescGZIP(), []int{0} } func (x *Floor) GetH4() int32 { @@ -96,7 +96,7 @@ type DBUserRecord struct { func (x *DBUserRecord) Reset() { *x = DBUserRecord{} if protoimpl.UnsafeEnabled { - mi := &file_hero_userrecord_proto_msgTypes[1] + mi := &file_userrecord_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -109,7 +109,7 @@ func (x *DBUserRecord) String() string { func (*DBUserRecord) ProtoMessage() {} func (x *DBUserRecord) ProtoReflect() protoreflect.Message { - mi := &file_hero_userrecord_proto_msgTypes[1] + mi := &file_userrecord_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -122,7 +122,7 @@ func (x *DBUserRecord) ProtoReflect() protoreflect.Message { // Deprecated: Use DBUserRecord.ProtoReflect.Descriptor instead. func (*DBUserRecord) Descriptor() ([]byte, []int) { - return file_hero_userrecord_proto_rawDescGZIP(), []int{1} + return file_userrecord_proto_rawDescGZIP(), []int{1} } func (x *DBUserRecord) GetId() string { @@ -195,52 +195,52 @@ func (x *DBUserRecord) GetMtime() int64 { return 0 } -var File_hero_userrecord_proto protoreflect.FileDescriptor +var File_userrecord_proto protoreflect.FileDescriptor -var file_hero_userrecord_proto_rawDesc = []byte{ - 0x0a, 0x15, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x72, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, - 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, - 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, - 0x22, 0x9c, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 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, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, - 0x30, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x12, - 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, - 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x12, 0x1c, 0x0a, - 0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, - 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x12, 0x1c, 0x0a, 0x05, 0x72, - 0x61, 0x63, 0x65, 0x34, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, - 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69, - 0x67, 0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, - 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, - 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, - 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_userrecord_proto_rawDesc = []byte{ + 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x68, + 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, 0x12, 0x0e, 0x0a, 0x02, 0x68, + 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, 0x22, 0x9c, 0x02, 0x0a, 0x0c, + 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 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, 0x1c, + 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, + 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x12, 0x1c, 0x0a, 0x05, + 0x72, 0x61, 0x63, 0x65, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, + 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, + 0x63, 0x65, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, + 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, + 0x33, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, + 0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x34, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, + 0x61, 0x63, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x6e, + 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, + 0x72, 0x6e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, + 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, + 0x74, 0x79, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_hero_userrecord_proto_rawDescOnce sync.Once - file_hero_userrecord_proto_rawDescData = file_hero_userrecord_proto_rawDesc + file_userrecord_proto_rawDescOnce sync.Once + file_userrecord_proto_rawDescData = file_userrecord_proto_rawDesc ) -func file_hero_userrecord_proto_rawDescGZIP() []byte { - file_hero_userrecord_proto_rawDescOnce.Do(func() { - file_hero_userrecord_proto_rawDescData = protoimpl.X.CompressGZIP(file_hero_userrecord_proto_rawDescData) +func file_userrecord_proto_rawDescGZIP() []byte { + file_userrecord_proto_rawDescOnce.Do(func() { + file_userrecord_proto_rawDescData = protoimpl.X.CompressGZIP(file_userrecord_proto_rawDescData) }) - return file_hero_userrecord_proto_rawDescData + return file_userrecord_proto_rawDescData } -var file_hero_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_hero_userrecord_proto_goTypes = []interface{}{ +var file_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_userrecord_proto_goTypes = []interface{}{ (*Floor)(nil), // 0: Floor (*DBUserRecord)(nil), // 1: DBUserRecord } -var file_hero_userrecord_proto_depIdxs = []int32{ +var file_userrecord_proto_depIdxs = []int32{ 0, // 0: DBUserRecord.race0:type_name -> Floor 0, // 1: DBUserRecord.race1:type_name -> Floor 0, // 2: DBUserRecord.race2:type_name -> Floor @@ -253,13 +253,13 @@ var file_hero_userrecord_proto_depIdxs = []int32{ 0, // [0:5] is the sub-list for field type_name } -func init() { file_hero_userrecord_proto_init() } -func file_hero_userrecord_proto_init() { - if File_hero_userrecord_proto != nil { +func init() { file_userrecord_proto_init() } +func file_userrecord_proto_init() { + if File_userrecord_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_hero_userrecord_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_userrecord_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Floor); i { case 0: return &v.state @@ -271,7 +271,7 @@ func file_hero_userrecord_proto_init() { return nil } } - file_hero_userrecord_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_userrecord_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBUserRecord); i { case 0: return &v.state @@ -288,18 +288,18 @@ func file_hero_userrecord_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_hero_userrecord_proto_rawDesc, + RawDescriptor: file_userrecord_proto_rawDesc, NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_hero_userrecord_proto_goTypes, - DependencyIndexes: file_hero_userrecord_proto_depIdxs, - MessageInfos: file_hero_userrecord_proto_msgTypes, + GoTypes: file_userrecord_proto_goTypes, + DependencyIndexes: file_userrecord_proto_depIdxs, + MessageInfos: file_userrecord_proto_msgTypes, }.Build() - File_hero_userrecord_proto = out.File - file_hero_userrecord_proto_rawDesc = nil - file_hero_userrecord_proto_goTypes = nil - file_hero_userrecord_proto_depIdxs = nil + File_userrecord_proto = out.File + file_userrecord_proto_rawDesc = nil + file_userrecord_proto_goTypes = nil + file_userrecord_proto_depIdxs = nil }