From 269c02486c5c222af188638eba74f5b7b567cba4 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 10 Aug 2023 20:28:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/pushgiftbag/configure.go | 2 +- pb/stonehenge_db.pb.go | 455 ++++++++++++++++------- pb/stonehenge_msg.pb.go | 595 ++++++++++++++++++++++++++----- 3 files changed, 837 insertions(+), 215 deletions(-) diff --git a/modules/pushgiftbag/configure.go b/modules/pushgiftbag/configure.go index aaadcf1ce..5c1496333 100644 --- a/modules/pushgiftbag/configure.go +++ b/modules/pushgiftbag/configure.go @@ -44,7 +44,7 @@ func (this *configureComp) getGamePushGiftbyid(id int32) (conf *cfg.GamePushGift if v, err = this.GetConfigure(game_pushgift); err != nil { return } - if conf, ok = v.(*cfg.GamePushGift).GetDataMap()[id]; ok { + if conf, ok = v.(*cfg.GamePushGift).GetDataMap()[id]; !ok { err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_pushgift, id) this.module.Errorln(err) return diff --git a/pb/stonehenge_db.pb.go b/pb/stonehenge_db.pb.go index 5bbc97e99..d808ed48b 100644 --- a/pb/stonehenge_db.pb.go +++ b/pb/stonehenge_db.pb.go @@ -74,12 +74,13 @@ type RoomData struct { Portal []int32 `protobuf:"varint,2,rep,packed,name=portal,proto3" json:"portal"` // 传送门id Selectbuff []int32 `protobuf:"varint,3,rep,packed,name=selectbuff,proto3" json:"selectbuff"` // 给前端显示的buff 组 // map group = 4; // 事件组 - Complete bool `protobuf:"varint,5,opt,name=complete,proto3" json:"complete"` // 房间是否通关 - Index int32 `protobuf:"varint,6,opt,name=index,proto3" json:"index"` // 房间索引 - Roomid int32 `protobuf:"varint,7,opt,name=roomid,proto3" json:"roomid"` // 房间id - Hero []string `protobuf:"bytes,8,rep,name=hero,proto3" json:"hero"` //上阵英雄 继承血量用 - Box map[int32]int32 `protobuf:"bytes,9,rep,name=box,proto3" json:"box" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 宝箱事件 - Story int32 `protobuf:"varint,10,opt,name=story,proto3" json:"story"` // 剧情id + Complete bool `protobuf:"varint,5,opt,name=complete,proto3" json:"complete"` // 房间是否通关 + Index int32 `protobuf:"varint,6,opt,name=index,proto3" json:"index"` // 房间索引 + Roomid int32 `protobuf:"varint,7,opt,name=roomid,proto3" json:"roomid"` // 房间id + Hero []string `protobuf:"bytes,8,rep,name=hero,proto3" json:"hero"` //上阵英雄 继承血量用 + Box map[int32]int32 `protobuf:"bytes,9,rep,name=box,proto3" json:"box" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 宝箱事件 + Story int32 `protobuf:"varint,10,opt,name=story,proto3" json:"story"` // 剧情id + Shop map[int32]int32 `protobuf:"bytes,11,rep,name=shop,proto3" json:"shop" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 商店 } func (x *RoomData) Reset() { @@ -177,6 +178,13 @@ func (x *RoomData) GetStory() int32 { return 0 } +func (x *RoomData) GetShop() map[int32]int32 { + if x != nil { + return x.Shop + } + return nil +} + type DBStonehenge struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -454,13 +462,141 @@ func (x *DBStoneBoss) GetRtime() int64 { return 0 } +//图鉴 +type DBStonehengeBook 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"` + Books []int32 `protobuf:"varint,3,rep,packed,name=books,proto3" json:"books"` + Award map[int32]*DBStonehengeBookAward `protobuf:"bytes,4,rep,name=award,proto3" json:"award" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` +} + +func (x *DBStonehengeBook) Reset() { + *x = DBStonehengeBook{} + if protoimpl.UnsafeEnabled { + mi := &file_stonehenge_stonehenge_db_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBStonehengeBook) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBStonehengeBook) ProtoMessage() {} + +func (x *DBStonehengeBook) ProtoReflect() protoreflect.Message { + mi := &file_stonehenge_stonehenge_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 DBStonehengeBook.ProtoReflect.Descriptor instead. +func (*DBStonehengeBook) Descriptor() ([]byte, []int) { + return file_stonehenge_stonehenge_db_proto_rawDescGZIP(), []int{4} +} + +func (x *DBStonehengeBook) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBStonehengeBook) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBStonehengeBook) GetBooks() []int32 { + if x != nil { + return x.Books + } + return nil +} + +func (x *DBStonehengeBook) GetAward() map[int32]*DBStonehengeBookAward { + if x != nil { + return x.Award + } + return nil +} + +//图鉴奖励 +type DBStonehengeBookAward struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Btype int32 `protobuf:"varint,1,opt,name=btype,proto3" json:"btype"` + Stage map[int32]bool `protobuf:"bytes,2,rep,name=stage,proto3" json:"stage" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` +} + +func (x *DBStonehengeBookAward) Reset() { + *x = DBStonehengeBookAward{} + if protoimpl.UnsafeEnabled { + mi := &file_stonehenge_stonehenge_db_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBStonehengeBookAward) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBStonehengeBookAward) ProtoMessage() {} + +func (x *DBStonehengeBookAward) ProtoReflect() protoreflect.Message { + mi := &file_stonehenge_stonehenge_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 DBStonehengeBookAward.ProtoReflect.Descriptor instead. +func (*DBStonehengeBookAward) Descriptor() ([]byte, []int) { + return file_stonehenge_stonehenge_db_proto_rawDescGZIP(), []int{5} +} + +func (x *DBStonehengeBookAward) GetBtype() int32 { + if x != nil { + return x.Btype + } + return 0 +} + +func (x *DBStonehengeBookAward) GetStage() map[int32]bool { + if x != nil { + return x.Stage + } + return nil +} + var File_stonehenge_stonehenge_db_proto protoreflect.FileDescriptor var file_stonehenge_stonehenge_db_proto_rawDesc = []byte{ 0x0a, 0x1e, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2f, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, - 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x82, 0x03, 0x0a, 0x08, 0x52, 0x6f, 0x6f, + 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe4, 0x03, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x30, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, @@ -477,97 +613,127 @@ var file_stonehenge_stonehenge_db_proto_rawDesc = []byte{ 0x03, 0x62, 0x6f, 0x78, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x42, 0x6f, 0x78, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x62, 0x6f, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x0a, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x69, 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, 0x1a, 0x36, 0x0a, 0x08, 0x42, 0x6f, 0x78, 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, 0xdc, 0x07, - 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 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, 0x22, 0x0a, 0x0c, 0x63, 0x75, - 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0c, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73, 0x12, 0x1f, - 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x12, - 0x16, 0x0a, 0x06, 0x77, 0x65, 0x62, 0x75, 0x66, 0x66, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, - 0x06, 0x77, 0x65, 0x62, 0x75, 0x66, 0x66, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x65, 0x6d, 0x79, - 0x62, 0x75, 0x66, 0x66, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x65, 0x6e, 0x65, 0x6d, - 0x79, 0x62, 0x75, 0x66, 0x66, 0x12, 0x37, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, - 0x66, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, - 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 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, 0x2b, - 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, - 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x48, 0x65, 0x72, 0x6f, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x31, 0x0a, 0x06, 0x72, - 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, - 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, - 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x3a, - 0x0a, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0b, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, - 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, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, - 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, - 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, - 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x12, 0x49, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x44, 0x42, - 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, - 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, - 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x32, - 0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x18, 0x0f, 0x20, 0x03, 0x28, - 0x0e, 0x32, 0x14, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, - 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, - 0x67, 0x65, 0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, + 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x27, 0x0a, 0x04, 0x73, 0x68, 0x6f, + 0x70, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, + 0x74, 0x61, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, + 0x6f, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x69, 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, 0x1a, 0x36, + 0x0a, 0x08, 0x42, 0x6f, 0x78, 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, 0x37, 0x0a, 0x09, 0x53, 0x68, 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, 0x1a, - 0x44, 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, 0x21, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, + 0xdc, 0x07, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, + 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, 0x22, 0x0a, 0x0c, + 0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73, + 0x12, 0x1f, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, + 0x73, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, 0x62, 0x75, 0x66, 0x66, 0x18, 0x06, 0x20, 0x03, 0x28, + 0x05, 0x52, 0x06, 0x77, 0x65, 0x62, 0x75, 0x66, 0x66, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x65, + 0x6d, 0x79, 0x62, 0x75, 0x66, 0x66, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x65, 0x6e, + 0x65, 0x6d, 0x79, 0x62, 0x75, 0x66, 0x66, 0x12, 0x37, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x62, + 0x75, 0x66, 0x66, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x53, 0x74, + 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 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, 0x2b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, + 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x48, 0x65, + 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x31, 0x0a, + 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, + 0x12, 0x3a, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0b, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, + 0x67, 0x65, 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, 0x12, 0x14, 0x0a, 0x05, + 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, + 0x6d, 0x65, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, + 0x65, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x49, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, + 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x54, 0x61, 0x6c, + 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x12, 0x32, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x18, 0x0f, 0x20, + 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, + 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, + 0x6c, 0x65, 0x67, 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, 0x44, 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, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 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, 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, + 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 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, 0x41, 0x0a, 0x13, 0x54, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x5f, + 0x0a, 0x09, 0x53, 0x74, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x6d, + 0x61, 0x69, 0x6e, 0x65, 0x62, 0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, + 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x62, 0x75, 0x66, 0x66, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x65, + 0x6d, 0x79, 0x62, 0x75, 0x66, 0x66, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x65, 0x6e, + 0x65, 0x6d, 0x79, 0x62, 0x75, 0x66, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, + 0xa8, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x12, + 0x39, 0x0a, 0x09, 0x62, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x42, 0x6f, 0x73, 0x73, + 0x2e, 0x42, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x09, 0x62, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, + 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, + 0x1a, 0x48, 0x0a, 0x0e, 0x42, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x74, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xd0, 0x01, 0x0a, 0x10, 0x44, + 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, + 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, + 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, + 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x12, 0x32, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, + 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x50, 0x0a, 0x0a, 0x41, + 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, 0x2c, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x53, + 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa0, 0x01, + 0x0a, 0x15, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, + 0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x37, 0x0a, + 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x44, + 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, + 0x77, 0x61, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x74, 0x61, 0x67, 0x65, 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, 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, 0x1a, 0x39, - 0x0a, 0x0b, 0x54, 0x61, 0x6c, 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, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x5f, 0x0a, 0x09, - 0x53, 0x74, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x61, 0x69, - 0x6e, 0x65, 0x62, 0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x61, - 0x69, 0x6e, 0x65, 0x62, 0x75, 0x66, 0x66, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x65, 0x6d, 0x79, - 0x62, 0x75, 0x66, 0x66, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x65, 0x6e, 0x65, 0x6d, - 0x79, 0x62, 0x75, 0x66, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0xa8, 0x01, - 0x0a, 0x0b, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x12, 0x39, 0x0a, - 0x09, 0x62, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x42, 0x6f, 0x73, 0x73, 0x2e, 0x42, - 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x62, - 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x48, - 0x0a, 0x0e, 0x42, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x74, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x33, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, - 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x12, - 0x1c, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x69, - 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x5f, 0x4e, 0x6f, 0x6c, 0x6c, 0x10, 0x00, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2a, 0x33, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, + 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, + 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x5f, 0x4e, + 0x6f, 0x6c, 0x6c, 0x10, 0x00, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -583,43 +749,52 @@ func file_stonehenge_stonehenge_db_proto_rawDescGZIP() []byte { } var file_stonehenge_stonehenge_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_stonehenge_stonehenge_db_proto_msgTypes = make([]protoimpl.MessageInfo, 13) +var file_stonehenge_stonehenge_db_proto_msgTypes = make([]protoimpl.MessageInfo, 18) var file_stonehenge_stonehenge_db_proto_goTypes = []interface{}{ - (StonehengePrivilege)(0), // 0: StonehengePrivilege - (*RoomData)(nil), // 1: RoomData - (*DBStonehenge)(nil), // 2: DBStonehenge - (*StageData)(nil), // 3: StageData - (*DBStoneBoss)(nil), // 4: DBStoneBoss - nil, // 5: RoomData.EventidEntry - nil, // 6: RoomData.BoxEntry - nil, // 7: DBStonehenge.UserbuffEntry - nil, // 8: DBStonehenge.HeroEntry - nil, // 9: DBStonehenge.RewardEntry - nil, // 10: DBStonehenge.AddweightEntry - nil, // 11: DBStonehenge.TalentEntry - nil, // 12: DBStonehenge.TalentpropertyEntry - nil, // 13: DBStoneBoss.BossstageEntry - (*BattleRole)(nil), // 14: BattleRole + (StonehengePrivilege)(0), // 0: StonehengePrivilege + (*RoomData)(nil), // 1: RoomData + (*DBStonehenge)(nil), // 2: DBStonehenge + (*StageData)(nil), // 3: StageData + (*DBStoneBoss)(nil), // 4: DBStoneBoss + (*DBStonehengeBook)(nil), // 5: DBStonehengeBook + (*DBStonehengeBookAward)(nil), // 6: DBStonehengeBookAward + nil, // 7: RoomData.EventidEntry + nil, // 8: RoomData.BoxEntry + nil, // 9: RoomData.ShopEntry + nil, // 10: DBStonehenge.UserbuffEntry + nil, // 11: DBStonehenge.HeroEntry + nil, // 12: DBStonehenge.RewardEntry + nil, // 13: DBStonehenge.AddweightEntry + nil, // 14: DBStonehenge.TalentEntry + nil, // 15: DBStonehenge.TalentpropertyEntry + nil, // 16: DBStoneBoss.BossstageEntry + nil, // 17: DBStonehengeBook.AwardEntry + nil, // 18: DBStonehengeBookAward.StageEntry + (*BattleRole)(nil), // 19: BattleRole } var file_stonehenge_stonehenge_db_proto_depIdxs = []int32{ - 5, // 0: RoomData.eventid:type_name -> RoomData.EventidEntry - 6, // 1: RoomData.box:type_name -> RoomData.BoxEntry - 1, // 2: DBStonehenge.rooms:type_name -> RoomData - 7, // 3: DBStonehenge.userbuff:type_name -> DBStonehenge.UserbuffEntry - 8, // 4: DBStonehenge.hero:type_name -> DBStonehenge.HeroEntry - 9, // 5: DBStonehenge.reward:type_name -> DBStonehenge.RewardEntry - 10, // 6: DBStonehenge.addweight:type_name -> DBStonehenge.AddweightEntry - 11, // 7: DBStonehenge.talent:type_name -> DBStonehenge.TalentEntry - 12, // 8: DBStonehenge.talentproperty:type_name -> DBStonehenge.TalentpropertyEntry - 0, // 9: DBStonehenge.privilege:type_name -> StonehengePrivilege - 13, // 10: DBStoneBoss.bossstage:type_name -> DBStoneBoss.BossstageEntry - 14, // 11: DBStonehenge.HeroEntry.value:type_name -> BattleRole - 3, // 12: DBStoneBoss.BossstageEntry.value:type_name -> StageData - 13, // [13:13] is the sub-list for method output_type - 13, // [13:13] is the sub-list for method input_type - 13, // [13:13] is the sub-list for extension type_name - 13, // [13:13] is the sub-list for extension extendee - 0, // [0:13] is the sub-list for field type_name + 7, // 0: RoomData.eventid:type_name -> RoomData.EventidEntry + 8, // 1: RoomData.box:type_name -> RoomData.BoxEntry + 9, // 2: RoomData.shop:type_name -> RoomData.ShopEntry + 1, // 3: DBStonehenge.rooms:type_name -> RoomData + 10, // 4: DBStonehenge.userbuff:type_name -> DBStonehenge.UserbuffEntry + 11, // 5: DBStonehenge.hero:type_name -> DBStonehenge.HeroEntry + 12, // 6: DBStonehenge.reward:type_name -> DBStonehenge.RewardEntry + 13, // 7: DBStonehenge.addweight:type_name -> DBStonehenge.AddweightEntry + 14, // 8: DBStonehenge.talent:type_name -> DBStonehenge.TalentEntry + 15, // 9: DBStonehenge.talentproperty:type_name -> DBStonehenge.TalentpropertyEntry + 0, // 10: DBStonehenge.privilege:type_name -> StonehengePrivilege + 16, // 11: DBStoneBoss.bossstage:type_name -> DBStoneBoss.BossstageEntry + 17, // 12: DBStonehengeBook.award:type_name -> DBStonehengeBook.AwardEntry + 18, // 13: DBStonehengeBookAward.stage:type_name -> DBStonehengeBookAward.StageEntry + 19, // 14: DBStonehenge.HeroEntry.value:type_name -> BattleRole + 3, // 15: DBStoneBoss.BossstageEntry.value:type_name -> StageData + 6, // 16: DBStonehengeBook.AwardEntry.value:type_name -> DBStonehengeBookAward + 17, // [17:17] is the sub-list for method output_type + 17, // [17:17] is the sub-list for method input_type + 17, // [17:17] is the sub-list for extension type_name + 17, // [17:17] is the sub-list for extension extendee + 0, // [0:17] is the sub-list for field type_name } func init() { file_stonehenge_stonehenge_db_proto_init() } @@ -677,6 +852,30 @@ func file_stonehenge_stonehenge_db_proto_init() { return nil } } + file_stonehenge_stonehenge_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBStonehengeBook); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_stonehenge_stonehenge_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBStonehengeBookAward); 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{ @@ -684,7 +883,7 @@ func file_stonehenge_stonehenge_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_stonehenge_stonehenge_db_proto_rawDesc, NumEnums: 1, - NumMessages: 13, + NumMessages: 18, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/stonehenge_msg.pb.go b/pb/stonehenge_msg.pb.go index 2acb07030..db0c4f2ed 100644 --- a/pb/stonehenge_msg.pb.go +++ b/pb/stonehenge_msg.pb.go @@ -794,19 +794,122 @@ func (x *StonehengeBattleResp) GetInfo() *BattleInfo { return nil } -//激活天赋 +//商店购买 +type StonehengeShopReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id +} + +func (x *StonehengeShopReq) Reset() { + *x = StonehengeShopReq{} + if protoimpl.UnsafeEnabled { + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *StonehengeShopReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*StonehengeShopReq) ProtoMessage() {} + +func (x *StonehengeShopReq) ProtoReflect() protoreflect.Message { + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[14] + 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 StonehengeShopReq.ProtoReflect.Descriptor instead. +func (*StonehengeShopReq) Descriptor() ([]byte, []int) { + return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{14} +} + +func (x *StonehengeShopReq) GetEventid() int32 { + if x != nil { + return x.Eventid + } + return 0 +} + +type StonehengeShopResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id + Shop map[int32]int32 `protobuf:"bytes,2,rep,name=shop,proto3" json:"shop" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 商店 +} + +func (x *StonehengeShopResp) Reset() { + *x = StonehengeShopResp{} + if protoimpl.UnsafeEnabled { + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *StonehengeShopResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*StonehengeShopResp) ProtoMessage() {} + +func (x *StonehengeShopResp) ProtoReflect() protoreflect.Message { + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[15] + 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 StonehengeShopResp.ProtoReflect.Descriptor instead. +func (*StonehengeShopResp) Descriptor() ([]byte, []int) { + return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{15} +} + +func (x *StonehengeShopResp) GetEventid() int32 { + if x != nil { + return x.Eventid + } + return 0 +} + +func (x *StonehengeShopResp) GetShop() map[int32]int32 { + if x != nil { + return x.Shop + } + return nil +} + +//激活天赋树 type StonehengeActivateTalentReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Node int32 `protobuf:"varint,1,opt,name=node,proto3" json:"node"` + Node int32 `protobuf:"varint,1,opt,name=node,proto3" json:"node"` //事件id } func (x *StonehengeActivateTalentReq) Reset() { *x = StonehengeActivateTalentReq{} if protoimpl.UnsafeEnabled { - mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[14] + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -819,7 +922,7 @@ func (x *StonehengeActivateTalentReq) String() string { func (*StonehengeActivateTalentReq) ProtoMessage() {} func (x *StonehengeActivateTalentReq) ProtoReflect() protoreflect.Message { - mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[14] + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -832,7 +935,7 @@ func (x *StonehengeActivateTalentReq) ProtoReflect() protoreflect.Message { // Deprecated: Use StonehengeActivateTalentReq.ProtoReflect.Descriptor instead. func (*StonehengeActivateTalentReq) Descriptor() ([]byte, []int) { - return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{14} + return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{16} } func (x *StonehengeActivateTalentReq) GetNode() int32 { @@ -842,22 +945,22 @@ func (x *StonehengeActivateTalentReq) GetNode() int32 { return 0 } -//激活天赋 +//激活天赋树 type StonehengeActivateTalentResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Node int32 `protobuf:"varint,1,opt,name=node,proto3" json:"node"` - Talent map[int32]bool `protobuf:"bytes,13,rep,name=talent,proto3" json:"talent" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋树 - Talentproperty map[string]int32 `protobuf:"bytes,14,rep,name=talentproperty,proto3" json:"talentproperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋属性 - Privilege []StonehengePrivilege `protobuf:"varint,15,rep,packed,name=privilege,proto3,enum=StonehengePrivilege" json:"privilege"` //解锁特权 + Node int32 `protobuf:"varint,1,opt,name=node,proto3" json:"node"` //事件id + Talent map[int32]bool `protobuf:"bytes,2,rep,name=talent,proto3" json:"talent" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋树 + Talentproperty map[string]int32 `protobuf:"bytes,3,rep,name=talentproperty,proto3" json:"talentproperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋属性 + Privilege []StonehengePrivilege `protobuf:"varint,4,rep,packed,name=privilege,proto3,enum=StonehengePrivilege" json:"privilege"` //解锁特权 } func (x *StonehengeActivateTalentResp) Reset() { *x = StonehengeActivateTalentResp{} if protoimpl.UnsafeEnabled { - mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[15] + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -870,7 +973,7 @@ func (x *StonehengeActivateTalentResp) String() string { func (*StonehengeActivateTalentResp) ProtoMessage() {} func (x *StonehengeActivateTalentResp) ProtoReflect() protoreflect.Message { - mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[15] + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -883,7 +986,7 @@ func (x *StonehengeActivateTalentResp) ProtoReflect() protoreflect.Message { // Deprecated: Use StonehengeActivateTalentResp.ProtoReflect.Descriptor instead. func (*StonehengeActivateTalentResp) Descriptor() ([]byte, []int) { - return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{15} + return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{17} } func (x *StonehengeActivateTalentResp) GetNode() int32 { @@ -914,6 +1017,213 @@ func (x *StonehengeActivateTalentResp) GetPrivilege() []StonehengePrivilege { return nil } +//激活图鉴进度奖励领取 +type StonehengeBookInfoReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *StonehengeBookInfoReq) Reset() { + *x = StonehengeBookInfoReq{} + if protoimpl.UnsafeEnabled { + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *StonehengeBookInfoReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*StonehengeBookInfoReq) ProtoMessage() {} + +func (x *StonehengeBookInfoReq) ProtoReflect() protoreflect.Message { + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[18] + 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 StonehengeBookInfoReq.ProtoReflect.Descriptor instead. +func (*StonehengeBookInfoReq) Descriptor() ([]byte, []int) { + return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{18} +} + +//激活天赋树 +type StonehengeBookInfoResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Info *DBStonehengeBook `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` +} + +func (x *StonehengeBookInfoResp) Reset() { + *x = StonehengeBookInfoResp{} + if protoimpl.UnsafeEnabled { + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *StonehengeBookInfoResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*StonehengeBookInfoResp) ProtoMessage() {} + +func (x *StonehengeBookInfoResp) ProtoReflect() protoreflect.Message { + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[19] + 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 StonehengeBookInfoResp.ProtoReflect.Descriptor instead. +func (*StonehengeBookInfoResp) Descriptor() ([]byte, []int) { + return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{19} +} + +func (x *StonehengeBookInfoResp) GetInfo() *DBStonehengeBook { + if x != nil { + return x.Info + } + return nil +} + +//激活图鉴进度奖励领取 +type StonehengeBookAwardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Btype int32 `protobuf:"varint,1,opt,name=btype,proto3" json:"btype"` + Stage int32 `protobuf:"varint,2,opt,name=stage,proto3" json:"stage"` +} + +func (x *StonehengeBookAwardReq) Reset() { + *x = StonehengeBookAwardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *StonehengeBookAwardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*StonehengeBookAwardReq) ProtoMessage() {} + +func (x *StonehengeBookAwardReq) ProtoReflect() protoreflect.Message { + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[20] + 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 StonehengeBookAwardReq.ProtoReflect.Descriptor instead. +func (*StonehengeBookAwardReq) Descriptor() ([]byte, []int) { + return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{20} +} + +func (x *StonehengeBookAwardReq) GetBtype() int32 { + if x != nil { + return x.Btype + } + return 0 +} + +func (x *StonehengeBookAwardReq) GetStage() int32 { + if x != nil { + return x.Stage + } + return 0 +} + +//激活天赋树 +type StonehengeBookAwardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Btype int32 `protobuf:"varint,1,opt,name=btype,proto3" json:"btype"` + Stage int32 `protobuf:"varint,2,opt,name=stage,proto3" json:"stage"` + Award []*UserAssets `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励 +} + +func (x *StonehengeBookAwardResp) Reset() { + *x = StonehengeBookAwardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *StonehengeBookAwardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*StonehengeBookAwardResp) ProtoMessage() {} + +func (x *StonehengeBookAwardResp) ProtoReflect() protoreflect.Message { + mi := &file_stonehenge_stonehenge_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 StonehengeBookAwardResp.ProtoReflect.Descriptor instead. +func (*StonehengeBookAwardResp) Descriptor() ([]byte, []int) { + return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{21} +} + +func (x *StonehengeBookAwardResp) GetBtype() int32 { + if x != nil { + return x.Btype + } + return 0 +} + +func (x *StonehengeBookAwardResp) GetStage() int32 { + if x != nil { + return x.Stage + } + return 0 +} + +func (x *StonehengeBookAwardResp) GetAward() []*UserAssets { + if x != nil { + return x.Award + } + return nil +} + var File_stonehenge_stonehenge_msg_proto protoreflect.FileDescriptor var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{ @@ -1015,36 +1325,65 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{ 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x31, 0x0a, - 0x1b, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, - 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, - 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, - 0x22, 0x82, 0x03, 0x0a, 0x1c, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, - 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x12, 0x41, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, - 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, - 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x59, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, - 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x31, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, - 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, - 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x12, 0x32, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, - 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, - 0x6e, 0x67, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x09, 0x70, 0x72, - 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 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, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 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, + 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2d, 0x0a, + 0x11, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, + 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x22, 0x9a, 0x01, 0x0a, + 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x31, 0x0a, + 0x04, 0x73, 0x68, 0x6f, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x53, 0x74, + 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, + 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x6f, 0x70, + 0x1a, 0x37, 0x0a, 0x09, 0x53, 0x68, 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, 0x22, 0x31, 0x0a, 0x1b, 0x53, 0x74, 0x6f, + 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x22, 0x82, 0x03, 0x0a, + 0x1c, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, + 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6e, 0x6f, 0x64, + 0x65, 0x12, 0x41, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x29, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, + 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, + 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x59, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x53, + 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, + 0x65, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x61, 0x6c, 0x65, + 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, + 0x32, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x18, 0x04, 0x20, 0x03, + 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, + 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, + 0x65, 0x67, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 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, 0x41, + 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 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, 0x17, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, + 0x6f, 0x6f, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3f, 0x0a, 0x16, 0x53, 0x74, + 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, + 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x44, 0x0a, 0x16, 0x53, + 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, + 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, + 0x65, 0x22, 0x68, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, + 0x6f, 0x6f, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, + 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, + 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, + 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1059,7 +1398,7 @@ func file_stonehenge_stonehenge_msg_proto_rawDescGZIP() []byte { return file_stonehenge_stonehenge_msg_proto_rawDescData } -var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21) +var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 28) var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{ (*StonehengeGetListReq)(nil), // 0: StonehengeGetListReq (*StonehengeGetListResp)(nil), // 1: StonehengeGetListResp @@ -1075,48 +1414,60 @@ var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{ (*StonehengeFinishResp)(nil), // 11: StonehengeFinishResp (*StonehengeBattleReq)(nil), // 12: StonehengeBattleReq (*StonehengeBattleResp)(nil), // 13: StonehengeBattleResp - (*StonehengeActivateTalentReq)(nil), // 14: StonehengeActivateTalentReq - (*StonehengeActivateTalentResp)(nil), // 15: StonehengeActivateTalentResp - nil, // 16: StonehengeEnterLevelResp.HeroEntry - nil, // 17: StonehengeEventResp.HeroEntry - nil, // 18: StonehengeEventResp.UserbuffEntry - nil, // 19: StonehengeActivateTalentResp.TalentEntry - nil, // 20: StonehengeActivateTalentResp.TalentpropertyEntry - (*DBStonehenge)(nil), // 21: DBStonehenge - (*DBStoneBoss)(nil), // 22: DBStoneBoss - (*RoomData)(nil), // 23: RoomData - (*BattleReport)(nil), // 24: BattleReport - (*UserAtno)(nil), // 25: UserAtno - (*BattleFormation)(nil), // 26: BattleFormation - (*BattleInfo)(nil), // 27: BattleInfo - (StonehengePrivilege)(0), // 28: StonehengePrivilege - (*BattleRole)(nil), // 29: BattleRole + (*StonehengeShopReq)(nil), // 14: StonehengeShopReq + (*StonehengeShopResp)(nil), // 15: StonehengeShopResp + (*StonehengeActivateTalentReq)(nil), // 16: StonehengeActivateTalentReq + (*StonehengeActivateTalentResp)(nil), // 17: StonehengeActivateTalentResp + (*StonehengeBookInfoReq)(nil), // 18: StonehengeBookInfoReq + (*StonehengeBookInfoResp)(nil), // 19: StonehengeBookInfoResp + (*StonehengeBookAwardReq)(nil), // 20: StonehengeBookAwardReq + (*StonehengeBookAwardResp)(nil), // 21: StonehengeBookAwardResp + nil, // 22: StonehengeEnterLevelResp.HeroEntry + nil, // 23: StonehengeEventResp.HeroEntry + nil, // 24: StonehengeEventResp.UserbuffEntry + nil, // 25: StonehengeShopResp.ShopEntry + nil, // 26: StonehengeActivateTalentResp.TalentEntry + nil, // 27: StonehengeActivateTalentResp.TalentpropertyEntry + (*DBStonehenge)(nil), // 28: DBStonehenge + (*DBStoneBoss)(nil), // 29: DBStoneBoss + (*RoomData)(nil), // 30: RoomData + (*BattleReport)(nil), // 31: BattleReport + (*UserAtno)(nil), // 32: UserAtno + (*BattleFormation)(nil), // 33: BattleFormation + (*BattleInfo)(nil), // 34: BattleInfo + (StonehengePrivilege)(0), // 35: StonehengePrivilege + (*DBStonehengeBook)(nil), // 36: DBStonehengeBook + (*UserAssets)(nil), // 37: UserAssets + (*BattleRole)(nil), // 38: BattleRole } var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{ - 21, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge - 22, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss - 16, // 2: StonehengeEnterLevelResp.hero:type_name -> StonehengeEnterLevelResp.HeroEntry - 23, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData - 23, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData - 24, // 5: StonehengeEventReq.report:type_name -> BattleReport - 23, // 6: StonehengeEventResp.room:type_name -> RoomData - 25, // 7: StonehengeEventResp.reward:type_name -> UserAtno - 17, // 8: StonehengeEventResp.hero:type_name -> StonehengeEventResp.HeroEntry - 18, // 9: StonehengeEventResp.userbuff:type_name -> StonehengeEventResp.UserbuffEntry - 23, // 10: StonehengeGetRoomInfoResp.room:type_name -> RoomData - 21, // 11: StonehengeFinishResp.data:type_name -> DBStonehenge - 26, // 12: StonehengeBattleReq.battle:type_name -> BattleFormation - 27, // 13: StonehengeBattleResp.info:type_name -> BattleInfo - 19, // 14: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry - 20, // 15: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry - 28, // 16: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege - 29, // 17: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole - 29, // 18: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole - 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 + 28, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge + 29, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss + 22, // 2: StonehengeEnterLevelResp.hero:type_name -> StonehengeEnterLevelResp.HeroEntry + 30, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData + 30, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData + 31, // 5: StonehengeEventReq.report:type_name -> BattleReport + 30, // 6: StonehengeEventResp.room:type_name -> RoomData + 32, // 7: StonehengeEventResp.reward:type_name -> UserAtno + 23, // 8: StonehengeEventResp.hero:type_name -> StonehengeEventResp.HeroEntry + 24, // 9: StonehengeEventResp.userbuff:type_name -> StonehengeEventResp.UserbuffEntry + 30, // 10: StonehengeGetRoomInfoResp.room:type_name -> RoomData + 28, // 11: StonehengeFinishResp.data:type_name -> DBStonehenge + 33, // 12: StonehengeBattleReq.battle:type_name -> BattleFormation + 34, // 13: StonehengeBattleResp.info:type_name -> BattleInfo + 25, // 14: StonehengeShopResp.shop:type_name -> StonehengeShopResp.ShopEntry + 26, // 15: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry + 27, // 16: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry + 35, // 17: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege + 36, // 18: StonehengeBookInfoResp.info:type_name -> DBStonehengeBook + 37, // 19: StonehengeBookAwardResp.award:type_name -> UserAssets + 38, // 20: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole + 38, // 21: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole + 22, // [22:22] is the sub-list for method output_type + 22, // [22:22] is the sub-list for method input_type + 22, // [22:22] is the sub-list for extension type_name + 22, // [22:22] is the sub-list for extension extendee + 0, // [0:22] is the sub-list for field type_name } func init() { file_stonehenge_stonehenge_msg_proto_init() } @@ -1298,7 +1649,7 @@ func file_stonehenge_stonehenge_msg_proto_init() { } } file_stonehenge_stonehenge_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StonehengeActivateTalentReq); i { + switch v := v.(*StonehengeShopReq); i { case 0: return &v.state case 1: @@ -1310,6 +1661,30 @@ func file_stonehenge_stonehenge_msg_proto_init() { } } file_stonehenge_stonehenge_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*StonehengeShopResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_stonehenge_stonehenge_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*StonehengeActivateTalentReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_stonehenge_stonehenge_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StonehengeActivateTalentResp); i { case 0: return &v.state @@ -1321,6 +1696,54 @@ func file_stonehenge_stonehenge_msg_proto_init() { return nil } } + file_stonehenge_stonehenge_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*StonehengeBookInfoReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_stonehenge_stonehenge_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*StonehengeBookInfoResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_stonehenge_stonehenge_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*StonehengeBookAwardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_stonehenge_stonehenge_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*StonehengeBookAwardResp); 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{ @@ -1328,7 +1751,7 @@ func file_stonehenge_stonehenge_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_stonehenge_stonehenge_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 21, + NumMessages: 28, NumExtensions: 0, NumServices: 0, }, From 04e3e99bde9312882c9859e254aa08873bf8495d Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 10 Aug 2023 20:42:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=BF=B7=E5=AE=AB?= =?UTF-8?q?=E5=A4=A9=E8=B5=8B=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 40 ++- bin/json/game_rdtasknpc.json | 2 +- bin/json/game_shop.json | 4 +- bin/json/game_stoneevent.json | 16 +- bin/json/game_stoneprivilege.json | 32 ++ bin/json/game_stonestore.json | 48 +-- bin/json/game_stonestory.json | 228 +++++++------- bin/json/game_stonetalent.json | 361 ++++++++++++++++++++++- bin/json/game_uigameminer.json | 60 ++-- modules/stonehenge/api_activatetalent.go | 68 ++++- modules/stonehenge/configure.go | 21 +- 11 files changed, 673 insertions(+), 207 deletions(-) create mode 100644 bin/json/game_stoneprivilege.json diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index ad7d952d8..07ead7916 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -24719,7 +24719,9 @@ "id": 50000001, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_869", @@ -24741,7 +24743,9 @@ "id": 50000002, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_870", @@ -24763,7 +24767,9 @@ "id": 50000003, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_871", @@ -24785,7 +24791,9 @@ "id": 50000004, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_872", @@ -24807,7 +24815,9 @@ "id": 50000005, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_873", @@ -24829,7 +24839,9 @@ "id": 50000006, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_874", @@ -24851,7 +24863,9 @@ "id": 50000007, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_875", @@ -24873,7 +24887,9 @@ "id": 50000008, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_876", @@ -24895,7 +24911,9 @@ "id": 50000009, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_877", @@ -24917,7 +24935,9 @@ "id": 50000010, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_878", diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 4eb44a230..2417930ed 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -2045,7 +2045,7 @@ "Levelid": 0, "datas": [ "GameMain", - "功能入口-魔药", + "20380-菲奥娜", "901" ], "event": [ diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json index 017afc1e8..d9b5e142c 100644 --- a/bin/json/game_shop.json +++ b/bin/json/game_shop.json @@ -22,8 +22,8 @@ "n": 1 } ], - "rtype": 2, - "rtime": 6, + "rtype": 1, + "rtime": 8, "rnum": 8, "rneed": [ { diff --git a/bin/json/game_stoneevent.json b/bin/json/game_stoneevent.json index 68e1f3817..9167e8fc3 100644 --- a/bin/json/game_stoneevent.json +++ b/bin/json/game_stoneevent.json @@ -150,7 +150,7 @@ "text": "商店" }, "EventType": 11, - "EventResource": "event_battle_51004", + "EventResource": "event_store", "Value1": 0, "Value2": 0, "Value3": 0, @@ -182,7 +182,7 @@ "text": "打开" }, "EventType": 17, - "EventResource": "event_rewardbox_1", + "EventResource": "event_rewardbox_2", "Value1": 200, "Value2": 3, "Value3": 0, @@ -374,7 +374,7 @@ "text": "剧情（首领战必出）" }, "EventType": 12, - "EventResource": "100001", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, @@ -390,7 +390,7 @@ "text": "剧情（常规）" }, "EventType": 12, - "EventResource": "100002", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, @@ -406,7 +406,7 @@ "text": "剧情（常规）" }, "EventType": 12, - "EventResource": "100003", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, @@ -422,7 +422,7 @@ "text": "剧情（常规）" }, "EventType": 12, - "EventResource": "100004", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, @@ -438,7 +438,7 @@ "text": "剧情（常规）" }, "EventType": 12, - "EventResource": "100005", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, @@ -454,7 +454,7 @@ "text": "剧情（常规）" }, "EventType": 12, - "EventResource": "100006", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, diff --git a/bin/json/game_stoneprivilege.json b/bin/json/game_stoneprivilege.json new file mode 100644 index 000000000..98eace06f --- /dev/null +++ b/bin/json/game_stoneprivilege.json @@ -0,0 +1,32 @@ +[ + { + "PrivilegeId": 1, + "Desc": { + "key": "stonehenge_privilege_Desc_1", + "text": "解锁“事件商店”中，复活事件" + }, + "Value1": 0, + "Value2": 0, + "Value3": 0 + }, + { + "PrivilegeId": 2, + "Desc": { + "key": "stonehenge_privilege_Desc_2", + "text": "解锁“事件商店”中，支援事件" + }, + "Value1": 0, + "Value2": 0, + "Value3": 0 + }, + { + "PrivilegeId": 3, + "Desc": { + "key": "stonehenge_privilege_Desc_3", + "text": "解锁“事件商店”中，更换符文事件" + }, + "Value1": 0, + "Value2": 0, + "Value3": 0 + } +] \ No newline at end of file diff --git a/bin/json/game_stonestore.json b/bin/json/game_stonestore.json index e6ec1a297..35e4c2b42 100644 --- a/bin/json/game_stonestore.json +++ b/bin/json/game_stonestore.json @@ -1,52 +1,32 @@ [ { "Id": 1, - "EventId": 0, + "EventId": 20000000, "EventDesc": { - "key": "", - "text": "" + "key": "stonehenge_eventstore_EventDesc_1", + "text": "支援" }, - "LimitTime": 0, + "LimitTime": 1, "PrivilegeId": 0 }, { "Id": 2, - "EventId": 0, + "EventId": 21000000, "EventDesc": { - "key": "", - "text": "" + "key": "stonehenge_eventstore_EventDesc_2", + "text": "选择一名英雄，可进行复活并将其血量恢复至100%" }, - "LimitTime": 0, - "PrivilegeId": 0 + "LimitTime": 1, + "PrivilegeId": 1 }, { "Id": 3, - "EventId": 0, + "EventId": 18000001, "EventDesc": { - "key": "", - "text": "" + "key": "stonehenge_eventstore_EventDesc_3", + "text": "回血" }, - "LimitTime": 0, - "PrivilegeId": 0 - }, - { - "Id": 4, - "EventId": 0, - "EventDesc": { - "key": "", - "text": "" - }, - "LimitTime": 0, - "PrivilegeId": 0 - }, - { - "Id": 5, - "EventId": 0, - "EventDesc": { - "key": "", - "text": "" - }, - "LimitTime": 0, - "PrivilegeId": 0 + "LimitTime": 2, + "PrivilegeId": 2 } ] \ No newline at end of file diff --git a/bin/json/game_stonestory.json b/bin/json/game_stonestory.json index 0cfb1d07b..44abe70ae 100644 --- a/bin/json/game_stonestory.json +++ b/bin/json/game_stonestory.json @@ -22,7 +22,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_1", + "key": "", "text": "" } }, @@ -49,7 +49,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_2", + "key": "", "text": "" } }, @@ -76,7 +76,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_3", + "key": "", "text": "" } }, @@ -103,7 +103,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_4", + "key": "", "text": "" } }, @@ -130,7 +130,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_5", + "key": "", "text": "" } }, @@ -157,7 +157,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_6", + "key": "", "text": "" } }, @@ -184,7 +184,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_7", + "key": "", "text": "" } }, @@ -211,7 +211,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_8", + "key": "", "text": "" } }, @@ -224,7 +224,7 @@ "text": "“来吧，告诉我，我们该从哪儿下手。”" }, "OptionEventIdGroup1": [ - "10" + "25100001,50,10" ], "EndEventId1": 0, "OptionDesc1": { @@ -232,7 +232,7 @@ "text": "拎起皮带猴抖一抖。（从随机三枚红色符文中选择一枚）" }, "OptionEventIdGroup2": [ - "13" + "25100001,50,13" ], "EndEventId2": 0, "OptionDesc2": { @@ -240,12 +240,12 @@ "text": "放珊迪！（战斗开始时，首领的体力下降20％）" }, "OptionEventIdGroup3": [ - "15" + "25100001,50,15" ], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_9", - "text": "不急，先磨磨枪。（随机强化2枚符文）" + "key": "", + "text": "" } }, { @@ -271,7 +271,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_10", + "key": "", "text": "" } }, @@ -298,7 +298,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_11", + "key": "", "text": "" } }, @@ -325,7 +325,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_12", + "key": "", "text": "" } }, @@ -352,7 +352,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_13", + "key": "", "text": "" } }, @@ -379,7 +379,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_14", + "key": "", "text": "" } }, @@ -406,7 +406,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_15", + "key": "", "text": "" } }, @@ -433,7 +433,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_16", + "key": "", "text": "" } }, @@ -460,7 +460,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_17", + "key": "", "text": "" } }, @@ -487,7 +487,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_18", + "key": "", "text": "" } }, @@ -514,7 +514,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_19", + "key": "", "text": "" } }, @@ -541,7 +541,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_20", + "key": "", "text": "" } }, @@ -568,7 +568,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_21", + "key": "", "text": "" } }, @@ -595,7 +595,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_22", + "key": "", "text": "" } }, @@ -622,7 +622,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_23", + "key": "", "text": "" } }, @@ -649,7 +649,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_24", + "key": "", "text": "" } }, @@ -676,7 +676,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_25", + "key": "", "text": "" } }, @@ -703,7 +703,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_26", + "key": "", "text": "" } }, @@ -716,7 +716,7 @@ "text": "“好吧，我犹豫了很久，还没下定决心。”菲尔按着太阳穴，“让我参考一下你的想法，你支持哪一只？”" }, "OptionEventIdGroup1": [ - "10" + "25100001,50,10" ], "EndEventId1": 0, "OptionDesc1": { @@ -724,7 +724,7 @@ "text": "支持挥舞小爪爪的那只。（随机获得1-2枚紫色品质攻击符文）" }, "OptionEventIdGroup2": [ - "12" + "25100001,50,12" ], "EndEventId2": 0, "OptionDesc2": { @@ -734,7 +734,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_27", + "key": "", "text": "" } }, @@ -761,7 +761,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_28", + "key": "", "text": "" } }, @@ -788,7 +788,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_29", + "key": "", "text": "" } }, @@ -815,7 +815,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_30", + "key": "", "text": "" } }, @@ -842,7 +842,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_31", + "key": "", "text": "" } }, @@ -869,7 +869,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_32", + "key": "", "text": "" } }, @@ -896,7 +896,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_33", + "key": "", "text": "" } }, @@ -923,7 +923,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_34", + "key": "", "text": "" } }, @@ -950,7 +950,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_35", + "key": "", "text": "" } }, @@ -977,7 +977,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_36", + "key": "", "text": "" } }, @@ -1004,7 +1004,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_37", + "key": "", "text": "" } }, @@ -1031,7 +1031,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_38", + "key": "", "text": "" } }, @@ -1044,7 +1044,7 @@ "text": "" }, "OptionEventIdGroup1": [ - "9" + "25100001,50,9" ], "EndEventId1": 0, "OptionDesc1": { @@ -1052,7 +1052,7 @@ "text": "这很简单。（随机获得1-2枚紫色品质辅助符文）" }, "OptionEventIdGroup2": [ - "11" + "25100001,50,11" ], "EndEventId2": 0, "OptionDesc2": { @@ -1062,7 +1062,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_39", + "key": "", "text": "" } }, @@ -1089,7 +1089,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_40", + "key": "", "text": "" } }, @@ -1116,7 +1116,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_41", + "key": "", "text": "" } }, @@ -1143,7 +1143,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_42", + "key": "", "text": "" } }, @@ -1170,7 +1170,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_43", + "key": "", "text": "" } }, @@ -1197,7 +1197,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_44", + "key": "", "text": "" } }, @@ -1224,7 +1224,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_45", + "key": "", "text": "" } }, @@ -1251,7 +1251,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_46", + "key": "", "text": "" } }, @@ -1278,7 +1278,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_47", + "key": "", "text": "" } }, @@ -1305,7 +1305,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_48", + "key": "", "text": "" } }, @@ -1332,7 +1332,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_49", + "key": "", "text": "" } }, @@ -1359,7 +1359,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_50", + "key": "", "text": "" } }, @@ -1372,7 +1372,7 @@ "text": "" }, "OptionEventIdGroup1": [ - "9" + "25100001,50,9" ], "EndEventId1": 0, "OptionDesc1": { @@ -1380,7 +1380,7 @@ "text": "这很简单。（随机获得1-2枚紫色品质辅助符文）" }, "OptionEventIdGroup2": [ - "11" + "25100001,50,11" ], "EndEventId2": 0, "OptionDesc2": { @@ -1390,7 +1390,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_51", + "key": "", "text": "" } }, @@ -1417,7 +1417,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_52", + "key": "", "text": "" } }, @@ -1446,7 +1446,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_53", + "key": "", "text": "" } }, @@ -1473,7 +1473,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_54", + "key": "", "text": "" } }, @@ -1502,7 +1502,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_55", + "key": "", "text": "" } }, @@ -1529,7 +1529,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_56", + "key": "", "text": "" } }, @@ -1556,7 +1556,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_57", + "key": "", "text": "" } }, @@ -1583,7 +1583,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_58", + "key": "", "text": "" } }, @@ -1610,7 +1610,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_59", + "key": "", "text": "" } }, @@ -1637,7 +1637,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_60", + "key": "", "text": "" } }, @@ -1664,7 +1664,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_61", + "key": "", "text": "" } }, @@ -1691,7 +1691,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_62", + "key": "", "text": "" } }, @@ -1718,7 +1718,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_63", + "key": "", "text": "" } }, @@ -1731,7 +1731,7 @@ "text": "" }, "OptionEventIdGroup1": [ - "10" + "25100001,50,10" ], "EndEventId1": 0, "OptionDesc1": { @@ -1739,7 +1739,7 @@ "text": "用长木棍。（随机强化2个已经获得的攻击符文）" }, "OptionEventIdGroup2": [ - "13" + "25100001,50,13" ], "EndEventId2": 0, "OptionDesc2": { @@ -1749,7 +1749,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_64", + "key": "", "text": "" } }, @@ -1776,7 +1776,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_65", + "key": "", "text": "" } }, @@ -1803,7 +1803,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_66", + "key": "", "text": "" } }, @@ -1830,7 +1830,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_67", + "key": "", "text": "" } }, @@ -1857,7 +1857,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_68", + "key": "", "text": "" } }, @@ -1884,7 +1884,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_69", + "key": "", "text": "" } }, @@ -1911,7 +1911,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_70", + "key": "", "text": "" } }, @@ -1938,7 +1938,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_71", + "key": "", "text": "" } }, @@ -1965,7 +1965,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_72", + "key": "", "text": "" } }, @@ -1992,7 +1992,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_73", + "key": "", "text": "" } }, @@ -2019,7 +2019,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_74", + "key": "", "text": "" } }, @@ -2046,7 +2046,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_75", + "key": "", "text": "" } }, @@ -2073,7 +2073,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_76", + "key": "", "text": "" } }, @@ -2100,7 +2100,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_77", + "key": "", "text": "" } }, @@ -2127,7 +2127,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_78", + "key": "", "text": "" } }, @@ -2154,7 +2154,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_79", + "key": "", "text": "" } }, @@ -2181,7 +2181,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_80", + "key": "", "text": "" } }, @@ -2208,7 +2208,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_81", + "key": "", "text": "" } }, @@ -2235,7 +2235,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_82", + "key": "", "text": "" } }, @@ -2262,7 +2262,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_83", + "key": "", "text": "" } }, @@ -2289,7 +2289,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_84", + "key": "", "text": "" } }, @@ -2316,7 +2316,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_85", + "key": "", "text": "" } }, @@ -2343,7 +2343,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_86", + "key": "", "text": "" } }, @@ -2356,7 +2356,7 @@ "text": "" }, "OptionEventIdGroup1": [ - "12" + "25100001,50,12" ], "EndEventId1": 0, "OptionDesc1": { @@ -2364,7 +2364,7 @@ "text": "爬上去！（随机强化2个已经获得的防御符文）" }, "OptionEventIdGroup2": [ - "17" + "25100001,50,17" ], "EndEventId2": 0, "OptionDesc2": { @@ -2374,7 +2374,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_87", + "key": "", "text": "" } }, @@ -2401,7 +2401,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_88", + "key": "", "text": "" } }, @@ -2428,7 +2428,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_89", + "key": "", "text": "" } }, @@ -2455,7 +2455,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_90", + "key": "", "text": "" } }, @@ -2482,7 +2482,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_91", + "key": "", "text": "" } }, @@ -2509,7 +2509,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_92", + "key": "", "text": "" } }, @@ -2536,7 +2536,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_93", + "key": "", "text": "" } }, @@ -2563,7 +2563,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_94", + "key": "", "text": "" } }, @@ -2590,7 +2590,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_95", + "key": "", "text": "" } }, @@ -2617,7 +2617,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_96", + "key": "", "text": "" } }, @@ -2644,7 +2644,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_97", + "key": "", "text": "" } }, @@ -2671,7 +2671,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_98", + "key": "", "text": "" } }, @@ -2698,7 +2698,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_99", + "key": "", "text": "" } }, @@ -2725,7 +2725,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_100", + "key": "", "text": "" } } diff --git a/bin/json/game_stonetalent.json b/bin/json/game_stonetalent.json index 0637a088a..46292f1ff 100644 --- a/bin/json/game_stonetalent.json +++ b/bin/json/game_stonetalent.json @@ -1 +1,360 @@ -[] \ No newline at end of file +[ + { + "Id": 1, + "NodeType": 2, + "NodeIcon": "", + "listIndex": 1, + "Front": [ + 0 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_1", + "text": "全局生命提升{0},全局攻击提升{1}" + }, + "Attribute": [ + { + "a": "hp", + "n": 75 + }, + { + "a": "atk", + "n": 100 + } + ] + }, + { + "Id": 2, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 1, + "Front": [ + 1 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 51 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_2", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 150 + } + ] + }, + { + "Id": 3, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 1, + "Front": [ + 1 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 52 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_3", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 225 + } + ] + }, + { + "Id": 4, + "NodeType": 2, + "NodeIcon": "", + "listIndex": 1, + "Front": [ + 2, + 3 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 1, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_4", + "text": "全局攻击提升{0}" + }, + "Attribute": [ + { + "a": "atk", + "n": 20 + } + ] + }, + { + "Id": 5, + "NodeType": 2, + "NodeIcon": "", + "listIndex": 2, + "Front": [ + 4 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 2, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_5", + "text": "全局攻击提升{0}" + }, + "Attribute": [ + { + "a": "atk", + "n": 40 + } + ] + }, + { + "Id": 6, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 2, + "Front": [ + 5 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_6", + "text": "全局攻击提升{0}" + }, + "Attribute": [ + { + "a": "atk", + "n": 60 + } + ] + }, + { + "Id": 7, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 2, + "Front": [ + 5 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_7", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 200 + } + ] + }, + { + "Id": 8, + "NodeType": 2, + "NodeIcon": "", + "listIndex": 2, + "Front": [ + 6, + 7 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 3, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_8", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 600 + } + ] + }, + { + "Id": 9, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 3, + "Front": [ + 8 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_9", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 300 + } + ] + }, + { + "Id": 10, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 3, + "Front": [ + 8 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_10", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 300 + } + ] + }, + { + "Id": 11, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 3, + "Front": [ + 9 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_11", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 300 + } + ] + }, + { + "Id": 12, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 3, + "Front": [ + 10 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_12", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 300 + } + ] + }, + { + "Id": 13, + "NodeType": 2, + "NodeIcon": "", + "listIndex": 3, + "Front": [ + 11, + 12 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_13", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 1100 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_uigameminer.json b/bin/json/game_uigameminer.json index 4700fb06a..7564cf15f 100644 --- a/bin/json/game_uigameminer.json +++ b/bin/json/game_uigameminer.json @@ -8,8 +8,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 100 + "x": 1518, + "y": 600 }, "itemjpg": "item_10000001" }, @@ -22,8 +22,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 101 + "x": 1090, + "y": 638 }, "itemjpg": "item_10000001" }, @@ -36,8 +36,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 102 + "x": 1881, + "y": 537 }, "itemjpg": "item_10000001" }, @@ -50,8 +50,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 103 + "x": 1229, + "y": 499 }, "itemjpg": "item_10000001" }, @@ -64,8 +64,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 104 + "x": 1707, + "y": 463 }, "itemjpg": "item_10000001" }, @@ -78,8 +78,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 105 + "x": 1518, + "y": 600 }, "itemjpg": "item_10000001" }, @@ -92,8 +92,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 106 + "x": 1090, + "y": 638 }, "itemjpg": "item_10000001" }, @@ -106,8 +106,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 107 + "x": 1881, + "y": 537 }, "itemjpg": "item_10000001" }, @@ -120,8 +120,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 108 + "x": 1229, + "y": 499 }, "itemjpg": "item_10000001" }, @@ -134,8 +134,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 109 + "x": 1707, + "y": 463 }, "itemjpg": "item_10000001" }, @@ -148,8 +148,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 110 + "x": 1518, + "y": 600 }, "itemjpg": "item_10000001" }, @@ -162,8 +162,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 111 + "x": 1090, + "y": 638 }, "itemjpg": "item_10000001" }, @@ -176,8 +176,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 112 + "x": 1881, + "y": 537 }, "itemjpg": "item_10000001" }, @@ -190,8 +190,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 113 + "x": 1229, + "y": 499 }, "itemjpg": "item_10000001" }, @@ -204,8 +204,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 114 + "x": 1707, + "y": 463 }, "itemjpg": "item_10000001" } diff --git a/modules/stonehenge/api_activatetalent.go b/modules/stonehenge/api_activatetalent.go index f428daf21..8f8c6e6d9 100644 --- a/modules/stonehenge/api_activatetalent.go +++ b/modules/stonehenge/api_activatetalent.go @@ -3,6 +3,7 @@ package stonehenge import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -13,13 +14,68 @@ func (this *apiComp) ActivateTalentCheck(session comm.IUserSession, req *pb.Ston func (this *apiComp) ActivateTalent(session comm.IUserSession, req *pb.StonehengeActivateTalentReq) (errdata *pb.ErrorData) { var ( - stone *pb.DBStonehenge - err error + info *pb.DBStonehenge + conf *cfg.GameStoneTalentData + ok bool + err error ) if errdata = this.ActivateTalentCheck(session, req); errdata != nil { return } - if stone, err = this.module.modelStonehenge.GetStonehengeData(session.GetUserId()); err != nil { + if info, err = this.module.modelStonehenge.GetStonehengeData(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.String(), + Message: err.Error(), + } + return + } + if conf, err = this.module.configure.getGameStoneTalentData(req.Node); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.String(), + Message: err.Error(), + } + return + } + + for _, v := range conf.Front { + if _, ok := info.Talent[v]; !ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.String(), + Message: "Front no unlock", + } + return + } + } + + if errdata = this.module.ConsumeRes(session, conf.CostItem, true); errdata != nil { + return + } + + info.Talent[req.Node] = true + for _, v := range conf.Attribute { + info.Talentproperty[v.A] += v.N + } + ok = false + if conf.PrivilegeId != 0 { + for _, v := range info.Privilege { + if int32(v) == conf.PrivilegeId { + ok = true + break + } + } + } + if !ok { + info.Privilege = append(info.Privilege, pb.StonehengePrivilege(conf.PrivilegeId)) + } + + if err = this.module.modelStonehenge.Change(session.GetUserId(), map[string]interface{}{ + "talent": info.Talent, + "talentproperty": info.Talentproperty, + "privilege": info.Privilege, + }); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.String(), @@ -30,9 +86,9 @@ func (this *apiComp) ActivateTalent(session comm.IUserSession, req *pb.Stoneheng session.SendMsg(string(this.module.GetType()), "activatetalent", &pb.StonehengeActivateTalentResp{ Node: req.Node, - Talent: stone.Talent, - Talentproperty: stone.Talentproperty, - Privilege: stone.Privilege, + Talent: info.Talent, + Talentproperty: info.Talentproperty, + Privilege: info.Privilege, }) return } diff --git a/modules/stonehenge/configure.go b/modules/stonehenge/configure.go index dd852a58a..50f6c3904 100644 --- a/modules/stonehenge/configure.go +++ b/modules/stonehenge/configure.go @@ -21,6 +21,7 @@ const ( game_eventconf = "game_stoneevent.json" game_bossconf = "game_stoneboss.json" game_battleconf = "game_stonebattle.json" + game_stonetalent = "game_stonetalent.json" ) ///背包配置管理组件 @@ -84,7 +85,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.LoadConfigure(game_roomconf, cfg.NewGameStoneRoom) err = this.LoadConfigure(game_bossconf, cfg.NewGameStoneBoss) err = this.LoadConfigure(game_battleconf, cfg.NewGameStoneBattle) - + err = this.LoadConfigure(game_stonetalent, cfg.NewGameStoneTalent) configure.RegisterConfigure(game_stageconf, cfg.NewGameStoneStage, this.LoadGameStoneStage) configure.RegisterConfigure(game_buffconf, cfg.NewGameStoneBuff, this.LoadGameStoneBuff) @@ -671,3 +672,21 @@ func (this *configureComp) GetBattleConfById(id int32) (data *cfg.GameStoneBattl err = comm.NewNotFoundConfErr(moduleName, game_battleconf, id) return } + +// 读取任务配置表 +func (this *configureComp) getGameStoneTalentData(id int32) (conf *cfg.GameStoneTalentData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_stonetalent); err != nil { + return + } else { + if conf, ok = v.(*cfg.GameStoneTalent).GetDataMap()[id]; !ok { + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_stonetalent, id) + this.module.Errorln(err) + return + } + } + return +}