From d12ff517d66eeb8210f2c877fac912069734ddc8 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 26 Jan 2024 15:43:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/arena/api_info.go | 1 + modules/arena/modelarena.go | 9 ++ pb/arena_db.pb.go | 249 +++++++++++++++++++++++++----------- 3 files changed, 182 insertions(+), 77 deletions(-) diff --git a/modules/arena/api_info.go b/modules/arena/api_info.go index 671ace229..9e6592287 100644 --- a/modules/arena/api_info.go +++ b/modules/arena/api_info.go @@ -71,6 +71,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd Settlementtime: this.module.modelArena.settlementTime().Unix(), Tasks: make(map[int32]int32), Danaward: make(map[int32]int32), + Weekaward: make([]*pb.DBWeekAward, 0), } if info.Dan, err = this.module.modelArena.computedan(info.Integral); err != nil { errdata = &pb.ErrorData{ diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go index c0d8beab2..9f1ee5ceb 100644 --- a/modules/arena/modelarena.go +++ b/modules/arena/modelarena.go @@ -182,6 +182,10 @@ func (this *modelArena) updateArenaUserInfo(info *pb.DBArenaUser) (err error) { "dan2": info.Dan2, "lastweektime": info.Lastweektime, "settlementtime": info.Settlementtime, + "tasks": info.Tasks, + "danaward": info.Danaward, + "maxdan": info.Maxdan, + "weekaward": info.Weekaward, }) return } @@ -510,6 +514,11 @@ func (this *modelArena) weeksettlement(session comm.IUserSession, info *pb.DBAre this.module.Errorln(errdata) return } + info.Weekaward = append(info.Weekaward, &pb.DBWeekAward{ + Dan: info.Dan, + Dan2: info.Dan2, + Award: atno, + }) session.SendMsg(string(this.module.GetType()), "settlementreward", &pb.ArenaSettlementRewardPush{Stype: 1, Award: atno}) } } diff --git a/pb/arena_db.pb.go b/pb/arena_db.pb.go index 19b77f438..39a5a55d0 100644 --- a/pb/arena_db.pb.go +++ b/pb/arena_db.pb.go @@ -469,6 +469,7 @@ type DBArenaUser struct { Tasks map[int32]int32 `protobuf:"bytes,30,rep,name=tasks,proto3" json:"tasks" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //成就任务 Danaward map[int32]int32 `protobuf:"bytes,31,rep,name=danaward,proto3" json:"danaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //段位奖励 Maxdan int32 `protobuf:"varint,32,opt,name=maxdan,proto3" json:"maxdan"` //历史最高段位 + Weekaward []*DBWeekAward `protobuf:"bytes,33,rep,name=weekaward,proto3" json:"weekaward"` //周奖励记录 } func (x *DBArenaUser) Reset() { @@ -699,6 +700,76 @@ func (x *DBArenaUser) GetMaxdan() int32 { return 0 } +func (x *DBArenaUser) GetWeekaward() []*DBWeekAward { + if x != nil { + return x.Weekaward + } + return nil +} + +type DBWeekAward struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Dan int32 `protobuf:"varint,1,opt,name=dan,proto3" json:"dan"` + Dan2 int32 `protobuf:"varint,2,opt,name=dan2,proto3" json:"dan2"` + Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励 +} + +func (x *DBWeekAward) Reset() { + *x = DBWeekAward{} + if protoimpl.UnsafeEnabled { + mi := &file_arena_arena_db_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBWeekAward) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBWeekAward) ProtoMessage() {} + +func (x *DBWeekAward) ProtoReflect() protoreflect.Message { + mi := &file_arena_arena_db_proto_msgTypes[4] + 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 DBWeekAward.ProtoReflect.Descriptor instead. +func (*DBWeekAward) Descriptor() ([]byte, []int) { + return file_arena_arena_db_proto_rawDescGZIP(), []int{4} +} + +func (x *DBWeekAward) GetDan() int32 { + if x != nil { + return x.Dan + } + return 0 +} + +func (x *DBWeekAward) GetDan2() int32 { + if x != nil { + return x.Dan2 + } + return 0 +} + +func (x *DBWeekAward) GetAward() []*UserAtno { + if x != nil { + return x.Award + } + return nil +} + // npc数据 type DBNpc struct { state protoimpl.MessageState @@ -713,7 +784,7 @@ type DBNpc struct { func (x *DBNpc) Reset() { *x = DBNpc{} if protoimpl.UnsafeEnabled { - mi := &file_arena_arena_db_proto_msgTypes[4] + mi := &file_arena_arena_db_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -726,7 +797,7 @@ func (x *DBNpc) String() string { func (*DBNpc) ProtoMessage() {} func (x *DBNpc) ProtoReflect() protoreflect.Message { - mi := &file_arena_arena_db_proto_msgTypes[4] + mi := &file_arena_arena_db_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -739,7 +810,7 @@ func (x *DBNpc) ProtoReflect() protoreflect.Message { // Deprecated: Use DBNpc.ProtoReflect.Descriptor instead. func (*DBNpc) Descriptor() ([]byte, []int) { - return file_arena_arena_db_proto_rawDescGZIP(), []int{4} + return file_arena_arena_db_proto_rawDescGZIP(), []int{5} } func (x *DBNpc) GetId() int32 { @@ -776,7 +847,7 @@ type RPCModifyIntegralReq struct { func (x *RPCModifyIntegralReq) Reset() { *x = RPCModifyIntegralReq{} if protoimpl.UnsafeEnabled { - mi := &file_arena_arena_db_proto_msgTypes[5] + mi := &file_arena_arena_db_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -789,7 +860,7 @@ func (x *RPCModifyIntegralReq) String() string { func (*RPCModifyIntegralReq) ProtoMessage() {} func (x *RPCModifyIntegralReq) ProtoReflect() protoreflect.Message { - mi := &file_arena_arena_db_proto_msgTypes[5] + mi := &file_arena_arena_db_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -802,7 +873,7 @@ func (x *RPCModifyIntegralReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCModifyIntegralReq.ProtoReflect.Descriptor instead. func (*RPCModifyIntegralReq) Descriptor() ([]byte, []int) { - return file_arena_arena_db_proto_rawDescGZIP(), []int{5} + return file_arena_arena_db_proto_rawDescGZIP(), []int{6} } func (x *RPCModifyIntegralReq) GetUid() string { @@ -918,7 +989,7 @@ var file_arena_arena_db_proto_rawDesc = []byte{ 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, - 0xdd, 0x08, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x12, + 0x89, 0x09, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 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, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, @@ -976,38 +1047,46 @@ var file_arena_arena_db_proto_rawDesc = []byte{ 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x2e, 0x44, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x64, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x61, 0x78, 0x64, 0x61, 0x6e, 0x18, 0x20, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x06, 0x6d, 0x61, 0x78, 0x64, 0x61, 0x6e, 0x1a, 0x3e, 0x0a, 0x08, 0x4e, 0x70, 0x63, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, - 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 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, 0x1a, 0x3b, 0x0a, 0x0d, 0x44, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 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, - 0x3d, 0x0a, 0x05, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, - 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x44, - 0x0a, 0x14, 0x52, 0x50, 0x43, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x67, - 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, - 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, - 0x67, 0x72, 0x61, 0x6c, 0x2a, 0x9f, 0x01, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, - 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x74, - 0x74, 0x61, 0x63, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x74, 0x74, - 0x61, 0x63, 0x6b, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x66, - 0x65, 0x6e, 0x64, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x66, - 0x65, 0x6e, 0x64, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x57, 0x61, 0x69, - 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x10, 0x04, 0x12, 0x11, 0x0a, - 0x0d, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x05, - 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x75, 0x63, 0x63, 0x65, - 0x65, 0x64, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, - 0x65, 0x45, 0x6e, 0x64, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x06, 0x6d, 0x61, 0x78, 0x64, 0x61, 0x6e, 0x12, 0x2a, 0x0a, 0x09, 0x77, 0x65, 0x65, 0x6b, + 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x21, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, + 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x61, + 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3e, 0x0a, 0x08, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 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, 0x1a, 0x3b, + 0x0a, 0x0d, 0x44, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 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, 0x54, 0x0a, 0x0b, 0x44, + 0x42, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, + 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x12, 0x0a, 0x04, + 0x64, 0x61, 0x6e, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x61, 0x6e, 0x32, + 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x22, 0x3d, 0x0a, 0x05, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, + 0x22, 0x44, 0x0a, 0x14, 0x52, 0x50, 0x43, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x74, + 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, + 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, + 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2a, 0x9f, 0x01, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0d, 0x0a, 0x09, + 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x41, + 0x74, 0x74, 0x61, 0x63, 0x6b, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x44, + 0x65, 0x66, 0x65, 0x6e, 0x64, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x44, + 0x65, 0x66, 0x65, 0x6e, 0x64, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x57, + 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x10, 0x04, 0x12, + 0x11, 0x0a, 0x0d, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, + 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x75, 0x63, + 0x63, 0x65, 0x65, 0x64, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x65, 0x76, 0x65, + 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x64, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1023,53 +1102,57 @@ func file_arena_arena_db_proto_rawDescGZIP() []byte { } var file_arena_arena_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_arena_arena_db_proto_goTypes = []interface{}{ (BattleRecordState)(0), // 0: BattleRecordState (*ArenaPlayer)(nil), // 1: ArenaPlayer (*DBHeroBase)(nil), // 2: DBHeroBase (*DBArenaBattleRecord)(nil), // 3: DBArenaBattleRecord (*DBArenaUser)(nil), // 4: DBArenaUser - (*DBNpc)(nil), // 5: DBNpc - (*RPCModifyIntegralReq)(nil), // 6: RPCModifyIntegralReq - nil, // 7: DBHeroBase.PropertyEntry - nil, // 8: DBHeroBase.AddPropertyEntry - nil, // 9: DBHeroBase.JuexPropertyEntry - nil, // 10: DBHeroBase.TalentPropertyEntry - nil, // 11: DBHeroBase.HoroscopePropertyEntry - nil, // 12: DBHeroBase.FettersEntry - nil, // 13: DBArenaUser.NpcEntry - nil, // 14: DBArenaUser.TasksEntry - nil, // 15: DBArenaUser.DanawardEntry - (*BaseUserInfo)(nil), // 16: BaseUserInfo - (*DBPlayerBattleFormt)(nil), // 17: DBPlayerBattleFormt - (*SkillData)(nil), // 18: SkillData + (*DBWeekAward)(nil), // 5: DBWeekAward + (*DBNpc)(nil), // 6: DBNpc + (*RPCModifyIntegralReq)(nil), // 7: RPCModifyIntegralReq + nil, // 8: DBHeroBase.PropertyEntry + nil, // 9: DBHeroBase.AddPropertyEntry + nil, // 10: DBHeroBase.JuexPropertyEntry + nil, // 11: DBHeroBase.TalentPropertyEntry + nil, // 12: DBHeroBase.HoroscopePropertyEntry + nil, // 13: DBHeroBase.FettersEntry + nil, // 14: DBArenaUser.NpcEntry + nil, // 15: DBArenaUser.TasksEntry + nil, // 16: DBArenaUser.DanawardEntry + (*BaseUserInfo)(nil), // 17: BaseUserInfo + (*DBPlayerBattleFormt)(nil), // 18: DBPlayerBattleFormt + (*SkillData)(nil), // 19: SkillData + (*UserAtno)(nil), // 20: UserAtno } var file_arena_arena_db_proto_depIdxs = []int32{ - 16, // 0: ArenaPlayer.uinfo:type_name -> BaseUserInfo - 17, // 1: ArenaPlayer.defend:type_name -> DBPlayerBattleFormt - 7, // 2: DBHeroBase.property:type_name -> DBHeroBase.PropertyEntry - 8, // 3: DBHeroBase.addProperty:type_name -> DBHeroBase.AddPropertyEntry - 9, // 4: DBHeroBase.juexProperty:type_name -> DBHeroBase.JuexPropertyEntry - 10, // 5: DBHeroBase.talentProperty:type_name -> DBHeroBase.TalentPropertyEntry - 11, // 6: DBHeroBase.horoscopeProperty:type_name -> DBHeroBase.HoroscopePropertyEntry - 12, // 7: DBHeroBase.fetters:type_name -> DBHeroBase.FettersEntry - 18, // 8: DBHeroBase.normalSkill:type_name -> SkillData + 17, // 0: ArenaPlayer.uinfo:type_name -> BaseUserInfo + 18, // 1: ArenaPlayer.defend:type_name -> DBPlayerBattleFormt + 8, // 2: DBHeroBase.property:type_name -> DBHeroBase.PropertyEntry + 9, // 3: DBHeroBase.addProperty:type_name -> DBHeroBase.AddPropertyEntry + 10, // 4: DBHeroBase.juexProperty:type_name -> DBHeroBase.JuexPropertyEntry + 11, // 5: DBHeroBase.talentProperty:type_name -> DBHeroBase.TalentPropertyEntry + 12, // 6: DBHeroBase.horoscopeProperty:type_name -> DBHeroBase.HoroscopePropertyEntry + 13, // 7: DBHeroBase.fetters:type_name -> DBHeroBase.FettersEntry + 19, // 8: DBHeroBase.normalSkill:type_name -> SkillData 2, // 9: DBArenaBattleRecord.formt:type_name -> DBHeroBase 0, // 10: DBArenaBattleRecord.State:type_name -> BattleRecordState - 16, // 11: DBArenaUser.uinfo:type_name -> BaseUserInfo - 17, // 12: DBArenaUser.attack:type_name -> DBPlayerBattleFormt - 17, // 13: DBArenaUser.defend:type_name -> DBPlayerBattleFormt + 17, // 11: DBArenaUser.uinfo:type_name -> BaseUserInfo + 18, // 12: DBArenaUser.attack:type_name -> DBPlayerBattleFormt + 18, // 13: DBArenaUser.defend:type_name -> DBPlayerBattleFormt 3, // 14: DBArenaUser.record:type_name -> DBArenaBattleRecord - 13, // 15: DBArenaUser.npc:type_name -> DBArenaUser.NpcEntry - 14, // 16: DBArenaUser.tasks:type_name -> DBArenaUser.TasksEntry - 15, // 17: DBArenaUser.danaward:type_name -> DBArenaUser.DanawardEntry - 5, // 18: DBArenaUser.NpcEntry.value:type_name -> DBNpc - 19, // [19:19] is the sub-list for method output_type - 19, // [19:19] is the sub-list for method input_type - 19, // [19:19] is the sub-list for extension type_name - 19, // [19:19] is the sub-list for extension extendee - 0, // [0:19] is the sub-list for field type_name + 14, // 15: DBArenaUser.npc:type_name -> DBArenaUser.NpcEntry + 15, // 16: DBArenaUser.tasks:type_name -> DBArenaUser.TasksEntry + 16, // 17: DBArenaUser.danaward:type_name -> DBArenaUser.DanawardEntry + 5, // 18: DBArenaUser.weekaward:type_name -> DBWeekAward + 20, // 19: DBWeekAward.award:type_name -> UserAtno + 6, // 20: DBArenaUser.NpcEntry.value:type_name -> DBNpc + 21, // [21:21] is the sub-list for method output_type + 21, // [21:21] is the sub-list for method input_type + 21, // [21:21] is the sub-list for extension type_name + 21, // [21:21] is the sub-list for extension extendee + 0, // [0:21] is the sub-list for field type_name } func init() { file_arena_arena_db_proto_init() } @@ -1129,7 +1212,7 @@ func file_arena_arena_db_proto_init() { } } file_arena_arena_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBNpc); i { + switch v := v.(*DBWeekAward); i { case 0: return &v.state case 1: @@ -1141,6 +1224,18 @@ func file_arena_arena_db_proto_init() { } } file_arena_arena_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBNpc); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_arena_arena_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RPCModifyIntegralReq); i { case 0: return &v.state @@ -1159,7 +1254,7 @@ func file_arena_arena_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_arena_arena_db_proto_rawDesc, NumEnums: 1, - NumMessages: 15, + NumMessages: 16, NumExtensions: 0, NumServices: 0, },