diff --git a/comm/const.go b/comm/const.go index f4a72d29e..7cb32383b 100644 --- a/comm/const.go +++ b/comm/const.go @@ -89,6 +89,8 @@ const ( ModuleActivity core.M_Modules = "acrivity" //活动 ModuleGuidance core.M_Modules = "guidance" //引导 ModuleWtask core.M_Modules = "wtask" //世界任务 + ModulePasson core.M_Modules = "passon" //传功房 + ) // 数据表名定义处 diff --git a/modules/passon/module.go b/modules/passon/module.go index 5657371cf..fedbe0caa 100644 --- a/modules/passon/module.go +++ b/modules/passon/module.go @@ -30,7 +30,7 @@ type Passon struct { } func (this *Passon) GetType() core.M_Modules { - return comm.ModuleMail + return comm.ModulePasson } func (this *Passon) OnInstallComp() { diff --git a/pb/activity_db.pb.go b/pb/activity_db.pb.go index b423a3d1a..ed35a5b0c 100644 --- a/pb/activity_db.pb.go +++ b/pb/activity_db.pb.go @@ -329,7 +329,7 @@ type DBActivityData struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` - Hid int32 `protobuf:"varint,3,opt,name=hid,proto3" json:"hid"` + Hdid int32 `protobuf:"varint,3,opt,name=hdid,proto3" json:"hdid"` Gotarr []int32 `protobuf:"varint,4,rep,packed,name=gotarr,proto3" json:"gotarr"` Lasttime int64 `protobuf:"varint,5,opt,name=lasttime,proto3" json:"lasttime"` Val int32 `protobuf:"varint,6,opt,name=val,proto3" json:"val"` @@ -381,9 +381,9 @@ func (x *DBActivityData) GetUid() string { return "" } -func (x *DBActivityData) GetHid() int32 { +func (x *DBActivityData) GetHdid() int32 { if x != nil { - return x.Hid + return x.Hdid } return 0 } @@ -450,16 +450,16 @@ var file_activity_activity_db_proto_rawDesc = []byte{ 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, - 0x8a, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, + 0x8c, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 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, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, - 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, 0x1a, - 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, - 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, + 0x72, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, + 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, + 0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/viking_db.pb.go b/pb/viking_db.pb.go index 13023b1b0..5cea1d8d4 100644 --- a/pb/viking_db.pb.go +++ b/pb/viking_db.pb.go @@ -220,6 +220,126 @@ func (x *DBVikingRank) GetCostTime() int32 { return 0 } +// 装备副本DBVSeasonRank +type DBVSeasonRank struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + Difficulty int32 `protobuf:"varint,3,opt,name=difficulty,proto3" json:"difficulty"` // 难度 + Bosstype int32 `protobuf:"varint,4,opt,name=bosstype,proto3" json:"bosstype"` // boss类型塔类型 + Nickname string `protobuf:"bytes,5,opt,name=nickname,proto3" json:"nickname"` // 昵称 + Icon string `protobuf:"bytes,6,opt,name=icon,proto3" json:"icon"` // 玩家头像 + Lv int32 `protobuf:"varint,7,opt,name=lv,proto3" json:"lv"` // 玩家等级 + Leadpos int32 `protobuf:"varint,8,opt,name=leadpos,proto3" json:"leadpos"` //队长位置 + Line []*LineUp `protobuf:"bytes,9,rep,name=line,proto3" json:"line"` // 阵容数据 + Huihe int32 `protobuf:"varint,10,opt,name=huihe,proto3" json:"huihe"` // 平均回合数 建议*10 +} + +func (x *DBVSeasonRank) Reset() { + *x = DBVSeasonRank{} + if protoimpl.UnsafeEnabled { + mi := &file_viking_viking_db_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBVSeasonRank) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBVSeasonRank) ProtoMessage() {} + +func (x *DBVSeasonRank) ProtoReflect() protoreflect.Message { + mi := &file_viking_viking_db_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 DBVSeasonRank.ProtoReflect.Descriptor instead. +func (*DBVSeasonRank) Descriptor() ([]byte, []int) { + return file_viking_viking_db_proto_rawDescGZIP(), []int{2} +} + +func (x *DBVSeasonRank) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBVSeasonRank) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBVSeasonRank) GetDifficulty() int32 { + if x != nil { + return x.Difficulty + } + return 0 +} + +func (x *DBVSeasonRank) GetBosstype() int32 { + if x != nil { + return x.Bosstype + } + return 0 +} + +func (x *DBVSeasonRank) GetNickname() string { + if x != nil { + return x.Nickname + } + return "" +} + +func (x *DBVSeasonRank) GetIcon() string { + if x != nil { + return x.Icon + } + return "" +} + +func (x *DBVSeasonRank) GetLv() int32 { + if x != nil { + return x.Lv + } + return 0 +} + +func (x *DBVSeasonRank) GetLeadpos() int32 { + if x != nil { + return x.Leadpos + } + return 0 +} + +func (x *DBVSeasonRank) GetLine() []*LineUp { + if x != nil { + return x.Line + } + return nil +} + +func (x *DBVSeasonRank) GetHuihe() int32 { + if x != nil { + return x.Huihe + } + return 0 +} + var File_viking_viking_db_proto protoreflect.FileDescriptor var file_viking_viking_db_proto_rawDesc = []byte{ @@ -264,7 +384,23 @@ var file_viking_viking_db_proto_rawDesc = []byte{ 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0xfa, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x56, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x61, + 0x6e, 0x6b, 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, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, + 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, + 0x75, 0x6c, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, + 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, + 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, + 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, + 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, + 0x6e, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, + 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, + 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -279,25 +415,27 @@ func file_viking_viking_db_proto_rawDescGZIP() []byte { return file_viking_viking_db_proto_rawDescData } -var file_viking_viking_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_viking_viking_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_viking_viking_db_proto_goTypes = []interface{}{ - (*DBViking)(nil), // 0: DBViking - (*DBVikingRank)(nil), // 1: DBVikingRank - nil, // 2: DBViking.BossEntry - nil, // 3: DBViking.BossTimeEntry - nil, // 4: DBViking.PsEntry - (*LineUp)(nil), // 5: LineUp + (*DBViking)(nil), // 0: DBViking + (*DBVikingRank)(nil), // 1: DBVikingRank + (*DBVSeasonRank)(nil), // 2: DBVSeasonRank + nil, // 3: DBViking.BossEntry + nil, // 4: DBViking.BossTimeEntry + nil, // 5: DBViking.PsEntry + (*LineUp)(nil), // 6: LineUp } var file_viking_viking_db_proto_depIdxs = []int32{ - 2, // 0: DBViking.boss:type_name -> DBViking.BossEntry - 3, // 1: DBViking.bossTime:type_name -> DBViking.BossTimeEntry - 4, // 2: DBViking.ps:type_name -> DBViking.PsEntry - 5, // 3: DBVikingRank.line:type_name -> LineUp - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 3, // 0: DBViking.boss:type_name -> DBViking.BossEntry + 4, // 1: DBViking.bossTime:type_name -> DBViking.BossTimeEntry + 5, // 2: DBViking.ps:type_name -> DBViking.PsEntry + 6, // 3: DBVikingRank.line:type_name -> LineUp + 6, // 4: DBVSeasonRank.line:type_name -> LineUp + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_viking_viking_db_proto_init() } @@ -331,6 +469,18 @@ func file_viking_viking_db_proto_init() { return nil } } + file_viking_viking_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBVSeasonRank); 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{ @@ -338,7 +488,7 @@ func file_viking_viking_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_viking_viking_db_proto_rawDesc, NumEnums: 0, - NumMessages: 5, + NumMessages: 6, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/viking_msg.pb.go b/pb/viking_msg.pb.go index ca340d706..e6b3aa5e3 100644 --- a/pb/viking_msg.pb.go +++ b/pb/viking_msg.pb.go @@ -597,6 +597,219 @@ func (x *VikingRankListResp) GetRanks() []*DBVikingRank { return nil } +// 排行榜 +type VikingSeasonRankReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + BoosType int32 `protobuf:"varint,1,opt,name=boosType,proto3" json:"boosType"` // boss 类型 +} + +func (x *VikingSeasonRankReq) Reset() { + *x = VikingSeasonRankReq{} + if protoimpl.UnsafeEnabled { + mi := &file_viking_viking_msg_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *VikingSeasonRankReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*VikingSeasonRankReq) ProtoMessage() {} + +func (x *VikingSeasonRankReq) ProtoReflect() protoreflect.Message { + mi := &file_viking_viking_msg_proto_msgTypes[10] + 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 VikingSeasonRankReq.ProtoReflect.Descriptor instead. +func (*VikingSeasonRankReq) Descriptor() ([]byte, []int) { + return file_viking_viking_msg_proto_rawDescGZIP(), []int{10} +} + +func (x *VikingSeasonRankReq) GetBoosType() int32 { + if x != nil { + return x.BoosType + } + return 0 +} + +type VikingSeasonRankResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Ranks []*DBVSeasonRank `protobuf:"bytes,1,rep,name=ranks,proto3" json:"ranks"` // 排行数据 有序的 注意boss类型 +} + +func (x *VikingSeasonRankResp) Reset() { + *x = VikingSeasonRankResp{} + if protoimpl.UnsafeEnabled { + mi := &file_viking_viking_msg_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *VikingSeasonRankResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*VikingSeasonRankResp) ProtoMessage() {} + +func (x *VikingSeasonRankResp) ProtoReflect() protoreflect.Message { + mi := &file_viking_viking_msg_proto_msgTypes[11] + 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 VikingSeasonRankResp.ProtoReflect.Descriptor instead. +func (*VikingSeasonRankResp) Descriptor() ([]byte, []int) { + return file_viking_viking_msg_proto_rawDescGZIP(), []int{11} +} + +func (x *VikingSeasonRankResp) GetRanks() []*DBVSeasonRank { + if x != nil { + return x.Ranks + } + return nil +} + +// 连续自动战斗结束 通知服务端 +type VikingAutoOverReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + BossId int32 `protobuf:"varint,1,opt,name=bossId,proto3" json:"bossId"` // boos 类型 + Difficulty int32 `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度 + Line *LineUp `protobuf:"bytes,3,opt,name=line,proto3" json:"line"` // 阵型数据 + LeadPos int32 `protobuf:"varint,4,opt,name=leadPos,proto3" json:"leadPos"` // 队长位置 + Huihe int32 `protobuf:"varint,5,opt,name=huihe,proto3" json:"huihe"` // 平均回合数 +} + +func (x *VikingAutoOverReq) Reset() { + *x = VikingAutoOverReq{} + if protoimpl.UnsafeEnabled { + mi := &file_viking_viking_msg_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *VikingAutoOverReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*VikingAutoOverReq) ProtoMessage() {} + +func (x *VikingAutoOverReq) ProtoReflect() protoreflect.Message { + mi := &file_viking_viking_msg_proto_msgTypes[12] + 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 VikingAutoOverReq.ProtoReflect.Descriptor instead. +func (*VikingAutoOverReq) Descriptor() ([]byte, []int) { + return file_viking_viking_msg_proto_rawDescGZIP(), []int{12} +} + +func (x *VikingAutoOverReq) GetBossId() int32 { + if x != nil { + return x.BossId + } + return 0 +} + +func (x *VikingAutoOverReq) GetDifficulty() int32 { + if x != nil { + return x.Difficulty + } + return 0 +} + +func (x *VikingAutoOverReq) GetLine() *LineUp { + if x != nil { + return x.Line + } + return nil +} + +func (x *VikingAutoOverReq) GetLeadPos() int32 { + if x != nil { + return x.LeadPos + } + return 0 +} + +func (x *VikingAutoOverReq) GetHuihe() int32 { + if x != nil { + return x.Huihe + } + return 0 +} + +type VikingAutoOverResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *VikingAutoOverResp) Reset() { + *x = VikingAutoOverResp{} + if protoimpl.UnsafeEnabled { + mi := &file_viking_viking_msg_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *VikingAutoOverResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*VikingAutoOverResp) ProtoMessage() {} + +func (x *VikingAutoOverResp) ProtoReflect() protoreflect.Message { + mi := &file_viking_viking_msg_proto_msgTypes[13] + 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 VikingAutoOverResp.ProtoReflect.Descriptor instead. +func (*VikingAutoOverResp) Descriptor() ([]byte, []int) { + return file_viking_viking_msg_proto_rawDescGZIP(), []int{13} +} + var File_viking_viking_msg_proto protoreflect.FileDescriptor var file_viking_viking_msg_proto_rawDesc = []byte{ @@ -666,8 +879,26 @@ var file_viking_viking_msg_proto_rawDesc = []byte{ 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, - 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x6e, 0x6b, 0x73, 0x22, 0x31, 0x0a, 0x13, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x65, + 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, + 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, + 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x22, 0x3c, 0x0a, 0x14, 0x56, 0x69, 0x6b, 0x69, 0x6e, + 0x67, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x24, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, + 0x2e, 0x44, 0x42, 0x56, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, + 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x22, 0x98, 0x01, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, + 0x41, 0x75, 0x74, 0x6f, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, + 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x73, + 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, + 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, + 0x6c, 0x74, 0x79, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x50, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x50, 0x6f, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x75, + 0x69, 0x68, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, + 0x22, 0x14, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x41, 0x75, 0x74, 0x6f, 0x4f, 0x76, + 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -682,7 +913,7 @@ func file_viking_viking_msg_proto_rawDescGZIP() []byte { return file_viking_viking_msg_proto_rawDescData } -var file_viking_viking_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11) +var file_viking_viking_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_viking_viking_msg_proto_goTypes = []interface{}{ (*VikingGetListReq)(nil), // 0: VikingGetListReq (*VikingGetListResp)(nil), // 1: VikingGetListResp @@ -694,29 +925,37 @@ var file_viking_viking_msg_proto_goTypes = []interface{}{ (*VikingBuyResp)(nil), // 7: VikingBuyResp (*VikingRankListReq)(nil), // 8: VikingRankListReq (*VikingRankListResp)(nil), // 9: VikingRankListResp - nil, // 10: VikingChallengeOverResp.HeroexpEntry - (*DBViking)(nil), // 11: DBViking - (*BattleFormation)(nil), // 12: BattleFormation - (*BattleInfo)(nil), // 13: BattleInfo - (*BattleReport)(nil), // 14: BattleReport - (*UserAtno)(nil), // 15: UserAtno - (*DBVikingRank)(nil), // 16: DBVikingRank + (*VikingSeasonRankReq)(nil), // 10: VikingSeasonRankReq + (*VikingSeasonRankResp)(nil), // 11: VikingSeasonRankResp + (*VikingAutoOverReq)(nil), // 12: VikingAutoOverReq + (*VikingAutoOverResp)(nil), // 13: VikingAutoOverResp + nil, // 14: VikingChallengeOverResp.HeroexpEntry + (*DBViking)(nil), // 15: DBViking + (*BattleFormation)(nil), // 16: BattleFormation + (*BattleInfo)(nil), // 17: BattleInfo + (*BattleReport)(nil), // 18: BattleReport + (*UserAtno)(nil), // 19: UserAtno + (*DBVikingRank)(nil), // 20: DBVikingRank + (*DBVSeasonRank)(nil), // 21: DBVSeasonRank + (*LineUp)(nil), // 22: LineUp } var file_viking_viking_msg_proto_depIdxs = []int32{ - 11, // 0: VikingGetListResp.data:type_name -> DBViking - 12, // 1: VikingChallengeReq.battle:type_name -> BattleFormation - 13, // 2: VikingChallengeResp.info:type_name -> BattleInfo - 14, // 3: VikingChallengeOverReq.report:type_name -> BattleReport - 11, // 4: VikingChallengeOverResp.data:type_name -> DBViking - 15, // 5: VikingChallengeOverResp.asset:type_name -> UserAtno - 10, // 6: VikingChallengeOverResp.heroexp:type_name -> VikingChallengeOverResp.HeroexpEntry - 11, // 7: VikingBuyResp.data:type_name -> DBViking - 16, // 8: VikingRankListResp.ranks:type_name -> DBVikingRank - 9, // [9:9] is the sub-list for method output_type - 9, // [9:9] is the sub-list for method input_type - 9, // [9:9] is the sub-list for extension type_name - 9, // [9:9] is the sub-list for extension extendee - 0, // [0:9] is the sub-list for field type_name + 15, // 0: VikingGetListResp.data:type_name -> DBViking + 16, // 1: VikingChallengeReq.battle:type_name -> BattleFormation + 17, // 2: VikingChallengeResp.info:type_name -> BattleInfo + 18, // 3: VikingChallengeOverReq.report:type_name -> BattleReport + 15, // 4: VikingChallengeOverResp.data:type_name -> DBViking + 19, // 5: VikingChallengeOverResp.asset:type_name -> UserAtno + 14, // 6: VikingChallengeOverResp.heroexp:type_name -> VikingChallengeOverResp.HeroexpEntry + 15, // 7: VikingBuyResp.data:type_name -> DBViking + 20, // 8: VikingRankListResp.ranks:type_name -> DBVikingRank + 21, // 9: VikingSeasonRankResp.ranks:type_name -> DBVSeasonRank + 22, // 10: VikingAutoOverReq.line:type_name -> LineUp + 11, // [11:11] is the sub-list for method output_type + 11, // [11:11] is the sub-list for method input_type + 11, // [11:11] is the sub-list for extension type_name + 11, // [11:11] is the sub-list for extension extendee + 0, // [0:11] is the sub-list for field type_name } func init() { file_viking_viking_msg_proto_init() } @@ -848,6 +1087,54 @@ func file_viking_viking_msg_proto_init() { return nil } } + file_viking_viking_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VikingSeasonRankReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_viking_viking_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VikingSeasonRankResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_viking_viking_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VikingAutoOverReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_viking_viking_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VikingAutoOverResp); 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{ @@ -855,7 +1142,7 @@ func file_viking_viking_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_viking_viking_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 11, + NumMessages: 15, NumExtensions: 0, NumServices: 0, }, diff --git a/services/worker/main.go b/services/worker/main.go index 831d7440f..0f5412ddb 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -34,6 +34,7 @@ import ( "go_dreamfactory/modules/oldtimes" "go_dreamfactory/modules/pagoda" "go_dreamfactory/modules/parkour" + "go_dreamfactory/modules/passon" "go_dreamfactory/modules/pay" "go_dreamfactory/modules/practice" "go_dreamfactory/modules/privilege" @@ -128,6 +129,7 @@ func main() { activity.NewModule(), guidance.NewModule(), wtask.NewModule(), + passon.NewModule(), ) }