From 24067fdc01c6e031f3e06b3eaf3ef7bc5ac2554e Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 14 Jun 2023 09:13:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/buried/module.go | 15 ++++++++++++--- modules/equipment/module.go | 2 +- modules/shop/api_buy.go | 5 ++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/modules/buried/module.go b/modules/buried/module.go index 8371d5fd5..75f31da38 100644 --- a/modules/buried/module.go +++ b/modules/buried/module.go @@ -136,12 +136,16 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) { //激活数据采集点 func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.ConIProgress, err error) { var ( + model *buriedModel bdatas *pb.DBBuried conf *cfg.GameBuriedCondiData bdata *pb.DBBuriedItem ok bool ) - if bdatas, err = this.modelBuried.getUserBurieds(uid); err != nil { + if model, err = this.modelBuried.getburiedModel(uid); err != nil { + return + } + if bdatas, err = model.getUserBurieds(uid); err != nil { return } condis = make([]*pb.ConIProgress, 0) @@ -194,6 +198,7 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb. //设置任务完成状态并校验 func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32, condiIds ...int32) (condis []*pb.ConIProgress, err error) { var ( + model *buriedModel bdatas *pb.DBBuried bitem *pb.DBBuriedConItem conf *cfg.GameBuriedCondiData @@ -201,7 +206,11 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32, chanage bool bdata *pb.DBBuriedItem ) - if bdatas, err = this.modelBuried.getUserBurieds(uid); err != nil { + + if model, err = this.modelBuried.getburiedModel(uid); err != nil { + return + } + if bdatas, err = model.getUserBurieds(uid); err != nil { return } @@ -323,7 +332,7 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32, } if chanage { - if err = this.modelBuried.updateUserBurieds(uid, bdatas); err != nil { + if err = model.updateUserBurieds(uid, bdatas); err != nil { this.Error("更新用户埋点数据错误!", log.Field{Key: "err", Value: err.Error()}) return } diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 828f032a7..7eb4bd30b 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -491,7 +491,7 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), + Message: fmt.Sprintf("no fond pos:%d intlv:%d", pos, lv), } return } else { diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index 15d7b41b2..83c335577 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -112,9 +112,8 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata } if conf.Buyminnum-record.Buy[req.GoodsId] < req.BuyNum { errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ShopGoodsIsSoldOut, - Title: pb.ErrorCode_ShopGoodsIsSoldOut.ToString(), - Message: err.Error(), + Code: pb.ErrorCode_ShopGoodsIsSoldOut, + Title: pb.ErrorCode_ShopGoodsIsSoldOut.ToString(), } return } From 3abfdec8aac5e3269995f4b57767354d2cd7d977 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 14 Jun 2023 09:20:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0db=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys/db/dbmodel.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/db/dbmodel.go b/sys/db/dbmodel.go index e212e3dbd..62ba11183 100644 --- a/sys/db/dbmodel.go +++ b/sys/db/dbmodel.go @@ -81,7 +81,7 @@ func (this *DBModel) InsertModelLogs(table string, uID string, target interface{ _, err = this.DB.InsertOne(DB_ModelTable, data) if err != nil { - log.Errorf("insert model db err %v", err) + log.Errorf("table:%s insert model db err %v", this.TableName, err) } return err @@ -104,7 +104,7 @@ func (this *DBModel) InsertManyModelLogs(table string, datas map[string]interfac _, err = this.DB.InsertMany(DB_ModelTable, data) if err != nil { - log.Errorf("insert model db err %v", err) + log.Errorf("table:%s insert model db err %v", this.TableName, err) } return err } @@ -122,7 +122,7 @@ func (this *DBModel) DeleteModelLogs(table string, uID string, where interface{} _, err = this.DB.InsertOne(DB_ModelTable, data) if err != nil { - log.Errorf("insert model db err %v", err) + log.Errorf("table:%s insert model db err %v", this.TableName, err) } return err @@ -141,7 +141,7 @@ func (this *DBModel) UpdateModelLogs(table string, uID string, where bson.M, tar _, err = this.DB.InsertOne(DB_ModelTable, data) if err != nil { - log.Errorf("insert model db err %v", err) + log.Errorf("table:%s insert model db err %v", this.TableName, err) } return err From 5cdac676ada2fab973097be9071571651eda31ee Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Wed, 14 Jun 2023 10:08:34 +0800 Subject: [PATCH 3/5] update config --- bin/json/game_buriedcondi.json | 6 +- bin/json/game_worldtask.json | 798 ++++++++++++++------------ modules/sociaty/api_cross_tasklist.go | 3 +- 3 files changed, 421 insertions(+), 386 deletions(-) diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index d755b866c..f30901894 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -17171,7 +17171,7 @@ ], "filter2": [ "英雄ID", - "0", + "装备数量", "0", "0" ] @@ -17519,7 +17519,7 @@ }, "type": 41, "valid": 0, - "NPC": 10264, + "NPC": 0, "value": 1, "filter": [ 3 @@ -17543,7 +17543,7 @@ }, "type": 43, "valid": 0, - "NPC": 10274, + "NPC": 0, "value": 3, "filter": [ 6 diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 8fb4f2791..ccbd7cb28 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -4,12 +4,12 @@ "lock": 1, "lockend": 0, "ontxe": 0, - "id_after": 20020, + "id_after": 20011, "group": 10, "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_1", + "key": "worldtask_world_story_task_name_1", "text": "剧情（月光交互、移动教学）" }, "task_details": { @@ -17,7 +17,7 @@ "text": "剧情（月光交互、移动教学）" }, "npctxt": { - "key": "worldtask_world_task_npctxt_1", + "key": "worldtask_world_story_npctxt_1", "text": "剧情（月光交互、移动教学）" }, "npc": 10010, @@ -35,25 +35,61 @@ ], "module": [] }, + { + "key": 20011, + "lock": 1, + "lockend": 1, + "ontxe": 20010, + "id_after": 20020, + "group": 10, + "des": 2, + "icon": "", + "task_name": { + "key": "worldtask_world_story_task_name_2", + "text": "和阿宝对话" + }, + "task_details": { + "key": "worldtask_world_story_task_details_2", + "text": "和阿宝对话" + }, + "npctxt": { + "key": "worldtask_world_story_npctxt_2", + "text": "和阿宝对话" + }, + "npc": 100101, + "completetask": [ + 0 + ], + "deliver_npc": 0, + "auto_accept": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + } + ], + "module": [] + }, { "key": 20020, "lock": 1, "lockend": 0, - "ontxe": 20010, + "ontxe": 20011, "id_after": 20030, "group": 10, "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_2", + "key": "worldtask_world_story_task_name_3", "text": "剧情（战斗1 小怪）" }, "task_details": { - "key": "worldtask_world_task_task_details_2", + "key": "worldtask_world_story_task_details_3", "text": "剧情（战斗1 小怪）" }, "npctxt": { - "key": "worldtask_world_task_npctxt_2", + "key": "worldtask_world_story_npctxt_3", "text": "剧情（战斗1 小怪）" }, "npc": 10020, @@ -61,7 +97,7 @@ 12070020 ], "deliver_npc": 10028, - "auto_accept": 0, + "auto_accept": 1, "reword": [ { "a": "attr", @@ -81,15 +117,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_3", + "key": "worldtask_world_story_task_name_4", "text": "剧情（战斗2 邦尼兔）" }, "task_details": { - "key": "worldtask_world_task_task_details_3", + "key": "worldtask_world_story_task_details_4", "text": "剧情（战斗2 邦尼兔）" }, "npctxt": { - "key": "worldtask_world_task_npctxt_3", + "key": "worldtask_world_story_npctxt_4", "text": "剧情（战斗2 邦尼兔）" }, "npc": 10030, @@ -117,15 +153,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_4", + "key": "worldtask_world_story_task_name_5", "text": "剧情（战斗3 邦尼兔）" }, "task_details": { - "key": "worldtask_world_task_task_details_4", + "key": "worldtask_world_story_task_details_5", "text": "剧情（战斗3 邦尼兔）" }, "npctxt": { - "key": "worldtask_world_task_npctxt_4", + "key": "worldtask_world_story_npctxt_5", "text": "剧情（战斗3 邦尼兔）" }, "npc": 10040, @@ -133,7 +169,7 @@ 12070040 ], "deliver_npc": 0, - "auto_accept": 0, + "auto_accept": 1, "reword": [ { "a": "attr", @@ -153,15 +189,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_5", + "key": "worldtask_world_story_task_name_6", "text": "剧情（战斗4 恐惧灵）" }, "task_details": { - "key": "worldtask_world_task_task_details_5", + "key": "worldtask_world_story_task_details_6", "text": "剧情（战斗4 恐惧灵）" }, "npctxt": { - "key": "worldtask_world_task_npctxt_5", + "key": "worldtask_world_story_npctxt_6", "text": "剧情（战斗4 恐惧灵）" }, "npc": 10050, @@ -189,15 +225,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_6", + "key": "worldtask_world_story_task_name_7", "text": "单抽" }, "task_details": { - "key": "worldtask_world_task_task_details_6", + "key": "worldtask_world_story_task_details_7", "text": "单抽" }, "npctxt": { - "key": "worldtask_world_task_npctxt_6", + "key": "worldtask_world_story_npctxt_7", "text": "单抽" }, "npc": 10060, @@ -225,15 +261,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_7", + "key": "worldtask_world_story_task_name_8", "text": "剧情（战斗5 浣熊师傅）" }, "task_details": { - "key": "worldtask_world_task_task_details_7", + "key": "worldtask_world_story_task_details_8", "text": "剧情（战斗5 浣熊师傅）" }, "npctxt": { - "key": "worldtask_world_task_npctxt_7", + "key": "worldtask_world_story_npctxt_8", "text": "剧情（战斗5 浣熊师傅）" }, "npc": 10070, @@ -261,15 +297,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_8", + "key": "worldtask_world_story_task_name_9", "text": "木桩" }, "task_details": { - "key": "worldtask_world_task_task_details_8", + "key": "worldtask_world_story_task_details_9", "text": "木桩" }, "npctxt": { - "key": "worldtask_world_task_npctxt_8", + "key": "worldtask_world_story_npctxt_9", "text": "木桩" }, "npc": 10080, @@ -299,15 +335,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_9", + "key": "worldtask_world_story_task_name_10", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_9", + "key": "worldtask_world_story_task_details_10", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_9", + "key": "worldtask_world_story_npctxt_10", "text": "剧情" }, "npc": 10090, @@ -335,15 +371,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_10", + "key": "worldtask_world_story_task_name_11", "text": "主线【1-1】-【1-3】" }, "task_details": { - "key": "worldtask_world_task_task_details_10", + "key": "worldtask_world_story_task_details_11", "text": "主线【1-1】-【1-3】" }, "npctxt": { - "key": "worldtask_world_task_npctxt_10", + "key": "worldtask_world_story_npctxt_11", "text": "主线【1-1】-【1-3】" }, "npc": 10100, @@ -371,15 +407,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_11", + "key": "worldtask_world_story_task_name_12", "text": "给阿宝传5件装备" }, "task_details": { - "key": "worldtask_world_task_task_details_11", + "key": "worldtask_world_story_task_details_12", "text": "给阿宝传5件装备" }, "npctxt": { - "key": "worldtask_world_task_npctxt_11", + "key": "worldtask_world_story_npctxt_12", "text": "给阿宝传5件装备" }, "npc": 10110, @@ -407,15 +443,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_12", + "key": "worldtask_world_story_task_name_13", "text": "主线【1-4】-【1-7】" }, "task_details": { - "key": "worldtask_world_task_task_details_12", + "key": "worldtask_world_story_task_details_13", "text": "主线【1-4】-【1-7】" }, "npctxt": { - "key": "worldtask_world_task_npctxt_12", + "key": "worldtask_world_story_npctxt_13", "text": "主线【1-4】-【1-7】" }, "npc": 10120, @@ -443,15 +479,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_13", + "key": "worldtask_world_story_task_name_14", "text": "维京远征boss1难度1" }, "task_details": { - "key": "worldtask_world_task_task_details_13", + "key": "worldtask_world_story_task_details_14", "text": "维京远征boss1难度1" }, "npctxt": { - "key": "worldtask_world_task_npctxt_13", + "key": "worldtask_world_story_npctxt_14", "text": "维京远征boss1难度1" }, "npc": 10130, @@ -479,15 +515,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_14", + "key": "worldtask_world_story_task_name_15", "text": "定制1件装备" }, "task_details": { - "key": "worldtask_world_task_task_details_14", + "key": "worldtask_world_story_task_details_15", "text": "定制1件装备" }, "npctxt": { - "key": "worldtask_world_task_npctxt_14", + "key": "worldtask_world_story_npctxt_15", "text": "定制1件装备" }, "npc": 10140, @@ -515,15 +551,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_15", + "key": "worldtask_world_story_task_name_16", "text": "穿戴无极神功4件套" }, "task_details": { - "key": "worldtask_world_task_task_details_15", + "key": "worldtask_world_story_task_details_16", "text": "穿戴无极神功4件套" }, "npctxt": { - "key": "worldtask_world_task_npctxt_15", + "key": "worldtask_world_story_npctxt_16", "text": "穿戴无极神功4件套" }, "npc": 10150, @@ -551,15 +587,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_16", + "key": "worldtask_world_story_task_name_17", "text": "3件装备+3" }, "task_details": { - "key": "worldtask_world_task_task_details_16", + "key": "worldtask_world_story_task_details_17", "text": "3件装备+3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_16", + "key": "worldtask_world_story_npctxt_17", "text": "3件装备+3" }, "npc": 10160, @@ -587,15 +623,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_17", + "key": "worldtask_world_story_task_name_18", "text": "主线【1-8】" }, "task_details": { - "key": "worldtask_world_task_task_details_17", + "key": "worldtask_world_story_task_details_18", "text": "主线【1-8】" }, "npctxt": { - "key": "worldtask_world_task_npctxt_17", + "key": "worldtask_world_story_npctxt_18", "text": "主线【1-8】" }, "npc": 10170, @@ -623,15 +659,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_18", + "key": "worldtask_world_story_task_name_19", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_18", + "key": "worldtask_world_story_task_details_19", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_18", + "key": "worldtask_world_story_npctxt_19", "text": "剧情" }, "npc": 10180, @@ -659,15 +695,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_19", + "key": "worldtask_world_story_task_name_20", "text": "十连" }, "task_details": { - "key": "worldtask_world_task_task_details_19", + "key": "worldtask_world_story_task_details_20", "text": "十连" }, "npctxt": { - "key": "worldtask_world_task_npctxt_19", + "key": "worldtask_world_story_npctxt_20", "text": "十连" }, "npc": 10190, @@ -695,15 +731,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_20", + "key": "worldtask_world_story_task_name_21", "text": "战斗6" }, "task_details": { - "key": "worldtask_world_task_task_details_20", + "key": "worldtask_world_story_task_details_21", "text": "战斗6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_20", + "key": "worldtask_world_story_npctxt_21", "text": "战斗6" }, "npc": 10200, @@ -731,15 +767,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_21", + "key": "worldtask_world_story_task_name_22", "text": "战斗7" }, "task_details": { - "key": "worldtask_world_task_task_details_21", + "key": "worldtask_world_story_task_details_22", "text": "战斗7" }, "npctxt": { - "key": "worldtask_world_task_npctxt_21", + "key": "worldtask_world_story_npctxt_22", "text": "战斗7" }, "npc": 10210, @@ -767,15 +803,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_22", + "key": "worldtask_world_story_task_name_23", "text": "战斗" }, "task_details": { - "key": "worldtask_world_task_task_details_22", + "key": "worldtask_world_story_task_details_23", "text": "战斗" }, "npctxt": { - "key": "worldtask_world_task_npctxt_22", + "key": "worldtask_world_story_npctxt_23", "text": "战斗" }, "npc": 10220, @@ -795,7 +831,7 @@ }, { "key": 20230, - "lock": 2, + "lock": 1, "lockend": 0, "ontxe": 20220, "id_after": 20240, @@ -803,15 +839,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_23", + "key": "worldtask_world_story_task_name_24", "text": "解锁木人桩" }, "task_details": { - "key": "worldtask_world_task_task_details_23", + "key": "worldtask_world_story_task_details_24", "text": "解锁木人桩" }, "npctxt": { - "key": "worldtask_world_task_npctxt_23", + "key": "worldtask_world_story_npctxt_24", "text": "解锁木人桩" }, "npc": 10230, @@ -831,7 +867,7 @@ }, { "key": 20240, - "lock": 2, + "lock": 1, "lockend": 0, "ontxe": 20230, "id_after": 20250, @@ -839,15 +875,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_24", + "key": "worldtask_world_story_task_name_25", "text": "功夫大师挑战塔3层" }, "task_details": { - "key": "worldtask_world_task_task_details_24", + "key": "worldtask_world_story_task_details_25", "text": "功夫大师挑战塔3层" }, "npctxt": { - "key": "worldtask_world_task_npctxt_24", + "key": "worldtask_world_story_npctxt_25", "text": "功夫大师挑战塔3层" }, "npc": 10240, @@ -867,7 +903,7 @@ }, { "key": 20250, - "lock": 2, + "lock": 1, "lockend": 0, "ontxe": 20240, "id_after": 20260, @@ -875,15 +911,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_25", + "key": "worldtask_world_story_task_name_26", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_25", + "key": "worldtask_world_story_task_details_26", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_25", + "key": "worldtask_world_story_npctxt_26", "text": "剧情" }, "npc": 10250, @@ -903,7 +939,7 @@ }, { "key": 20260, - "lock": 2, + "lock": 1, "lockend": 0, "ontxe": 20250, "id_after": 20270, @@ -911,15 +947,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_26", + "key": "worldtask_world_story_task_name_27", "text": "穿戴装备" }, "task_details": { - "key": "worldtask_world_task_task_details_26", + "key": "worldtask_world_story_task_details_27", "text": "穿戴6件SR装备" }, "npctxt": { - "key": "worldtask_world_task_npctxt_26", + "key": "worldtask_world_story_npctxt_27", "text": "穿戴6件SR装备" }, "npc": 10260, @@ -939,7 +975,7 @@ }, { "key": 20270, - "lock": 2, + "lock": 1, "lockend": 0, "ontxe": 20260, "id_after": 20280, @@ -947,15 +983,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_27", + "key": "worldtask_world_story_task_name_28", "text": "3件装备+6" }, "task_details": { - "key": "worldtask_world_task_task_details_27", + "key": "worldtask_world_story_task_details_28", "text": "3件装备+6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_27", + "key": "worldtask_world_story_npctxt_28", "text": "3件装备+6" }, "npc": 10270, @@ -975,7 +1011,7 @@ }, { "key": 20280, - "lock": 2, + "lock": 1, "lockend": 0, "ontxe": 20270, "id_after": 20290, @@ -983,15 +1019,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_28", + "key": "worldtask_world_story_task_name_29", "text": "主线【2-1】-【2-8】" }, "task_details": { - "key": "worldtask_world_task_task_details_28", + "key": "worldtask_world_story_task_details_29", "text": "主线【2-1】-【2-8】" }, "npctxt": { - "key": "worldtask_world_task_npctxt_28", + "key": "worldtask_world_story_npctxt_29", "text": "主线【2-1】-【2-8】" }, "npc": 10280, @@ -1011,7 +1047,7 @@ }, { "key": 20290, - "lock": 2, + "lock": 1, "lockend": 0, "ontxe": 20280, "id_after": 0, @@ -1019,15 +1055,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_29", + "key": "worldtask_world_story_task_name_30", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_29", + "key": "worldtask_world_story_task_details_30", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_29", + "key": "worldtask_world_story_npctxt_30", "text": "剧情" }, "npc": 10290, @@ -1049,7 +1085,7 @@ }, { "key": 20300, - "lock": 3, + "lock": 1, "lockend": 0, "ontxe": 20290, "id_after": 20310, @@ -1057,15 +1093,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_30", + "key": "worldtask_world_story_task_name_31", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_30", + "key": "worldtask_world_story_task_details_31", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_30", + "key": "worldtask_world_story_npctxt_31", "text": "剧情" }, "npc": 10300, @@ -1085,7 +1121,7 @@ }, { "key": 20310, - "lock": 3, + "lock": 1, "lockend": 0, "ontxe": 20300, "id_after": 20320, @@ -1093,15 +1129,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_31", + "key": "worldtask_world_story_task_name_32", "text": "维京远征boss2难度1" }, "task_details": { - "key": "worldtask_world_task_task_details_31", + "key": "worldtask_world_story_task_details_32", "text": "维京远征boss2难度1" }, "npctxt": { - "key": "worldtask_world_task_npctxt_31", + "key": "worldtask_world_story_npctxt_32", "text": "维京远征boss2难度1" }, "npc": 10310, @@ -1121,7 +1157,7 @@ }, { "key": 20320, - "lock": 3, + "lock": 1, "lockend": 0, "ontxe": 20310, "id_after": 20330, @@ -1129,15 +1165,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_32", + "key": "worldtask_world_story_task_name_33", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_32", + "key": "worldtask_world_story_task_details_33", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_32", + "key": "worldtask_world_story_npctxt_33", "text": "剧情" }, "npc": 10320, @@ -1157,7 +1193,7 @@ }, { "key": 20330, - "lock": 3, + "lock": 1, "lockend": 0, "ontxe": 20320, "id_after": 20340, @@ -1165,15 +1201,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_33", + "key": "worldtask_world_story_task_name_34", "text": "主线【3-1】-【3-4】" }, "task_details": { - "key": "worldtask_world_task_task_details_33", + "key": "worldtask_world_story_task_details_34", "text": "主线【3-1】-【3-4】" }, "npctxt": { - "key": "worldtask_world_task_npctxt_33", + "key": "worldtask_world_story_npctxt_34", "text": "主线【3-1】-【3-4】" }, "npc": 10330, @@ -1193,7 +1229,7 @@ }, { "key": 20340, - "lock": 3, + "lock": 1, "lockend": 0, "ontxe": 20330, "id_after": 20350, @@ -1201,15 +1237,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_34", + "key": "worldtask_world_story_task_name_35", "text": "装备副本boss1难度2刷1次" }, "task_details": { - "key": "worldtask_world_task_task_details_34", + "key": "worldtask_world_story_task_details_35", "text": "装备副本boss1难度2刷1次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_34", + "key": "worldtask_world_story_npctxt_35", "text": "装备副本boss1难度2刷1次" }, "npc": 10340, @@ -1229,7 +1265,7 @@ }, { "key": 20350, - "lock": 3, + "lock": 1, "lockend": 0, "ontxe": 20340, "id_after": 20360, @@ -1237,15 +1273,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_35", + "key": "worldtask_world_story_task_name_36", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_35", + "key": "worldtask_world_story_task_details_36", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_35", + "key": "worldtask_world_story_npctxt_36", "text": "剧情" }, "npc": 10350, @@ -1265,7 +1301,7 @@ }, { "key": 20360, - "lock": 3, + "lock": 1, "lockend": 0, "ontxe": 20350, "id_after": 0, @@ -1273,15 +1309,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_36", + "key": "worldtask_world_story_task_name_37", "text": "主线【3-5】-【3-8】" }, "task_details": { - "key": "worldtask_world_task_task_details_36", + "key": "worldtask_world_story_task_details_37", "text": "主线【3-5】-【3-8】" }, "npctxt": { - "key": "worldtask_world_task_npctxt_36", + "key": "worldtask_world_story_npctxt_37", "text": "主线【3-5】-【3-8】" }, "npc": 10360, @@ -1301,7 +1337,7 @@ }, { "key": 20370, - "lock": 4, + "lock": 1, "lockend": 0, "ontxe": 20360, "id_after": 20380, @@ -1309,15 +1345,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_37", + "key": "worldtask_world_story_task_name_38", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_37", + "key": "worldtask_world_story_task_details_38", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_37", + "key": "worldtask_world_story_npctxt_38", "text": "剧情" }, "npc": 10370, @@ -1337,7 +1373,7 @@ }, { "key": 20380, - "lock": 4, + "lock": 1, "lockend": 0, "ontxe": 20370, "id_after": 20390, @@ -1345,15 +1381,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_38", + "key": "worldtask_world_story_task_name_39", "text": "战斗18" }, "task_details": { - "key": "worldtask_world_task_task_details_38", + "key": "worldtask_world_story_task_details_39", "text": "战斗18" }, "npctxt": { - "key": "worldtask_world_task_npctxt_38", + "key": "worldtask_world_story_npctxt_39", "text": "战斗18" }, "npc": 10380, @@ -1373,7 +1409,7 @@ }, { "key": 20390, - "lock": 4, + "lock": 1, "lockend": 0, "ontxe": 20380, "id_after": 20400, @@ -1381,15 +1417,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_39", + "key": "worldtask_world_story_task_name_40", "text": "星座图1次" }, "task_details": { - "key": "worldtask_world_task_task_details_39", + "key": "worldtask_world_story_task_details_40", "text": "星座图1次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_39", + "key": "worldtask_world_story_npctxt_40", "text": "星座图1次" }, "npc": 10390, @@ -1409,7 +1445,7 @@ }, { "key": 20400, - "lock": 4, + "lock": 1, "lockend": 0, "ontxe": 20390, "id_after": 20410, @@ -1417,15 +1453,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_40", + "key": "worldtask_world_story_task_name_41", "text": "维京远征boss1难度2" }, "task_details": { - "key": "worldtask_world_task_task_details_40", + "key": "worldtask_world_story_task_details_41", "text": "维京远征boss1难度2" }, "npctxt": { - "key": "worldtask_world_task_npctxt_40", + "key": "worldtask_world_story_npctxt_41", "text": "维京远征boss2难度6" }, "npc": 10400, @@ -1445,7 +1481,7 @@ }, { "key": 20410, - "lock": 4, + "lock": 1, "lockend": 0, "ontxe": 20400, "id_after": 20420, @@ -1453,15 +1489,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_41", + "key": "worldtask_world_story_task_name_42", "text": "9件装备强化+6" }, "task_details": { - "key": "worldtask_world_task_task_details_41", + "key": "worldtask_world_story_task_details_42", "text": "9件装备强化+6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_41", + "key": "worldtask_world_story_npctxt_42", "text": "9件装备强化+6" }, "npc": 10410, @@ -1481,7 +1517,7 @@ }, { "key": 20420, - "lock": 4, + "lock": 1, "lockend": 0, "ontxe": 20410, "id_after": 20430, @@ -1489,15 +1525,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_42", + "key": "worldtask_world_story_task_name_43", "text": "战斗21" }, "task_details": { - "key": "worldtask_world_task_task_details_42", + "key": "worldtask_world_story_task_details_43", "text": "战斗21" }, "npctxt": { - "key": "worldtask_world_task_npctxt_42", + "key": "worldtask_world_story_npctxt_43", "text": "战斗21" }, "npc": 10420, @@ -1517,7 +1553,7 @@ }, { "key": 20430, - "lock": 4, + "lock": 1, "lockend": 0, "ontxe": 20420, "id_after": 0, @@ -1525,15 +1561,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_43", + "key": "worldtask_world_story_task_name_44", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_43", + "key": "worldtask_world_story_task_details_44", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_43", + "key": "worldtask_world_story_npctxt_44", "text": "剧情" }, "npc": 10430, @@ -1561,15 +1597,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_44", + "key": "worldtask_world_story_task_name_45", "text": "战斗16" }, "task_details": { - "key": "worldtask_world_task_task_details_44", + "key": "worldtask_world_story_task_details_45", "text": "战斗16" }, "npctxt": { - "key": "worldtask_world_task_npctxt_44", + "key": "worldtask_world_story_npctxt_45", "text": "战斗16" }, "npc": 10440, @@ -1597,15 +1633,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_45", + "key": "worldtask_world_story_task_name_46", "text": "维京远征boss2难度1" }, "task_details": { - "key": "worldtask_world_task_task_details_45", + "key": "worldtask_world_story_task_details_46", "text": "维京远征boss2难度1" }, "npctxt": { - "key": "worldtask_world_task_npctxt_45", + "key": "worldtask_world_story_npctxt_46", "text": "维京远征boss2难度1" }, "npc": 10450, @@ -1633,15 +1669,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_46", + "key": "worldtask_world_story_task_name_47", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_46", + "key": "worldtask_world_story_task_details_47", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_46", + "key": "worldtask_world_story_npctxt_47", "text": "剧情" }, "npc": 10460, @@ -1669,15 +1705,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_47", + "key": "worldtask_world_story_task_name_48", "text": "强化装备" }, "task_details": { - "key": "worldtask_world_task_task_details_47", + "key": "worldtask_world_story_task_details_48", "text": "强化装备" }, "npctxt": { - "key": "worldtask_world_task_npctxt_47", + "key": "worldtask_world_story_npctxt_48", "text": "强化装备" }, "npc": 10470, @@ -1705,15 +1741,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_48", + "key": "worldtask_world_story_task_name_49", "text": "主线【3-1】-【3-4】" }, "task_details": { - "key": "worldtask_world_task_task_details_48", + "key": "worldtask_world_story_task_details_49", "text": "主线【3-1】-【3-4】" }, "npctxt": { - "key": "worldtask_world_task_npctxt_48", + "key": "worldtask_world_story_npctxt_49", "text": "主线【3-1】-【3-4】" }, "npc": 10480, @@ -1741,15 +1777,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_49", + "key": "worldtask_world_story_task_name_50", "text": "装备副本boss2难度2刷1次" }, "task_details": { - "key": "worldtask_world_task_task_details_49", + "key": "worldtask_world_story_task_details_50", "text": "装备副本boss2难度2刷1次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_49", + "key": "worldtask_world_story_npctxt_50", "text": "装备副本boss2难度2刷1次" }, "npc": 10490, @@ -1777,15 +1813,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_50", + "key": "worldtask_world_story_task_name_51", "text": "主线【3-5】-【3-8】" }, "task_details": { - "key": "worldtask_world_task_task_details_50", + "key": "worldtask_world_story_task_details_51", "text": "主线【3-5】-【3-8】" }, "npctxt": { - "key": "worldtask_world_task_npctxt_50", + "key": "worldtask_world_story_npctxt_51", "text": "主线【3-5】-【3-8】" }, "npc": 10500, @@ -1813,15 +1849,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_51", + "key": "worldtask_world_story_task_name_52", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_51", + "key": "worldtask_world_story_task_details_52", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_51", + "key": "worldtask_world_story_npctxt_52", "text": "剧情" }, "npc": 10510, @@ -1849,15 +1885,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_52", + "key": "worldtask_world_story_task_name_53", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_52", + "key": "worldtask_world_story_task_details_53", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_52", + "key": "worldtask_world_story_npctxt_53", "text": "剧情" }, "npc": 10520, @@ -1885,15 +1921,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_53", + "key": "worldtask_world_story_task_name_54", "text": "功夫大师挑战塔5层" }, "task_details": { - "key": "worldtask_world_task_task_details_53", + "key": "worldtask_world_story_task_details_54", "text": "功夫大师挑战塔5层" }, "npctxt": { - "key": "worldtask_world_task_npctxt_53", + "key": "worldtask_world_story_npctxt_54", "text": "功夫大师挑战塔5层" }, "npc": 10530, @@ -1921,15 +1957,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_54", + "key": "worldtask_world_story_task_name_55", "text": "战斗17" }, "task_details": { - "key": "worldtask_world_task_task_details_54", + "key": "worldtask_world_story_task_details_55", "text": "战斗17" }, "npctxt": { - "key": "worldtask_world_task_npctxt_54", + "key": "worldtask_world_story_npctxt_55", "text": "战斗17" }, "npc": 10540, @@ -1957,15 +1993,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_55", + "key": "worldtask_world_story_task_name_56", "text": "战斗18" }, "task_details": { - "key": "worldtask_world_task_task_details_55", + "key": "worldtask_world_story_task_details_56", "text": "战斗18" }, "npctxt": { - "key": "worldtask_world_task_npctxt_55", + "key": "worldtask_world_story_npctxt_56", "text": "战斗18" }, "npc": 10550, @@ -1993,15 +2029,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_56", + "key": "worldtask_world_story_task_name_57", "text": "战斗19" }, "task_details": { - "key": "worldtask_world_task_task_details_56", + "key": "worldtask_world_story_task_details_57", "text": "战斗19" }, "npctxt": { - "key": "worldtask_world_task_npctxt_56", + "key": "worldtask_world_story_npctxt_57", "text": "战斗19" }, "npc": 10560, @@ -2029,15 +2065,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_57", + "key": "worldtask_world_story_task_name_58", "text": "装备副本boss3难度1(开支线，打狩猎)" }, "task_details": { - "key": "worldtask_world_task_task_details_57", + "key": "worldtask_world_story_task_details_58", "text": "装备副本boss3难度1(开支线，打狩猎)" }, "npctxt": { - "key": "worldtask_world_task_npctxt_57", + "key": "worldtask_world_story_npctxt_58", "text": "装备副本boss3难度1(开支线，打狩猎)" }, "npc": 10570, @@ -2065,15 +2101,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_58", + "key": "worldtask_world_story_task_name_59", "text": "主角星座觉醒3次" }, "task_details": { - "key": "worldtask_world_task_task_details_58", + "key": "worldtask_world_story_task_details_59", "text": "主角星座觉醒3次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_58", + "key": "worldtask_world_story_npctxt_59", "text": "主角星座觉醒3次" }, "npc": 10580, @@ -2101,15 +2137,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_59", + "key": "worldtask_world_story_task_name_60", "text": "9件装备强化+6" }, "task_details": { - "key": "worldtask_world_task_task_details_59", + "key": "worldtask_world_story_task_details_60", "text": "9件装备强化+6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_59", + "key": "worldtask_world_story_npctxt_60", "text": "9件装备强化+6" }, "npc": 10590, @@ -2137,15 +2173,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_60", + "key": "worldtask_world_story_task_name_61", "text": "战斗20" }, "task_details": { - "key": "worldtask_world_task_task_details_60", + "key": "worldtask_world_story_task_details_61", "text": "战斗20" }, "npctxt": { - "key": "worldtask_world_task_npctxt_60", + "key": "worldtask_world_story_npctxt_61", "text": "战斗20" }, "npc": 10600, @@ -2173,15 +2209,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_61", + "key": "worldtask_world_story_task_name_62", "text": "战斗21" }, "task_details": { - "key": "worldtask_world_task_task_details_61", + "key": "worldtask_world_story_task_details_62", "text": "战斗21" }, "npctxt": { - "key": "worldtask_world_task_npctxt_61", + "key": "worldtask_world_story_npctxt_62", "text": "战斗21" }, "npc": 10610, @@ -2209,15 +2245,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_62", + "key": "worldtask_world_story_task_name_63", "text": "剧情" }, "task_details": { - "key": "worldtask_world_task_task_details_62", + "key": "worldtask_world_story_task_details_63", "text": "剧情" }, "npctxt": { - "key": "worldtask_world_task_npctxt_62", + "key": "worldtask_world_story_npctxt_63", "text": "剧情" }, "npc": 10620, @@ -2245,15 +2281,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_63", + "key": "worldtask_world_story_task_name_64", "text": "主线【4-1】-【4-8】" }, "task_details": { - "key": "worldtask_world_task_task_details_63", + "key": "worldtask_world_story_task_details_64", "text": "主线【4-1】-【4-8】" }, "npctxt": { - "key": "worldtask_world_task_npctxt_63", + "key": "worldtask_world_story_npctxt_64", "text": "主线【4-1】-【4-8】" }, "npc": 10630, @@ -2281,15 +2317,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_64", + "key": "worldtask_world_story_task_name_65", "text": "装备副本boss3难度1刷1次" }, "task_details": { - "key": "worldtask_world_task_task_details_64", + "key": "worldtask_world_story_task_details_65", "text": "装备副本boss3难度1刷1次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_64", + "key": "worldtask_world_story_npctxt_65", "text": "装备副本boss3难度1刷1次" }, "npc": 10640, @@ -2317,15 +2353,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_65", + "key": "worldtask_world_story_task_name_66", "text": "12件装备强化+6" }, "task_details": { - "key": "worldtask_world_task_task_details_65", + "key": "worldtask_world_story_task_details_66", "text": "12件装备强化+6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_65", + "key": "worldtask_world_story_npctxt_66", "text": "12件装备强化+6" }, "npc": 10650, @@ -2353,15 +2389,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_66", + "key": "worldtask_world_story_task_name_67", "text": "武馆木桩解锁3根" }, "task_details": { - "key": "worldtask_world_task_task_details_66", + "key": "worldtask_world_story_task_details_67", "text": "武馆木桩解锁3根" }, "npctxt": { - "key": "worldtask_world_task_npctxt_66", + "key": "worldtask_world_story_npctxt_67", "text": "武馆木桩解锁3根" }, "npc": 10660, @@ -2389,15 +2425,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_67", + "key": "worldtask_world_story_task_name_68", "text": "功夫大师挑战塔10层" }, "task_details": { - "key": "worldtask_world_task_task_details_67", + "key": "worldtask_world_story_task_details_68", "text": "功夫大师挑战塔10层" }, "npctxt": { - "key": "worldtask_world_task_npctxt_67", + "key": "worldtask_world_story_npctxt_68", "text": "功夫大师挑战塔10层" }, "npc": 10670, @@ -2425,15 +2461,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_68", + "key": "worldtask_world_story_task_name_69", "text": "关卡【5-1】-【5-8】" }, "task_details": { - "key": "worldtask_world_task_task_details_68", + "key": "worldtask_world_story_task_details_69", "text": "关卡【5-1】-【5-8】" }, "npctxt": { - "key": "worldtask_world_task_npctxt_68", + "key": "worldtask_world_story_npctxt_69", "text": "关卡【5-1】-【5-8】" }, "npc": 10680, @@ -2461,15 +2497,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_69", + "key": "worldtask_world_story_task_name_70", "text": "战斗22" }, "task_details": { - "key": "worldtask_world_task_task_details_69", + "key": "worldtask_world_story_task_details_70", "text": "战斗22" }, "npctxt": { - "key": "worldtask_world_task_npctxt_69", + "key": "worldtask_world_story_npctxt_70", "text": "战斗22" }, "npc": 10690, @@ -2497,15 +2533,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_70", + "key": "worldtask_world_story_task_name_71", "text": "战斗23" }, "task_details": { - "key": "worldtask_world_task_task_details_70", + "key": "worldtask_world_story_task_details_71", "text": "战斗23" }, "npctxt": { - "key": "worldtask_world_task_npctxt_70", + "key": "worldtask_world_story_npctxt_71", "text": "战斗23" }, "npc": 10700, @@ -2533,15 +2569,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_71", + "key": "worldtask_world_story_task_name_72", "text": "穿指定套装2套(从解锁的装备boss套装里选)" }, "task_details": { - "key": "worldtask_world_task_task_details_71", + "key": "worldtask_world_story_task_details_72", "text": "穿指定套装2套(从解锁的装备boss套装里选)" }, "npctxt": { - "key": "worldtask_world_task_npctxt_71", + "key": "worldtask_world_story_npctxt_72", "text": "穿指定套装2套(从解锁的装备boss套装里选)" }, "npc": 10710, @@ -2569,15 +2605,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_72", + "key": "worldtask_world_story_task_name_73", "text": "加入公会" }, "task_details": { - "key": "worldtask_world_task_task_details_72", + "key": "worldtask_world_story_task_details_73", "text": "加入公会" }, "npctxt": { - "key": "worldtask_world_task_npctxt_72", + "key": "worldtask_world_story_npctxt_73", "text": "加入公会" }, "npc": 10720, @@ -2605,15 +2641,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_73", + "key": "worldtask_world_story_task_name_74", "text": "装备副本boss3难度2刷1次" }, "task_details": { - "key": "worldtask_world_task_task_details_73", + "key": "worldtask_world_story_task_details_74", "text": "装备副本boss3难度2刷1次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_73", + "key": "worldtask_world_story_npctxt_74", "text": "装备副本boss3难度2刷1次" }, "npc": 10730, @@ -2641,15 +2677,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_74", + "key": "worldtask_world_story_task_name_75", "text": "装备副本boss3难度5刷2次" }, "task_details": { - "key": "worldtask_world_task_task_details_74", + "key": "worldtask_world_story_task_details_75", "text": "装备副本boss3难度5刷2次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_74", + "key": "worldtask_world_story_npctxt_75", "text": "装备副本boss3难度5刷2次" }, "npc": 10740, @@ -2677,15 +2713,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_75", + "key": "worldtask_world_story_task_name_76", "text": "守护者星座图解锁次数10次" }, "task_details": { - "key": "worldtask_world_task_task_details_75", + "key": "worldtask_world_story_task_details_76", "text": "守护者星座图解锁次数10次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_75", + "key": "worldtask_world_story_npctxt_76", "text": "守护者星座图解锁次数10次" }, "npc": 10750, @@ -2713,15 +2749,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_76", + "key": "worldtask_world_story_task_name_77", "text": "守护者星座图解锁次数15次" }, "task_details": { - "key": "worldtask_world_task_task_details_76", + "key": "worldtask_world_story_task_details_77", "text": "守护者星座图解锁次数15次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_76", + "key": "worldtask_world_story_npctxt_77", "text": "守护者星座图解锁次数15次" }, "npc": 10760, @@ -2749,15 +2785,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_77", + "key": "worldtask_world_story_task_name_78", "text": "关卡6-6" }, "task_details": { - "key": "worldtask_world_task_task_details_77", + "key": "worldtask_world_story_task_details_78", "text": "关卡6-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_77", + "key": "worldtask_world_story_npctxt_78", "text": "关卡6-6" }, "npc": 10770, @@ -2785,15 +2821,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_78", + "key": "worldtask_world_story_task_name_79", "text": "12件装备强化+9" }, "task_details": { - "key": "worldtask_world_task_task_details_78", + "key": "worldtask_world_story_task_details_79", "text": "12件装备强化+9" }, "npctxt": { - "key": "worldtask_world_task_npctxt_78", + "key": "worldtask_world_story_npctxt_79", "text": "12件装备强化+9" }, "npc": 10780, @@ -2821,15 +2857,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_79", + "key": "worldtask_world_story_task_name_80", "text": "竞技场3连胜" }, "task_details": { - "key": "worldtask_world_task_task_details_79", + "key": "worldtask_world_story_task_details_80", "text": "竞技场3连胜" }, "npctxt": { - "key": "worldtask_world_task_npctxt_79", + "key": "worldtask_world_story_npctxt_80", "text": "竞技场3连胜" }, "npc": 10790, @@ -2857,15 +2893,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_80", + "key": "worldtask_world_story_task_name_81", "text": "装备副本boss4难度2刷1次" }, "task_details": { - "key": "worldtask_world_task_task_details_80", + "key": "worldtask_world_story_task_details_81", "text": "装备副本boss4难度2刷1次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_80", + "key": "worldtask_world_story_npctxt_81", "text": "装备副本boss4难度2刷1次" }, "npc": 10800, @@ -2893,15 +2929,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_81", + "key": "worldtask_world_story_task_name_82", "text": "守护者星座图解锁解锁30次" }, "task_details": { - "key": "worldtask_world_task_task_details_81", + "key": "worldtask_world_story_task_details_82", "text": "守护者星座图解锁解锁30次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_81", + "key": "worldtask_world_story_npctxt_82", "text": "守护者星座图解锁解锁30次" }, "npc": 10810, @@ -2929,15 +2965,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_82", + "key": "worldtask_world_story_task_name_83", "text": "关卡7-6" }, "task_details": { - "key": "worldtask_world_task_task_details_82", + "key": "worldtask_world_story_task_details_83", "text": "关卡7-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_82", + "key": "worldtask_world_story_npctxt_83", "text": "关卡7-6" }, "npc": 10820, @@ -2965,15 +3001,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_83", + "key": "worldtask_world_story_task_name_84", "text": "搜集12个4星装备" }, "task_details": { - "key": "worldtask_world_task_task_details_83", + "key": "worldtask_world_story_task_details_84", "text": "搜集12个4星装备" }, "npctxt": { - "key": "worldtask_world_task_npctxt_83", + "key": "worldtask_world_story_npctxt_84", "text": "搜集12个4星装备" }, "npc": 10830, @@ -3001,15 +3037,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_84", + "key": "worldtask_world_story_task_name_85", "text": "功夫大师挑战塔20层" }, "task_details": { - "key": "worldtask_world_task_task_details_84", + "key": "worldtask_world_story_task_details_85", "text": "功夫大师挑战塔20层" }, "npctxt": { - "key": "worldtask_world_task_npctxt_84", + "key": "worldtask_world_story_npctxt_85", "text": "功夫大师挑战塔20层" }, "npc": 10840, @@ -3037,15 +3073,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_85", + "key": "worldtask_world_story_task_name_86", "text": "关卡8-6" }, "task_details": { - "key": "worldtask_world_task_task_details_85", + "key": "worldtask_world_story_task_details_86", "text": "关卡8-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_85", + "key": "worldtask_world_story_npctxt_86", "text": "关卡8-6" }, "npc": 10850, @@ -3073,15 +3109,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_86", + "key": "worldtask_world_story_task_name_87", "text": "装备副本boss4难度4刷1次" }, "task_details": { - "key": "worldtask_world_task_task_details_86", + "key": "worldtask_world_story_task_details_87", "text": "装备副本boss4难度4刷1次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_86", + "key": "worldtask_world_story_npctxt_87", "text": "装备副本boss4难度4刷1次" }, "npc": 10860, @@ -3109,15 +3145,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_87", + "key": "worldtask_world_story_task_name_88", "text": "18件强化+9" }, "task_details": { - "key": "worldtask_world_task_task_details_87", + "key": "worldtask_world_story_task_details_88", "text": "18件强化+9" }, "npctxt": { - "key": "worldtask_world_task_npctxt_87", + "key": "worldtask_world_story_npctxt_88", "text": "18件强化+9" }, "npc": 10870, @@ -3145,15 +3181,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_88", + "key": "worldtask_world_story_task_name_89", "text": "关卡9-6" }, "task_details": { - "key": "worldtask_world_task_task_details_88", + "key": "worldtask_world_story_task_details_89", "text": "关卡9-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_88", + "key": "worldtask_world_story_npctxt_89", "text": "关卡9-6" }, "npc": 10880, @@ -3181,15 +3217,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_89", + "key": "worldtask_world_story_task_name_90", "text": "守护者星座图解锁50次" }, "task_details": { - "key": "worldtask_world_task_task_details_89", + "key": "worldtask_world_story_task_details_90", "text": "守护者星座图解锁50次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_89", + "key": "worldtask_world_story_npctxt_90", "text": "守护者星座图解锁50次" }, "npc": 10890, @@ -3217,15 +3253,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_90", + "key": "worldtask_world_story_task_name_91", "text": "关卡10-6" }, "task_details": { - "key": "worldtask_world_task_task_details_90", + "key": "worldtask_world_story_task_details_91", "text": "关卡10-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_90", + "key": "worldtask_world_story_npctxt_91", "text": "关卡10-6" }, "npc": 10900, @@ -3253,15 +3289,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_91", + "key": "worldtask_world_story_task_name_92", "text": "装备副本boss4难度6刷1次" }, "task_details": { - "key": "worldtask_world_task_task_details_91", + "key": "worldtask_world_story_task_details_92", "text": "装备副本boss4难度6刷1次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_91", + "key": "worldtask_world_story_npctxt_92", "text": "装备副本boss4难度6刷1次" }, "npc": 10910, @@ -3289,15 +3325,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_92", + "key": "worldtask_world_story_task_name_93", "text": "8件任意装备强化+12" }, "task_details": { - "key": "worldtask_world_task_task_details_92", + "key": "worldtask_world_story_task_details_93", "text": "8件任意装备强化+12" }, "npctxt": { - "key": "worldtask_world_task_npctxt_92", + "key": "worldtask_world_story_npctxt_93", "text": "8件任意装备强化+12" }, "npc": 10920, @@ -3325,15 +3361,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_93", + "key": "worldtask_world_story_task_name_94", "text": "关卡11-6" }, "task_details": { - "key": "worldtask_world_task_task_details_93", + "key": "worldtask_world_story_task_details_94", "text": "关卡11-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_93", + "key": "worldtask_world_story_npctxt_94", "text": "关卡11-6" }, "npc": 10930, @@ -3361,15 +3397,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_94", + "key": "worldtask_world_story_task_name_95", "text": "竞技场获胜20次" }, "task_details": { - "key": "worldtask_world_task_task_details_94", + "key": "worldtask_world_story_task_details_95", "text": "竞技场获胜20次" }, "npctxt": { - "key": "worldtask_world_task_npctxt_94", + "key": "worldtask_world_story_npctxt_95", "text": "竞技场获胜20次" }, "npc": 10940, @@ -3397,15 +3433,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_95", + "key": "worldtask_world_story_task_name_96", "text": "关卡12-6" }, "task_details": { - "key": "worldtask_world_task_task_details_95", + "key": "worldtask_world_story_task_details_96", "text": "关卡12-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_95", + "key": "worldtask_world_story_npctxt_96", "text": "关卡12-6" }, "npc": 10950, @@ -3433,15 +3469,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_96", + "key": "worldtask_world_story_task_name_97", "text": "主线困难1-3" }, "task_details": { - "key": "worldtask_world_task_task_details_96", + "key": "worldtask_world_story_task_details_97", "text": "主线困难1-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_96", + "key": "worldtask_world_story_npctxt_97", "text": "主线困难1-3" }, "npc": 10960, @@ -3469,15 +3505,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_97", + "key": "worldtask_world_story_task_name_98", "text": "主线困难1-6" }, "task_details": { - "key": "worldtask_world_task_task_details_97", + "key": "worldtask_world_story_task_details_98", "text": "主线困难1-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_97", + "key": "worldtask_world_story_npctxt_98", "text": "主线困难1-6" }, "npc": 10970, @@ -3505,15 +3541,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_98", + "key": "worldtask_world_story_task_name_99", "text": "主线困难2-3" }, "task_details": { - "key": "worldtask_world_task_task_details_98", + "key": "worldtask_world_story_task_details_99", "text": "主线困难2-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_98", + "key": "worldtask_world_story_npctxt_99", "text": "主线困难2-3" }, "npc": 10980, @@ -3541,15 +3577,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_99", + "key": "worldtask_world_story_task_name_100", "text": "主线困难2-6" }, "task_details": { - "key": "worldtask_world_task_task_details_99", + "key": "worldtask_world_story_task_details_100", "text": "主线困难2-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_99", + "key": "worldtask_world_story_npctxt_100", "text": "主线困难2-6" }, "npc": 10990, @@ -3577,15 +3613,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_100", + "key": "worldtask_world_story_task_name_101", "text": "主线困难3-3" }, "task_details": { - "key": "worldtask_world_task_task_details_100", + "key": "worldtask_world_story_task_details_101", "text": "主线困难3-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_100", + "key": "worldtask_world_story_npctxt_101", "text": "主线困难3-3" }, "npc": 11000, @@ -3613,15 +3649,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_101", + "key": "worldtask_world_story_task_name_102", "text": "主线困难3-6" }, "task_details": { - "key": "worldtask_world_task_task_details_101", + "key": "worldtask_world_story_task_details_102", "text": "主线困难3-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_101", + "key": "worldtask_world_story_npctxt_102", "text": "主线困难3-6" }, "npc": 11010, @@ -3649,15 +3685,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_102", + "key": "worldtask_world_story_task_name_103", "text": "主线困难4-3" }, "task_details": { - "key": "worldtask_world_task_task_details_102", + "key": "worldtask_world_story_task_details_103", "text": "主线困难4-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_102", + "key": "worldtask_world_story_npctxt_103", "text": "主线困难4-3" }, "npc": 11020, @@ -3685,15 +3721,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_103", + "key": "worldtask_world_story_task_name_104", "text": "主线困难4-6" }, "task_details": { - "key": "worldtask_world_task_task_details_103", + "key": "worldtask_world_story_task_details_104", "text": "主线困难4-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_103", + "key": "worldtask_world_story_npctxt_104", "text": "主线困难4-6" }, "npc": 11030, @@ -3721,15 +3757,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_104", + "key": "worldtask_world_story_task_name_105", "text": "主线困难5-3" }, "task_details": { - "key": "worldtask_world_task_task_details_104", + "key": "worldtask_world_story_task_details_105", "text": "主线困难5-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_104", + "key": "worldtask_world_story_npctxt_105", "text": "主线困难5-3" }, "npc": 11040, @@ -3757,15 +3793,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_105", + "key": "worldtask_world_story_task_name_106", "text": "主线困难5-6" }, "task_details": { - "key": "worldtask_world_task_task_details_105", + "key": "worldtask_world_story_task_details_106", "text": "主线困难5-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_105", + "key": "worldtask_world_story_npctxt_106", "text": "主线困难5-6" }, "npc": 11050, @@ -3793,15 +3829,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_106", + "key": "worldtask_world_story_task_name_107", "text": "主线困难6-3" }, "task_details": { - "key": "worldtask_world_task_task_details_106", + "key": "worldtask_world_story_task_details_107", "text": "主线困难6-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_106", + "key": "worldtask_world_story_npctxt_107", "text": "主线困难6-3" }, "npc": 11060, @@ -3829,15 +3865,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_107", + "key": "worldtask_world_story_task_name_108", "text": "主线困难6-6" }, "task_details": { - "key": "worldtask_world_task_task_details_107", + "key": "worldtask_world_story_task_details_108", "text": "主线困难6-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_107", + "key": "worldtask_world_story_npctxt_108", "text": "主线困难6-6" }, "npc": 11070, @@ -3865,15 +3901,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_108", + "key": "worldtask_world_story_task_name_109", "text": "主线困难7-3" }, "task_details": { - "key": "worldtask_world_task_task_details_108", + "key": "worldtask_world_story_task_details_109", "text": "主线困难7-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_108", + "key": "worldtask_world_story_npctxt_109", "text": "主线困难7-3" }, "npc": 11080, @@ -3901,15 +3937,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_109", + "key": "worldtask_world_story_task_name_110", "text": "主线困难7-6" }, "task_details": { - "key": "worldtask_world_task_task_details_109", + "key": "worldtask_world_story_task_details_110", "text": "主线困难7-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_109", + "key": "worldtask_world_story_npctxt_110", "text": "主线困难7-6" }, "npc": 11090, @@ -3937,15 +3973,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_110", + "key": "worldtask_world_story_task_name_111", "text": "主线困难8-3" }, "task_details": { - "key": "worldtask_world_task_task_details_110", + "key": "worldtask_world_story_task_details_111", "text": "主线困难8-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_110", + "key": "worldtask_world_story_npctxt_111", "text": "主线困难8-3" }, "npc": 11100, @@ -3973,15 +4009,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_111", + "key": "worldtask_world_story_task_name_112", "text": "主线困难8-6" }, "task_details": { - "key": "worldtask_world_task_task_details_111", + "key": "worldtask_world_story_task_details_112", "text": "主线困难8-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_111", + "key": "worldtask_world_story_npctxt_112", "text": "主线困难8-6" }, "npc": 11110, @@ -4009,15 +4045,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_112", + "key": "worldtask_world_story_task_name_113", "text": "主线困难9-3" }, "task_details": { - "key": "worldtask_world_task_task_details_112", + "key": "worldtask_world_story_task_details_113", "text": "主线困难9-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_112", + "key": "worldtask_world_story_npctxt_113", "text": "主线困难9-3" }, "npc": 11120, @@ -4045,15 +4081,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_113", + "key": "worldtask_world_story_task_name_114", "text": "主线困难9-6" }, "task_details": { - "key": "worldtask_world_task_task_details_113", + "key": "worldtask_world_story_task_details_114", "text": "主线困难9-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_113", + "key": "worldtask_world_story_npctxt_114", "text": "主线困难9-6" }, "npc": 11130, @@ -4081,15 +4117,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_114", + "key": "worldtask_world_story_task_name_115", "text": "主线困难10-3" }, "task_details": { - "key": "worldtask_world_task_task_details_114", + "key": "worldtask_world_story_task_details_115", "text": "主线困难10-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_114", + "key": "worldtask_world_story_npctxt_115", "text": "主线困难10-3" }, "npc": 11140, @@ -4117,15 +4153,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_115", + "key": "worldtask_world_story_task_name_116", "text": "主线困难10-6" }, "task_details": { - "key": "worldtask_world_task_task_details_115", + "key": "worldtask_world_story_task_details_116", "text": "主线困难10-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_115", + "key": "worldtask_world_story_npctxt_116", "text": "主线困难10-6" }, "npc": 11150, @@ -4153,15 +4189,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_116", + "key": "worldtask_world_story_task_name_117", "text": "主线困难11-3" }, "task_details": { - "key": "worldtask_world_task_task_details_116", + "key": "worldtask_world_story_task_details_117", "text": "主线困难11-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_116", + "key": "worldtask_world_story_npctxt_117", "text": "主线困难11-3" }, "npc": 11160, @@ -4189,15 +4225,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_117", + "key": "worldtask_world_story_task_name_118", "text": "主线困难11-6" }, "task_details": { - "key": "worldtask_world_task_task_details_117", + "key": "worldtask_world_story_task_details_118", "text": "主线困难11-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_117", + "key": "worldtask_world_story_npctxt_118", "text": "主线困难11-6" }, "npc": 11170, @@ -4225,15 +4261,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_118", + "key": "worldtask_world_story_task_name_119", "text": "主线困难12-3" }, "task_details": { - "key": "worldtask_world_task_task_details_118", + "key": "worldtask_world_story_task_details_119", "text": "主线困难12-3" }, "npctxt": { - "key": "worldtask_world_task_npctxt_118", + "key": "worldtask_world_story_npctxt_119", "text": "主线困难12-3" }, "npc": 11180, @@ -4261,15 +4297,15 @@ "des": 2, "icon": "", "task_name": { - "key": "worldtask_world_task_task_name_119", + "key": "worldtask_world_story_task_name_120", "text": "主线困难12-6" }, "task_details": { - "key": "worldtask_world_task_task_details_119", + "key": "worldtask_world_story_task_details_120", "text": "主线困难12-6" }, "npctxt": { - "key": "worldtask_world_task_npctxt_119", + "key": "worldtask_world_story_npctxt_120", "text": "主线困难12-6" }, "npc": 11190, diff --git a/modules/sociaty/api_cross_tasklist.go b/modules/sociaty/api_cross_tasklist.go index 7cdeb06e2..7a9d288a5 100644 --- a/modules/sociaty/api_cross_tasklist.go +++ b/modules/sociaty/api_cross_tasklist.go @@ -28,7 +28,6 @@ func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskList var taskList []*pb.SociatyTask for _, v := range sociatyTask.TaskList { - status := v.Status // if _, ok := this.module.modelSociaty.validTask(uid, v.TaskId); ok { // status = 1 //完成 // } @@ -48,7 +47,7 @@ func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskList taskList = append(taskList, &pb.SociatyTask{ TaskId: v.TaskId, - Status: status, + Status: v.Status, Received: v.Received, Cond: v.Cond, }) From b50497a9e8f49ef317a9e4a261f34c1e39c524e8 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Wed, 14 Jun 2023 10:35:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/worldtask/module.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index 5bbed8fc5..0b6f284d5 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -126,7 +126,7 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) { for _, cfg := range worldtaskConf.GetDataList() { for _, condId := range cfg.Completetask { for _, cond := range conds { - if condId == cond.Conid && cond.State == pb.BuriedItemFinishState_buried_finish { + if condId == cond.Conid { //&& cond.State == pb.BuriedItemFinishState_buried_finish { //校验任务是否是当前任务 if task, ok := userTask.CurrentTasks[cfg.Group]; ok { var currentTasks []*pb.CurrentTask @@ -160,8 +160,10 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) { return } if curTaskConf.DeliverNpc == 0 { - this.modelWorldtask.taskFinish(session, t.TaskId, userTask, curTaskConf) - this.modelWorldtask.taskFinishPush(session, userTask, curTaskConf) + defer func() { + this.modelWorldtask.taskFinish(session, t.TaskId, userTask, curTaskConf) + this.modelWorldtask.taskFinishPush(session, userTask, curTaskConf) + }() } currentTasks = append(currentTasks, t) } From 953cb783db4bd923f0b34f174900f8e3c5a33dee Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 14 Jun 2023 11:20:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/梦工厂后台AIP文档.md | 2 +- modules/web/api_paydelivery.go | 4 +++- modules/web/api_synccross.go | 4 +++- modules/web/api_upload.go | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/梦工厂后台AIP文档.md b/bin/梦工厂后台AIP文档.md index 5b87d1fc2..bf9c5d64b 100644 --- a/bin/梦工厂后台AIP文档.md +++ b/bin/梦工厂后台AIP文档.md @@ -98,7 +98,7 @@ ### 支付发货API - 接口名:paydelivery -- 接口说明:web 服务器给玩家发送邮件 +- 接口说明:web 服务器给玩家发送支付获得商品 - 请求地址:{IP}:{port}/paydelivery - 请求参数:uid(用户id|签名),productid(商品id|签名),orderid(订单号|签名),price(总金额|签名),sign(签名) - 请求样例 diff --git a/modules/web/api_paydelivery.go b/modules/web/api_paydelivery.go index a9fb56271..dd69dfa62 100644 --- a/modules/web/api_paydelivery.go +++ b/modules/web/api_paydelivery.go @@ -8,6 +8,7 @@ import ( "go_dreamfactory/lego/utils/crypto/md5" "go_dreamfactory/pb" "net/http" + "time" ) type PayDeliveryResults struct { @@ -53,8 +54,9 @@ func (this *Api_Comp) PayDelivery(c *engine.Context) { payresp.Code = pb.ErrorCode_SignError payresp.Msg = pb.GetErrorCodeMsg(pb.ErrorCode_SignError) } + ctx, _ := context.WithTimeout(context.TODO(), time.Second*5) if err = this.module.service.RpcCall( - context.Background(), + ctx, comm.Service_Worker, string(comm.Rpc_ModulePayDelivery), payreq, diff --git a/modules/web/api_synccross.go b/modules/web/api_synccross.go index 9b8e92e17..1b1c1cd5f 100644 --- a/modules/web/api_synccross.go +++ b/modules/web/api_synccross.go @@ -8,6 +8,7 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/db" "net/http" + "time" ) type SyncCrossReq struct { @@ -51,8 +52,9 @@ func (this *Api_Comp) SyncCross(c *engine.Context) { resp.Message = err.Error() return } + ctx, _ := context.WithTimeout(context.TODO(), time.Second*5) if err = this.module.service.RpcBroadcast( - context.Background(), + ctx, comm.Service_Worker, string(comm.Rpc_DBSyncCross), pb.EmptyReq{}, diff --git a/modules/web/api_upload.go b/modules/web/api_upload.go index 215d6b1ae..fad22ee80 100644 --- a/modules/web/api_upload.go +++ b/modules/web/api_upload.go @@ -9,6 +9,7 @@ import ( "go_dreamfactory/sys/configure" "net/http" "strconv" + "time" ) //上传配置文件 @@ -52,8 +53,9 @@ func (this *Api_Comp) Upload(c *engine.Context) { } } } + ctx, _ := context.WithTimeout(context.TODO(), time.Second*5) if err := this.module.service.RpcBroadcast( - context.Background(), + ctx, comm.Service_Worker, string(comm.Rpc_ConfigureUpDate), &pb.EmptyReq{},