From adaf4b91a5497b968fa71e4b01d34dd4fda9141e Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 16 Aug 2023 15:46:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E4=B8=89=E9=80=89=E4=B8=80bu?= =?UTF-8?q?ff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 3 - modules/stonehenge/api_enterlevel.go | 17 ++ .../stonehenge/modelStonehengePrivilege.go | 75 ------- pb/stonehenge_db.pb.go | 183 +++++------------- pb/stonehenge_msg.pb.go | 93 +++++---- 5 files changed, 113 insertions(+), 258 deletions(-) delete mode 100644 modules/stonehenge/modelStonehengePrivilege.go diff --git a/comm/const.go b/comm/const.go index 0811bea0f..db2252854 100644 --- a/comm/const.go +++ b/comm/const.go @@ -350,9 +350,6 @@ const ( // 迷宫图鉴 TableStonehengeBook = "stonehengebook" - - // 迷宫特权 - TableStonehengePrivilege = "stonehengeprivilege" ) // RPC服务接口定义处 diff --git a/modules/stonehenge/api_enterlevel.go b/modules/stonehenge/api_enterlevel.go index e7346768c..a3cd984bf 100644 --- a/modules/stonehenge/api_enterlevel.go +++ b/modules/stonehenge/api_enterlevel.go @@ -5,6 +5,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" + "strconv" ) //参数校验 @@ -139,6 +140,22 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt stone.Rooms.Eventid[v] = false } } + // 特权校验 + for _, v := range stone.Privilege { + if int32(v) == 8 { + if c, e := this.module.configure.getGameStonePrivilegeData(8); e != nil { + res := &cfg.Gameatn{ + A: "item", + T: strconv.Itoa(int(c.Value1)), + N: c.Value2, + } + if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil { + return + } + } + break + } + } // stageid 赋值 stone.StageID = req.Stageid update["stageID"] = stone.StageID diff --git a/modules/stonehenge/modelStonehengePrivilege.go b/modules/stonehenge/modelStonehengePrivilege.go deleted file mode 100644 index 958e23776..000000000 --- a/modules/stonehenge/modelStonehengePrivilege.go +++ /dev/null @@ -1,75 +0,0 @@ -package stonehenge - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/lego/core" - "go_dreamfactory/lego/sys/mgo" - "go_dreamfactory/modules" - "go_dreamfactory/pb" - - "go.mongodb.org/mongo-driver/bson/primitive" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/x/bsonx" -) - -// 特权 -type ModelStonehengePrivilege struct { - modules.MCompModel - module *Stonehenge -} - -//组件初始化接口 -func (this *ModelStonehengePrivilege) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { - this.TableName = comm.TableStonehengePrivilege - this.MCompModel.Init(service, module, comp, opt) - this.module = module.(*Stonehenge) - - //创建uid索引 - this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ - Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, - }) - return -} - -//获取特权 -func (this *ModelStonehengePrivilege) getStonehengePrivilege(uid string) (info *pb.DBStonehengePrivilege, err error) { - info = &pb.DBStonehengePrivilege{} - if err = this.Get(uid, info); err != nil && mgo.MongodbNil != err { // 创建一条初始的数据 - return - } - if mgo.MongodbNil == err { - info = &pb.DBStonehengePrivilege{ - Id: primitive.NewObjectID().Hex(), - Uid: uid, - Privilege: map[int32]int32{}, - } - err = this.Add(uid, info) - } - return -} - -// 激活特权信息 -func (this *ModelStonehengePrivilege) addStonehengePrivilege(uid string, privilegeId int32) { - var ( - info *pb.DBStonehengePrivilege - - ok bool - err error - ) - if info, err = this.getStonehengePrivilege(uid); err != nil { - this.module.Errorln(err) - return - } - - if _, ok = info.Privilege[privilegeId]; !ok { - - info.Privilege[privilegeId] = 1 - if err = this.Change(uid, map[string]interface{}{ - "privilege": info.Privilege, - }); err != nil { - this.module.Errorln(err) - return - } - } - return -} diff --git a/pb/stonehenge_db.pb.go b/pb/stonehenge_db.pb.go index 54e56e8fb..d9b2f29cc 100644 --- a/pb/stonehenge_db.pb.go +++ b/pb/stonehenge_db.pb.go @@ -630,70 +630,6 @@ func (x *DBStonehengeBookAward) GetStage() map[int32]bool { return nil } -// 特权 -type DBStonehengePrivilege 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"` - Privilege map[int32]int32 `protobuf:"bytes,4,rep,name=privilege,proto3" json:"privilege" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` -} - -func (x *DBStonehengePrivilege) Reset() { - *x = DBStonehengePrivilege{} - if protoimpl.UnsafeEnabled { - mi := &file_stonehenge_stonehenge_db_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DBStonehengePrivilege) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DBStonehengePrivilege) ProtoMessage() {} - -func (x *DBStonehengePrivilege) ProtoReflect() protoreflect.Message { - mi := &file_stonehenge_stonehenge_db_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use DBStonehengePrivilege.ProtoReflect.Descriptor instead. -func (*DBStonehengePrivilege) Descriptor() ([]byte, []int) { - return file_stonehenge_stonehenge_db_proto_rawDescGZIP(), []int{6} -} - -func (x *DBStonehengePrivilege) GetId() string { - if x != nil { - return x.Id - } - return "" -} - -func (x *DBStonehengePrivilege) GetUid() string { - if x != nil { - return x.Uid - } - return "" -} - -func (x *DBStonehengePrivilege) GetPrivilege() map[int32]int32 { - if x != nil { - return x.Privilege - } - return nil -} - var File_stonehenge_stonehenge_db_proto protoreflect.FileDescriptor var file_stonehenge_stonehenge_db_proto_rawDesc = []byte{ @@ -858,23 +794,11 @@ var file_stonehenge_stonehenge_db_proto_rawDesc = []byte{ 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, 0x22, 0xbc, 0x01, 0x0a, 0x15, 0x44, 0x42, 0x53, - 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, - 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, 0x43, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, - 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, - 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x2e, - 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, - 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x1a, 0x3c, 0x0a, 0x0e, 0x50, 0x72, 0x69, - 0x76, 0x69, 0x6c, 0x65, 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, 0x05, 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, + 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, } var ( @@ -890,7 +814,7 @@ 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, 23) +var file_stonehenge_stonehenge_db_proto_msgTypes = make([]protoimpl.MessageInfo, 21) var file_stonehenge_stonehenge_db_proto_goTypes = []interface{}{ (StonehengePrivilege)(0), // 0: StonehengePrivilege (*RoomData)(nil), // 1: RoomData @@ -899,52 +823,49 @@ var file_stonehenge_stonehenge_db_proto_goTypes = []interface{}{ (*DBStoneBoss)(nil), // 4: DBStoneBoss (*DBStonehengeBook)(nil), // 5: DBStonehengeBook (*DBStonehengeBookAward)(nil), // 6: DBStonehengeBookAward - (*DBStonehengePrivilege)(nil), // 7: DBStonehengePrivilege - nil, // 8: RoomData.EventidEntry - nil, // 9: RoomData.BoxEntry - nil, // 10: RoomData.ShopEntry - nil, // 11: RoomData.PassiveEntry - nil, // 12: DBStonehenge.UserbuffEntry - nil, // 13: DBStonehenge.HeroEntry - nil, // 14: DBStonehenge.RewardEntry - nil, // 15: DBStonehenge.AddweightEntry - nil, // 16: DBStonehenge.TalentEntry - nil, // 17: DBStonehenge.TalentpropertyEntry - nil, // 18: DBStonehenge.WeeklyrewardEntry - nil, // 19: DBStonehenge.TaskEntry - nil, // 20: DBStoneBoss.BossstageEntry - nil, // 21: DBStonehengeBook.AwardEntry - nil, // 22: DBStonehengeBookAward.StageEntry - nil, // 23: DBStonehengePrivilege.PrivilegeEntry - (*BattleRole)(nil), // 24: BattleRole + nil, // 7: RoomData.EventidEntry + nil, // 8: RoomData.BoxEntry + nil, // 9: RoomData.ShopEntry + nil, // 10: RoomData.PassiveEntry + nil, // 11: DBStonehenge.UserbuffEntry + nil, // 12: DBStonehenge.HeroEntry + nil, // 13: DBStonehenge.RewardEntry + nil, // 14: DBStonehenge.AddweightEntry + nil, // 15: DBStonehenge.TalentEntry + nil, // 16: DBStonehenge.TalentpropertyEntry + nil, // 17: DBStonehenge.WeeklyrewardEntry + nil, // 18: DBStonehenge.TaskEntry + nil, // 19: DBStoneBoss.BossstageEntry + nil, // 20: DBStonehengeBook.AwardEntry + nil, // 21: DBStonehengeBookAward.StageEntry + (*BattleRole)(nil), // 22: BattleRole } var file_stonehenge_stonehenge_db_proto_depIdxs = []int32{ - 8, // 0: RoomData.eventid:type_name -> RoomData.EventidEntry - 9, // 1: RoomData.box:type_name -> RoomData.BoxEntry - 10, // 2: RoomData.shop:type_name -> RoomData.ShopEntry - 11, // 3: RoomData.passive:type_name -> RoomData.PassiveEntry + 7, // 0: RoomData.eventid:type_name -> RoomData.EventidEntry + 8, // 1: RoomData.box:type_name -> RoomData.BoxEntry + 9, // 2: RoomData.shop:type_name -> RoomData.ShopEntry + 10, // 3: RoomData.passive:type_name -> RoomData.PassiveEntry 1, // 4: DBStonehenge.rooms:type_name -> RoomData - 12, // 5: DBStonehenge.userbuff:type_name -> DBStonehenge.UserbuffEntry - 13, // 6: DBStonehenge.hero:type_name -> DBStonehenge.HeroEntry - 14, // 7: DBStonehenge.reward:type_name -> DBStonehenge.RewardEntry - 15, // 8: DBStonehenge.addweight:type_name -> DBStonehenge.AddweightEntry - 16, // 9: DBStonehenge.talent:type_name -> DBStonehenge.TalentEntry - 17, // 10: DBStonehenge.talentproperty:type_name -> DBStonehenge.TalentpropertyEntry + 11, // 5: DBStonehenge.userbuff:type_name -> DBStonehenge.UserbuffEntry + 12, // 6: DBStonehenge.hero:type_name -> DBStonehenge.HeroEntry + 13, // 7: DBStonehenge.reward:type_name -> DBStonehenge.RewardEntry + 14, // 8: DBStonehenge.addweight:type_name -> DBStonehenge.AddweightEntry + 15, // 9: DBStonehenge.talent:type_name -> DBStonehenge.TalentEntry + 16, // 10: DBStonehenge.talentproperty:type_name -> DBStonehenge.TalentpropertyEntry 0, // 11: DBStonehenge.privilege:type_name -> StonehengePrivilege - 18, // 12: DBStonehenge.weeklyreward:type_name -> DBStonehenge.WeeklyrewardEntry - 19, // 13: DBStonehenge.task:type_name -> DBStonehenge.TaskEntry - 20, // 14: DBStoneBoss.bossstage:type_name -> DBStoneBoss.BossstageEntry - 21, // 15: DBStonehengeBook.award:type_name -> DBStonehengeBook.AwardEntry - 22, // 16: DBStonehengeBookAward.stage:type_name -> DBStonehengeBookAward.StageEntry - 23, // 17: DBStonehengePrivilege.privilege:type_name -> DBStonehengePrivilege.PrivilegeEntry - 24, // 18: DBStonehenge.HeroEntry.value:type_name -> BattleRole - 3, // 19: DBStoneBoss.BossstageEntry.value:type_name -> StageData - 6, // 20: DBStonehengeBook.AwardEntry.value:type_name -> DBStonehengeBookAward - 21, // [21:21] is the sub-list for method output_type - 21, // [21:21] is the sub-list for method input_type - 21, // [21:21] is the sub-list for extension type_name - 21, // [21:21] is the sub-list for extension extendee - 0, // [0:21] is the sub-list for field type_name + 17, // 12: DBStonehenge.weeklyreward:type_name -> DBStonehenge.WeeklyrewardEntry + 18, // 13: DBStonehenge.task:type_name -> DBStonehenge.TaskEntry + 19, // 14: DBStoneBoss.bossstage:type_name -> DBStoneBoss.BossstageEntry + 20, // 15: DBStonehengeBook.award:type_name -> DBStonehengeBook.AwardEntry + 21, // 16: DBStonehengeBookAward.stage:type_name -> DBStonehengeBookAward.StageEntry + 22, // 17: DBStonehenge.HeroEntry.value:type_name -> BattleRole + 3, // 18: DBStoneBoss.BossstageEntry.value:type_name -> StageData + 6, // 19: DBStonehengeBook.AwardEntry.value:type_name -> DBStonehengeBookAward + 20, // [20:20] is the sub-list for method output_type + 20, // [20:20] is the sub-list for method input_type + 20, // [20:20] is the sub-list for extension type_name + 20, // [20:20] is the sub-list for extension extendee + 0, // [0:20] is the sub-list for field type_name } func init() { file_stonehenge_stonehenge_db_proto_init() } @@ -1026,18 +947,6 @@ func file_stonehenge_stonehenge_db_proto_init() { return nil } } - file_stonehenge_stonehenge_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBStonehengePrivilege); 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{ @@ -1045,7 +954,7 @@ func file_stonehenge_stonehenge_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_stonehenge_stonehenge_db_proto_rawDesc, NumEnums: 1, - NumMessages: 23, + NumMessages: 21, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/stonehenge_msg.pb.go b/pb/stonehenge_msg.pb.go index 9d5be3999..b6bf77da0 100644 --- a/pb/stonehenge_msg.pb.go +++ b/pb/stonehenge_msg.pb.go @@ -1678,15 +1678,17 @@ func (x *StonehengeTaskReceiveResp) GetAward() []*UserAssets { return nil } -//获取特权列表 -type StonehengePrivilegeInfoReq struct { +// 重置三选一 +type StonehengeResetBuffReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + + Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` } -func (x *StonehengePrivilegeInfoReq) Reset() { - *x = StonehengePrivilegeInfoReq{} +func (x *StonehengeResetBuffReq) Reset() { + *x = StonehengeResetBuffReq{} if protoimpl.UnsafeEnabled { mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1694,13 +1696,13 @@ func (x *StonehengePrivilegeInfoReq) Reset() { } } -func (x *StonehengePrivilegeInfoReq) String() string { +func (x *StonehengeResetBuffReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*StonehengePrivilegeInfoReq) ProtoMessage() {} +func (*StonehengeResetBuffReq) ProtoMessage() {} -func (x *StonehengePrivilegeInfoReq) ProtoReflect() protoreflect.Message { +func (x *StonehengeResetBuffReq) ProtoReflect() protoreflect.Message { mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1712,22 +1714,28 @@ func (x *StonehengePrivilegeInfoReq) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use StonehengePrivilegeInfoReq.ProtoReflect.Descriptor instead. -func (*StonehengePrivilegeInfoReq) Descriptor() ([]byte, []int) { +// Deprecated: Use StonehengeResetBuffReq.ProtoReflect.Descriptor instead. +func (*StonehengeResetBuffReq) Descriptor() ([]byte, []int) { return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{30} } -// 秘境特权信息 -type StonehengePrivilegeInfoResp struct { +func (x *StonehengeResetBuffReq) GetEventid() int32 { + if x != nil { + return x.Eventid + } + return 0 +} + +type StonehengeResetBuffResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Info *DBStonehengePrivilege `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` + Selectbuff []int32 `protobuf:"varint,1,rep,packed,name=selectbuff,proto3" json:"selectbuff"` } -func (x *StonehengePrivilegeInfoResp) Reset() { - *x = StonehengePrivilegeInfoResp{} +func (x *StonehengeResetBuffResp) Reset() { + *x = StonehengeResetBuffResp{} if protoimpl.UnsafeEnabled { mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1735,13 +1743,13 @@ func (x *StonehengePrivilegeInfoResp) Reset() { } } -func (x *StonehengePrivilegeInfoResp) String() string { +func (x *StonehengeResetBuffResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*StonehengePrivilegeInfoResp) ProtoMessage() {} +func (*StonehengeResetBuffResp) ProtoMessage() {} -func (x *StonehengePrivilegeInfoResp) ProtoReflect() protoreflect.Message { +func (x *StonehengeResetBuffResp) ProtoReflect() protoreflect.Message { mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1753,14 +1761,14 @@ func (x *StonehengePrivilegeInfoResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use StonehengePrivilegeInfoResp.ProtoReflect.Descriptor instead. -func (*StonehengePrivilegeInfoResp) Descriptor() ([]byte, []int) { +// Deprecated: Use StonehengeResetBuffResp.ProtoReflect.Descriptor instead. +func (*StonehengeResetBuffResp) Descriptor() ([]byte, []int) { return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{31} } -func (x *StonehengePrivilegeInfoResp) GetInfo() *DBStonehengePrivilege { +func (x *StonehengeResetBuffResp) GetSelectbuff() []int32 { if x != nil { - return x.Info + return x.Selectbuff } return nil } @@ -1985,14 +1993,15 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{ 0x61, 0x73, 0x6b, 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, 0x22, 0x1c, 0x0a, 0x1a, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, - 0x67, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, - 0x65, 0x71, 0x22, 0x49, 0x0a, 0x1b, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, - 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x2a, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x16, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x72, - 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0x32, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, + 0x67, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x42, 0x75, 0x66, 0x66, 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, 0x39, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, + 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x75, 0x66, + 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, + 0x75, 0x66, 0x66, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -2039,8 +2048,8 @@ var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{ (*StonehengeTaskInfoResp)(nil), // 27: StonehengeTaskInfoResp (*StonehengeTaskReceiveReq)(nil), // 28: StonehengeTaskReceiveReq (*StonehengeTaskReceiveResp)(nil), // 29: StonehengeTaskReceiveResp - (*StonehengePrivilegeInfoReq)(nil), // 30: StonehengePrivilegeInfoReq - (*StonehengePrivilegeInfoResp)(nil), // 31: StonehengePrivilegeInfoResp + (*StonehengeResetBuffReq)(nil), // 30: StonehengeResetBuffReq + (*StonehengeResetBuffResp)(nil), // 31: StonehengeResetBuffResp nil, // 32: StonehengeEnterLevelResp.HeroEntry nil, // 33: StonehengeEventResp.HeroEntry nil, // 34: StonehengeEventResp.UserbuffEntry @@ -2061,8 +2070,7 @@ var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{ (*DBStonehengeBook)(nil), // 49: DBStonehengeBook (*UserAssets)(nil), // 50: UserAssets (*ConIProgress)(nil), // 51: ConIProgress - (*DBStonehengePrivilege)(nil), // 52: DBStonehengePrivilege - (*BattleRole)(nil), // 53: BattleRole + (*BattleRole)(nil), // 52: BattleRole } var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{ 41, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge @@ -2093,14 +2101,13 @@ var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{ 39, // 25: StonehengeTaskInfoResp.task:type_name -> StonehengeTaskInfoResp.TaskEntry 40, // 26: StonehengeTaskReceiveResp.task:type_name -> StonehengeTaskReceiveResp.TaskEntry 50, // 27: StonehengeTaskReceiveResp.award:type_name -> UserAssets - 52, // 28: StonehengePrivilegeInfoResp.info:type_name -> DBStonehengePrivilege - 53, // 29: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole - 53, // 30: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole - 31, // [31:31] is the sub-list for method output_type - 31, // [31:31] is the sub-list for method input_type - 31, // [31:31] is the sub-list for extension type_name - 31, // [31:31] is the sub-list for extension extendee - 0, // [0:31] is the sub-list for field type_name + 52, // 28: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole + 52, // 29: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole + 30, // [30:30] is the sub-list for method output_type + 30, // [30:30] is the sub-list for method input_type + 30, // [30:30] is the sub-list for extension type_name + 30, // [30:30] is the sub-list for extension extendee + 0, // [0:30] is the sub-list for field type_name } func init() { file_stonehenge_stonehenge_msg_proto_init() } @@ -2475,7 +2482,7 @@ func file_stonehenge_stonehenge_msg_proto_init() { } } file_stonehenge_stonehenge_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StonehengePrivilegeInfoReq); i { + switch v := v.(*StonehengeResetBuffReq); i { case 0: return &v.state case 1: @@ -2487,7 +2494,7 @@ func file_stonehenge_stonehenge_msg_proto_init() { } } file_stonehenge_stonehenge_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StonehengePrivilegeInfoResp); i { + switch v := v.(*StonehengeResetBuffResp); i { case 0: return &v.state case 1: