From 1e2b5b90b140ff193d72664fe76f84d6f221dd80 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 2 Feb 2024 17:46:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=86=E6=95=B0=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/plunder/api_challengeover.go | 2 +- modules/plunder/api_rankscore.go | 42 +++ pb/battle_struct.pb.go | 395 ++++++++++++++++++++------- pb/comm.pb.go | 130 ++------- pb/plunder_msg.pb.go | 216 +++++++++++---- 5 files changed, 528 insertions(+), 257 deletions(-) create mode 100644 modules/plunder/api_rankscore.go diff --git a/modules/plunder/api_challengeover.go b/modules/plunder/api_challengeover.go index 2a19ab957..0a0e73378 100644 --- a/modules/plunder/api_challengeover.go +++ b/modules/plunder/api_challengeover.go @@ -154,7 +154,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha _id := primitive.NewObjectID().Hex() // 创建一条船的信息 if req.Itype == 0 { // 普通运输走普通到达时间 - addTime = conf.Extime + addTime = conf.Time } else { addTime = conf.Extime } diff --git a/modules/plunder/api_rankscore.go b/modules/plunder/api_rankscore.go new file mode 100644 index 000000000..b20d7294a --- /dev/null +++ b/modules/plunder/api_rankscore.go @@ -0,0 +1,42 @@ +package plunder + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +func (this *apiComp) RankSocreCheck(session comm.IUserSession, req *pb.PlunderRankSocreReq) (errdata *pb.ErrorData) { + return +} + +// 获取基本信息 +func (this *apiComp) RankSocre(session comm.IUserSession, req *pb.PlunderRankSocreReq) (errdata *pb.ErrorData) { + var ( + err error + list *pb.DBPlunder + land *pb.DBPlunderLand + ) + if errdata = this.RankSocreCheck(session, req); errdata != nil { + return + } + + if list, err = this.module.modelPlunder.getPlunderData(session); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + if land, err = this.module.modelLand.getPlunderLandData(list.Landid); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + session.SendMsg(string(this.module.GetType()), "refresh", &pb.PlunderRankSocreResp{ + Score: land.Score, + }) + + return +} diff --git a/pb/battle_struct.pb.go b/pb/battle_struct.pb.go index 5c8eb16c7..3bf32cbb5 100644 --- a/pb/battle_struct.pb.go +++ b/pb/battle_struct.pb.go @@ -2149,13 +2149,9 @@ type ComUpdateScore struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` //评分组ID - Grade int32 `protobuf:"varint,2,opt,name=grade,proto3" json:"grade"` //当前积分对应的档次 - Socre int32 `protobuf:"varint,3,opt,name=socre,proto3" json:"socre"` //积分 - ExtraSocre int32 `protobuf:"varint,4,opt,name=extraSocre,proto3" json:"extraSocre"` //额外积分 - Rate int32 `protobuf:"varint,5,opt,name=rate,proto3" json:"rate"` //当前积分倍率 - Stage int32 `protobuf:"varint,6,opt,name=stage,proto3" json:"stage"` //羽毛层数 - ShowStage bool `protobuf:"varint,7,opt,name=showStage,proto3" json:"showStage"` //是否显示羽毛 + GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` //评分组ID + Grade int32 `protobuf:"varint,2,opt,name=grade,proto3" json:"grade"` //当前积分对应的档次 + Socre int32 `protobuf:"varint,3,opt,name=socre,proto3" json:"socre"` //积分 } func (x *ComUpdateScore) Reset() { @@ -2211,34 +2207,124 @@ func (x *ComUpdateScore) GetSocre() int32 { return 0 } -func (x *ComUpdateScore) GetExtraSocre() int32 { +type ComExtraScore struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ExtraSocre int32 `protobuf:"varint,1,opt,name=extraSocre,proto3" json:"extraSocre"` //额外积分 + Rate int32 `protobuf:"varint,2,opt,name=rate,proto3" json:"rate"` //当前积分倍率 +} + +func (x *ComExtraScore) Reset() { + *x = ComExtraScore{} + if protoimpl.UnsafeEnabled { + mi := &file_battle_battle_struct_proto_msgTypes[31] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ComExtraScore) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ComExtraScore) ProtoMessage() {} + +func (x *ComExtraScore) ProtoReflect() protoreflect.Message { + mi := &file_battle_battle_struct_proto_msgTypes[31] + 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 ComExtraScore.ProtoReflect.Descriptor instead. +func (*ComExtraScore) Descriptor() ([]byte, []int) { + return file_battle_battle_struct_proto_rawDescGZIP(), []int{31} +} + +func (x *ComExtraScore) GetExtraSocre() int32 { if x != nil { return x.ExtraSocre } return 0 } -func (x *ComUpdateScore) GetRate() int32 { +func (x *ComExtraScore) GetRate() int32 { if x != nil { return x.Rate } return 0 } -func (x *ComUpdateScore) GetStage() int32 { +type ComExtraStage struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Stage int32 `protobuf:"varint,1,opt,name=stage,proto3" json:"stage"` //羽毛层数 + ShowStage bool `protobuf:"varint,2,opt,name=showStage,proto3" json:"showStage"` //是否显示 + ExtraRate int32 `protobuf:"varint,3,opt,name=extraRate,proto3" json:"extraRate"` //额外积分倍率(>1 开始生效) +} + +func (x *ComExtraStage) Reset() { + *x = ComExtraStage{} + if protoimpl.UnsafeEnabled { + mi := &file_battle_battle_struct_proto_msgTypes[32] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ComExtraStage) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ComExtraStage) ProtoMessage() {} + +func (x *ComExtraStage) ProtoReflect() protoreflect.Message { + mi := &file_battle_battle_struct_proto_msgTypes[32] + 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 ComExtraStage.ProtoReflect.Descriptor instead. +func (*ComExtraStage) Descriptor() ([]byte, []int) { + return file_battle_battle_struct_proto_rawDescGZIP(), []int{32} +} + +func (x *ComExtraStage) GetStage() int32 { if x != nil { return x.Stage } return 0 } -func (x *ComUpdateScore) GetShowStage() bool { +func (x *ComExtraStage) GetShowStage() bool { if x != nil { return x.ShowStage } return false } +func (x *ComExtraStage) GetExtraRate() int32 { + if x != nil { + return x.ExtraRate + } + return 0 +} + type ComInBattleMaxScore struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2251,7 +2337,7 @@ type ComInBattleMaxScore struct { func (x *ComInBattleMaxScore) Reset() { *x = ComInBattleMaxScore{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[31] + mi := &file_battle_battle_struct_proto_msgTypes[33] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2264,7 +2350,7 @@ func (x *ComInBattleMaxScore) String() string { func (*ComInBattleMaxScore) ProtoMessage() {} func (x *ComInBattleMaxScore) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[31] + mi := &file_battle_battle_struct_proto_msgTypes[33] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2277,7 +2363,7 @@ func (x *ComInBattleMaxScore) ProtoReflect() protoreflect.Message { // Deprecated: Use ComInBattleMaxScore.ProtoReflect.Descriptor instead. func (*ComInBattleMaxScore) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{31} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{33} } func (x *ComInBattleMaxScore) GetGroupId() int32 { @@ -2294,6 +2380,69 @@ func (x *ComInBattleMaxScore) GetGrade() int32 { return 0 } +type ComBuffSpecialEffect struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Rid int32 `protobuf:"varint,1,opt,name=rid,proto3" json:"rid"` //角色id + BuffId int32 `protobuf:"varint,2,opt,name=buffId,proto3" json:"buffId"` //buffId + Add bool `protobuf:"varint,3,opt,name=add,proto3" json:"add"` //添加-移除 +} + +func (x *ComBuffSpecialEffect) Reset() { + *x = ComBuffSpecialEffect{} + if protoimpl.UnsafeEnabled { + mi := &file_battle_battle_struct_proto_msgTypes[34] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ComBuffSpecialEffect) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ComBuffSpecialEffect) ProtoMessage() {} + +func (x *ComBuffSpecialEffect) ProtoReflect() protoreflect.Message { + mi := &file_battle_battle_struct_proto_msgTypes[34] + 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 ComBuffSpecialEffect.ProtoReflect.Descriptor instead. +func (*ComBuffSpecialEffect) Descriptor() ([]byte, []int) { + return file_battle_battle_struct_proto_rawDescGZIP(), []int{34} +} + +func (x *ComBuffSpecialEffect) GetRid() int32 { + if x != nil { + return x.Rid + } + return 0 +} + +func (x *ComBuffSpecialEffect) GetBuffId() int32 { + if x != nil { + return x.BuffId + } + return 0 +} + +func (x *ComBuffSpecialEffect) GetAdd() bool { + if x != nil { + return x.Add + } + return false +} + var File_battle_battle_struct_proto protoreflect.FileDescriptor var file_battle_battle_struct_proto_rawDesc = []byte{ @@ -2490,50 +2639,59 @@ var file_battle_battle_struct_proto_rawDesc = []byte{ 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0x37, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0xbe, - 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x6f, 0x72, - 0x65, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x67, - 0x72, 0x61, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, - 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x72, 0x61, - 0x53, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x78, 0x74, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x56, + 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x6f, 0x72, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, + 0x61, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, + 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x22, 0x43, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x45, 0x78, 0x74, + 0x72, 0x61, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x72, 0x61, + 0x53, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x78, 0x74, 0x72, 0x61, 0x53, 0x6f, 0x63, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x74, 0x65, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, - 0x74, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, - 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x68, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x67, 0x65, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, 0x68, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x67, 0x65, 0x22, - 0x45, 0x0a, 0x13, 0x43, 0x6f, 0x6d, 0x49, 0x6e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4d, 0x61, - 0x78, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, - 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x2a, 0x93, 0x03, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, - 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, - 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, - 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, - 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, - 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, - 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, - 0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75, - 0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x5f, 0x4f, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x5f, 0x4f, 0x70, 0x65, - 0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x6f, - 0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d, - 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f, 0x6e, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x09, - 0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x63, - 0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x65, 0x61, 0x74, 0x42, - 0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x65, 0x61, 0x73, 0x65, - 0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x74, 0x48, 0x6f, 0x6c, 0x64, 0x10, - 0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x10, - 0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x69, 0x6e, 0x63, 0x69, 0x62, 0x69, 0x6c, 0x69, - 0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x65, 0x61, 0x6c, 0x47, 0x61, 0x69, - 0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x68, 0x69, 0x66, 0x74, 0x44, 0x65, 0x62, 0x75, - 0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x10, - 0x18, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x72, 0x6f, 0x69, 0x6c, 0x10, 0x19, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, 0x22, 0x61, 0x0a, 0x0d, 0x43, + 0x6f, 0x6d, 0x45, 0x78, 0x74, 0x72, 0x61, 0x53, 0x74, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, + 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, + 0x67, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x68, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x67, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, 0x68, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x67, 0x65, + 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x72, 0x61, 0x52, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x65, 0x78, 0x74, 0x72, 0x61, 0x52, 0x61, 0x74, 0x65, 0x22, 0x45, + 0x0a, 0x13, 0x43, 0x6f, 0x6d, 0x49, 0x6e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4d, 0x61, 0x78, + 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, + 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x67, 0x72, 0x61, 0x64, 0x65, 0x22, 0x52, 0x0a, 0x14, 0x43, 0x6f, 0x6d, 0x42, 0x75, 0x66, 0x66, + 0x53, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x10, 0x0a, + 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x64, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x61, 0x64, 0x64, 0x2a, 0x93, 0x03, 0x0a, 0x0e, 0x45, 0x66, + 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, + 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, + 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, + 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, + 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, + 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, + 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, + 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x5f, 0x4f, + 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x5f, + 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x74, 0x61, + 0x6e, 0x64, 0x6f, 0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65, 0x61, + 0x64, 0x10, 0x0d, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f, 0x6e, 0x65, 0x64, 0x10, + 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x0c, 0x0a, 0x08, + 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x65, + 0x61, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x65, + 0x61, 0x73, 0x65, 0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x74, 0x48, 0x6f, + 0x6c, 0x64, 0x10, 0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, + 0x6e, 0x64, 0x10, 0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x69, 0x6e, 0x63, 0x69, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x65, 0x61, 0x6c, + 0x47, 0x61, 0x69, 0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x68, 0x69, 0x66, 0x74, 0x44, + 0x65, 0x62, 0x75, 0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x62, 0x69, 0x72, + 0x74, 0x68, 0x10, 0x18, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x72, 0x6f, 0x69, 0x6c, 0x10, 0x19, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2549,54 +2707,57 @@ func file_battle_battle_struct_proto_rawDescGZIP() []byte { } var file_battle_battle_struct_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 32) +var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 35) var file_battle_battle_struct_proto_goTypes = []interface{}{ - (EffectTipsType)(0), // 0: EffectTipsType - (*DBPlayerBattleFormt)(nil), // 1: DBPlayerBattleFormt - (*ComModifyOperate)(nil), // 2: ComModifyOperate - (*ComStartFight)(nil), // 3: ComStartFight - (*ComInitFight)(nil), // 4: ComInitFight - (*ComDeleteRole)(nil), // 5: ComDeleteRole - (*ComEndFight)(nil), // 6: ComEndFight - (*ComSkillInfo)(nil), // 7: ComSkillInfo - (*ComStartAction)(nil), // 8: ComStartAction - (*ComSkillCDAction)(nil), // 9: ComSkillCDAction - (*ComStopAction)(nil), // 10: ComStopAction - (*ComWaitInputSkill)(nil), // 11: ComWaitInputSkill - (*ComSkillAtk)(nil), // 12: ComSkillAtk - (*ComSkillAfterAtk)(nil), // 13: ComSkillAfterAtk - (*ComMondifyBuff)(nil), // 14: ComMondifyBuff - (*ComRebirth)(nil), // 15: ComRebirth - (*ComModifyHealth)(nil), // 16: ComModifyHealth - (*ComTeachTask)(nil), // 17: ComTeachTask - (*ComStory)(nil), // 18: ComStory - (*ComGuide)(nil), // 19: ComGuide - (*ComCreateRoles)(nil), // 20: ComCreateRoles - (*ComPlayEffect)(nil), // 21: ComPlayEffect - (*ComEmitCountdown)(nil), // 22: ComEmitCountdown - (*ComEffectTips)(nil), // 23: ComEffectTips - (*ComChainEffect)(nil), // 24: ComChainEffect - (*ComShieldInfo)(nil), // 25: ComShieldInfo - (*ComBuffEffect)(nil), // 26: ComBuffEffect - (*ComSwitchScene)(nil), // 27: ComSwitchScene - (*ComReplaceSkill)(nil), // 28: ComReplaceSkill - (*ComExtraEffect)(nil), // 29: ComExtraEffect - (*ComTriggerPassive)(nil), // 30: ComTriggerPassive - (*ComUpdateScore)(nil), // 31: ComUpdateScore - (*ComInBattleMaxScore)(nil), // 32: ComInBattleMaxScore - (*DBHero)(nil), // 33: DBHero - (*BattleRole)(nil), // 34: BattleRole - (*BattleCmd)(nil), // 35: BattleCmd + (EffectTipsType)(0), // 0: EffectTipsType + (*DBPlayerBattleFormt)(nil), // 1: DBPlayerBattleFormt + (*ComModifyOperate)(nil), // 2: ComModifyOperate + (*ComStartFight)(nil), // 3: ComStartFight + (*ComInitFight)(nil), // 4: ComInitFight + (*ComDeleteRole)(nil), // 5: ComDeleteRole + (*ComEndFight)(nil), // 6: ComEndFight + (*ComSkillInfo)(nil), // 7: ComSkillInfo + (*ComStartAction)(nil), // 8: ComStartAction + (*ComSkillCDAction)(nil), // 9: ComSkillCDAction + (*ComStopAction)(nil), // 10: ComStopAction + (*ComWaitInputSkill)(nil), // 11: ComWaitInputSkill + (*ComSkillAtk)(nil), // 12: ComSkillAtk + (*ComSkillAfterAtk)(nil), // 13: ComSkillAfterAtk + (*ComMondifyBuff)(nil), // 14: ComMondifyBuff + (*ComRebirth)(nil), // 15: ComRebirth + (*ComModifyHealth)(nil), // 16: ComModifyHealth + (*ComTeachTask)(nil), // 17: ComTeachTask + (*ComStory)(nil), // 18: ComStory + (*ComGuide)(nil), // 19: ComGuide + (*ComCreateRoles)(nil), // 20: ComCreateRoles + (*ComPlayEffect)(nil), // 21: ComPlayEffect + (*ComEmitCountdown)(nil), // 22: ComEmitCountdown + (*ComEffectTips)(nil), // 23: ComEffectTips + (*ComChainEffect)(nil), // 24: ComChainEffect + (*ComShieldInfo)(nil), // 25: ComShieldInfo + (*ComBuffEffect)(nil), // 26: ComBuffEffect + (*ComSwitchScene)(nil), // 27: ComSwitchScene + (*ComReplaceSkill)(nil), // 28: ComReplaceSkill + (*ComExtraEffect)(nil), // 29: ComExtraEffect + (*ComTriggerPassive)(nil), // 30: ComTriggerPassive + (*ComUpdateScore)(nil), // 31: ComUpdateScore + (*ComExtraScore)(nil), // 32: ComExtraScore + (*ComExtraStage)(nil), // 33: ComExtraStage + (*ComInBattleMaxScore)(nil), // 34: ComInBattleMaxScore + (*ComBuffSpecialEffect)(nil), // 35: ComBuffSpecialEffect + (*DBHero)(nil), // 36: DBHero + (*BattleRole)(nil), // 37: BattleRole + (*BattleCmd)(nil), // 38: BattleCmd } var file_battle_battle_struct_proto_depIdxs = []int32{ - 33, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero - 34, // 1: ComInitFight.roles:type_name -> BattleRole + 36, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero + 37, // 1: ComInitFight.roles:type_name -> BattleRole 7, // 2: ComStartAction.skillInfo:type_name -> ComSkillInfo 7, // 3: ComSkillCDAction.skillInfo:type_name -> ComSkillInfo 13, // 4: ComSkillAtk.comList:type_name -> ComSkillAfterAtk - 35, // 5: ComSkillAfterAtk.comList:type_name -> BattleCmd + 38, // 5: ComSkillAfterAtk.comList:type_name -> BattleCmd 0, // 6: ComModifyHealth.tips:type_name -> EffectTipsType - 34, // 7: ComCreateRoles.roles:type_name -> BattleRole + 37, // 7: ComCreateRoles.roles:type_name -> BattleRole 0, // 8: ComEffectTips.type:type_name -> EffectTipsType 7, // 9: ComReplaceSkill.skillInfo:type_name -> ComSkillInfo 10, // [10:10] is the sub-list for method output_type @@ -2988,6 +3149,30 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ComExtraScore); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_battle_battle_struct_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ComExtraStage); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_battle_battle_struct_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ComInBattleMaxScore); i { case 0: return &v.state @@ -2999,6 +3184,18 @@ func file_battle_battle_struct_proto_init() { return nil } } + file_battle_battle_struct_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ComBuffSpecialEffect); 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{ @@ -3006,7 +3203,7 @@ func file_battle_battle_struct_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_battle_battle_struct_proto_rawDesc, NumEnums: 1, - NumMessages: 32, + NumMessages: 35, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/comm.pb.go b/pb/comm.pb.go index 4263d7cd0..8d5edd990 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -2507,78 +2507,6 @@ func (x *SweepResult) GetHeroexp() map[string]int32 { return nil } -//服务组数据 -type DBServiceGroup struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` - Group int32 `protobuf:"varint,2,opt,name=group,proto3" json:"group"` //分组 - Create int64 `protobuf:"varint,3,opt,name=create,proto3" json:"create"` //创建时间 - Playernum int32 `protobuf:"varint,4,opt,name=playernum,proto3" json:"playernum"` //玩家数量 -} - -func (x *DBServiceGroup) Reset() { - *x = DBServiceGroup{} - if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[36] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DBServiceGroup) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DBServiceGroup) ProtoMessage() {} - -func (x *DBServiceGroup) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[36] - 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 DBServiceGroup.ProtoReflect.Descriptor instead. -func (*DBServiceGroup) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{36} -} - -func (x *DBServiceGroup) GetId() string { - if x != nil { - return x.Id - } - return "" -} - -func (x *DBServiceGroup) GetGroup() int32 { - if x != nil { - return x.Group - } - return 0 -} - -func (x *DBServiceGroup) GetCreate() int64 { - if x != nil { - return x.Create - } - return 0 -} - -func (x *DBServiceGroup) GetPlayernum() int32 { - if x != nil { - return x.Playernum - } - return 0 -} - var File_comm_proto protoreflect.FileDescriptor var file_comm_proto_rawDesc = []byte{ @@ -2841,20 +2769,13 @@ var file_comm_proto_rawDesc = []byte{ 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x6c, - 0x0a, 0x0e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x1c, - 0x0a, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x2a, 0x43, 0x0a, 0x12, - 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, - 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, - 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, - 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, - 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x43, + 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, + 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, + 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, + 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -2870,7 +2791,7 @@ func file_comm_proto_rawDescGZIP() []byte { } var file_comm_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 38) +var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 37) var file_comm_proto_goTypes = []interface{}{ (HeroAttributesType)(0), // 0: HeroAttributesType (*ErrorData)(nil), // 1: ErrorData @@ -2909,26 +2830,25 @@ var file_comm_proto_goTypes = []interface{}{ (*ServiceDBInfo)(nil), // 34: ServiceDBInfo (*DBVector3)(nil), // 35: DBVector3 (*SweepResult)(nil), // 36: SweepResult - (*DBServiceGroup)(nil), // 37: DBServiceGroup - nil, // 38: SweepResult.HeroexpEntry - (ErrorCode)(0), // 39: ErrorCode - (*anypb.Any)(nil), // 40: google.protobuf.Any + nil, // 37: SweepResult.HeroexpEntry + (ErrorCode)(0), // 38: ErrorCode + (*anypb.Any)(nil), // 39: google.protobuf.Any } var file_comm_proto_depIdxs = []int32{ - 39, // 0: ErrorData.code:type_name -> ErrorCode + 38, // 0: ErrorData.code:type_name -> ErrorCode 18, // 1: ErrorData.atn:type_name -> UserAssets 3, // 2: MessagePackage.messages:type_name -> UserMessage - 40, // 3: UserMessage.data:type_name -> google.protobuf.Any - 40, // 4: AgentMessage.Message:type_name -> google.protobuf.Any + 39, // 3: UserMessage.data:type_name -> google.protobuf.Any + 39, // 4: AgentMessage.Message:type_name -> google.protobuf.Any 1, // 5: RPCMessageReply.ErrorData:type_name -> ErrorData 3, // 6: RPCMessageReply.Reply:type_name -> UserMessage 3, // 7: AgentSendMessageReq.Reply:type_name -> UserMessage - 40, // 8: BatchMessageReq.Data:type_name -> google.protobuf.Any - 40, // 9: BatchUsersMessageReq.Data:type_name -> google.protobuf.Any - 40, // 10: BroadCastMessageReq.Data:type_name -> google.protobuf.Any + 39, // 8: BatchMessageReq.Data:type_name -> google.protobuf.Any + 39, // 9: BatchUsersMessageReq.Data:type_name -> google.protobuf.Any + 39, // 10: BroadCastMessageReq.Data:type_name -> google.protobuf.Any 18, // 11: SweepResult.consume:type_name -> UserAssets 19, // 12: SweepResult.award:type_name -> UserAtno - 38, // 13: SweepResult.heroexp:type_name -> SweepResult.HeroexpEntry + 37, // 13: SweepResult.heroexp:type_name -> SweepResult.HeroexpEntry 14, // [14:14] is the sub-list for method output_type 14, // [14:14] is the sub-list for method input_type 14, // [14:14] is the sub-list for extension type_name @@ -3375,18 +3295,6 @@ func file_comm_proto_init() { return nil } } - file_comm_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBServiceGroup); 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{ @@ -3394,7 +3302,7 @@ func file_comm_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_comm_proto_rawDesc, NumEnums: 1, - NumMessages: 38, + NumMessages: 37, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/plunder_msg.pb.go b/pb/plunder_msg.pb.go index 2771e1060..69052166c 100644 --- a/pb/plunder_msg.pb.go +++ b/pb/plunder_msg.pb.go @@ -1212,6 +1212,92 @@ func (x *PlunderRecordResp) GetInfo() *DBPlunderRecord { return nil } +// 获取玩家积分信息 +type PlunderRankSocreReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *PlunderRankSocreReq) Reset() { + *x = PlunderRankSocreReq{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderRankSocreReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderRankSocreReq) ProtoMessage() {} + +func (x *PlunderRankSocreReq) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_msg_proto_msgTypes[23] + 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 PlunderRankSocreReq.ProtoReflect.Descriptor instead. +func (*PlunderRankSocreReq) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{23} +} + +type PlunderRankSocreResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Score map[string]int32 `protobuf:"bytes,1,rep,name=score,proto3" json:"score" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 排行榜积分用 +} + +func (x *PlunderRankSocreResp) Reset() { + *x = PlunderRankSocreResp{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderRankSocreResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderRankSocreResp) ProtoMessage() {} + +func (x *PlunderRankSocreResp) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_msg_proto_msgTypes[24] + 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 PlunderRankSocreResp.ProtoReflect.Descriptor instead. +func (*PlunderRankSocreResp) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{24} +} + +func (x *PlunderRankSocreResp) GetScore() map[string]int32 { + if x != nil { + return x.Score + } + return nil +} + var File_plunder_plunder_msg_proto protoreflect.FileDescriptor var file_plunder_plunder_msg_proto_rawDesc = []byte{ @@ -1345,8 +1431,18 @@ var file_plunder_plunder_msg_proto_rawDesc = []byte{ 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x04, 0x69, - 0x6e, 0x66, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x6e, 0x66, 0x6f, 0x22, 0x15, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x61, + 0x6e, 0x6b, 0x53, 0x6f, 0x63, 0x72, 0x65, 0x52, 0x65, 0x71, 0x22, 0x88, 0x01, 0x0a, 0x14, 0x50, + 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x6b, 0x53, 0x6f, 0x63, 0x72, 0x65, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x36, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x6b, + 0x53, 0x6f, 0x63, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, + 0x63, 0x6f, 0x72, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1361,7 +1457,7 @@ func file_plunder_plunder_msg_proto_rawDescGZIP() []byte { return file_plunder_plunder_msg_proto_rawDescData } -var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 28) +var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 31) var file_plunder_plunder_msg_proto_goTypes = []interface{}{ (*PlunderGetListReq)(nil), // 0: PlunderGetListReq (*PlunderGetListResp)(nil), // 1: PlunderGetListResp @@ -1386,50 +1482,54 @@ var file_plunder_plunder_msg_proto_goTypes = []interface{}{ (*PlunderDevelopResp)(nil), // 20: PlunderDevelopResp (*PlunderRecordReq)(nil), // 21: PlunderRecordReq (*PlunderRecordResp)(nil), // 22: PlunderRecordResp - nil, // 23: PlunderChallengeOverResp.ShipEntry - nil, // 24: PlunderChallengeOverResp.HeroexpEntry - nil, // 25: PlunderClientTagResp.ShipEntry - nil, // 26: PlunderChangePush.ShipEntry - nil, // 27: PlunderDevelopResp.DevelopEntry - (*DBPlunder)(nil), // 28: DBPlunder - (*DBPlunderLand)(nil), // 29: DBPlunderLand - (*BattleFormation)(nil), // 30: BattleFormation - (*BattleInfo)(nil), // 31: BattleInfo - (*BattleReport)(nil), // 32: BattleReport - (*TransportLine)(nil), // 33: TransportLine - (*UserAtno)(nil), // 34: UserAtno - (*DBPlunderRecord)(nil), // 35: DBPlunderRecord - (*ShipData)(nil), // 36: ShipData + (*PlunderRankSocreReq)(nil), // 23: PlunderRankSocreReq + (*PlunderRankSocreResp)(nil), // 24: PlunderRankSocreResp + nil, // 25: PlunderChallengeOverResp.ShipEntry + nil, // 26: PlunderChallengeOverResp.HeroexpEntry + nil, // 27: PlunderClientTagResp.ShipEntry + nil, // 28: PlunderChangePush.ShipEntry + nil, // 29: PlunderDevelopResp.DevelopEntry + nil, // 30: PlunderRankSocreResp.ScoreEntry + (*DBPlunder)(nil), // 31: DBPlunder + (*DBPlunderLand)(nil), // 32: DBPlunderLand + (*BattleFormation)(nil), // 33: BattleFormation + (*BattleInfo)(nil), // 34: BattleInfo + (*BattleReport)(nil), // 35: BattleReport + (*TransportLine)(nil), // 36: TransportLine + (*UserAtno)(nil), // 37: UserAtno + (*DBPlunderRecord)(nil), // 38: DBPlunderRecord + (*ShipData)(nil), // 39: ShipData } var file_plunder_plunder_msg_proto_depIdxs = []int32{ - 28, // 0: PlunderGetListResp.list:type_name -> DBPlunder - 29, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand - 30, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation - 31, // 3: PlunderChallengeResp.info:type_name -> BattleInfo - 32, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport - 33, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine - 23, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry - 34, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno - 24, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry - 30, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation - 31, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo - 32, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport - 34, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno - 33, // 13: PlunderReachResp.line:type_name -> TransportLine - 34, // 14: PlunderReachResp.atno:type_name -> UserAtno - 25, // 15: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry - 26, // 16: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry - 33, // 17: PlunderUnlockResp.line:type_name -> TransportLine - 27, // 18: PlunderDevelopResp.develop:type_name -> PlunderDevelopResp.DevelopEntry - 35, // 19: PlunderRecordResp.info:type_name -> DBPlunderRecord - 36, // 20: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData - 36, // 21: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData - 36, // 22: PlunderChangePush.ShipEntry.value:type_name -> ShipData - 23, // [23:23] is the sub-list for method output_type - 23, // [23:23] is the sub-list for method input_type - 23, // [23:23] is the sub-list for extension type_name - 23, // [23:23] is the sub-list for extension extendee - 0, // [0:23] is the sub-list for field type_name + 31, // 0: PlunderGetListResp.list:type_name -> DBPlunder + 32, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand + 33, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation + 34, // 3: PlunderChallengeResp.info:type_name -> BattleInfo + 35, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport + 36, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine + 25, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry + 37, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno + 26, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry + 33, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation + 34, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo + 35, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport + 37, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno + 36, // 13: PlunderReachResp.line:type_name -> TransportLine + 37, // 14: PlunderReachResp.atno:type_name -> UserAtno + 27, // 15: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry + 28, // 16: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry + 36, // 17: PlunderUnlockResp.line:type_name -> TransportLine + 29, // 18: PlunderDevelopResp.develop:type_name -> PlunderDevelopResp.DevelopEntry + 38, // 19: PlunderRecordResp.info:type_name -> DBPlunderRecord + 30, // 20: PlunderRankSocreResp.score:type_name -> PlunderRankSocreResp.ScoreEntry + 39, // 21: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData + 39, // 22: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData + 39, // 23: PlunderChangePush.ShipEntry.value:type_name -> ShipData + 24, // [24:24] is the sub-list for method output_type + 24, // [24:24] is the sub-list for method input_type + 24, // [24:24] is the sub-list for extension type_name + 24, // [24:24] is the sub-list for extension extendee + 0, // [0:24] is the sub-list for field type_name } func init() { file_plunder_plunder_msg_proto_init() } @@ -1717,6 +1817,30 @@ func file_plunder_plunder_msg_proto_init() { return nil } } + file_plunder_plunder_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderRankSocreReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_plunder_plunder_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderRankSocreResp); 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{ @@ -1724,7 +1848,7 @@ func file_plunder_plunder_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_plunder_plunder_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 28, + NumMessages: 31, NumExtensions: 0, NumServices: 0, },