diff --git a/modules/plunder/api_challengeover.go b/modules/plunder/api_challengeover.go index 1bf88e71e..f5df47973 100644 --- a/modules/plunder/api_challengeover.go +++ b/modules/plunder/api_challengeover.go @@ -221,6 +221,24 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha Atno: atno, Heroexp: changExp, }) + + // 运输记录 + var info []*pb.PlunderRecordData + info = append(info, &pb.PlunderRecordData{ + Itype: 1, // 1 出发 + P1: session.GetUserId(), + P2: "", + Cid: list.Source[req.Index], + Ctime: configure.Now().Unix(), + }) + info = append(info, &pb.PlunderRecordData{ + Itype: 3, // 3 到达 + P1: session.GetUserId(), + P2: "", + Cid: list.Source[req.Index], + Ctime: configure.Now().Unix() + int64(conf.Extime), + }) + err = this.module.modelRecord.AddRecordData(session.GetUserId(), info) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PlunderChallengeOverReq", atno) }) diff --git a/modules/plunder/api_pvpchallengeover.go b/modules/plunder/api_pvpchallengeover.go index d94c0225b..bbbf7d9e5 100644 --- a/modules/plunder/api_pvpchallengeover.go +++ b/modules/plunder/api_pvpchallengeover.go @@ -31,7 +31,9 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder lock *redis.RedisMutex changeShip map[string]*pb.ShipData // 数据变化通知 atno []*pb.UserAtno // 打赢奖励 + info []*pb.PlunderRecordData // 运输记录 ) + if errdata = this.PvpChallengeOverCheck(session, req); errdata != nil { return } @@ -97,6 +99,16 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{ Atno: []*pb.UserAtno{}, }) + + info = append(info, &pb.PlunderRecordData{ + Itype: 2, // 2 被战败 + P1: session.GetUserId(), + P2: land.Ship[req.Oid].Uid, + Cid: land.Ship[req.Oid].Line.Cid, + Ctime: configure.Now().Unix(), + }) + err = this.module.modelRecord.AddRecordData(session.GetUserId(), info) + return } land.Ship[req.Oid].Status = 3 @@ -127,6 +139,13 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{ Atno: atno, }) - + info = append(info, &pb.PlunderRecordData{ + Itype: 4, // 4 掠夺成功 + P1: session.GetUserId(), + P2: land.Ship[req.Oid].Uid, + Cid: land.Ship[req.Oid].Line.Cid, + Ctime: configure.Now().Unix(), + }) + err = this.module.modelRecord.AddRecordData(session.GetUserId(), info) return } diff --git a/modules/plunder/model_land.go b/modules/plunder/model_land.go index 65556fffd..21d57e3c3 100644 --- a/modules/plunder/model_land.go +++ b/modules/plunder/model_land.go @@ -104,7 +104,7 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand land.Uinfo[int32(sz[k])] = v } err = this.AddList(comm.RDS_EMPTY, land.Id, land) - + this.module.modelRecord.getPlunderRecordData(land.Id) // 创建一条记录数据 return } diff --git a/modules/plunder/model_record.go b/modules/plunder/model_record.go new file mode 100644 index 000000000..93638922b --- /dev/null +++ b/modules/plunder/model_record.go @@ -0,0 +1,45 @@ +package plunder + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/modules" + "go_dreamfactory/pb" +) + +type modelRecord struct { + modules.MCompModel + module *Plunder +} + +func (this *modelRecord) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompModel.Init(service, module, comp, options) + this.TableName = comm.TablePlunderRecord + this.module = module.(*Plunder) + return +} + +func (this *modelRecord) getPlunderRecordData(id string) (info *pb.DBPlunderRecord, err error) { + info = &pb.DBPlunderRecord{} + if err = this.Get(id, info); err == mgo.MongodbNil { + info.Id = id + err = this.Add(id, info) + return + } + return +} + +func (this *modelRecord) changePlunderRecordData(id string, update map[string]interface{}) (err error) { + err = this.Change(id, update) + return +} + +// 新增一条记录 +func (this *modelRecord) AddRecordData(id string, info []*pb.PlunderRecordData) (err error) { + if record, err := this.getPlunderRecordData(id); err != nil { + record.Data = append(record.Data, info...) + err = this.changePlunderRecordData(id, map[string]interface{}{"data": record.Data}) + } + return +} diff --git a/modules/plunder/module.go b/modules/plunder/module.go index badd148b7..498054b9d 100644 --- a/modules/plunder/module.go +++ b/modules/plunder/module.go @@ -23,6 +23,7 @@ type Plunder struct { modelPlunder *modelPlunder modelLand *modelLand battle comm.IBattle + modelRecord *modelRecord } // 模块名 @@ -56,6 +57,7 @@ func (this *Plunder) OnInstallComp() { this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.modelPlunder = this.RegisterComp(new(modelPlunder)).(*modelPlunder) this.modelLand = this.RegisterComp(new(modelLand)).(*modelLand) + this.modelRecord = this.RegisterComp(new(modelRecord)).(*modelRecord) } func (this *Plunder) CreatePlunderLand(uid string) (land *pb.DBPlunderLand, err error) { diff --git a/modules/plunder/plunder_test.go b/modules/plunder/plunder_test.go new file mode 100644 index 000000000..d17f6795a --- /dev/null +++ b/modules/plunder/plunder_test.go @@ -0,0 +1,26 @@ +package plunder + +import "sort" + +//根据value排序 +type Pair struct { + Key string + Value int +} + +type PairList []Pair + +func (p PairList) Swap(i, j int) { p[i], p[j] = p[j], p[i] } +func (p PairList) Len() int { return len(p) } +func (p PairList) Less(i, j int) bool { return p[i].Value < p[j].Value } + +func sortMap(m map[string]int) PairList { + p := make(PairList, len(m)) + i := 0 + for k, v := range m { + p[i] = Pair{k, v} + i++ + } + sort.Sort(p) + return p +} diff --git a/pb/chat_db.pb.go b/pb/chat_db.pb.go index 491fc39d9..d1c8b51a7 100644 --- a/pb/chat_db.pb.go +++ b/pb/chat_db.pb.go @@ -87,7 +87,7 @@ const ( ChatType_ItemShare ChatType = 5 //道具分享 ChatType_Parkour ChatType = 6 //捕羊大赛邀请 ChatType_Questionnaire ChatType = 7 //问答分享 - ChatType_XxlRoom ChatType = 8 // 三消房间分享类型 + ChatType_XxlRoom ChatType = 8 //三消房间分享类型 ) // Enum value maps for ChatType. diff --git a/pb/plunder_db.pb.go b/pb/plunder_db.pb.go index 8051063a7..6659db1e0 100644 --- a/pb/plunder_db.pb.go +++ b/pb/plunder_db.pb.go @@ -453,6 +453,141 @@ func (x *DBPlunderLand) GetEtime() int64 { return 0 } +type PlunderRecordData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Itype int32 `protobuf:"varint,1,opt,name=itype,proto3" json:"itype"` // + P1 string `protobuf:"bytes,2,opt,name=p1,proto3" json:"p1"` // 玩家1 + P2 string `protobuf:"bytes,3,opt,name=p2,proto3" json:"p2"` + Cid int32 `protobuf:"varint,4,opt,name=cid,proto3" json:"cid"` // 配置表id + Ctime int64 `protobuf:"varint,5,opt,name=ctime,proto3" json:"ctime"` //记录时间 +} + +func (x *PlunderRecordData) Reset() { + *x = PlunderRecordData{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_db_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderRecordData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderRecordData) ProtoMessage() {} + +func (x *PlunderRecordData) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_db_proto_msgTypes[5] + 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 PlunderRecordData.ProtoReflect.Descriptor instead. +func (*PlunderRecordData) Descriptor() ([]byte, []int) { + return file_plunder_plunder_db_proto_rawDescGZIP(), []int{5} +} + +func (x *PlunderRecordData) GetItype() int32 { + if x != nil { + return x.Itype + } + return 0 +} + +func (x *PlunderRecordData) GetP1() string { + if x != nil { + return x.P1 + } + return "" +} + +func (x *PlunderRecordData) GetP2() string { + if x != nil { + return x.P2 + } + return "" +} + +func (x *PlunderRecordData) GetCid() int32 { + if x != nil { + return x.Cid + } + return 0 +} + +func (x *PlunderRecordData) GetCtime() int64 { + if x != nil { + return x.Ctime + } + return 0 +} + +// 掠夺记录 +type DBPlunderRecord struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Data []*PlunderRecordData `protobuf:"bytes,2,rep,name=data,proto3" json:"data"` // 记录详情 +} + +func (x *DBPlunderRecord) Reset() { + *x = DBPlunderRecord{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_db_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBPlunderRecord) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBPlunderRecord) ProtoMessage() {} + +func (x *DBPlunderRecord) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_db_proto_msgTypes[6] + 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 DBPlunderRecord.ProtoReflect.Descriptor instead. +func (*DBPlunderRecord) Descriptor() ([]byte, []int) { + return file_plunder_plunder_db_proto_rawDescGZIP(), []int{6} +} + +func (x *DBPlunderRecord) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBPlunderRecord) GetData() []*PlunderRecordData { + if x != nil { + return x.Data + } + return nil +} + var File_plunder_plunder_db_proto protoreflect.FileDescriptor var file_plunder_plunder_db_proto_rawDesc = []byte{ @@ -525,8 +660,19 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{ 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 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, + 0x38, 0x01, 0x22, 0x71, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, + 0x02, 0x70, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x70, 0x31, 0x12, 0x0e, 0x0a, + 0x02, 0x70, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x70, 0x32, 0x12, 0x10, 0x0a, + 0x03, 0x63, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, + 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x49, 0x0a, 0x0f, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, + 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, 0x26, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -541,33 +687,36 @@ func file_plunder_plunder_db_proto_rawDescGZIP() []byte { return file_plunder_plunder_db_proto_rawDescData } -var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_plunder_plunder_db_proto_goTypes = []interface{}{ (*DBPlunder)(nil), // 0: DBPlunder (*TransportLine)(nil), // 1: TransportLine (*PlunderLine)(nil), // 2: PlunderLine (*ShipData)(nil), // 3: ShipData (*DBPlunderLand)(nil), // 4: DBPlunderLand - nil, // 5: DBPlunder.DevelopEntry - nil, // 6: DBPlunderLand.UinfoEntry - nil, // 7: DBPlunderLand.ShipEntry - (*DBPlayerBattleFormt)(nil), // 8: DBPlayerBattleFormt - (*BaseUserInfo)(nil), // 9: BaseUserInfo + (*PlunderRecordData)(nil), // 5: PlunderRecordData + (*DBPlunderRecord)(nil), // 6: DBPlunderRecord + nil, // 7: DBPlunder.DevelopEntry + nil, // 8: DBPlunderLand.UinfoEntry + nil, // 9: DBPlunderLand.ShipEntry + (*DBPlayerBattleFormt)(nil), // 10: DBPlayerBattleFormt + (*BaseUserInfo)(nil), // 11: BaseUserInfo } var file_plunder_plunder_db_proto_depIdxs = []int32{ - 1, // 0: DBPlunder.line:type_name -> TransportLine - 5, // 1: DBPlunder.develop:type_name -> DBPlunder.DevelopEntry - 2, // 2: ShipData.line:type_name -> PlunderLine - 8, // 3: ShipData.defend:type_name -> DBPlayerBattleFormt - 6, // 4: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry - 7, // 5: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry - 9, // 6: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo - 3, // 7: DBPlunderLand.ShipEntry.value:type_name -> ShipData - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 1, // 0: DBPlunder.line:type_name -> TransportLine + 7, // 1: DBPlunder.develop:type_name -> DBPlunder.DevelopEntry + 2, // 2: ShipData.line:type_name -> PlunderLine + 10, // 3: ShipData.defend:type_name -> DBPlayerBattleFormt + 8, // 4: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry + 9, // 5: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry + 5, // 6: DBPlunderRecord.data:type_name -> PlunderRecordData + 11, // 7: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo + 3, // 8: DBPlunderLand.ShipEntry.value:type_name -> ShipData + 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 } func init() { file_plunder_plunder_db_proto_init() } @@ -638,6 +787,30 @@ func file_plunder_plunder_db_proto_init() { return nil } } + file_plunder_plunder_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderRecordData); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_plunder_plunder_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBPlunderRecord); 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{ @@ -645,7 +818,7 @@ func file_plunder_plunder_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_plunder_plunder_db_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/plunder_msg.pb.go b/pb/plunder_msg.pb.go index e2f040037..9581d37ce 100644 --- a/pb/plunder_msg.pb.go +++ b/pb/plunder_msg.pb.go @@ -1127,6 +1127,91 @@ func (x *PlunderDevelopResp) GetDevelop() map[int32]int32 { return nil } +type PlunderRecordReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *PlunderRecordReq) Reset() { + *x = PlunderRecordReq{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderRecordReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderRecordReq) ProtoMessage() {} + +func (x *PlunderRecordReq) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_msg_proto_msgTypes[21] + 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 PlunderRecordReq.ProtoReflect.Descriptor instead. +func (*PlunderRecordReq) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{21} +} + +type PlunderRecordResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Info *DBPlunderRecord `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` // 航海要事 +} + +func (x *PlunderRecordResp) Reset() { + *x = PlunderRecordResp{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderRecordResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderRecordResp) ProtoMessage() {} + +func (x *PlunderRecordResp) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_msg_proto_msgTypes[22] + 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 PlunderRecordResp.ProtoReflect.Descriptor instead. +func (*PlunderRecordResp) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{22} +} + +func (x *PlunderRecordResp) GetInfo() *DBPlunderRecord { + if x != nil { + return x.Info + } + return nil +} + var File_plunder_plunder_msg_proto protoreflect.FileDescriptor var file_plunder_plunder_msg_proto_rawDesc = []byte{ @@ -1261,8 +1346,13 @@ var file_plunder_plunder_msg_proto_rawDesc = []byte{ 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x12, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x11, + 0x50, 0x6c, 0x75, 0x6e, 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, } var ( @@ -1277,7 +1367,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, 27) +var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 29) var file_plunder_plunder_msg_proto_goTypes = []interface{}{ (*PlunderGetListReq)(nil), // 0: PlunderGetListReq (*PlunderGetListResp)(nil), // 1: PlunderGetListResp @@ -1300,51 +1390,55 @@ var file_plunder_plunder_msg_proto_goTypes = []interface{}{ (*PlunderUnlockResp)(nil), // 18: PlunderUnlockResp (*PlunderDevelopReq)(nil), // 19: PlunderDevelopReq (*PlunderDevelopResp)(nil), // 20: PlunderDevelopResp - nil, // 21: PlunderChallengeOverResp.ShipEntry - nil, // 22: PlunderChallengeOverResp.HeroexpEntry - nil, // 23: PlunderReachResp.ShipEntry - nil, // 24: PlunderClientTagResp.ShipEntry - nil, // 25: PlunderChangePush.ShipEntry - nil, // 26: PlunderDevelopResp.DevelopEntry - (*DBPlunder)(nil), // 27: DBPlunder - (*DBPlunderLand)(nil), // 28: DBPlunderLand - (*BattleFormation)(nil), // 29: BattleFormation - (*BattleInfo)(nil), // 30: BattleInfo - (*BattleReport)(nil), // 31: BattleReport - (*TransportLine)(nil), // 32: TransportLine - (*UserAtno)(nil), // 33: UserAtno - (*ShipData)(nil), // 34: ShipData + (*PlunderRecordReq)(nil), // 21: PlunderRecordReq + (*PlunderRecordResp)(nil), // 22: PlunderRecordResp + nil, // 23: PlunderChallengeOverResp.ShipEntry + nil, // 24: PlunderChallengeOverResp.HeroexpEntry + nil, // 25: PlunderReachResp.ShipEntry + nil, // 26: PlunderClientTagResp.ShipEntry + nil, // 27: PlunderChangePush.ShipEntry + nil, // 28: PlunderDevelopResp.DevelopEntry + (*DBPlunder)(nil), // 29: DBPlunder + (*DBPlunderLand)(nil), // 30: DBPlunderLand + (*BattleFormation)(nil), // 31: BattleFormation + (*BattleInfo)(nil), // 32: BattleInfo + (*BattleReport)(nil), // 33: BattleReport + (*TransportLine)(nil), // 34: TransportLine + (*UserAtno)(nil), // 35: UserAtno + (*DBPlunderRecord)(nil), // 36: DBPlunderRecord + (*ShipData)(nil), // 37: ShipData } var file_plunder_plunder_msg_proto_depIdxs = []int32{ - 27, // 0: PlunderGetListResp.list:type_name -> DBPlunder - 28, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand - 29, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation - 30, // 3: PlunderChallengeResp.info:type_name -> BattleInfo - 31, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport - 32, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine - 21, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry - 33, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno - 22, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry - 29, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation - 30, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo - 31, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport - 33, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno - 32, // 13: PlunderReachResp.line:type_name -> TransportLine - 23, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry - 33, // 15: PlunderReachResp.atno:type_name -> UserAtno - 24, // 16: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry - 25, // 17: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry - 32, // 18: PlunderUnlockResp.line:type_name -> TransportLine - 26, // 19: PlunderDevelopResp.develop:type_name -> PlunderDevelopResp.DevelopEntry - 34, // 20: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData - 34, // 21: PlunderReachResp.ShipEntry.value:type_name -> ShipData - 34, // 22: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData - 34, // 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 + 29, // 0: PlunderGetListResp.list:type_name -> DBPlunder + 30, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand + 31, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation + 32, // 3: PlunderChallengeResp.info:type_name -> BattleInfo + 33, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport + 34, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine + 23, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry + 35, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno + 24, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry + 31, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation + 32, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo + 33, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport + 35, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno + 34, // 13: PlunderReachResp.line:type_name -> TransportLine + 25, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry + 35, // 15: PlunderReachResp.atno:type_name -> UserAtno + 26, // 16: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry + 27, // 17: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry + 34, // 18: PlunderUnlockResp.line:type_name -> TransportLine + 28, // 19: PlunderDevelopResp.develop:type_name -> PlunderDevelopResp.DevelopEntry + 36, // 20: PlunderRecordResp.info:type_name -> DBPlunderRecord + 37, // 21: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData + 37, // 22: PlunderReachResp.ShipEntry.value:type_name -> ShipData + 37, // 23: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData + 37, // 24: PlunderChangePush.ShipEntry.value:type_name -> ShipData + 25, // [25:25] is the sub-list for method output_type + 25, // [25:25] is the sub-list for method input_type + 25, // [25:25] is the sub-list for extension type_name + 25, // [25:25] is the sub-list for extension extendee + 0, // [0:25] is the sub-list for field type_name } func init() { file_plunder_plunder_msg_proto_init() } @@ -1608,6 +1702,30 @@ func file_plunder_plunder_msg_proto_init() { return nil } } + file_plunder_plunder_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderRecordReq); 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[22].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderRecordResp); 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{ @@ -1615,7 +1733,7 @@ func file_plunder_plunder_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_plunder_plunder_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 27, + NumMessages: 29, NumExtensions: 0, NumServices: 0, },