From 4b150256d07717d51ff7108f755768fce222d9e9 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 2 Aug 2022 12:05:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8F=91=E6=94=BE?= =?UTF-8?q?=E6=B6=88=E8=80=97=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 4 +- modules/hero/model_hero.go | 25 ++--- modules/hero/module.go | 18 +++- modules/mail/api_getAttachment.go | 2 +- modules/mail/api_readmail.go | 2 +- modules/modulebase.go | 153 +++++++++++++++--------------- modules/user/module.go | 68 +++++++++++++ 7 files changed, 177 insertions(+), 95 deletions(-) diff --git a/comm/imodule.go b/comm/imodule.go index 74489d394..460cae600 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -40,7 +40,7 @@ type ( //创建指定数量 CreateRepeatHero(uid string, heroCfgId string, num int32) (*pb.DBHero, error) // 批量创建英雄 - CreateRepeatHeros(session IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode) + CreateRepeatHeros(session IUserSession, heros map[string]int32, bPush bool) (code pb.ErrorCode) // 获取英雄 // heroId 英雄ID GetHeroByObjID(uid, heroId string) (*pb.DBHero, pb.ErrorCode) @@ -64,6 +64,8 @@ type ( QueryAttributeValue(uid string, attr string) (value int32) //添加/减少属性值 第四个参数控制是否推送给前端 AddAttributeValue(session IUserSession, attr string, add int32, bPush bool) (code pb.ErrorCode) + // 批量处理 + AddAttributeValues(session IUserSession, attrs map[string]int32, bPush bool) (code pb.ErrorCode) //用户改变事件 EventUserChanged(session IUserSession) //获取用户expand diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index e03bc604a..c66ca69b3 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -112,20 +112,23 @@ func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int hero = this.initHero(uid, heroCfgId) if hero != nil { // 添加图鉴 - if result, err1 := this.moduleHero.ModuleUser.GetUserExpand(uid); err1 == nil { - sz := make(map[string]bool, 0) - for k := range result.GetTujian() { - sz[k] = true - } - if _, ok := result.GetTujian()[heroCfgId]; !ok { - sz[heroCfgId] = true - initUpdate := map[string]interface{}{ - "tujian": sz, + go func(uid, heroCfgId string) { // 携程处理 图鉴数据 + if result, err1 := this.moduleHero.ModuleUser.GetUserExpand(uid); err1 == nil { + sz := make(map[string]bool, 0) + for k := range result.GetTujian() { + sz[k] = true } + if _, ok := result.GetTujian()[heroCfgId]; !ok { + sz[heroCfgId] = true + initUpdate := map[string]interface{}{ + "tujian": sz, + } - this.moduleHero.ModuleUser.ChangeUserExpand(uid, initUpdate) + this.moduleHero.ModuleUser.ChangeUserExpand(uid, initUpdate) + } } - } + }(uid, heroCfgId) + hero.SameCount = count if err = this.moduleHero.modelHero.AddList(uid, hero.Id, hero); err != nil { this.moduleHero.Errorf("%v", err) diff --git a/modules/hero/module.go b/modules/hero/module.go index a64692368..1b2511024 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -159,14 +159,22 @@ func (this *Hero) EventUserOffline(session comm.IUserSession) { } // 批量创建多个英雄 -func (this *Hero) CreateRepeatHeros(session comm.IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode) { - - for heroCfgId, num := range items { - _, err := this.modelHero.createHeroOverlying(session.GetUserId(), heroCfgId, num) +func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string]int32, bPush bool) (code pb.ErrorCode) { + changeHero := make([]*pb.DBHero, 0) + for heroCfgId, num := range heros { + if num == 0 { // 数量为0 不做处理 + continue + } + hero, err := this.modelHero.createHeroOverlying(session.GetUserId(), heroCfgId, num) if err != nil { code = pb.ErrorCode_HeroCreate - break + return } + changeHero = append(changeHero, hero) + } + + if bPush && len(changeHero) > 0 { //推送 + session.SendMsg("hero", "change", &pb.HeroChangePush{List: changeHero}) } return diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index 80a1a373e..f0f790ff7 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -47,7 +47,7 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma if code == pb.ErrorCode_Success { // 修改状态 this.module.modelMail.MailUpdateMailAttachmentState(req.ObjID) - mail.Reward = true + //mail.Reward = true //return } } diff --git a/modules/mail/api_readmail.go b/modules/mail/api_readmail.go index 0b34a01e1..6f0d09609 100644 --- a/modules/mail/api_readmail.go +++ b/modules/mail/api_readmail.go @@ -33,7 +33,7 @@ func (this *apiComp) ReadMail(session comm.IUserSession, req *pb.MailReadMailReq return } this.module.Debugf("read mail %v", mail) - mail.Check = true + session.SendMsg(string(this.module.GetType()), "readmail", &pb.MailReadMailResp{Mail: mail}) return } diff --git a/modules/modulebase.go b/modules/modulebase.go index 62e3a97b4..5df5317c7 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -178,71 +178,56 @@ func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Game_atn) //消耗资源 func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Game_atn, bPush bool) (code pb.ErrorCode) { var ( - amount int32 + items map[string]int32 // 道具背包 批量处理 + attrs map[string]int32 // 属性 ) + items = make(map[string]int32, 0) + attrs = make(map[string]int32, 0) + for _, v := range res { + switch v.A { + case comm.AttrType: + attrs[v.T] -= v.N + case comm.ItemType: + items[v.T] -= v.N + default: + this.Errorf("not found res type") // 找不到资源类型 + } + } source := &comm.ModuleCallSource{ Module: string(this.module.GetType()), FuncName: "CheckConsumeRes", Describe: "消耗资源", } - //校验消费资源是否充足 - for _, v := range res { - if v.A == comm.AttrType { //用户属性资源 - if amount = this.ModuleUser.QueryAttributeValue(session.GetUserId(), v.T); amount < v.N { - code = pb.ErrorCode_ResNoEnough - this.Errorf("道具不足:A:%s,T:%s,N:%d", v.A, v.T, v.N) - return - } - } else if v.A == comm.ItemType { //道具资源 - // if resID, err = strconv.Atoi(v.T); err != nil { - // code = pb.ErrorCode_ConfigurationException - // return - // } - if amount = int32(this.ModuleItems.QueryItemAmount(source, session.GetUserId(), v.T)); amount < v.N { - code = pb.ErrorCode_ResNoEnough - this.Errorf("道具不足:A:%s,T:%s,N:%d", v.A, v.T, v.N) - return - } + // 校验数量 + for k, v := range attrs { + if this.ModuleUser.QueryAttributeValue(session.GetUserId(), k) < -v { // -v 负负得正 + code = pb.ErrorCode_ResNoEnough + this.Errorf("资源不足: A: attr, T: %s, N: %d", k, v) + return } - // else if v.A == comm.HeroType { //卡片资源 - // if resID, err = strconv.Atoi(v.T); err != nil { - // code = pb.ErrorCode_ConfigurationException - // return - // } - // if amount = int32(this.ModuleHero.QueryHeroAmount(uid, int32(resID))); amount < v.N { - // code = pb.ErrorCode_ResNoEnough - // return - // } - // } - //不存在消耗武器的情况 - // } else if v.A == comm.EquipmentType { - // if resID, err = strconv.Atoi(v.T); err != nil { - // code = pb.ErrorCode_ConfigurationException - // return - // } - // if amount = int32(equipment.QueryEquipmentAmount(source, uid, int32(resID))); amount < v.N { - // code = pb.ErrorCode_ResNoEnough - // return - // } - // } } - - for _, v := range res { - if v.A == comm.AttrType { //用户属性资源 - this.ModuleUser.AddAttributeValue(session, v.T, -1*v.N, bPush) - } else if v.A == comm.ItemType { //道具资源 - //resID, _ = strconv.Atoi(v.T) - this.ModuleItems.AddItem(source, session, v.T, -1*v.N, bPush) + for k, v := range items { + if int32(this.ModuleItems.QueryItemAmount(source, session.GetUserId(), k)) < -v { + code = pb.ErrorCode_ResNoEnough + this.Errorf("道具不足: A: item, T:%s, N:%d", k, v) + return } - // else if v.A == comm.HeroType { //卡片资源 - // resID, _ = strconv.Atoi(v.T) - // this.ModuleHero.ConsumeCard(uid, int32(resID), -1*v.N) - // } - // } else if v.A == comm.EquipmentType { - // resID, _ = strconv.Atoi(v.T) - // equipment.AddNewEquipments(source, uid, resID, -1*v.N) - // } + } + // 真正消耗 + if len(attrs) > 0 { + code = this.ModuleUser.AddAttributeValues(session, attrs, bPush) + if code != pb.ErrorCode_Success { + return + } + this.Debugf("消耗玩家资源: %v", attrs) + } + if len(items) > 0 { + code = this.ModuleItems.AddItems(source, session, items, bPush) + if code != pb.ErrorCode_Success { + return + } + this.Debugf("消耗道具资源: %v", items) } return @@ -251,37 +236,53 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Game_at //发放资源 func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Game_atn, bPush bool) (code pb.ErrorCode) { var ( - hero []*pb.DBHero + items map[string]int32 // 道具背包 批量处理 + heros map[string]int32 // 英雄 + attrs map[string]int32 // 属性 + equips map[string]uint32 // 装备 ) + items = make(map[string]int32, 0) + heros = make(map[string]int32, 0) + attrs = make(map[string]int32, 0) + equips = make(map[string]uint32, 0) + source := &comm.ModuleCallSource{ Module: string(this.module.GetType()), FuncName: "DispenseRes", Describe: "发放资源", } for _, v := range res { - this.Debugf("发放资源 DispenseRes:A = %s, T:%s, N:%d", v.A, v.T, v.N) - if v.A == comm.AttrType { //用户属性资源 - code = this.ModuleUser.AddAttributeValue(session, v.T, v.N, bPush) - - } else if v.A == comm.ItemType { //道具资源 - // resID = cast.ToInt(v.T) - // resID, _ = strconv.Atoi(v.T) - code = this.ModuleItems.AddItem(source, session, v.T, v.N, bPush) - } else if v.A == comm.HeroType { //卡片资源 - //resID, _ = strconv.Atoi(v.T) - _hero, err := this.ModuleHero.CreateRepeatHero(session.GetUserId(), v.T, v.N) - if err != nil { - code = pb.ErrorCode_HeroMaxCount - return + switch v.A { + case comm.AttrType: + attrs[v.T] += v.N + case comm.ItemType: + items[v.T] += v.N + case comm.HeroType: + heros[v.T] += v.N + case comm.EquipmentType: + if v.N > 0 { // 不允许减少装备 + equips[v.T] += uint32(v.N) } - hero = append(hero, _hero) - } else if v.A == comm.EquipmentType { - //resID, _ = strconv.Atoi(v.T) - code = this.ModuleEquipment.AddNewEquipments(source, session, map[string]uint32{v.T: uint32(v.N)}, bPush) + default: + this.Errorf("not found res type") // 找不到资源类型 } } - if len(hero) > 0 { - session.SendMsg("hero", "change", &pb.HeroChangePush{List: hero}) + + if len(attrs) > 0 { //用户属性资源 + code = this.ModuleUser.AddAttributeValues(session, attrs, bPush) + this.Debugf("发放用户资源: %v", attrs) + } + if len(items) > 0 { //道具资源 + code = this.ModuleItems.AddItems(source, session, items, bPush) + this.Debugf("发放道具资源: %v", items) + } + if len(heros) > 0 { //卡片资源 + code = this.ModuleHero.CreateRepeatHeros(session, heros, bPush) + this.Debugf("发放英雄资源: %v", heros) + } + if len(equips) > 0 { + code = this.ModuleEquipment.AddNewEquipments(source, session, equips, bPush) + this.Debugf("发放装备资源: %v", equips) } return diff --git a/modules/user/module.go b/modules/user/module.go index 72f1b7fe2..f0fb5e39f 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -161,6 +161,74 @@ func (this *User) AddAttributeValue(session comm.IUserSession, attr string, add return } +//用户资源 +func (this *User) AddAttributeValues(session comm.IUserSession, attrs map[string]int32, bPush bool) (code pb.ErrorCode) { + user := this.GetUser(session.GetUserId()) + if user == nil { + code = pb.ErrorCode_UserSessionNobeing + return + } + _change := &pb.UserResChangePush{ + Gold: user.Gold, + Exp: user.Exp, + Lv: user.Lv, + Vip: user.Vip, + Diamond: user.Diamond, + } + update := make(map[string]interface{}) + for key, add := range attrs { + if add == 0 { + log.Errorf("attr no changed,uid: %s attr: %s add: %d", session.GetUserId(), key, add) + continue + } + switch key { + case comm.ResGold: + if add < 0 { + if user.Gold+add < 0 { + code = pb.ErrorCode_GoldNoEnough + return + } + } + _change.Gold += add + update[comm.ResGold] = user.Gold + add + case comm.ResExp: + if add < 0 { + if user.Exp+add < 0 { + code = pb.ErrorCode_ResNoEnough + return + } + } + _change.Exp += add + update[comm.ResExp] = user.Exp + add + case comm.ResDiamond: + if add < 0 { + if user.Diamond+add < 0 { + code = pb.ErrorCode_ResNoEnough + return + } + } + _change.Diamond += add + update[comm.ResDiamond] = user.Diamond + add + default: + code = pb.ErrorCode_Unknown + } + } + + if len(update) == 0 { + log.Warn("AddAttributeValue param is empty") + return + } + if err := this.modelUser.updateUserAttr(session.GetUserId(), update); err != nil { + log.Errorf("AddAttributeValue err:%v", err) + code = pb.ErrorCode_DBError + } + + if bPush { //推送玩家账号信息变化消息 + session.SendMsg(string(this.GetType()), "reschange", _change) + } + return +} + // 用户事件变化 func (this *User) EventUserChanged(session comm.IUserSession) { ul := new(UserListen) From 796ec966dde2fbf6c90f098d0d54abce52b14d69 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 3 Aug 2022 09:33:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=97=B6=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/items/configure.go | 2 +- modules/mail/api_getAttachment.go | 10 +- modules/mail/model_mail.go | 1 + modules/mail/module.go | 5 +- modules/user/api_login.go | 1 + modules/user/module.go | 1 + pb/mail_msg.pb.go | 15 ++- pb/user_msg.pb.go | 204 ++++++++++++++++-------------- 8 files changed, 133 insertions(+), 106 deletions(-) diff --git a/modules/items/configure.go b/modules/items/configure.go index 5de81a949..0c6f8d184 100644 --- a/modules/items/configure.go +++ b/modules/items/configure.go @@ -56,7 +56,7 @@ func (this *ConfigureComp) GetItemConfigure(id string) (item *cfg.Game_itemData, return } else { if item, ok = v.(*cfg.Game_item).GetDataMap()[id]; !ok { - err = fmt.Errorf("no found item:%d configure", id) + err = fmt.Errorf("no found item:%s configure", id) this.module.Errorf("err:%v", err) return } diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index f0f790ff7..6147573ae 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -47,8 +47,6 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma if code == pb.ErrorCode_Success { // 修改状态 this.module.modelMail.MailUpdateMailAttachmentState(req.ObjID) - //mail.Reward = true - //return } } } @@ -64,6 +62,9 @@ func (this *apiComp) GetAllMailAttachmentCheck(session comm.IUserSession, req *p func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.MailGetAllMailAttachmentReq) (code pb.ErrorCode, data proto.Message) { + var ( + mailIds []string + ) code = this.GetAllMailAttachmentCheck(session, req) // check if code != pb.ErrorCode_Success { return @@ -93,9 +94,12 @@ func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.Mai if code == pb.ErrorCode_Success { this.module.modelMail.MailUpdateMailAttachmentState(v.ObjId) v.Reward = true + v.Check = true + mailIds = append(mailIds, v.ObjId) } } - session.SendMsg(string(this.module.GetType()), "getusermailattachment", &pb.MailGetAllMailAttachmentResp{Res: fj}) + session.SendMsg(string(this.module.GetType()), "getallmailattachment", &pb.MailGetAllMailAttachmentResp{Res: fj, + Ids: mailIds}) return } diff --git a/modules/mail/model_mail.go b/modules/mail/model_mail.go index b7a39ab88..5fb0e1b98 100644 --- a/modules/mail/model_mail.go +++ b/modules/mail/model_mail.go @@ -101,6 +101,7 @@ func (this *modelMail) MailUpdateMailAttachmentState(objId string) bool { bson.M{"_id": objId}, bson.M{"$set": bson.M{ "reward": true, + "check": true, }}, options.FindOneAndUpdate().SetUpsert(false).SetReturnDocument(options.After), ) diff --git a/modules/mail/module.go b/modules/mail/module.go index dd8d49258..352736425 100644 --- a/modules/mail/module.go +++ b/modules/mail/module.go @@ -53,7 +53,8 @@ func (this *Mail) CreateNewMail(session comm.IUserSession, mail *pb.DBMailData) } err := this.modelMail.MailInsertUserMail(mail) if err != nil { - this.ModuleBase.Errorf("create mail failed") + this.Errorf("create mail failed :%v", err) + return false } // 通知玩家 this.AddNewMailPush(session, mail) @@ -62,7 +63,7 @@ func (this *Mail) CreateNewMail(session comm.IUserSession, mail *pb.DBMailData) } // 获得新邮件 推送给玩家 -func (this *Mail) AddNewMailPush(session comm.IUserSession, mail *pb.DBMailData) (err error) { +func (this *Mail) AddNewMailPush(session comm.IUserSession, mail *pb.DBMailData) { session.SendMsg(string(this.GetType()), "getnewmail", &pb.MailGetNewMailPush{Mail: mail}) return } diff --git a/modules/user/api_login.go b/modules/user/api_login.go index 33368d989..40da35484 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -36,6 +36,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod defer func() { if user != nil { rsp.Data = user + rsp.TimeNow = time.Now().Unix() // 设置服务器时间 err = session.SendMsg(string(this.module.GetType()), UserSubTypeLogin, rsp) if err != nil { code = pb.ErrorCode_SystemError diff --git a/modules/user/module.go b/modules/user/module.go index f0fb5e39f..a98913d9e 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -85,6 +85,7 @@ func (this *User) QueryAttributeValue(uid string, attr string) (value int32) { switch attr { case comm.ResGold: return user.Gold + case comm.ResExp: return user.Exp case comm.ResDiamond: diff --git a/pb/mail_msg.pb.go b/pb/mail_msg.pb.go index da074101a..5e70f3daf 100644 --- a/pb/mail_msg.pb.go +++ b/pb/mail_msg.pb.go @@ -484,6 +484,7 @@ type MailGetAllMailAttachmentResp struct { unknownFields protoimpl.UnknownFields Res []*UserAssets `protobuf:"bytes,1,rep,name=res,proto3" json:"res"` //资源类型 + Ids []string `protobuf:"bytes,2,rep,name=ids,proto3" json:"ids"` // 已经领取的邮件唯一id } func (x *MailGetAllMailAttachmentResp) Reset() { @@ -525,6 +526,13 @@ func (x *MailGetAllMailAttachmentResp) GetRes() []*UserAssets { return nil } +func (x *MailGetAllMailAttachmentResp) GetIds() []string { + if x != nil { + return x.Ids + } + return nil +} + var File_mail_mail_msg_proto protoreflect.FileDescriptor var file_mail_mail_msg_proto_rawDesc = []byte{ @@ -559,12 +567,13 @@ var file_mail_mail_msg_proto_rawDesc = []byte{ 0x69, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x22, 0x1d, 0x0a, 0x1b, 0x4d, 0x61, 0x69, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3d, 0x0a, 0x1c, 0x4d, 0x61, + 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x22, 0x4f, 0x0a, 0x1c, 0x4d, 0x61, 0x69, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, - 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x72, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x72, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go index af0bd70a1..ea133282f 100644 --- a/pb/user_msg.pb.go +++ b/pb/user_msg.pb.go @@ -81,8 +81,9 @@ type UserLoginResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data *DBUser `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` - Ex *DBUserExpand `protobuf:"bytes,2,opt,name=ex,proto3" json:"ex"` //用户扩展 + Data *DBUser `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` + Ex *DBUserExpand `protobuf:"bytes,2,opt,name=ex,proto3" json:"ex"` //用户扩展 + TimeNow int64 `protobuf:"varint,3,opt,name=timeNow,proto3" json:"timeNow"` // 服务器时间 } func (x *UserLoginResp) Reset() { @@ -131,6 +132,13 @@ func (x *UserLoginResp) GetEx() *DBUserExpand { return nil } +func (x *UserLoginResp) GetTimeNow() int64 { + if x != nil { + return x.TimeNow + } + return 0 +} + //登出 type UserLogoutReq struct { state protoimpl.MessageState @@ -1517,106 +1525,108 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x73, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, + 0x03, 0x73, 0x69, 0x64, 0x22, 0x65, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65, - 0x78, 0x22, 0x0f, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, - 0x65, 0x71, 0x22, 0x10, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x22, 0x3d, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, - 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, - 0x73, 0x69, 0x64, 0x22, 0x4c, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, - 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, - 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x22, 0x2e, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x22, 0x2b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, - 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x28, - 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x2e, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, - 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x03, 0x72, 0x65, 0x73, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, - 0x65, 0x74, 0x73, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x2f, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, - 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x72, 0x65, - 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, - 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x75, 0x0a, 0x11, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, - 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f, - 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, - 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, - 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, - 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, 0x3e, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, - 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x07, 0x73, - 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, - 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, - 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x40, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a, - 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, - 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, - 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, - 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, - 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, - 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, - 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, - 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, - 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, - 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, - 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, - 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x3c, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, - 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, - 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, - 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, - 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, - 0x6f, 0x69, 0x64, 0x73, 0x22, 0x45, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, - 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0xe3, 0x01, 0x0a, 0x0d, - 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, - 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x12, 0x16, 0x0a, - 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x04, 0x68, 0x61, 0x69, 0x72, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x48, 0x61, 0x69, 0x72, 0x52, 0x04, 0x68, 0x61, 0x69, 0x72, - 0x12, 0x19, 0x0a, 0x04, 0x65, 0x79, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, - 0x2e, 0x45, 0x79, 0x65, 0x73, 0x52, 0x04, 0x65, 0x79, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x05, 0x6d, - 0x6f, 0x75, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x4d, 0x6f, 0x75, - 0x74, 0x68, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x12, 0x19, 0x0a, 0x04, 0x62, 0x6f, 0x64, - 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x04, - 0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, - 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, - 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, - 0x6e, 0x22, 0x5b, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, + 0x78, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, 0x22, 0x0f, 0x0a, 0x0d, 0x55, + 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x22, 0x10, 0x0a, 0x0e, + 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3d, + 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, + 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x69, 0x64, 0x22, 0x4c, 0x0a, + 0x10, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, + 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0c, 0x55, + 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, + 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x0d, 0x55, + 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, + 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x28, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, + 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, + 0x63, 0x63, 0x22, 0x2e, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, + 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x72, + 0x65, 0x73, 0x22, 0x2f, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, + 0x72, 0x65, 0x73, 0x22, 0x75, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68, + 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, + 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, + 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, + 0x0a, 0x03, 0x76, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x70, + 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, + 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, + 0x3e, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, + 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, + 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, + 0x40, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, + 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, + 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, + 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, + 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, + 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, + 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, + 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, + 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, + 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, + 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, + 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3c, 0x0a, + 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, - 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, - 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x22, 0x27, - 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, - 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, - 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x12, 0x0a, 0x10, 0x55, + 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, + 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x22, 0x45, + 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, + 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0xe3, 0x01, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, + 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, + 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, 0x72, 0x65, + 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x19, 0x0a, 0x04, 0x68, 0x61, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, + 0x48, 0x61, 0x69, 0x72, 0x52, 0x04, 0x68, 0x61, 0x69, 0x72, 0x12, 0x19, 0x0a, 0x04, 0x65, 0x79, + 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x45, 0x79, 0x65, 0x73, 0x52, + 0x04, 0x65, 0x79, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x4d, 0x6f, 0x75, 0x74, 0x68, 0x52, 0x05, 0x6d, 0x6f, + 0x75, 0x74, 0x68, 0x12, 0x19, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x05, 0x2e, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, + 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x52, + 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0x5b, 0x0a, 0x0e, 0x55, + 0x73, 0x65, 0x72, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, + 0x52, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, + 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, + 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, + 0x6e, 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, + 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( From f327295b5289947fbfe75c71a7c9eaf003657655 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 3 Aug 2022 10:02:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89newhero=20=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=20=E4=BD=BF=E7=94=A8hero=E9=85=8D=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{game_newhero.json => game_hero.json} | 768 ++++++---------- modules/hero/configure_comp.go | 10 +- sys/configure/structs/Tables.go | 835 +++++++++--------- sys/configure/structs/game.hero.go | 42 + .../{game.newHeroData.go => game.heroData.go} | 16 +- sys/configure/structs/game.newHero.go | 42 - 6 files changed, 729 insertions(+), 984 deletions(-) rename bin/json/{game_newhero.json => game_hero.json} (91%) create mode 100644 sys/configure/structs/game.hero.go rename sys/configure/structs/{game.newHeroData.go => game.heroData.go} (91%) delete mode 100644 sys/configure/structs/game.newHero.go diff --git a/bin/json/game_newhero.json b/bin/json/game_hero.json similarity index 91% rename from bin/json/game_newhero.json rename to bin/json/game_hero.json index 5fdc37919..57492b70e 100644 --- a/bin/json/game_newhero.json +++ b/bin/json/game_hero.json @@ -12,11 +12,9 @@ "type": 1, "handbook": -1, "prefab": 13001, + "rotation": "0|8|0", "icon": 13001, - "sound": { - "key": "13001", - "text": "" - }, + "vocal": "13001", "tujing": [ 1 ], @@ -56,11 +54,9 @@ "type": 1, "handbook": -1, "prefab": 13002, + "rotation": "0|8|0", "icon": 13002, - "sound": { - "key": "13002", - "text": "" - }, + "vocal": "13002", "tujing": [ 1 ], @@ -100,11 +96,9 @@ "type": 1, "handbook": -1, "prefab": 13003, + "rotation": "0|8|0", "icon": 13003, - "sound": { - "key": "13003", - "text": "" - }, + "vocal": "13003", "tujing": [ 1 ], @@ -144,11 +138,9 @@ "type": 1, "handbook": -1, "prefab": 13004, + "rotation": "0|8|0", "icon": 13004, - "sound": { - "key": "13004", - "text": "" - }, + "vocal": "13004", "tujing": [ 1 ], @@ -188,11 +180,9 @@ "type": 1, "handbook": -1, "prefab": 13005, + "rotation": "0|8|0", "icon": 13005, - "sound": { - "key": "13005", - "text": "" - }, + "vocal": "13005", "tujing": [ 1 ], @@ -232,11 +222,9 @@ "type": 1, "handbook": -1, "prefab": 14001, + "rotation": "0|8|0", "icon": 14001, - "sound": { - "key": "14001", - "text": "" - }, + "vocal": "14001", "tujing": [ 1 ], @@ -276,11 +264,9 @@ "type": 1, "handbook": -1, "prefab": 14002, + "rotation": "0|8|0", "icon": 14002, - "sound": { - "key": "14002", - "text": "" - }, + "vocal": "14002", "tujing": [ 1 ], @@ -320,11 +306,9 @@ "type": 1, "handbook": -1, "prefab": 14003, + "rotation": "0|8|0", "icon": 14003, - "sound": { - "key": "14003", - "text": "" - }, + "vocal": "14003", "tujing": [ 1 ], @@ -364,11 +348,9 @@ "type": 1, "handbook": -1, "prefab": 14004, + "rotation": "0|8|0", "icon": 14004, - "sound": { - "key": "14004", - "text": "" - }, + "vocal": "14004", "tujing": [ 1 ], @@ -408,11 +390,9 @@ "type": 1, "handbook": -1, "prefab": 14005, + "rotation": "0|8|0", "icon": 14005, - "sound": { - "key": "14005", - "text": "" - }, + "vocal": "14005", "tujing": [ 1 ], @@ -452,11 +432,9 @@ "type": 1, "handbook": -1, "prefab": 14006, + "rotation": "0|8|0", "icon": 14006, - "sound": { - "key": "14006", - "text": "" - }, + "vocal": "14006", "tujing": [ 1 ], @@ -496,11 +474,9 @@ "type": 1, "handbook": -1, "prefab": 14007, + "rotation": "0|8|0", "icon": 14007, - "sound": { - "key": "14007", - "text": "" - }, + "vocal": "14007", "tujing": [ 1 ], @@ -540,11 +516,9 @@ "type": 1, "handbook": -1, "prefab": 15001, + "rotation": "0|8|0", "icon": 15001, - "sound": { - "key": "15001", - "text": "" - }, + "vocal": "15001", "tujing": [ 1 ], @@ -584,11 +558,9 @@ "type": 1, "handbook": -1, "prefab": 15002, + "rotation": "0|8|0", "icon": 15002, - "sound": { - "key": "15002", - "text": "" - }, + "vocal": "15002", "tujing": [ 1 ], @@ -628,11 +600,9 @@ "type": 1, "handbook": -1, "prefab": 15003, + "rotation": "0|8|0", "icon": 15003, - "sound": { - "key": "15003", - "text": "" - }, + "vocal": "15003", "tujing": [ 1 ], @@ -672,11 +642,9 @@ "type": 1, "handbook": -1, "prefab": 15004, + "rotation": "0|8|0", "icon": 15004, - "sound": { - "key": "15004", - "text": "" - }, + "vocal": "15004", "tujing": [ 1 ], @@ -716,11 +684,9 @@ "type": 1, "handbook": -1, "prefab": 23001, + "rotation": "0|8|0", "icon": 23001, - "sound": { - "key": "23001", - "text": "" - }, + "vocal": "23001", "tujing": [ 1 ], @@ -760,11 +726,9 @@ "type": 1, "handbook": -1, "prefab": 23002, + "rotation": "0|8|0", "icon": 23002, - "sound": { - "key": "23002", - "text": "" - }, + "vocal": "23002", "tujing": [ 1 ], @@ -804,11 +768,9 @@ "type": 1, "handbook": -1, "prefab": 23003, + "rotation": "0|8|0", "icon": 23003, - "sound": { - "key": "23003", - "text": "" - }, + "vocal": "23003", "tujing": [ 1 ], @@ -848,11 +810,9 @@ "type": 1, "handbook": -1, "prefab": 23004, + "rotation": "0|8|0", "icon": 23004, - "sound": { - "key": "23004", - "text": "" - }, + "vocal": "23004", "tujing": [ 1 ], @@ -892,11 +852,9 @@ "type": 1, "handbook": -1, "prefab": 24001, + "rotation": "0|8|0", "icon": 24001, - "sound": { - "key": "24001", - "text": "" - }, + "vocal": "24001", "tujing": [ 1 ], @@ -936,11 +894,9 @@ "type": 1, "handbook": -1, "prefab": 24002, + "rotation": "0|8|0", "icon": 24002, - "sound": { - "key": "24002", - "text": "" - }, + "vocal": "24002", "tujing": [ 1 ], @@ -980,11 +936,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 24003, - "sound": { - "key": "24003", - "text": "" - }, + "vocal": "24003", "tujing": [ 1 ], @@ -1024,11 +978,9 @@ "type": 1, "handbook": -1, "prefab": 24004, + "rotation": "0|8|0", "icon": 24004, - "sound": { - "key": "24004", - "text": "" - }, + "vocal": "24004", "tujing": [ 1 ], @@ -1068,11 +1020,9 @@ "type": 1, "handbook": -1, "prefab": 24005, + "rotation": "0|8|0", "icon": 24005, - "sound": { - "key": "24005", - "text": "" - }, + "vocal": "24005", "tujing": [ 1 ], @@ -1112,11 +1062,9 @@ "type": 1, "handbook": -1, "prefab": 24006, + "rotation": "0|8|0", "icon": 24006, - "sound": { - "key": "24006", - "text": "" - }, + "vocal": "24006", "tujing": [ 1 ], @@ -1156,11 +1104,9 @@ "type": 1, "handbook": -1, "prefab": 24007, + "rotation": "0|8|0", "icon": 24007, - "sound": { - "key": "24007", - "text": "" - }, + "vocal": "24007", "tujing": [ 1 ], @@ -1200,11 +1146,9 @@ "type": 1, "handbook": -1, "prefab": 24008, + "rotation": "0|8|0", "icon": 24008, - "sound": { - "key": "24008", - "text": "" - }, + "vocal": "24008", "tujing": [ 1 ], @@ -1244,11 +1188,9 @@ "type": 1, "handbook": -1, "prefab": 24009, + "rotation": "0|8|0", "icon": 24009, - "sound": { - "key": "24009", - "text": "" - }, + "vocal": "24009", "tujing": [ 1 ], @@ -1288,11 +1230,9 @@ "type": 1, "handbook": 1, "prefab": 25001, + "rotation": "0|8|0", "icon": 25001, - "sound": { - "key": "25001", - "text": "" - }, + "vocal": "25001", "tujing": [ 1 ], @@ -1332,11 +1272,9 @@ "type": 1, "handbook": -1, "prefab": 25002, + "rotation": "0|8|0", "icon": 25002, - "sound": { - "key": "25002", - "text": "" - }, + "vocal": "25002", "tujing": [ 1 ], @@ -1376,11 +1314,9 @@ "type": 1, "handbook": -1, "prefab": 25003, + "rotation": "0|8|0", "icon": 25003, - "sound": { - "key": "25003", - "text": "" - }, + "vocal": "25003", "tujing": [ 1 ], @@ -1420,11 +1356,9 @@ "type": 1, "handbook": 1, "prefab": 25004, + "rotation": "0|8|0", "icon": 25004, - "sound": { - "key": "25004", - "text": "" - }, + "vocal": "25004", "tujing": [ 1 ], @@ -1464,11 +1398,9 @@ "type": 1, "handbook": -1, "prefab": 33001, + "rotation": "0|8|0", "icon": 33001, - "sound": { - "key": "33001", - "text": "" - }, + "vocal": "33001", "tujing": [ 1 ], @@ -1508,11 +1440,9 @@ "type": 1, "handbook": -1, "prefab": 33002, + "rotation": "0|8|0", "icon": 33002, - "sound": { - "key": "33002", - "text": "" - }, + "vocal": "33002", "tujing": [ 1 ], @@ -1552,11 +1482,9 @@ "type": 1, "handbook": -1, "prefab": 33003, + "rotation": "0|8|0", "icon": 33003, - "sound": { - "key": "33003", - "text": "" - }, + "vocal": "33003", "tujing": [ 1 ], @@ -1596,11 +1524,9 @@ "type": 1, "handbook": -1, "prefab": 33004, + "rotation": "0|8|0", "icon": 33004, - "sound": { - "key": "33004", - "text": "" - }, + "vocal": "33004", "tujing": [ 1 ], @@ -1640,11 +1566,9 @@ "type": 1, "handbook": -1, "prefab": 33005, + "rotation": "0|8|0", "icon": 33005, - "sound": { - "key": "33005", - "text": "" - }, + "vocal": "33005", "tujing": [ 1 ], @@ -1684,11 +1608,9 @@ "type": 1, "handbook": -1, "prefab": 33006, + "rotation": "0|8|0", "icon": 33006, - "sound": { - "key": "33006", - "text": "" - }, + "vocal": "33006", "tujing": [ 1 ], @@ -1728,11 +1650,9 @@ "type": 1, "handbook": -1, "prefab": 34001, + "rotation": "0|8|0", "icon": 34001, - "sound": { - "key": "34001", - "text": "" - }, + "vocal": "34001", "tujing": [ 1 ], @@ -1772,11 +1692,9 @@ "type": 1, "handbook": -1, "prefab": 34002, + "rotation": "0|8|0", "icon": 34002, - "sound": { - "key": "34002", - "text": "" - }, + "vocal": "34002", "tujing": [ 1 ], @@ -1816,11 +1734,9 @@ "type": 1, "handbook": -1, "prefab": 34003, + "rotation": "0|8|0", "icon": 34003, - "sound": { - "key": "34003", - "text": "" - }, + "vocal": "34003", "tujing": [ 1 ], @@ -1860,11 +1776,9 @@ "type": 1, "handbook": -1, "prefab": 34004, + "rotation": "0|8|0", "icon": 34004, - "sound": { - "key": "34004", - "text": "" - }, + "vocal": "34004", "tujing": [ 1 ], @@ -1904,11 +1818,9 @@ "type": 1, "handbook": -1, "prefab": 34005, + "rotation": "0|8|0", "icon": 34005, - "sound": { - "key": "34005", - "text": "" - }, + "vocal": "34005", "tujing": [ 1 ], @@ -1948,11 +1860,9 @@ "type": 1, "handbook": -1, "prefab": 34006, + "rotation": "0|8|0", "icon": 34006, - "sound": { - "key": "34006", - "text": "" - }, + "vocal": "34006", "tujing": [ 1 ], @@ -1992,11 +1902,9 @@ "type": 1, "handbook": -1, "prefab": 34007, + "rotation": "0|8|0", "icon": 34007, - "sound": { - "key": "34007", - "text": "" - }, + "vocal": "34007", "tujing": [ 1 ], @@ -2036,11 +1944,9 @@ "type": 1, "handbook": -1, "prefab": 34008, + "rotation": "0|8|0", "icon": 34008, - "sound": { - "key": "34008", - "text": "" - }, + "vocal": "34008", "tujing": [ 1 ], @@ -2080,11 +1986,9 @@ "type": 1, "handbook": -1, "prefab": 35002, + "rotation": "0|8|0", "icon": 35002, - "sound": { - "key": "35002", - "text": "" - }, + "vocal": "35002", "tujing": [ 1 ], @@ -2124,11 +2028,9 @@ "type": 1, "handbook": -1, "prefab": 35003, + "rotation": "0|8|0", "icon": 35003, - "sound": { - "key": "35003", - "text": "" - }, + "vocal": "35003", "tujing": [ 1 ], @@ -2168,11 +2070,9 @@ "type": 1, "handbook": -1, "prefab": 35004, + "rotation": "0|8|0", "icon": 35004, - "sound": { - "key": "35004", - "text": "" - }, + "vocal": "35004", "tujing": [ 1 ], @@ -2212,11 +2112,9 @@ "type": 1, "handbook": -1, "prefab": 35005, + "rotation": "0|8|0", "icon": 35005, - "sound": { - "key": "35005", - "text": "" - }, + "vocal": "35005", "tujing": [ 1 ], @@ -2256,11 +2154,9 @@ "type": 1, "handbook": -1, "prefab": 35006, + "rotation": "0|8|0", "icon": 35006, - "sound": { - "key": "35006", - "text": "" - }, + "vocal": "35006", "tujing": [ 1 ], @@ -2300,11 +2196,9 @@ "type": 1, "handbook": -1, "prefab": 43001, + "rotation": "0|8|0", "icon": 43001, - "sound": { - "key": "43001", - "text": "" - }, + "vocal": "43001", "tujing": [ 1 ], @@ -2344,11 +2238,9 @@ "type": 1, "handbook": -1, "prefab": 43002, + "rotation": "0|8|0", "icon": 43002, - "sound": { - "key": "43002", - "text": "" - }, + "vocal": "43002", "tujing": [ 1 ], @@ -2388,11 +2280,9 @@ "type": 1, "handbook": -1, "prefab": 43003, + "rotation": "0|8|0", "icon": 43003, - "sound": { - "key": "43003", - "text": "" - }, + "vocal": "43003", "tujing": [ 1 ], @@ -2432,11 +2322,9 @@ "type": 1, "handbook": -1, "prefab": 43004, + "rotation": "0|8|0", "icon": 43004, - "sound": { - "key": "43004", - "text": "" - }, + "vocal": "43004", "tujing": [ 1 ], @@ -2476,11 +2364,9 @@ "type": 1, "handbook": -1, "prefab": 43005, + "rotation": "0|8|0", "icon": 43005, - "sound": { - "key": "43005", - "text": "" - }, + "vocal": "43005", "tujing": [ 1 ], @@ -2520,11 +2406,9 @@ "type": 1, "handbook": -1, "prefab": 43006, + "rotation": "0|8|0", "icon": 43006, - "sound": { - "key": "43006", - "text": "" - }, + "vocal": "43006", "tujing": [ 1 ], @@ -2564,11 +2448,9 @@ "type": 1, "handbook": -1, "prefab": 43007, + "rotation": "0|8|0", "icon": 43007, - "sound": { - "key": "43007", - "text": "" - }, + "vocal": "43007", "tujing": [ 1 ], @@ -2608,11 +2490,9 @@ "type": 1, "handbook": -1, "prefab": 44001, + "rotation": "0|8|0", "icon": 44001, - "sound": { - "key": "44001", - "text": "" - }, + "vocal": "44001", "tujing": [ 1 ], @@ -2652,11 +2532,9 @@ "type": 1, "handbook": -1, "prefab": 44002, + "rotation": "0|8|0", "icon": 44002, - "sound": { - "key": "44002", - "text": "" - }, + "vocal": "44002", "tujing": [ 1 ], @@ -2696,11 +2574,9 @@ "type": 1, "handbook": -1, "prefab": 44003, + "rotation": "0|8|0", "icon": 44003, - "sound": { - "key": "44003", - "text": "" - }, + "vocal": "44003", "tujing": [ 1 ], @@ -2740,11 +2616,9 @@ "type": 1, "handbook": -1, "prefab": 44004, + "rotation": "0|8|0", "icon": 44004, - "sound": { - "key": "44004", - "text": "" - }, + "vocal": "44004", "tujing": [ 1 ], @@ -2784,11 +2658,9 @@ "type": 1, "handbook": -1, "prefab": 44006, + "rotation": "0|8|0", "icon": 44006, - "sound": { - "key": "44006", - "text": "" - }, + "vocal": "44006", "tujing": [ 1 ], @@ -2828,11 +2700,9 @@ "type": 1, "handbook": -1, "prefab": 45001, + "rotation": "0|8|0", "icon": 45001, - "sound": { - "key": "45001", - "text": "" - }, + "vocal": "45001", "tujing": [ 1 ], @@ -2872,11 +2742,9 @@ "type": 1, "handbook": -1, "prefab": 45002, + "rotation": "0|8|0", "icon": 45002, - "sound": { - "key": "45002", - "text": "" - }, + "vocal": "45002", "tujing": [ 1 ], @@ -2916,11 +2784,9 @@ "type": 1, "handbook": -1, "prefab": 45003, + "rotation": "0|8|0", "icon": 45003, - "sound": { - "key": "45003", - "text": "" - }, + "vocal": "45003", "tujing": [ 1 ], @@ -2960,11 +2826,9 @@ "type": 1, "handbook": -1, "prefab": 45004, + "rotation": "0|8|0", "icon": 45004, - "sound": { - "key": "45004", - "text": "" - }, + "vocal": "45004", "tujing": [ 1 ], @@ -3004,11 +2868,9 @@ "type": 2, "handbook": -1, "prefab": 43901, + "rotation": "0|8|0", "icon": 43901, - "sound": { - "key": "43901", - "text": "" - }, + "vocal": "43901", "tujing": [ 1 ], @@ -3048,11 +2910,9 @@ "type": 3, "handbook": -1, "prefab": 42911, + "rotation": "0|8|0", "icon": 42911, - "sound": { - "key": "42911", - "text": "" - }, + "vocal": "42911", "tujing": [ 1 ], @@ -3092,11 +2952,9 @@ "type": 3, "handbook": -1, "prefab": 43911, + "rotation": "0|8|0", "icon": 43911, - "sound": { - "key": "43911", - "text": "" - }, + "vocal": "43911", "tujing": [ 1 ], @@ -3136,11 +2994,9 @@ "type": 3, "handbook": -1, "prefab": 44911, + "rotation": "0|8|0", "icon": 44911, - "sound": { - "key": "44911", - "text": "" - }, + "vocal": "44911", "tujing": [ 1 ], @@ -3180,11 +3036,9 @@ "type": 4, "handbook": -1, "prefab": 43921, + "rotation": "0|8|0", "icon": 43921, - "sound": { - "key": "43921", - "text": "" - }, + "vocal": "43921", "tujing": [ 1 ], @@ -3224,11 +3078,9 @@ "type": 4, "handbook": -1, "prefab": 44921, + "rotation": "0|8|0", "icon": 44921, - "sound": { - "key": "44921", - "text": "" - }, + "vocal": "44921", "tujing": [ 1 ], @@ -3268,11 +3120,9 @@ "type": 4, "handbook": -1, "prefab": 45921, + "rotation": "0|8|0", "icon": 45921, - "sound": { - "key": "45921", - "text": "" - }, + "vocal": "45921", "tujing": [ 1 ], @@ -3312,11 +3162,9 @@ "type": 5, "handbook": -1, "prefab": 51001, + "rotation": "0|8|0", "icon": 51001, - "sound": { - "key": "51001", - "text": "" - }, + "vocal": "51001", "tujing": [ 1 ], @@ -3356,11 +3204,9 @@ "type": 5, "handbook": -1, "prefab": 51002, + "rotation": "0|8|0", "icon": 51002, - "sound": { - "key": "51002", - "text": "" - }, + "vocal": "51002", "tujing": [ 1 ], @@ -3400,11 +3246,9 @@ "type": 5, "handbook": -1, "prefab": 51003, + "rotation": "0|8|0", "icon": 51003, - "sound": { - "key": "51003", - "text": "" - }, + "vocal": "51003", "tujing": [ 1 ], @@ -3444,11 +3288,9 @@ "type": 5, "handbook": -1, "prefab": 51004, + "rotation": "0|8|0", "icon": 51004, - "sound": { - "key": "51004", - "text": "" - }, + "vocal": "51004", "tujing": [ 1 ], @@ -3488,11 +3330,9 @@ "type": 5, "handbook": -1, "prefab": 51005, + "rotation": "0|8|0", "icon": 51005, - "sound": { - "key": "51005", - "text": "" - }, + "vocal": "51005", "tujing": [ 1 ], @@ -3532,11 +3372,9 @@ "type": 5, "handbook": -1, "prefab": 51006, + "rotation": "0|8|0", "icon": 51006, - "sound": { - "key": "51006", - "text": "" - }, + "vocal": "51006", "tujing": [ 1 ], @@ -3576,11 +3414,9 @@ "type": 5, "handbook": -1, "prefab": 51007, + "rotation": "0|8|0", "icon": 51007, - "sound": { - "key": "51007", - "text": "" - }, + "vocal": "51007", "tujing": [ 1 ], @@ -3620,11 +3456,9 @@ "type": 5, "handbook": -1, "prefab": 51008, + "rotation": "0|8|0", "icon": 51008, - "sound": { - "key": "51008", - "text": "" - }, + "vocal": "51008", "tujing": [ 1 ], @@ -3664,11 +3498,9 @@ "type": 5, "handbook": -1, "prefab": 51009, + "rotation": "0|8|0", "icon": 51009, - "sound": { - "key": "51009", - "text": "" - }, + "vocal": "51009", "tujing": [ 1 ], @@ -3708,11 +3540,9 @@ "type": 5, "handbook": -1, "prefab": 51010, + "rotation": "0|8|0", "icon": 51010, - "sound": { - "key": "51010", - "text": "" - }, + "vocal": "51010", "tujing": [ 1 ], @@ -3752,11 +3582,9 @@ "type": 5, "handbook": -1, "prefab": 51011, + "rotation": "0|8|0", "icon": 51011, - "sound": { - "key": "51011", - "text": "" - }, + "vocal": "51011", "tujing": [ 1 ], @@ -3796,11 +3624,9 @@ "type": 5, "handbook": -1, "prefab": 51012, + "rotation": "0|8|0", "icon": 51012, - "sound": { - "key": "51012", - "text": "" - }, + "vocal": "51012", "tujing": [ 1 ], @@ -3840,11 +3666,9 @@ "type": 5, "handbook": -1, "prefab": 51013, + "rotation": "0|8|0", "icon": 51013, - "sound": { - "key": "51013", - "text": "" - }, + "vocal": "51013", "tujing": [ 1 ], @@ -3884,11 +3708,9 @@ "type": 5, "handbook": -1, "prefab": 51014, + "rotation": "0|8|0", "icon": 51014, - "sound": { - "key": "51014", - "text": "" - }, + "vocal": "51014", "tujing": [ 1 ], @@ -3928,11 +3750,9 @@ "type": 5, "handbook": -1, "prefab": 53001, + "rotation": "0|8|0", "icon": 53001, - "sound": { - "key": "53001", - "text": "" - }, + "vocal": "53001", "tujing": [ 1 ], @@ -3972,11 +3792,9 @@ "type": 5, "handbook": -1, "prefab": 53002, + "rotation": "0|8|0", "icon": 53002, - "sound": { - "key": "53002", - "text": "" - }, + "vocal": "53002", "tujing": [ 1 ], @@ -4016,11 +3834,9 @@ "type": 5, "handbook": -1, "prefab": 53003, + "rotation": "0|8|0", "icon": 53003, - "sound": { - "key": "53003", - "text": "" - }, + "vocal": "53003", "tujing": [ 1 ], @@ -4060,11 +3876,9 @@ "type": 5, "handbook": -1, "prefab": 53004, + "rotation": "0|8|0", "icon": 53004, - "sound": { - "key": "53004", - "text": "" - }, + "vocal": "53004", "tujing": [ 1 ], @@ -4104,11 +3918,9 @@ "type": 5, "handbook": -1, "prefab": 53005, + "rotation": "0|8|0", "icon": 53005, - "sound": { - "key": "53005", - "text": "" - }, + "vocal": "53005", "tujing": [ 1 ], @@ -4148,11 +3960,9 @@ "type": 5, "handbook": -1, "prefab": 53006, + "rotation": "0|8|0", "icon": 53006, - "sound": { - "key": "53006", - "text": "" - }, + "vocal": "53006", "tujing": [ 1 ], @@ -4192,11 +4002,9 @@ "type": 5, "handbook": -1, "prefab": 55001, + "rotation": "0|8|0", "icon": 55001, - "sound": { - "key": "55001", - "text": "" - }, + "vocal": "55001", "tujing": [ 1 ], @@ -4236,11 +4044,9 @@ "type": 5, "handbook": -1, "prefab": 55002, + "rotation": "0|8|0", "icon": 55002, - "sound": { - "key": "55002", - "text": "" - }, + "vocal": "55002", "tujing": [ 1 ], @@ -4280,11 +4086,9 @@ "type": 5, "handbook": -1, "prefab": 55003, + "rotation": "0|8|0", "icon": 55003, - "sound": { - "key": "55003", - "text": "" - }, + "vocal": "55003", "tujing": [ 1 ], @@ -4324,11 +4128,9 @@ "type": 5, "handbook": -1, "prefab": 55004, + "rotation": "0|8|0", "icon": 55004, - "sound": { - "key": "55004", - "text": "" - }, + "vocal": "55004", "tujing": [ 1 ], @@ -4368,11 +4170,9 @@ "type": 5, "handbook": -1, "prefab": 55005, + "rotation": "0|8|0", "icon": 55005, - "sound": { - "key": "55005", - "text": "" - }, + "vocal": "55005", "tujing": [ 1 ], @@ -4412,11 +4212,9 @@ "type": 5, "handbook": -1, "prefab": 55006, + "rotation": "0|8|0", "icon": 55006, - "sound": { - "key": "55006", - "text": "" - }, + "vocal": "55006", "tujing": [ 1 ], @@ -4456,11 +4254,9 @@ "type": 5, "handbook": -1, "prefab": 55007, + "rotation": "0|8|0", "icon": 55007, - "sound": { - "key": "55007", - "text": "" - }, + "vocal": "55007", "tujing": [ 1 ], @@ -4500,11 +4296,9 @@ "type": 5, "handbook": -1, "prefab": 55008, + "rotation": "0|8|0", "icon": 55008, - "sound": { - "key": "55008", - "text": "" - }, + "vocal": "55008", "tujing": [ 1 ], @@ -4544,11 +4338,9 @@ "type": 1, "handbook": -1, "prefab": 25001, + "rotation": "0|8|0", "icon": 11001, - "sound": { - "key": "121323", - "text": "" - }, + "vocal": "121323", "tujing": [ 1 ], @@ -4588,11 +4380,9 @@ "type": 1, "handbook": -1, "prefab": 34004, + "rotation": "0|8|0", "icon": 11002, - "sound": { - "key": "11002", - "text": "" - }, + "vocal": "11002", "tujing": [ 1 ], @@ -4632,11 +4422,9 @@ "type": 1, "handbook": -1, "prefab": 25004, + "rotation": "0|8|0", "icon": 11003, - "sound": { - "key": "11003", - "text": "" - }, + "vocal": "11003", "tujing": [ 1 ], @@ -4678,11 +4466,9 @@ "type": 1, "handbook": -1, "prefab": 14006, + "rotation": "0|8|0", "icon": 11004, - "sound": { - "key": "11004", - "text": "" - }, + "vocal": "11004", "tujing": [ 1 ], @@ -4722,11 +4508,9 @@ "type": 1, "handbook": -1, "prefab": 25003, + "rotation": "0|8|0", "icon": 11005, - "sound": { - "key": "121323", - "text": "" - }, + "vocal": "121323", "tujing": [ 1 ], @@ -4766,11 +4550,9 @@ "type": 1, "handbook": -1, "prefab": 14003, + "rotation": "0|8|0", "icon": 11006, - "sound": { - "key": "11006", - "text": "" - }, + "vocal": "11006", "tujing": [ 1 ], @@ -4810,11 +4592,9 @@ "type": 1, "handbook": -1, "prefab": 35002, + "rotation": "0|8|0", "icon": 11009, - "sound": { - "key": "11009", - "text": "" - }, + "vocal": "11009", "tujing": [ 1 ], @@ -4854,11 +4634,9 @@ "type": 1, "handbook": -1, "prefab": 34001, + "rotation": "0|8|0", "icon": 22002, - "sound": { - "key": "22002", - "text": "" - }, + "vocal": "22002", "tujing": [ 1 ], @@ -4898,11 +4676,9 @@ "type": 1, "handbook": -1, "prefab": 25001, + "rotation": "0|8|0", "icon": 90001, - "sound": { - "key": "90001", - "text": "" - }, + "vocal": "90001", "tujing": [ 1 ], @@ -4942,11 +4718,9 @@ "type": 1, "handbook": -1, "prefab": 35001, + "rotation": "0|8|0", "icon": 11011, - "sound": { - "key": "11011", - "text": "" - }, + "vocal": "11011", "tujing": [ 1 ], @@ -4986,11 +4760,9 @@ "type": 1, "handbook": -1, "prefab": 44006, + "rotation": "0|8|0", "icon": 11008, - "sound": { - "key": "11008", - "text": "" - }, + "vocal": "11008", "tujing": [ 1 ], @@ -5030,11 +4802,9 @@ "type": 1, "handbook": -1, "prefab": 34006, + "rotation": "0|8|0", "icon": 11017, - "sound": { - "key": "11017", - "text": "" - }, + "vocal": "11017", "tujing": [ 1 ], @@ -5076,11 +4846,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 11018, - "sound": { - "key": "11018", - "text": "" - }, + "vocal": "11018", "tujing": [ 1 ], @@ -5123,11 +4891,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 11019, - "sound": { - "key": "11019", - "text": "" - }, + "vocal": "11019", "tujing": [ 1 ], @@ -5167,11 +4933,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 11020, - "sound": { - "key": "11020", - "text": "" - }, + "vocal": "11020", "tujing": [ 1 ], @@ -5211,11 +4975,9 @@ "type": 1, "handbook": -1, "prefab": 55007, + "rotation": "0|8|0", "icon": 11021, - "sound": { - "key": "11021", - "text": "" - }, + "vocal": "11021", "tujing": [ 1 ], @@ -5255,11 +5017,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 11099, - "sound": { - "key": "11099", - "text": "" - }, + "vocal": "11099", "tujing": [ 1 ], @@ -5299,11 +5059,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 12001, - "sound": { - "key": "121323", - "text": "" - }, + "vocal": "121323", "tujing": [ 1 ], @@ -5343,11 +5101,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 12003, - "sound": { - "key": "12003", - "text": "" - }, + "vocal": "12003", "tujing": [ 1 ], @@ -5389,11 +5145,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 11009, - "sound": { - "key": "11009", - "text": "" - }, + "vocal": "11009", "tujing": [ 1 ], @@ -5433,11 +5187,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 12017, - "sound": { - "key": "12017", - "text": "" - }, + "vocal": "12017", "tujing": [ 1 ], @@ -5479,11 +5231,9 @@ "type": 1, "handbook": -1, "prefab": 24003, + "rotation": "0|8|0", "icon": 12018, - "sound": { - "key": "12018", - "text": "" - }, + "vocal": "12018", "tujing": [ 1 ], @@ -5523,11 +5273,9 @@ "type": 1, "handbook": -1, "prefab": 44005, + "rotation": "0|8|0", "icon": 44005, - "sound": { - "key": "44005", - "text": "" - }, + "vocal": "44005", "tujing": [ 1 ], @@ -5567,11 +5315,9 @@ "type": 1, "handbook": -1, "prefab": 15005, + "rotation": "0|8|0", "icon": 15005, - "sound": { - "key": "15005", - "text": "" - }, + "vocal": "15005", "tujing": [ 1 ], @@ -5611,11 +5357,9 @@ "type": 1, "handbook": -1, "prefab": 35001, + "rotation": "0|8|0", "icon": 35001, - "sound": { - "key": "35001", - "text": "" - }, + "vocal": "35001", "tujing": [ 1 ], diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index aff7f74de..e965155f6 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -9,7 +9,7 @@ import ( ) const ( - new_hero = "game_newhero.json" //英雄 + new_hero = "game_hero.json" //英雄 hero_stargrow = "game_herostargrow.json" //英雄品质系数 hero_levelgrow = "game_herolevelgrow.json" //英雄成长系数 hero_starup = "game_herostarup.json" // 升星 @@ -35,7 +35,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.MCompConfigure.Init(service, module, comp, options) err = this.LoadMultiConfigure(map[string]interface{}{ - new_hero: cfg.NewGame_newHero, + new_hero: cfg.NewGame_hero, hero_stargrow: cfg.NewGame_heroStargrow, hero_levelgrow: cfg.NewGame_heroLevelgrow, hero_starup: cfg.NewGame_heroStarup, @@ -55,7 +55,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp } //获取英雄配置数据 -func (this *configureComp) getHeroConfigure() (configure *cfg.Game_newHero, err error) { +func (this *configureComp) getHeroConfigure() (configure *cfg.Game_hero, err error) { var ( v interface{} ok bool @@ -64,7 +64,7 @@ func (this *configureComp) getHeroConfigure() (configure *cfg.Game_newHero, err if v, err = this.GetConfigure(new_hero); err != nil { return } else { - if configure, ok = v.(*cfg.Game_newHero); !ok { + if configure, ok = v.(*cfg.Game_hero); !ok { err = fmt.Errorf("%T no is *cfg.Game_hero", v) } } @@ -204,7 +204,7 @@ func (this *configureComp) GetHeroStargrow() (configure *cfg.Game_heroStargrow, } //获取英雄配置 -func (this *configureComp) GetHero(heroCfgId string) *cfg.Game_newHeroData { +func (this *configureComp) GetHero(heroCfgId string) *cfg.Game_heroData { cfg, err := this.getHeroConfigure() if err != nil { return nil diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 20fbb96ad..eb01611fb 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -1,4 +1,3 @@ - //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -12,425 +11,425 @@ package cfg type JsonLoader func(string) ([]map[string]interface{}, error) type Tables struct { - LocalizeConfig_CNCategory *Localize_LocalizeConfig_CNCategory - LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory - LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory - global *Game_global - ui *Game_ui - plot *Game_plot - extservers *Game_extservers - skillAtk *Game_skillAtk - skillAfteratk *Game_skillAfteratk - skillBuff *Game_skillBuff - skillPassive *Game_skillPassive - newHero *Game_newHero - heroStargrow *Game_heroStargrow - heroLevelgrow *Game_heroLevelgrow - heroStarup *Game_heroStarup - heroExp *Game_heroExp - heroLevelup *Game_heroLevelup - equip *Game_equip - equipAttrlibrary *Game_equipAttrlibrary - equipSuit *Game_equipSuit - equipColor *Game_equipColor - equipIntensify *Game_equipIntensify - item *Game_item - heroSkillLevel *Game_heroSkillLevel - heroResonance *Game_heroResonance - comAtn *Game_comAtn - heroAwaken *Game_heroAwaken - heroMethod *Game_heroMethod - shop *Game_shop - shopitem *Game_shopitem - activeReward *Game_activeReward - serverList *Game_serverList - com *Game_com - newSkill *Game_newSkill - model *Game_model - mainlineChapter *Game_mainlineChapter - mainlineEasy *Game_mainlineEasy - mainlineHard *Game_mainlineHard - mainlinePurgatory *Game_mainlinePurgatory - drawCard *Game_drawCard - drawUpdraw *Game_drawUpdraw - drawCom *Game_drawCom - drawCost *Game_drawCost - chatChannel *Game_chatChannel - chatSystem *Game_chatSystem - chatServerGroup *Game_chatServerGroup - chatChannelCom *Game_chatChannelCom - taskRound *Game_taskRound - taskActiveReward *Game_taskActiveReward - coin *Game_coin - initial *Game_initial - monster *Game_monster - equipPos *Game_equipPos - playerlv *Game_playerlv - propsgroup *Game_propsgroup - facemod *Game_facemod - msgdistrib *Game_msgdistrib - language *Game_language - propsgrouplist *Game_propsgrouplist + LocalizeConfig_CNCategory *Localize_LocalizeConfig_CNCategory + LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory + LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory + global *Game_global + ui *Game_ui + plot *Game_plot + extservers *Game_extservers + skillAtk *Game_skillAtk + skillAfteratk *Game_skillAfteratk + skillBuff *Game_skillBuff + skillPassive *Game_skillPassive + newHero *Game_hero + heroStargrow *Game_heroStargrow + heroLevelgrow *Game_heroLevelgrow + heroStarup *Game_heroStarup + heroExp *Game_heroExp + heroLevelup *Game_heroLevelup + equip *Game_equip + equipAttrlibrary *Game_equipAttrlibrary + equipSuit *Game_equipSuit + equipColor *Game_equipColor + equipIntensify *Game_equipIntensify + item *Game_item + heroSkillLevel *Game_heroSkillLevel + heroResonance *Game_heroResonance + comAtn *Game_comAtn + heroAwaken *Game_heroAwaken + heroMethod *Game_heroMethod + shop *Game_shop + shopitem *Game_shopitem + activeReward *Game_activeReward + serverList *Game_serverList + com *Game_com + newSkill *Game_newSkill + model *Game_model + mainlineChapter *Game_mainlineChapter + mainlineEasy *Game_mainlineEasy + mainlineHard *Game_mainlineHard + mainlinePurgatory *Game_mainlinePurgatory + drawCard *Game_drawCard + drawUpdraw *Game_drawUpdraw + drawCom *Game_drawCom + drawCost *Game_drawCost + chatChannel *Game_chatChannel + chatSystem *Game_chatSystem + chatServerGroup *Game_chatServerGroup + chatChannelCom *Game_chatChannelCom + taskRound *Game_taskRound + taskActiveReward *Game_taskActiveReward + coin *Game_coin + initial *Game_initial + monster *Game_monster + equipPos *Game_equipPos + playerlv *Game_playerlv + propsgroup *Game_propsgroup + facemod *Game_facemod + msgdistrib *Game_msgdistrib + language *Game_language + propsgrouplist *Game_propsgrouplist } func NewTables(loader JsonLoader) (*Tables, error) { - var err error - var buf []map[string]interface{} + var err error + var buf []map[string]interface{} - tables := &Tables{} - if buf, err = loader("LocalizeConfig_CN") ; err != nil { - return nil, err - } - if tables.LocalizeConfig_CNCategory, err = NewLocalize_LocalizeConfig_CNCategory(buf) ; err != nil { - return nil, err - } - if buf, err = loader("LocalizeConfig_EN") ; err != nil { - return nil, err - } - if tables.LocalizeConfig_ENCategory, err = NewLocalize_LocalizeConfig_ENCategory(buf) ; err != nil { - return nil, err - } - if buf, err = loader("LocalizeConfig_TW") ; err != nil { - return nil, err - } - if tables.LocalizeConfig_TWCategory, err = NewLocalize_LocalizeConfig_TWCategory(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_global") ; err != nil { - return nil, err - } - if tables.global, err = NewGame_global(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_ui") ; err != nil { - return nil, err - } - if tables.ui, err = NewGame_ui(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_plot") ; err != nil { - return nil, err - } - if tables.plot, err = NewGame_plot(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_extservers") ; err != nil { - return nil, err - } - if tables.extservers, err = NewGame_extservers(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillatk") ; err != nil { - return nil, err - } - if tables.skillAtk, err = NewGame_skillAtk(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillafteratk") ; err != nil { - return nil, err - } - if tables.skillAfteratk, err = NewGame_skillAfteratk(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillbuff") ; err != nil { - return nil, err - } - if tables.skillBuff, err = NewGame_skillBuff(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_skillpassive") ; err != nil { - return nil, err - } - if tables.skillPassive, err = NewGame_skillPassive(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_newhero") ; err != nil { - return nil, err - } - if tables.newHero, err = NewGame_newHero(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herostargrow") ; err != nil { - return nil, err - } - if tables.heroStargrow, err = NewGame_heroStargrow(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herolevelgrow") ; err != nil { - return nil, err - } - if tables.heroLevelgrow, err = NewGame_heroLevelgrow(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herostarup") ; err != nil { - return nil, err - } - if tables.heroStarup, err = NewGame_heroStarup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroexp") ; err != nil { - return nil, err - } - if tables.heroExp, err = NewGame_heroExp(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_herolevelup") ; err != nil { - return nil, err - } - if tables.heroLevelup, err = NewGame_heroLevelup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equip") ; err != nil { - return nil, err - } - if tables.equip, err = NewGame_equip(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipattrlibrary") ; err != nil { - return nil, err - } - if tables.equipAttrlibrary, err = NewGame_equipAttrlibrary(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipsuit") ; err != nil { - return nil, err - } - if tables.equipSuit, err = NewGame_equipSuit(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipcolor") ; err != nil { - return nil, err - } - if tables.equipColor, err = NewGame_equipColor(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equipintensify") ; err != nil { - return nil, err - } - if tables.equipIntensify, err = NewGame_equipIntensify(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_item") ; err != nil { - return nil, err - } - if tables.item, err = NewGame_item(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroskilllevel") ; err != nil { - return nil, err - } - if tables.heroSkillLevel, err = NewGame_heroSkillLevel(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroresonance") ; err != nil { - return nil, err - } - if tables.heroResonance, err = NewGame_heroResonance(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_comatn") ; err != nil { - return nil, err - } - if tables.comAtn, err = NewGame_comAtn(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heroawaken") ; err != nil { - return nil, err - } - if tables.heroAwaken, err = NewGame_heroAwaken(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_heromethod") ; err != nil { - return nil, err - } - if tables.heroMethod, err = NewGame_heroMethod(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_shop") ; err != nil { - return nil, err - } - if tables.shop, err = NewGame_shop(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_shopitem") ; err != nil { - return nil, err - } - if tables.shopitem, err = NewGame_shopitem(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_activereward") ; err != nil { - return nil, err - } - if tables.activeReward, err = NewGame_activeReward(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_serverlist") ; err != nil { - return nil, err - } - if tables.serverList, err = NewGame_serverList(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_com") ; err != nil { - return nil, err - } - if tables.com, err = NewGame_com(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_newskill") ; err != nil { - return nil, err - } - if tables.newSkill, err = NewGame_newSkill(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_model") ; err != nil { - return nil, err - } - if tables.model, err = NewGame_model(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlinechapter") ; err != nil { - return nil, err - } - if tables.mainlineChapter, err = NewGame_mainlineChapter(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlineeasy") ; err != nil { - return nil, err - } - if tables.mainlineEasy, err = NewGame_mainlineEasy(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlinehard") ; err != nil { - return nil, err - } - if tables.mainlineHard, err = NewGame_mainlineHard(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_mainlinepurgatory") ; err != nil { - return nil, err - } - if tables.mainlinePurgatory, err = NewGame_mainlinePurgatory(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_drawcard") ; err != nil { - return nil, err - } - if tables.drawCard, err = NewGame_drawCard(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_drawupdraw") ; err != nil { - return nil, err - } - if tables.drawUpdraw, err = NewGame_drawUpdraw(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_drawcom") ; err != nil { - return nil, err - } - if tables.drawCom, err = NewGame_drawCom(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_drawcost") ; err != nil { - return nil, err - } - if tables.drawCost, err = NewGame_drawCost(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatchannel") ; err != nil { - return nil, err - } - if tables.chatChannel, err = NewGame_chatChannel(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatsystem") ; err != nil { - return nil, err - } - if tables.chatSystem, err = NewGame_chatSystem(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatservergroup") ; err != nil { - return nil, err - } - if tables.chatServerGroup, err = NewGame_chatServerGroup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_chatchannelcom") ; err != nil { - return nil, err - } - if tables.chatChannelCom, err = NewGame_chatChannelCom(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_taskround") ; err != nil { - return nil, err - } - if tables.taskRound, err = NewGame_taskRound(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_taskactivereward") ; err != nil { - return nil, err - } - if tables.taskActiveReward, err = NewGame_taskActiveReward(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_coin") ; err != nil { - return nil, err - } - if tables.coin, err = NewGame_coin(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_initial") ; err != nil { - return nil, err - } - if tables.initial, err = NewGame_initial(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_monster") ; err != nil { - return nil, err - } - if tables.monster, err = NewGame_monster(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_equippos") ; err != nil { - return nil, err - } - if tables.equipPos, err = NewGame_equipPos(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_playerlv") ; err != nil { - return nil, err - } - if tables.playerlv, err = NewGame_playerlv(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_propsgroup") ; err != nil { - return nil, err - } - if tables.propsgroup, err = NewGame_propsgroup(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_facemod") ; err != nil { - return nil, err - } - if tables.facemod, err = NewGame_facemod(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_msgdistrib") ; err != nil { - return nil, err - } - if tables.msgdistrib, err = NewGame_msgdistrib(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_language") ; err != nil { - return nil, err - } - if tables.language, err = NewGame_language(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_propsgrouplist") ; err != nil { - return nil, err - } - if tables.propsgrouplist, err = NewGame_propsgrouplist(buf) ; err != nil { - return nil, err - } - return tables, nil + tables := &Tables{} + if buf, err = loader("LocalizeConfig_CN"); err != nil { + return nil, err + } + if tables.LocalizeConfig_CNCategory, err = NewLocalize_LocalizeConfig_CNCategory(buf); err != nil { + return nil, err + } + if buf, err = loader("LocalizeConfig_EN"); err != nil { + return nil, err + } + if tables.LocalizeConfig_ENCategory, err = NewLocalize_LocalizeConfig_ENCategory(buf); err != nil { + return nil, err + } + if buf, err = loader("LocalizeConfig_TW"); err != nil { + return nil, err + } + if tables.LocalizeConfig_TWCategory, err = NewLocalize_LocalizeConfig_TWCategory(buf); err != nil { + return nil, err + } + if buf, err = loader("game_global"); err != nil { + return nil, err + } + if tables.global, err = NewGame_global(buf); err != nil { + return nil, err + } + if buf, err = loader("game_ui"); err != nil { + return nil, err + } + if tables.ui, err = NewGame_ui(buf); err != nil { + return nil, err + } + if buf, err = loader("game_plot"); err != nil { + return nil, err + } + if tables.plot, err = NewGame_plot(buf); err != nil { + return nil, err + } + if buf, err = loader("game_extservers"); err != nil { + return nil, err + } + if tables.extservers, err = NewGame_extservers(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillatk"); err != nil { + return nil, err + } + if tables.skillAtk, err = NewGame_skillAtk(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillafteratk"); err != nil { + return nil, err + } + if tables.skillAfteratk, err = NewGame_skillAfteratk(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillbuff"); err != nil { + return nil, err + } + if tables.skillBuff, err = NewGame_skillBuff(buf); err != nil { + return nil, err + } + if buf, err = loader("game_skillpassive"); err != nil { + return nil, err + } + if tables.skillPassive, err = NewGame_skillPassive(buf); err != nil { + return nil, err + } + if buf, err = loader("game_hero"); err != nil { + return nil, err + } + if tables.newHero, err = NewGame_hero(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herostargrow"); err != nil { + return nil, err + } + if tables.heroStargrow, err = NewGame_heroStargrow(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herolevelgrow"); err != nil { + return nil, err + } + if tables.heroLevelgrow, err = NewGame_heroLevelgrow(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herostarup"); err != nil { + return nil, err + } + if tables.heroStarup, err = NewGame_heroStarup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroexp"); err != nil { + return nil, err + } + if tables.heroExp, err = NewGame_heroExp(buf); err != nil { + return nil, err + } + if buf, err = loader("game_herolevelup"); err != nil { + return nil, err + } + if tables.heroLevelup, err = NewGame_heroLevelup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equip"); err != nil { + return nil, err + } + if tables.equip, err = NewGame_equip(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipattrlibrary"); err != nil { + return nil, err + } + if tables.equipAttrlibrary, err = NewGame_equipAttrlibrary(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipsuit"); err != nil { + return nil, err + } + if tables.equipSuit, err = NewGame_equipSuit(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipcolor"); err != nil { + return nil, err + } + if tables.equipColor, err = NewGame_equipColor(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equipintensify"); err != nil { + return nil, err + } + if tables.equipIntensify, err = NewGame_equipIntensify(buf); err != nil { + return nil, err + } + if buf, err = loader("game_item"); err != nil { + return nil, err + } + if tables.item, err = NewGame_item(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroskilllevel"); err != nil { + return nil, err + } + if tables.heroSkillLevel, err = NewGame_heroSkillLevel(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroresonance"); err != nil { + return nil, err + } + if tables.heroResonance, err = NewGame_heroResonance(buf); err != nil { + return nil, err + } + if buf, err = loader("game_comatn"); err != nil { + return nil, err + } + if tables.comAtn, err = NewGame_comAtn(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heroawaken"); err != nil { + return nil, err + } + if tables.heroAwaken, err = NewGame_heroAwaken(buf); err != nil { + return nil, err + } + if buf, err = loader("game_heromethod"); err != nil { + return nil, err + } + if tables.heroMethod, err = NewGame_heroMethod(buf); err != nil { + return nil, err + } + if buf, err = loader("game_shop"); err != nil { + return nil, err + } + if tables.shop, err = NewGame_shop(buf); err != nil { + return nil, err + } + if buf, err = loader("game_shopitem"); err != nil { + return nil, err + } + if tables.shopitem, err = NewGame_shopitem(buf); err != nil { + return nil, err + } + if buf, err = loader("game_activereward"); err != nil { + return nil, err + } + if tables.activeReward, err = NewGame_activeReward(buf); err != nil { + return nil, err + } + if buf, err = loader("game_serverlist"); err != nil { + return nil, err + } + if tables.serverList, err = NewGame_serverList(buf); err != nil { + return nil, err + } + if buf, err = loader("game_com"); err != nil { + return nil, err + } + if tables.com, err = NewGame_com(buf); err != nil { + return nil, err + } + if buf, err = loader("game_newskill"); err != nil { + return nil, err + } + if tables.newSkill, err = NewGame_newSkill(buf); err != nil { + return nil, err + } + if buf, err = loader("game_model"); err != nil { + return nil, err + } + if tables.model, err = NewGame_model(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlinechapter"); err != nil { + return nil, err + } + if tables.mainlineChapter, err = NewGame_mainlineChapter(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlineeasy"); err != nil { + return nil, err + } + if tables.mainlineEasy, err = NewGame_mainlineEasy(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlinehard"); err != nil { + return nil, err + } + if tables.mainlineHard, err = NewGame_mainlineHard(buf); err != nil { + return nil, err + } + if buf, err = loader("game_mainlinepurgatory"); err != nil { + return nil, err + } + if tables.mainlinePurgatory, err = NewGame_mainlinePurgatory(buf); err != nil { + return nil, err + } + if buf, err = loader("game_drawcard"); err != nil { + return nil, err + } + if tables.drawCard, err = NewGame_drawCard(buf); err != nil { + return nil, err + } + if buf, err = loader("game_drawupdraw"); err != nil { + return nil, err + } + if tables.drawUpdraw, err = NewGame_drawUpdraw(buf); err != nil { + return nil, err + } + if buf, err = loader("game_drawcom"); err != nil { + return nil, err + } + if tables.drawCom, err = NewGame_drawCom(buf); err != nil { + return nil, err + } + if buf, err = loader("game_drawcost"); err != nil { + return nil, err + } + if tables.drawCost, err = NewGame_drawCost(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatchannel"); err != nil { + return nil, err + } + if tables.chatChannel, err = NewGame_chatChannel(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatsystem"); err != nil { + return nil, err + } + if tables.chatSystem, err = NewGame_chatSystem(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatservergroup"); err != nil { + return nil, err + } + if tables.chatServerGroup, err = NewGame_chatServerGroup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_chatchannelcom"); err != nil { + return nil, err + } + if tables.chatChannelCom, err = NewGame_chatChannelCom(buf); err != nil { + return nil, err + } + if buf, err = loader("game_taskround"); err != nil { + return nil, err + } + if tables.taskRound, err = NewGame_taskRound(buf); err != nil { + return nil, err + } + if buf, err = loader("game_taskactivereward"); err != nil { + return nil, err + } + if tables.taskActiveReward, err = NewGame_taskActiveReward(buf); err != nil { + return nil, err + } + if buf, err = loader("game_coin"); err != nil { + return nil, err + } + if tables.coin, err = NewGame_coin(buf); err != nil { + return nil, err + } + if buf, err = loader("game_initial"); err != nil { + return nil, err + } + if tables.initial, err = NewGame_initial(buf); err != nil { + return nil, err + } + if buf, err = loader("game_monster"); err != nil { + return nil, err + } + if tables.monster, err = NewGame_monster(buf); err != nil { + return nil, err + } + if buf, err = loader("game_equippos"); err != nil { + return nil, err + } + if tables.equipPos, err = NewGame_equipPos(buf); err != nil { + return nil, err + } + if buf, err = loader("game_playerlv"); err != nil { + return nil, err + } + if tables.playerlv, err = NewGame_playerlv(buf); err != nil { + return nil, err + } + if buf, err = loader("game_propsgroup"); err != nil { + return nil, err + } + if tables.propsgroup, err = NewGame_propsgroup(buf); err != nil { + return nil, err + } + if buf, err = loader("game_facemod"); err != nil { + return nil, err + } + if tables.facemod, err = NewGame_facemod(buf); err != nil { + return nil, err + } + if buf, err = loader("game_msgdistrib"); err != nil { + return nil, err + } + if tables.msgdistrib, err = NewGame_msgdistrib(buf); err != nil { + return nil, err + } + if buf, err = loader("game_language"); err != nil { + return nil, err + } + if tables.language, err = NewGame_language(buf); err != nil { + return nil, err + } + if buf, err = loader("game_propsgrouplist"); err != nil { + return nil, err + } + if tables.propsgrouplist, err = NewGame_propsgrouplist(buf); err != nil { + return nil, err + } + return tables, nil } diff --git a/sys/configure/structs/game.hero.go b/sys/configure/structs/game.hero.go new file mode 100644 index 000000000..48cc2c6ea --- /dev/null +++ b/sys/configure/structs/game.hero.go @@ -0,0 +1,42 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +package cfg + +type Game_hero struct { + _dataMap map[string]*Game_heroData + _dataList []*Game_heroData +} + +func NewGame_hero(_buf []map[string]interface{}) (*Game_hero, error) { + _dataList := make([]*Game_heroData, 0, len(_buf)) + dataMap := make(map[string]*Game_heroData) + for _, _ele_ := range _buf { + if _v, err2 := NewGame_heroData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Hid] = _v + } + } + return &Game_hero{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Game_hero) GetDataMap() map[string]*Game_heroData { + return table._dataMap +} + +func (table *Game_hero) GetDataList() []*Game_heroData { + return table._dataList +} + +func (table *Game_hero) Get(key string) *Game_heroData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.newHeroData.go b/sys/configure/structs/game.heroData.go similarity index 91% rename from sys/configure/structs/game.newHeroData.go rename to sys/configure/structs/game.heroData.go index aaf7877e1..2e7541699 100644 --- a/sys/configure/structs/game.newHeroData.go +++ b/sys/configure/structs/game.heroData.go @@ -11,7 +11,7 @@ package cfg import "errors" import "bright/math" -type Game_newHeroData struct { +type Game_heroData struct { Hid string Name string Star int32 @@ -21,8 +21,9 @@ type Game_newHeroData struct { Type int32 Handbook int32 Prefab int32 + Rotation string Icon int32 - Sound string + Vocal string Tujing []int32 Intr string Events string @@ -38,12 +39,12 @@ type Game_newHeroData struct { Camerainterval float32 } -func (Game_newHeroData) GetTypeId() int { - return -1696809848 +func (Game_heroData) GetTypeId() int { + return 650222912 } -func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err error) { - _v = &Game_newHeroData{} +func NewGame_heroData(_buf map[string]interface{}) (_v *Game_heroData, err error) { + _v = &Game_heroData{} { var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } @@ -53,8 +54,9 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["handbook"].(float64); !_ok_ { err = errors.New("handbook error"); return }; _v.Handbook = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["prefab"].(float64); !_ok_ { err = errors.New("prefab error"); return }; _v.Prefab = int32(_tempNum_) } + { var _ok_ bool; if _v.Rotation, _ok_ = _buf["rotation"].(string); !_ok_ { err = errors.New("rotation error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icon"].(float64); !_ok_ { err = errors.New("icon error"); return }; _v.Icon = int32(_tempNum_) } - {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["sound"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Sound error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Sound, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.Vocal, _ok_ = _buf["vocal"].(string); !_ok_ { err = errors.New("vocal error"); return } } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/game.newHero.go b/sys/configure/structs/game.newHero.go deleted file mode 100644 index e5020d522..000000000 --- a/sys/configure/structs/game.newHero.go +++ /dev/null @@ -1,42 +0,0 @@ - -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ -package cfg - -type Game_newHero struct { - _dataMap map[string]*Game_newHeroData - _dataList []*Game_newHeroData -} - -func NewGame_newHero(_buf []map[string]interface{}) (*Game_newHero, error) { - _dataList := make([]*Game_newHeroData, 0, len(_buf)) - dataMap := make(map[string]*Game_newHeroData) - for _, _ele_ := range _buf { - if _v, err2 := NewGame_newHeroData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Hid] = _v - } - } - return &Game_newHero{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *Game_newHero) GetDataMap() map[string]*Game_newHeroData { - return table._dataMap -} - -func (table *Game_newHero) GetDataList() []*Game_newHeroData { - return table._dataList -} - -func (table *Game_newHero) Get(key string) *Game_newHeroData { - return table._dataMap[key] -} - - From 49a42793c6d6176e2d00ee5e822804a7e2c89dbf Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 3 Aug 2022 10:29:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/LocalizeConfig_CN.json | 72 + bin/json/LocalizeConfig_EN.json | 72 + bin/json/LocalizeConfig_TW.json | 72 + bin/json/game_extservers.json | 8 + bin/json/game_language.json | 108 + bin/json/game_skill.json | 8586 ++++++++++++++++++ bin/json/game_ui.json | 24 + modules/hero/api_strengthenUpStar.go | 19 +- sys/configure/structs/Tables.go | 835 +- sys/configure/structs/game.equipIntensify.go | 15 +- sys/configure/structs/game.skill.go | 42 + sys/configure/structs/game.skillData.go | 77 + sys/db/init_test.go | 1 + 13 files changed, 9500 insertions(+), 431 deletions(-) create mode 100644 bin/json/game_skill.json create mode 100644 sys/configure/structs/game.skill.go create mode 100644 sys/configure/structs/game.skillData.go diff --git a/bin/json/LocalizeConfig_CN.json b/bin/json/LocalizeConfig_CN.json index ed415054a..f2632b235 100644 --- a/bin/json/LocalizeConfig_CN.json +++ b/bin/json/LocalizeConfig_CN.json @@ -3354,5 +3354,77 @@ { "key": "opencond_prompt_10003", "text_cn": "开服第2天开启且通关2-14后开启" + }, + { + "key": "num_1001", + "text_cn": "主线入口" + }, + { + "key": "num_1002", + "text_cn": "招募" + }, + { + "key": "num_1003", + "text_cn": "剧情副本" + }, + { + "key": "num_1004", + "text_cn": "武馆入口" + }, + { + "key": "num_1005", + "text_cn": "主题活动入口" + }, + { + "key": "num_1006", + "text_cn": "迷雾岛屿" + }, + { + "key": "num_1007", + "text_cn": "维京远征" + }, + { + "key": "num_1008", + "text_cn": "心魔塔" + }, + { + "key": "num_1009", + "text_cn": "捕羊大赛" + }, + { + "key": "num_1010", + "text_cn": "黑暗料理大赛" + }, + { + "key": "num_1011", + "text_cn": "地下角斗场" + }, + { + "key": "num_1012", + "text_cn": "疯狂竞技赛" + }, + { + "key": "num_1013", + "text_cn": "五侠擂台" + }, + { + "key": "num_1014", + "text_cn": "藏书馆" + }, + { + "key": "num_1015", + "text_cn": "篝火舞会" + }, + { + "key": "num_1016", + "text_cn": "商队" + }, + { + "key": "num_1017", + "text_cn": "美食馆" + }, + { + "key": "num_1018", + "text_cn": "戈伯铁匠铺" } ] \ No newline at end of file diff --git a/bin/json/LocalizeConfig_EN.json b/bin/json/LocalizeConfig_EN.json index 357e6b2d3..3e30d11fb 100644 --- a/bin/json/LocalizeConfig_EN.json +++ b/bin/json/LocalizeConfig_EN.json @@ -3354,5 +3354,77 @@ { "key": "opencond_prompt_10003", "text_en": "" + }, + { + "key": "num_1001", + "text_en": "TRIALS" + }, + { + "key": "num_1002", + "text_en": "MOON" + }, + { + "key": "num_1003", + "text_en": "STORY" + }, + { + "key": "num_1004", + "text_en": "KONG FU" + }, + { + "key": "num_1005", + "text_en": "EVENT" + }, + { + "key": "num_1006", + "text_en": "Misty Island" + }, + { + "key": "num_1007", + "text_en": "Viking expedition" + }, + { + "key": "num_1008", + "text_en": "Heart demon tower" + }, + { + "key": "num_1009", + "text_en": "Catch sheep" + }, + { + "key": "num_1010", + "text_en": "Dark cuisine" + }, + { + "key": "num_1011", + "text_en": "Underground Arena" + }, + { + "key": "num_1012", + "text_en": "Crazy competition" + }, + { + "key": "num_1013", + "text_en": "Five heroes challenge" + }, + { + "key": "num_1014", + "text_en": "Library" + }, + { + "key": "num_1015", + "text_en": "Bonfire Dance" + }, + { + "key": "num_1016", + "text_en": "Caravan" + }, + { + "key": "num_1017", + "text_en": "Gourmet restaurant" + }, + { + "key": "num_1018", + "text_en": "Gober blacksmith shop" } ] \ No newline at end of file diff --git a/bin/json/LocalizeConfig_TW.json b/bin/json/LocalizeConfig_TW.json index f76cbd096..028781a16 100644 --- a/bin/json/LocalizeConfig_TW.json +++ b/bin/json/LocalizeConfig_TW.json @@ -3354,5 +3354,77 @@ { "key": "opencond_prompt_10003", "text_tw": "" + }, + { + "key": "num_1001", + "text_tw": "" + }, + { + "key": "num_1002", + "text_tw": "" + }, + { + "key": "num_1003", + "text_tw": "" + }, + { + "key": "num_1004", + "text_tw": "" + }, + { + "key": "num_1005", + "text_tw": "" + }, + { + "key": "num_1006", + "text_tw": "" + }, + { + "key": "num_1007", + "text_tw": "" + }, + { + "key": "num_1008", + "text_tw": "" + }, + { + "key": "num_1009", + "text_tw": "" + }, + { + "key": "num_1010", + "text_tw": "" + }, + { + "key": "num_1011", + "text_tw": "" + }, + { + "key": "num_1012", + "text_tw": "" + }, + { + "key": "num_1013", + "text_tw": "" + }, + { + "key": "num_1014", + "text_tw": "" + }, + { + "key": "num_1015", + "text_tw": "" + }, + { + "key": "num_1016", + "text_tw": "" + }, + { + "key": "num_1017", + "text_tw": "" + }, + { + "key": "num_1018", + "text_tw": "" } ] \ No newline at end of file diff --git a/bin/json/game_extservers.json b/bin/json/game_extservers.json index d76dc267b..f628045f5 100644 --- a/bin/json/game_extservers.json +++ b/bin/json/game_extservers.json @@ -22,5 +22,13 @@ }, "ips": "10.0.0.138:7891", "debug": true + }, + { + "name": { + "key": "debug_server_02", + "text": "mxf" + }, + "ips": "10.0.0.85:7891", + "debug": true } ] \ No newline at end of file diff --git a/bin/json/game_language.json b/bin/json/game_language.json index c2c1197a4..da9b04b36 100644 --- a/bin/json/game_language.json +++ b/bin/json/game_language.json @@ -322,5 +322,113 @@ "key": "tips_1002", "text": "tips_1002" } + }, + { + "keycode": { + "key": "num_1001", + "text": "num_1001" + } + }, + { + "keycode": { + "key": "num_1002", + "text": "num_1002" + } + }, + { + "keycode": { + "key": "num_1003", + "text": "num_1003" + } + }, + { + "keycode": { + "key": "num_1004", + "text": "num_1004" + } + }, + { + "keycode": { + "key": "num_1005", + "text": "num_1005" + } + }, + { + "keycode": { + "key": "num_1006", + "text": "num_1006" + } + }, + { + "keycode": { + "key": "num_1007", + "text": "num_1007" + } + }, + { + "keycode": { + "key": "num_1008", + "text": "num_1008" + } + }, + { + "keycode": { + "key": "num_1009", + "text": "num_1009" + } + }, + { + "keycode": { + "key": "num_1010", + "text": "num_1010" + } + }, + { + "keycode": { + "key": "num_1011", + "text": "num_1011" + } + }, + { + "keycode": { + "key": "num_1012", + "text": "num_1012" + } + }, + { + "keycode": { + "key": "num_1013", + "text": "num_1013" + } + }, + { + "keycode": { + "key": "num_1014", + "text": "num_1014" + } + }, + { + "keycode": { + "key": "num_1015", + "text": "num_1015" + } + }, + { + "keycode": { + "key": "num_1016", + "text": "num_1016" + } + }, + { + "keycode": { + "key": "num_1017", + "text": "num_1017" + } + }, + { + "keycode": { + "key": "num_1018", + "text": "num_1018" + } } ] \ No newline at end of file diff --git a/bin/json/game_skill.json b/bin/json/game_skill.json new file mode 100644 index 000000000..4c84647b0 --- /dev/null +++ b/bin/json/game_skill.json @@ -0,0 +1,8586 @@ +[ + { + "Id": 190011000, + "Name": { + "key": "skillname_190011000", + "text": "阿宝队长技" + }, + "ico": "jn_dzj_01", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290011101 + ] + }, + { + "Id": [ + 290011101 + ] + }, + { + "Id": [ + 290011101 + ] + }, + { + "Id": [ + 290011101 + ] + }, + { + "Id": [ + 290011101 + ] + }, + { + "Id": [ + 290011101 + ] + } + ], + "Desc1": { + "key": "skill_190011000", + "text": "我方全体防御增加30%" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190012000, + "Name": { + "key": "skillname_190012000", + "text": "熊猫拳" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290012101 + ] + }, + { + "Id": [ + 290012101 + ] + }, + { + "Id": [ + 290012101 + ] + }, + { + "Id": [ + 290012101 + ] + }, + { + "Id": [ + 290012101 + ] + }, + { + "Id": [ + 290012101 + ] + } + ], + "Desc1": { + "key": "skill_190012000", + "text": "阿宝对敌方1个目标造成攻击力30%及防御力70%的伤害，并有75%概率对目标附加2回合【攻击下降】效果" + }, + "Desc2": { + "key": "skill_190011001", + "text": "伤害提升至100%" + }, + "Desc3": { + "key": "skill_190011002", + "text": "伤害提升至110%" + }, + "Desc4": { + "key": "skill_190011003", + "text": "伤害提升至120%" + }, + "Desc5": { + "key": "skill_190011004", + "text": "伤害提升至130%" + } + }, + { + "Id": 190013000, + "Name": { + "key": "skillname_190013000", + "text": "太极一式" + }, + "ico": "jn_icon_002", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290013101 + ] + }, + { + "Id": [ + 290013101 + ] + }, + { + "Id": [ + 290013101 + ] + }, + { + "Id": [ + 290013101 + ] + }, + { + "Id": [ + 290013101 + ] + }, + { + "Id": [ + 290013101 + ] + } + ], + "Desc1": { + "key": "skill_190013000", + "text": "每回合结束后，阿宝会进入【玄御】状态，持续1回合，在自身新回合开始时，对敌方全体造成防御力110%的伤害。【玄御】期间自身每次收到攻击时都会获得1层【玄御之佑】，但出于不可行动状态时解除【玄御】状态。自身的任意主动技能命中敌人触发暴击时降低此技能1回合冷却" + }, + "Desc2": { + "key": "skill_190011001", + "text": "伤害提升至100%" + }, + "Desc3": { + "key": "skill_190011002", + "text": "伤害提升至110%" + }, + "Desc4": { + "key": "skill_190011003", + "text": "伤害提升至120%" + }, + "Desc5": { + "key": "skill_190011004", + "text": "伤害提升至130%" + } + }, + { + "Id": 190014000, + "Name": { + "key": "skillname_190011003", + "text": "太极零式" + }, + "ico": "jn_icon_003", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290014101 + ] + }, + { + "Id": [ + 290014101 + ] + }, + { + "Id": [ + 290014101 + ] + }, + { + "Id": [ + 290014101 + ] + }, + { + "Id": [ + 290014101 + ] + }, + { + "Id": [ + 290014101 + ] + } + ], + "Desc1": { + "key": "skill_190014000", + "text": "阿宝对敌方1个目标造成攻击力80%及防御力140%的伤害，同时为自身附加【防御提升】【免疫】状态各2回合" + }, + "Desc2": { + "key": "skill_190011001", + "text": "伤害提升至100%" + }, + "Desc3": { + "key": "skill_190011002", + "text": "伤害提升至110%" + }, + "Desc4": { + "key": "skill_190011003", + "text": "伤害提升至120%" + }, + "Desc5": { + "key": "skill_190011004", + "text": "伤害提升至130%" + } + }, + { + "Id": 190015000, + "Name": { + "key": "skillname_190014000", + "text": "波比队长技" + }, + "ico": "jn_dzj_03", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290015101 + ] + }, + { + "Id": [ + 290015101 + ] + }, + { + "Id": [ + 290015101 + ] + }, + { + "Id": [ + 290015101 + ] + }, + { + "Id": [ + 290015101 + ] + }, + { + "Id": [ + 290015101 + ] + } + ], + "Desc1": { + "key": "skill_190015000", + "text": "我方全体效果抵抗增加40%" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190016000, + "Name": { + "key": "skillname_190016000", + "text": "和谐音律" + }, + "ico": "jn_icon_004", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290016101 + ] + }, + { + "Id": [ + 290016101 + ] + }, + { + "Id": [ + 290016101 + ] + }, + { + "Id": [ + 290016101 + ] + }, + { + "Id": [ + 290016101 + ] + }, + { + "Id": [ + 290016101 + ] + } + ], + "Desc1": { + "key": "skill_190016000", + "text": "波比对敌方1个目标造成3次攻击力45%的伤害，有60%概率为自身附加2回合【免疫】状态。" + }, + "Desc2": { + "key": "skill_190011001", + "text": "伤害提升至100%" + }, + "Desc3": { + "key": "skill_190011002", + "text": "伤害提升至110%" + }, + "Desc4": { + "key": "skill_190011003", + "text": "伤害提升至120%" + }, + "Desc5": { + "key": "skill_190011004", + "text": "伤害提升至130%" + } + }, + { + "Id": 190017000, + "Name": { + "key": "skillname_190017000", + "text": "欢悦之舞" + }, + "ico": "jn_icon_005", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290017101 + ] + }, + { + "Id": [ + 290017101 + ] + }, + { + "Id": [ + 290017101 + ] + }, + { + "Id": [ + 290017101 + ] + }, + { + "Id": [ + 290017101 + ] + }, + { + "Id": [ + 290017101 + ] + } + ], + "Desc1": { + "key": "skill_190017000", + "text": "波比清除我方所有减益状态，并平均分配我方生命值百分比，为我方全体附加2回合【攻击提升】状态" + }, + "Desc2": { + "key": "skill_190011001", + "text": "伤害提升至100%" + }, + "Desc3": { + "key": "skill_190011002", + "text": "伤害提升至110%" + }, + "Desc4": { + "key": "skill_190011003", + "text": "伤害提升至120%" + }, + "Desc5": { + "key": "skill_190011004", + "text": "伤害提升至130%" + } + }, + { + "Id": 190018000, + "Name": { + "key": "skillname_190018000", + "text": "彩虹音符" + }, + "ico": "jn_icon_006", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290018001 + ] + }, + { + "Id": [ + 290018001 + ] + }, + { + "Id": [ + 290018001 + ] + }, + { + "Id": [ + 290018001 + ] + }, + { + "Id": [ + 290018001 + ] + }, + { + "Id": [ + 290018001 + ] + } + ], + "Desc1": { + "key": "skill_190018000", + "text": "进入2回合【喜悦】状态，使我方全体收到伤害降低25%，且在每个队友行动去，为其驱散1个减益状态并回复其最大生命值26%的生命，效果持续期间自身无法行动。" + }, + "Desc2": { + "key": "skill_190011001", + "text": "伤害提升至100%" + }, + "Desc3": { + "key": "skill_190011002", + "text": "伤害提升至110%" + }, + "Desc4": { + "key": "skill_190011003", + "text": "伤害提升至120%" + }, + "Desc5": { + "key": "skill_190011004", + "text": "伤害提升至130%" + } + }, + { + "Id": 190019000, + "Name": { + "key": "skillname_190019000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290019001 + ] + }, + { + "Id": [ + 290019001 + ] + }, + { + "Id": [ + 290019001 + ] + }, + { + "Id": [ + 290019001 + ] + }, + { + "Id": [ + 290019001 + ] + }, + { + "Id": [ + 290019001 + ] + } + ], + "Desc1": { + "key": "skill_190018001", + "text": "敌方单体附加攻击下降，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190020000, + "Name": { + "key": "skillname_190020000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290020001 + ] + }, + { + "Id": [ + 290020001 + ] + }, + { + "Id": [ + 290020001 + ] + }, + { + "Id": [ + 290020001 + ] + }, + { + "Id": [ + 290020001 + ] + }, + { + "Id": [ + 290020001 + ] + } + ], + "Desc1": { + "key": "skill_190018002", + "text": "己方全体附加防御提升，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190021000, + "Name": { + "key": "skillname_190021000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290021001 + ] + }, + { + "Id": [ + 290021001 + ] + }, + { + "Id": [ + 290021001 + ] + }, + { + "Id": [ + 290021001 + ] + }, + { + "Id": [ + 290021001 + ] + }, + { + "Id": [ + 290021001 + ] + } + ], + "Desc1": { + "key": "skill_190018003", + "text": "敌方单体附加防御下降，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190022000, + "Name": { + "key": "skillname_190022000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290022001 + ] + }, + { + "Id": [ + 290022001 + ] + }, + { + "Id": [ + 290022001 + ] + }, + { + "Id": [ + 290022001 + ] + }, + { + "Id": [ + 290022001 + ] + }, + { + "Id": [ + 290022001 + ] + } + ], + "Desc1": { + "key": "skill_190018004", + "text": "己方全体附加速度提升，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190023000, + "Name": { + "key": "skillname_190023000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290023001 + ] + }, + { + "Id": [ + 290023001 + ] + }, + { + "Id": [ + 290023001 + ] + }, + { + "Id": [ + 290023001 + ] + }, + { + "Id": [ + 290023001 + ] + }, + { + "Id": [ + 290023001 + ] + } + ], + "Desc1": { + "key": "skill_190018005", + "text": "敌方单体附加速度下降，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190024000, + "Name": { + "key": "skillname_190024000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290024001 + ] + }, + { + "Id": [ + 290024001 + ] + }, + { + "Id": [ + 290024001 + ] + }, + { + "Id": [ + 290024001 + ] + }, + { + "Id": [ + 290024001 + ] + }, + { + "Id": [ + 290024001 + ] + } + ], + "Desc1": { + "key": "skill_190018006", + "text": "己方全体附加暴击提升，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190025000, + "Name": { + "key": "skillname_190025000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290025001 + ] + }, + { + "Id": [ + 290025001 + ] + }, + { + "Id": [ + 290025001 + ] + }, + { + "Id": [ + 290025001 + ] + }, + { + "Id": [ + 290025001 + ] + }, + { + "Id": [ + 290025001 + ] + } + ], + "Desc1": { + "key": "skill_190018007", + "text": "敌方单体附加暴击下降，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190026000, + "Name": { + "key": "skillname_190026000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290026001 + ] + }, + { + "Id": [ + 290026001 + ] + }, + { + "Id": [ + 290026001 + ] + }, + { + "Id": [ + 290026001 + ] + }, + { + "Id": [ + 290026001 + ] + }, + { + "Id": [ + 290026001 + ] + } + ], + "Desc1": { + "key": "skill_190018008", + "text": "敌方单体附加烙印，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190027000, + "Name": { + "key": "skillname_190027000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290027001 + ] + }, + { + "Id": [ + 290027001 + ] + }, + { + "Id": [ + 290027001 + ] + }, + { + "Id": [ + 290027001 + ] + }, + { + "Id": [ + 290027001 + ] + }, + { + "Id": [ + 290027001 + ] + } + ], + "Desc1": { + "key": "skill_190018009", + "text": "敌方单体附加失手率提升，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190028000, + "Name": { + "key": "skillname_190028000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290028001 + ] + }, + { + "Id": [ + 290028001 + ] + }, + { + "Id": [ + 290028001 + ] + }, + { + "Id": [ + 290028001 + ] + }, + { + "Id": [ + 290028001 + ] + }, + { + "Id": [ + 290028001 + ] + } + ], + "Desc1": { + "key": "skill_190018010", + "text": "己方全体附加10层叹息之力" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190029000, + "Name": { + "key": "skillname_190029000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290029001 + ] + }, + { + "Id": [ + 290029001 + ] + }, + { + "Id": [ + 290029001 + ] + }, + { + "Id": [ + 290029001 + ] + }, + { + "Id": [ + 290029001 + ] + }, + { + "Id": [ + 290029001 + ] + } + ], + "Desc1": { + "key": "skill_190018011", + "text": "己方全体附加暴击抵抗，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190030000, + "Name": { + "key": "skillname_190030000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290030001 + ] + }, + { + "Id": [ + 290030001 + ] + }, + { + "Id": [ + 290030001 + ] + }, + { + "Id": [ + 290030001 + ] + }, + { + "Id": [ + 290030001 + ] + }, + { + "Id": [ + 290030001 + ] + } + ], + "Desc1": { + "key": "skill_190018012", + "text": "敌方单体附加眩晕，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190031000, + "Name": { + "key": "skillname_190031000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290031001 + ] + }, + { + "Id": [ + 290031001 + ] + }, + { + "Id": [ + 290031001 + ] + }, + { + "Id": [ + 290031001 + ] + }, + { + "Id": [ + 290031001 + ] + }, + { + "Id": [ + 290031001 + ] + } + ], + "Desc1": { + "key": "skill_190018013", + "text": "敌方单体附加冰冻，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190032000, + "Name": { + "key": "skillname_190032000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290032001 + ] + }, + { + "Id": [ + 290032001 + ] + }, + { + "Id": [ + 290032001 + ] + }, + { + "Id": [ + 290032001 + ] + }, + { + "Id": [ + 290032001 + ] + }, + { + "Id": [ + 290032001 + ] + } + ], + "Desc1": { + "key": "skill_190018014", + "text": "己方全体附加无法获得增益效果，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190033000, + "Name": { + "key": "skillname_190033000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290033001 + ] + }, + { + "Id": [ + 290033001 + ] + }, + { + "Id": [ + 290033001 + ] + }, + { + "Id": [ + 290033001 + ] + }, + { + "Id": [ + 290033001 + ] + }, + { + "Id": [ + 290033001 + ] + } + ], + "Desc1": { + "key": "skill_190018015", + "text": "己方全体附加无法获得减益效果，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190034000, + "Name": { + "key": "skillname_190034000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290034001 + ] + }, + { + "Id": [ + 290034001 + ] + }, + { + "Id": [ + 290034001 + ] + }, + { + "Id": [ + 290034001 + ] + }, + { + "Id": [ + 290034001 + ] + }, + { + "Id": [ + 290034001 + ] + } + ], + "Desc1": { + "key": "skill_190018016", + "text": "己方全体附加免疫，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190035000, + "Name": { + "key": "skillname_190035000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290035001 + ] + }, + { + "Id": [ + 290035001 + ] + }, + { + "Id": [ + 290035001 + ] + }, + { + "Id": [ + 290035001 + ] + }, + { + "Id": [ + 290035001 + ] + }, + { + "Id": [ + 290035001 + ] + } + ], + "Desc1": { + "key": "skill_190018017", + "text": "己方全体附加无敌，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190036000, + "Name": { + "key": "skillname_190036000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290036001 + ] + }, + { + "Id": [ + 290036001 + ] + }, + { + "Id": [ + 290036001 + ] + }, + { + "Id": [ + 290036001 + ] + }, + { + "Id": [ + 290036001 + ] + }, + { + "Id": [ + 290036001 + ] + } + ], + "Desc1": { + "key": "skill_190018018", + "text": "敌方单体附加禁疗，持续2回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190037000, + "Name": { + "key": "skillname_190037000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290037001, + 290037002 + ] + }, + { + "Id": [ + 290037001, + 290037002 + ] + }, + { + "Id": [ + 290037001, + 290037002 + ] + }, + { + "Id": [ + 290037001, + 290037002 + ] + }, + { + "Id": [ + 290037001, + 290037002 + ] + }, + { + "Id": [ + 290037001, + 290037002 + ] + } + ], + "Desc1": { + "key": "skill_190018019", + "text": "对敌方单体造成3次攻击力80%的伤害，有50%的概率再次对目标额外造成50%防御力的伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190038000, + "Name": { + "key": "skillname_190038000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290038001 + ] + }, + { + "Id": [ + 290038001 + ] + }, + { + "Id": [ + 290038001 + ] + }, + { + "Id": [ + 290038001 + ] + }, + { + "Id": [ + 290038001 + ] + }, + { + "Id": [ + 290038001 + ] + } + ], + "Desc1": { + "key": "skill_190018020", + "text": "对敌方全体造成攻击力80%的伤害，另有50%概率驱散敌方1个增益BUFF（表现为2次伤害飘字）" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190039000, + "Name": { + "key": "skillname_190039000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290039001 + ] + }, + { + "Id": [ + 290039001 + ] + }, + { + "Id": [ + 290039001 + ] + }, + { + "Id": [ + 290039001 + ] + }, + { + "Id": [ + 290039001 + ] + }, + { + "Id": [ + 290039001 + ] + } + ], + "Desc1": { + "key": "skill_190018021", + "text": "对敌方单体造成3次攻击力80%的伤害，每次50%概率附加目标最大生命8%的伤害，此附加伤害不超过自身攻击50%（生命伤害不会暴击，整个技能表现为3次伤害飘字）" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190040000, + "Name": { + "key": "skillname_190040000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290040001 + ] + }, + { + "Id": [ + 290040001 + ] + }, + { + "Id": [ + 290040001 + ] + }, + { + "Id": [ + 290040001 + ] + }, + { + "Id": [ + 290040001 + ] + }, + { + "Id": [ + 290040001 + ] + } + ], + "Desc1": { + "key": "skill_190018022", + "text": "对敌方单体目标造成80%攻击力伤害，触发暴击时，攻击力伤害系数增加30%" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190041000, + "Name": { + "key": "skillname_190041000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290041001 + ] + }, + { + "Id": [ + 290041001 + ] + }, + { + "Id": [ + 290041001 + ] + }, + { + "Id": [ + 290041001 + ] + }, + { + "Id": [ + 290041001 + ] + }, + { + "Id": [ + 290041001 + ] + } + ], + "Desc1": { + "key": "skill_190018023", + "text": "对敌方单体目标造成80%攻击力伤害，触发暴击时，造成伤害增加30%" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190042000, + "Name": { + "key": "skillname_190042000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290042001, + 290042002 + ] + }, + { + "Id": [ + 290042001, + 290042002 + ] + }, + { + "Id": [ + 290042001, + 290042002 + ] + }, + { + "Id": [ + 290042001, + 290042002 + ] + }, + { + "Id": [ + 290042001, + 290042002 + ] + }, + { + "Id": [ + 290042001, + 290042002 + ] + } + ], + "Desc1": { + "key": "skill_190018024", + "text": "对敌方单体目标造成80%攻击力伤害，回复本次伤害30%的血量，本次伤害必定暴击" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190043000, + "Name": { + "key": "skillname_190043000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290043001 + ] + }, + { + "Id": [ + 290043001 + ] + }, + { + "Id": [ + 290043001 + ] + }, + { + "Id": [ + 290043001 + ] + }, + { + "Id": [ + 290043001 + ] + }, + { + "Id": [ + 290043001 + ] + } + ], + "Desc1": { + "key": "skill_190018025", + "text": "对敌方全体目标造成80%攻击力伤害，本次伤害无视防御100%，敌方每有一个增益BUFF，无视防御减少20%" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190044000, + "Name": { + "key": "skillname_190044000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290044001 + ] + }, + { + "Id": [ + 290044001 + ] + }, + { + "Id": [ + 290044001 + ] + }, + { + "Id": [ + 290044001 + ] + }, + { + "Id": [ + 290044001 + ] + }, + { + "Id": [ + 290044001 + ] + } + ], + "Desc1": { + "key": "skill_190018026", + "text": "对敌方单体目标造成80%攻击力伤害，自身每10点速度增加1%的攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190045000, + "Name": { + "key": "skillname_190045000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290045001 + ] + }, + { + "Id": [ + 290045001 + ] + }, + { + "Id": [ + 290045001 + ] + }, + { + "Id": [ + 290045001 + ] + }, + { + "Id": [ + 290045001 + ] + }, + { + "Id": [ + 290045001 + ] + } + ], + "Desc1": { + "key": "skill_190018027", + "text": "对敌方单体目标造成80%攻击力伤害，自身每个增益BUFF，增加攻击力10%的伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190046000, + "Name": { + "key": "skillname_190046000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290046001 + ] + }, + { + "Id": [ + 290046001 + ] + }, + { + "Id": [ + 290046001 + ] + }, + { + "Id": [ + 290046001 + ] + }, + { + "Id": [ + 290046001 + ] + }, + { + "Id": [ + 290046001 + ] + } + ], + "Desc1": { + "key": "skill_190018028", + "text": "驱散敌方全体增益效果，随后对敌方全体造成攻击力80%伤害，每驱散1个增益BUFF，对其造成的伤害增加3%" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190047000, + "Name": { + "key": "skillname_190047000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290047001, + 290047002 + ] + }, + { + "Id": [ + 290047001, + 290047002 + ] + }, + { + "Id": [ + 290047001, + 290047002 + ] + }, + { + "Id": [ + 290047001, + 290047002 + ] + }, + { + "Id": [ + 290047001, + 290047002 + ] + }, + { + "Id": [ + 290047001, + 290047002 + ] + } + ], + "Desc1": { + "key": "skill_190018029", + "text": "对敌方单体造成80%攻击力伤害，对其他敌方目标造成此伤害40%的溅射伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190048000, + "Name": { + "key": "skillname_190048000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290048001 + ] + }, + { + "Id": [ + 290048001 + ] + }, + { + "Id": [ + 290048001 + ] + }, + { + "Id": [ + 290048001 + ] + }, + { + "Id": [ + 290048001 + ] + }, + { + "Id": [ + 290048001 + ] + } + ], + "Desc1": { + "key": "skill_190018030", + "text": "回复己方全体80%攻击力的血量" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190049000, + "Name": { + "key": "skillname_190049000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290049001 + ] + }, + { + "Id": [ + 290049001 + ] + }, + { + "Id": [ + 290049001 + ] + }, + { + "Id": [ + 290049001 + ] + }, + { + "Id": [ + 290049001 + ] + }, + { + "Id": [ + 290049001 + ] + } + ], + "Desc1": { + "key": "skill_190018031", + "text": "回复己方全体其最大生命值20%的血量" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190050000, + "Name": { + "key": "skillname_190050000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290050001 + ] + }, + { + "Id": [ + 290050001 + ] + }, + { + "Id": [ + 290050001 + ] + }, + { + "Id": [ + 290050001 + ] + }, + { + "Id": [ + 290050001 + ] + }, + { + "Id": [ + 290050001 + ] + } + ], + "Desc1": { + "key": "skill_190018032", + "text": "己方全体行动值增加30%" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190051000, + "Name": { + "key": "skillname_190051000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290051001 + ] + }, + { + "Id": [ + 290051001 + ] + }, + { + "Id": [ + 290051001 + ] + }, + { + "Id": [ + 290051001 + ] + }, + { + "Id": [ + 290051001 + ] + }, + { + "Id": [ + 290051001 + ] + } + ], + "Desc1": { + "key": "skill_190018033", + "text": "敌方全体行动值降低30%" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190052000, + "Name": { + "key": "skillname_190052000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290052001 + ] + }, + { + "Id": [ + 290052001 + ] + }, + { + "Id": [ + 290052001 + ] + }, + { + "Id": [ + 290052001 + ] + }, + { + "Id": [ + 290052001 + ] + }, + { + "Id": [ + 290052001 + ] + } + ], + "Desc1": { + "key": "skill_190018034", + "text": "夺取敌方单体30%行动值" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190053000, + "Name": { + "key": "skillname_190053000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290053001 + ] + }, + { + "Id": [ + 290053001 + ] + }, + { + "Id": [ + 290053001 + ] + }, + { + "Id": [ + 290053001 + ] + }, + { + "Id": [ + 290053001 + ] + }, + { + "Id": [ + 290053001 + ] + } + ], + "Desc1": { + "key": "skill_190018035", + "text": "净化己方全体非防御下降类减益BUFF" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190054000, + "Name": { + "key": "skillname_190054000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290054001 + ] + }, + { + "Id": [ + 290054001 + ] + }, + { + "Id": [ + 290054001 + ] + }, + { + "Id": [ + 290054001 + ] + }, + { + "Id": [ + 290054001 + ] + }, + { + "Id": [ + 290054001 + ] + } + ], + "Desc1": { + "key": "skill_190018036", + "text": "驱散敌方全体增益BUFF" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190055000, + "Name": { + "key": "skillname_190055000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290055001 + ] + }, + { + "Id": [ + 290055001 + ] + }, + { + "Id": [ + 290055001 + ] + }, + { + "Id": [ + 290055001 + ] + }, + { + "Id": [ + 290055001 + ] + }, + { + "Id": [ + 290055001 + ] + } + ], + "Desc1": { + "key": "skill_190018037", + "text": "夺取敌方单体全部增益BUFF给自身" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190056000, + "Name": { + "key": "skillname_190056000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290056001 + ] + }, + { + "Id": [ + 290056001 + ] + }, + { + "Id": [ + 290056001 + ] + }, + { + "Id": [ + 290056001 + ] + }, + { + "Id": [ + 290056001 + ] + }, + { + "Id": [ + 290056001 + ] + } + ], + "Desc1": { + "key": "skill_190018038", + "text": "转移己方全体1个减益BUFF给敌方单体" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190057000, + "Name": { + "key": "skillname_190057000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290057001 + ] + }, + { + "Id": [ + 290057001 + ] + }, + { + "Id": [ + 290057001 + ] + }, + { + "Id": [ + 290057001 + ] + }, + { + "Id": [ + 290057001 + ] + }, + { + "Id": [ + 290057001 + ] + } + ], + "Desc1": { + "key": "skill_190018039", + "text": "己方全体增益BUFF持续回合\u002B1" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190058000, + "Name": { + "key": "skillname_190058000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290058001 + ] + }, + { + "Id": [ + 290058001 + ] + }, + { + "Id": [ + 290058001 + ] + }, + { + "Id": [ + 290058001 + ] + }, + { + "Id": [ + 290058001 + ] + }, + { + "Id": [ + 290058001 + ] + } + ], + "Desc1": { + "key": "skill_190018040", + "text": "敌方全体减益BUFF持续回合\u002B1" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190059000, + "Name": { + "key": "skillname_190059000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290059001 + ] + }, + { + "Id": [ + 290059001 + ] + }, + { + "Id": [ + 290059001 + ] + }, + { + "Id": [ + 290059001 + ] + }, + { + "Id": [ + 290059001 + ] + }, + { + "Id": [ + 290059001 + ] + } + ], + "Desc1": { + "key": "skill_190018041", + "text": "己方全体所有技能CD-1" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190060000, + "Name": { + "key": "skillname_190060000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290060001 + ] + }, + { + "Id": [ + 290060001 + ] + }, + { + "Id": [ + 290060001 + ] + }, + { + "Id": [ + 290060001 + ] + }, + { + "Id": [ + 290060001 + ] + }, + { + "Id": [ + 290060001 + ] + } + ], + "Desc1": { + "key": "skill_190018042", + "text": "敌方全体所有技能CD\u002B1" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190061000, + "Name": { + "key": "skillname_190061000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290061001, + 290061002 + ] + }, + { + "Id": [ + 290061001, + 290061002 + ] + }, + { + "Id": [ + 290061001, + 290061002 + ] + }, + { + "Id": [ + 290061001, + 290061002 + ] + }, + { + "Id": [ + 290061001, + 290061002 + ] + }, + { + "Id": [ + 290061001, + 290061002 + ] + } + ], + "Desc1": { + "key": "skill_190018043", + "text": "对敌方单体造成80%攻击力伤害，随后自身立即获得回合。" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190062000, + "Name": { + "key": "skillname_190062000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 5, + "ChildSkill": [ + { + "Id": [ + 290062001, + 290062002 + ] + }, + { + "Id": [ + 290062001, + 290062002 + ] + }, + { + "Id": [ + 290062001, + 290062002 + ] + }, + { + "Id": [ + 290062001, + 290062002 + ] + }, + { + "Id": [ + 290062001, + 290062002 + ] + }, + { + "Id": [ + 290062001, + 290062002 + ] + } + ], + "Desc1": { + "key": "skill_190018044", + "text": "回复己方单体其最大生命50%的生命值。若目标为死亡状态，则复活目标，并回复其最大生命50%的生命" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190063000, + "Name": { + "key": "skillname_190063000", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290063001 + ] + }, + { + "Id": [ + 290063001 + ] + }, + { + "Id": [ + 290063001 + ] + }, + { + "Id": [ + 290063001 + ] + }, + { + "Id": [ + 290063001 + ] + }, + { + "Id": [ + 290063001 + ] + } + ], + "Desc1": { + "key": "skill_190018045", + "text": "对敌方单体造成80%攻击力伤害，有50%概率再次使用该技能进行追击" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190064000, + "Name": { + "key": "skillname_190064000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290064001 + ] + }, + { + "Id": [ + 290064001 + ] + }, + { + "Id": [ + 290064001 + ] + }, + { + "Id": [ + 290064001 + ] + }, + { + "Id": [ + 290064001 + ] + }, + { + "Id": [ + 290064001 + ] + } + ], + "Desc1": { + "key": "skill_190018046", + "text": "对敌方单体造成80%攻击力伤害，有50%概率再次使用190063000技能进行追击" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190065000, + "Name": { + "key": "skillname_190065000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 4, + "ChildSkill": [ + { + "Id": [ + 290065001 + ] + }, + { + "Id": [ + 290065001 + ] + }, + { + "Id": [ + 290065001 + ] + }, + { + "Id": [ + 290065001 + ] + }, + { + "Id": [ + 290065001 + ] + }, + { + "Id": [ + 290065001 + ] + } + ], + "Desc1": { + "key": "skill_190018047", + "text": "自身随机附加攻击提升，暴击提升，防御提升其中一种，持续2回合。" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190066000, + "Name": { + "key": "skillname_190066000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 290066001 + ] + }, + { + "Id": [ + 290066001 + ] + }, + { + "Id": [ + 290066001 + ] + }, + { + "Id": [ + 290066001 + ] + }, + { + "Id": [ + 290066001 + ] + }, + { + "Id": [ + 290066001 + ] + } + ], + "Desc1": { + "key": "skill_190018048", + "text": "对敌方随机目标造成80%攻击力伤害，50%概率额外造成50%防御力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190067000, + "Name": { + "key": "skillname_190067000", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290067001 + ] + }, + { + "Id": [ + 290067001 + ] + }, + { + "Id": [ + 290067001 + ] + }, + { + "Id": [ + 290067001 + ] + }, + { + "Id": [ + 290067001 + ] + }, + { + "Id": [ + 290067001 + ] + } + ], + "Desc1": { + "key": "skill_190018049", + "text": "每回合行动前对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190068000, + "Name": { + "key": "skillname_190068000", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290068001 + ] + }, + { + "Id": [ + 290068001 + ] + }, + { + "Id": [ + 290068001 + ] + }, + { + "Id": [ + 290068001 + ] + }, + { + "Id": [ + 290068001 + ] + }, + { + "Id": [ + 290068001 + ] + } + ], + "Desc1": { + "key": "skill_190018050", + "text": "下回合行动前对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190069000, + "Name": { + "key": "skillname_190069000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290069001 + ] + }, + { + "Id": [ + 290069001 + ] + }, + { + "Id": [ + 290069001 + ] + }, + { + "Id": [ + 290069001 + ] + }, + { + "Id": [ + 290069001 + ] + }, + { + "Id": [ + 290069001 + ] + } + ], + "Desc1": { + "key": "skill_190018051", + "text": "每次攻击前对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190070000, + "Name": { + "key": "skillname_190070000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290070001 + ] + }, + { + "Id": [ + 290070001 + ] + }, + { + "Id": [ + 290070001 + ] + }, + { + "Id": [ + 290070001 + ] + }, + { + "Id": [ + 290070001 + ] + }, + { + "Id": [ + 290070001 + ] + } + ], + "Desc1": { + "key": "skill_190018052", + "text": "每次受到攻击前对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190071000, + "Name": { + "key": "skillname_190071000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290071001 + ] + }, + { + "Id": [ + 290071001 + ] + }, + { + "Id": [ + 290071001 + ] + }, + { + "Id": [ + 290071001 + ] + }, + { + "Id": [ + 290071001 + ] + }, + { + "Id": [ + 290071001 + ] + } + ], + "Desc1": { + "key": "skill_190018053", + "text": "暴击时回复自身5%最大生命值血量" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190072000, + "Name": { + "key": "skillname_190072000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290072001 + ] + }, + { + "Id": [ + 290072001 + ] + }, + { + "Id": [ + 290072001 + ] + }, + { + "Id": [ + 290072001 + ] + }, + { + "Id": [ + 290072001 + ] + }, + { + "Id": [ + 290072001 + ] + } + ], + "Desc1": { + "key": "skill_190018054", + "text": "被暴击时回复自身5%最大生命值血量" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190073000, + "Name": { + "key": "skillname_190073000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290073001 + ] + }, + { + "Id": [ + 290073001 + ] + }, + { + "Id": [ + 290073001 + ] + }, + { + "Id": [ + 290073001 + ] + }, + { + "Id": [ + 290073001 + ] + }, + { + "Id": [ + 290073001 + ] + } + ], + "Desc1": { + "key": "skill_190018055", + "text": "受到致死伤害后免除死亡，每场战斗最多1次" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190074000, + "Name": { + "key": "skillname_190074000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290074001 + ] + }, + { + "Id": [ + 290074001 + ] + }, + { + "Id": [ + 290074001 + ] + }, + { + "Id": [ + 290074001 + ] + }, + { + "Id": [ + 290074001 + ] + }, + { + "Id": [ + 290074001 + ] + } + ], + "Desc1": { + "key": "skill_190018056", + "text": "击破护盾时，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190075000, + "Name": { + "key": "skillname_190075000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290075001 + ] + }, + { + "Id": [ + 290075001 + ] + }, + { + "Id": [ + 290075001 + ] + }, + { + "Id": [ + 290075001 + ] + }, + { + "Id": [ + 290075001 + ] + }, + { + "Id": [ + 290075001 + ] + } + ], + "Desc1": { + "key": "skill_190018057", + "text": "护盾被击破时，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190076000, + "Name": { + "key": "skillname_190076000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290076001 + ] + }, + { + "Id": [ + 290076001 + ] + }, + { + "Id": [ + 290076001 + ] + }, + { + "Id": [ + 290076001 + ] + }, + { + "Id": [ + 290076001 + ] + }, + { + "Id": [ + 290076001 + ] + } + ], + "Desc1": { + "key": "skill_190018058", + "text": "攻击时，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190077000, + "Name": { + "key": "skillname_190077000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290077001 + ] + }, + { + "Id": [ + 290077001 + ] + }, + { + "Id": [ + 290077001 + ] + }, + { + "Id": [ + 290077001 + ] + }, + { + "Id": [ + 290077001 + ] + }, + { + "Id": [ + 290077001 + ] + } + ], + "Desc1": { + "key": "skill_190018059", + "text": "受到攻击时，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190078000, + "Name": { + "key": "skillname_190078000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290078001 + ] + }, + { + "Id": [ + 290078001 + ] + }, + { + "Id": [ + 290078001 + ] + }, + { + "Id": [ + 290078001 + ] + }, + { + "Id": [ + 290078001 + ] + }, + { + "Id": [ + 290078001 + ] + } + ], + "Desc1": { + "key": "skill_190018060", + "text": "击杀敌人后，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190079000, + "Name": { + "key": "skillname_190079000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290079001 + ] + }, + { + "Id": [ + 290079001 + ] + }, + { + "Id": [ + 290079001 + ] + }, + { + "Id": [ + 290079001 + ] + }, + { + "Id": [ + 290079001 + ] + }, + { + "Id": [ + 290079001 + ] + } + ], + "Desc1": { + "key": "skill_190018061", + "text": "死亡后，立即复活" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190080000, + "Name": { + "key": "skillname_190080000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290080001 + ] + }, + { + "Id": [ + 290080001 + ] + }, + { + "Id": [ + 290080001 + ] + }, + { + "Id": [ + 290080001 + ] + }, + { + "Id": [ + 290080001 + ] + }, + { + "Id": [ + 290080001 + ] + } + ], + "Desc1": { + "key": "skill_190018062", + "text": "复活后，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190081000, + "Name": { + "key": "skillname_190081000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290081001 + ] + }, + { + "Id": [ + 290081001 + ] + }, + { + "Id": [ + 290081001 + ] + }, + { + "Id": [ + 290081001 + ] + }, + { + "Id": [ + 290081001 + ] + }, + { + "Id": [ + 290081001 + ] + } + ], + "Desc1": { + "key": "skill_190018063", + "text": "BUFF结束，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190082000, + "Name": { + "key": "skillname_190082000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290082001 + ] + }, + { + "Id": [ + 290082001 + ] + }, + { + "Id": [ + 290082001 + ] + }, + { + "Id": [ + 290082001 + ] + }, + { + "Id": [ + 290082001 + ] + }, + { + "Id": [ + 290082001 + ] + } + ], + "Desc1": { + "key": "skill_190018064", + "text": "回合结束后，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190083000, + "Name": { + "key": "skillname_190083000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290083001 + ] + }, + { + "Id": [ + 290083001 + ] + }, + { + "Id": [ + 290083001 + ] + }, + { + "Id": [ + 290083001 + ] + }, + { + "Id": [ + 290083001 + ] + }, + { + "Id": [ + 290083001 + ] + } + ], + "Desc1": { + "key": "skill_190018065", + "text": "行动结束前，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190084000, + "Name": { + "key": "skillname_190084000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + } + ], + "Desc1": { + "key": "skill_190018066", + "text": "行动结束后，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190085000, + "Name": { + "key": "skillname_190085000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290085001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + } + ], + "Desc1": { + "key": "skill_190018067", + "text": "增加敌方全体所有技能CD1回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190086000, + "Name": { + "key": "skillname_190086000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290086001 + ] + }, + { + "Id": [ + 290086001 + ] + }, + { + "Id": [ + 290086001 + ] + }, + { + "Id": [ + 290086001 + ] + }, + { + "Id": [ + 290086001 + ] + }, + { + "Id": [ + 290086001 + ] + } + ], + "Desc1": { + "key": "skill_190018068", + "text": "减少己方全体所有技能CD1回合" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 100012100, + "Name": { + "key": "skillname_100012100", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200012101, + 200012102 + ] + }, + { + "Id": [ + 200012101, + 200012102 + ] + }, + { + "Id": [ + 200012101, + 200012102 + ] + }, + { + "Id": [ + 200012101, + 200012102 + ] + }, + { + "Id": [ + 200012101, + 200012102 + ] + }, + { + "Id": [ + 200012101, + 200012102 + ] + } + ], + "Desc1": { + "key": "skill_190018069", + "text": "每回合结束后，会进入【引雷】状态，持续1回合，在自身新回合开始时，对敌方全体造成防御力110%的伤害。【引雷】期间自身每次受到攻击时都会获得1层【雷之庇佑】，但出于不可行动状态时解除【引雷】状态。自身的任意主动技能命中敌人触发暴击时降低此技能1回合冷却（技能无论触发多少次暴击都只执行1次，也就是被动每行动只执行1次）" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 100022100, + "Name": { + "key": "skillname_100022100", + "text": "梦妖姥姥" + }, + "ico": "jn_icon_002", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + }, + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + }, + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + }, + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + }, + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + }, + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + } + ], + "Desc1": { + "key": "skill_190018070", + "text": "无法受到任何控制效果，每回合行动前为己方全体清除任意一个非无法行动状态的减益状态并回复其5%最大生命值；且在任意队友获得减益状态时，自身获得20%行动值提升，每回合仅触发1次。" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 100092100, + "Name": { + "key": "skillname_100092100", + "text": "梦龙闪耀" + }, + "ico": "jn_icon_003", + "act": "Skill_1", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200092101, + 200092102 + ] + }, + { + "Id": [ + 200092101, + 200092102 + ] + }, + { + "Id": [ + 200092101, + 200092102 + ] + }, + { + "Id": [ + 200092101, + 200092102 + ] + }, + { + "Id": [ + 200092101, + 200092102 + ] + }, + { + "Id": [ + 200092101, + 200092102 + ] + } + ], + "Desc1": { + "key": "skill_190018071", + "text": "自身攻击不会失手。当敌方单位使其友方减益状态提前结束时，令该单位失去30%当前生命值，同时失去全部增益状态并获得1回合【石化】效果。" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 100102100, + "Name": { + "key": "skillname_100102100", + "text": "梦扣扣" + }, + "ico": "dzjn_icon_001", + "act": "Skill_2", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + }, + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + }, + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + }, + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + }, + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + }, + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + } + ], + "Desc1": { + "key": "skill_190018072", + "text": "无法获得任意增益和减益状态，受到的所有伤害降低10%。同时，每次被施加增益或减益状态时，自身获得1层【叹息之力】；每有1个队友死亡时，自身获得10层【叹息之力】。最多可叠加50层。每次战斗中首次受到致命伤害时，免除本次死亡，并根据当前【叹息之力】层数回复自身生命值状态，每层回复自身1%最大生命值状态。（死亡是否驱散所有叹息之力）" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 100162100, + "Name": { + "key": "skillname_100162100", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200162101, + 200162102 + ] + }, + { + "Id": [ + 200162101, + 200162102 + ] + }, + { + "Id": [ + 200162101, + 200162102 + ] + }, + { + "Id": [ + 200162101, + 200162102 + ] + }, + { + "Id": [ + 200162101, + 200162102 + ] + }, + { + "Id": [ + 200162101, + 200162102 + ] + } + ], + "Desc1": { + "key": "skill_190018073", + "text": "对己方任意目标造成治疗效果时，会同时为其净化2个减益效果，若目标没有减益效果，则额外为其施加1回合【免疫】效果。同时自身治疗量溢出的120%将转变为【护盾】效果，持续2回合。" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 100191100, + "Name": { + "key": "skillname_100191100", + "text": "猫猫威慑" + }, + "ico": "jn_icon_003", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 200191101, + 200191102 + ] + }, + { + "Id": [ + 200191101, + 200191102 + ] + }, + { + "Id": [ + 200191101, + 200191102 + ] + }, + { + "Id": [ + 200191101, + 200191102 + ] + }, + { + "Id": [ + 200191101, + 200191102 + ] + }, + { + "Id": [ + 200191101, + 200191102 + ] + } + ], + "Desc1": { + "key": "skill_190018074", + "text": "对敌方单体造成攻击力130%的伤害，并附加1层【猫猫威慑】状态。" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 100192100, + "Name": { + "key": "skillname_100192100", + "text": "猫猫推理" + }, + "ico": "dzjn_icon_001", + "act": "Skill_2", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + }, + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + }, + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + }, + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + }, + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + }, + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + } + ], + "Desc1": { + "key": "skill_190018075", + "text": "每次攻击后，若目标的生命值比例高于50%，则对该目标重复释放一次本次攻击所用技能，否则自身获得1层【猫猫推理】。每回合仅触发1次。每层【猫猫推理】提供15%伤害减免。" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 100193100, + "Name": { + "key": "skillname_100193100", + "text": "烙印" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 200193101 + ] + }, + { + "Id": [ + 200193101 + ] + } + ], + "Desc1": { + "key": "skill_190018076", + "text": "对敌方单体造成攻击力210%的伤害，并附加2回合【烙印】状态。" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 100622100, + "Name": { + "key": "skillname_100622100", + "text": "烙印" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200622101 + ] + }, + { + "Id": [ + 200622101 + ] + }, + { + "Id": [ + 200622101 + ] + }, + { + "Id": [ + 200622101 + ] + }, + { + "Id": [ + 200622101 + ] + }, + { + "Id": [ + 200622101 + ] + } + ], + "Desc1": { + "key": "skill_190018077", + "text": "当队友向敌方任意1个目标发起攻击时，都会跟随队友对目标造成攻击力40%的伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 100626100, + "Name": { + "key": "skillname_100626100", + "text": "烙印" + }, + "ico": "jn_icon_001", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200626101 + ] + }, + { + "Id": [ + 200626101 + ] + }, + { + "Id": [ + 200626101 + ] + }, + { + "Id": [ + 200626101 + ] + }, + { + "Id": [ + 200626101 + ] + }, + { + "Id": [ + 200626101 + ] + } + ], + "Desc1": { + "key": "skill_190018078", + "text": "对目标造成攻击力40%的伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190087000, + "Name": { + "key": "skillname_190087000", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + } + ], + "Desc1": { + "key": "skill_190018079", + "text": "攻击时，如果自身血量大于50%，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190087001, + "Name": { + "key": "skillname_190087001", + "text": "梦之贪婪" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290087003 + ] + }, + { + "Id": [ + 290087003 + ] + }, + { + "Id": [ + 290087003 + ] + }, + { + "Id": [ + 290087003 + ] + }, + { + "Id": [ + 290087003 + ] + }, + { + "Id": [ + 290087003 + ] + } + ], + "Desc1": { + "key": "skill_190018080", + "text": "攻击时，如果自身血量大于50%，对敌方全体造成80%攻击力伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190087002, + "Name": { + "key": "skillname_190087002", + "text": "梦之防护" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290087004 + ] + }, + { + "Id": [ + 290087004 + ] + }, + { + "Id": [ + 290087004 + ] + }, + { + "Id": [ + 290087004 + ] + }, + { + "Id": [ + 290087004 + ] + }, + { + "Id": [ + 290087004 + ] + } + ], + "Desc1": { + "key": "skill_190018081", + "text": "添加一个自身攻击力100%的护盾" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190087003, + "Name": { + "key": "skillname_190087003", + "text": "护盾检测" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290087005 + ] + }, + { + "Id": [ + 290087005 + ] + }, + { + "Id": [ + 290087005 + ] + }, + { + "Id": [ + 290087005 + ] + }, + { + "Id": [ + 290087005 + ] + }, + { + "Id": [ + 290087005 + ] + } + ], + "Desc1": { + "key": "skill_190018082", + "text": "身上护盾被击破时，对敌方全体造成80%攻击力的伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 190087004, + "Name": { + "key": "skillname_190087004", + "text": "护盾击破检测" + }, + "ico": "jn_icon_001", + "act": "Skill_3", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290087006 + ] + }, + { + "Id": [ + 290087006 + ] + }, + { + "Id": [ + 290087006 + ] + }, + { + "Id": [ + 290087006 + ] + }, + { + "Id": [ + 290087006 + ] + }, + { + "Id": [ + 290087006 + ] + } + ], + "Desc1": { + "key": "skill_190018083", + "text": "击破目标身上护盾时，对敌方全体造成80%攻击力的伤害" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110011, + "Name": { + "key": "skillname_110011", + "text": "熊猫拳" + }, + "ico": "skillicon_001", + "act": "Skill_1", + "Type": 0, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110012, + "Name": { + "key": "skillname_110012", + "text": "太极一式" + }, + "ico": "skillicon_002", + "act": "Skill_2", + "Type": 0, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110013, + "Name": { + "key": "skillname_110013", + "text": "太极零式" + }, + "ico": "skillicon_003", + "act": "Skill_3", + "Type": 0, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110031, + "Name": { + "key": "skillname_110031", + "text": "和谐音律" + }, + "ico": "skillicon_004", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110032, + "Name": { + "key": "skillname_110032", + "text": "欢悦之舞" + }, + "ico": "skillicon_005", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110033, + "Name": { + "key": "skillname_110033", + "text": "彩虹音符" + }, + "ico": "skillicon_006", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110171, + "Name": { + "key": "skillname_110171", + "text": "冰霜之语" + }, + "ico": "skillicon_010", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110172, + "Name": { + "key": "skillname_110172", + "text": "寒冰之力" + }, + "ico": "skillicon_011", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110173, + "Name": { + "key": "skillname_110173", + "text": "极寒领域" + }, + "ico": "skillicon_012", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110181, + "Name": { + "key": "skillname_110181", + "text": "梦·呓语" + }, + "ico": "skillicon_013", + "act": "Skill_1", + "Type": 0, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110182, + "Name": { + "key": "skillname_110182", + "text": "梦·愉悦" + }, + "ico": "skillicon_014", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110183, + "Name": { + "key": "skillname_110183", + "text": "梦·创世" + }, + "ico": "skillicon_015", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110091, + "Name": { + "key": "skillname_110091", + "text": "一往无前" + }, + "ico": "skillicon_007", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110092, + "Name": { + "key": "skillname_110092", + "text": "无所畏惧" + }, + "ico": "skillicon_008", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110093, + "Name": { + "key": "skillname_110093", + "text": "自由之往" + }, + "ico": "skillicon_009", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110111, + "Name": { + "key": "skillname_110111", + "text": "点到为止" + }, + "ico": "skillicon_001", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110112, + "Name": { + "key": "skillname_110112", + "text": "聚·心神" + }, + "ico": "skillicon_002", + "act": "Skill_2", + "Type": 0, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110113, + "Name": { + "key": "skillname_110113", + "text": "上·善若水" + }, + "ico": "skillicon_003", + "act": "Skill_3", + "Type": 0, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 440051, + "Name": { + "key": "skillname_440051", + "text": "蛮之力" + }, + "ico": "skillicon_001", + "act": "Skill_1", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 440052, + "Name": { + "key": "skillname_440052", + "text": "蛮力横扫" + }, + "ico": "skillicon_002", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 440053, + "Name": { + "key": "skillname_440053", + "text": "蛮力冲撞" + }, + "ico": "skillicon_003", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110081, + "Name": { + "key": "skillname_110081", + "text": "猛虎爪" + }, + "ico": "skillicon_007", + "act": "Skill_1", + "Type": 0, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110082, + "Name": { + "key": "skillname_110082", + "text": "胜者为王" + }, + "ico": "skillicon_008", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 110083, + "Name": { + "key": "skillname_110083", + "text": "霸·猎杀时刻" + }, + "ico": "skillicon_009", + "act": "Skill_3", + "Type": 0, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 150051, + "Name": { + "key": "skillname_150051", + "text": "狮子铁拳" + }, + "ico": "skillicon_013", + "act": "Skill_1", + "Type": 0, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 150052, + "Name": { + "key": "skillname_150052", + "text": "净化烟火" + }, + "ico": "skillicon_014", + "act": "Skill_2", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + }, + { + "Id": 150053, + "Name": { + "key": "skillname_150053", + "text": "这是我的主场！" + }, + "ico": "skillicon_015", + "act": "Skill_3", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + }, + { + "Id": [ + 210011 + ] + } + ], + "Desc1": { + "key": "", + "text": "" + }, + "Desc2": { + "key": "", + "text": "" + }, + "Desc3": { + "key": "", + "text": "" + }, + "Desc4": { + "key": "", + "text": "" + }, + "Desc5": { + "key": "", + "text": "" + } + } +] \ No newline at end of file diff --git a/bin/json/game_ui.json b/bin/json/game_ui.json index 117762088..b8f2f2d18 100644 --- a/bin/json/game_ui.json +++ b/bin/json/game_ui.json @@ -682,5 +682,29 @@ "packagename": "roledetails", "comname": "equistrengthen", "des": "装备强化" + }, + { + "id": "strengthenup", + "file": "StrengthenUpWindow", + "unloadpkg": 5, + "loadtype": 1, + "full": 0, + "blur": 1, + "package": "roledetails/roledetails", + "packagename": "roledetails", + "comname": "strengthen", + "des": "英雄升级升星详情" + }, + { + "id": "croppingwindow", + "file": "CroppingWindow", + "unloadpkg": 0, + "loadtype": 1, + "full": 2, + "blur": 0, + "package": "zhandou/zhandou", + "packagename": "zhandou", + "comname": "cropping", + "des": "遮幅" } ] \ No newline at end of file diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index 4c0f1c13c..b26cebf5d 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -39,8 +39,6 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr _hero *pb.DBHero // 目标英雄 tagHero *pb.DBHero // 消耗指定英雄 mapCostHero map[string]int32 // 所有消耗英雄分类 - bCheckNeedhero bool // 指定英雄校验 - bCheckRacehero bool // 种族英雄校验 chanegCard []*pb.DBHero // 变化的英雄数据 CostHeroObj map[string]*pb.DBHero // 所有消耗英雄分类 ) @@ -95,6 +93,8 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr code = pb.ErrorCode_ReqParameterError return } + costNeedHeroCount = 0 + costRaceHeroCount = 0 // 遍历所有消耗英雄 for k, v := range mapCostHero { if tagHero, code = this.module.GetHeroByObjID(session.GetUserId(), k); code != pb.ErrorCode_Success { // 没有这个英雄 @@ -110,7 +110,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr } if tagHero.HeroID == target.Needhero && tagHero.Star == target.Needherostar && tagHero.SameCount >= target.Needheronum { - bCheckNeedhero = true + costNeedHeroCount += v } for _, value := range target.Needrace { // 阵营校验 @@ -118,19 +118,22 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr cfg := this.module.configure.GetHero(tagHero.HeroID) if cfg != nil { if cfg.Race == value { - bCheckRacehero = true - break + costRaceHeroCount += v } } } - this.module.Debugf("指定英雄校验结果:%b,种族英雄校验结果:%b", bCheckNeedhero, bCheckRacehero) } CostHeroObj[k] = tagHero } - if !bCheckRacehero || !bCheckNeedhero { + + if target.Needheronum <= costNeedHeroCount || target.Needracenum <= costRaceHeroCount { code = pb.ErrorCode_ReqParameterError - return // 校验失败 + return } + // if !bCheckRacehero || !bCheckNeedhero { + // code = pb.ErrorCode_ReqParameterError + // return // 校验失败 + // } // 金币消耗判断 curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), "gold") diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index eb01611fb..f01783f1f 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -1,3 +1,4 @@ + //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -11,425 +12,425 @@ package cfg type JsonLoader func(string) ([]map[string]interface{}, error) type Tables struct { - LocalizeConfig_CNCategory *Localize_LocalizeConfig_CNCategory - LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory - LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory - global *Game_global - ui *Game_ui - plot *Game_plot - extservers *Game_extservers - skillAtk *Game_skillAtk - skillAfteratk *Game_skillAfteratk - skillBuff *Game_skillBuff - skillPassive *Game_skillPassive - newHero *Game_hero - heroStargrow *Game_heroStargrow - heroLevelgrow *Game_heroLevelgrow - heroStarup *Game_heroStarup - heroExp *Game_heroExp - heroLevelup *Game_heroLevelup - equip *Game_equip - equipAttrlibrary *Game_equipAttrlibrary - equipSuit *Game_equipSuit - equipColor *Game_equipColor - equipIntensify *Game_equipIntensify - item *Game_item - heroSkillLevel *Game_heroSkillLevel - heroResonance *Game_heroResonance - comAtn *Game_comAtn - heroAwaken *Game_heroAwaken - heroMethod *Game_heroMethod - shop *Game_shop - shopitem *Game_shopitem - activeReward *Game_activeReward - serverList *Game_serverList - com *Game_com - newSkill *Game_newSkill - model *Game_model - mainlineChapter *Game_mainlineChapter - mainlineEasy *Game_mainlineEasy - mainlineHard *Game_mainlineHard - mainlinePurgatory *Game_mainlinePurgatory - drawCard *Game_drawCard - drawUpdraw *Game_drawUpdraw - drawCom *Game_drawCom - drawCost *Game_drawCost - chatChannel *Game_chatChannel - chatSystem *Game_chatSystem - chatServerGroup *Game_chatServerGroup - chatChannelCom *Game_chatChannelCom - taskRound *Game_taskRound - taskActiveReward *Game_taskActiveReward - coin *Game_coin - initial *Game_initial - monster *Game_monster - equipPos *Game_equipPos - playerlv *Game_playerlv - propsgroup *Game_propsgroup - facemod *Game_facemod - msgdistrib *Game_msgdistrib - language *Game_language - propsgrouplist *Game_propsgrouplist + LocalizeConfig_CNCategory *Localize_LocalizeConfig_CNCategory + LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory + LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory + global *Game_global + ui *Game_ui + plot *Game_plot + extservers *Game_extservers + skillAtk *Game_skillAtk + skillAfteratk *Game_skillAfteratk + skillBuff *Game_skillBuff + skillPassive *Game_skillPassive + hero *Game_hero + heroStargrow *Game_heroStargrow + heroLevelgrow *Game_heroLevelgrow + heroStarup *Game_heroStarup + heroExp *Game_heroExp + heroLevelup *Game_heroLevelup + equip *Game_equip + equipAttrlibrary *Game_equipAttrlibrary + equipSuit *Game_equipSuit + equipColor *Game_equipColor + equipIntensify *Game_equipIntensify + item *Game_item + heroSkillLevel *Game_heroSkillLevel + heroResonance *Game_heroResonance + comAtn *Game_comAtn + heroAwaken *Game_heroAwaken + heroMethod *Game_heroMethod + shop *Game_shop + shopitem *Game_shopitem + activeReward *Game_activeReward + serverList *Game_serverList + com *Game_com + skill *Game_skill + model *Game_model + mainlineChapter *Game_mainlineChapter + mainlineEasy *Game_mainlineEasy + mainlineHard *Game_mainlineHard + mainlinePurgatory *Game_mainlinePurgatory + drawCard *Game_drawCard + drawUpdraw *Game_drawUpdraw + drawCom *Game_drawCom + drawCost *Game_drawCost + chatChannel *Game_chatChannel + chatSystem *Game_chatSystem + chatServerGroup *Game_chatServerGroup + chatChannelCom *Game_chatChannelCom + taskRound *Game_taskRound + taskActiveReward *Game_taskActiveReward + coin *Game_coin + initial *Game_initial + monster *Game_monster + equipPos *Game_equipPos + playerlv *Game_playerlv + propsgroup *Game_propsgroup + facemod *Game_facemod + msgdistrib *Game_msgdistrib + language *Game_language + propsgrouplist *Game_propsgrouplist } func NewTables(loader JsonLoader) (*Tables, error) { - var err error - var buf []map[string]interface{} + var err error + var buf []map[string]interface{} - tables := &Tables{} - if buf, err = loader("LocalizeConfig_CN"); err != nil { - return nil, err - } - if tables.LocalizeConfig_CNCategory, err = NewLocalize_LocalizeConfig_CNCategory(buf); err != nil { - return nil, err - } - if buf, err = loader("LocalizeConfig_EN"); err != nil { - return nil, err - } - if tables.LocalizeConfig_ENCategory, err = NewLocalize_LocalizeConfig_ENCategory(buf); err != nil { - return nil, err - } - if buf, err = loader("LocalizeConfig_TW"); err != nil { - return nil, err - } - if tables.LocalizeConfig_TWCategory, err = NewLocalize_LocalizeConfig_TWCategory(buf); err != nil { - return nil, err - } - if buf, err = loader("game_global"); err != nil { - return nil, err - } - if tables.global, err = NewGame_global(buf); err != nil { - return nil, err - } - if buf, err = loader("game_ui"); err != nil { - return nil, err - } - if tables.ui, err = NewGame_ui(buf); err != nil { - return nil, err - } - if buf, err = loader("game_plot"); err != nil { - return nil, err - } - if tables.plot, err = NewGame_plot(buf); err != nil { - return nil, err - } - if buf, err = loader("game_extservers"); err != nil { - return nil, err - } - if tables.extservers, err = NewGame_extservers(buf); err != nil { - return nil, err - } - if buf, err = loader("game_skillatk"); err != nil { - return nil, err - } - if tables.skillAtk, err = NewGame_skillAtk(buf); err != nil { - return nil, err - } - if buf, err = loader("game_skillafteratk"); err != nil { - return nil, err - } - if tables.skillAfteratk, err = NewGame_skillAfteratk(buf); err != nil { - return nil, err - } - if buf, err = loader("game_skillbuff"); err != nil { - return nil, err - } - if tables.skillBuff, err = NewGame_skillBuff(buf); err != nil { - return nil, err - } - if buf, err = loader("game_skillpassive"); err != nil { - return nil, err - } - if tables.skillPassive, err = NewGame_skillPassive(buf); err != nil { - return nil, err - } - if buf, err = loader("game_hero"); err != nil { - return nil, err - } - if tables.newHero, err = NewGame_hero(buf); err != nil { - return nil, err - } - if buf, err = loader("game_herostargrow"); err != nil { - return nil, err - } - if tables.heroStargrow, err = NewGame_heroStargrow(buf); err != nil { - return nil, err - } - if buf, err = loader("game_herolevelgrow"); err != nil { - return nil, err - } - if tables.heroLevelgrow, err = NewGame_heroLevelgrow(buf); err != nil { - return nil, err - } - if buf, err = loader("game_herostarup"); err != nil { - return nil, err - } - if tables.heroStarup, err = NewGame_heroStarup(buf); err != nil { - return nil, err - } - if buf, err = loader("game_heroexp"); err != nil { - return nil, err - } - if tables.heroExp, err = NewGame_heroExp(buf); err != nil { - return nil, err - } - if buf, err = loader("game_herolevelup"); err != nil { - return nil, err - } - if tables.heroLevelup, err = NewGame_heroLevelup(buf); err != nil { - return nil, err - } - if buf, err = loader("game_equip"); err != nil { - return nil, err - } - if tables.equip, err = NewGame_equip(buf); err != nil { - return nil, err - } - if buf, err = loader("game_equipattrlibrary"); err != nil { - return nil, err - } - if tables.equipAttrlibrary, err = NewGame_equipAttrlibrary(buf); err != nil { - return nil, err - } - if buf, err = loader("game_equipsuit"); err != nil { - return nil, err - } - if tables.equipSuit, err = NewGame_equipSuit(buf); err != nil { - return nil, err - } - if buf, err = loader("game_equipcolor"); err != nil { - return nil, err - } - if tables.equipColor, err = NewGame_equipColor(buf); err != nil { - return nil, err - } - if buf, err = loader("game_equipintensify"); err != nil { - return nil, err - } - if tables.equipIntensify, err = NewGame_equipIntensify(buf); err != nil { - return nil, err - } - if buf, err = loader("game_item"); err != nil { - return nil, err - } - if tables.item, err = NewGame_item(buf); err != nil { - return nil, err - } - if buf, err = loader("game_heroskilllevel"); err != nil { - return nil, err - } - if tables.heroSkillLevel, err = NewGame_heroSkillLevel(buf); err != nil { - return nil, err - } - if buf, err = loader("game_heroresonance"); err != nil { - return nil, err - } - if tables.heroResonance, err = NewGame_heroResonance(buf); err != nil { - return nil, err - } - if buf, err = loader("game_comatn"); err != nil { - return nil, err - } - if tables.comAtn, err = NewGame_comAtn(buf); err != nil { - return nil, err - } - if buf, err = loader("game_heroawaken"); err != nil { - return nil, err - } - if tables.heroAwaken, err = NewGame_heroAwaken(buf); err != nil { - return nil, err - } - if buf, err = loader("game_heromethod"); err != nil { - return nil, err - } - if tables.heroMethod, err = NewGame_heroMethod(buf); err != nil { - return nil, err - } - if buf, err = loader("game_shop"); err != nil { - return nil, err - } - if tables.shop, err = NewGame_shop(buf); err != nil { - return nil, err - } - if buf, err = loader("game_shopitem"); err != nil { - return nil, err - } - if tables.shopitem, err = NewGame_shopitem(buf); err != nil { - return nil, err - } - if buf, err = loader("game_activereward"); err != nil { - return nil, err - } - if tables.activeReward, err = NewGame_activeReward(buf); err != nil { - return nil, err - } - if buf, err = loader("game_serverlist"); err != nil { - return nil, err - } - if tables.serverList, err = NewGame_serverList(buf); err != nil { - return nil, err - } - if buf, err = loader("game_com"); err != nil { - return nil, err - } - if tables.com, err = NewGame_com(buf); err != nil { - return nil, err - } - if buf, err = loader("game_newskill"); err != nil { - return nil, err - } - if tables.newSkill, err = NewGame_newSkill(buf); err != nil { - return nil, err - } - if buf, err = loader("game_model"); err != nil { - return nil, err - } - if tables.model, err = NewGame_model(buf); err != nil { - return nil, err - } - if buf, err = loader("game_mainlinechapter"); err != nil { - return nil, err - } - if tables.mainlineChapter, err = NewGame_mainlineChapter(buf); err != nil { - return nil, err - } - if buf, err = loader("game_mainlineeasy"); err != nil { - return nil, err - } - if tables.mainlineEasy, err = NewGame_mainlineEasy(buf); err != nil { - return nil, err - } - if buf, err = loader("game_mainlinehard"); err != nil { - return nil, err - } - if tables.mainlineHard, err = NewGame_mainlineHard(buf); err != nil { - return nil, err - } - if buf, err = loader("game_mainlinepurgatory"); err != nil { - return nil, err - } - if tables.mainlinePurgatory, err = NewGame_mainlinePurgatory(buf); err != nil { - return nil, err - } - if buf, err = loader("game_drawcard"); err != nil { - return nil, err - } - if tables.drawCard, err = NewGame_drawCard(buf); err != nil { - return nil, err - } - if buf, err = loader("game_drawupdraw"); err != nil { - return nil, err - } - if tables.drawUpdraw, err = NewGame_drawUpdraw(buf); err != nil { - return nil, err - } - if buf, err = loader("game_drawcom"); err != nil { - return nil, err - } - if tables.drawCom, err = NewGame_drawCom(buf); err != nil { - return nil, err - } - if buf, err = loader("game_drawcost"); err != nil { - return nil, err - } - if tables.drawCost, err = NewGame_drawCost(buf); err != nil { - return nil, err - } - if buf, err = loader("game_chatchannel"); err != nil { - return nil, err - } - if tables.chatChannel, err = NewGame_chatChannel(buf); err != nil { - return nil, err - } - if buf, err = loader("game_chatsystem"); err != nil { - return nil, err - } - if tables.chatSystem, err = NewGame_chatSystem(buf); err != nil { - return nil, err - } - if buf, err = loader("game_chatservergroup"); err != nil { - return nil, err - } - if tables.chatServerGroup, err = NewGame_chatServerGroup(buf); err != nil { - return nil, err - } - if buf, err = loader("game_chatchannelcom"); err != nil { - return nil, err - } - if tables.chatChannelCom, err = NewGame_chatChannelCom(buf); err != nil { - return nil, err - } - if buf, err = loader("game_taskround"); err != nil { - return nil, err - } - if tables.taskRound, err = NewGame_taskRound(buf); err != nil { - return nil, err - } - if buf, err = loader("game_taskactivereward"); err != nil { - return nil, err - } - if tables.taskActiveReward, err = NewGame_taskActiveReward(buf); err != nil { - return nil, err - } - if buf, err = loader("game_coin"); err != nil { - return nil, err - } - if tables.coin, err = NewGame_coin(buf); err != nil { - return nil, err - } - if buf, err = loader("game_initial"); err != nil { - return nil, err - } - if tables.initial, err = NewGame_initial(buf); err != nil { - return nil, err - } - if buf, err = loader("game_monster"); err != nil { - return nil, err - } - if tables.monster, err = NewGame_monster(buf); err != nil { - return nil, err - } - if buf, err = loader("game_equippos"); err != nil { - return nil, err - } - if tables.equipPos, err = NewGame_equipPos(buf); err != nil { - return nil, err - } - if buf, err = loader("game_playerlv"); err != nil { - return nil, err - } - if tables.playerlv, err = NewGame_playerlv(buf); err != nil { - return nil, err - } - if buf, err = loader("game_propsgroup"); err != nil { - return nil, err - } - if tables.propsgroup, err = NewGame_propsgroup(buf); err != nil { - return nil, err - } - if buf, err = loader("game_facemod"); err != nil { - return nil, err - } - if tables.facemod, err = NewGame_facemod(buf); err != nil { - return nil, err - } - if buf, err = loader("game_msgdistrib"); err != nil { - return nil, err - } - if tables.msgdistrib, err = NewGame_msgdistrib(buf); err != nil { - return nil, err - } - if buf, err = loader("game_language"); err != nil { - return nil, err - } - if tables.language, err = NewGame_language(buf); err != nil { - return nil, err - } - if buf, err = loader("game_propsgrouplist"); err != nil { - return nil, err - } - if tables.propsgrouplist, err = NewGame_propsgrouplist(buf); err != nil { - return nil, err - } - return tables, nil + tables := &Tables{} + if buf, err = loader("LocalizeConfig_CN") ; err != nil { + return nil, err + } + if tables.LocalizeConfig_CNCategory, err = NewLocalize_LocalizeConfig_CNCategory(buf) ; err != nil { + return nil, err + } + if buf, err = loader("LocalizeConfig_EN") ; err != nil { + return nil, err + } + if tables.LocalizeConfig_ENCategory, err = NewLocalize_LocalizeConfig_ENCategory(buf) ; err != nil { + return nil, err + } + if buf, err = loader("LocalizeConfig_TW") ; err != nil { + return nil, err + } + if tables.LocalizeConfig_TWCategory, err = NewLocalize_LocalizeConfig_TWCategory(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_global") ; err != nil { + return nil, err + } + if tables.global, err = NewGame_global(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_ui") ; err != nil { + return nil, err + } + if tables.ui, err = NewGame_ui(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_plot") ; err != nil { + return nil, err + } + if tables.plot, err = NewGame_plot(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_extservers") ; err != nil { + return nil, err + } + if tables.extservers, err = NewGame_extservers(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_skillatk") ; err != nil { + return nil, err + } + if tables.skillAtk, err = NewGame_skillAtk(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_skillafteratk") ; err != nil { + return nil, err + } + if tables.skillAfteratk, err = NewGame_skillAfteratk(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_skillbuff") ; err != nil { + return nil, err + } + if tables.skillBuff, err = NewGame_skillBuff(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_skillpassive") ; err != nil { + return nil, err + } + if tables.skillPassive, err = NewGame_skillPassive(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_hero") ; err != nil { + return nil, err + } + if tables.hero, err = NewGame_hero(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_herostargrow") ; err != nil { + return nil, err + } + if tables.heroStargrow, err = NewGame_heroStargrow(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_herolevelgrow") ; err != nil { + return nil, err + } + if tables.heroLevelgrow, err = NewGame_heroLevelgrow(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_herostarup") ; err != nil { + return nil, err + } + if tables.heroStarup, err = NewGame_heroStarup(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_heroexp") ; err != nil { + return nil, err + } + if tables.heroExp, err = NewGame_heroExp(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_herolevelup") ; err != nil { + return nil, err + } + if tables.heroLevelup, err = NewGame_heroLevelup(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_equip") ; err != nil { + return nil, err + } + if tables.equip, err = NewGame_equip(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_equipattrlibrary") ; err != nil { + return nil, err + } + if tables.equipAttrlibrary, err = NewGame_equipAttrlibrary(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_equipsuit") ; err != nil { + return nil, err + } + if tables.equipSuit, err = NewGame_equipSuit(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_equipcolor") ; err != nil { + return nil, err + } + if tables.equipColor, err = NewGame_equipColor(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_equipintensify") ; err != nil { + return nil, err + } + if tables.equipIntensify, err = NewGame_equipIntensify(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_item") ; err != nil { + return nil, err + } + if tables.item, err = NewGame_item(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_heroskilllevel") ; err != nil { + return nil, err + } + if tables.heroSkillLevel, err = NewGame_heroSkillLevel(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_heroresonance") ; err != nil { + return nil, err + } + if tables.heroResonance, err = NewGame_heroResonance(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_comatn") ; err != nil { + return nil, err + } + if tables.comAtn, err = NewGame_comAtn(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_heroawaken") ; err != nil { + return nil, err + } + if tables.heroAwaken, err = NewGame_heroAwaken(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_heromethod") ; err != nil { + return nil, err + } + if tables.heroMethod, err = NewGame_heroMethod(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_shop") ; err != nil { + return nil, err + } + if tables.shop, err = NewGame_shop(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_shopitem") ; err != nil { + return nil, err + } + if tables.shopitem, err = NewGame_shopitem(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_activereward") ; err != nil { + return nil, err + } + if tables.activeReward, err = NewGame_activeReward(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_serverlist") ; err != nil { + return nil, err + } + if tables.serverList, err = NewGame_serverList(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_com") ; err != nil { + return nil, err + } + if tables.com, err = NewGame_com(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_skill") ; err != nil { + return nil, err + } + if tables.skill, err = NewGame_skill(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_model") ; err != nil { + return nil, err + } + if tables.model, err = NewGame_model(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_mainlinechapter") ; err != nil { + return nil, err + } + if tables.mainlineChapter, err = NewGame_mainlineChapter(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_mainlineeasy") ; err != nil { + return nil, err + } + if tables.mainlineEasy, err = NewGame_mainlineEasy(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_mainlinehard") ; err != nil { + return nil, err + } + if tables.mainlineHard, err = NewGame_mainlineHard(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_mainlinepurgatory") ; err != nil { + return nil, err + } + if tables.mainlinePurgatory, err = NewGame_mainlinePurgatory(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_drawcard") ; err != nil { + return nil, err + } + if tables.drawCard, err = NewGame_drawCard(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_drawupdraw") ; err != nil { + return nil, err + } + if tables.drawUpdraw, err = NewGame_drawUpdraw(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_drawcom") ; err != nil { + return nil, err + } + if tables.drawCom, err = NewGame_drawCom(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_drawcost") ; err != nil { + return nil, err + } + if tables.drawCost, err = NewGame_drawCost(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_chatchannel") ; err != nil { + return nil, err + } + if tables.chatChannel, err = NewGame_chatChannel(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_chatsystem") ; err != nil { + return nil, err + } + if tables.chatSystem, err = NewGame_chatSystem(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_chatservergroup") ; err != nil { + return nil, err + } + if tables.chatServerGroup, err = NewGame_chatServerGroup(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_chatchannelcom") ; err != nil { + return nil, err + } + if tables.chatChannelCom, err = NewGame_chatChannelCom(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_taskround") ; err != nil { + return nil, err + } + if tables.taskRound, err = NewGame_taskRound(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_taskactivereward") ; err != nil { + return nil, err + } + if tables.taskActiveReward, err = NewGame_taskActiveReward(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_coin") ; err != nil { + return nil, err + } + if tables.coin, err = NewGame_coin(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_initial") ; err != nil { + return nil, err + } + if tables.initial, err = NewGame_initial(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_monster") ; err != nil { + return nil, err + } + if tables.monster, err = NewGame_monster(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_equippos") ; err != nil { + return nil, err + } + if tables.equipPos, err = NewGame_equipPos(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_playerlv") ; err != nil { + return nil, err + } + if tables.playerlv, err = NewGame_playerlv(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_propsgroup") ; err != nil { + return nil, err + } + if tables.propsgroup, err = NewGame_propsgroup(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_facemod") ; err != nil { + return nil, err + } + if tables.facemod, err = NewGame_facemod(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_msgdistrib") ; err != nil { + return nil, err + } + if tables.msgdistrib, err = NewGame_msgdistrib(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_language") ; err != nil { + return nil, err + } + if tables.language, err = NewGame_language(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_propsgrouplist") ; err != nil { + return nil, err + } + if tables.propsgrouplist, err = NewGame_propsgrouplist(buf) ; err != nil { + return nil, err + } + return tables, nil } diff --git a/sys/configure/structs/game.equipIntensify.go b/sys/configure/structs/game.equipIntensify.go index 591107eb3..a0a3de41d 100644 --- a/sys/configure/structs/game.equipIntensify.go +++ b/sys/configure/structs/game.equipIntensify.go @@ -1,3 +1,4 @@ + //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -8,8 +9,8 @@ package cfg type Game_equipIntensify struct { - _dataMap map[int32]*Game_equipIntensifyData - _dataList []*Game_equipIntensifyData + _dataMap map[int32]*Game_equipIntensifyData + _dataList []*Game_equipIntensifyData } func NewGame_equipIntensify(_buf []map[string]interface{}) (*Game_equipIntensify, error) { @@ -23,17 +24,19 @@ func NewGame_equipIntensify(_buf []map[string]interface{}) (*Game_equipIntensify dataMap[_v.Key] = _v } } - return &Game_equipIntensify{_dataList: _dataList, _dataMap: dataMap}, nil + return &Game_equipIntensify{_dataList:_dataList, _dataMap:dataMap}, nil } func (table *Game_equipIntensify) GetDataMap() map[int32]*Game_equipIntensifyData { - return table._dataMap + return table._dataMap } func (table *Game_equipIntensify) GetDataList() []*Game_equipIntensifyData { - return table._dataList + return table._dataList } func (table *Game_equipIntensify) Get(key int32) *Game_equipIntensifyData { - return table._dataMap[key] + return table._dataMap[key] } + + diff --git a/sys/configure/structs/game.skill.go b/sys/configure/structs/game.skill.go new file mode 100644 index 000000000..49bbcf1da --- /dev/null +++ b/sys/configure/structs/game.skill.go @@ -0,0 +1,42 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +package cfg + +type Game_skill struct { + _dataMap map[int32]*Game_skillData + _dataList []*Game_skillData +} + +func NewGame_skill(_buf []map[string]interface{}) (*Game_skill, error) { + _dataList := make([]*Game_skillData, 0, len(_buf)) + dataMap := make(map[int32]*Game_skillData) + for _, _ele_ := range _buf { + if _v, err2 := NewGame_skillData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &Game_skill{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Game_skill) GetDataMap() map[int32]*Game_skillData { + return table._dataMap +} + +func (table *Game_skill) GetDataList() []*Game_skillData { + return table._dataList +} + +func (table *Game_skill) Get(key int32) *Game_skillData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.skillData.go b/sys/configure/structs/game.skillData.go new file mode 100644 index 000000000..cf63ccb01 --- /dev/null +++ b/sys/configure/structs/game.skillData.go @@ -0,0 +1,77 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +package cfg + +import "errors" + +type Game_skillData struct { + Id int32 + Name string + Ico string + Act string + Type int32 + MaxLV int32 + CD []int32 + Target int32 + ChildSkill []*Game_ChildSkills + Desc1 string + Desc2 string + Desc3 string + Desc4 string + Desc5 string +} + +func (Game_skillData) GetTypeId() int { + return -1600555361 +} + +func NewGame_skillData(_buf map[string]interface{}) (_v *Game_skillData, err error) { + _v = &Game_skillData{} + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } + { var _ok_ bool; if _v.Act, _ok_ = _buf["act"].(string); !_ok_ { err = errors.New("act error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxLV"].(float64); !_ok_ { err = errors.New("MaxLV error"); return }; _v.MaxLV = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["CD"].([]interface{}); !_ok_ { err = errors.New("CD error"); return } + + _v.CD = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.CD = append(_v.CD, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Target"].(float64); !_ok_ { err = errors.New("Target error"); return }; _v.Target = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["ChildSkill"].([]interface{}); !_ok_ { err = errors.New("ChildSkill error"); return } + + _v.ChildSkill = make([]*Game_ChildSkills, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Game_ChildSkills + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_ChildSkills(_x_); err != nil { return } } + _v.ChildSkill = append(_v.ChildSkill, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc1"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc1 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc1, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc2 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc2, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc3"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc3 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc3, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc4"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc4 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc4, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc5"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc5 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc5, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + return +} diff --git a/sys/db/init_test.go b/sys/db/init_test.go index 3a1cfc34c..db12b1e50 100644 --- a/sys/db/init_test.go +++ b/sys/db/init_test.go @@ -26,6 +26,7 @@ func TestMain(m *testing.M) { defer os.Exit(m.Run()) } func TestMail(t *testing.T) { + mail := &pb.DBMailData{} err := db.mgo.FindOneAndUpdate( "mail",