diff --git a/modules/pagoda/api_racechallenge.go b/modules/pagoda/api_racechallenge.go index 6af839c95..2905581e6 100644 --- a/modules/pagoda/api_racechallenge.go +++ b/modules/pagoda/api_racechallenge.go @@ -24,6 +24,7 @@ func (this *apiComp) ChallengeRace(session comm.IUserSession, req *pb.PagodaChal pagoda *pb.DBPagodaRace err error //timeCheckOk bool + pType pb.PlayType ) if errdata = this.ChallengeRaceCheck(session, req); errdata != nil { return // 参数校验失败直接返回 @@ -107,9 +108,13 @@ func (this *apiComp) ChallengeRace(session comm.IUserSession, req *pb.PagodaChal } } } - + if req.Race >= 10 { + pType = pb.PlayType_cycle + } else { + pType = pb.PlayType_race + } errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{ - Ptype: pb.PlayType_pagoda, + Ptype: pType, Title: "", Format: req.Battle, Mformat: conf.Monsterlineup, diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go index 31b91efd6..96529e20e 100644 --- a/pb/battle_db.pb.go +++ b/pb/battle_db.pb.go @@ -100,6 +100,8 @@ const ( PlayType_sociaty PlayType = 12 //工会战 PlayType_friendsmeet PlayType = 13 //好友切磋 PlayType_practicenpc PlayType = 14 //武馆NPC + PlayType_race PlayType = 15 // 阵营 塔 + PlayType_cycle PlayType = 16 // 循环塔 ) // Enum value maps for PlayType. @@ -120,6 +122,8 @@ var ( 12: "sociaty", 13: "friendsmeet", 14: "practicenpc", + 15: "race", + 16: "cycle", } PlayType_value = map[string]int32{ "null": 0, @@ -137,6 +141,8 @@ var ( "sociaty": 12, "friendsmeet": 13, "practicenpc": 14, + "race": 15, + "cycle": 16, } ) @@ -739,7 +745,7 @@ var file_battle_battle_db_proto_rawDesc = []byte{ 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x70, 0x76, 0x70, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, - 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0xd5, 0x01, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, + 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0xea, 0x01, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, @@ -752,13 +758,15 @@ var file_battle_battle_db_proto_rawDesc = []byte{ 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x65, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x10, 0x0b, 0x12, 0x0b, 0x0a, 0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x10, 0x0c, 0x12, 0x0f, 0x0a, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x6d, 0x65, 0x65, 0x74, 0x10, 0x0d, 0x12, 0x0f, 0x0a, - 0x0b, 0x70, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x6e, 0x70, 0x63, 0x10, 0x0e, 0x2a, 0x1f, - 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, - 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, - 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, - 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, - 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0b, 0x70, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x6e, 0x70, 0x63, 0x10, 0x0e, 0x12, 0x08, + 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x10, 0x0f, 0x12, 0x09, 0x0a, 0x05, 0x63, 0x79, 0x63, 0x6c, + 0x65, 0x10, 0x10, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, + 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, + 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, + 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pb/dungeon_db.pb.go b/pb/dungeon_db.pb.go index c963d322c..a35dd9430 100644 --- a/pb/dungeon_db.pb.go +++ b/pb/dungeon_db.pb.go @@ -26,12 +26,14 @@ type RoomData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Event map[int32]bool `protobuf:"bytes,1,rep,name=event,proto3" json:"event" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //房间的事件信息 true 表示已完成 - CurRoomIndes int32 `protobuf:"varint,2,opt,name=curRoomIndes,proto3" json:"curRoomIndes"` // 当前房间索引 初始 0 每通关一次+1 - Portal []int32 `protobuf:"varint,3,rep,packed,name=portal,proto3" json:"portal"` // 传送门id - Selectbuff []int32 `protobuf:"varint,4,rep,packed,name=selectbuff,proto3" json:"selectbuff"` // 给前端显示的buff 组 - Curselectbuff int32 `protobuf:"varint,5,opt,name=curselectbuff,proto3" json:"curselectbuff"` // 当前已经选择的buf - Group map[int32]int32 `protobuf:"bytes,6,rep,name=group,proto3" json:"group" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 事件组 + Event map[int32]bool `protobuf:"bytes,1,rep,name=event,proto3" json:"event" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //房间的事件信息 true 表示已完成 + CurRoomIndes int32 `protobuf:"varint,2,opt,name=curRoomIndes,proto3" json:"curRoomIndes"` // 当前房间索引 初始 0 每通关一次+1 + Portal []int32 `protobuf:"varint,3,rep,packed,name=portal,proto3" json:"portal"` // 传送门id + Selectbuff []int32 `protobuf:"varint,4,rep,packed,name=selectbuff,proto3" json:"selectbuff"` // 给前端显示的buff 组 + //int32 curselectbuff = 5;// 当前已经选择的buf + Group map[int32]int32 `protobuf:"bytes,6,rep,name=group,proto3" json:"group" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 事件组 + Complete bool `protobuf:"varint,7,opt,name=complete,proto3" json:"complete"` // 房间是否通关 + Addweight map[int32]int32 `protobuf:"bytes,8,rep,name=addweight,proto3" json:"addweight" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 选择buff权重增加 key 类型 } func (x *RoomData) Reset() { @@ -94,13 +96,6 @@ func (x *RoomData) GetSelectbuff() []int32 { return nil } -func (x *RoomData) GetCurselectbuff() int32 { - if x != nil { - return x.Curselectbuff - } - return 0 -} - func (x *RoomData) GetGroup() map[int32]int32 { if x != nil { return x.Group @@ -108,16 +103,34 @@ func (x *RoomData) GetGroup() map[int32]int32 { return nil } +func (x *RoomData) GetComplete() bool { + if x != nil { + return x.Complete + } + return false +} + +func (x *RoomData) GetAddweight() map[int32]int32 { + if x != nil { + return x.Addweight + } + return nil +} + type DBDungeon 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"` - Rooms map[int32]*RoomData `protobuf:"bytes,3,rep,name=rooms,proto3" json:"rooms" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Buff map[int32]int32 `protobuf:"bytes,4,rep,name=buff,proto3" json:"buff" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 获得buff value - Hero map[string]*DBHero `protobuf:"bytes,5,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 英雄信息 + 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"` + StageID int32 `protobuf:"varint,3,opt,name=stageID,proto3" json:"stageID"` // 关卡id + Rooms *RoomData `protobuf:"bytes,4,opt,name=rooms,proto3" json:"rooms"` // 当前房间 + Envbuff []int32 `protobuf:"varint,5,rep,packed,name=envbuff,proto3" json:"envbuff"` // 环境buff 不能被更改 + Userbuff map[int32]int32 `protobuf:"bytes,6,rep,name=userbuff,proto3" json:"userbuff" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家获得的buff key buff 类型 + Hero map[string]*DBHero `protobuf:"bytes,7,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 英雄信息 + Reward map[int32]bool `protobuf:"bytes,8,rep,name=reward,proto3" json:"reward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 是否首通 key:stageid + Rtime int64 `protobuf:"varint,9,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 } func (x *DBDungeon) Reset() { @@ -166,16 +179,30 @@ func (x *DBDungeon) GetUid() string { return "" } -func (x *DBDungeon) GetRooms() map[int32]*RoomData { +func (x *DBDungeon) GetStageID() int32 { + if x != nil { + return x.StageID + } + return 0 +} + +func (x *DBDungeon) GetRooms() *RoomData { if x != nil { return x.Rooms } return nil } -func (x *DBDungeon) GetBuff() map[int32]int32 { +func (x *DBDungeon) GetEnvbuff() []int32 { if x != nil { - return x.Buff + return x.Envbuff + } + return nil +} + +func (x *DBDungeon) GetUserbuff() map[int32]int32 { + if x != nil { + return x.Userbuff } return nil } @@ -187,13 +214,27 @@ func (x *DBDungeon) GetHero() map[string]*DBHero { return nil } +func (x *DBDungeon) GetReward() map[int32]bool { + if x != nil { + return x.Reward + } + return nil +} + +func (x *DBDungeon) GetRtime() int64 { + if x != nil { + return x.Rtime + } + return 0 +} + var File_dungeon_dungeon_db_proto protoreflect.FileDescriptor var file_dungeon_dungeon_db_proto_rawDesc = []byte{ 0x0a, 0x18, 0x64, 0x75, 0x6e, 0x67, 0x65, 0x6f, 0x6e, 0x2f, 0x64, 0x75, 0x6e, 0x67, 0x65, 0x6f, 0x6e, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x68, 0x65, 0x72, 0x6f, - 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd8, - 0x02, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2a, 0x0a, 0x05, 0x65, + 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc4, + 0x03, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2a, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x52, 0x6f, @@ -202,41 +243,55 @@ var file_dungeon_dungeon_db_proto_rawDesc = []byte{ 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x75, 0x66, 0x66, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, - 0x75, 0x66, 0x66, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x75, 0x72, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, - 0x62, 0x75, 0x66, 0x66, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x63, 0x75, 0x72, 0x73, - 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x75, 0x66, 0x66, 0x12, 0x2a, 0x0a, 0x05, 0x67, 0x72, 0x6f, - 0x75, 0x70, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, - 0x61, 0x74, 0x61, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x1a, 0x38, 0x0a, 0x0a, 0x45, 0x76, 0x65, 0x6e, 0x74, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, - 0x38, 0x0a, 0x0a, 0x47, 0x72, 0x6f, 0x75, 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, 0x22, 0xee, 0x02, 0x0a, 0x09, 0x44, 0x42, - 0x44, 0x75, 0x6e, 0x67, 0x65, 0x6f, 0x6e, 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, 0x2b, 0x0a, 0x05, 0x72, 0x6f, 0x6f, - 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x44, 0x75, 0x6e, - 0x67, 0x65, 0x6f, 0x6e, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x12, 0x28, 0x0a, 0x04, 0x62, 0x75, 0x66, 0x66, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x44, 0x75, 0x6e, 0x67, 0x65, 0x6f, 0x6e, - 0x2e, 0x42, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x75, 0x66, 0x66, - 0x12, 0x28, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, + 0x75, 0x66, 0x66, 0x12, 0x2a, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x06, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, + 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x61, + 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, + 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x1a, 0x38, 0x0a, 0x0a, 0x45, 0x76, 0x65, 0x6e, 0x74, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, + 0x0a, 0x47, 0x72, 0x6f, 0x75, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x77, 0x65, + 0x69, 0x67, 0x68, 0x74, 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, 0xe2, 0x03, 0x0a, 0x09, 0x44, 0x42, 0x44, 0x75, 0x6e, 0x67, + 0x65, 0x6f, 0x6e, 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, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x44, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x44, 0x12, + 0x1f, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, + 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, + 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75, 0x66, 0x66, 0x18, 0x05, 0x20, 0x03, 0x28, + 0x05, 0x52, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75, 0x66, 0x66, 0x12, 0x34, 0x0a, 0x08, 0x75, 0x73, + 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, + 0x42, 0x44, 0x75, 0x6e, 0x67, 0x65, 0x6f, 0x6e, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, + 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, + 0x12, 0x28, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x44, 0x75, 0x6e, 0x67, 0x65, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x1a, 0x43, 0x0a, 0x0a, 0x52, 0x6f, - 0x6f, 0x6d, 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, 0x1f, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, - 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, - 0x37, 0x0a, 0x09, 0x42, 0x75, 0x66, 0x66, 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, 0x40, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x44, + 0x75, 0x6e, 0x67, 0x65, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, + 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, + 0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 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, 0x40, 0x0a, + 0x09, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, + 0x48, 0x65, 0x72, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, + 0x39, 0x0a, 0x0b, 0x52, 0x65, 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, 0x08, 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, } @@ -253,30 +308,32 @@ func file_dungeon_dungeon_db_proto_rawDescGZIP() []byte { return file_dungeon_dungeon_db_proto_rawDescData } -var file_dungeon_dungeon_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_dungeon_dungeon_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_dungeon_dungeon_db_proto_goTypes = []interface{}{ (*RoomData)(nil), // 0: RoomData (*DBDungeon)(nil), // 1: DBDungeon nil, // 2: RoomData.EventEntry nil, // 3: RoomData.GroupEntry - nil, // 4: DBDungeon.RoomsEntry - nil, // 5: DBDungeon.BuffEntry + nil, // 4: RoomData.AddweightEntry + nil, // 5: DBDungeon.UserbuffEntry nil, // 6: DBDungeon.HeroEntry - (*DBHero)(nil), // 7: DBHero + nil, // 7: DBDungeon.RewardEntry + (*DBHero)(nil), // 8: DBHero } var file_dungeon_dungeon_db_proto_depIdxs = []int32{ 2, // 0: RoomData.event:type_name -> RoomData.EventEntry 3, // 1: RoomData.group:type_name -> RoomData.GroupEntry - 4, // 2: DBDungeon.rooms:type_name -> DBDungeon.RoomsEntry - 5, // 3: DBDungeon.buff:type_name -> DBDungeon.BuffEntry - 6, // 4: DBDungeon.hero:type_name -> DBDungeon.HeroEntry - 0, // 5: DBDungeon.RoomsEntry.value:type_name -> RoomData - 7, // 6: DBDungeon.HeroEntry.value:type_name -> DBHero - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name + 4, // 2: RoomData.addweight:type_name -> RoomData.AddweightEntry + 0, // 3: DBDungeon.rooms:type_name -> RoomData + 5, // 4: DBDungeon.userbuff:type_name -> DBDungeon.UserbuffEntry + 6, // 5: DBDungeon.hero:type_name -> DBDungeon.HeroEntry + 7, // 6: DBDungeon.reward:type_name -> DBDungeon.RewardEntry + 8, // 7: DBDungeon.HeroEntry.value:type_name -> DBHero + 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 } func init() { file_dungeon_dungeon_db_proto_init() } @@ -317,7 +374,7 @@ func file_dungeon_dungeon_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_dungeon_dungeon_db_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 8, NumExtensions: 0, NumServices: 0, },