From 218e97f62be4eb6828b4e289316a0d6240ed6f2c Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 6 Jul 2023 16:47:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 1 + comm/imodule.go | 5 +++++ modules/passon/api_inroom.go | 8 +++++--- modules/passon/core.go | 21 +++++++++++++++++++++ modules/passon/module.go | 13 +++++++++++++ modules/worldtask/module.go | 3 ++- modules/wtask/module.go | 2 +- services/worker/main.go | 2 ++ 8 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 modules/passon/core.go diff --git a/comm/const.go b/comm/const.go index 621090655..f4a72d29e 100644 --- a/comm/const.go +++ b/comm/const.go @@ -88,6 +88,7 @@ const ( ModuleBuried core.M_Modules = "buried" //埋点中心 ModuleActivity core.M_Modules = "acrivity" //活动 ModuleGuidance core.M_Modules = "guidance" //引导 + ModuleWtask core.M_Modules = "wtask" //世界任务 ) // 数据表名定义处 diff --git a/comm/imodule.go b/comm/imodule.go index 879103b25..cd375bd0a 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -533,4 +533,9 @@ type ( //推送红点 PushReddot(session IUserSession, reddot ...*pb.ReddotItem) (errdata *pb.ErrorData) } + //练功房 + IPasson interface { + //英雄升级 + HeroUpLv(session IUserSession, heroid string, lv int32) + } ) diff --git a/modules/passon/api_inroom.go b/modules/passon/api_inroom.go index b6309b114..c310a1fa7 100644 --- a/modules/passon/api_inroom.go +++ b/modules/passon/api_inroom.go @@ -50,7 +50,7 @@ func (this *apiComp) InRoom(session comm.IUserSession, req *pb.PassonInRoomReq) errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, Title: pb.ErrorCode_ReqParameterError.ToString(), - Message: fmt.Sprintf("no found hero:%d", req.Heroid), + Message: fmt.Sprintf("no found hero:%s", req.Heroid), } return } @@ -82,7 +82,9 @@ func (this *apiComp) InRoom(session comm.IUserSession, req *pb.PassonInRoomReq) return } hero.Ispasson = true - - session.SendMsg(string(this.module.GetType()), "getlist", &pb.PassonInRoomResp{Heroid: req.Heroid}) + if errdata = this.module.ModuleHero.PassonHero(session, map[string]bool{hero.Id: true}); errdata != nil { + return + } + session.SendMsg(string(this.module.GetType()), "inroom", &pb.PassonInRoomResp{Heroid: req.Heroid}) return } diff --git a/modules/passon/core.go b/modules/passon/core.go new file mode 100644 index 000000000..9dda408b0 --- /dev/null +++ b/modules/passon/core.go @@ -0,0 +1,21 @@ +package passon + +import "go_dreamfactory/pb" + +type SliceHero []*pb.DBHero + +// 实现sort.Interface接口的方法 +// 获取数组长度 +func (this SliceHero) Len() int { + return len(this) +} + +// 比较元素大小 +func (this SliceHero) Less(i, j int) bool { + return this[i].Lv < this[j].Lv +} + +// 交换元素位置 +func (this SliceHero) Swap(i, j int) { + this[i], this[j] = this[j], this[i] +} diff --git a/modules/passon/module.go b/modules/passon/module.go index db0e7622f..c35c4429a 100644 --- a/modules/passon/module.go +++ b/modules/passon/module.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/modules" "go_dreamfactory/pb" + "sort" "go_dreamfactory/lego/base" "go_dreamfactory/lego/core" @@ -53,6 +54,7 @@ func (this *Passon) Start() (err error) { func (this *Passon) HeroUpLv(session comm.IUserSession, heroid string, lv int32) { var ( passon *pb.DBPasson + heros []*pb.DBHero err error ) if passon, err = this.modelPasson.getUserPasson(session.GetUserId()); err != nil { @@ -69,4 +71,15 @@ func (this *Passon) HeroUpLv(session comm.IUserSession, heroid string, lv int32) } } + heros = this.ModuleHero.GetHeroList(session.GetUserId()) + + if len(heros) < 5 { + return + } + + // 使用sort.Slice进行排序 + sort.Slice(heros, func(i, j int) bool { + return heros[i].Lv < heros[j].Lv + }) + } diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index a5bddc023..f504a982e 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -5,6 +5,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/base" "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/event" "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" @@ -36,7 +37,7 @@ func (this *Worldtask) Init(service core.IService, module core.IModule, options func (this *Worldtask) OnInstallComp() { this.ModuleBase.OnInstallComp() - // event.Register(comm.EventBuriedComplete, this.TCondFinishNotify) + event.Register(comm.EventBuriedComplete, this.TCondFinishNotify) this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.modelWorldtask = this.RegisterComp(new(ModelWorldtask)).(*ModelWorldtask) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) diff --git a/modules/wtask/module.go b/modules/wtask/module.go index c4c599b4c..f2465fd00 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -28,7 +28,7 @@ func NewModule() core.IModule { } func (this *WTask) GetType() core.M_Modules { - return comm.ModuleWorldtask + return comm.ModuleWtask } func (this *WTask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { diff --git a/services/worker/main.go b/services/worker/main.go index 8727a43bd..831d7440f 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -49,6 +49,7 @@ import ( "go_dreamfactory/modules/user" "go_dreamfactory/modules/viking" "go_dreamfactory/modules/worldtask" + "go_dreamfactory/modules/wtask" "go_dreamfactory/services" "go_dreamfactory/sys/db" "go_dreamfactory/sys/wordfilter" @@ -126,6 +127,7 @@ func main() { buried.NewModule(), activity.NewModule(), guidance.NewModule(), + wtask.NewModule(), ) } From 99267bfee347a3da479c9c0f1491318abe8fac70 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 6 Jul 2023 16:55:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_caravancity.json | 30 +- bin/json/game_heroawaken.json | 1704 +++++++++++++++++ bin/json/game_item.json | 38 +- bin/json/game_rdtasknpc.json | 20 +- bin/json/game_worldtask.json | 594 ++++++ sys/configure/structs/Game.BuriedCondiData.go | 2 + sys/configure/structs/Game.WorldTaskData.go | 2 + sys/configure/structs/game.heroAwakenData.go | 2 + 8 files changed, 2348 insertions(+), 44 deletions(-) diff --git a/bin/json/game_caravancity.json b/bin/json/game_caravancity.json index ab097ec27..af26bf65f 100644 --- a/bin/json/game_caravancity.json +++ b/bin/json/game_caravancity.json @@ -20,15 +20,15 @@ "cityman": 34006, "cityname": { "key": "caravan_caravan_city_cityname_1", - "text": "死湾" + "text": "贝特曼" }, "cityinformation": { "key": "caravan_caravan_city_cityinformation_1", - "text": "常年游荡在死湾的商人，这一区域或许只有他才敢在这里做生意。" + "text": "在贝特曼城卖着各种原始的小玩意。" }, "citytxt": { "key": "caravan_caravan_city_citytxt_1", - "text": "死湾长年被一股胀气笼罩，这里的人们长年吸入这些气息，不知不觉已经产生了异变，他们自己称之为兽化病，年长的居民，会随着兽化病的加重，变成熊猫的模样，他们的人性会逐渐的被兽性所代替，最后彻底沦为一只只知道吃包子的直立行走的熊猫。" + "text": "贝特曼城生活着具有一定高级文明的人，他们用灶炉生火、能够引水洗澡、有独立的房间睡觉。" }, "citytype": 1, "citytypenum": 2, @@ -73,15 +73,15 @@ "cityman": 24004, "cityname": { "key": "caravan_caravan_city_cityname_2", - "text": "乱冢" + "text": "和平" }, "cityinformation": { "key": "caravan_caravan_city_cityinformation_2", - "text": "常年游荡在乱冢的商人，这一区域或许只有他才敢在这里做生意。" + "text": "在和平城卖各种防身的武器。" }, "citytxt": { "key": "caravan_caravan_city_citytxt_2", - "text": "乱冢长年被一股胀气笼罩，这里的人们长年吸入这些气息，不知不觉已经产生了异变，他们自己称之为兽化病，年长的居民，会随着兽化病的加重，变成熊猫的模样，他们的人性会逐渐的被兽性所代替，最后彻底沦为一只只知道吃包子的直立行走的熊猫。" + "text": "在和平城里，所有人都乐忠于学功夫，大家友好的用功夫进行交流，也让和平城免受外敌入侵。" }, "citytype": 1, "citytypenum": 3, @@ -127,15 +127,15 @@ "cityman": 25001, "cityname": { "key": "caravan_caravan_city_cityname_3", - "text": "陌城" + "text": "加菲斯特" }, "cityinformation": { "key": "caravan_caravan_city_cityinformation_3", - "text": "常年游荡在陌城的商人，这一区域或许只有他才敢在这里做生意。" + "text": "在加菲斯特城，商人都喜欢售卖能高效办公的用具。" }, "citytxt": { "key": "caravan_caravan_city_citytxt_3", - "text": "陌城长年被一股胀气笼罩，这里的人们长年吸入这些气息，不知不觉已经产生了异变，他们自己称之为兽化病，年长的居民，会随着兽化病的加重，变成熊猫的模样，他们的人性会逐渐的被兽性所代替，最后彻底沦为一只只知道吃包子的直立行走的熊猫。" + "text": "加菲斯特城生活着往来务工的人，所有人都在为各自的工作奋斗，鲜少有什么娱乐生活。" }, "citytype": 1, "citytypenum": 4, @@ -181,15 +181,15 @@ "cityman": 45001, "cityname": { "key": "caravan_caravan_city_cityname_4", - "text": "暗窟" + "text": "沼泽" }, "cityinformation": { "key": "caravan_caravan_city_cityinformation_4", - "text": "常年游荡在暗窟的商人，这一区域或许只有他才敢在这里做生意。" + "text": "在沼泽城的商人都以售卖轻便的商品为生。" }, "citytxt": { "key": "caravan_caravan_city_citytxt_4", - "text": "暗窟长年被一股胀气笼罩，这里的人们长年吸入这些气息，不知不觉已经产生了异变，他们自己称之为兽化病，年长的居民，会随着兽化病的加重，变成熊猫的模样，他们的人性会逐渐的被兽性所代替，最后彻底沦为一只只知道吃包子的直立行走的熊猫。" + "text": "沼泽城常年被沼泽覆盖，和外界处于隔绝的状态，靠往来的商人让各种物品保持流通状态。" }, "citytype": 1, "citytypenum": 3, @@ -234,15 +234,15 @@ "cityman": 14007, "cityname": { "key": "caravan_caravan_city_cityname_5", - "text": "腐宴" + "text": "博克" }, "cityinformation": { "key": "caravan_caravan_city_cityinformation_5", - "text": "常年游荡在腐宴的商人，这一区域或许只有他才敢在这里做生意。" + "text": "在博克城的商人对龙有很深的研究，喜欢卖各种和龙有关的商品。" }, "citytxt": { "key": "caravan_caravan_city_citytxt_5", - "text": "腐宴长年被一股胀气笼罩，这里的人们长年吸入这些气息，不知不觉已经产生了异变，他们自己称之为兽化病，年长的居民，会随着兽化病的加重，变成熊猫的模样，他们的人性会逐渐的被兽性所代替，最后彻底沦为一只只知道吃包子的直立行走的熊猫。" + "text": "博科城有一种特殊的飞行工具——龙，这也让这座城市的人出行很方便，只要想去一个地方，龙都能够快速将他带过去。" }, "citytype": 1, "citytypenum": 4, diff --git a/bin/json/game_heroawaken.json b/bin/json/game_heroawaken.json index 00ce88142..c33a14278 100644 --- a/bin/json/game_heroawaken.json +++ b/bin/json/game_heroawaken.json @@ -11,6 +11,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_1", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -39,6 +43,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_2", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -67,6 +75,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_3", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -95,6 +107,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_4", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -123,6 +139,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_5", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -151,6 +171,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_6", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -179,6 +203,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_7", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -207,6 +235,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_8", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -235,6 +267,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_9", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -263,6 +299,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_10", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -291,6 +331,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_11", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -319,6 +363,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_12", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -347,6 +395,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_13", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -375,6 +427,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_14", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -403,6 +459,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_15", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -431,6 +491,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_16", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -459,6 +523,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_17", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -487,6 +555,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_18", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -515,6 +587,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_19", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -543,6 +619,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_20", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -571,6 +651,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_21", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -599,6 +683,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_22", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -627,6 +715,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_23", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -655,6 +747,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_24", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -683,6 +779,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_25", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -711,6 +811,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_26", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -739,6 +843,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_27", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -767,6 +875,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_28", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -795,6 +907,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_29", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -823,6 +939,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_30", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -851,6 +971,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_31", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -879,6 +1003,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_32", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -907,6 +1035,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_33", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -935,6 +1067,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_34", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -963,6 +1099,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_35", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -991,6 +1131,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_36", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -1019,6 +1163,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_37", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -1047,6 +1195,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_38", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -1075,6 +1227,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_39", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -1103,6 +1259,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_40", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -1131,6 +1291,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_41", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -1159,6 +1323,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_42", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -1187,6 +1355,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_43", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -1215,6 +1387,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_44", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -1243,6 +1419,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_45", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -1271,6 +1451,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_46", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -1299,6 +1483,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_47", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -1327,6 +1515,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_48", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -1355,6 +1547,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_49", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -1383,6 +1579,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_50", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -1411,6 +1611,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_51", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -1439,6 +1643,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_52", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -1467,6 +1675,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_53", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -1495,6 +1707,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_54", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -1523,6 +1739,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_55", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -1551,6 +1771,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_56", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -1579,6 +1803,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_57", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -1607,6 +1835,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_58", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -1635,6 +1867,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_59", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -1663,6 +1899,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_60", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -1691,6 +1931,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_61", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -1719,6 +1963,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_62", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -1747,6 +1995,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_63", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -1775,6 +2027,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_64", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -1803,6 +2059,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_65", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -1831,6 +2091,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_66", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -1859,6 +2123,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_67", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -1887,6 +2155,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_68", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -1915,6 +2187,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_69", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -1943,6 +2219,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_70", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -1971,6 +2251,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_71", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -1999,6 +2283,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_72", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -2027,6 +2315,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_73", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -2055,6 +2347,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_74", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -2083,6 +2379,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_75", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -2111,6 +2411,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_76", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -2139,6 +2443,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_77", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -2167,6 +2475,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_78", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -2195,6 +2507,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_79", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -2223,6 +2539,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_80", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -2251,6 +2571,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_81", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -2279,6 +2603,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_82", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -2307,6 +2635,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_83", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -2335,6 +2667,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_84", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -2363,6 +2699,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_85", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -2391,6 +2731,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_86", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -2419,6 +2763,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_87", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -2447,6 +2795,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_88", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -2475,6 +2827,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_89", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -2503,6 +2859,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_90", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -2531,6 +2891,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_91", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -2559,6 +2923,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_92", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -2587,6 +2955,10 @@ "915004211", "1" ], + "describe": { + "key": "hero_awaken_describe_93", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -2615,6 +2987,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_94", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -2643,6 +3019,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_95", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -2671,6 +3051,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_96", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -2699,6 +3083,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_97", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -2727,6 +3115,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_98", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -2755,6 +3147,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_99", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -2783,6 +3179,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_100", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -2811,6 +3211,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_101", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -2839,6 +3243,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_102", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -2867,6 +3275,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_103", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -2895,6 +3307,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_104", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -2923,6 +3339,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_105", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -2951,6 +3371,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_106", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -2979,6 +3403,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_107", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -3007,6 +3435,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_108", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -3035,6 +3467,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_109", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -3063,6 +3499,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_110", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -3091,6 +3531,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_111", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -3119,6 +3563,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_112", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -3147,6 +3595,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_113", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -3175,6 +3627,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_114", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -3203,6 +3659,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_115", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -3231,6 +3691,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_116", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -3259,6 +3723,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_117", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -3287,6 +3755,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_118", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -3315,6 +3787,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_119", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -3343,6 +3819,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_120", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -3371,6 +3851,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_121", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -3399,6 +3883,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_122", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -3427,6 +3915,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_123", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -3455,6 +3947,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_124", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -3483,6 +3979,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_125", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -3511,6 +4011,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_126", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -3539,6 +4043,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_127", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -3567,6 +4075,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_128", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -3595,6 +4107,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_129", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -3623,6 +4139,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_130", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -3651,6 +4171,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_131", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -3679,6 +4203,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_132", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -3707,6 +4235,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_133", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -3735,6 +4267,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_134", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -3763,6 +4299,10 @@ "924003411", "1" ], + "describe": { + "key": "hero_awaken_describe_135", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -3791,6 +4331,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_136", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -3819,6 +4363,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_137", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -3847,6 +4395,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_138", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -3875,6 +4427,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_139", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -3903,6 +4459,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_140", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -3931,6 +4491,10 @@ "924004411", "1" ], + "describe": { + "key": "hero_awaken_describe_141", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -3959,6 +4523,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_142", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -3987,6 +4555,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_143", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -4015,6 +4587,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_144", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -4043,6 +4619,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_145", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -4071,6 +4651,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_146", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -4099,6 +4683,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_147", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -4127,6 +4715,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_148", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -4155,6 +4747,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_149", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -4183,6 +4779,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_150", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -4211,6 +4811,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_151", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -4239,6 +4843,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_152", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -4267,6 +4875,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_153", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -4295,6 +4907,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_154", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -4323,6 +4939,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_155", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -4351,6 +4971,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_156", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -4379,6 +5003,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_157", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -4407,6 +5035,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_158", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -4435,6 +5067,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_159", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -4463,6 +5099,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_160", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -4491,6 +5131,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_161", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -4519,6 +5163,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_162", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -4547,6 +5195,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_163", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -4575,6 +5227,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_164", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -4603,6 +5259,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_165", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -4631,6 +5291,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_166", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -4659,6 +5323,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_167", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -4687,6 +5355,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_168", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -4715,6 +5387,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_169", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -4743,6 +5419,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_170", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -4771,6 +5451,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_171", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -4799,6 +5483,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_172", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -4827,6 +5515,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_173", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -4855,6 +5547,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_174", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -4883,6 +5579,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_175", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -4911,6 +5611,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_176", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -4939,6 +5643,10 @@ "925001411", "1" ], + "describe": { + "key": "hero_awaken_describe_177", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -4967,6 +5675,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_178", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -4995,6 +5707,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_179", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -5023,6 +5739,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_180", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -5051,6 +5771,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_181", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -5079,6 +5803,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_182", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -5107,6 +5835,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_183", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -5135,6 +5867,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_184", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -5163,6 +5899,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_185", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -5191,6 +5931,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_186", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -5219,6 +5963,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_187", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -5247,6 +5995,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_188", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -5275,6 +6027,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_189", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -5303,6 +6059,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_190", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -5331,6 +6091,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_191", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -5359,6 +6123,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_192", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -5387,6 +6155,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_193", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -5415,6 +6187,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_194", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -5443,6 +6219,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_195", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -5471,6 +6251,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_196", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -5499,6 +6283,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_197", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -5527,6 +6315,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_198", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -5555,6 +6347,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_199", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -5583,6 +6379,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_200", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -5611,6 +6411,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_201", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -5639,6 +6443,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_202", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -5667,6 +6475,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_203", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -5695,6 +6507,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_204", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -5723,6 +6539,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_205", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -5751,6 +6571,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_206", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -5779,6 +6603,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_207", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -5807,6 +6635,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_208", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -5835,6 +6667,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_209", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -5863,6 +6699,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_210", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -5891,6 +6731,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_211", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -5919,6 +6763,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_212", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -5947,6 +6795,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_213", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -5975,6 +6827,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_214", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -6003,6 +6859,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_215", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -6031,6 +6891,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_216", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -6059,6 +6923,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_217", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -6087,6 +6955,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_218", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -6115,6 +6987,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_219", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -6143,6 +7019,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_220", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -6171,6 +7051,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_221", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -6199,6 +7083,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_222", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -6227,6 +7115,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_223", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -6255,6 +7147,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_224", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -6283,6 +7179,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_225", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -6311,6 +7211,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_226", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -6339,6 +7243,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_227", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -6367,6 +7275,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_228", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -6395,6 +7307,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_229", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -6423,6 +7339,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_230", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -6451,6 +7371,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_231", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -6479,6 +7403,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_232", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -6507,6 +7435,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_233", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -6535,6 +7467,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_234", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -6563,6 +7499,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_235", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -6591,6 +7531,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_236", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -6619,6 +7563,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_237", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -6647,6 +7595,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_238", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -6675,6 +7627,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_239", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -6703,6 +7659,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_240", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -6731,6 +7691,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_241", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -6759,6 +7723,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_242", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -6787,6 +7755,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_243", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -6815,6 +7787,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_244", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -6843,6 +7819,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_245", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -6871,6 +7851,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_246", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -6899,6 +7883,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_247", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -6927,6 +7915,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_248", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -6955,6 +7947,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_249", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -6983,6 +7979,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_250", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -7011,6 +8011,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_251", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -7039,6 +8043,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_252", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -7067,6 +8075,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_253", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -7095,6 +8107,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_254", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -7123,6 +8139,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_255", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -7151,6 +8171,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_256", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -7179,6 +8203,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_257", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -7207,6 +8235,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_258", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -7235,6 +8267,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_259", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -7263,6 +8299,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_260", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -7291,6 +8331,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_261", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -7319,6 +8363,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_262", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -7347,6 +8395,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_263", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -7375,6 +8427,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_264", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -7403,6 +8459,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_265", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -7431,6 +8491,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_266", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -7459,6 +8523,10 @@ "934006411", "1" ], + "describe": { + "key": "hero_awaken_describe_267", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -7487,6 +8555,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_268", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -7515,6 +8587,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_269", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -7543,6 +8619,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_270", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -7571,6 +8651,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_271", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -7599,6 +8683,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_272", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -7627,6 +8715,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_273", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -7655,6 +8747,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_274", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -7683,6 +8779,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_275", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -7711,6 +8811,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_276", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -7739,6 +8843,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_277", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -7767,6 +8875,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_278", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -7795,6 +8907,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_279", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -7823,6 +8939,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_280", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -7851,6 +8971,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_281", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -7879,6 +9003,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_282", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -7907,6 +9035,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_283", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -7935,6 +9067,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_284", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -7963,6 +9099,10 @@ "935001411", "1" ], + "describe": { + "key": "hero_awaken_describe_285", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -7991,6 +9131,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_286", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -8019,6 +9163,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_287", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -8047,6 +9195,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_288", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -8075,6 +9227,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_289", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -8103,6 +9259,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_290", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -8131,6 +9291,10 @@ "935002411", "1" ], + "describe": { + "key": "hero_awaken_describe_291", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -8159,6 +9323,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_292", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -8187,6 +9355,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_293", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -8215,6 +9387,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_294", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -8243,6 +9419,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_295", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -8271,6 +9451,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_296", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -8299,6 +9483,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_297", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -8327,6 +9515,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_298", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -8355,6 +9547,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_299", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -8383,6 +9579,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_300", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -8411,6 +9611,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_301", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -8439,6 +9643,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_302", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -8467,6 +9675,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_303", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -8495,6 +9707,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_304", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -8523,6 +9739,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_305", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -8551,6 +9771,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_306", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -8579,6 +9803,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_307", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -8607,6 +9835,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_308", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -8635,6 +9867,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_309", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -8663,6 +9899,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_310", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -8691,6 +9931,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_311", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -8719,6 +9963,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_312", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -8747,6 +9995,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_313", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -8775,6 +10027,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_314", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -8803,6 +10059,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_315", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -8831,6 +10091,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_316", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -8859,6 +10123,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_317", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -8887,6 +10155,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_318", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -8915,6 +10187,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_319", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -8943,6 +10219,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_320", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -8971,6 +10251,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_321", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -8999,6 +10283,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_322", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -9027,6 +10315,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_323", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -9055,6 +10347,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_324", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -9083,6 +10379,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_325", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -9111,6 +10411,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_326", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -9139,6 +10443,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_327", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -9167,6 +10475,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_328", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -9195,6 +10507,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_329", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -9223,6 +10539,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_330", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -9251,6 +10571,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_331", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -9279,6 +10603,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_332", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -9307,6 +10635,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_333", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -9335,6 +10667,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_334", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -9363,6 +10699,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_335", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -9391,6 +10731,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_336", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -9419,6 +10763,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_337", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -9447,6 +10795,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_338", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -9475,6 +10827,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_339", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -9503,6 +10859,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_340", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -9531,6 +10891,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_341", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -9559,6 +10923,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_342", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -9587,6 +10955,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_343", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -9615,6 +10987,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_344", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -9643,6 +11019,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_345", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -9671,6 +11051,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_346", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -9699,6 +11083,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_347", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -9727,6 +11115,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_348", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -9755,6 +11147,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_349", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -9783,6 +11179,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_350", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -9811,6 +11211,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_351", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -9839,6 +11243,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_352", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -9867,6 +11275,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_353", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -9895,6 +11307,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_354", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -9923,6 +11339,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_355", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -9951,6 +11371,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_356", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -9979,6 +11403,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_357", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -10007,6 +11435,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_358", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -10035,6 +11467,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_359", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -10063,6 +11499,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_360", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -10091,6 +11531,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_361", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -10119,6 +11563,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_362", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -10147,6 +11595,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_363", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -10175,6 +11627,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_364", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -10203,6 +11659,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_365", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -10231,6 +11691,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_366", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -10259,6 +11723,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_367", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -10287,6 +11755,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_368", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -10315,6 +11787,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_369", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -10343,6 +11819,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_370", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -10371,6 +11851,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_371", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -10399,6 +11883,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_372", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -10427,6 +11915,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_373", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -10455,6 +11947,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_374", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -10483,6 +11979,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_375", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -10511,6 +12011,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_376", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -10539,6 +12043,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_377", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -10567,6 +12075,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_378", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -10595,6 +12107,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_379", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -10623,6 +12139,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_380", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -10651,6 +12171,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_381", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -10679,6 +12203,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_382", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -10707,6 +12235,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_383", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -10735,6 +12267,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_384", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -10763,6 +12299,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_385", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -10791,6 +12331,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_386", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -10819,6 +12363,10 @@ "944006411", "1" ], + "describe": { + "key": "hero_awaken_describe_387", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -10847,6 +12395,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_388", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -10875,6 +12427,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_389", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -10903,6 +12459,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_390", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -10931,6 +12491,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_391", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -10959,6 +12523,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_392", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -10987,6 +12555,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_393", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -11015,6 +12587,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_394", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -11043,6 +12619,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_395", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -11071,6 +12651,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_396", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -11099,6 +12683,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_397", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -11127,6 +12715,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_398", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -11155,6 +12747,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_399", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -11183,6 +12779,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_400", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -11211,6 +12811,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_401", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -11239,6 +12843,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_402", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -11267,6 +12875,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_403", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -11295,6 +12907,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_404", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -11323,6 +12939,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_405", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -11351,6 +12971,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_406", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -11379,6 +13003,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_407", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -11407,6 +13035,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_408", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -11435,6 +13067,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_409", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -11463,6 +13099,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_410", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -11491,6 +13131,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_411", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -11519,6 +13163,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_412", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -11547,6 +13195,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_413", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -11575,6 +13227,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_414", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -11603,6 +13259,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_415", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -11631,6 +13291,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_416", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -11659,6 +13323,10 @@ "944005411", "1" ], + "describe": { + "key": "hero_awaken_describe_417", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -11687,6 +13355,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_418", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -11715,6 +13387,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_419", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -11743,6 +13419,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_420", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ @@ -11771,6 +13451,10 @@ "hp", "950" ], + "describe": { + "key": "hero_awaken_describe_421", + "text": "基础攻击、防御、基础生命值、基础速度提升6%。" + }, "icon": "js_jx_img_icon03", "condition": 0, "phaseneed": [ @@ -11799,6 +13483,10 @@ "def", "70" ], + "describe": { + "key": "hero_awaken_describe_422", + "text": "基础攻击、防御、基础生命值、基础速度提升8%。" + }, "icon": "js_jx_img_icon02", "condition": 0, "phaseneed": [ @@ -11827,6 +13515,10 @@ "cri", "100" ], + "describe": { + "key": "hero_awaken_describe_423", + "text": "基础攻击、防御、基础生命值、基础速度提升12%。" + }, "icon": "js_jx_img_icon08", "condition": 0, "phaseneed": [ @@ -11855,6 +13547,10 @@ "hppro", "30" ], + "describe": { + "key": "hero_awaken_describe_424", + "text": "基础攻击、防御、基础生命值、基础速度提升14%。" + }, "icon": "js_jx_img_icon06", "condition": 0, "phaseneed": [ @@ -11883,6 +13579,10 @@ "defpro", "100" ], + "describe": { + "key": "hero_awaken_describe_425", + "text": "基础攻击、防御、基础生命值、基础速度提升18%。" + }, "icon": "js_jx_img_icon09", "condition": 0, "phaseneed": [ @@ -11911,6 +13611,10 @@ "speed", "10" ], + "describe": { + "key": "hero_awaken_describe_426", + "text": "基础攻击、防御、基础生命值、基础速度提升20%。" + }, "icon": "js_jx_img_icon04", "condition": 0, "phaseneed": [ diff --git a/bin/json/game_item.json b/bin/json/game_item.json index a9436496b..2a361c0ac 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -11968,7 +11968,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12005,7 +12005,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12042,7 +12042,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12079,7 +12079,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12116,7 +12116,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12153,7 +12153,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12190,7 +12190,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12227,7 +12227,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12264,7 +12264,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12301,7 +12301,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12338,7 +12338,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12375,7 +12375,7 @@ }, "usetype": 4, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 2, "special_type": 0, "time": 0, @@ -12412,7 +12412,7 @@ }, "usetype": 4, "color": 2, - "bagtype": 0, + "bagtype": 1, "index": 1, "special_type": 0, "time": 0, @@ -12449,7 +12449,7 @@ }, "usetype": 4, "color": 3, - "bagtype": 0, + "bagtype": 1, "index": 1, "special_type": 0, "time": 0, @@ -12486,7 +12486,7 @@ }, "usetype": 4, "color": 4, - "bagtype": 0, + "bagtype": 1, "index": 1, "special_type": 0, "time": 0, @@ -12523,7 +12523,7 @@ }, "usetype": 4, "color": 4, - "bagtype": 0, + "bagtype": 1, "index": 1, "special_type": 0, "time": 0, @@ -12560,7 +12560,7 @@ }, "usetype": 4, "color": 3, - "bagtype": 0, + "bagtype": 1, "index": 1, "special_type": 0, "time": 0, @@ -12597,7 +12597,7 @@ }, "usetype": 4, "color": 3, - "bagtype": 0, + "bagtype": 1, "index": 1, "special_type": 0, "time": 0, @@ -12634,7 +12634,7 @@ }, "usetype": 4, "color": 3, - "bagtype": 0, + "bagtype": 1, "index": 1, "special_type": 0, "time": 0, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index d53765f06..769d80abd 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -5256,7 +5256,7 @@ ], "event": [ 2, - 50000010 + 50010010 ], "goto": 0 }, @@ -5282,7 +5282,7 @@ ], "event": [ 2, - 50000020 + 50010020 ], "goto": 0 }, @@ -5296,7 +5296,7 @@ ], "event": [ 2, - 50000030 + 50010030 ], "goto": 0 }, @@ -5322,7 +5322,7 @@ ], "event": [ 2, - 50000040 + 50010040 ], "goto": 0 }, @@ -5336,7 +5336,7 @@ ], "event": [ 2, - 50000050 + 50010050 ], "goto": 0 }, @@ -5362,7 +5362,7 @@ ], "event": [ 2, - 50000060 + 50010060 ], "goto": 0 }, @@ -5376,7 +5376,7 @@ ], "event": [ 2, - 50000070 + 50010070 ], "goto": 0 }, @@ -5404,7 +5404,7 @@ ], "event": [ 2, - 50000080 + 50010080 ], "goto": 0 }, @@ -5418,7 +5418,7 @@ ], "event": [ 2, - 50000090 + 50010090 ], "goto": 0 }, @@ -5446,7 +5446,7 @@ ], "event": [ 2, - 50000100 + 50010100 ], "goto": 0 } diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 4abb57fd7..7d893b2eb 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -28,6 +28,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 1, + "lock_add": 0, "reword": [ { "a": "attr", @@ -66,6 +67,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -104,6 +106,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -147,6 +150,7 @@ "deliver_npc": 10028, "taskend_removeitem": [], "auto_accept": 1, + "lock_add": 0, "reword": [ { "a": "attr", @@ -185,6 +189,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -223,6 +228,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 1, + "lock_add": 0, "reword": [ { "a": "attr", @@ -266,6 +272,7 @@ "deliver_npc": 10058, "taskend_removeitem": [], "auto_accept": 1, + "lock_add": 0, "reword": [ { "a": "attr", @@ -309,6 +316,7 @@ "deliver_npc": 10068, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -347,6 +355,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -387,6 +396,7 @@ "deliver_npc": 10088, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -425,6 +435,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -468,6 +479,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "equi", @@ -531,6 +543,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -569,6 +582,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -607,6 +621,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -645,6 +660,7 @@ "deliver_npc": 10148, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "equi", @@ -708,6 +724,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -746,6 +763,7 @@ "deliver_npc": 10168, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -784,6 +802,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -827,6 +846,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -870,6 +890,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -908,6 +929,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -946,6 +968,7 @@ "deliver_npc": 10218, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -984,6 +1007,7 @@ "deliver_npc": 10228, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1022,6 +1046,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1065,6 +1090,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1103,6 +1129,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "equi", @@ -1166,6 +1193,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1204,6 +1232,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1242,6 +1271,7 @@ "deliver_npc": 10288, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1287,6 +1317,7 @@ "deliver_npc": 10298, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1325,6 +1356,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1368,6 +1400,7 @@ "deliver_npc": 10318, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1406,6 +1439,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1444,6 +1478,7 @@ "deliver_npc": 10338, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1482,6 +1517,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1531,6 +1567,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1569,6 +1606,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1612,6 +1650,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1655,6 +1694,7 @@ "deliver_npc": 10388, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1693,6 +1733,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1731,6 +1772,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1769,6 +1811,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1807,6 +1850,7 @@ "deliver_npc": 10428, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1845,6 +1889,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1888,6 +1933,7 @@ "deliver_npc": 10448, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1926,6 +1972,7 @@ "deliver_npc": 10458, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -1964,6 +2011,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2002,6 +2050,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 1, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2040,6 +2089,7 @@ "deliver_npc": 10488, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2078,6 +2128,7 @@ "deliver_npc": 10498, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2116,6 +2167,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2159,6 +2211,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2197,6 +2250,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2235,6 +2289,7 @@ "deliver_npc": 10538, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2278,6 +2333,7 @@ "deliver_npc": 10548, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2316,6 +2372,7 @@ "deliver_npc": 10558, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2354,6 +2411,7 @@ "deliver_npc": 10568, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2392,6 +2450,7 @@ "deliver_npc": 10578, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2430,6 +2489,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2468,6 +2528,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2506,6 +2567,7 @@ "deliver_npc": 10608, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2544,6 +2606,7 @@ "deliver_npc": 10618, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2582,6 +2645,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2620,6 +2684,7 @@ "deliver_npc": 10638, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2663,6 +2728,7 @@ "deliver_npc": 10648, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2701,6 +2767,7 @@ "deliver_npc": 10658, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2739,6 +2806,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2777,6 +2845,7 @@ "deliver_npc": 10678, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2820,6 +2889,7 @@ "deliver_npc": 10688, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2863,6 +2933,7 @@ "deliver_npc": 10698, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2901,6 +2972,7 @@ "deliver_npc": 10708, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2939,6 +3011,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -2977,6 +3050,7 @@ "deliver_npc": 10728, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3015,6 +3089,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3053,6 +3128,7 @@ "deliver_npc": 10748, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3091,6 +3167,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3129,6 +3206,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3167,6 +3245,7 @@ "deliver_npc": 10778, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3210,6 +3289,7 @@ "deliver_npc": 10788, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3248,6 +3328,7 @@ "deliver_npc": 10798, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3286,6 +3367,7 @@ "deliver_npc": 10808, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3324,6 +3406,7 @@ "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3362,6 +3445,7 @@ "deliver_npc": 10828, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3405,6 +3489,7 @@ "deliver_npc": 10838, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3443,6 +3528,7 @@ "deliver_npc": 10848, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3486,6 +3572,7 @@ "deliver_npc": 10858, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3529,6 +3616,7 @@ "deliver_npc": 10868, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3567,6 +3655,7 @@ "deliver_npc": 10878, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3605,6 +3694,7 @@ "deliver_npc": 10888, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3648,6 +3738,7 @@ "deliver_npc": 10898, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3686,6 +3777,7 @@ "deliver_npc": 10908, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3724,6 +3816,7 @@ "deliver_npc": 10918, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3762,6 +3855,7 @@ "deliver_npc": 10928, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3800,6 +3894,7 @@ "deliver_npc": 10938, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3838,6 +3933,7 @@ "deliver_npc": 10948, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3876,6 +3972,7 @@ "deliver_npc": 10958, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3919,6 +4016,7 @@ "deliver_npc": 10968, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3957,6 +4055,7 @@ "deliver_npc": 10978, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -3995,6 +4094,7 @@ "deliver_npc": 10988, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4033,6 +4133,7 @@ "deliver_npc": 10998, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4071,6 +4172,7 @@ "deliver_npc": 11008, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4109,6 +4211,7 @@ "deliver_npc": 11018, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4147,6 +4250,7 @@ "deliver_npc": 11028, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4185,6 +4289,7 @@ "deliver_npc": 11038, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4223,6 +4328,7 @@ "deliver_npc": 11048, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4261,6 +4367,7 @@ "deliver_npc": 11058, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4299,6 +4406,7 @@ "deliver_npc": 11068, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4337,6 +4445,7 @@ "deliver_npc": 11078, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4375,6 +4484,7 @@ "deliver_npc": 11088, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4413,6 +4523,7 @@ "deliver_npc": 11098, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4451,6 +4562,7 @@ "deliver_npc": 11108, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4489,6 +4601,7 @@ "deliver_npc": 11118, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4527,6 +4640,7 @@ "deliver_npc": 11128, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4565,6 +4679,7 @@ "deliver_npc": 11138, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4603,6 +4718,7 @@ "deliver_npc": 11148, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4641,6 +4757,7 @@ "deliver_npc": 11158, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4679,6 +4796,7 @@ "deliver_npc": 11168, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4717,6 +4835,7 @@ "deliver_npc": 11178, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4755,6 +4874,7 @@ "deliver_npc": 11188, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4793,6 +4913,7 @@ "deliver_npc": 11198, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 0, "reword": [ { "a": "attr", @@ -4802,6 +4923,474 @@ ], "module": [] }, + { + "key": 300010, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 0, + "id_after": 300020, + "group": 301, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_122", + "text": "阿宝悍娇虎日常一" + }, + "task_details": { + "key": "worldtask_world_task_task_details_122", + "text": "阿宝悍娇虎日常一" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_122", + "text": "阿宝悍娇虎日常一" + }, + "npc": 300010, + "completetask": [ + 1 + ], + "deliver_npc": 300019, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300020, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 300010, + "id_after": 0, + "group": 301, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_123", + "text": "阿宝悍娇虎日常二" + }, + "task_details": { + "key": "worldtask_world_task_task_details_123", + "text": "阿宝悍娇虎日常二" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_123", + "text": "阿宝悍娇虎日常二" + }, + "npc": 300020, + "completetask": [ + 1 + ], + "deliver_npc": 300029, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300030, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 300020, + "id_after": 300040, + "group": 302, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_124", + "text": "希卡普&亚丝翠&鼻涕粗日常一" + }, + "task_details": { + "key": "worldtask_world_task_task_details_124", + "text": "希卡普&亚丝翠&鼻涕粗日常一" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_124", + "text": "希卡普&亚丝翠&鼻涕粗日常一" + }, + "npc": 300030, + "completetask": [ + 1 + ], + "deliver_npc": 300039, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300040, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 300030, + "id_after": 300050, + "group": 302, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_125", + "text": "希卡普&亚丝翠&鼻涕粗日常二" + }, + "task_details": { + "key": "worldtask_world_task_task_details_125", + "text": "希卡普&亚丝翠&鼻涕粗日常二" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_125", + "text": "希卡普&亚丝翠&鼻涕粗日常二" + }, + "npc": 300040, + "completetask": [ + 1 + ], + "deliver_npc": 300049, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300050, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 300040, + "id_after": 0, + "group": 302, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_126", + "text": "希卡普&亚丝翠&鼻涕粗日常三" + }, + "task_details": { + "key": "worldtask_world_task_task_details_126", + "text": "希卡普&亚丝翠&鼻涕粗日常三" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_126", + "text": "希卡普&亚丝翠&鼻涕粗日常三" + }, + "npc": 300050, + "completetask": [ + 1 + ], + "deliver_npc": 300059, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300060, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 300050, + "id_after": 0, + "group": 0, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_127", + "text": "希卡普&亚丝翠&鼻涕粗日常四" + }, + "task_details": { + "key": "worldtask_world_task_task_details_127", + "text": "希卡普&亚丝翠&鼻涕粗日常四" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_127", + "text": "希卡普&亚丝翠&鼻涕粗日常四" + }, + "npc": 300060, + "completetask": [ + 1 + ], + "deliver_npc": 300069, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300070, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 300060, + "id_after": 0, + "group": 303, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_128", + "text": "平先生的焦急" + }, + "task_details": { + "key": "worldtask_world_task_task_details_128", + "text": "平先生的焦急" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_128", + "text": "平先生的焦急" + }, + "npc": 300070, + "completetask": [ + 1 + ], + "deliver_npc": 300079, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300080, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 300070, + "id_after": 0, + "group": 304, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_129", + "text": "赛龙的故事" + }, + "task_details": { + "key": "worldtask_world_task_task_details_129", + "text": "赛龙的故事" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_129", + "text": "赛龙的故事" + }, + "npc": 300080, + "completetask": [ + 1 + ], + "deliver_npc": 300089, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300090, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 300080, + "id_after": 0, + "group": 305, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_130", + "text": "中轴城历史荣耀墙" + }, + "task_details": { + "key": "worldtask_world_task_task_details_130", + "text": "中轴城历史荣耀墙" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_130", + "text": "中轴城历史荣耀墙" + }, + "npc": 300090, + "completetask": [ + 1 + ], + "deliver_npc": 300099, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300100, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 300090, + "id_after": 0, + "group": 306, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_131", + "text": "贪玩的云朵先生" + }, + "task_details": { + "key": "worldtask_world_task_task_details_131", + "text": "贪玩的云朵先生" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_131", + "text": "贪玩的云朵先生" + }, + "npc": 300100, + "completetask": [ + 1 + ], + "deliver_npc": 300109, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300110, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 300100, + "id_after": 0, + "group": 307, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_132", + "text": "魔鬼教官邦尼兔" + }, + "task_details": { + "key": "worldtask_world_task_task_details_132", + "text": "魔鬼教官邦尼兔" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_132", + "text": "魔鬼教官邦尼兔" + }, + "npc": 300110, + "completetask": [ + 1 + ], + "deliver_npc": 300119, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, + { + "key": 300120, + "opencond": "", + "lock": 1, + "lockend": 0, + "ontxe": 300110, + "id_after": 0, + "group": 308, + "des": 3, + "icon": "", + "task_name": { + "key": "worldtask_world_task_task_name_133", + "text": "扫地僧鹤大师" + }, + "task_details": { + "key": "worldtask_world_task_task_details_133", + "text": "扫地僧鹤大师" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_133", + "text": "扫地僧鹤大师" + }, + "npc": 300120, + "completetask": [ + 1 + ], + "deliver_npc": 300129, + "taskend_removeitem": [], + "auto_accept": 0, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ], + "module": [] + }, { "key": 500010, "opencond": "", @@ -4831,6 +5420,7 @@ "deliver_npc": 50018, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 1, "reword": [ { "a": "attr", @@ -4871,6 +5461,7 @@ "deliver_npc": 50028, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 1, "reword": [ { "a": "attr", @@ -4911,6 +5502,7 @@ "deliver_npc": 50038, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 1, "reword": [ { "a": "attr", @@ -4951,6 +5543,7 @@ "deliver_npc": 50048, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 1, "reword": [ { "a": "attr", @@ -4991,6 +5584,7 @@ "deliver_npc": 50058, "taskend_removeitem": [], "auto_accept": 0, + "lock_add": 1, "reword": [ { "a": "attr", diff --git a/sys/configure/structs/Game.BuriedCondiData.go b/sys/configure/structs/Game.BuriedCondiData.go index c265d3b98..e573c1e75 100644 --- a/sys/configure/structs/Game.BuriedCondiData.go +++ b/sys/configure/structs/Game.BuriedCondiData.go @@ -19,6 +19,7 @@ type GameBuriedCondiData struct { Tasktxt string Type int32 Valid int32 + Head *Gameatn NPC int32 Value int32 Filter []int32 @@ -53,6 +54,7 @@ func (_v *GameBuriedCondiData)Deserialize(_buf map[string]interface{}) (err erro {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tasktxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Tasktxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Tasktxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text 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["valid"].(float64); !_ok_ { err = errors.New("valid error"); return }; _v.Valid = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["head"].(map[string]interface{}); !_ok_ { err = errors.New("head error"); return }; if _v.Head, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["NPC"].(float64); !_ok_ { err = errors.New("NPC error"); return }; _v.NPC = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } { diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go index 68b1bcb3c..0fdb04bcf 100644 --- a/sys/configure/structs/Game.WorldTaskData.go +++ b/sys/configure/structs/Game.WorldTaskData.go @@ -28,6 +28,7 @@ type GameWorldTaskData struct { DeliverNpc int32 TaskendRemoveitem []*Gameatn AutoAccept int32 + LockAdd int32 Reword []*Gameatn Module []string } @@ -82,6 +83,7 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock_add"].(float64); !_ok_ { err = errors.New("lock_add error"); return }; _v.LockAdd = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/game.heroAwakenData.go b/sys/configure/structs/game.heroAwakenData.go index 56c328231..06ce757a4 100644 --- a/sys/configure/structs/game.heroAwakenData.go +++ b/sys/configure/structs/game.heroAwakenData.go @@ -16,6 +16,7 @@ type GameHeroAwakenData struct { Phase int32 Name string Phasebonus []string + Describe string Icon string Condition int32 Phaseneed []*Gameatn @@ -47,6 +48,7 @@ func (_v *GameHeroAwakenData)Deserialize(_buf map[string]interface{}) (err error } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) } { From 3b45e361bc378022253cb43410f2ecf4edd75b59 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 6 Jul 2023 17:21:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=9C=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_worldtask.json | 872 ++++++++------------------------- modules/worldtask/configure.go | 73 +++ modules/worldtask/module.go | 71 +-- modules/wtask/module.go | 4 +- 4 files changed, 278 insertions(+), 742 deletions(-) diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 7d893b2eb..4119fc7d4 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -3,7 +3,7 @@ "key": 20010, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 0, "id_after": 20011, "group": 10, @@ -42,7 +42,7 @@ "key": 20011, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20010, "id_after": 20012, "group": 10, @@ -81,7 +81,7 @@ "key": 20012, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20011, "id_after": 20020, "group": 10, @@ -125,7 +125,7 @@ "key": 20020, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20012, "id_after": 20030, "group": 10, @@ -164,7 +164,7 @@ "key": 20030, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20020, "id_after": 20040, "group": 10, @@ -203,7 +203,7 @@ "key": 20040, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20030, "id_after": 20050, "group": 10, @@ -247,7 +247,7 @@ "key": 20050, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20040, "id_after": 20060, "group": 10, @@ -291,7 +291,7 @@ "key": 20060, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20050, "id_after": 20070, "group": 10, @@ -330,7 +330,7 @@ "key": 20070, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20060, "id_after": 20080, "group": 10, @@ -369,7 +369,7 @@ "key": 20080, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20070, "id_after": 20090, "group": 10, @@ -410,7 +410,7 @@ "key": 20090, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20080, "id_after": 20100, "group": 10, @@ -454,7 +454,7 @@ "key": 20100, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20090, "id_after": 20110, "group": 10, @@ -518,7 +518,7 @@ "key": 20110, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20100, "id_after": 20120, "group": 10, @@ -557,7 +557,7 @@ "key": 20120, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20110, "id_after": 20130, "group": 10, @@ -596,7 +596,7 @@ "key": 20130, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20120, "id_after": 20140, "group": 10, @@ -635,7 +635,7 @@ "key": 20140, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20130, "id_after": 20150, "group": 10, @@ -699,7 +699,7 @@ "key": 20150, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20140, "id_after": 20160, "group": 10, @@ -738,7 +738,7 @@ "key": 20160, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20150, "id_after": 20170, "group": 10, @@ -777,7 +777,7 @@ "key": 20170, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20160, "id_after": 20180, "group": 10, @@ -821,7 +821,7 @@ "key": 20180, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20170, "id_after": 20190, "group": 10, @@ -865,7 +865,7 @@ "key": 20190, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20180, "id_after": 20200, "group": 10, @@ -904,7 +904,7 @@ "key": 20200, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20190, "id_after": 20210, "group": 10, @@ -943,7 +943,7 @@ "key": 20210, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20200, "id_after": 20220, "group": 10, @@ -982,7 +982,7 @@ "key": 20220, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20210, "id_after": 0, "group": 10, @@ -1021,7 +1021,7 @@ "key": 20230, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20220, "id_after": 20240, "group": 20, @@ -1065,7 +1065,7 @@ "key": 20240, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20230, "id_after": 20250, "group": 20, @@ -1104,7 +1104,7 @@ "key": 20250, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20240, "id_after": 20260, "group": 20, @@ -1168,7 +1168,7 @@ "key": 20260, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20250, "id_after": 20270, "group": 20, @@ -1207,7 +1207,7 @@ "key": 20270, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20260, "id_after": 20280, "group": 20, @@ -1246,7 +1246,7 @@ "key": 20280, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20270, "id_after": 20290, "group": 20, @@ -1290,7 +1290,7 @@ "key": 20290, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20280, "id_after": 0, "group": 20, @@ -1331,7 +1331,7 @@ "key": 20300, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20290, "id_after": 20310, "group": 30, @@ -1375,7 +1375,7 @@ "key": 20310, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20300, "id_after": 20320, "group": 30, @@ -1414,7 +1414,7 @@ "key": 20320, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20310, "id_after": 20330, "group": 30, @@ -1453,7 +1453,7 @@ "key": 20330, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20320, "id_after": 20340, "group": 30, @@ -1492,7 +1492,7 @@ "key": 20340, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20330, "id_after": 20350, "group": 30, @@ -1541,7 +1541,7 @@ "key": 20350, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20340, "id_after": 20360, "group": 30, @@ -1581,7 +1581,7 @@ "key": 20360, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20350, "id_after": 0, "group": 30, @@ -1625,7 +1625,7 @@ "key": 20370, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20360, "id_after": 20380, "group": 40, @@ -1669,7 +1669,7 @@ "key": 20380, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20370, "id_after": 20390, "group": 40, @@ -1708,7 +1708,7 @@ "key": 20390, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20380, "id_after": 20400, "group": 40, @@ -1747,7 +1747,7 @@ "key": 20400, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20390, "id_after": 20410, "group": 40, @@ -1786,7 +1786,7 @@ "key": 20410, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20400, "id_after": 20420, "group": 40, @@ -1825,7 +1825,7 @@ "key": 20420, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20410, "id_after": 20430, "group": 40, @@ -1864,7 +1864,7 @@ "key": 20430, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 20420, "id_after": 0, "group": 40, @@ -1907,8 +1907,8 @@ { "key": 20440, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20430, "id_after": 20450, "group": 50, @@ -1946,8 +1946,8 @@ { "key": 20450, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20440, "id_after": 20460, "group": 50, @@ -1985,8 +1985,8 @@ { "key": 20460, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20450, "id_after": 20470, "group": 50, @@ -2024,8 +2024,8 @@ { "key": 20470, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20460, "id_after": 20480, "group": 50, @@ -2063,8 +2063,8 @@ { "key": 20480, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20470, "id_after": 20490, "group": 50, @@ -2102,8 +2102,8 @@ { "key": 20490, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20480, "id_after": 20500, "group": 50, @@ -2141,8 +2141,8 @@ { "key": 20500, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20490, "id_after": 20510, "group": 50, @@ -2185,8 +2185,8 @@ { "key": 20510, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20500, "id_after": 20520, "group": 50, @@ -2224,8 +2224,8 @@ { "key": 20520, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20510, "id_after": 20530, "group": 50, @@ -2263,8 +2263,8 @@ { "key": 20530, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20520, "id_after": 20540, "group": 50, @@ -2307,8 +2307,8 @@ { "key": 20540, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20530, "id_after": 20550, "group": 50, @@ -2346,8 +2346,8 @@ { "key": 20550, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20540, "id_after": 20560, "group": 50, @@ -2385,8 +2385,8 @@ { "key": 20560, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20550, "id_after": 20570, "group": 50, @@ -2424,8 +2424,8 @@ { "key": 20570, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20560, "id_after": 20580, "group": 50, @@ -2463,8 +2463,8 @@ { "key": 20580, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20570, "id_after": 20590, "group": 50, @@ -2502,8 +2502,8 @@ { "key": 20590, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20580, "id_after": 20600, "group": 50, @@ -2541,8 +2541,8 @@ { "key": 20600, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20590, "id_after": 20610, "group": 50, @@ -2580,8 +2580,8 @@ { "key": 20610, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20600, "id_after": 20620, "group": 50, @@ -2619,8 +2619,8 @@ { "key": 20620, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20610, "id_after": 20630, "group": 50, @@ -2658,8 +2658,8 @@ { "key": 20630, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20620, "id_after": 20640, "group": 50, @@ -2702,8 +2702,8 @@ { "key": 20640, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20630, "id_after": 20650, "group": 50, @@ -2741,8 +2741,8 @@ { "key": 20650, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20640, "id_after": 20660, "group": 50, @@ -2780,8 +2780,8 @@ { "key": 20660, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20650, "id_after": 20670, "group": 50, @@ -2819,8 +2819,8 @@ { "key": 20670, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20660, "id_after": 20680, "group": 50, @@ -2863,8 +2863,8 @@ { "key": 20680, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20670, "id_after": 20690, "group": 50, @@ -2907,8 +2907,8 @@ { "key": 20690, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20680, "id_after": 20700, "group": 50, @@ -2946,8 +2946,8 @@ { "key": 20700, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20690, "id_after": 20710, "group": 50, @@ -2985,8 +2985,8 @@ { "key": 20710, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20700, "id_after": 20720, "group": 50, @@ -3024,8 +3024,8 @@ { "key": 20720, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20710, "id_after": 20730, "group": 50, @@ -3063,8 +3063,8 @@ { "key": 20730, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20720, "id_after": 20740, "group": 50, @@ -3102,8 +3102,8 @@ { "key": 20740, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20730, "id_after": 20750, "group": 50, @@ -3141,8 +3141,8 @@ { "key": 20750, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20740, "id_after": 20760, "group": 50, @@ -3180,8 +3180,8 @@ { "key": 20760, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20750, "id_after": 20770, "group": 50, @@ -3219,8 +3219,8 @@ { "key": 20770, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20760, "id_after": 20780, "group": 50, @@ -3263,8 +3263,8 @@ { "key": 20780, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20770, "id_after": 20790, "group": 50, @@ -3302,8 +3302,8 @@ { "key": 20790, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20780, "id_after": 20800, "group": 50, @@ -3341,8 +3341,8 @@ { "key": 20800, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20790, "id_after": 20810, "group": 50, @@ -3380,8 +3380,8 @@ { "key": 20810, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20800, "id_after": 20820, "group": 50, @@ -3419,8 +3419,8 @@ { "key": 20820, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20810, "id_after": 20830, "group": 50, @@ -3463,8 +3463,8 @@ { "key": 20830, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20820, "id_after": 20840, "group": 50, @@ -3502,8 +3502,8 @@ { "key": 20840, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20830, "id_after": 20850, "group": 50, @@ -3546,8 +3546,8 @@ { "key": 20850, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20840, "id_after": 20860, "group": 50, @@ -3590,8 +3590,8 @@ { "key": 20860, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20850, "id_after": 20870, "group": 50, @@ -3629,8 +3629,8 @@ { "key": 20870, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20860, "id_after": 20880, "group": 50, @@ -3668,8 +3668,8 @@ { "key": 20880, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20870, "id_after": 20890, "group": 50, @@ -3712,8 +3712,8 @@ { "key": 20890, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20880, "id_after": 20900, "group": 50, @@ -3751,8 +3751,8 @@ { "key": 20900, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20890, "id_after": 20910, "group": 50, @@ -3790,8 +3790,8 @@ { "key": 20910, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20900, "id_after": 20920, "group": 50, @@ -3829,8 +3829,8 @@ { "key": 20920, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20910, "id_after": 20930, "group": 50, @@ -3868,8 +3868,8 @@ { "key": 20930, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20920, "id_after": 20940, "group": 50, @@ -3907,8 +3907,8 @@ { "key": 20940, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20930, "id_after": 20950, "group": 50, @@ -3946,8 +3946,8 @@ { "key": 20950, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20940, "id_after": 20960, "group": 50, @@ -3990,8 +3990,8 @@ { "key": 20960, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20950, "id_after": 20970, "group": 50, @@ -4029,8 +4029,8 @@ { "key": 20970, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20960, "id_after": 20980, "group": 50, @@ -4068,8 +4068,8 @@ { "key": 20980, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20970, "id_after": 20990, "group": 50, @@ -4107,8 +4107,8 @@ { "key": 20990, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20980, "id_after": 21000, "group": 50, @@ -4146,8 +4146,8 @@ { "key": 21000, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 20990, "id_after": 21010, "group": 50, @@ -4185,8 +4185,8 @@ { "key": 21010, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21000, "id_after": 21020, "group": 50, @@ -4224,8 +4224,8 @@ { "key": 21020, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21010, "id_after": 21030, "group": 50, @@ -4263,8 +4263,8 @@ { "key": 21030, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21020, "id_after": 21040, "group": 50, @@ -4302,8 +4302,8 @@ { "key": 21040, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21030, "id_after": 21050, "group": 50, @@ -4341,8 +4341,8 @@ { "key": 21050, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21040, "id_after": 21060, "group": 50, @@ -4380,8 +4380,8 @@ { "key": 21060, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21050, "id_after": 21070, "group": 50, @@ -4419,8 +4419,8 @@ { "key": 21070, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21060, "id_after": 21080, "group": 50, @@ -4458,8 +4458,8 @@ { "key": 21080, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21070, "id_after": 21090, "group": 50, @@ -4497,8 +4497,8 @@ { "key": 21090, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21080, "id_after": 21100, "group": 50, @@ -4536,8 +4536,8 @@ { "key": 21100, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21090, "id_after": 21110, "group": 50, @@ -4575,8 +4575,8 @@ { "key": 21110, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21100, "id_after": 21120, "group": 50, @@ -4614,8 +4614,8 @@ { "key": 21120, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21110, "id_after": 21130, "group": 50, @@ -4653,8 +4653,8 @@ { "key": 21130, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21120, "id_after": 21140, "group": 50, @@ -4692,8 +4692,8 @@ { "key": 21140, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21130, "id_after": 21150, "group": 50, @@ -4731,8 +4731,8 @@ { "key": 21150, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21140, "id_after": 21160, "group": 50, @@ -4770,8 +4770,8 @@ { "key": 21160, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21150, "id_after": 21170, "group": 50, @@ -4809,8 +4809,8 @@ { "key": 21170, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21160, "id_after": 21180, "group": 50, @@ -4848,8 +4848,8 @@ { "key": 21180, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21170, "id_after": 21190, "group": 50, @@ -4887,8 +4887,8 @@ { "key": 21190, "opencond": "", - "lock": 5, - "lockend": 0, + "lock": 1, + "lockend": 999, "ontxe": 21180, "id_after": 0, "group": 50, @@ -4923,479 +4923,11 @@ ], "module": [] }, - { - "key": 300010, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 0, - "id_after": 300020, - "group": 301, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_122", - "text": "阿宝悍娇虎日常一" - }, - "task_details": { - "key": "worldtask_world_task_task_details_122", - "text": "阿宝悍娇虎日常一" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_122", - "text": "阿宝悍娇虎日常一" - }, - "npc": 300010, - "completetask": [ - 1 - ], - "deliver_npc": 300019, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300020, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300010, - "id_after": 0, - "group": 301, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_123", - "text": "阿宝悍娇虎日常二" - }, - "task_details": { - "key": "worldtask_world_task_task_details_123", - "text": "阿宝悍娇虎日常二" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_123", - "text": "阿宝悍娇虎日常二" - }, - "npc": 300020, - "completetask": [ - 1 - ], - "deliver_npc": 300029, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300030, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300020, - "id_after": 300040, - "group": 302, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_124", - "text": "希卡普&亚丝翠&鼻涕粗日常一" - }, - "task_details": { - "key": "worldtask_world_task_task_details_124", - "text": "希卡普&亚丝翠&鼻涕粗日常一" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_124", - "text": "希卡普&亚丝翠&鼻涕粗日常一" - }, - "npc": 300030, - "completetask": [ - 1 - ], - "deliver_npc": 300039, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300040, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300030, - "id_after": 300050, - "group": 302, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_125", - "text": "希卡普&亚丝翠&鼻涕粗日常二" - }, - "task_details": { - "key": "worldtask_world_task_task_details_125", - "text": "希卡普&亚丝翠&鼻涕粗日常二" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_125", - "text": "希卡普&亚丝翠&鼻涕粗日常二" - }, - "npc": 300040, - "completetask": [ - 1 - ], - "deliver_npc": 300049, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300050, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300040, - "id_after": 0, - "group": 302, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_126", - "text": "希卡普&亚丝翠&鼻涕粗日常三" - }, - "task_details": { - "key": "worldtask_world_task_task_details_126", - "text": "希卡普&亚丝翠&鼻涕粗日常三" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_126", - "text": "希卡普&亚丝翠&鼻涕粗日常三" - }, - "npc": 300050, - "completetask": [ - 1 - ], - "deliver_npc": 300059, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300060, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300050, - "id_after": 0, - "group": 0, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_127", - "text": "希卡普&亚丝翠&鼻涕粗日常四" - }, - "task_details": { - "key": "worldtask_world_task_task_details_127", - "text": "希卡普&亚丝翠&鼻涕粗日常四" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_127", - "text": "希卡普&亚丝翠&鼻涕粗日常四" - }, - "npc": 300060, - "completetask": [ - 1 - ], - "deliver_npc": 300069, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300070, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300060, - "id_after": 0, - "group": 303, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_128", - "text": "平先生的焦急" - }, - "task_details": { - "key": "worldtask_world_task_task_details_128", - "text": "平先生的焦急" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_128", - "text": "平先生的焦急" - }, - "npc": 300070, - "completetask": [ - 1 - ], - "deliver_npc": 300079, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300080, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300070, - "id_after": 0, - "group": 304, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_129", - "text": "赛龙的故事" - }, - "task_details": { - "key": "worldtask_world_task_task_details_129", - "text": "赛龙的故事" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_129", - "text": "赛龙的故事" - }, - "npc": 300080, - "completetask": [ - 1 - ], - "deliver_npc": 300089, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300090, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300080, - "id_after": 0, - "group": 305, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_130", - "text": "中轴城历史荣耀墙" - }, - "task_details": { - "key": "worldtask_world_task_task_details_130", - "text": "中轴城历史荣耀墙" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_130", - "text": "中轴城历史荣耀墙" - }, - "npc": 300090, - "completetask": [ - 1 - ], - "deliver_npc": 300099, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300100, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300090, - "id_after": 0, - "group": 306, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_131", - "text": "贪玩的云朵先生" - }, - "task_details": { - "key": "worldtask_world_task_task_details_131", - "text": "贪玩的云朵先生" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_131", - "text": "贪玩的云朵先生" - }, - "npc": 300100, - "completetask": [ - 1 - ], - "deliver_npc": 300109, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300110, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300100, - "id_after": 0, - "group": 307, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_132", - "text": "魔鬼教官邦尼兔" - }, - "task_details": { - "key": "worldtask_world_task_task_details_132", - "text": "魔鬼教官邦尼兔" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_132", - "text": "魔鬼教官邦尼兔" - }, - "npc": 300110, - "completetask": [ - 1 - ], - "deliver_npc": 300119, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, - { - "key": 300120, - "opencond": "", - "lock": 1, - "lockend": 0, - "ontxe": 300110, - "id_after": 0, - "group": 308, - "des": 3, - "icon": "", - "task_name": { - "key": "worldtask_world_task_task_name_133", - "text": "扫地僧鹤大师" - }, - "task_details": { - "key": "worldtask_world_task_task_details_133", - "text": "扫地僧鹤大师" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_133", - "text": "扫地僧鹤大师" - }, - "npc": 300120, - "completetask": [ - 1 - ], - "deliver_npc": 300129, - "taskend_removeitem": [], - "auto_accept": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 500 - } - ], - "module": [] - }, { "key": 500010, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 0, "id_after": 500020, "group": 500, @@ -5436,7 +4968,7 @@ "key": 500020, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 500010, "id_after": 500030, "group": 500, @@ -5477,7 +5009,7 @@ "key": 500030, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 500020, "id_after": 0, "group": 500, @@ -5518,7 +5050,7 @@ "key": 500040, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 0, "id_after": 0, "group": 510, @@ -5559,7 +5091,7 @@ "key": 500050, "opencond": "", "lock": 1, - "lockend": 0, + "lockend": 999, "ontxe": 0, "id_after": 0, "group": 520, diff --git a/modules/worldtask/configure.go b/modules/worldtask/configure.go index da203277b..545034387 100644 --- a/modules/worldtask/configure.go +++ b/modules/worldtask/configure.go @@ -20,12 +20,14 @@ const ( type configureComp struct { modules.MCompConfigure + module *Worldtask lock sync.RWMutex worldtaskConf map[int32]*cfg.GameWorldTaskData //key 条件ID } func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompConfigure.Init(service, module, comp, options) + this.module = module.(*Worldtask) err = this.LoadMultiConfigure(map[string]interface{}{ gameWorldTask: cfg.NewGameWorldTask, gameWorldtaskBattle: cfg.NewGameWorldBattle, @@ -38,6 +40,77 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp return } +func (this *configureComp) Start() (err error) { + err = this.MCompConfigure.Start() + this.checkWorldtaskConf() + conf, err := this.getWorldtaskCfg() + if err != nil { + return err + } + this.worldtaskConf = conf.GetDataMap() + return +} + +// 配置文件校验 +func (this *configureComp) checkWorldtaskConf() (err error) { + worldtaskConf, err := this.getWorldtaskCfg() + if err != nil { + return err + } + buriedCondConf, err := this.getBuriedCondCfg() + if err != nil { + return err + } + for _, data := range worldtaskConf.GetDataList() { + // 检查 lock + if data.Lock < 1 { + this.module.Errorf("taskId:%v lock:%v可能存在问题", data.Key, data.Lock) + } + //检查group + if data.Group <= 0 { + this.module.Errorf("taskId:%v group:%v可能存在问题", data.Key, data.Group) + } + //检查des + if data.Des < 1 || data.Des > 5 { + // errs = append(errs, fmt.Sprintf("taskId:%v des:%v可能存在问题", data.Key, data.Des)) + this.module.Errorf("taskId:%v des:%v可能存在问题", data.Key, data.Des) + } + // 检查completetask 是否有效 + for _, condId := range data.Completetask { + if condId > 0 { + if _, ok := buriedCondConf.GetDataMap()[condId]; !ok { + this.module.Errorf("taskId:%v completetask:%v可能是无效的ID", data.Key, condId) + // errs = append(errs, fmt.Sprintf("taskId:%v completetask:%v可能是无效的ID", data.Key, condId)) + } + } + } + //检查NPC + if data.Npc > 0 { + if _, err := this.getNPCById(data.Npc); err != nil { + this.module.Errorf("npcId:%v 可能无效,检查world_task表字段Npc值是否存在于buried/rdtasknpc", data.Npc) + // errs = append(errs, fmt.Sprintf("npcId:%v 可能无效,检查world_task表字段Npc值是否存在于buried/rdtasknpc", data.Npc)) + } + } + if data.DeliverNpc > 0 { + if _, err := this.getNPCById(data.Npc); err != nil { + this.module.Errorf("npcId:%v 可能无效,检查world_task表字段deliver_npc值是否存在于buried/rdtasknpc", data.Npc) + // errs = append(errs, fmt.Sprintf("npcId:%v 可能无效,检查world_task表字段deliver_npc值是否存在于buried/rdtasknpc", data.Npc)) + } + } + } + + for _, data := range buriedCondConf.GetDataList() { + if data.NPC > 0 { + if _, err := this.getNPCById(data.NPC); err != nil { + this.module.Errorf("npcId:%v 可能无效,检查buried_condi表字段NPC值是否存在于buried/rdtasknpc", data.NPC) + + } + } + } + + return +} + func (this *configureComp) getWorldtaskCfg() (data *cfg.GameWorldTask, err error) { var ( v interface{} diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index f504a982e..3bc5c32ce 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -11,7 +11,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" - "strings" ) var _ comm.IWorldtask = (*Worldtask)(nil) @@ -37,7 +36,6 @@ func (this *Worldtask) Init(service core.IService, module core.IModule, options func (this *Worldtask) OnInstallComp() { this.ModuleBase.OnInstallComp() - event.Register(comm.EventBuriedComplete, this.TCondFinishNotify) this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.modelWorldtask = this.RegisterComp(new(ModelWorldtask)).(*ModelWorldtask) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) @@ -50,14 +48,7 @@ func (this *Worldtask) GetType() core.M_Modules { func (this *Worldtask) Start() (err error) { err = this.ModuleBase.Start() - if err = this.checkWorldtaskConf(); err != nil { - return err - } - conf, err := this.configure.getWorldtaskCfg() - if err != nil { - return err - } - this.configure.worldtaskConf = conf.GetDataMap() + event.Register(comm.EventBuriedComplete, this.TCondFinishNotify) return } @@ -68,66 +59,6 @@ func (this *Worldtask) OpenCmdNotice(session comm.IUserSession, keys ...string) var errs []string -// 配置文件校验 -func (this *Worldtask) checkWorldtaskConf() (err error) { - worldtaskConf, err := this.configure.getWorldtaskCfg() - if err != nil { - return err - } - buriedCondConf, err := this.configure.getBuriedCondCfg() - if err != nil { - return err - } - for _, data := range worldtaskConf.GetDataList() { - // 检查 lock - if data.Lock < 1 { - errs = append(errs, fmt.Sprintf("taskId:%v lock:%v可能存在问题", data.Key, data.Lock)) - } - //检查group - if data.Group <= 0 { - errs = append(errs, fmt.Sprintf("taskId:%v group:%v可能存在问题", data.Key, data.Group)) - } - //检查des - if data.Des < 1 || data.Des > 5 { - errs = append(errs, fmt.Sprintf("taskId:%v des:%v可能存在问题", data.Key, data.Des)) - } - // 检查completetask 是否有效 - for _, condId := range data.Completetask { - if condId > 0 { - if _, ok := buriedCondConf.GetDataMap()[condId]; !ok { - errs = append(errs, fmt.Sprintf("taskId:%v completetask:%v可能是无效的ID", data.Key, condId)) - } - } - } - //检查NPC - if data.Npc > 0 { - if _, err := this.configure.getNPCById(data.Npc); err != nil { - errs = append(errs, fmt.Sprintf("npcId:%v 可能无效,检查world_task表字段Npc值是否存在于buried/rdtasknpc", data.Npc)) - } - } - if data.DeliverNpc > 0 { - if _, err := this.configure.getNPCById(data.Npc); err != nil { - errs = append(errs, fmt.Sprintf("npcId:%v 可能无效,检查world_task表字段deliver_npc值是否存在于buried/rdtasknpc", data.Npc)) - } - } - } - - for _, data := range buriedCondConf.GetDataList() { - if data.NPC > 0 { - if _, err := this.configure.getNPCById(data.NPC); err != nil { - errs = append(errs, fmt.Sprintf("npcId:%v 可能无效,检查buried_condi表字段NPC值是否存在于buried/rdtasknpc", data.NPC)) - } - } - } - - if len(errs) > 0 { - return fmt.Errorf("%s", strings.Join(errs, "|")) - } - - this.Debug("check worldtask conf completed") - return -} - // 完成条件通知 func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) { this.Debug("世界任务完成条件通知", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condIds", Value: conds}) diff --git a/modules/wtask/module.go b/modules/wtask/module.go index f2465fd00..af6e9634e 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -238,7 +238,7 @@ func (this *WTask) fishtask(session comm.IUserSession, wtask *pb.DBWTask) { opencmd = append(opencmd, k) } } - if user = this.ModuleUser.GetUser(session.GetUserId()); user != nil { + if user = this.ModuleUser.GetUser(session.GetUserId()); user == nil { this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()}) return } @@ -295,7 +295,7 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa if _, ok = activatMap[v.Key]; ok { //已在可接取列表中 continue } - if _, ok = acceptsMap[v.Key]; ok { //已在已接取任务列表中 + if _, ok = acceptsMap[v.Key]; v.LockAdd == 0 && ok { //已在已接取任务列表中 LockAdd 0 表示只能接取一次 1 表示可以重复接取 continue } if _, ok = completeMap[v.Key]; ok { //已在完成列表中 From 5a191218dc54a09da87c59f53655cde233d7fc2a Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 6 Jul 2023 17:56:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BC=A0=E5=8A=9F?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/passon/module.go | 42 ++++++++- pb/activity_db.pb.go | 22 ++--- pb/passon_msg.pb.go | 74 ++++++++++++++-- pb/viking_db.pb.go | 186 ++++----------------------------------- 4 files changed, 137 insertions(+), 187 deletions(-) diff --git a/modules/passon/module.go b/modules/passon/module.go index c35c4429a..5657371cf 100644 --- a/modules/passon/module.go +++ b/modules/passon/module.go @@ -53,9 +53,11 @@ func (this *Passon) Start() (err error) { // 英雄升级 func (this *Passon) HeroUpLv(session comm.IUserSession, heroid string, lv int32) { var ( - passon *pb.DBPasson - heros []*pb.DBHero - err error + passon *pb.DBPasson + heros []*pb.DBHero + change map[string]bool = make(map[string]bool) + errdata *pb.ErrorData + err error ) if passon, err = this.modelPasson.getUserPasson(session.GetUserId()); err != nil { this.Error("getUserPasson err", log.Field{Key: "err", Value: err.Error()}) @@ -82,4 +84,38 @@ func (this *Passon) HeroUpLv(session comm.IUserSession, heroid string, lv int32) return heros[i].Lv < heros[j].Lv }) + for i := 0; i < 5; i++ { + if heros[i].Ispasson { + change[heros[i].Id] = false + for ii, v := range passon.Student { + if v == heros[ii].Id { + passon.Student[ii] = "" + } + } + } + passon.Teacher[i] = heros[i].Id + } + + if len(change) > 0 { + if errdata = this.ModuleHero.PassonHero(session, change); errdata != nil { + return + } + } + + if passon.Passonlv != heros[4].Lv { + passon.Passonlv = heros[4].Lv + this.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ + "passonlv": passon.Passonlv, + }) + session.SendMsg(string(this.GetType()), "lvchange", &pb.PassonLvChangePush{Lv: passon.Passonlv}) + } + + if err = this.modelPasson.Change(session.GetUserId(), map[string]interface{}{ + "passonlv": passon.Passonlv, + "teacher": passon.Teacher, + "student": passon.Student, + }); err != nil { + this.Errorln(err) + } + } diff --git a/pb/activity_db.pb.go b/pb/activity_db.pb.go index ed35a5b0c..b423a3d1a 100644 --- a/pb/activity_db.pb.go +++ b/pb/activity_db.pb.go @@ -329,7 +329,7 @@ type DBActivityData struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` - Hdid int32 `protobuf:"varint,3,opt,name=hdid,proto3" json:"hdid"` + Hid int32 `protobuf:"varint,3,opt,name=hid,proto3" json:"hid"` Gotarr []int32 `protobuf:"varint,4,rep,packed,name=gotarr,proto3" json:"gotarr"` Lasttime int64 `protobuf:"varint,5,opt,name=lasttime,proto3" json:"lasttime"` Val int32 `protobuf:"varint,6,opt,name=val,proto3" json:"val"` @@ -381,9 +381,9 @@ func (x *DBActivityData) GetUid() string { return "" } -func (x *DBActivityData) GetHdid() int32 { +func (x *DBActivityData) GetHid() int32 { if x != nil { - return x.Hdid + return x.Hid } return 0 } @@ -450,16 +450,16 @@ var file_activity_activity_db_proto_rawDesc = []byte{ 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, - 0x8c, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, + 0x8a, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, - 0x72, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, - 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, - 0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, 0x1a, + 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, + 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/passon_msg.pb.go b/pb/passon_msg.pb.go index 5f18f620e..85c44d7d6 100644 --- a/pb/passon_msg.pb.go +++ b/pb/passon_msg.pb.go @@ -116,6 +116,54 @@ func (x *PassonInRoomResp) GetHeroid() string { return "" } +//传功等级变化推送 +type PassonLvChangePush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Lv int32 `protobuf:"varint,1,opt,name=lv,proto3" json:"lv"` +} + +func (x *PassonLvChangePush) Reset() { + *x = PassonLvChangePush{} + if protoimpl.UnsafeEnabled { + mi := &file_passon_passon_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PassonLvChangePush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PassonLvChangePush) ProtoMessage() {} + +func (x *PassonLvChangePush) ProtoReflect() protoreflect.Message { + mi := &file_passon_passon_msg_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PassonLvChangePush.ProtoReflect.Descriptor instead. +func (*PassonLvChangePush) Descriptor() ([]byte, []int) { + return file_passon_passon_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *PassonLvChangePush) GetLv() int32 { + if x != nil { + return x.Lv + } + return 0 +} + var File_passon_passon_msg_proto protoreflect.FileDescriptor var file_passon_passon_msg_proto_rawDesc = []byte{ @@ -126,7 +174,10 @@ var file_passon_passon_msg_proto_rawDesc = []byte{ 0x72, 0x6f, 0x69, 0x64, 0x22, 0x2a, 0x0a, 0x10, 0x50, 0x61, 0x73, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x24, 0x0a, 0x12, 0x50, 0x61, 0x73, 0x73, 0x6f, 0x6e, 0x4c, 0x76, 0x43, 0x68, 0x61, 0x6e, + 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -141,10 +192,11 @@ func file_passon_passon_msg_proto_rawDescGZIP() []byte { return file_passon_passon_msg_proto_rawDescData } -var file_passon_passon_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_passon_passon_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_passon_passon_msg_proto_goTypes = []interface{}{ - (*PassonInRoomReq)(nil), // 0: PassonInRoomReq - (*PassonInRoomResp)(nil), // 1: PassonInRoomResp + (*PassonInRoomReq)(nil), // 0: PassonInRoomReq + (*PassonInRoomResp)(nil), // 1: PassonInRoomResp + (*PassonLvChangePush)(nil), // 2: PassonLvChangePush } var file_passon_passon_msg_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type @@ -184,6 +236,18 @@ func file_passon_passon_msg_proto_init() { return nil } } + file_passon_passon_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PassonLvChangePush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -191,7 +255,7 @@ func file_passon_passon_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_passon_passon_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 2, + NumMessages: 3, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/viking_db.pb.go b/pb/viking_db.pb.go index 5cea1d8d4..13023b1b0 100644 --- a/pb/viking_db.pb.go +++ b/pb/viking_db.pb.go @@ -220,126 +220,6 @@ func (x *DBVikingRank) GetCostTime() int32 { return 0 } -// 装备副本DBVSeasonRank -type DBVSeasonRank struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - Difficulty int32 `protobuf:"varint,3,opt,name=difficulty,proto3" json:"difficulty"` // 难度 - Bosstype int32 `protobuf:"varint,4,opt,name=bosstype,proto3" json:"bosstype"` // boss类型塔类型 - Nickname string `protobuf:"bytes,5,opt,name=nickname,proto3" json:"nickname"` // 昵称 - Icon string `protobuf:"bytes,6,opt,name=icon,proto3" json:"icon"` // 玩家头像 - Lv int32 `protobuf:"varint,7,opt,name=lv,proto3" json:"lv"` // 玩家等级 - Leadpos int32 `protobuf:"varint,8,opt,name=leadpos,proto3" json:"leadpos"` //队长位置 - Line []*LineUp `protobuf:"bytes,9,rep,name=line,proto3" json:"line"` // 阵容数据 - Huihe int32 `protobuf:"varint,10,opt,name=huihe,proto3" json:"huihe"` // 平均回合数 建议*10 -} - -func (x *DBVSeasonRank) Reset() { - *x = DBVSeasonRank{} - if protoimpl.UnsafeEnabled { - mi := &file_viking_viking_db_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DBVSeasonRank) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DBVSeasonRank) ProtoMessage() {} - -func (x *DBVSeasonRank) ProtoReflect() protoreflect.Message { - mi := &file_viking_viking_db_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use DBVSeasonRank.ProtoReflect.Descriptor instead. -func (*DBVSeasonRank) Descriptor() ([]byte, []int) { - return file_viking_viking_db_proto_rawDescGZIP(), []int{2} -} - -func (x *DBVSeasonRank) GetId() string { - if x != nil { - return x.Id - } - return "" -} - -func (x *DBVSeasonRank) GetUid() string { - if x != nil { - return x.Uid - } - return "" -} - -func (x *DBVSeasonRank) GetDifficulty() int32 { - if x != nil { - return x.Difficulty - } - return 0 -} - -func (x *DBVSeasonRank) GetBosstype() int32 { - if x != nil { - return x.Bosstype - } - return 0 -} - -func (x *DBVSeasonRank) GetNickname() string { - if x != nil { - return x.Nickname - } - return "" -} - -func (x *DBVSeasonRank) GetIcon() string { - if x != nil { - return x.Icon - } - return "" -} - -func (x *DBVSeasonRank) GetLv() int32 { - if x != nil { - return x.Lv - } - return 0 -} - -func (x *DBVSeasonRank) GetLeadpos() int32 { - if x != nil { - return x.Leadpos - } - return 0 -} - -func (x *DBVSeasonRank) GetLine() []*LineUp { - if x != nil { - return x.Line - } - return nil -} - -func (x *DBVSeasonRank) GetHuihe() int32 { - if x != nil { - return x.Huihe - } - return 0 -} - var File_viking_viking_db_proto protoreflect.FileDescriptor var file_viking_viking_db_proto_rawDesc = []byte{ @@ -384,23 +264,7 @@ var file_viking_viking_db_proto_rawDesc = []byte{ 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, - 0x22, 0xfa, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x56, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x61, - 0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, - 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, - 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, - 0x75, 0x6c, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, - 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, - 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, - 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, - 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, - 0x6e, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, - 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, - 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -415,27 +279,25 @@ func file_viking_viking_db_proto_rawDescGZIP() []byte { return file_viking_viking_db_proto_rawDescData } -var file_viking_viking_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_viking_viking_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_viking_viking_db_proto_goTypes = []interface{}{ - (*DBViking)(nil), // 0: DBViking - (*DBVikingRank)(nil), // 1: DBVikingRank - (*DBVSeasonRank)(nil), // 2: DBVSeasonRank - nil, // 3: DBViking.BossEntry - nil, // 4: DBViking.BossTimeEntry - nil, // 5: DBViking.PsEntry - (*LineUp)(nil), // 6: LineUp + (*DBViking)(nil), // 0: DBViking + (*DBVikingRank)(nil), // 1: DBVikingRank + nil, // 2: DBViking.BossEntry + nil, // 3: DBViking.BossTimeEntry + nil, // 4: DBViking.PsEntry + (*LineUp)(nil), // 5: LineUp } var file_viking_viking_db_proto_depIdxs = []int32{ - 3, // 0: DBViking.boss:type_name -> DBViking.BossEntry - 4, // 1: DBViking.bossTime:type_name -> DBViking.BossTimeEntry - 5, // 2: DBViking.ps:type_name -> DBViking.PsEntry - 6, // 3: DBVikingRank.line:type_name -> LineUp - 6, // 4: DBVSeasonRank.line:type_name -> LineUp - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 2, // 0: DBViking.boss:type_name -> DBViking.BossEntry + 3, // 1: DBViking.bossTime:type_name -> DBViking.BossTimeEntry + 4, // 2: DBViking.ps:type_name -> DBViking.PsEntry + 5, // 3: DBVikingRank.line:type_name -> LineUp + 4, // [4:4] is the sub-list for method output_type + 4, // [4:4] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 4, // [4:4] is the sub-list for extension extendee + 0, // [0:4] is the sub-list for field type_name } func init() { file_viking_viking_db_proto_init() } @@ -469,18 +331,6 @@ func file_viking_viking_db_proto_init() { return nil } } - file_viking_viking_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBVSeasonRank); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -488,7 +338,7 @@ func file_viking_viking_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_viking_viking_db_proto_rawDesc, NumEnums: 0, - NumMessages: 6, + NumMessages: 5, NumExtensions: 0, NumServices: 0, },