From bba209803053eb83ed1d659968b01eff7df2a06d Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 6 Jul 2023 18:11:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?pb=20=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pb/activity_db.pb.go | 22 ++--- pb/viking_db.pb.go | 186 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 179 insertions(+), 29 deletions(-) diff --git a/pb/activity_db.pb.go b/pb/activity_db.pb.go index b423a3d1a..ed35a5b0c 100644 --- a/pb/activity_db.pb.go +++ b/pb/activity_db.pb.go @@ -329,7 +329,7 @@ type DBActivityData struct { 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"` - Hid int32 `protobuf:"varint,3,opt,name=hid,proto3" json:"hid"` + Hdid int32 `protobuf:"varint,3,opt,name=hdid,proto3" json:"hdid"` Gotarr []int32 `protobuf:"varint,4,rep,packed,name=gotarr,proto3" json:"gotarr"` Lasttime int64 `protobuf:"varint,5,opt,name=lasttime,proto3" json:"lasttime"` Val int32 `protobuf:"varint,6,opt,name=val,proto3" json:"val"` @@ -381,9 +381,9 @@ func (x *DBActivityData) GetUid() string { return "" } -func (x *DBActivityData) GetHid() int32 { +func (x *DBActivityData) GetHdid() int32 { if x != nil { - return x.Hid + return x.Hdid } return 0 } @@ -450,16 +450,16 @@ var file_activity_activity_db_proto_rawDesc = []byte{ 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, - 0x8a, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, + 0x8c, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 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, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, - 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, 0x1a, - 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, - 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, + 0x72, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, + 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, + 0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/viking_db.pb.go b/pb/viking_db.pb.go index 13023b1b0..5cea1d8d4 100644 --- a/pb/viking_db.pb.go +++ b/pb/viking_db.pb.go @@ -220,6 +220,126 @@ func (x *DBVikingRank) GetCostTime() int32 { return 0 } +// 装备副本DBVSeasonRank +type DBVSeasonRank 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" bson:"uid"` //用户ID + Difficulty int32 `protobuf:"varint,3,opt,name=difficulty,proto3" json:"difficulty"` // 难度 + Bosstype int32 `protobuf:"varint,4,opt,name=bosstype,proto3" json:"bosstype"` // boss类型塔类型 + Nickname string `protobuf:"bytes,5,opt,name=nickname,proto3" json:"nickname"` // 昵称 + Icon string `protobuf:"bytes,6,opt,name=icon,proto3" json:"icon"` // 玩家头像 + Lv int32 `protobuf:"varint,7,opt,name=lv,proto3" json:"lv"` // 玩家等级 + Leadpos int32 `protobuf:"varint,8,opt,name=leadpos,proto3" json:"leadpos"` //队长位置 + Line []*LineUp `protobuf:"bytes,9,rep,name=line,proto3" json:"line"` // 阵容数据 + Huihe int32 `protobuf:"varint,10,opt,name=huihe,proto3" json:"huihe"` // 平均回合数 建议*10 +} + +func (x *DBVSeasonRank) Reset() { + *x = DBVSeasonRank{} + if protoimpl.UnsafeEnabled { + mi := &file_viking_viking_db_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBVSeasonRank) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBVSeasonRank) ProtoMessage() {} + +func (x *DBVSeasonRank) ProtoReflect() protoreflect.Message { + mi := &file_viking_viking_db_proto_msgTypes[2] + 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 DBVSeasonRank.ProtoReflect.Descriptor instead. +func (*DBVSeasonRank) Descriptor() ([]byte, []int) { + return file_viking_viking_db_proto_rawDescGZIP(), []int{2} +} + +func (x *DBVSeasonRank) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBVSeasonRank) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBVSeasonRank) GetDifficulty() int32 { + if x != nil { + return x.Difficulty + } + return 0 +} + +func (x *DBVSeasonRank) GetBosstype() int32 { + if x != nil { + return x.Bosstype + } + return 0 +} + +func (x *DBVSeasonRank) GetNickname() string { + if x != nil { + return x.Nickname + } + return "" +} + +func (x *DBVSeasonRank) GetIcon() string { + if x != nil { + return x.Icon + } + return "" +} + +func (x *DBVSeasonRank) GetLv() int32 { + if x != nil { + return x.Lv + } + return 0 +} + +func (x *DBVSeasonRank) GetLeadpos() int32 { + if x != nil { + return x.Leadpos + } + return 0 +} + +func (x *DBVSeasonRank) GetLine() []*LineUp { + if x != nil { + return x.Line + } + return nil +} + +func (x *DBVSeasonRank) GetHuihe() int32 { + if x != nil { + return x.Huihe + } + return 0 +} + var File_viking_viking_db_proto protoreflect.FileDescriptor var file_viking_viking_db_proto_rawDesc = []byte{ @@ -264,7 +384,23 @@ var file_viking_viking_db_proto_rawDesc = []byte{ 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0xfa, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x56, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x61, + 0x6e, 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, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, + 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, + 0x75, 0x6c, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, + 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, + 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, + 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, + 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, + 0x6e, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, + 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, + 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -279,25 +415,27 @@ func file_viking_viking_db_proto_rawDescGZIP() []byte { return file_viking_viking_db_proto_rawDescData } -var file_viking_viking_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_viking_viking_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_viking_viking_db_proto_goTypes = []interface{}{ - (*DBViking)(nil), // 0: DBViking - (*DBVikingRank)(nil), // 1: DBVikingRank - nil, // 2: DBViking.BossEntry - nil, // 3: DBViking.BossTimeEntry - nil, // 4: DBViking.PsEntry - (*LineUp)(nil), // 5: LineUp + (*DBViking)(nil), // 0: DBViking + (*DBVikingRank)(nil), // 1: DBVikingRank + (*DBVSeasonRank)(nil), // 2: DBVSeasonRank + nil, // 3: DBViking.BossEntry + nil, // 4: DBViking.BossTimeEntry + nil, // 5: DBViking.PsEntry + (*LineUp)(nil), // 6: LineUp } var file_viking_viking_db_proto_depIdxs = []int32{ - 2, // 0: DBViking.boss:type_name -> DBViking.BossEntry - 3, // 1: DBViking.bossTime:type_name -> DBViking.BossTimeEntry - 4, // 2: DBViking.ps:type_name -> DBViking.PsEntry - 5, // 3: DBVikingRank.line:type_name -> LineUp - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 3, // 0: DBViking.boss:type_name -> DBViking.BossEntry + 4, // 1: DBViking.bossTime:type_name -> DBViking.BossTimeEntry + 5, // 2: DBViking.ps:type_name -> DBViking.PsEntry + 6, // 3: DBVikingRank.line:type_name -> LineUp + 6, // 4: DBVSeasonRank.line:type_name -> LineUp + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_viking_viking_db_proto_init() } @@ -331,6 +469,18 @@ func file_viking_viking_db_proto_init() { return nil } } + file_viking_viking_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBVSeasonRank); 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{ @@ -338,7 +488,7 @@ func file_viking_viking_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_viking_viking_db_proto_rawDesc, NumEnums: 0, - NumMessages: 5, + NumMessages: 6, NumExtensions: 0, NumServices: 0, }, From cd2e9e18ac0bd3ca5669c90fb050f5877facc7bf Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 6 Jul 2023 22:59:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=BB=A1=E5=A4=A9?= =?UTF-8?q?=E8=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/gm/api_cmd.go | 1 + modules/hero/configure_comp.go | 19 ++++++++++++++++++- modules/hero/model_talent.go | 8 ++++++++ modules/hero/module.go | 22 ++++++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/modules/gm/api_cmd.go b/modules/gm/api_cmd.go index 68af62b29..73e3fc64d 100644 --- a/modules/gm/api_cmd.go +++ b/modules/gm/api_cmd.go @@ -39,6 +39,7 @@ import ( 23、bingo:viplv,50 24、bingo:cleannpc 31、bingo:jx // 获得所有教习资源 +32、bingo:godlike // 一键超神 */ //参数校验 func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (errdata *pb.ErrorData) { diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index 3eeeb97c1..0ad802d11 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -1,4 +1,3 @@ - package hero import ( @@ -477,3 +476,21 @@ func (this *configureComp) GetHeroByPool(pool string) (hid string, err error) { err = comm.NewNotFoundConfErr(moduleName, hero_cardpool, pool) return } + +// gm 用 不管性能 +func (this *configureComp) GMGetTalentByHeroId(hid string) (data []*cfg.GameHeroTalentData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(hero_talent); err == nil { + if configure, ok := v.(*cfg.GameHeroTalent); ok { + for _, v1 := range configure.GetDataList() { + if v1.Hid == hid { + data = append(data, v1) + } + } + } + } + err = comm.NewNotFoundConfErr(moduleName, hero_talent, hid) + return +} diff --git a/modules/hero/model_talent.go b/modules/hero/model_talent.go index 798b2efc8..392357dc0 100644 --- a/modules/hero/model_talent.go +++ b/modules/hero/model_talent.go @@ -68,3 +68,11 @@ func (this *ModelTalent) CreateHeroTalent(uid, heroId string) (talent *pb.DBHero err = this.AddList(uid, talent.Id, talent) return } + +// gm 专用 清除所有的天赋 + +func (this *ModelTalent) CleanAllHeroTalent(uid string) (talent *pb.DBHeroTalent, err error) { + + err = this.DelByUId(uid) + return +} diff --git a/modules/hero/module.go b/modules/hero/module.go index e59c915aa..d56130d81 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -703,6 +703,28 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession) (errdata *pb.ErrorDat "juexProperty": hero.JuexProperty, } + if true { // 满天赋 + //var talent *pb.DBHeroTalent + talnet, _ := this.modelTalent.GetHerotalent(session.GetUserId()) + this.modelTalent.CleanAllHeroTalent(session.GetUserId()) + data, err := this.configure.GMGetTalentByHeroId(hero.HeroID) + if err == nil { + for _, v := range talnet { + if v.HeroId == hero.HeroID { + for _, v2 := range data { + v.Talent[v2.Skillid] = 1 + } + } + } + } + // talent.Talent[req.TalentID] = 1 + // update := make(map[string]interface{}, 0) + // update["talent"] = talent.Talent + // if err = this.module.modelTalent.ChangeHeroTalent(talent, update); err != nil { + // this.module.Errorf("update failed :%v", err) + // } + // this.modelHero.setTalentProperty(hero) + } // 保存数据 err = this.modelHero.ChangeList(session.GetUserId(), hero.Id, _heroMap) if err != nil {