diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index c6724193e..e665b43a3 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -1,106 +1,107 @@ [ { - "id": 110001, - "rtype": 1, + "id": 101, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_1", - "text": "获得阿宝" + "key": "taskcond_rdtask_condi_tasktxt_1", + "text": "测试数据" }, "type": 1, "valid": 0, "NPC": 0, "value": 1, "filter": [ - { - "s": "eq", - "d": 25001 - } + 25001 ] }, { - "id": 110003, - "rtype": 1, + "id": 102, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_2", - "text": "完成某个每日任务(打开任务时,检查指定任务id是否完成,这里的每日,指的世界任务的每日)" + "key": "taskcond_rdtask_condi_tasktxt_2", + "text": "测试数据" }, - "type": 3, + "type": 1, "valid": 0, "NPC": 0, "value": 1, "filter": [ - { - "s": "eq", - "d": 700010 - } + 3 ] }, { - "id": 110004, - "rtype": 1, + "id": 103, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_3", - "text": "指定英雄的等级到达某个程度(打开任务时检查,指定英雄的等级计入进度,达到配置等级则完成)" + "key": "taskcond_rdtask_condi_tasktxt_3", + "text": "测试数据" }, - "type": 4, + "type": 3, "valid": 0, "NPC": 0, "value": 10, "filter": [ - { - "s": "eq", - "d": 14007 - } + 2 ] }, { - "id": 110005, - "rtype": 1, + "id": 104, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_4", - "text": "指定英雄的装备数量(打开任务时检查,指定英雄身上穿戴的装备数量计入进度,达到配置数量则完成)" + "key": "taskcond_rdtask_condi_tasktxt_4", + "text": "测试数据" }, - "type": 5, + "type": 4, "valid": 0, "NPC": 0, "value": 2, "filter": [ - { - "s": "eq", - "d": 25001 - } + 14007 ] }, { - "id": 110006, - "rtype": 1, + "id": 105, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_5", - "text": "指定英雄的星级(打开任务时检查,指定英雄达到X星级则任务完成)" + "key": "taskcond_rdtask_condi_tasktxt_5", + "text": "测试数据" }, - "type": 6, + "type": 5, "valid": 0, "NPC": 0, "value": 5, "filter": [ - { - "s": "eq", - "d": 25004 - } + 25001 ] }, { - "id": 110007, - "rtype": 1, + "id": 106, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_6", - "text": "日常登录一次" + "key": "taskcond_rdtask_condi_tasktxt_6", + "text": "测试数据" + }, + "type": 6, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [ + 25004 + ] + }, + { + "id": 107, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_7", + "text": "测试数据" }, "type": 7, "valid": 0, @@ -109,12 +110,12 @@ "filter": [] }, { - "id": 110008, - "rtype": 1, + "id": 108, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_7", - "text": "累计登陆xx天(创建账号开始,每登录一次则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_8", + "text": "测试数据" }, "type": 8, "valid": 0, @@ -123,40 +124,54 @@ "filter": [] }, { - "id": 110009, - "rtype": 1, + "id": 109, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_8", - "text": "连续登陆xx天(接到任务时,记录连续登录的天数,如果中断每有登录则进度清到1天)" + "key": "taskcond_rdtask_condi_tasktxt_9", + "text": "测试数据" }, "type": 9, "valid": 0, "NPC": 0, - "value": 1, - "filter": [] - }, - { - "id": 110010, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_9", - "text": "拥有xx个好友(打开任务时,检查好友数量计入进度,达到配置数量则完成任务)" - }, - "type": 10, - "valid": 0, - "NPC": 0, "value": 2, "filter": [] }, { - "id": 110012, - "rtype": 1, + "id": 110, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_10", - "text": "使用好友助战英雄xx次(接到任务开始,每次使用好友的助战英雄进度战斗则进度+1,无论战斗结果如何)" + "key": "taskcond_rdtask_condi_tasktxt_10", + "text": "测试数据" + }, + "type": 10, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [] + }, + { + "id": 111, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_11", + "text": "测试数据" + }, + "type": 11, + "valid": 0, + "NPC": 0, + "value": 2, + "filter": [] + }, + { + "id": 112, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_12", + "text": "测试数据" }, "type": 12, "valid": 0, @@ -165,92 +180,86 @@ "filter": [] }, { - "id": 110013, - "rtype": 1, + "id": 113, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_11", - "text": "更换X次助战英雄(接到任务开始,每次更换助战英雄则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_13", + "text": "测试数据" }, "type": 13, "valid": 0, "NPC": 0, - "value": 2, - "filter": [] - }, - { - "id": 110014, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_12", - "text": "xx次普通招募(接到任务后,每次进行普通招募进度+1,十连抽进度+10)" - }, - "type": 14, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [] - }, - { - "id": 110015, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_13", - "text": "xx次阵营招募(接到任务后,每次进行阵营招募进度+1,阵营十连抽进度+10)" - }, - "type": 15, - "valid": 0, - "NPC": 0, "value": 10, "filter": [] }, { - "id": 110016, - "rtype": 1, + "id": 114, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_14", - "text": "招募到xx品质英雄xx个(接到任务后在招募中每获得一个X品质的英雄则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_14", + "text": "招募一次守护者" + }, + "type": 14, + "valid": 0, + "NPC": 101, + "value": 5, + "filter": [] + }, + { + "id": 115, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_15", + "text": "测试数据" + }, + "type": 15, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [] + }, + { + "id": 116, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_16", + "text": "测试数据" }, "type": 16, "valid": 0, "NPC": 0, - "value": 5, + "value": 1, "filter": [ - { - "s": "eq", - "d": 3 - } + 3 ] }, { - "id": 110017, - "rtype": 1, + "id": 117, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_15", - "text": "普通招募十连,获得xx个以上xx星英雄(接到任务后在一次十连抽中抽到X个X星以上英雄,连续点10次单抽不算)" + "key": "taskcond_rdtask_condi_tasktxt_17", + "text": "测试数据" }, "type": 17, "valid": 0, "NPC": 0, - "value": 1, + "value": 2, "filter": [ - { - "s": "eq", - "d": 3 - } + 3 ] }, { - "id": 110018, - "rtype": 1, + "id": 118, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_16", - "text": "累计xx次普通招募" + "key": "taskcond_rdtask_condi_tasktxt_18", + "text": "测试数据" }, "type": 18, "valid": 0, @@ -259,287 +268,309 @@ "filter": [] }, { - "id": 110019, - "rtype": 1, + "id": 119, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_17", - "text": "累计xx次阵营招募" + "key": "taskcond_rdtask_condi_tasktxt_19", + "text": "测试数据" }, "type": 19, "valid": 0, "NPC": 0, - "value": 2, + "value": 3, "filter": [] }, { - "id": 110020, - "rtype": 1, + "id": 120, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_18", - "text": "用户等级达到xx级(打开任务时检查,人物等级计入进度,达到配置等级则完成)" + "key": "taskcond_rdtask_condi_tasktxt_20", + "text": "测试数据" }, "type": 20, "valid": 0, "NPC": 0, - "value": 1, - "filter": [] - }, - { - "id": 110023, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_19", - "text": "拥有xx个xx星级的xx等级英雄(打开任务时检查,配置英雄和配置等级都达标的英雄数量,记录进度)" - }, - "type": 23, - "valid": 0, - "NPC": 0, - "value": 3, - "filter": [ - { - "s": "eq", - "d": 5 - }, - { - "s": "gte", - "d": 20 - } - ] - }, - { - "id": 110024, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_20", - "text": "为任意英雄提升xx次等级(接到任务后,任意英雄等级每提升1级则进度+1)" - }, - "type": 24, - "valid": 0, - "NPC": 0, "value": 4, "filter": [] }, { - "id": 110025, - "rtype": 1, + "id": 121, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_21", - "text": "xx名xx英雄升至xx星(接到任务后,每有一个指定英雄id的英雄升至X星则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_21", + "text": "测试数据" + }, + "type": 21, + "valid": 0, + "NPC": 0, + "value": 3, + "filter": [] + }, + { + "id": 122, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_22", + "text": "测试数据" + }, + "type": 22, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [ + 25001 + ] + }, + { + "id": 123, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_23", + "text": "测试数据" + }, + "type": 23, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [ + 5, + 20 + ] + }, + { + "id": 124, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_24", + "text": "测试数据" + }, + "type": 24, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [] + }, + { + "id": 125, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_25", + "text": "测试数据" }, "type": 25, "valid": 0, "NPC": 0, - "value": 3, + "value": 5, "filter": [ - { - "s": "eq", - "d": 25001 - }, - { - "s": "gte", - "d": 6 - } + 25001, + 6 ] }, { - "id": 110026, - "rtype": 1, + "id": 126, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_22", - "text": "xx名英雄从三星升四星(接到任务后,每当一个从3星升至4星时,进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_26", + "text": "测试数据" }, "type": 26, "valid": 0, "NPC": 0, - "value": 1, + "value": 3, "filter": [] }, { - "id": 110027, - "rtype": 1, + "id": 127, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_23", - "text": "xx名英雄从四星升五星(接到任务后,每当一个从4星升至5星时,进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_27", + "text": "测试数据" }, "type": 27, "valid": 0, "NPC": 0, - "value": 1, + "value": 3, "filter": [] }, { - "id": 110028, - "rtype": 1, + "id": 128, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_24", - "text": "xx名英雄从五星升六星(接到任务后,每当一个从5星升至6星时,进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_28", + "text": "测试数据" }, "type": 28, "valid": 0, "NPC": 0, - "value": 1, + "value": 5, "filter": [] }, { - "id": 110030, - "rtype": 1, + "id": 129, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_25", - "text": "获得xx个品质为xx及以上的英雄(从创号开始,每获得一个配置品质的英雄进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_29", + "text": "测试数据" + }, + "type": 29, + "valid": 0, + "NPC": 0, + "value": 2, + "filter": [ + 25004, + 22 + ] + }, + { + "id": 130, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_30", + "text": "测试数据" }, "type": 30, "valid": 0, "NPC": 0, - "value": 5, + "value": 1, "filter": [ - { - "s": "gte", - "d": 3 - } + 3 ] }, { - "id": 110032, - "rtype": 1, + "id": 131, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_26", - "text": "xx个品质为xx的英雄升到xx级(从创号开始,当配置品质的英雄达到XX级时进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_31", + "text": "测试数据" + }, + "type": 31, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [ + 3 + ] + }, + { + "id": 132, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_32", + "text": "测试数据" }, "type": 32, "valid": 0, "NPC": 0, - "value": 3, + "value": 1, "filter": [ - { - "s": "eq", - "d": 3 - }, - { - "s": "gte", - "d": 20 - } + 3, + 20 ] }, { - "id": 110033, - "rtype": 1, + "id": 133, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_27", - "text": "xx个品质为xx以及以上英雄升到xx级(从创号开始,当配置品质及以上的英雄达到XX级时进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_33", + "text": "测试数据" }, "type": 33, "valid": 0, "NPC": 0, - "value": 3, + "value": 2, "filter": [ - { - "s": "eq", - "d": 3 - }, - { - "s": "gte", - "d": 23 - } + 3, + 23 ] }, { - "id": 110034, - "rtype": 1, + "id": 134, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_28", - "text": "xx个英雄觉醒达到xx阶段从(创号开始,每有一个英雄觉醒达到X阶段则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_34", + "text": "测试数据" }, "type": 34, "valid": 0, "NPC": 0, - "value": 5, + "value": 2, "filter": [ - { - "s": "gte", - "d": 2 - } + 2 ] }, { - "id": 110035, - "rtype": 1, + "id": 135, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_29", - "text": "xx英雄觉醒达到xx阶段(创号开始,检查指定英雄id的英雄觉醒是否达到X阶段,达到则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_35", + "text": "测试数据" }, "type": 35, "valid": 0, "NPC": 0, "value": 2, "filter": [ - { - "s": "eq", - "d": 25001 - } + 25001 ] }, { - "id": 110036, - "rtype": 1, + "id": 136, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_30", - "text": "xx位xx品质xx职业英雄(xx阵营)觉醒达到xx阶段(检查满级,满共鸣,满觉醒的英雄数量,每有一个进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_36", + "text": "测试数据" }, "type": 36, "valid": 0, "NPC": 0, - "value": 1, + "value": 2, "filter": [ - { - "s": "eq", - "d": 3 - }, - { - "s": "eq", - "d": 3 - } + 3, + 3, + 1 ] }, { - "id": 110037, - "rtype": 1, + "id": 137, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_31", - "text": "xx名xx品质英雄满共鸣、等级、觉醒(检查X品质的英雄满级,满共鸣,满觉醒的英雄数量,每有一个进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_37", + "text": "测试数据" }, "type": 37, "valid": 0, "NPC": 0, - "value": 1, + "value": 2, "filter": [ - { - "s": "eq", - "d": 3 - } + 3 ] }, { - "id": 110038, - "rtype": 1, + "id": 138, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_32", - "text": "xx英雄满级、共鸣、觉醒至最高状态(检查满级,满共鸣,满觉醒的英雄数量,每有一个进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_38", + "text": "测试数据" }, "type": 38, "valid": 0, @@ -548,12 +579,12 @@ "filter": [] }, { - "id": 110039, - "rtype": 1, + "id": 139, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_33", - "text": "任意英雄共鸣累计xx次(从创号开始,英雄每次共鸣1个同名英雄进度+1,如果一次共鸣选中了多个同名英雄则进度+多次)" + "key": "taskcond_rdtask_condi_tasktxt_39", + "text": "测试数据" }, "type": 39, "valid": 0, @@ -562,190 +593,223 @@ "filter": [] }, { - "id": 110040, - "rtype": 1, + "id": 140, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_34", - "text": "xx个英雄共鸣满xx次(打开任务时检查每个英雄的共鸣次数,每有一个共鸣次数大于配置次数的英雄进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_40", + "text": "测试数据" }, "type": 40, "valid": 0, "NPC": 0, - "value": 2, + "value": 1, "filter": [ - { - "s": "gte", - "d": 2 - } + 2 ] }, { - "id": 110041, - "rtype": 1, + "id": 141, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_35", - "text": "xx名英雄穿戴xx件xx星级的装备(打开任务时检查每个英雄穿戴的装备,当满足星级的装备达到N件时,进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_41", + "text": "测试数据" }, "type": 41, "valid": 0, "NPC": 0, - "value": 2, + "value": 1, "filter": [ - { - "s": "gte", - "d": 2 - }, - { - "s": "eq", - "d": 1 - } + 2, + 1 ] }, { - "id": 110042, - "rtype": 1, + "id": 142, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_36", - "text": "xx名英雄穿戴xx件xx等级的装备(打开任务时检查每个英雄穿戴的装备,当满足强化等级的装备达到N件时,进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_42", + "text": "测试数据" }, "type": 42, "valid": 0, "NPC": 0, - "value": 2, + "value": 1, "filter": [ - { - "s": "gte", - "d": 2 - }, - { - "s": "eq", - "d": 2 - } + 2, + 2 ] }, { - "id": 110043, - "rtype": 1, + "id": 143, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_37", - "text": "将xx件装备强化至xx级(接到任务后,每次装备强化等级变动时,强化前等级小于配置等级且强化后等级大于等于配置等级则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_43", + "text": "测试数据" }, "type": 43, "valid": 0, "NPC": 0, "value": 2, "filter": [ - { - "s": "gte", - "d": 2 - } + 2 ] }, { - "id": 110046, - "rtype": 1, + "id": 144, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_38", - "text": "为xx名英雄穿戴完整xx星【xx】套装装备(打开任务时,检查英雄身上的XX套装,每有一个穿戴XX套装的英雄其套装中星级最低的装备达到配置时进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_44", + "text": "测试数据" + }, + "type": 44, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [] + }, + { + "id": 145, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_45", + "text": "测试数据" + }, + "type": 45, + "valid": 0, + "NPC": 0, + "value": 2, + "filter": [ + 1, + 1, + 2 + ] + }, + { + "id": 146, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_46", + "text": "测试数据" }, "type": 46, "valid": 0, "NPC": 0, "value": 1, "filter": [ - { - "s": "gte", - "d": 4 - }, - { - "s": "eq", - "d": 1 - } + 4, + 1 ] }, { - "id": 110047, - "rtype": 1, + "id": 147, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_39", - "text": "累计强化装备成功xx次(从创号开始,每次强化装备成功1级则进度+1,如果使用连续强化一次性从0强化到15则进度+15)" + "key": "taskcond_rdtask_condi_tasktxt_47", + "text": "测试数据" }, "type": 47, "valid": 0, "NPC": 0, - "value": 2, + "value": 1, "filter": [] }, { - "id": 110050, - "rtype": 1, + "id": 148, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_40", - "text": "获得xx星以上装备xx件(接到任务后,每获得一件星级大于等于配置星级的装备,则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_48", + "text": "测试数据" + }, + "type": 48, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1, + 2 + ] + }, + { + "id": 149, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_49", + "text": "测试数据" + }, + "type": 49, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [ + 1, + 2 + ] + }, + { + "id": 150, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_50", + "text": "测试数据" }, "type": 50, "valid": 0, "NPC": 0, - "value": 1, + "value": 2, "filter": [ - { - "s": "gte", - "d": 1 - } + 1 ] }, { - "id": 110051, - "rtype": 1, + "id": 151, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_41", - "text": "在铁匠铺中获得xx件xx星装备(接到任务后,从铁匠铺领取奖励时每获得一件星级大于等于配置星级的装备,则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_51", + "text": "测试数据" }, "type": 51, "valid": 0, "NPC": 0, - "value": 1, + "value": 2, "filter": [ - { - "s": "gte", - "d": 1 - } + 1 ] }, { - "id": 110052, - "rtype": 1, + "id": 152, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_42", - "text": "xx英雄提升xx次技能等级(接到任务后,指定英雄id的英雄提升一次技能等级则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_52", + "text": "测试数据" }, "type": 52, "valid": 0, "NPC": 0, - "value": 1, + "value": 2, "filter": [ - { - "s": "eq", - "d": 14007 - } + 14007 ] }, { - "id": 110053, - "rtype": 1, + "id": 153, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_43", - "text": "技能升级累计xx次(接到任务后,任意英雄提升一次技能等级则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_53", + "text": "测试数据" }, "type": 53, "valid": 0, @@ -754,68 +818,59 @@ "filter": [] }, { - "id": 110054, - "rtype": 1, + "id": 154, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_44", - "text": "x名卡牌角色技能全满级(打开任务时统计技能满级的英雄数量,每个进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_54", + "text": "测试数据" }, "type": 54, "valid": 0, "NPC": 0, - "value": 1, + "value": 1000, "filter": [] }, { - "id": 110055, - "rtype": 1, + "id": 155, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_45", - "text": "xx品质英雄提升xx次技能等级(接到任务后,指定品质的英雄提升一次技能等级则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_55", + "text": "测试数据" }, "type": 55, "valid": 0, "NPC": 0, - "value": 2, + "value": 1000, "filter": [ - { - "s": "eq", - "d": 3 - } + 3 ] }, { - "id": 110056, - "rtype": 1, + "id": 156, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_46", - "text": "拥有xx名技能升级xx次的xx职业英雄(打开任务时检查指定职业的英雄技能,每有一个英雄“技能等级之和-技能数量>=配置的技能升级次数”则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_56", + "text": "测试数据" }, "type": 56, "valid": 0, "NPC": 0, "value": 1, "filter": [ - { - "s": "gte", - "d": 1 - }, - { - "s": "eq", - "d": 2 - } + 1, + 2 ] }, { - "id": 110057, - "rtype": 1, + "id": 157, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_47", - "text": "xx名英雄技能满级(打开任务时检查技能满级的英雄个数并记入进度)" + "key": "taskcond_rdtask_condi_tasktxt_57", + "text": "测试数据" }, "type": 57, "valid": 0, @@ -824,12 +879,40 @@ "filter": [] }, { - "id": 110060, - "rtype": 1, + "id": 158, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_48", - "text": "任意主线副本通关X次(接到任务后,每次通过主线副本进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_58", + "text": "测试数据" + }, + "type": 58, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [] + }, + { + "id": 159, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_59", + "text": "测试数据" + }, + "type": 59, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [] + }, + { + "id": 160, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_60", + "text": "测试数据" }, "type": 60, "valid": 0, @@ -838,672 +921,416 @@ "filter": [] }, { - "id": 110061, - "rtype": 1, + "id": 161, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_49", - "text": "通关主线关卡xx(打开任务时检查所填关卡id是否通过,通过则任务完成)" + "key": "taskcond_rdtask_condi_tasktxt_61", + "text": "通关主线章节1-5" }, "type": 61, "valid": 0, - "NPC": 0, + "NPC": 105, "value": 1, "filter": [ - { - "s": "eq", - "d": 1100102 - } + 1100105 ] }, { - "id": 110062, - "rtype": 1, + "id": 162, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_50", - "text": "世界聊天发言xx次(世界频道发一段话算一次,被限制发言CD不计入发言次数)" + "key": "taskcond_rdtask_condi_tasktxt_62", + "text": "测试数据" }, "type": 62, "valid": 0, "NPC": 0, - "value": 2, + "value": 1, "filter": [] }, { - "id": 110064, - "rtype": 1, + "id": 163, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_51", - "text": "任意商品购买xx次(在任意商店购买1份商品进度+1,一次购买10份进度+10。1份的定义为:玩家进行购买操作时最小可选的购买数量为1份)" + "key": "taskcond_rdtask_condi_tasktxt_63", + "text": "测试数据" + }, + "type": 63, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [] + }, + { + "id": 164, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_64", + "text": "测试数据" }, "type": 64, "valid": 0, "NPC": 0, - "value": 2, + "value": 1, "filter": [] }, { - "id": 110065, - "rtype": 1, + "id": 165, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_52", - "text": "在商店购买xx商品xx件(在任意商店购买指定道具id的商品的数量)" + "key": "taskcond_rdtask_condi_tasktxt_65", + "text": "测试数据" }, "type": 65, "valid": 0, "NPC": 0, - "value": 2, + "value": 1, "filter": [ - { - "s": "eq", - "d": 10001 - } + 10001 ] }, { - "id": 110066, - "rtype": 1, + "id": 166, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_53", - "text": "xx商店购买任意商品xx次(在指定商店id中购买1份商品进度+1,一次购买10份进度+10。1份的定义为玩家进行购买操作时最小可选的购买数量为1份)" + "key": "taskcond_rdtask_condi_tasktxt_66", + "text": "测试数据" }, "type": 66, "valid": 0, "NPC": 0, - "value": 2, - "filter": [] + "value": 1, + "filter": [ + 1 + ] }, { - "id": 110067, - "rtype": 1, + "id": 167, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_54", - "text": "商店购物消耗xx货币xx个(某种货币发生减少时,将减少量计入进度)" + "key": "taskcond_rdtask_condi_tasktxt_67", + "text": "测试数据" }, "type": 67, "valid": 0, "NPC": 0, - "value": 1000, + "value": 1, "filter": [ - { - "s": "eq", - "d": 1 - } + 1 ] }, { - "id": 110068, - "rtype": 1, + "id": 168, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_55", - "text": "任意渠道消耗xx金币(金币发生减少时,将减少量计入进度)" + "key": "taskcond_rdtask_condi_tasktxt_68", + "text": "测试数据" }, "type": 68, "valid": 0, "NPC": 0, - "value": 1000, + "value": 1, + "filter": [ + 1 + ] + }, + { + "id": 169, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_69", + "text": "测试数据" + }, + "type": 69, + "valid": 0, + "NPC": 0, + "value": 3, "filter": [] }, { - "id": 110070, - "rtype": 1, + "id": 170, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_56", - "text": "通关世界任务XX关卡(X为世界任务战斗表的ID)" + "key": "taskcond_rdtask_condi_tasktxt_70", + "text": "测试数据" + }, + "type": 1, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [ + 44006 + ] + }, + { + "id": 171, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_71", + "text": "测试数据" }, "type": 70, "valid": 0, "NPC": 0, "value": 1, "filter": [ - { - "s": "eq", - "d": 101 - } + 101 ] }, { - "id": 110072, - "rtype": 1, + "id": 172, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_57", - "text": "通关难度A维京远征指定BOSSN次(从接到任务开始,只有通关A难度进度才+1)" + "key": "taskcond_rdtask_condi_tasktxt_72", + "text": "测试数据" }, - "type": 73, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [ - { - "s": "eq", - "d": 1 - }, - { - "s": "eq", - "d": 1 - } - ] - }, - { - "id": 110073, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_58", - "text": "通关难度A维京远征指定BOSS(检查最高难度记录是否超过了此难度,超过则完成)" - }, - "type": 74, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [ - { - "s": "eq", - "d": 1 - } - ] - }, - { - "id": 110074, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_59", - "text": "自动战斗通关难度A的维京远征指定BOSS(从接到任务开始,若全程无手动操作(不包含变速)且挑战难度大于等于A则判断任务完成)" - }, - "type": 75, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [ - { - "s": "eq", - "d": 1 - } - ] - }, - { - "id": 110075, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_60", - "text": "通关维京远征指定BOSSN次(从创号开始记录,通关任意难度进度都+1)" - }, - "type": 76, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [ - { - "s": "eq", - "d": 1 - } - ] - }, - { - "id": 110076, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_61", - "text": "通关难度A及以上维京远征指定BOSSN次(从接到任务开始,若通关难度大于等于设定难度,则进度+1)" - }, - "type": 77, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [ - { - "s": "eq", - "d": 1 - }, - { - "s": "gte", - "d": 1 - } - ] - }, - { - "id": 110077, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_62", - "text": "通关难度A维京远征指定BOSS时间达到XX秒以内(检查最高记录是否超过了此难度,超过则完成)" - }, - "type": 78, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [ - { - "s": "eq", - "d": 1 - }, - { - "s": "lte", - "d": 30 - } - ] - }, - { - "id": 110078, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_63", - "text": "使用好友助战英雄通关A难度的指定维京远征BOSS(从接到任务开始,通关阵营中包含好友助战英雄,难度大于等于A的指定维京远征BOSS时任务完成。)" - }, - "type": 79, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [ - { - "s": "eq", - "d": 1 - } - ] - }, - { - "id": 110079, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_64", - "text": "通关难度A指定狩猎BOSS难度N次(从接到任务开始,只有通关A难度进度才+1)" - }, - "type": 80, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [ - { - "s": "eq", - "d": 1 - }, - { - "s": "gte", - "d": 1 - } - ] - }, - { - "id": 110080, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_65", - "text": "通关A难度狩猎BOOS(检查最高难度记录是否达到了此难度,达到则完成)" - }, - "type": 81, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [ - { - "s": "eq", - "d": 1 - } - ] - }, - { - "id": 110081, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_66", - "text": "通关狩猎指定BOOSN次(历史)(从创号开始记录登陆天数,通关任意难度进度都+1)" - }, - "type": 82, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [ - { - "s": "eq", - "d": 1 - } - ] - }, - { - "id": 110082, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_67", - "text": "通关难度A及以上指定狩猎BOOSN次(从接到任务开始,若通关难度大于等于设定难度,则进度+1)" - }, - "type": 83, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [ - { - "s": "eq", - "d": 1 - }, - { - "s": "gte", - "d": 1 - } - ] - }, - { - "id": 110086, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_68", - "text": "发现月之秘境N次(从接到任务开始,发现一次则进度+1)" - }, - "type": 87, + "type": 18, "valid": 0, "NPC": 0, "value": 1, "filter": [] }, { - "id": 110087, - "rtype": 1, + "id": 173, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_69", - "text": "完成月之秘境N次(从接到任务开始,打完一个月之秘境则进度+1(耗尽BOSS挑战次数))" + "key": "taskcond_rdtask_condi_tasktxt_73", + "text": "测试数据" }, - "type": 88, + "type": 72, "valid": 0, "NPC": 0, "value": 3, "filter": [] }, { - "id": 110088, - "rtype": 1, + "id": 174, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_70", - "text": "任意招募N次(从接到任务开始,普通招募和阵营招募都算,单抽1次,10连抽算10次)" + "key": "taskcond_rdtask_condi_tasktxt_74", + "text": "尝试挑战邦尼兔" }, - "type": 89, + "type": 70, "valid": 0, - "NPC": 0, - "value": 1, - "filter": [] - }, - { - "id": 110089, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_71", - "text": "进行N次普通招募10连抽(从接到任务开始,单抽点10次不算,10连抽才进度+1)" - }, - "type": 90, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [] - }, - { - "id": 110090, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_72", - "text": "进行N次阵营招募10连抽(从接到任务开始,单抽点10次不算,10连抽才进度+1)" - }, - "type": 91, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [] - }, - { - "id": 110091, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_73", - "text": "强化装备N次(从接到任务开始,强化任意装备,失败和成功进度都+1)" - }, - "type": 92, - "valid": 0, - "NPC": 0, - "value": 3, - "filter": [] - }, - { - "id": 110092, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_74", - "text": "拥有一套强化到N级的A套装(记录A套装中每个部位的最高强化等级,并将这些强化等级中最低的数值计入进度,如果达到了任务所需的强化等级则完成任务。)" - }, - "type": 93, - "valid": 0, - "NPC": 0, + "NPC": 10022, "value": 3, "filter": [ - { - "s": "eq", - "d": 1 - } + 101 ] }, { - "id": 110093, - "rtype": 1, + "id": 175, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_75", - "text": "装备附魔N次(历史)(从创号开始记录,附魔成功进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_75", + "text": "测试数据" }, - "type": 94, + "type": 70, "valid": 0, "NPC": 0, "value": 1, - "filter": [] + "filter": [ + 102 + ] }, { - "id": 110094, - "rtype": 1, + "id": 176, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_76", - "text": "装备洗练N次(历史)(从创号开始记录,洗练成功进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_76", + "text": "测试数据" }, - "type": 95, + "type": 70, "valid": 0, "NPC": 0, "value": 1, - "filter": [] + "filter": [ + 103 + ] }, { - "id": 110095, - "rtype": 1, + "id": 177, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_77", - "text": "强化失败N次(从接到任务开始,强化失败进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_77", + "text": "测试数据" }, - "type": 96, + "type": 70, "valid": 0, "NPC": 0, "value": 10, - "filter": [] + "filter": [ + 104 + ] }, { - "id": 110096, - "rtype": 1, + "id": 178, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_78", - "text": "获得X星X套装的装备N件(时段)(从接到任务开始,每获得1件X星X套装的装备则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_78", + "text": "测试数据" }, - "type": 97, + "type": 70, "valid": 0, "NPC": 0, "value": 3, "filter": [ - { - "s": "gte", - "d": 3 - }, - { - "s": "eq", - "d": 1 - } + 105 ] }, { - "id": 110097, - "rtype": 1, + "id": 179, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_79", - "text": "穿戴N套强化A级的装备(打开任务时,检查英雄身上的装备的最低等级,当最低等级超过A则任务进度+1。)" + "key": "taskcond_rdtask_condi_tasktxt_79", + "text": "测试数据" }, - "type": 98, + "type": 70, "valid": 0, "NPC": 0, "value": 2, "filter": [ - { - "s": "gte", - "d": 3 - } + 106 ] }, { - "id": 110098, - "rtype": 1, + "id": 180, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_80", - "text": "获得N个初始属性大于等于A条的B星装备(从接到任务开始,每次获得强化为0级的A星装备时判断属性条目,大于或等于B进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_80", + "text": "测试数据" }, - "type": 99, + "type": 70, "valid": 0, "NPC": 0, "value": 2, "filter": [ - { - "s": "gte", - "d": 3 - }, - { - "s": "eq", - "d": 5 - } + 107 ] }, { - "id": 110101, - "rtype": 1, + "id": 181, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_81", - "text": "阵营饰品强化成功N次(历史)(从创号开始记录,强化成功进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_81", + "text": "测试数据" }, - "type": 102, - "valid": 0, - "NPC": 0, - "value": 1, - "filter": [] - }, - { - "id": 110102, - "rtype": 1, - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_82", - "text": "获得X星阵营饰品N件(历史)(从创号开始记录,每获得1件X星阵营饰品则进度+1)" - }, - "type": 103, + "type": 70, "valid": 0, "NPC": 0, "value": 1, "filter": [ - { - "s": "eq", - "d": 3 - } + 108 ] }, { - "id": 110103, - "rtype": 1, + "id": 182, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_83", - "text": "消费N个钻石(历史)(从创号开始记录,每次消耗钻石增加消耗额的进度)" + "key": "taskcond_rdtask_condi_tasktxt_82", + "text": "测试数据" }, - "type": 104, + "type": 70, + "valid": 0, + "NPC": 0, + "value": 1, + "filter": [ + 109 + ] + }, + { + "id": 183, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_83", + "text": "测试数据" + }, + "type": 140, "valid": 0, "NPC": 0, "value": 1000, - "filter": [] + "filter": [ + 10001 + ] }, { - "id": 110104, - "rtype": 1, + "id": 184, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_84", - "text": "商店刷新N次(从接到任务开始,每次刷新商店进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_84", + "text": "测试数据" }, - "type": 105, + "type": 140, "valid": 0, "NPC": 0, "value": 10, - "filter": [] + "filter": [ + 10002 + ] }, { - "id": 110105, - "rtype": 1, + "id": 185, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_85", - "text": "跨服聊天发言N次(从接到任务开始,每次跨服发言成功进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_85", + "text": "测试数据" }, - "type": 106, + "type": 140, "valid": 0, "NPC": 0, "value": 2, - "filter": [] + "filter": [ + 10003 + ] }, { - "id": 110106, - "rtype": 1, + "id": 186, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_86", - "text": "助战英雄被使用X次(从接到任务开始,每被使用1次则进度+1)" + "key": "taskcond_rdtask_condi_tasktxt_86", + "text": "测试数据" }, - "type": 108, + "type": 140, "valid": 0, "NPC": 0, "value": 1, - "filter": [] + "filter": [ + 10004 + ] }, { - "id": 110107, - "rtype": 1, + "id": 187, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_87", - "text": "加入公会(打开任务时,检查是否加入了公会,加入则完成)" + "key": "taskcond_rdtask_condi_tasktxt_87", + "text": "测试数据" }, "type": 109, "valid": 0, @@ -1512,1049 +1339,10036 @@ "filter": [] }, { - "id": 110109, - "rtype": 1, + "id": 188, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_88", - "text": "拥有N个X级英雄(打开任务时,检查达到X级的英雄数量,达到任务所需个数则完成任务,)" + "key": "taskcond_rdtask_condi_tasktxt_88", + "text": "测试数据" }, - "type": 111, + "type": 104, "valid": 0, "NPC": 0, "value": 3, - "filter": [ - { - "s": "gte", - "d": 20 - } - ] + "filter": [] }, { - "id": 110110, - "rtype": 1, + "id": 189, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_89", - "text": "养成N个X级英雄(从接到任务开始,英雄升级时,如果英雄的初始等级=配置的技能升级次数”则进度+1)" + }, + "type": 56, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1, + 2 + ] + }, + { + "id": 110057, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_649", + "text": "xx名英雄技能满级(打开任务时检查技能满级的英雄个数并记入进度)" + }, + "type": 57, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110060, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_650", + "text": "任意主线副本通关X次(接到任务后,每次通过主线副本进度+1)" + }, + "type": 60, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110061, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_651", + "text": "通关主线关卡xx(打开任务时检查所填关卡id是否通过,通过则任务完成)" + }, + "type": 61, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1100105 + ] + }, + { + "id": 110062, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_652", + "text": "世界聊天发言xx次(世界频道发一段话算一次,被限制发言CD不计入发言次数)" + }, + "type": 62, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110064, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_653", + "text": "任意商品购买xx次(在任意商店购买1份商品进度+1,一次购买10份进度+10。1份的定义为:玩家进行购买操作时最小可选的购买数量为1份)" + }, + "type": 64, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110065, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_654", + "text": "在商店购买xx商品xx件(在任意商店购买指定道具id的商品的数量)" + }, + "type": 65, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 10001 + ] + }, + { + "id": 110066, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_655", + "text": "xx商店购买任意商品xx次(在指定商店id中购买1份商品进度+1,一次购买10份进度+10。1份的定义为玩家进行购买操作时最小可选的购买数量为1份)" + }, + "type": 66, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1 + ] + }, + { + "id": 110067, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_656", + "text": "商店购物消耗xx货币xx个(某种货币发生减少时,将减少量计入进度)" + }, + "type": 67, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1 + ] + }, + { + "id": 110068, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_657", + "text": "任意渠道消耗xx金币(金币发生减少时,将减少量计入进度)" + }, + "type": 68, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110070, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_658", + "text": "通关世界任务XX关卡(X为世界任务战斗表的ID)" + }, + "type": 70, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 101 + ] + }, + { + "id": 110072, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_659", + "text": "通关难度A维京远征指定BOSSN次(从接到任务开始,只有通关A难度进度才+1)" + }, + "type": 73, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1, + 1 + ] + }, + { + "id": 110073, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_660", + "text": "通关难度A维京远征指定BOSS(检查最高难度记录是否超过了此难度,超过则完成)" + }, + "type": 74, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1 + ] + }, + { + "id": 110074, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_661", + "text": "自动战斗通关难度A的维京远征指定BOSS(从接到任务开始,若全程无手动操作(不包含变速)且挑战难度大于等于A则判断任务完成)" + }, + "type": 75, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1 + ] + }, + { + "id": 110075, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_662", + "text": "通关维京远征指定BOSSN次(从创号开始记录,通关任意难度进度都+1)" + }, + "type": 76, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1 + ] + }, + { + "id": 110076, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_663", + "text": "通关难度A及以上维京远征指定BOSSN次(从接到任务开始,若通关难度大于等于设定难度,则进度+1)" + }, + "type": 77, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1, + 1 + ] + }, + { + "id": 110077, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_664", + "text": "通关难度A维京远征指定BOSS时间达到XX秒以内(检查最高记录是否超过了此难度,超过则完成)" + }, + "type": 78, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1, + 30 + ] + }, + { + "id": 110078, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_665", + "text": "使用好友助战英雄通关A难度的指定维京远征BOSS(从接到任务开始,通关阵营中包含好友助战英雄,难度大于等于A的指定维京远征BOSS时任务完成。)" + }, + "type": 79, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1 + ] + }, + { + "id": 110079, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_666", + "text": "通关难度A指定狩猎BOSS难度N次(从接到任务开始,只有通关A难度进度才+1)" + }, + "type": 80, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1, + 1 + ] + }, + { + "id": 110080, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_667", + "text": "通关A难度狩猎BOOS(检查最高难度记录是否达到了此难度,达到则完成)" + }, + "type": 81, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1 + ] + }, + { + "id": 110081, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_668", + "text": "通关狩猎指定BOOSN次(历史)(从创号开始记录登陆天数,通关任意难度进度都+1)" + }, + "type": 82, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1 + ] + }, + { + "id": 110082, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_669", + "text": "通关难度A及以上指定狩猎BOOSN次(从接到任务开始,若通关难度大于等于设定难度,则进度+1)" + }, + "type": 83, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1, + 1 + ] + }, + { + "id": 110086, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_670", + "text": "发现月之秘境N次(从接到任务开始,发现一次则进度+1)" + }, + "type": 87, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110087, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_671", + "text": "完成月之秘境N次(从接到任务开始,打完一个月之秘境则进度+1(耗尽BOSS挑战次数))" + }, + "type": 88, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110088, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_672", + "text": "任意招募N次(从接到任务开始,普通招募和阵营招募都算,单抽1次,10连抽算10次)" + }, + "type": 89, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110089, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_673", + "text": "进行N次普通招募10连抽(从接到任务开始,单抽点10次不算,10连抽才进度+1)" + }, + "type": 90, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110090, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_674", + "text": "进行N次阵营招募10连抽(从接到任务开始,单抽点10次不算,10连抽才进度+1)" + }, + "type": 91, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110091, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_675", + "text": "强化装备N次(从接到任务开始,强化任意装备,失败和成功进度都+1)" + }, + "type": 92, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110092, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_676", + "text": "拥有一套强化到N级的A套装(记录A套装中每个部位的最高强化等级,并将这些强化等级中最低的数值计入进度,如果达到了任务所需的强化等级则完成任务。)" + }, + "type": 93, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 1 + ] + }, + { + "id": 110093, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_677", + "text": "装备附魔N次(历史)(从创号开始记录,附魔成功进度+1)" + }, + "type": 94, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110094, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_678", + "text": "装备洗练N次(历史)(从创号开始记录,洗练成功进度+1)" + }, + "type": 95, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110095, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_679", + "text": "强化失败N次(从接到任务开始,强化失败进度+1)" + }, + "type": 96, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110096, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_680", + "text": "获得X星X套装的装备N件(时段)(从接到任务开始,每获得1件X星X套装的装备则进度+1)" + }, + "type": 97, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 3, + 1 + ] + }, + { + "id": 110097, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_681", + "text": "穿戴N套强化A级的装备(打开任务时,检查英雄身上的装备的最低等级,当最低等级超过A则任务进度+1。)" + }, + "type": 98, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 3 + ] + }, + { + "id": 110098, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_682", + "text": "获得N个初始属性大于等于A条的B星装备(从接到任务开始,每次获得强化为0级的A星装备时判断属性条目,大于或等于B进度+1)" + }, + "type": 99, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 3, + 5 + ] + }, + { + "id": 110101, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_683", + "text": "阵营饰品强化成功N次(历史)(从创号开始记录,强化成功进度+1)" + }, + "type": 102, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110102, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_684", + "text": "获得X星阵营饰品N件(历史)(从创号开始记录,每获得1件X星阵营饰品则进度+1)" + }, + "type": 103, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 3 + ] + }, + { + "id": 110103, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_685", + "text": "消费N个钻石(历史)(从创号开始记录,每次消耗钻石增加消耗额的进度)" + }, + "type": 104, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110104, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_686", + "text": "商店刷新N次(从接到任务开始,每次刷新商店进度+1)" + }, + "type": 105, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110105, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_687", + "text": "跨服聊天发言N次(从接到任务开始,每次跨服发言成功进度+1)" + }, + "type": 106, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110106, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_688", + "text": "助战英雄被使用X次(从接到任务开始,每被使用1次则进度+1)" + }, + "type": 108, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110107, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_689", + "text": "加入公会(打开任务时,检查是否加入了公会,加入则完成)" + }, + "type": 109, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [] + }, + { + "id": 110109, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_690", + "text": "拥有N个X级英雄(打开任务时,检查达到X级的英雄数量,达到任务所需个数则完成任务,)" + }, + "type": 111, + "valid": 0, + "NPC": 0, + "value": 0, + "filter": [ + 20 + ] + }, + { + "id": 110110, + "rtype": 2, + "type_sp": 1, + "tasktxt": { + "key": "taskcond_rdtask_condi_tasktxt_691", + "text": "养成N个X级英雄(从接到任务开始,英雄升级时,如果英雄的初始等级=指定数目,任务便算完成)" }, "type": 175, "valid": 0, "NPC": 0, - "value": 40, + "value": 0, "filter": [] }, { "id": 110174, - "rtype": 1, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_141", + "key": "taskcond_rdtask_condi_tasktxt_743", "text": "解锁X个新图纸(从接取任务开始,在铁匠铺每解锁任意阶段的一个新图纸,进度便加一)" }, "type": 177, "valid": 0, "NPC": 0, - "value": 1, + "value": 0, "filter": [] }, { "id": 110175, - "rtype": 1, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_142", + "key": "taskcond_rdtask_condi_tasktxt_744", "text": "解锁X阶段装备新图纸X个(接取任务后开始记录,在铁匠铺对应阶段的一个新图纸,进度便加一)" }, "type": 179, "valid": 0, "NPC": 0, - "value": 2, + "value": 0, "filter": [ - { - "s": "gte", - "d": 2 - } + 2 ] }, { "id": 110176, - "rtype": 1, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_143", + "key": "taskcond_rdtask_condi_tasktxt_745", "text": "在X副本内使用好友助战X次(接取任务后开始记录,在对应副本内使用好友助战每有1次,进度便加一)" }, "type": 180, "valid": 0, "NPC": 0, - "value": 1, + "value": 0, "filter": [ - { - "s": "eq", - "d": 1 - } + 1 ] }, { "id": 110177, - "rtype": 1, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_144", + "key": "taskcond_rdtask_condi_tasktxt_746", "text": "X副本X难度自动战斗X次(接取任务后开始记录,在对应副本的指定难度内,使用自动战斗每有1次,进度便加一)" }, "type": 181, "valid": 0, "NPC": 0, - "value": 1, + "value": 0, "filter": [ - { - "s": "eq", - "d": 1 - }, - { - "s": "gte", - "d": 1 - } + 1, + 1 ] }, { "id": 110178, - "rtype": 1, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_145", + "key": "taskcond_rdtask_condi_tasktxt_747", "text": "打赢武馆内踢馆X次(接取任务后开始记录,每赢得一次踢馆战斗的胜利,进度便加一)" }, "type": 182, "valid": 0, "NPC": 0, - "value": 1, + "value": 0, "filter": [] }, { "id": 110179, - "rtype": 1, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_146", + "key": "taskcond_rdtask_condi_tasktxt_748", "text": "去好友武馆踢馆X次(接取任务后开始记录,每次在好友武馆开启一场踢馆,便进度加一)" }, "type": 183, "valid": 0, "NPC": 0, - "value": 1, + "value": 0, "filter": [] }, { "id": 110180, - "rtype": 1, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_147", + "key": "taskcond_rdtask_condi_tasktxt_749", "text": "使用好友武馆木桩X次(接取任务后,每次使用好友的木桩训练英雄一次,进度便加一)" }, "type": 184, "valid": 0, "NPC": 0, - "value": 1, + "value": 0, "filter": [] }, { "id": 110181, - "rtype": 1, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_148", + "key": "taskcond_rdtask_condi_tasktxt_750", "text": "完成X次每日1健(接取任务后,每完成1次每日1健,便进度加一)" }, "type": 185, "valid": 0, "NPC": 0, - "value": 2, + "value": 0, "filter": [] }, { "id": 110182, - "rtype": 1, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_149", + "key": "taskcond_rdtask_condi_tasktxt_751", "text": "武馆的派遣悬赏X次(接取任务后开始计算,当玩家的派遣完成1次,进度便加一,不领奖也算一次,只要倒计时结束即可)" }, "type": 186, "valid": 0, "NPC": 0, - "value": 2, + "value": 0, "filter": [] }, { "id": 110183, - "rtype": 1, + "rtype": 2, "type_sp": 1, "tasktxt": { - "key": "buried_buried_condi_tasktxt_150", + "key": "taskcond_rdtask_condi_tasktxt_752", "text": "搜集X道具Y个" }, "type": 187, "valid": 0, "NPC": 0, - "value": 5, + "value": 0, "filter": [ - { - "s": "eq", - "d": 132000 - } + 132000 ] } ] \ No newline at end of file diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json index 2b21ec5ee..b9760e1a7 100644 --- a/bin/json/game_buriedtype.json +++ b/bin/json/game_buriedtype.json @@ -1,746 +1,1126 @@ [ { "id": 1, - "insert": 2 + "insert": 2, + "filter": [ + "eq" + ] }, { "id": 2, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 3, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 4, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 5, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 6, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 7, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 8, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 9, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 10, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 11, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 12, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 13, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 14, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 15, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 16, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 17, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 18, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 19, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 20, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 21, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 22, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 23, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "gte" + ] }, { "id": 24, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 25, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "eq" + ] }, { "id": 26, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 27, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 28, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 29, - "insert": 3 + "insert": 3, + "filter": [ + "gte", + "eq" + ] }, { "id": 30, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 31, - "insert": 1 + "insert": 1, + "filter": [ + "eq" + ] }, { "id": 32, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "gte" + ] }, { "id": 33, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "gte" + ] }, { "id": 34, - "insert": 0 + "insert": 0, + "filter": [ + "gte" + ] }, { "id": 35, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 36, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "eq", + "eq", + "gte" + ] }, { "id": 37, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 38, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 39, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 40, - "insert": 0 + "insert": 0, + "filter": [ + "gte" + ] }, { "id": 41, - "insert": 0 + "insert": 0, + "filter": [ + "gte", + "eq" + ] }, { "id": 42, - "insert": 0 + "insert": 0, + "filter": [ + "gte", + "gte" + ] }, { "id": 43, - "insert": 0 + "insert": 0, + "filter": [ + "gte" + ] }, { "id": 44, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 45, - "insert": 1 + "insert": 1, + "filter": [ + "eq", + "eq", + "gte" + ] }, { "id": 46, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "eq" + ] }, { "id": 47, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 48, - "insert": 1 + "insert": 1, + "filter": [ + "eq", + "gte" + ] }, { "id": 49, - "insert": 1 + "insert": 1, + "filter": [ + "eq", + "gte" + ] }, { "id": 50, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 51, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 52, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 53, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 54, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 55, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 56, - "insert": 0 + "insert": 0, + "filter": [ + "gte", + "eq" + ] }, { "id": 57, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 58, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 59, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 60, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 61, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 62, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 63, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 64, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 65, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 66, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 67, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 68, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 69, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 70, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 72, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 73, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "gte" + ] }, { "id": 74, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "gte" + ] }, { "id": 75, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 76, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 77, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "gte" + ] }, { "id": 78, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "lte" + ] }, { "id": 79, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 80, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "gte" + ] }, { "id": 81, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 82, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 83, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "gte" + ] }, { "id": 84, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 85, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 86, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 87, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 88, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 89, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 90, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 91, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 92, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 93, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "gte" + ] }, { "id": 94, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 95, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 96, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 97, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "eq" + ] }, { "id": 98, - "insert": 0 + "insert": 0, + "filter": [ + "gte" + ] }, { "id": 99, - "insert": 0 + "insert": 0, + "filter": [ + "gte", + "eq" + ] }, { "id": 100, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 101, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 102, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 103, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 104, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 105, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 106, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 108, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 109, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 110, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 111, - "insert": 0 + "insert": 0, + "filter": [ + "gte" + ] }, { "id": 112, - "insert": 0 + "insert": 0, + "filter": [ + "gte" + ] }, { "id": 113, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 114, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 115, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 116, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 117, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 118, - "insert": 0 + "insert": 0, + "filter": [ + "gte", + "eq" + ] }, { "id": 119, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 120, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 121, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 122, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 123, - "insert": 0 + "insert": 0, + "filter": [ + "gte", + "eq" + ] }, { "id": 124, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 125, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 126, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 127, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 128, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 129, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 130, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 131, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 132, - "insert": 0 + "insert": 0, + "filter": [ + "gte" + ] }, { "id": 133, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 134, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 135, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 136, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 137, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 138, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 139, - "insert": 1 + "insert": 1, + "filter": [] }, { "id": 140, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 141, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 142, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 143, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 144, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 145, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 146, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 147, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 148, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 149, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 150, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 151, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 152, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 153, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 154, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 155, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 156, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 157, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "eq" + ] }, { "id": 158, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "gte" + ] }, { "id": 159, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 160, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 161, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 162, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 163, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 164, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 165, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 166, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 167, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 168, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 169, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 170, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 171, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 172, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 173, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 174, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 175, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 177, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 179, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 180, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 181, - "insert": 0 + "insert": 0, + "filter": [ + "eq", + "gte" + ] }, { "id": 182, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 183, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 184, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 185, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 186, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 187, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 188, - "insert": 0 + "insert": 0, + "filter": [] }, { "id": 20001, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] }, { "id": 20002, - "insert": 0 + "insert": 0, + "filter": [ + "eq" + ] } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 17a639c42..096eedb91 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -9054,9 +9054,9 @@ { "Id": 224002111, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], - "Order": "Type=Rand", + "Order": "", "Limit": 1, "ExecuteCnt": 1, "Type": 1, @@ -9081,7 +9081,7 @@ { "Id": 224002112, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 1, @@ -9157,7 +9157,7 @@ { "Id": 224002122, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 1, @@ -9209,7 +9209,7 @@ { "Id": 224002132, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 1, @@ -9261,7 +9261,7 @@ { "Id": 224002142, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 1, @@ -9313,7 +9313,7 @@ { "Id": 224002152, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 1, @@ -9365,7 +9365,7 @@ { "Id": 224002162, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 1, @@ -9565,7 +9565,7 @@ 390001211, 1000, 5, - 1 + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -9588,10 +9588,12 @@ "Argu": [ 1, 4, - 2050 + 2100 ], "FollowSK": [], - "SucFollowSK": [], + "SucFollowSK": [ + 224002313 + ], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -9611,10 +9613,12 @@ "Argu": [ 1, 4, - 2050 + 2100 ], "FollowSK": [], - "SucFollowSK": [], + "SucFollowSK": [ + 224002313 + ], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -9634,10 +9638,12 @@ "Argu": [ 1, 4, - 2100 + 2200 ], "FollowSK": [], - "SucFollowSK": [], + "SucFollowSK": [ + 224002313 + ], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -9657,10 +9663,12 @@ "Argu": [ 1, 4, - 2100 + 2200 ], "FollowSK": [], - "SucFollowSK": [], + "SucFollowSK": [ + 224002313 + ], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index a1b7b2fa2..14b25ff0a 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -22,6 +22,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -52,6 +53,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -82,6 +84,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -112,6 +115,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -142,6 +146,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -172,6 +177,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -202,6 +208,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -234,6 +241,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -264,6 +272,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -294,6 +303,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -324,6 +334,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, "golbalbufficon": "", @@ -354,6 +365,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, "golbalbufficon": "", @@ -384,6 +396,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -414,6 +427,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -441,6 +455,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -470,6 +485,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -497,6 +513,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -524,6 +541,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -551,6 +569,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -578,6 +597,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -605,6 +625,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -632,6 +653,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -659,6 +681,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -690,6 +713,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -717,6 +741,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -744,6 +769,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -771,6 +797,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -798,6 +825,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -825,6 +853,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -852,6 +881,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -879,6 +909,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -906,6 +937,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -933,6 +965,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -964,6 +997,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -995,6 +1029,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, "golbalbufficon": "", @@ -1022,6 +1057,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1053,6 +1089,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1080,6 +1117,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1111,6 +1149,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1138,6 +1177,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1169,6 +1209,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1200,6 +1241,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, "golbalbufficon": "", @@ -1230,6 +1272,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 10, "SameID": false, "golbalbufficon": "", @@ -1262,6 +1305,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 10, "SameID": false, "golbalbufficon": "", @@ -1289,6 +1333,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1316,6 +1361,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 8, "SameID": false, "golbalbufficon": "", @@ -1343,6 +1389,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1370,6 +1417,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1400,6 +1448,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1427,6 +1476,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1457,6 +1507,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 5, "SameID": false, "golbalbufficon": "", @@ -1477,7 +1528,8 @@ "BuffType": 69, "EffectArgu": [ 2, - 224002214 + 224002214, + 224002215 ], "BufParNum": 1, "RelyCheckArgu": [], @@ -1487,6 +1539,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 1, "OverlayTimes": 5, "SameID": false, "golbalbufficon": "", @@ -1517,6 +1570,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 50, "SameID": false, "golbalbufficon": "", @@ -1546,6 +1600,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1573,6 +1628,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1602,6 +1658,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1631,6 +1688,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -1656,6 +1714,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -1686,6 +1745,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 8, "SameID": false, "golbalbufficon": "", @@ -1716,6 +1776,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1746,6 +1807,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1776,6 +1838,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1806,6 +1869,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1836,6 +1900,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1866,6 +1931,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1896,6 +1962,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1926,6 +1993,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1956,6 +2024,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -1986,6 +2055,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2016,6 +2086,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2046,6 +2117,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2076,6 +2148,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2106,6 +2179,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2136,6 +2210,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2166,6 +2241,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2196,6 +2272,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2226,6 +2303,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2256,6 +2334,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2286,6 +2365,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2316,6 +2396,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2346,6 +2427,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2376,6 +2458,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2406,6 +2489,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2436,6 +2520,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2466,6 +2551,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2496,6 +2582,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2529,6 +2616,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, "golbalbufficon": "", @@ -2558,6 +2646,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2587,6 +2676,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2618,6 +2708,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, "golbalbufficon": "", @@ -2648,6 +2739,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, "golbalbufficon": "", @@ -2678,6 +2770,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, "golbalbufficon": "", @@ -2708,6 +2801,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, "golbalbufficon": "", @@ -2738,6 +2832,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, "golbalbufficon": "", @@ -2767,6 +2862,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, "golbalbufficon": "", @@ -2797,6 +2893,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, "golbalbufficon": "", @@ -2827,6 +2924,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, "golbalbufficon": "", @@ -2856,6 +2954,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -2883,6 +2982,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, "golbalbufficon": "", @@ -2912,6 +3012,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, "golbalbufficon": "", @@ -2942,6 +3043,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, "golbalbufficon": "", @@ -2969,6 +3071,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -2996,6 +3099,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -3023,6 +3127,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -3054,6 +3159,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, "golbalbufficon": "", @@ -3079,6 +3185,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -3106,6 +3213,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -3136,6 +3244,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 10, "SameID": false, "golbalbufficon": "", @@ -3161,6 +3270,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -3191,6 +3301,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, "golbalbufficon": "", @@ -3218,6 +3329,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -3247,6 +3359,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 5, "SameID": true, "golbalbufficon": "", @@ -3277,6 +3390,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, "golbalbufficon": "", @@ -3302,6 +3416,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -3333,6 +3448,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, "golbalbufficon": "", @@ -3362,6 +3478,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, "golbalbufficon": "", @@ -3389,6 +3506,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, "golbalbufficon": "", @@ -3416,6 +3534,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, "golbalbufficon": "", @@ -3447,6 +3566,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -3475,6 +3595,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, "golbalbufficon": "", @@ -3505,6 +3626,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -3535,6 +3657,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "buff_gj_ts", @@ -3565,6 +3688,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "buff_fy_ts", @@ -3595,6 +3719,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "buff_bj_ts", @@ -3622,6 +3747,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "buff_bj_dk", @@ -3652,6 +3778,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "buff_mz_ts", @@ -3682,6 +3809,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "buff_dk_ts", @@ -3710,6 +3838,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -3740,6 +3869,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, "golbalbufficon": "", @@ -3765,6 +3895,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -3795,6 +3926,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, "golbalbufficon": "", @@ -3820,6 +3952,7 @@ "Effect": [], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -3847,6 +3980,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", @@ -3877,6 +4011,7 @@ ], "AddEffect": false, "RemoveType": false, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", @@ -3907,6 +4042,7 @@ ], "AddEffect": false, "RemoveType": true, + "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, "golbalbufficon": "", diff --git a/bin/json/game_talentbox.json b/bin/json/game_talentbox.json index f0205f6ec..3103e5cf9 100644 --- a/bin/json/game_talentbox.json +++ b/bin/json/game_talentbox.json @@ -1,286 +1,286 @@ [ { "heroid": "13001", - "itemid": "513001" + "itemid": "11013001" }, { "heroid": "13002", - "itemid": "513002" + "itemid": "11013002" }, { "heroid": "13003", - "itemid": "513003" + "itemid": "11013003" }, { "heroid": "13004", - "itemid": "513004" + "itemid": "11013004" }, { "heroid": "13005", - "itemid": "513005" + "itemid": "11013005" }, { "heroid": "14001", - "itemid": "514001" + "itemid": "11014001" }, { "heroid": "14002", - "itemid": "514002" + "itemid": "11014002" }, { "heroid": "14003", - "itemid": "514003" + "itemid": "11014003" }, { "heroid": "14004", - "itemid": "514004" + "itemid": "11014004" }, { "heroid": "14005", - "itemid": "514005" + "itemid": "11014005" }, { "heroid": "14006", - "itemid": "514006" + "itemid": "11014006" }, { "heroid": "14007", - "itemid": "514007" + "itemid": "11014007" }, { "heroid": "15001", - "itemid": "515001" + "itemid": "11015001" }, { "heroid": "15002", - "itemid": "515002" + "itemid": "11015002" }, { "heroid": "15003", - "itemid": "515003" + "itemid": "11015003" }, { "heroid": "15004", - "itemid": "515004" + "itemid": "11015004" }, { "heroid": "23001", - "itemid": "523001" + "itemid": "11023001" }, { "heroid": "23002", - "itemid": "523002" + "itemid": "11023002" }, { "heroid": "23003", - "itemid": "523003" + "itemid": "11023003" }, { "heroid": "23004", - "itemid": "523004" + "itemid": "11023004" }, { "heroid": "24001", - "itemid": "524001" + "itemid": "11024001" }, { "heroid": "24002", - "itemid": "524002" + "itemid": "11024002" }, { "heroid": "24003", - "itemid": "524003" + "itemid": "11024003" }, { "heroid": "24004", - "itemid": "524004" + "itemid": "11024004" }, { "heroid": "24005", - "itemid": "524005" + "itemid": "11024005" }, { "heroid": "24006", - "itemid": "524006" + "itemid": "11024006" }, { "heroid": "24007", - "itemid": "524007" + "itemid": "11024007" }, { "heroid": "24008", - "itemid": "524008" + "itemid": "11024008" }, { "heroid": "24009", - "itemid": "524009" + "itemid": "11024009" }, { "heroid": "25001", - "itemid": "525001" + "itemid": "11025001" }, { "heroid": "25002", - "itemid": "525002" + "itemid": "11025002" }, { "heroid": "25003", - "itemid": "525003" + "itemid": "11025003" }, { "heroid": "25004", - "itemid": "525004" + "itemid": "11025004" }, { "heroid": "33001", - "itemid": "533001" + "itemid": "11033001" }, { "heroid": "33002", - "itemid": "533002" + "itemid": "11033002" }, { "heroid": "33003", - "itemid": "533003" + "itemid": "11033003" }, { "heroid": "33004", - "itemid": "533004" + "itemid": "11033004" }, { "heroid": "33005", - "itemid": "533005" + "itemid": "11033005" }, { "heroid": "33006", - "itemid": "533006" + "itemid": "11033006" }, { "heroid": "34001", - "itemid": "534001" + "itemid": "11034001" }, { "heroid": "34002", - "itemid": "534002" + "itemid": "11034002" }, { "heroid": "34003", - "itemid": "534003" + "itemid": "11034003" }, { "heroid": "34004", - "itemid": "534004" + "itemid": "11034004" }, { "heroid": "34005", - "itemid": "534005" + "itemid": "11034005" }, { "heroid": "34006", - "itemid": "534006" + "itemid": "11034006" }, { "heroid": "34007", - "itemid": "534007" + "itemid": "11034007" }, { "heroid": "34008", - "itemid": "534008" + "itemid": "11034008" }, { "heroid": "35001", - "itemid": "535001" + "itemid": "11035001" }, { "heroid": "35002", - "itemid": "535002" + "itemid": "11035002" }, { "heroid": "35003", - "itemid": "535003" + "itemid": "11035003" }, { "heroid": "35004", - "itemid": "535004" + "itemid": "11035004" }, { "heroid": "35005", - "itemid": "535005" + "itemid": "11035005" }, { "heroid": "35006", - "itemid": "535006" + "itemid": "11035006" }, { "heroid": "43001", - "itemid": "543001" + "itemid": "11043001" }, { "heroid": "43002", - "itemid": "543002" + "itemid": "11043002" }, { "heroid": "43003", - "itemid": "543003" + "itemid": "11043003" }, { "heroid": "43004", - "itemid": "543004" + "itemid": "11043004" }, { "heroid": "43005", - "itemid": "543005" + "itemid": "11043005" }, { "heroid": "43006", - "itemid": "543006" + "itemid": "11043006" }, { "heroid": "43007", - "itemid": "543007" + "itemid": "11043007" }, { "heroid": "44001", - "itemid": "544001" + "itemid": "11044001" }, { "heroid": "44002", - "itemid": "544002" + "itemid": "11044002" }, { "heroid": "44003", - "itemid": "544003" + "itemid": "11044003" }, { "heroid": "44004", - "itemid": "544004" + "itemid": "11044004" }, { "heroid": "44006", - "itemid": "544006" + "itemid": "11044006" }, { "heroid": "45001", - "itemid": "545001" + "itemid": "11045001" }, { "heroid": "45002", - "itemid": "545002" + "itemid": "11045002" }, { "heroid": "45003", - "itemid": "545003" + "itemid": "11045003" }, { "heroid": "45004", - "itemid": "545004" + "itemid": "11045004" }, { "heroid": "44005", - "itemid": "544005" + "itemid": "11044005" }, { "heroid": "15005", - "itemid": "515005" + "itemid": "11015005" } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 78700daf6..9638f9af5 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -4458,7 +4458,7 @@ "lock": 999, "lockend": 0, "ontxe": 20010, - "id_after": 30200, + "id_after": 0, "group": 390, "des": 3, "icon": "", @@ -4501,9 +4501,9 @@ "key": 30200, "lock": 999, "lockend": 0, - "ontxe": 30190, + "ontxe": 999, "id_after": 30210, - "group": 390, + "group": 391, "des": 3, "icon": "", "task_Tname": { @@ -4547,7 +4547,7 @@ "lockend": 0, "ontxe": 30200, "id_after": 0, - "group": 390, + "group": 391, "des": 3, "icon": "", "task_Tname": { @@ -4633,7 +4633,7 @@ "key": 30230, "lock": 999, "lockend": 0, - "ontxe": 20040, + "ontxe": 999, "id_after": 0, "group": 410, "des": 3, @@ -4677,7 +4677,7 @@ "key": 30240, "lock": 999, "lockend": 0, - "ontxe": 20050, + "ontxe": 999, "id_after": 0, "group": 420, "des": 3, diff --git a/comm/imodule.go b/comm/imodule.go index b1630095e..d3bd790eb 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -508,8 +508,10 @@ type ( //埋点中心触发 TriggerBuried(uid string, burieds ...*BuriedParam) //校验条件是否达成 - CheckCondition(uid string, condiIds ...int32) (condIds []int32) + CheckCondition(uid string, condiIds ...int32) (condIds []int32, err error) //激活条件 - ActiveCondition(uid string, condiIds ...int32) + ActiveCondition(uid string, condiIds ...int32) (err error) + //校验的同时激活条件 + CheckAndActiveCondition(uid string, condiIds ...int32) (condIds []int32, err error) } ) diff --git a/modules/buried/configure.go b/modules/buried/configure.go index 8a1cf613b..87d1cb5a4 100644 --- a/modules/buried/configure.go +++ b/modules/buried/configure.go @@ -51,6 +51,25 @@ func (this *configureComp) getburiedtypedata(tt comm.TaskType) (result *cfg.Game return } +//读取条件任务id配置 +func (this *configureComp) getburiedcondidata(cid int32) (result *cfg.GameBuriedCondiData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_buriedcondi); err != nil { + this.module.Errorf("err:%v", err) + return + } else { + if result, ok = v.(*cfg.GameBuriedCondi).GetDataMap()[cid]; !ok { + err = comm.NewNotFoundConfErr(moduleName, game_buriedtype, cid) + this.module.Errorf("err:%v", err) + return + } + } + return +} + //动态更新配置 func (this *configureComp) updateconfigure() { if v, err := this.GetConfigure(game_buriedcondi); err != nil { diff --git a/modules/buried/core.go b/modules/buried/core.go index 8bde1a95e..b2504a074 100644 --- a/modules/buried/core.go +++ b/modules/buried/core.go @@ -32,37 +32,39 @@ const ( ) //判断埋点数据的有效性 -func checkburied(buried *comm.BuriedParam, conf *cfg.GameBuriedCondiData) (efficient bool) { - if len(buried.Filter) != len(conf.Filter) { +func checkburied(buried *comm.BuriedParam, bconf *cfg.GameBuriedTypeData, conf *cfg.GameBuriedCondiData) (efficient bool) { + if len(buried.Filter) == len(conf.Filter) { log.Error("校验埋点错误!", log.Field{Key: "buried", Value: buried}, log.Field{Key: "conf", Value: conf}) return } for i, v := range conf.Filter { efficient = false value := buried.Filter[i] - switch v.S { + symbol := bconf.Filter[i] + target := conf.Filter[i] + switch symbol { case eq: //== - if value == v.D { + if value == target { efficient = true } case gt: //> - if value > v.D { + if value > target { efficient = true } case gte: //>= - if value >= v.D { + if value >= target { efficient = true } case lt: //< - if value < v.D { + if value < target { efficient = true } case lte: //<= - if value <= v.D { + if value <= target { efficient = true } case ne: //!= - if value != v.D { + if value != target { efficient = true } default: diff --git a/modules/buried/module.go b/modules/buried/module.go index ccc0e16cf..fcfbcc9cf 100644 --- a/modules/buried/module.go +++ b/modules/buried/module.go @@ -58,15 +58,132 @@ func (this *Buried) OnInstallComp() { } //激活数据采集点 -func (this *Buried) ActiveCondition(uid string, condiIds ...int32) { - +func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) { + var ( + model *buriedModel + conf *cfg.GameBuriedCondiData + bdatas map[int32]*pb.DBBuried + chanage []*pb.DBBuried //变化埋点 + ) + if model, err = this.modelBuried.getburiedModel(uid); err != nil { + this.Error("获取用户埋点数据模型对象失败!", log.Field{Key: "err", Value: err.Error()}) + return + } + if bdatas, err = model.getUserBurieds(uid); err != nil { + return + } + chanage = make([]*pb.DBBuried, 0) + for _, v := range condiIds { + if conf, err = this.configure.getburiedcondidata(v); err != nil { + return + } + if bdata, ok := bdatas[conf.Type]; ok { + if conf.Rtype == rtype2 { + if item, ok := bdata.Items[v]; !ok { + bdata.Items[v] = &pb.DBBuriedItem{ + Conid: v, + State: pb.BuriedItemState_Activated, + Value: 0, + Statistics: make([]string, 0), + Timestamp: time.Now().Unix(), + } + chanage = append(chanage, bdata) + } else { + item.Value = 0 + item.Statistics = make([]string, 0) + item.Timestamp = time.Now().Unix() + item.State = pb.BuriedItemState_Activated + chanage = append(chanage, bdata) + } + } + } + } + if len(chanage) > 0 { + err = model.updateUserBurieds(uid, chanage) + } return } //激活数据采集点 -func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condIds []int32) { +func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condIds []int32, err error) { + var ( + model *buriedModel + bdatas map[int32]*pb.DBBuried + conf *cfg.GameBuriedCondiData + ) + if model, err = this.modelBuried.getburiedModel(uid); err != nil { + this.Error("获取用户埋点数据模型对象失败!", log.Field{Key: "err", Value: err.Error()}) + return + } + if bdatas, err = model.getUserBurieds(uid); err != nil { + return + } + condIds = make([]int32, 0) + for _, v := range condiIds { + if conf, err = this.configure.getburiedcondidata(v); err != nil { + return + } + if bdata, ok := bdatas[conf.Type]; ok { + if data, ok := bdata.Items[v]; ok { + if data.Value >= conf.Value { + condIds = append(condIds, v) + } + } + } + } + return +} - +//校验同时激活 +func (this *Buried) CheckAndActiveCondition(uid string, condiIds ...int32) (condIds []int32, err error) { + var ( + model *buriedModel + bdatas map[int32]*pb.DBBuried + conf *cfg.GameBuriedCondiData + chanage []*pb.DBBuried //变化埋点 + ) + if model, err = this.modelBuried.getburiedModel(uid); err != nil { + this.Error("获取用户埋点数据模型对象失败!", log.Field{Key: "err", Value: err.Error()}) + return + } + if bdatas, err = model.getUserBurieds(uid); err != nil { + return + } + condIds = make([]int32, 0) + chanage = make([]*pb.DBBuried, 0) + for _, v := range condiIds { + if conf, err = this.configure.getburiedcondidata(v); err != nil { + return + } + if bdata, ok := bdatas[conf.Type]; ok { + if data, ok := bdata.Items[v]; ok { + if data.Value >= conf.Value { + condIds = append(condIds, v) + } + } + if conf.Rtype == rtype2 { + if item, ok := bdata.Items[v]; !ok { + bdata.Items[v] = &pb.DBBuriedItem{ + Conid: v, + State: pb.BuriedItemState_Activated, + Value: 0, + Statistics: make([]string, 0), + Timestamp: time.Now().Unix(), + } + chanage = append(chanage, bdata) + } else { + item.Value = 0 + item.Statistics = make([]string, 0) + item.Timestamp = time.Now().Unix() + item.State = pb.BuriedItemState_Activated + chanage = append(chanage, bdata) + } + } + } + } + if len(chanage) > 0 { + err = model.updateUserBurieds(uid, chanage) + } return } @@ -90,8 +207,12 @@ func (this *Buried) TriggerBuried(uid string, burieds ...*comm.BuriedParam) { } for _, buried := range burieds { conds := this.configure.getCondiDatas(buried.Btype) + if bconf, err = this.configure.getburiedtypedata(buried.Btype); err != nil { + this.Error("未找到目标埋点类型配置", log.Field{Key: "type", Value: buried.Btype}) + continue + } for _, cond := range conds { - if checkburied(buried, cond) { //判断此埋点数据是否有效 + if checkburied(buried, bconf, cond) { //判断此埋点数据是否有效 if _, ok := pass[buried]; !ok { pass[buried] = make([]*cfg.GameBuriedCondiData, 0) } diff --git a/modules/friend/api_cross_blacklist.go b/modules/friend/api_cross_blacklist.go index 443609c00..d6d50e3fd 100644 --- a/modules/friend/api_cross_blacklist.go +++ b/modules/friend/api_cross_blacklist.go @@ -5,7 +5,7 @@ import ( "go_dreamfactory/pb" ) -//黑名单列表 +// 黑名单列表 func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.FriendBlackListReq) (code pb.ErrorCode) { return } diff --git a/modules/friend/api_cross_del.go b/modules/friend/api_cross_del.go index f598256e4..4950e8352 100644 --- a/modules/friend/api_cross_del.go +++ b/modules/friend/api_cross_del.go @@ -7,7 +7,7 @@ import ( "go_dreamfactory/utils" ) -//删除好友 +// 删除好友 func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) (code pb.ErrorCode) { if req.FriendId == "" { code = pb.ErrorCode_ReqParameterError diff --git a/modules/friend/api_cross_delblack.go b/modules/friend/api_cross_delblack.go index 56339aee4..c262d98be 100644 --- a/modules/friend/api_cross_delblack.go +++ b/modules/friend/api_cross_delblack.go @@ -7,7 +7,7 @@ import ( "go_dreamfactory/utils" ) -//删除黑名单 +// 删除黑名单 func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelBlackReq) (code pb.ErrorCode) { if req.FriendId == "" { code = pb.ErrorCode_ReqParameterError diff --git a/modules/friend/api_cross_refuse.go b/modules/friend/api_cross_refuse.go index 286c7e04f..d9c775002 100644 --- a/modules/friend/api_cross_refuse.go +++ b/modules/friend/api_cross_refuse.go @@ -17,7 +17,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuse return } -//单个/批量拒绝 +// 单个/批量拒绝 func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success { return diff --git a/modules/friend/api_cross_search.go b/modules/friend/api_cross_search.go index 78938d943..3117a679f 100644 --- a/modules/friend/api_cross_search.go +++ b/modules/friend/api_cross_search.go @@ -7,7 +7,7 @@ import ( "go_dreamfactory/utils" ) -//搜索 +// 搜索 func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode) { if req.NickName == "" { code = pb.ErrorCode_FriendSearchNameEmpty diff --git a/modules/linestory/api.go b/modules/linestory/api.go index 4321b4d07..63e3aed78 100644 --- a/modules/linestory/api.go +++ b/modules/linestory/api.go @@ -13,13 +13,13 @@ const ( type apiComp struct { modules.MCompGate - service core.IService - moduleLinestory *ModuleLinestory + service core.IService + module *ModuleLinestory } func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.MCompGate.Init(service, module, comp, options) - this.moduleLinestory = module.(*ModuleLinestory) + this.module = module.(*ModuleLinestory) this.service = service return } diff --git a/modules/linestory/api_chapter.go b/modules/linestory/api_chapter.go index 3cd18431b..4372356bb 100644 --- a/modules/linestory/api_chapter.go +++ b/modules/linestory/api_chapter.go @@ -12,12 +12,12 @@ func (this *apiComp) ChapterCheck(session comm.IUserSession, req *pb.LinestoryCh func (this *apiComp) Chapter(session comm.IUserSession, req *pb.LinestoryChapterReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() - taskMap := this.moduleLinestory.modelLinestory.getChapters(uid) + taskMap := this.module.modelLinestory.getChapters(uid) rsp := &pb.LinestoryChapterResp{ TaskChapter: taskMap, } - if err := session.SendMsg(string(this.moduleLinestory.GetType()), LinestorySubTypeChapter, rsp); err != nil { + if err := session.SendMsg(string(this.module.GetType()), LinestorySubTypeChapter, rsp); err != nil { code = pb.ErrorCode_SystemError } return diff --git a/modules/linestory/api_maintask.go b/modules/linestory/api_maintask.go index 43d74668a..ba377d29e 100644 --- a/modules/linestory/api_maintask.go +++ b/modules/linestory/api_maintask.go @@ -9,7 +9,7 @@ import ( // 支线剧情-我的主线任务 func (this *apiComp) MaintaskCheck(session comm.IUserSession, req *pb.LinestoryMaintaskReq) (code pb.ErrorCode) { if req.ChapterId == 0 { - this.moduleLinestory.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) + this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) code = pb.ErrorCode_ReqParameterError } return @@ -22,13 +22,13 @@ func (this *apiComp) Maintask(session comm.IUserSession, req *pb.LinestoryMainta uid := session.GetUserId() // 我的主线任务 - list := this.moduleLinestory.modelLinestory.getMaintasks(uid, req.ChapterId) + list := this.module.modelLinestory.getMaintasks(uid, req.ChapterId) rsp := &pb.LinestoryMaintaskResp{ List: list, } - if err := session.SendMsg(string(this.moduleLinestory.GetType()), LinestorySubTypeMaintask, rsp); err != nil { + if err := session.SendMsg(string(this.module.GetType()), LinestorySubTypeMaintask, rsp); err != nil { code = pb.ErrorCode_SystemError return } diff --git a/modules/linestory/api_receive.go b/modules/linestory/api_receive.go index 0c0e987fc..14ea15f43 100644 --- a/modules/linestory/api_receive.go +++ b/modules/linestory/api_receive.go @@ -11,7 +11,7 @@ import ( // 章节奖励领取 func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.LinestoryReceiveReq) (code pb.ErrorCode) { if req.ChapterId == 0 { - this.moduleLinestory.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) + this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) code = pb.ErrorCode_ReqParameterError } return @@ -22,27 +22,27 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceive return } uid := session.GetUserId() - conf := this.moduleLinestory.configure.getChapterCfgById(req.ChapterId) + conf := this.module.configure.getChapterCfgById(req.ChapterId) if conf == nil { - this.moduleLinestory.Error("配置未找到", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}) + this.module.Error("配置未找到", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}) code = pb.ErrorCode_ConfigNoFound return } - if err := this.moduleLinestory.modelLinestory.receive(uid, req.ChapterId); err != nil { + if err := this.module.modelLinestory.receive(uid, req.ChapterId); err != nil { var customErr = new(comm.CustomError) if errors.As(err, &customErr) { code = customErr.Code } else { code = pb.ErrorCode_DBError } - this.moduleLinestory.Error("章节奖励领取失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}, log.Field{Key: "code", Value: code}) + this.module.Error("章节奖励领取失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}, log.Field{Key: "code", Value: code}) return } //发奖 - if code = this.moduleLinestory.DispenseRes(session, conf.Reward, true); code != pb.ErrorCode_Success { - this.moduleLinestory.Error("奖励发放失败", + if code = this.module.DispenseRes(session, conf.Reward, true); code != pb.ErrorCode_Success { + this.module.Error("奖励发放失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}, log.Field{Key: "reward", Value: conf.Reward}, ) return @@ -52,7 +52,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceive ChapterId: req.ChapterId, UserAssets: utils.ConvertReward(conf.Reward...), } - if err := session.SendMsg(string(this.moduleLinestory.GetType()), LinestorySubTypeReceive, rsp); err != nil { + if err := session.SendMsg(string(this.module.GetType()), LinestorySubTypeReceive, rsp); err != nil { code = pb.ErrorCode_SystemError } return diff --git a/modules/task/api_activelist.go b/modules/task/api_activelist.go index 98607c2fd..bdfc0e416 100644 --- a/modules/task/api_activelist.go +++ b/modules/task/api_activelist.go @@ -5,7 +5,7 @@ import ( "go_dreamfactory/pb" ) -//活跃度列表 +// 活跃度列表 func (this *apiComp) ActiveListCheck(session comm.IUserSession, req *pb.TaskActiveListReq) (code pb.ErrorCode) { if req.TaskTag <= 0 || req.TaskTag > 2 { code = pb.ErrorCode_TaskTagEmpty diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index 8177699b8..b3f328f10 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" + "go_dreamfactory/utils" ) // 任务接取 @@ -85,30 +86,15 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) } else { - // 检查任务条件是否已完成 - rsp.CondiIds = a.checkCurrentCompleteCond(uid, curTaskConf.Completetask, myWorldtask) + // 已完成的任务条件 + rsp.CondiIds, err = a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...) + if err == nil { + a.module.ModuleBuried.ActiveCondition(uid, utils.NoContain(rsp.CondiIds, curTaskConf.Completetask)...) + } + } a.sendMsg(session, WorldtaskSubtypeAccept, rsp) - return -} - -// 检查当前任务的完成条件 -func (this *apiComp) checkCurrentCompleteCond(uid string, completeCondIds []int32, userTask *pb.DBWorldtask) (condIds []int32) { - - for _, condId := range completeCondIds { - if condId == 0 { - continue - } - - if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil { - iwt, ok := m.(comm.IRtask) - if ok { - if mc := iwt.CheckCondi(uid, condId); mc == pb.ErrorCode_Success { - condIds = append(condIds, condId) - } - } - } - } + return } diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go index 1ad54b635..2f47b84be 100644 --- a/modules/worldtask/api_completetask.go +++ b/modules/worldtask/api_completetask.go @@ -2,9 +2,7 @@ package worldtask import ( "go_dreamfactory/comm" - "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - "go_dreamfactory/utils" ) // 任务完成条件 @@ -43,28 +41,32 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC myWorldtask.Uid = uid wt := myWorldtask.CurrentTask[req.GroupId] - if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil { - iwt, ok := m.(comm.IRtask) - if ok { - if code = iwt.CheckCondi(uid, req.CondiId); code != pb.ErrorCode_Success { - rsp.Code = code - rsp.CondiId = req.CondiId - rsp.TaskId = req.TaskId - this.module.Debug("任务完成条件不满足", - log.Field{Key: "uid", Value: uid}, - log.Field{Key: "taskId", Value: req.TaskId}, - log.Field{Key: "condiId", Value: req.CondiId}, - ) - this.sendMsg(session, WorldtaskComplete, rsp) - return - } - if wt == nil { - wt = &pb.Worldtask{} - } - if _, b := utils.Findx(wt.CondiIds, req.CondiId); !b { - wt.CondiIds = append(wt.CondiIds, req.CondiId) - } - } + // if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil { + // iwt, ok := m.(comm.IRtask) + // if ok { + // if code = iwt.CheckCondi(uid, req.CondiId); code != pb.ErrorCode_Success { + // rsp.Code = code + // rsp.CondiId = req.CondiId + // rsp.TaskId = req.TaskId + // this.module.Debug("任务完成条件不满足", + // log.Field{Key: "uid", Value: uid}, + // log.Field{Key: "taskId", Value: req.TaskId}, + // log.Field{Key: "condiId", Value: req.CondiId}, + // ) + // this.sendMsg(session, WorldtaskComplete, rsp) + // return + // } + // if wt == nil { + // wt = &pb.Worldtask{} + // } + // if _, b := utils.Findx(wt.CondiIds, req.CondiId); !b { + // wt.CondiIds = append(wt.CondiIds, req.CondiId) + // } + // } + // } + condIds, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId) + if err == nil && len(condIds) > 0 { + wt.CondiIds = append(wt.CondiIds, condIds...) } myWorldtask.CurrentTask[req.GroupId] = wt diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 4997db0c2..0d99f7fdf 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -95,7 +95,9 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe condiFlag bool ) for _, condId := range curTaskConf.Completetask { - if this.module.modelWorldtask.checkCondi(uid, condId) { + conIds, err := this.module.ModuleBuried.CheckCondition(uid, condId) + // if this.module.modelWorldtask.checkCondi(uid, condId) { + if err == nil && len(conIds) > 0 { condiFlag = true } else { condiFlag = false @@ -194,27 +196,32 @@ func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextT TaskType: nextTaskConf.Des, } } - if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil { - iwt, ok := m.(comm.IRtask) - if ok { - if mc := iwt.CheckCondi(uid, condiId); mc != pb.ErrorCode_Success { - this.module.Debug("任务完成条件不满足", - log.Field{Key: "uid", Value: uid}, - log.Field{Key: "taskId", Value: nextTaskId}, - log.Field{Key: "condiId", Value: condiId}, - ) - } else { - if ok { - nwt.CondiIds = append(nwt.CondiIds, condiId) - } else { - condiIds := []int32{condiId} - nwt.CondiIds = condiIds - } - } - } + // if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil { + // iwt, ok := m.(comm.IRtask) + // if ok { + // if mc := iwt.CheckCondi(uid, condiId); mc != pb.ErrorCode_Success { + // this.module.Debug("任务完成条件不满足", + // log.Field{Key: "uid", Value: uid}, + // log.Field{Key: "taskId", Value: nextTaskId}, + // log.Field{Key: "condiId", Value: condiId}, + // ) + // } else { + // if ok { + // nwt.CondiIds = append(nwt.CondiIds, condiId) + // } else { + // condiIds := []int32{condiId} + // nwt.CondiIds = condiIds + // } + // } + // } + // } + condIds, err := this.module.ModuleBuried.CheckCondition(uid, condiId) + if err == nil && len(condIds) > 0 { + nwt.CondiIds = condIds + userTask.CurrentTask[nextTaskConf.Group] = nwt + update["currentTask"] = userTask.CurrentTask } - userTask.CurrentTask[nextTaskConf.Group] = nwt - update["currentTask"] = userTask.CurrentTask + } } diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go index f4b1771dd..d5920ca3c 100644 --- a/modules/worldtask/model_worldtask.go +++ b/modules/worldtask/model_worldtask.go @@ -208,24 +208,30 @@ func (this *ModelWorldtask) updateCheckCond(uid string, userLv int32, userTask * TaskType: nextTaskConf.Des, } } - if m, err := this.service.GetModule(comm.ModuleRtask); err == nil { - iwt, ok := m.(comm.IRtask) - if ok { - if mc := iwt.CheckCondi(uid, condiId); mc != pb.ErrorCode_Success { - this.moduleWorldtask.Debug("任务完成条件不满足", - log.Field{Key: "uid", Value: uid}, - log.Field{Key: "taskId", Value: nextTaskId}, - log.Field{Key: "condiId", Value: condiId}, - ) - } else { - if ok { - nwt.CondiIds = append(nwt.CondiIds, condiId) - } else { - condiIds := []int32{condiId} - nwt.CondiIds = condiIds - } - } - } + // if m, err := this.service.GetModule(comm.ModuleRtask); err == nil { + // iwt, ok := m.(comm.IRtask) + // if ok { + // if mc := iwt.CheckCondi(uid, condiId); mc != pb.ErrorCode_Success { + // this.moduleWorldtask.Debug("任务完成条件不满足", + // log.Field{Key: "uid", Value: uid}, + // log.Field{Key: "taskId", Value: nextTaskId}, + // log.Field{Key: "condiId", Value: condiId}, + // ) + // } else { + // if ok { + // nwt.CondiIds = append(nwt.CondiIds, condiId) + // } else { + // condiIds := []int32{condiId} + // nwt.CondiIds = condiIds + // } + // } + // } + // } + condIds, err := this.moduleWorldtask.ModuleBuried.CheckCondition(uid, condiId) + if err == nil && len(condIds) > 0 { + nwt.CondiIds = condIds + userTask.CurrentTask[nextTaskConf.Group] = nwt + update["currentTask"] = userTask.CurrentTask } userTask.CurrentTask[nextTaskConf.Group] = nwt update["currentTask"] = userTask.CurrentTask diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index b0ee9ebb9..9fd757006 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -4,6 +4,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" @@ -34,6 +35,7 @@ func (this *Worldtask) Init(service core.IService, module core.IModule, options func (this *Worldtask) OnInstallComp() { this.ModuleBase.OnInstallComp() + event.RegisterGO(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) @@ -54,15 +56,18 @@ func (this *Worldtask) Start() (err error) { return } -// 任务条件达成通知 -func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condIds []int32) error { - this.Debug("世界任务完成条件通知", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condIds", Value: condIds}) - uid := session.GetUserId() +func (this *Worldtask) TCondFinishNotify(uid string, conids []int32) { + session, ok := this.GetUserSession(uid) + if !ok { + return + } + this.Debug("世界任务完成条件通知", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condIds", Value: conids}) + // 玩家世界任务 userTask, err := this.modelWorldtask.getWorldtask(uid) if err != nil { this.Error("获取玩家世界任务", log.Field{Key: "uid", Value: uid}) - return err + return } var groupId, taskId int32 @@ -70,7 +75,7 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condIds [ finishedTaskIds := make(map[int32]int32) //达成的任务条件 for _, c := range this.worldtaskConf.GetDataList() { for _, v := range c.Completetask { - for _, condId := range condIds { + for _, condId := range conids { if v == condId { //校验任务是否是当前任务 if task, ok := userTask.CurrentTask[c.Group]; ok { @@ -90,7 +95,7 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condIds [ // this.Debug("未找到通知的世界任务", // log.Field{Key: "uid", Value: uid}, // log.Field{Key: "finishedTaskIds", Value: finishedTaskIds}) - return nil + return } if userTask.CurrentTask == nil { @@ -102,7 +107,7 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condIds [ wt = &pb.Worldtask{} } - for _, condId := range condIds { + for _, condId := range conids { if _, ok := utils.Findx(wt.CondiIds, condId); !ok { wt.CondiIds = append(wt.CondiIds, condId) } @@ -127,7 +132,7 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condIds [ // 当前任务配置 curTaskConf, err := this.configure.getWorldtaskById(taskId) if err != nil || curTaskConf == nil { - return comm.NewCustomError(pb.ErrorCode_ConfigNoFound) + return } //结束任务 @@ -135,6 +140,11 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condIds [ this.modelWorldtask.taskFinish(session, groupId, taskId, userTask, curTaskConf) this.modelWorldtask.taskFinishPush(session, groupId, userTask, curTaskConf) } + return +} + +// 任务条件达成通知 +func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condIds []int32) error { return nil } diff --git a/sys/configure/structs/Game.BuriedCondiData.go b/sys/configure/structs/Game.BuriedCondiData.go index 59baa3c4f..b1b50472f 100644 --- a/sys/configure/structs/Game.BuriedCondiData.go +++ b/sys/configure/structs/Game.BuriedCondiData.go @@ -19,7 +19,7 @@ type GameBuriedCondiData struct { Valid int32 NPC int32 Value int32 - Filter []*Gamecompare + Filter []int32 } const TypeId_GameBuriedCondiData = 1792922092 @@ -42,11 +42,11 @@ func (_v *GameBuriedCondiData)Deserialize(_buf map[string]interface{}) (err erro var _ok_ bool if _arr_, _ok_ = _buf["filter"].([]interface{}); !_ok_ { err = errors.New("filter error"); return } - _v.Filter = make([]*Gamecompare, 0, len(_arr_)) + _v.Filter = make([]int32, 0, len(_arr_)) for _, _e_ := range _arr_ { - var _list_v_ *Gamecompare - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGamecompare(_x_); err != nil { return } } + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } _v.Filter = append(_v.Filter, _list_v_) } } diff --git a/sys/configure/structs/Game.BuriedTypeData.go b/sys/configure/structs/Game.BuriedTypeData.go index 241fc8efa..8fa45211b 100644 --- a/sys/configure/structs/Game.BuriedTypeData.go +++ b/sys/configure/structs/Game.BuriedTypeData.go @@ -13,6 +13,7 @@ import "errors" type GameBuriedTypeData struct { Id int32 Insert int32 + Filter []string } const TypeId_GameBuriedTypeData = -452590967 @@ -24,6 +25,20 @@ func (*GameBuriedTypeData) GetTypeId() int32 { func (_v *GameBuriedTypeData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["insert"].(float64); !_ok_ { err = errors.New("insert error"); return }; _v.Insert = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["filter"].([]interface{}); !_ok_ { err = errors.New("filter error"); return } + + _v.Filter = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Filter = append(_v.Filter, _list_v_) + } + } + return } diff --git a/sys/configure/structs/Game.compare.go b/sys/configure/structs/Game.compare.go deleted file mode 100644 index 8ccde899e..000000000 --- a/sys/configure/structs/Game.compare.go +++ /dev/null @@ -1,37 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -package cfg - -import "errors" - -type Gamecompare struct { - S string - D int32 -} - -const TypeId_Gamecompare = -229713143 - -func (*Gamecompare) GetTypeId() int32 { - return -229713143 -} - -func (_v *Gamecompare)Deserialize(_buf map[string]interface{}) (err error) { - { var _ok_ bool; if _v.S, _ok_ = _buf["s"].(string); !_ok_ { err = errors.New("s error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["d"].(float64); !_ok_ { err = errors.New("d error"); return }; _v.D = int32(_tempNum_) } - return -} - -func DeserializeGamecompare(_buf map[string]interface{}) (*Gamecompare, error) { - v := &Gamecompare{} - if err := v.Deserialize(_buf); err == nil { - return v, nil - } else { - return nil, err - } -} diff --git a/sys/configure/structs/game.skillBuffData.go b/sys/configure/structs/game.skillBuffData.go index 367d9d97d..37d7078a7 100644 --- a/sys/configure/structs/game.skillBuffData.go +++ b/sys/configure/structs/game.skillBuffData.go @@ -22,6 +22,7 @@ type GameSkillBuffData struct { Effect []int32 AddEffect bool RemoveType bool + NotOverlay int32 OverlayTimes byte SameID bool Golbalbufficon string @@ -100,6 +101,7 @@ func (_v *GameSkillBuffData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; if _v.AddEffect, _ok_ = _buf["AddEffect"].(bool); !_ok_ { err = errors.New("AddEffect error"); return } } { var _ok_ bool; if _v.RemoveType, _ok_ = _buf["RemoveType"].(bool); !_ok_ { err = errors.New("RemoveType error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["NotOverlay"].(float64); !_ok_ { err = errors.New("NotOverlay error"); return }; _v.NotOverlay = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["OverlayTimes"].(float64); !_ok_ { err = errors.New("OverlayTimes error"); return }; _v.OverlayTimes = byte(_tempNum_) } { var _ok_ bool; if _v.SameID, _ok_ = _buf["SameID"].(bool); !_ok_ { err = errors.New("SameID error"); return } } { var _ok_ bool; if _v.Golbalbufficon, _ok_ = _buf["golbalbufficon"].(string); !_ok_ { err = errors.New("golbalbufficon error"); return } } diff --git a/utils/trans.go b/utils/trans.go index 186e881df..d25879b2c 100644 --- a/utils/trans.go +++ b/utils/trans.go @@ -27,3 +27,16 @@ func RemoveDuplicate(arr []int32) []int32 { } return result } + +func NoContain(exist, all []int32) (contain []int32) { + existMap := make(map[int32]bool) + for _, b := range exist { + existMap[b] = true + } + for _, a := range all { + if !existMap[a] { + contain = append(contain, a) + } + } + return +}