diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index cb51d89e1..6762b7e53 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -28194,7 +28194,7 @@ "key": "buried_buried_condi_tasktxt_920", "text": "在塔岗监狱中消耗15点体力" }, - "type": 237, + "type": 248, "valid": 1, "head": { "a": "attr", @@ -28208,7 +28208,9 @@ "text": "" }, "value": 15, - "filter": [], + "filter": [ + 4 + ], "filter2": [] }, { @@ -28816,7 +28818,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_940", - "text": "在维京远征种消耗28体力" + "text": "在维京远征种中消耗28体力" }, "type": 201, "valid": 1, @@ -32994,7 +32996,7 @@ "key": "", "text": "" }, - "value": 3, + "value": 1, "filter": [], "filter2": [] }, @@ -33024,7 +33026,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 2, "filter": [], "filter2": [] }, @@ -33054,7 +33056,7 @@ "key": "", "text": "" }, - "value": 5, + "value": 3, "filter": [], "filter2": [] }, @@ -33084,7 +33086,7 @@ "key": "", "text": "" }, - "value": 6, + "value": 4, "filter": [], "filter2": [] }, @@ -33114,7 +33116,7 @@ "key": "", "text": "" }, - "value": 7, + "value": 5, "filter": [], "filter2": [] }, diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json index 5b0eca3ef..cbd3839ff 100644 --- a/bin/json/game_buriedtype.json +++ b/bin/json/game_buriedtype.json @@ -1409,9 +1409,7 @@ { "id": 242, "insert": 1, - "filter": [ - "gte" - ] + "filter": [] }, { "id": 243, diff --git a/bin/json/game_equip.json b/bin/json/game_equip.json index 3a2e1c80b..a0ef9efdc 100644 --- a/bin/json/game_equip.json +++ b/bin/json/game_equip.json @@ -31756,13 +31756,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_649", - "text": "输出神器" + "text": "平先生祖传菜刀" }, "atlas_id": "1", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_649", - "text": "输出神器" + "text": "攻击型秘宝" }, "pos": 7, "initLv": 1, @@ -31782,7 +31782,7 @@ 10 ], "addlibrary": 20001, - "ico": "wp_icon_10021", + "ico": "sq_icon_gj", "use_skip": 102, "sale": [ { @@ -31805,13 +31805,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_650", - "text": "防御神器" + "text": "戈伯陈年铁内裤" }, "atlas_id": "2", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_650", - "text": "防御神器" + "text": "防御型秘宝" }, "pos": 7, "initLv": 1, @@ -31831,7 +31831,7 @@ 10 ], "addlibrary": 20001, - "ico": "wp_icon_10021", + "ico": "sq_icon_fy", "use_skip": 102, "sale": [ { @@ -31854,13 +31854,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_651", - "text": "辅助神器" + "text": "王子皇家口水巾" }, "atlas_id": "3", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_651", - "text": "辅助神器" + "text": "辅助型秘宝" }, "pos": 7, "initLv": 1, @@ -31880,7 +31880,7 @@ 10 ], "addlibrary": 20001, - "ico": "wp_icon_10021", + "ico": "sq_icon_fz", "use_skip": 102, "sale": [ { @@ -31903,13 +31903,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_652", - "text": "控制神器" + "text": "宝贝老板黄金马桶" }, "atlas_id": "4", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_652", - "text": "控制神器" + "text": "控制型秘宝" }, "pos": 7, "initLv": 1, @@ -31929,7 +31929,7 @@ 10 ], "addlibrary": 20001, - "ico": "wp_icon_10021", + "ico": "sq_icon_kz", "use_skip": 102, "sale": [ { @@ -31952,13 +31952,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_653", - "text": "输出神器" + "text": "平先生祖传菜刀" }, "atlas_id": "5", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_653", - "text": "输出神器" + "text": "攻击型秘宝" }, "pos": 7, "initLv": 2, @@ -31978,7 +31978,7 @@ 10 ], "addlibrary": 20002, - "ico": "wp_icon_10021", + "ico": "sq_icon_gj", "use_skip": 102, "sale": [ { @@ -32001,13 +32001,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_654", - "text": "防御神器" + "text": "戈伯陈年铁内裤" }, "atlas_id": "6", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_654", - "text": "防御神器" + "text": "防御型秘宝" }, "pos": 7, "initLv": 2, @@ -32027,7 +32027,7 @@ 10 ], "addlibrary": 20002, - "ico": "wp_icon_10021", + "ico": "sq_icon_fy", "use_skip": 102, "sale": [ { @@ -32050,13 +32050,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_655", - "text": "辅助神器" + "text": "王子皇家口水巾" }, "atlas_id": "7", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_655", - "text": "辅助神器" + "text": "辅助型秘宝" }, "pos": 7, "initLv": 2, @@ -32076,7 +32076,7 @@ 10 ], "addlibrary": 20002, - "ico": "wp_icon_10021", + "ico": "sq_icon_fz", "use_skip": 102, "sale": [ { @@ -32099,13 +32099,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_656", - "text": "控制神器" + "text": "宝贝老板黄金马桶" }, "atlas_id": "8", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_656", - "text": "控制神器" + "text": "控制型秘宝" }, "pos": 7, "initLv": 2, @@ -32125,7 +32125,7 @@ 10 ], "addlibrary": 20002, - "ico": "wp_icon_10021", + "ico": "sq_icon_kz", "use_skip": 102, "sale": [ { @@ -32148,13 +32148,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_657", - "text": "输出神器" + "text": "平先生祖传菜刀" }, "atlas_id": "9", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_657", - "text": "输出神器" + "text": "攻击型秘宝" }, "pos": 7, "initLv": 3, @@ -32174,7 +32174,7 @@ 10 ], "addlibrary": 20003, - "ico": "wp_icon_10021", + "ico": "sq_icon_gj", "use_skip": 102, "sale": [ { @@ -32197,13 +32197,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_658", - "text": "防御神器" + "text": "戈伯陈年铁内裤" }, "atlas_id": "10", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_658", - "text": "防御神器" + "text": "防御型秘宝" }, "pos": 7, "initLv": 3, @@ -32223,7 +32223,7 @@ 10 ], "addlibrary": 20003, - "ico": "wp_icon_10021", + "ico": "sq_icon_fy", "use_skip": 102, "sale": [ { @@ -32246,13 +32246,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_659", - "text": "辅助神器" + "text": "王子皇家口水巾" }, "atlas_id": "11", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_659", - "text": "辅助神器" + "text": "辅助型秘宝" }, "pos": 7, "initLv": 3, @@ -32272,7 +32272,7 @@ 10 ], "addlibrary": 20003, - "ico": "wp_icon_10021", + "ico": "sq_icon_fz", "use_skip": 102, "sale": [ { @@ -32295,13 +32295,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_660", - "text": "控制神器" + "text": "宝贝老板黄金马桶" }, "atlas_id": "12", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_660", - "text": "控制神器" + "text": "控制型秘宝" }, "pos": 7, "initLv": 3, @@ -32321,7 +32321,7 @@ 10 ], "addlibrary": 20003, - "ico": "wp_icon_10021", + "ico": "sq_icon_kz", "use_skip": 102, "sale": [ { @@ -32344,13 +32344,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_661", - "text": "输出神器" + "text": "平先生祖传菜刀" }, "atlas_id": "13", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_661", - "text": "输出神器" + "text": "攻击型秘宝" }, "pos": 7, "initLv": 4, @@ -32370,7 +32370,7 @@ 10 ], "addlibrary": 20004, - "ico": "wp_icon_10021", + "ico": "sq_icon_gj", "use_skip": 102, "sale": [ { @@ -32393,13 +32393,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_662", - "text": "防御神器" + "text": "戈伯陈年铁内裤" }, "atlas_id": "14", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_662", - "text": "防御神器" + "text": "防御型秘宝" }, "pos": 7, "initLv": 4, @@ -32419,7 +32419,7 @@ 10 ], "addlibrary": 20004, - "ico": "wp_icon_10021", + "ico": "sq_icon_fy", "use_skip": 102, "sale": [ { @@ -32442,13 +32442,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_663", - "text": "辅助神器" + "text": "王子皇家口水巾" }, "atlas_id": "15", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_663", - "text": "辅助神器" + "text": "辅助型秘宝" }, "pos": 7, "initLv": 4, @@ -32468,7 +32468,7 @@ 10 ], "addlibrary": 20004, - "ico": "wp_icon_10021", + "ico": "sq_icon_fz", "use_skip": 102, "sale": [ { @@ -32491,13 +32491,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_664", - "text": "控制神器" + "text": "宝贝老板黄金马桶" }, "atlas_id": "16", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_664", - "text": "控制神器" + "text": "控制型秘宝" }, "pos": 7, "initLv": 4, @@ -32517,7 +32517,7 @@ 10 ], "addlibrary": 20004, - "ico": "wp_icon_10021", + "ico": "sq_icon_kz", "use_skip": 102, "sale": [ { @@ -32540,13 +32540,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_665", - "text": "输出神器" + "text": "平先生祖传菜刀" }, "atlas_id": "17", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_665", - "text": "输出神器" + "text": "攻击型秘宝" }, "pos": 7, "initLv": 5, @@ -32564,7 +32564,7 @@ 20 ], "addlibrary": 20005, - "ico": "wp_icon_10021", + "ico": "sq_icon_gj", "use_skip": 102, "sale": [ { @@ -32587,13 +32587,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_666", - "text": "防御神器" + "text": "戈伯陈年铁内裤" }, "atlas_id": "18", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_666", - "text": "防御神器" + "text": "防御型秘宝" }, "pos": 7, "initLv": 5, @@ -32611,7 +32611,7 @@ 20 ], "addlibrary": 20005, - "ico": "wp_icon_10021", + "ico": "sq_icon_fy", "use_skip": 102, "sale": [ { @@ -32634,13 +32634,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_667", - "text": "辅助神器" + "text": "王子皇家口水巾" }, "atlas_id": "19", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_667", - "text": "辅助神器" + "text": "辅助型秘宝" }, "pos": 7, "initLv": 5, @@ -32658,7 +32658,7 @@ 20 ], "addlibrary": 20005, - "ico": "wp_icon_10021", + "ico": "sq_icon_fz", "use_skip": 102, "sale": [ { @@ -32681,13 +32681,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_668", - "text": "控制神器" + "text": "宝贝老板黄金马桶" }, "atlas_id": "20", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_668", - "text": "控制神器" + "text": "控制型秘宝" }, "pos": 7, "initLv": 5, @@ -32705,7 +32705,7 @@ 20 ], "addlibrary": 20005, - "ico": "wp_icon_10021", + "ico": "sq_icon_kz", "use_skip": 102, "sale": [ { @@ -32728,13 +32728,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_669", - "text": "输出神器" + "text": "平先生祖传菜刀" }, "atlas_id": "21", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_669", - "text": "输出神器" + "text": "攻击型秘宝" }, "pos": 7, "initLv": 6, @@ -32752,7 +32752,7 @@ 20 ], "addlibrary": 20006, - "ico": "wp_icon_10021", + "ico": "sq_icon_gj", "use_skip": 102, "sale": [ { @@ -32775,13 +32775,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_670", - "text": "防御神器" + "text": "戈伯陈年铁内裤" }, "atlas_id": "22", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_670", - "text": "防御神器" + "text": "防御型秘宝" }, "pos": 7, "initLv": 6, @@ -32799,7 +32799,7 @@ 20 ], "addlibrary": 20006, - "ico": "wp_icon_10021", + "ico": "sq_icon_fy", "use_skip": 102, "sale": [ { @@ -32822,13 +32822,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_671", - "text": "辅助神器" + "text": "王子皇家口水巾" }, "atlas_id": "23", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_671", - "text": "辅助神器" + "text": "辅助型秘宝" }, "pos": 7, "initLv": 6, @@ -32846,7 +32846,7 @@ 20 ], "addlibrary": 20006, - "ico": "wp_icon_10021", + "ico": "sq_icon_fz", "use_skip": 102, "sale": [ { @@ -32869,13 +32869,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_672", - "text": "控制神器" + "text": "宝贝老板黄金马桶" }, "atlas_id": "24", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_672", - "text": "控制神器" + "text": "控制型秘宝" }, "pos": 7, "initLv": 6, @@ -32893,7 +32893,7 @@ 20 ], "addlibrary": 20006, - "ico": "wp_icon_10021", + "ico": "sq_icon_kz", "use_skip": 102, "sale": [ { @@ -32916,13 +32916,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_673", - "text": "直觉饰品" + "text": "火的热情护身符" }, "atlas_id": "25", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_673", - "text": "直觉饰品" + "text": "火的热情护身符" }, "pos": 8, "initLv": 1, @@ -32942,7 +32942,7 @@ 10 ], "addlibrary": 30001, - "ico": "wp_icon_10023", + "ico": "sp_icon_huo", "use_skip": 102, "sale": [ { @@ -32965,13 +32965,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_674", - "text": "真诚饰品" + "text": "林的感观护身符" }, "atlas_id": "26", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_674", - "text": "真诚饰品" + "text": "林的感观护身符" }, "pos": 8, "initLv": 1, @@ -32991,7 +32991,7 @@ 10 ], "addlibrary": 30001, - "ico": "wp_icon_10023", + "ico": "sp_icon_lin", "use_skip": 102, "sale": [ { @@ -33014,13 +33014,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_675", - "text": "共情饰品" + "text": "水的包容护身符" }, "atlas_id": "27", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_675", - "text": "共情饰品" + "text": "水的包容护身符" }, "pos": 8, "initLv": 1, @@ -33040,7 +33040,7 @@ 10 ], "addlibrary": 30001, - "ico": "wp_icon_10023", + "ico": "sp_icon_shui", "use_skip": 102, "sale": [ { @@ -33063,13 +33063,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_676", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "atlas_id": "28", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_676", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "pos": 8, "initLv": 1, @@ -33089,7 +33089,7 @@ 10 ], "addlibrary": 30001, - "ico": "wp_icon_10023", + "ico": "sp_icon_guang", "use_skip": 102, "sale": [ { @@ -33112,13 +33112,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_677", - "text": "直觉饰品" + "text": "火的热情护身符" }, "atlas_id": "29", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_677", - "text": "直觉饰品" + "text": "火的热情护身符" }, "pos": 8, "initLv": 2, @@ -33138,7 +33138,7 @@ 10 ], "addlibrary": 30002, - "ico": "wp_icon_10023", + "ico": "sp_icon_huo", "use_skip": 102, "sale": [ { @@ -33161,13 +33161,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_678", - "text": "真诚饰品" + "text": "林的感观护身符" }, "atlas_id": "30", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_678", - "text": "真诚饰品" + "text": "林的感观护身符" }, "pos": 8, "initLv": 2, @@ -33187,7 +33187,7 @@ 10 ], "addlibrary": 30002, - "ico": "wp_icon_10023", + "ico": "sp_icon_lin", "use_skip": 102, "sale": [ { @@ -33210,13 +33210,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_679", - "text": "共情饰品" + "text": "水的包容护身符" }, "atlas_id": "31", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_679", - "text": "共情饰品" + "text": "水的包容护身符" }, "pos": 8, "initLv": 2, @@ -33236,7 +33236,7 @@ 10 ], "addlibrary": 30002, - "ico": "wp_icon_10023", + "ico": "sp_icon_shui", "use_skip": 102, "sale": [ { @@ -33259,13 +33259,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_680", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "atlas_id": "32", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_680", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "pos": 8, "initLv": 2, @@ -33285,7 +33285,7 @@ 10 ], "addlibrary": 30002, - "ico": "wp_icon_10023", + "ico": "sp_icon_guang", "use_skip": 102, "sale": [ { @@ -33308,13 +33308,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_681", - "text": "直觉饰品" + "text": "火的热情护身符" }, "atlas_id": "33", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_681", - "text": "直觉饰品" + "text": "火的热情护身符" }, "pos": 8, "initLv": 3, @@ -33334,7 +33334,7 @@ 10 ], "addlibrary": 30003, - "ico": "wp_icon_10023", + "ico": "sp_icon_huo", "use_skip": 102, "sale": [ { @@ -33357,13 +33357,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_682", - "text": "真诚饰品" + "text": "林的感观护身符" }, "atlas_id": "34", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_682", - "text": "真诚饰品" + "text": "林的感观护身符" }, "pos": 8, "initLv": 3, @@ -33383,7 +33383,7 @@ 10 ], "addlibrary": 30003, - "ico": "wp_icon_10023", + "ico": "sp_icon_lin", "use_skip": 102, "sale": [ { @@ -33406,13 +33406,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_683", - "text": "共情饰品" + "text": "水的包容护身符" }, "atlas_id": "35", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_683", - "text": "共情饰品" + "text": "水的包容护身符" }, "pos": 8, "initLv": 3, @@ -33432,7 +33432,7 @@ 10 ], "addlibrary": 30003, - "ico": "wp_icon_10023", + "ico": "sp_icon_shui", "use_skip": 102, "sale": [ { @@ -33455,13 +33455,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_684", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "atlas_id": "36", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_684", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "pos": 8, "initLv": 3, @@ -33481,7 +33481,7 @@ 10 ], "addlibrary": 30003, - "ico": "wp_icon_10023", + "ico": "sp_icon_guang", "use_skip": 102, "sale": [ { @@ -33504,13 +33504,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_685", - "text": "直觉饰品" + "text": "火的热情护身符" }, "atlas_id": "37", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_685", - "text": "直觉饰品" + "text": "火的热情护身符" }, "pos": 8, "initLv": 4, @@ -33530,7 +33530,7 @@ 10 ], "addlibrary": 30004, - "ico": "wp_icon_10023", + "ico": "sp_icon_huo", "use_skip": 102, "sale": [ { @@ -33553,13 +33553,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_686", - "text": "真诚饰品" + "text": "林的感观护身符" }, "atlas_id": "38", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_686", - "text": "真诚饰品" + "text": "林的感观护身符" }, "pos": 8, "initLv": 4, @@ -33579,7 +33579,7 @@ 10 ], "addlibrary": 30004, - "ico": "wp_icon_10023", + "ico": "sp_icon_lin", "use_skip": 102, "sale": [ { @@ -33602,13 +33602,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_687", - "text": "共情饰品" + "text": "水的包容护身符" }, "atlas_id": "39", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_687", - "text": "共情饰品" + "text": "水的包容护身符" }, "pos": 8, "initLv": 4, @@ -33628,7 +33628,7 @@ 10 ], "addlibrary": 30004, - "ico": "wp_icon_10023", + "ico": "sp_icon_shui", "use_skip": 102, "sale": [ { @@ -33651,13 +33651,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_688", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "atlas_id": "40", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_688", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "pos": 8, "initLv": 4, @@ -33677,7 +33677,7 @@ 10 ], "addlibrary": 30004, - "ico": "wp_icon_10023", + "ico": "sp_icon_guang", "use_skip": 102, "sale": [ { @@ -33700,13 +33700,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_689", - "text": "直觉饰品" + "text": "火的热情护身符" }, "atlas_id": "41", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_689", - "text": "直觉饰品" + "text": "火的热情护身符" }, "pos": 8, "initLv": 5, @@ -33724,7 +33724,7 @@ 20 ], "addlibrary": 30005, - "ico": "wp_icon_10023", + "ico": "sp_icon_huo", "use_skip": 102, "sale": [ { @@ -33747,13 +33747,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_690", - "text": "真诚饰品" + "text": "林的感观护身符" }, "atlas_id": "42", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_690", - "text": "真诚饰品" + "text": "林的感观护身符" }, "pos": 8, "initLv": 5, @@ -33771,7 +33771,7 @@ 20 ], "addlibrary": 30005, - "ico": "wp_icon_10023", + "ico": "sp_icon_lin", "use_skip": 102, "sale": [ { @@ -33794,13 +33794,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_691", - "text": "共情饰品" + "text": "水的包容护身符" }, "atlas_id": "43", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_691", - "text": "共情饰品" + "text": "水的包容护身符" }, "pos": 8, "initLv": 5, @@ -33818,7 +33818,7 @@ 20 ], "addlibrary": 30005, - "ico": "wp_icon_10023", + "ico": "sp_icon_shui", "use_skip": 102, "sale": [ { @@ -33841,13 +33841,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_692", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "atlas_id": "44", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_692", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "pos": 8, "initLv": 5, @@ -33865,7 +33865,7 @@ 20 ], "addlibrary": 30005, - "ico": "wp_icon_10023", + "ico": "sp_icon_guang", "use_skip": 102, "sale": [ { @@ -33888,13 +33888,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_693", - "text": "直觉饰品" + "text": "火的热情护身符" }, "atlas_id": "45", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_693", - "text": "直觉饰品" + "text": "火的热情护身符" }, "pos": 8, "initLv": 6, @@ -33912,7 +33912,7 @@ 20 ], "addlibrary": 30006, - "ico": "wp_icon_10023", + "ico": "sp_icon_huo", "use_skip": 102, "sale": [ { @@ -33935,13 +33935,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_694", - "text": "真诚饰品" + "text": "林的感观护身符" }, "atlas_id": "46", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_694", - "text": "真诚饰品" + "text": "林的感观护身符" }, "pos": 8, "initLv": 6, @@ -33959,7 +33959,7 @@ 20 ], "addlibrary": 30006, - "ico": "wp_icon_10023", + "ico": "sp_icon_lin", "use_skip": 102, "sale": [ { @@ -33982,13 +33982,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_695", - "text": "共情饰品" + "text": "水的包容护身符" }, "atlas_id": "47", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_695", - "text": "共情饰品" + "text": "水的包容护身符" }, "pos": 8, "initLv": 6, @@ -34006,7 +34006,7 @@ 20 ], "addlibrary": 30006, - "ico": "wp_icon_10023", + "ico": "sp_icon_shui", "use_skip": 102, "sale": [ { @@ -34029,13 +34029,13 @@ "equip_id": 2, "name": { "key": "equip_equip_name_696", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "atlas_id": "48", "suittype": 0, "suitintr": { "key": "equip_equip_suitintr_696", - "text": "责任饰品" + "text": "光的荣耀护身符" }, "pos": 8, "initLv": 6, @@ -34053,7 +34053,7 @@ 20 ], "addlibrary": 30006, - "ico": "wp_icon_10023", + "ico": "sp_icon_guang", "use_skip": 102, "sale": [ { diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 6603dd230..2f7452c51 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -797,6 +797,14 @@ "plunder_pvp_college_time": 7, "plunder_pvp_plunderum": 3, "plunder_pvp_transportnum": 3, + "plunder_pvp_seasontime": 2, + "plunder_pvp_timeon": 5, + "plunder_pvp_endtime": 22, + "plunder_pvp_remake": { + "a": "item", + "t": "30000002", + "n": 3 + }, "pvp_endtime": 3, "pvp_maintenancetime": 2, "pvp_integraltool": "pvpintegral", diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index 1e90d62da..3885cf97f 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -878,5 +878,15 @@ }, "data": "10070", "prefix": "" + }, + { + "id": 89, + "type": 1, + "text": { + "key": "GM_GM_text_136", + "text": "创建公会" + }, + "data": "", + "prefix": "" } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 9b62a012f..5aef3d436 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -7752,7 +7752,7 @@ "type": 2, "ip": 1, "sd": 1, - "handbook": true, + "handbook": false, "prefab": "53001", "rotation": "0|0|0", "revolve": 0, diff --git a/bin/json/game_herostarup.json b/bin/json/game_herostarup.json index c11a1fd3d..e3de3cfee 100644 --- a/bin/json/game_herostarup.json +++ b/bin/json/game_herostarup.json @@ -507,17 +507,17 @@ { "key": 27, "id": "14003", - "star": 4, + "star": 5, "needrace": [ { "a": "attr", "t": "gold", - "n": 150000 + "n": 300000 }, { "a": "item", - "t": "10000012", - "n": 4 + "t": "10000013", + "n": 5 } ], "starup": [ @@ -531,36 +531,12 @@ { "key": 28, "id": "14003", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 29, - "id": "14003", "star": 6, "needrace": [], "starup": [] }, { - "key": 30, + "key": 29, "id": "14004", "star": 4, "needrace": [ @@ -583,39 +559,39 @@ } ] }, + { + "key": 30, + "id": "14004", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 31, "id": "14004", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 32, - "id": "14004", "star": 6, "needrace": [], "starup": [] }, { - "key": 33, + "key": 32, "id": "14005", "star": 4, "needrace": [ @@ -638,39 +614,39 @@ } ] }, + { + "key": 33, + "id": "14005", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 34, "id": "14005", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 35, - "id": "14005", "star": 6, "needrace": [], "starup": [] }, { - "key": 36, + "key": 35, "id": "14006", "star": 4, "needrace": [ @@ -693,39 +669,39 @@ } ] }, + { + "key": 36, + "id": "14006", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 37, "id": "14006", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 38, - "id": "14006", "star": 6, "needrace": [], "starup": [] }, { - "key": 39, + "key": 38, "id": "14007", "star": 4, "needrace": [ @@ -748,9 +724,40 @@ } ] }, + { + "key": 39, + "id": "14007", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 40, "id": "14007", + "star": 6, + "needrace": [], + "starup": [] + }, + { + "key": 41, + "id": "15001", "star": 5, "needrace": [ { @@ -772,16 +779,16 @@ } ] }, - { - "key": 41, - "id": "14007", - "star": 6, - "needrace": [], - "starup": [] - }, { "key": 42, "id": "15001", + "star": 6, + "needrace": [], + "starup": [] + }, + { + "key": 43, + "id": "15002", "star": 5, "needrace": [ { @@ -803,16 +810,16 @@ } ] }, - { - "key": 43, - "id": "15001", - "star": 6, - "needrace": [], - "starup": [] - }, { "key": 44, "id": "15002", + "star": 6, + "needrace": [], + "starup": [] + }, + { + "key": 45, + "id": "15003", "star": 5, "needrace": [ { @@ -834,16 +841,16 @@ } ] }, - { - "key": 45, - "id": "15002", - "star": 6, - "needrace": [], - "starup": [] - }, { "key": 46, "id": "15003", + "star": 6, + "needrace": [], + "starup": [] + }, + { + "key": 47, + "id": "15004", "star": 5, "needrace": [ { @@ -865,46 +872,15 @@ } ] }, - { - "key": 47, - "id": "15003", - "star": 6, - "needrace": [], - "starup": [] - }, { "key": 48, "id": "15004", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 49, - "id": "15004", "star": 6, "needrace": [], "starup": [] }, { - "key": 50, + "key": 49, "id": "23001", "star": 3, "needrace": [ @@ -927,20 +903,44 @@ } ] }, + { + "key": 50, + "id": "23001", + "star": 4, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 150000 + }, + { + "a": "item", + "t": "10000012", + "n": 4 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 51, "id": "23001", - "star": 4, + "star": 5, "needrace": [ { "a": "attr", "t": "gold", - "n": 150000 + "n": 300000 }, { "a": "item", - "t": "10000012", - "n": 4 + "t": "10000013", + "n": 5 } ], "starup": [ @@ -954,36 +954,12 @@ { "key": 52, "id": "23001", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 53, - "id": "23001", "star": 6, "needrace": [], "starup": [] }, { - "key": 54, + "key": 53, "id": "23002", "star": 3, "needrace": [ @@ -1006,20 +982,44 @@ } ] }, + { + "key": 54, + "id": "23002", + "star": 4, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 150000 + }, + { + "a": "item", + "t": "10000012", + "n": 4 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 55, "id": "23002", - "star": 4, + "star": 5, "needrace": [ { "a": "attr", "t": "gold", - "n": 150000 + "n": 300000 }, { "a": "item", - "t": "10000012", - "n": 4 + "t": "10000013", + "n": 5 } ], "starup": [ @@ -1033,36 +1033,12 @@ { "key": 56, "id": "23002", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 57, - "id": "23002", "star": 6, "needrace": [], "starup": [] }, { - "key": 58, + "key": 57, "id": "23003", "star": 3, "needrace": [ @@ -1085,20 +1061,44 @@ } ] }, + { + "key": 58, + "id": "23003", + "star": 4, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 150000 + }, + { + "a": "item", + "t": "10000012", + "n": 4 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 59, "id": "23003", - "star": 4, + "star": 5, "needrace": [ { "a": "attr", "t": "gold", - "n": 150000 + "n": 300000 }, { "a": "item", - "t": "10000012", - "n": 4 + "t": "10000013", + "n": 5 } ], "starup": [ @@ -1112,36 +1112,12 @@ { "key": 60, "id": "23003", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 61, - "id": "23003", "star": 6, "needrace": [], "starup": [] }, { - "key": 62, + "key": 61, "id": "23004", "star": 3, "needrace": [ @@ -1164,20 +1140,44 @@ } ] }, + { + "key": 62, + "id": "23004", + "star": 4, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 150000 + }, + { + "a": "item", + "t": "10000012", + "n": 4 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 63, "id": "23004", - "star": 4, + "star": 5, "needrace": [ { "a": "attr", "t": "gold", - "n": 150000 + "n": 300000 }, { "a": "item", - "t": "10000012", - "n": 4 + "t": "10000013", + "n": 5 } ], "starup": [ @@ -1191,36 +1191,12 @@ { "key": 64, "id": "23004", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 65, - "id": "23004", "star": 6, "needrace": [], "starup": [] }, { - "key": 66, + "key": 65, "id": "23011", "star": 3, "needrace": [ @@ -1243,20 +1219,44 @@ } ] }, + { + "key": 66, + "id": "23011", + "star": 4, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 150000 + }, + { + "a": "item", + "t": "10000012", + "n": 4 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 67, "id": "23011", - "star": 4, + "star": 5, "needrace": [ { "a": "attr", "t": "gold", - "n": 150000 + "n": 300000 }, { "a": "item", - "t": "10000012", - "n": 4 + "t": "10000013", + "n": 5 } ], "starup": [ @@ -1270,36 +1270,12 @@ { "key": 68, "id": "23011", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 69, - "id": "23011", "star": 6, "needrace": [], "starup": [] }, { - "key": 70, + "key": 69, "id": "24001", "star": 4, "needrace": [ @@ -1323,7 +1299,7 @@ ] }, { - "key": 71, + "key": 70, "id": "24001", "star": 5, "needrace": [ @@ -1347,14 +1323,14 @@ ] }, { - "key": 72, + "key": 71, "id": "24001", "star": 6, "needrace": [], "starup": [] }, { - "key": 73, + "key": 72, "id": "24002", "star": 3, "needrace": [ @@ -1378,7 +1354,7 @@ ] }, { - "key": 74, + "key": 73, "id": "24002", "star": 4, "needrace": [ @@ -1401,39 +1377,39 @@ } ] }, + { + "key": 74, + "id": "24002", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 75, "id": "24002", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 76, - "id": "24002", "star": 6, "needrace": [], "starup": [] }, { - "key": 77, + "key": 76, "id": "24003", "star": 4, "needrace": [ @@ -1456,39 +1432,39 @@ } ] }, + { + "key": 77, + "id": "24003", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 78, "id": "24003", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 79, - "id": "24003", "star": 6, "needrace": [], "starup": [] }, { - "key": 80, + "key": 79, "id": "24004", "star": 4, "needrace": [ @@ -1511,39 +1487,39 @@ } ] }, + { + "key": 80, + "id": "24004", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 81, "id": "24004", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 82, - "id": "24004", "star": 6, "needrace": [], "starup": [] }, { - "key": 83, + "key": 82, "id": "24005", "star": 4, "needrace": [ @@ -1566,39 +1542,39 @@ } ] }, + { + "key": 83, + "id": "24005", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 84, "id": "24005", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 85, - "id": "24005", "star": 6, "needrace": [], "starup": [] }, { - "key": 86, + "key": 85, "id": "24006", "star": 4, "needrace": [ @@ -1621,39 +1597,39 @@ } ] }, + { + "key": 86, + "id": "24006", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 87, "id": "24006", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 88, - "id": "24006", "star": 6, "needrace": [], "starup": [] }, { - "key": 89, + "key": 88, "id": "24007", "star": 4, "needrace": [ @@ -1676,39 +1652,39 @@ } ] }, + { + "key": 89, + "id": "24007", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 90, "id": "24007", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 91, - "id": "24007", "star": 6, "needrace": [], "starup": [] }, { - "key": 92, + "key": 91, "id": "24008", "star": 4, "needrace": [ @@ -1731,39 +1707,39 @@ } ] }, + { + "key": 92, + "id": "24008", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 93, "id": "24008", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, - { - "key": 94, - "id": "24008", "star": 6, "needrace": [], "starup": [] }, { - "key": 95, + "key": 94, "id": "24009", "star": 4, "needrace": [ @@ -1787,7 +1763,7 @@ ] }, { - "key": 96, + "key": 95, "id": "24009", "star": 5, "needrace": [ @@ -1811,12 +1787,36 @@ ] }, { - "key": 97, + "key": 96, "id": "24009", "star": 6, "needrace": [], "starup": [] }, + { + "key": 97, + "id": "25001", + "star": 4, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 150000 + }, + { + "a": "item", + "t": "10000012", + "n": 4 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, { "key": 98, "id": "25001", @@ -3013,17 +3013,17 @@ { "key": 164, "id": "35006", - "star": 5, + "star": 4, "needrace": [ { "a": "attr", "t": "gold", - "n": 300000 + "n": 150000 }, { "a": "item", - "t": "10000013", - "n": 5 + "t": "10000012", + "n": 4 } ], "starup": [ @@ -3037,12 +3037,36 @@ { "key": 165, "id": "35006", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 166, + "id": "35006", "star": 6, "needrace": [], "starup": [] }, { - "key": 166, + "key": 167, "id": "43001", "star": 3, "needrace": [ @@ -3065,44 +3089,20 @@ } ] }, - { - "key": 167, - "id": "43001", - "star": 4, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 150000 - }, - { - "a": "item", - "t": "10000012", - "n": 4 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 168, "id": "43001", - "star": 5, + "star": 4, "needrace": [ { "a": "attr", "t": "gold", - "n": 300000 + "n": 150000 }, { "a": "item", - "t": "10000013", - "n": 5 + "t": "10000012", + "n": 4 } ], "starup": [ @@ -3116,12 +3116,36 @@ { "key": 169, "id": "43001", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 170, + "id": "43001", "star": 6, "needrace": [], "starup": [] }, { - "key": 170, + "key": 171, "id": "43002", "star": 3, "needrace": [ @@ -3144,44 +3168,20 @@ } ] }, - { - "key": 171, - "id": "43002", - "star": 4, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 150000 - }, - { - "a": "item", - "t": "10000012", - "n": 4 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 172, "id": "43002", - "star": 5, + "star": 4, "needrace": [ { "a": "attr", "t": "gold", - "n": 300000 + "n": 150000 }, { "a": "item", - "t": "10000013", - "n": 5 + "t": "10000012", + "n": 4 } ], "starup": [ @@ -3195,12 +3195,36 @@ { "key": 173, "id": "43002", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 174, + "id": "43002", "star": 6, "needrace": [], "starup": [] }, { - "key": 174, + "key": 175, "id": "43003", "star": 3, "needrace": [ @@ -3223,44 +3247,20 @@ } ] }, - { - "key": 175, - "id": "43003", - "star": 4, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 150000 - }, - { - "a": "item", - "t": "10000012", - "n": 4 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 176, "id": "43003", - "star": 5, + "star": 4, "needrace": [ { "a": "attr", "t": "gold", - "n": 300000 + "n": 150000 }, { "a": "item", - "t": "10000013", - "n": 5 + "t": "10000012", + "n": 4 } ], "starup": [ @@ -3274,12 +3274,36 @@ { "key": 177, "id": "43003", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 178, + "id": "43003", "star": 6, "needrace": [], "starup": [] }, { - "key": 178, + "key": 179, "id": "43004", "star": 3, "needrace": [ @@ -3302,44 +3326,20 @@ } ] }, - { - "key": 179, - "id": "43004", - "star": 4, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 150000 - }, - { - "a": "item", - "t": "10000012", - "n": 4 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 180, "id": "43004", - "star": 5, + "star": 4, "needrace": [ { "a": "attr", "t": "gold", - "n": 300000 + "n": 150000 }, { "a": "item", - "t": "10000013", - "n": 5 + "t": "10000012", + "n": 4 } ], "starup": [ @@ -3353,12 +3353,36 @@ { "key": 181, "id": "43004", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 182, + "id": "43004", "star": 6, "needrace": [], "starup": [] }, { - "key": 182, + "key": 183, "id": "43005", "star": 3, "needrace": [ @@ -3381,44 +3405,20 @@ } ] }, - { - "key": 183, - "id": "43005", - "star": 4, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 150000 - }, - { - "a": "item", - "t": "10000012", - "n": 4 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 184, "id": "43005", - "star": 5, + "star": 4, "needrace": [ { "a": "attr", "t": "gold", - "n": 300000 + "n": 150000 }, { "a": "item", - "t": "10000013", - "n": 5 + "t": "10000012", + "n": 4 } ], "starup": [ @@ -3432,12 +3432,36 @@ { "key": 185, "id": "43005", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 186, + "id": "43005", "star": 6, "needrace": [], "starup": [] }, { - "key": 186, + "key": 187, "id": "43006", "star": 3, "needrace": [ @@ -3460,33 +3484,33 @@ } ] }, - { - "key": 187, - "id": "43006", - "star": 4, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 150000 - }, - { - "a": "item", - "t": "10000012", - "n": 4 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 188, "id": "43006", + "star": 4, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 150000 + }, + { + "a": "item", + "t": "10000012", + "n": 4 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 189, + "id": "43006", "star": 5, "needrace": [ { @@ -3509,14 +3533,14 @@ ] }, { - "key": 189, + "key": 190, "id": "43006", "star": 6, "needrace": [], "starup": [] }, { - "key": 190, + "key": 191, "id": "43007", "star": 3, "needrace": [ @@ -3540,7 +3564,7 @@ ] }, { - "key": 191, + "key": 192, "id": "43007", "star": 4, "needrace": [ @@ -3563,39 +3587,39 @@ } ] }, - { - "key": 192, - "id": "43007", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 193, "id": "43007", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 194, + "id": "43007", "star": 6, "needrace": [], "starup": [] }, { - "key": 194, + "key": 195, "id": "44001", "star": 4, "needrace": [ @@ -3618,39 +3642,39 @@ } ] }, - { - "key": 195, - "id": "44001", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 196, "id": "44001", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 197, + "id": "44001", "star": 6, "needrace": [], "starup": [] }, { - "key": 197, + "key": 198, "id": "44002", "star": 4, "needrace": [ @@ -3673,39 +3697,39 @@ } ] }, - { - "key": 198, - "id": "44002", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 199, "id": "44002", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 200, + "id": "44002", "star": 6, "needrace": [], "starup": [] }, { - "key": 200, + "key": 201, "id": "44003", "star": 4, "needrace": [ @@ -3728,39 +3752,39 @@ } ] }, - { - "key": 201, - "id": "44003", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 202, "id": "44003", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 203, + "id": "44003", "star": 6, "needrace": [], "starup": [] }, { - "key": 203, + "key": 204, "id": "44004", "star": 4, "needrace": [ @@ -3783,39 +3807,39 @@ } ] }, - { - "key": 204, - "id": "44004", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 205, "id": "44004", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 206, + "id": "44004", "star": 6, "needrace": [], "starup": [] }, { - "key": 206, + "key": 207, "id": "44006", "star": 4, "needrace": [ @@ -3838,40 +3862,9 @@ } ] }, - { - "key": 207, - "id": "44006", - "star": 5, - "needrace": [ - { - "a": "attr", - "t": "gold", - "n": 300000 - }, - { - "a": "item", - "t": "10000013", - "n": 5 - } - ], - "starup": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] - }, { "key": 208, "id": "44006", - "star": 6, - "needrace": [], - "starup": [] - }, - { - "key": 209, - "id": "45001", "star": 5, "needrace": [ { @@ -3893,16 +3886,16 @@ } ] }, + { + "key": 209, + "id": "44006", + "star": 6, + "needrace": [], + "starup": [] + }, { "key": 210, "id": "45001", - "star": 6, - "needrace": [], - "starup": [] - }, - { - "key": 211, - "id": "45002", "star": 5, "needrace": [ { @@ -3924,16 +3917,16 @@ } ] }, + { + "key": 211, + "id": "45001", + "star": 6, + "needrace": [], + "starup": [] + }, { "key": 212, "id": "45002", - "star": 6, - "needrace": [], - "starup": [] - }, - { - "key": 213, - "id": "45003", "star": 5, "needrace": [ { @@ -3955,15 +3948,46 @@ } ] }, + { + "key": 213, + "id": "45002", + "star": 6, + "needrace": [], + "starup": [] + }, { "key": 214, "id": "45003", + "star": 5, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "item", + "t": "10000013", + "n": 5 + } + ], + "starup": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "key": 215, + "id": "45003", "star": 6, "needrace": [], "starup": [] }, { - "key": 215, + "key": 216, "id": "45004", "star": 5, "needrace": [ @@ -3987,14 +4011,14 @@ ] }, { - "key": 216, + "key": 217, "id": "45004", "star": 6, "needrace": [], "starup": [] }, { - "key": 217, + "key": 218, "id": "44005", "star": 4, "needrace": [ @@ -4018,7 +4042,7 @@ ] }, { - "key": 218, + "key": 219, "id": "44005", "star": 5, "needrace": [ @@ -4042,14 +4066,14 @@ ] }, { - "key": 219, + "key": 220, "id": "44005", "star": 6, "needrace": [], "starup": [] }, { - "key": 220, + "key": 221, "id": "15005", "star": 5, "needrace": [ @@ -4073,7 +4097,7 @@ ] }, { - "key": 221, + "key": 222, "id": "15005", "star": 6, "needrace": [], diff --git a/bin/json/game_herotalent.json b/bin/json/game_herotalent.json index 2452d4666..5123a9be1 100644 --- a/bin/json/game_herotalent.json +++ b/bin/json/game_herotalent.json @@ -28924,7 +28924,7 @@ "condition": 50, "skilltxt": { "key": "hero_talent_hero_talent_skilltxt_1084", - "text": "攻击时附带消耗自身血量5%，附带消耗血量100%的伤害" + "text": "3技能额外附带2回合免疫效果" }, "skillicon": "js_jx_img_icon09", "attr": { diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 1e5a8ce41..f64a717be 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -47143,6 +47143,170 @@ "sale": [], "gm": 0 }, + { + "id": "25010006", + "name": { + "key": "item_item_name_25010006", + "text": "菲奥娜的袜子" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_25010006", + "intr": { + "key": "item_item_intr_25010006", + "text": "菲奥娜的袜子" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 + }, + { + "id": "25010007", + "name": { + "key": "item_item_name_25010007", + "text": "驯龙笔记" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_25010007", + "intr": { + "key": "item_item_intr_25010007", + "text": "驯龙笔记" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 + }, + { + "id": "25010008", + "name": { + "key": "item_item_name_25010008", + "text": "陈旧的靴子" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_25010008", + "intr": { + "key": "item_item_intr_25010008", + "text": "陈旧的靴子" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 + }, + { + "id": "25010009", + "name": { + "key": "item_item_name_25010009", + "text": "毛线球" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_25010009", + "intr": { + "key": "item_item_intr_25010009", + "text": "毛线球" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 + }, { "id": "30000001", "name": { @@ -47168,7 +47332,7 @@ "access": [], "use_skip": 0, "upper_limit": 0, - "img": "item_30000001", + "img": "attr_merchantmoney", "intr": { "key": "item_item_intr_30000001", "text": "掠夺勇气值，用于解锁额外的运输位。" @@ -47183,5 +47347,87 @@ }, "sale": [], "gm": 0 + }, + { + "id": "30000002", + "name": { + "key": "item_item_name_30000002", + "text": "黑板擦" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_24010002", + "intr": { + "key": "item_item_intr_30000002", + "text": "可以用来刷新货船，来寻找更新有的货物进行运输。" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 + }, + { + "id": "30000003", + "name": { + "key": "item_item_name_30000003", + "text": "瓶盖" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "attr_guildexp", + "intr": { + "key": "item_item_intr_30000003", + "text": "可以用来解锁养成线内容，提高运输船护卫队的战斗和防守能力，以及一些特殊的战局效果。" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 } ] \ No newline at end of file diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index d1ba5bb2d..37d8f50ea 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -8404,6 +8404,111 @@ "modelsize": 1, "skillSequence": [] }, + { + "Id": 102111, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": -1, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 102111, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 70, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 102111, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51012, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 58, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 102111, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 61, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 102111, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": -1, + "modelsize": 1, + "skillSequence": [] + }, { "Id": 102611, "pos": 1, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 1cc8ca1b7..8dbf8bd72 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -41436,6 +41436,110 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 244002121, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "TriggerAnim": "", + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [ + 244002112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244002131, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "TriggerAnim": "", + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [ + 244002112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244002141, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "TriggerAnim": "", + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [ + 244002112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244002151, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "TriggerAnim": "", + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [ + 244002112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 244002211, "EmitPR": 1000, @@ -58030,11 +58134,11 @@ "Limit": 10, "ExecuteCnt": 1, "TriggerAnim": "", - "Type": 11, + "Type": 2, "Argu": [ - 2, - 2, - 50 + 483500521, + -1, + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -58048,17 +58152,18 @@ { "Id": 835005213, "EmitPR": 1000, - "From": 2, + "From": 1, "Where": [], "Order": "", "Limit": 10, "ExecuteCnt": 1, "TriggerAnim": "", - "Type": 11, + "Type": 3, "Argu": [ - 2, - 2, - 50 + 390001111, + 1000, + 1, + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -74514,7 +74619,7 @@ 391000119, 1000, 1, - -1 + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -74893,7 +74998,7 @@ 391000119, 1000, 1, - -1 + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -75271,7 +75376,7 @@ 391000119, 1000, 1, - -1 + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -75378,5 +75483,30 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [] + }, + { + "Id": 210000004, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "TriggerAnim": "", + "Type": 3, + "Argu": [ + 391000131, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index cd1288555..57254da3b 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -26307,7 +26307,7 @@ { "id": 143007211, "level": 1, - "MaxLV": 3, + "MaxLV": 1, "UnavailablePlayTypes": [], "SkillFlag": 2, "EffectFlag": 2, @@ -26337,72 +26337,6 @@ "buffid": [], "map": "" }, - { - "id": 143007211, - "level": 2, - "MaxLV": 3, - "UnavailablePlayTypes": [], - "SkillFlag": 2, - "EffectFlag": 2, - "Priority": 2, - "Name": { - "key": "skill_skill_atk_Name_143007211", - "text": "老练包扎" - }, - "ico": "jn_43007_2", - "CorrectPos": 0, - "IsMelee": 0, - "act": "Skill_2", - "Type": 2, - "CD": 0, - "Where": [], - "Target": 0, - "ChildSkill": { - "Id": [ - 243007211 - ] - }, - "passSkill": [], - "Desc": { - "key": "skill_skill_atk_Desc_143007211_2", - "text": "冷却回合减少1回合。" - }, - "buffid": [], - "map": "" - }, - { - "id": 143007211, - "level": 3, - "MaxLV": 3, - "UnavailablePlayTypes": [], - "SkillFlag": 2, - "EffectFlag": 2, - "Priority": 2, - "Name": { - "key": "skill_skill_atk_Name_143007211", - "text": "老练包扎" - }, - "ico": "jn_43007_2", - "CorrectPos": 0, - "IsMelee": 0, - "act": "Skill_2", - "Type": 2, - "CD": 0, - "Where": [], - "Target": 0, - "ChildSkill": { - "Id": [ - 243007211 - ] - }, - "passSkill": [], - "Desc": { - "key": "skill_skill_atk_Desc_143007211_3", - "text": "冷却回合减少1回合。" - }, - "buffid": [], - "map": "" - }, { "id": 143007311, "level": 1, @@ -32942,7 +32876,7 @@ { "id": 144002111, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "SkillFlag": 1, "EffectFlag": 5, @@ -32967,7 +32901,139 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_144002111_1", - "text": "蛇先生对敌方1个目标造成攻击力120%的伤害，并有60%概率驱散目标1个增益效果。" + "text": "蛇先生对敌方1个目标造成攻击力300%的伤害，并有60%概率驱散目标1个增益效果。" + }, + "buffid": [], + "map": "" + }, + { + "id": 144002111, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "SkillFlag": 1, + "EffectFlag": 5, + "Priority": 1, + "Name": { + "key": "skill_skill_atk_Name_144002111", + "text": "蛇咬" + }, + "ico": "jn_44002_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244002121 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144002111_2", + "text": "伤害提升至310%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 144002111, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "SkillFlag": 1, + "EffectFlag": 5, + "Priority": 1, + "Name": { + "key": "skill_skill_atk_Name_144002111", + "text": "蛇咬" + }, + "ico": "jn_44002_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244002131 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144002111_3", + "text": "伤害提升至320%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 144002111, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "SkillFlag": 1, + "EffectFlag": 5, + "Priority": 1, + "Name": { + "key": "skill_skill_atk_Name_144002111", + "text": "蛇咬" + }, + "ico": "jn_44002_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244002141 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144002111_4", + "text": "伤害提升至330%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 144002111, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "SkillFlag": 1, + "EffectFlag": 5, + "Priority": 1, + "Name": { + "key": "skill_skill_atk_Name_144002111", + "text": "蛇咬" + }, + "ico": "jn_44002_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244002151 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144002111_5", + "text": "伤害提升至340%。" }, "buffid": [], "map": "" @@ -32975,7 +33041,77 @@ { "id": 144002211, "level": 1, - "MaxLV": 1, + "MaxLV": 4, + "UnavailablePlayTypes": [], + "SkillFlag": 3, + "EffectFlag": 8, + "Priority": 2, + "Name": { + "key": "skill_skill_atk_Name_144002211", + "text": "分享推推糖" + }, + "ico": "jn_44002_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 6, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 244002211 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144002211_1", + "text": "蛇先生己方回复各自最大生命在10%的生命和自身攻击力80%的生命，并附加1回合[color=#37d8a9]复苏[/color] 状态。" + }, + "buffid": [ + 390001127 + ], + "map": "" + }, + { + "id": 144002211, + "level": 2, + "MaxLV": 4, + "UnavailablePlayTypes": [], + "SkillFlag": 3, + "EffectFlag": 8, + "Priority": 2, + "Name": { + "key": "skill_skill_atk_Name_144002211", + "text": "分享推推糖" + }, + "ico": "jn_44002_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 5, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 244002211 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144002211_2", + "text": "冷却时间减少1回合。" + }, + "buffid": [ + 390001127 + ], + "map": "" + }, + { + "id": 144002211, + "level": 3, + "MaxLV": 4, "UnavailablePlayTypes": [], "SkillFlag": 3, "EffectFlag": 8, @@ -32999,8 +33135,43 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_144002211_1", - "text": "蛇先生己方回复各自最大生命在10%的生命和自身攻击力80%的生命，并附加1回合[color=#37d8a9]复苏[/color] 状态。" + "key": "skill_skill_atk_Desc_144002211_3", + "text": "冷却时间减少1回合。" + }, + "buffid": [ + 390001127 + ], + "map": "" + }, + { + "id": 144002211, + "level": 4, + "MaxLV": 4, + "UnavailablePlayTypes": [], + "SkillFlag": 3, + "EffectFlag": 8, + "Priority": 2, + "Name": { + "key": "skill_skill_atk_Name_144002211", + "text": "分享推推糖" + }, + "ico": "jn_44002_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 244002211 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144002211_4", + "text": "冷却时间减少1回合。" }, "buffid": [ 390001127 @@ -33010,7 +33181,77 @@ { "id": 144002311, "level": 1, - "MaxLV": 1, + "MaxLV": 4, + "UnavailablePlayTypes": [], + "SkillFlag": 4, + "EffectFlag": 10, + "Priority": 3, + "Name": { + "key": "skill_skill_atk_Name_144002311", + "text": "窃计开始" + }, + "ico": "jn_44002_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 7, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 244002311 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144002311_1", + "text": "蛇先生己方提升25%行动值，并施加[color=#37d8a9]滑稽的伪装[/color] 。" + }, + "buffid": [ + 390001436 + ], + "map": "" + }, + { + "id": 144002311, + "level": 2, + "MaxLV": 4, + "UnavailablePlayTypes": [], + "SkillFlag": 4, + "EffectFlag": 10, + "Priority": 3, + "Name": { + "key": "skill_skill_atk_Name_144002311", + "text": "窃计开始" + }, + "ico": "jn_44002_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 6, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 244002311 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144002311_2", + "text": "冷却时间减少1回合。" + }, + "buffid": [ + 390001436 + ], + "map": "" + }, + { + "id": 144002311, + "level": 3, + "MaxLV": 4, "UnavailablePlayTypes": [], "SkillFlag": 4, "EffectFlag": 10, @@ -33034,8 +33275,43 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_144002311_1", - "text": "蛇先生己方提升25%行动值，并施加[color=#37d8a9]滑稽的伪装[/color] 。" + "key": "skill_skill_atk_Desc_144002311_3", + "text": "冷却时间减少1回合。" + }, + "buffid": [ + 390001436 + ], + "map": "" + }, + { + "id": 144002311, + "level": 4, + "MaxLV": 4, + "UnavailablePlayTypes": [], + "SkillFlag": 4, + "EffectFlag": 10, + "Priority": 3, + "Name": { + "key": "skill_skill_atk_Name_144002311", + "text": "窃计开始" + }, + "ico": "jn_44002_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 244002311 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144002311_4", + "text": "冷却时间减少1回合。" }, "buffid": [ 390001436 @@ -50958,7 +51234,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_835005431_1", - "text": "3技能新增效果：每次攻击时，每点速度提供攻击力0.33%的额外伤害" + "text": "每次攻击时，每点速度提供攻击力0.33%的额外伤害" }, "buffid": [], "map": "" @@ -51018,14 +51294,15 @@ "Target": 0, "ChildSkill": { "Id": [ - 835005212, - 835005213 + 835005212 ] }, - "passSkill": [], + "passSkill": [ + 835005212 + ], "Desc": { "key": "skill_skill_atk_Desc_835005423_1", - "text": "攻击时附带消耗自身血量5%，附带消耗血量100%的伤害" + "text": "3技能额外附带2回合免疫效果" }, "buffid": [], "map": "" @@ -61726,5 +62003,38 @@ }, "buffid": [], "map": "" + }, + { + "id": 100000004, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Priority": 0, + "Name": { + "key": "skill_skill_atk_Name_100000004", + "text": "" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 210000004 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_100000004_1", + "text": "黑化特效" + }, + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 0f083e79c..29d5e88dd 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -14667,7 +14667,7 @@ "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", - "buffIcon": "ty_icon_buff_fcsz", + "buffIcon": "ty_icon_buff_xyun", "buffeffect": "", "buffpos": "", "AddTrigger": 0, @@ -15046,5 +15046,40 @@ "TriggerAnim": "", "forbidFloat": 0, "ReplaceBuffID": 0 + }, + { + "Id": 391000131, + "Name": { + "key": "skill_skill_buff_Name_391000131", + "text": "" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000131", + "text": "黑化特效" + }, + "BuffType": 0, + "EffectArgu": [], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 0 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "effect_53001_evil_heiyan", + "buffpos": "根节点", + "AddTrigger": 0, + "TriggerEffect": "", + "TriggerPos": "", + "TriggerAnim": "", + "forbidFloat": 0, + "ReplaceBuffID": 0 } ] \ No newline at end of file diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 206781f2a..84651791c 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -13533,5 +13533,31 @@ "Callback": [ 285003514 ] + }, + { + "Id": 483500521, + "Name": { + "key": "skill_skill_passive_Name_483500521", + "text": "" + }, + "icon": "", + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "TriggerAnim": "", + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 1, + "Callback": [ + 835005213 + ] } ] \ No newline at end of file diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index 6d3e760b6..c92c9a692 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -568,5 +568,21 @@ "carexe": 500, "reward": 0, "exreward": [] + }, + { + "id": 127, + "FormatList": [ + 102111 + ], + "BattleReadyID": 10103009, + "EventList": [], + "playexp": { + "a": "attr", + "t": "exp", + "n": 1 + }, + "carexe": 500, + "reward": 0, + "exreward": [] } ] \ No newline at end of file diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 189a03d2d..14d4288a4 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -582,6 +582,10 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero, } return } + if hero.HeroID == "" { // 这里出bug了 + this.module.Errorf("获取英雄数据出问题.玩家id:%s 英雄对象:%v", session.GetUserId(), hero) + continue + } update = make(map[string]interface{}, 0) curExp = hero.Exp curLv = hero.Lv diff --git a/modules/hero/module.go b/modules/hero/module.go index 1010083bb..9b52214fd 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -886,7 +886,6 @@ func (this *Hero) AddHerosExp(session comm.IUserSession, heroObjs []string, exp } return } - if curAddExp, award, errdata = this.modelHero.AddCardExp(session, heros, exp, nil); errdata != nil { return } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 45935c6dc..d0b392629 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -286,6 +286,10 @@ type GameGlobalData struct { PlunderPvpCollegeTime int32 PlunderPvpPlunderum int32 PlunderPvpTransportnum int32 + PlunderPvpSeasontime int32 + PlunderPvpTimeon int32 + PlunderPvpEndtime int32 + PlunderPvpRemake *Gameatn PvpEndtime int32 PvpMaintenancetime int32 PvpIntegraltool string @@ -1107,6 +1111,10 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_time"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_time error"); return }; _v.PlunderPvpCollegeTime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_plunderum"].(float64); !_ok_ { err = errors.New("plunder_pvp_plunderum error"); return }; _v.PlunderPvpPlunderum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_transportnum"].(float64); !_ok_ { err = errors.New("plunder_pvp_transportnum error"); return }; _v.PlunderPvpTransportnum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_seasontime"].(float64); !_ok_ { err = errors.New("plunder_pvp_seasontime error"); return }; _v.PlunderPvpSeasontime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_timeon"].(float64); !_ok_ { err = errors.New("plunder_pvp_timeon error"); return }; _v.PlunderPvpTimeon = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_endtime"].(float64); !_ok_ { err = errors.New("plunder_pvp_endtime error"); return }; _v.PlunderPvpEndtime = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["plunder_pvp_remake"].(map[string]interface{}); !_ok_ { err = errors.New("plunder_pvp_remake error"); return }; if _v.PlunderPvpRemake, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_endtime"].(float64); !_ok_ { err = errors.New("pvp_endtime error"); return }; _v.PvpEndtime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_maintenancetime"].(float64); !_ok_ { err = errors.New("pvp_maintenancetime error"); return }; _v.PvpMaintenancetime = int32(_tempNum_) } { var _ok_ bool; if _v.PvpIntegraltool, _ok_ = _buf["pvp_integraltool"].(string); !_ok_ { err = errors.New("pvp_integraltool error"); return } }