diff --git a/bin/json/game_com.json b/bin/json/game_com.json new file mode 100644 index 000000000..942a7e8cf --- /dev/null +++ b/bin/json/game_com.json @@ -0,0 +1,57 @@ +[ + { + "index": "max_hy", + "var": "30", + "intr": "最大好友数" + }, + { + "index": "max_getreward", + "var": "10002,99", + "intr": "领取/赠送奖励" + }, + { + "index": "max_get", + "var": "30", + "intr": "每日领取/赠送次数" + }, + { + "index": "max_char", + "var": "100", + "intr": "聊天最大输入字符数量" + }, + { + "index": "max_hmd", + "var": "30", + "intr": "最大黑名单数" + }, + { + "index": "task_reset", + "var": "8", + "intr": "日/周常任务刷新时间，8点" + }, + { + "index": "init_gold", + "var": "100000", + "intr": "初始金币" + }, + { + "index": "init_hero", + "var": "15001,25001", + "intr": "初始英雄" + }, + { + "index": "cameramin", + "var": "0,0,0", + "intr": "镜头坐标最小值" + }, + { + "index": "cameramax", + "var": "-1.53,1.1,-8", + "intr": "镜头坐标最大值" + }, + { + "index": "heroshownum", + "var": "2", + "intr": "播放开场动作角色数量" + } +] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 186fced7f..942a7e8cf 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -46,7 +46,7 @@ }, { "index": "cameramax", - "var": "0,1.54,-2.62", + "var": "-1.53,1.1,-8", "intr": "镜头坐标最大值" }, { diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 5d1f0855d..35272fabd 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -1,7 +1,10 @@ [ { "id": 11001, - "name": "阿宝", + "name": { + "key": "11001", + "text": "阿宝" + }, "star": 4, "color": 3, "race": 1, @@ -30,7 +33,10 @@ }, { "id": 11002, - "name": "原始人", + "name": { + "key": "11002", + "text": "原始人" + }, "star": 5, "color": 4, "race": 1, @@ -59,7 +65,10 @@ }, { "id": 11003, - "name": "波比", + "name": { + "key": "11003", + "text": "波比" + }, "star": 5, "color": 4, "race": 2, @@ -90,7 +99,10 @@ }, { "id": 11004, - "name": "布兰", + "name": { + "key": "11004", + "text": "布兰" + }, "star": 5, "color": 4, "race": 1, @@ -119,7 +131,10 @@ }, { "id": 11005, - "name": "无牙仔", + "name": { + "key": "11005", + "text": "无牙仔" + }, "star": 4, "color": 3, "race": 1, @@ -148,7 +163,10 @@ }, { "id": 11006, - "name": "亚丝翠", + "name": { + "key": "11006", + "text": "亚丝翠" + }, "star": 5, "color": 4, "race": 1, @@ -177,7 +195,10 @@ }, { "id": 11009, - "name": "希卡普", + "name": { + "key": "11009", + "text": "希卡普" + }, "star": 4, "color": 3, "race": 3, @@ -206,7 +227,10 @@ }, { "id": 22002, - "name": "沈王爷青春版", + "name": { + "key": "22002", + "text": "沈王爷青春版" + }, "star": 5, "color": 4, "race": 2, @@ -235,7 +259,10 @@ }, { "id": 90001, - "name": "邪恶阿宝", + "name": { + "key": "90001", + "text": "邪恶阿宝" + }, "star": 4, "color": 3, "race": 1, @@ -264,7 +291,10 @@ }, { "id": 11011, - "name": "浣熊", + "name": { + "key": "11011", + "text": "浣熊" + }, "star": 4, "color": 3, "race": 2, @@ -293,7 +323,10 @@ }, { "id": 11008, - "name": "悍娇虎", + "name": { + "key": "11008", + "text": "悍娇虎" + }, "star": 5, "color": 4, "race": 2, @@ -322,7 +355,10 @@ }, { "id": 11017, - "name": "冰霜杰克", + "name": { + "key": "11017", + "text": "冰霜杰克" + }, "star": 5, "color": 4, "race": 4, @@ -353,7 +389,10 @@ }, { "id": 11018, - "name": "睡神", + "name": { + "key": "11018", + "text": "睡神" + }, "star": 5, "color": 4, "race": 4, @@ -385,7 +424,10 @@ }, { "id": 11019, - "name": "莫甘娜", + "name": { + "key": "11019", + "text": "莫甘娜" + }, "star": 5, "color": 4, "race": 2, @@ -414,7 +456,10 @@ }, { "id": 11020, - "name": "莫甘娜二阶段", + "name": { + "key": "11020", + "text": "莫甘娜二阶段" + }, "star": 5, "color": 4, "race": 2, @@ -443,7 +488,10 @@ }, { "id": 11021, - "name": "莫甘娜巨怪", + "name": { + "key": "11021", + "text": "莫甘娜巨怪" + }, "star": 5, "color": 4, "race": 2, @@ -472,7 +520,10 @@ }, { "id": 11099, - "name": "触手", + "name": { + "key": "11099", + "text": "触手" + }, "star": 5, "color": 4, "race": 2, @@ -501,7 +552,10 @@ }, { "id": 12001, - "name": "黑化阿宝", + "name": { + "key": "12001", + "text": "黑化阿宝" + }, "star": 5, "color": 4, "race": 2, @@ -530,7 +584,10 @@ }, { "id": 12003, - "name": "黑化包比", + "name": { + "key": "12003", + "text": "黑化包比" + }, "star": 5, "color": 4, "race": 2, @@ -561,7 +618,10 @@ }, { "id": 12009, - "name": "黑化希卡普", + "name": { + "key": "12009", + "text": "黑化希卡普" + }, "star": 5, "color": 4, "race": 2, @@ -590,7 +650,10 @@ }, { "id": 12017, - "name": "黑化杰克", + "name": { + "key": "12017", + "text": "黑化杰克" + }, "star": 5, "color": 4, "race": 2, @@ -621,7 +684,10 @@ }, { "id": 12018, - "name": "黑化睡神", + "name": { + "key": "12018", + "text": "黑化睡神" + }, "star": 5, "color": 4, "race": 2, @@ -647,5 +713,37 @@ "skill3": 0, "enteranivalue": 0, "camerainterval": 0.6 + }, + { + "id": 44005, + "name": { + "key": "44005", + "text": "小伊" + }, + "star": 4, + "color": 4, + "race": 4, + "job": 3, + "type": 1, + "prefab": "Person/44005.prefab", + "icon": 44005, + "sound": 44005, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_44005.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0, + "enteranivalue": 0, + "camerainterval": 0.6 } ] \ No newline at end of file diff --git a/bin/json/game_heroexp.json b/bin/json/game_heroexp.json index 9e333403f..0848cee2a 100644 --- a/bin/json/game_heroexp.json +++ b/bin/json/game_heroexp.json @@ -5,7 +5,8 @@ "star": 2, "color": 1, "heroexp": 1000, - "skilllevelup": 0 + "skilllevelup": 0, + "needgold": 1000 }, { "hid": 43911, @@ -13,7 +14,8 @@ "star": 3, "color": 2, "heroexp": 5000, - "skilllevelup": 0 + "skilllevelup": 0, + "needgold": 5000 }, { "hid": 44911, @@ -21,7 +23,8 @@ "star": 4, "color": 3, "heroexp": 20000, - "skilllevelup": 0 + "skilllevelup": 0, + "needgold": 20000 }, { "hid": 43921, @@ -29,7 +32,8 @@ "star": 3, "color": 2, "heroexp": 0, - "skilllevelup": 1 + "skilllevelup": 1, + "needgold": 1000 }, { "hid": 44921, @@ -37,7 +41,8 @@ "star": 4, "color": 3, "heroexp": 0, - "skilllevelup": 1 + "skilllevelup": 1, + "needgold": 1000 }, { "hid": 45921, @@ -45,6 +50,7 @@ "star": 5, "color": 4, "heroexp": 0, - "skilllevelup": 1 + "skilllevelup": 1, + "needgold": 1000 } ] \ No newline at end of file diff --git a/bin/json/game_herolevelup.json b/bin/json/game_herolevelup.json index cbb4fb0b7..42193c839 100644 --- a/bin/json/game_herolevelup.json +++ b/bin/json/game_herolevelup.json @@ -8,13 +8,6 @@ "n": 300 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 300 - } - ], "hp": 1857, "atk": 137, "def": 137 @@ -28,13 +21,6 @@ "n": 320 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 320 - } - ], "hp": 1953, "atk": 142.7, "def": 143.7 @@ -48,13 +34,6 @@ "n": 340 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 340 - } - ], "hp": 2049, "atk": 148.4, "def": 150.4 @@ -68,13 +47,6 @@ "n": 360 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 360 - } - ], "hp": 2145, "atk": 154.1, "def": 157.1 @@ -88,13 +60,6 @@ "n": 380 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 380 - } - ], "hp": 2241, "atk": 159.8, "def": 163.8 @@ -108,13 +73,6 @@ "n": 400 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 400 - } - ], "hp": 2337, "atk": 165.5, "def": 170.5 @@ -128,13 +86,6 @@ "n": 420 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 420 - } - ], "hp": 2433, "atk": 171.2, "def": 177.2 @@ -148,13 +99,6 @@ "n": 440 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 440 - } - ], "hp": 2529, "atk": 176.9, "def": 183.9 @@ -168,13 +112,6 @@ "n": 460 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 460 - } - ], "hp": 2625, "atk": 182.6, "def": 190.6 @@ -188,13 +125,6 @@ "n": 480 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 480 - } - ], "hp": 2721, "atk": 188.3, "def": 197.3 @@ -208,13 +138,6 @@ "n": 1100 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 1100 - } - ], "hp": 2817, "atk": 194, "def": 204 @@ -228,13 +151,6 @@ "n": 1200 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 1200 - } - ], "hp": 2913, "atk": 199.7, "def": 210.7 @@ -248,13 +164,6 @@ "n": 1300 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 1300 - } - ], "hp": 3009, "atk": 205.4, "def": 217.4 @@ -268,13 +177,6 @@ "n": 1400 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 1400 - } - ], "hp": 3105, "atk": 211.1, "def": 224.1 @@ -288,13 +190,6 @@ "n": 1500 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 1500 - } - ], "hp": 3201, "atk": 216.8, "def": 230.8 @@ -308,13 +203,6 @@ "n": 1600 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 1600 - } - ], "hp": 3297, "atk": 222.5, "def": 237.5 @@ -328,13 +216,6 @@ "n": 1700 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 1700 - } - ], "hp": 3393, "atk": 228.2, "def": 244.2 @@ -348,13 +229,6 @@ "n": 1800 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 1800 - } - ], "hp": 3489, "atk": 233.9, "def": 250.9 @@ -368,13 +242,6 @@ "n": 1900 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 1900 - } - ], "hp": 3585, "atk": 239.6, "def": 257.6 @@ -388,13 +255,6 @@ "n": 2000 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 2000 - } - ], "hp": 3681, "atk": 245.3, "def": 264.3 @@ -408,13 +268,6 @@ "n": 6300 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 6300 - } - ], "hp": 3777, "atk": 251, "def": 271 @@ -428,13 +281,6 @@ "n": 6600 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 6600 - } - ], "hp": 3873, "atk": 256.7, "def": 277.7 @@ -448,13 +294,6 @@ "n": 6900 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 6900 - } - ], "hp": 3969, "atk": 262.4, "def": 284.4 @@ -468,13 +307,6 @@ "n": 7200 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 7200 - } - ], "hp": 4065, "atk": 268.1, "def": 291.1 @@ -488,13 +320,6 @@ "n": 7500 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 7500 - } - ], "hp": 4161, "atk": 273.8, "def": 297.8 @@ -508,13 +333,6 @@ "n": 7800 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 7800 - } - ], "hp": 4257, "atk": 279.5, "def": 304.5 @@ -528,13 +346,6 @@ "n": 8100 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 8100 - } - ], "hp": 4353, "atk": 285.2, "def": 311.2 @@ -548,13 +359,6 @@ "n": 8400 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 8400 - } - ], "hp": 4449, "atk": 290.9, "def": 317.9 @@ -568,13 +372,6 @@ "n": 8700 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 8700 - } - ], "hp": 4545, "atk": 296.6, "def": 324.6 @@ -588,13 +385,6 @@ "n": 9000 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 9000 - } - ], "hp": 4641, "atk": 302.3, "def": 331.3 @@ -608,13 +398,6 @@ "n": 15500 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 15500 - } - ], "hp": 4737, "atk": 308, "def": 338 @@ -628,13 +411,6 @@ "n": 16000 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 16000 - } - ], "hp": 4833, "atk": 313.7, "def": 344.7 @@ -648,13 +424,6 @@ "n": 16500 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 16500 - } - ], "hp": 4929, "atk": 319.4, "def": 351.4 @@ -668,13 +437,6 @@ "n": 17000 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 17000 - } - ], "hp": 5025, "atk": 325.1, "def": 358.1 @@ -688,13 +450,6 @@ "n": 17500 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 17500 - } - ], "hp": 5121, "atk": 330.8, "def": 364.8 @@ -708,13 +463,6 @@ "n": 18000 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 18000 - } - ], "hp": 5217, "atk": 336.5, "def": 371.5 @@ -728,13 +476,6 @@ "n": 18500 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 18500 - } - ], "hp": 5313, "atk": 342.2, "def": 378.2 @@ -748,13 +489,6 @@ "n": 19000 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 19000 - } - ], "hp": 5409, "atk": 347.9, "def": 384.9 @@ -768,13 +502,6 @@ "n": 19500 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 19500 - } - ], "hp": 5505, "atk": 353.6, "def": 391.6 @@ -788,13 +515,6 @@ "n": 20000 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ], "hp": 5601, "atk": 359.3, "def": 398.3 @@ -808,13 +528,6 @@ "n": 24600 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 24600 - } - ], "hp": 5697, "atk": 365, "def": 405 @@ -828,13 +541,6 @@ "n": 25200 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 25200 - } - ], "hp": 5793, "atk": 370.7, "def": 411.7 @@ -848,13 +554,6 @@ "n": 25800 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 25800 - } - ], "hp": 5889, "atk": 376.4, "def": 418.4 @@ -868,13 +567,6 @@ "n": 26400 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 26400 - } - ], "hp": 5985, "atk": 382.1, "def": 425.1 @@ -888,13 +580,6 @@ "n": 27000 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 27000 - } - ], "hp": 6081, "atk": 387.8, "def": 431.8 @@ -908,13 +593,6 @@ "n": 27600 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 27600 - } - ], "hp": 6177, "atk": 393.5, "def": 438.5 @@ -928,13 +606,6 @@ "n": 28200 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 28200 - } - ], "hp": 6273, "atk": 399.2, "def": 445.2 @@ -948,13 +619,6 @@ "n": 28800 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 28800 - } - ], "hp": 6369, "atk": 404.9, "def": 451.9 @@ -968,13 +632,6 @@ "n": 29400 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 29400 - } - ], "hp": 6465, "atk": 410.6, "def": 458.6 @@ -988,13 +645,6 @@ "n": 30000 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 30000 - } - ], "hp": 6561, "atk": 416.3, "def": 465.3 @@ -1008,13 +658,6 @@ "n": 48450 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 48450 - } - ], "hp": 6657, "atk": 422, "def": 472 @@ -1028,13 +671,6 @@ "n": 49400 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 49400 - } - ], "hp": 6753, "atk": 427.7, "def": 478.7 @@ -1048,13 +684,6 @@ "n": 50350 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 50350 - } - ], "hp": 6849, "atk": 433.4, "def": 485.4 @@ -1068,13 +697,6 @@ "n": 51300 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 51300 - } - ], "hp": 6945, "atk": 439.1, "def": 492.1 @@ -1088,13 +710,6 @@ "n": 52250 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 52250 - } - ], "hp": 7041, "atk": 444.8, "def": 498.8 @@ -1108,13 +723,6 @@ "n": 53200 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 53200 - } - ], "hp": 7137, "atk": 450.5, "def": 505.5 @@ -1128,13 +736,6 @@ "n": 54150 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 54150 - } - ], "hp": 7233, "atk": 456.2, "def": 512.2 @@ -1148,13 +749,6 @@ "n": 55100 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 55100 - } - ], "hp": 7329, "atk": 461.9, "def": 518.9 @@ -1168,13 +762,6 @@ "n": 56050 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 56050 - } - ], "hp": 7425, "atk": 467.6, "def": 525.6 @@ -1188,13 +775,6 @@ "n": 57000 } ], - "gold": [ - { - "a": "attr", - "t": "gold", - "n": 57000 - } - ], "hp": 7521, "atk": 473.3, "def": 532.3 diff --git a/bin/json/game_herostargrow.json b/bin/json/game_herostargrow.json index 4e994d8bd..09f5228c0 100644 --- a/bin/json/game_herostargrow.json +++ b/bin/json/game_herostargrow.json @@ -2,6 +2,7 @@ { "star": 1, "level": 1, + "maxlevel": 10, "starup_hp": 0, "starup_atk": 0, "starup_def": 0, @@ -10,6 +11,7 @@ { "star": 2, "level": 10, + "maxlevel": 20, "starup_hp": 9.5, "starup_atk": 9.5, "starup_def": 9.5, @@ -18,6 +20,7 @@ { "star": 3, "level": 20, + "maxlevel": 30, "starup_hp": 19, "starup_atk": 19, "starup_def": 19, @@ -26,6 +29,7 @@ { "star": 4, "level": 30, + "maxlevel": 40, "starup_hp": 28.5, "starup_atk": 28.5, "starup_def": 28.5, @@ -34,6 +38,7 @@ { "star": 5, "level": 40, + "maxlevel": 50, "starup_hp": 38, "starup_atk": 38, "starup_def": 38, @@ -42,6 +47,7 @@ { "star": 6, "level": 50, + "maxlevel": 60, "starup_hp": 47.5, "starup_atk": 47.5, "starup_def": 47.5, diff --git a/bin/json/game_herostarup.json b/bin/json/game_herostarup.json index 3c11a7106..688f6ab58 100644 --- a/bin/json/game_herostarup.json +++ b/bin/json/game_herostarup.json @@ -3,7 +3,6 @@ "key": 1, "id": 25001, "star": 4, - "maxlevel": 40, "needhero": 25001, "needherostar": 4, "needheronum": 1, @@ -18,7 +17,6 @@ "key": 2, "id": 25001, "star": 5, - "maxlevel": 50, "needhero": 25001, "needherostar": 5, "needheronum": 1, @@ -33,7 +31,6 @@ "key": 3, "id": 25001, "star": 6, - "maxlevel": 60, "needhero": 0, "needherostar": 0, "needheronum": 0, @@ -46,7 +43,6 @@ "key": 4, "id": 25002, "star": 5, - "maxlevel": 50, "needhero": 25002, "needherostar": 5, "needheronum": 1, @@ -61,7 +57,6 @@ "key": 5, "id": 25002, "star": 6, - "maxlevel": 60, "needhero": 0, "needherostar": 0, "needheronum": 0, @@ -74,7 +69,6 @@ "key": 6, "id": 25003, "star": 5, - "maxlevel": 50, "needhero": 25003, "needherostar": 5, "needheronum": 1, @@ -89,7 +83,6 @@ "key": 7, "id": 25003, "star": 6, - "maxlevel": 60, "needhero": 0, "needherostar": 0, "needheronum": 0, @@ -102,7 +95,6 @@ "key": 8, "id": 15004, "star": 5, - "maxlevel": 50, "needhero": 15004, "needherostar": 5, "needheronum": 1, @@ -117,7 +109,6 @@ "key": 9, "id": 15004, "star": 6, - "maxlevel": 60, "needhero": 0, "needherostar": 0, "needheronum": 0, @@ -130,7 +121,6 @@ "key": 10, "id": 43901, "star": 3, - "maxlevel": 30, "needhero": 43901, "needherostar": 3, "needheronum": 1, @@ -148,7 +138,6 @@ "key": 11, "id": 43901, "star": 4, - "maxlevel": 40, "needhero": 43901, "needherostar": 4, "needheronum": 1, @@ -166,7 +155,6 @@ "key": 12, "id": 43901, "star": 5, - "maxlevel": 50, "needhero": 43901, "needherostar": 5, "needheronum": 1, @@ -184,7 +172,6 @@ "key": 13, "id": 43901, "star": 6, - "maxlevel": 60, "needhero": 0, "needherostar": 0, "needheronum": 0, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index a01cc548c..29ae860f7 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -1,278 +1,282 @@ [ { - "itemid": 10001, - "name": "1阵营觉醒材料", - "usetype": 9, - "color": 2, + "id": 1, + "name": "绿色材料", + "usetype": 1, + "color": 1, + "bagtype": 1, + "index": 1, + "special_type": 0, + "effects": "", + "drop": 0, + "synthetize_num": 10, + "access": 0, + "use_skip": 0, + "upper_limit": 999, + "uselv": 10, + "isani": 0, + "star": 2, "race": 1, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" + "synthetize_hero": 0, + "img": "item1", + "ico": "item1", + "intr": "绿色材料，可以合成蓝色材料", + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ], + "boxhero": [] }, { - "itemid": 10002, - "name": "1阵营觉醒材料", - "usetype": 9, + "id": 2, + "name": "蓝色材料", + "usetype": 1, + "color": 2, + "bagtype": 2, + "index": 2, + "special_type": 0, + "effects": "", + "drop": 0, + "synthetize_num": 20, + "access": 0, + "use_skip": 0, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 3, + "race": 2, + "synthetize_hero": 0, + "img": "item2", + "ico": "item2", + "intr": "蓝色材料，可以合成紫色材料", + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 3000 + } + ], + "boxhero": [] + }, + { + "id": 3, + "name": "紫色材料", + "usetype": 1, "color": 3, + "bagtype": 3, + "index": 3, + "special_type": 0, + "effects": "", + "drop": 0, + "synthetize_num": 30, + "access": 0, + "use_skip": 0, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 4, + "race": 3, + "synthetize_hero": 0, + "img": "item3", + "ico": "item3", + "intr": "紫色材料，可以合成橙色材料", + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 4000 + } + ], + "boxhero": [] + }, + { + "id": 4, + "name": "橙色材料", + "usetype": 1, + "color": 4, + "bagtype": 3, + "index": 4, + "special_type": 0, + "effects": "", + "drop": 0, + "synthetize_num": 40, + "access": 0, + "use_skip": 0, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 5, + "race": 4, + "synthetize_hero": 0, + "img": "item4", + "ico": "item4", + "intr": "橙色材料，可以合成红色材料", + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + } + ], + "boxhero": [] + }, + { + "id": 5, + "name": "红色材料", + "usetype": 2, + "color": 5, + "bagtype": 3, + "index": 5, + "special_type": 0, + "effects": "effects1", + "drop": 0, + "synthetize_num": 0, + "access": 0, + "use_skip": 0, + "upper_limit": 1, + "uselv": 0, + "isani": 1, + "star": 6, + "race": 4, + "synthetize_hero": 0, + "img": "item5", + "ico": "item5", + "intr": "红色材料，最顶级的材料", + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], + "boxhero": [] + }, + { + "id": 6, + "name": "金币箱子", + "usetype": 4, + "color": 4, + "bagtype": 1, + "index": 6, + "special_type": 0, + "effects": "", + "drop": 0, + "synthetize_num": 0, + "access": 0, + "use_skip": 0, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 5, + "race": 0, + "synthetize_hero": 0, + "img": "item6", + "ico": "item6", + "intr": "可以在以下道具中选择任选1个", + "sale": [], + "boxhero": [] + }, + { + "id": 7, + "name": "随机金币箱子", + "usetype": 7, + "color": 4, + "bagtype": 1, + "index": 7, + "special_type": 0, + "effects": "", + "drop": 1, + "synthetize_num": 0, + "access": 0, + "use_skip": 0, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 5, + "race": 0, + "synthetize_hero": 0, + "img": "item7", + "ico": "item7", + "intr": "可以下一下道具中随机获取1个", + "sale": [], + "boxhero": [] + }, + { + "id": 8, + "name": "2小时金币", + "usetype": 5, + "color": 4, + "bagtype": 1, + "index": 8, + "special_type": 120, + "effects": "", + "drop": 0, + "synthetize_num": 0, + "access": 0, + "use_skip": 0, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 5, + "race": 0, + "synthetize_hero": 0, + "img": "item8", + "ico": "item8", + "intr": "使用后获得2小时金币收益", + "sale": [], + "boxhero": [] + }, + { + "id": 9, + "name": "1分钟就不见", + "usetype": 6, + "color": 4, + "bagtype": 1, + "index": 9, + "special_type": 1, + "effects": "", + "drop": 0, + "synthetize_num": 0, + "access": 0, + "use_skip": 0, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 5, + "race": 0, + "synthetize_hero": 0, + "img": "item9", + "ico": "item9", + "intr": "获得1分钟后该道具消失", + "sale": [], + "boxhero": [] + }, + { + "id": 10001, + "name": "绿色材料", + "usetype": 1, + "color": 1, + "bagtype": 1, + "index": 1, + "special_type": 0, + "effects": "", + "drop": 0, + "synthetize_num": 10, + "access": 0, + "use_skip": 0, + "upper_limit": 999, + "uselv": 10, + "isani": 0, + "star": 2, "race": 1, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" - }, - { - "itemid": 10003, - "name": "1阵营觉醒材料", - "usetype": 9, - "color": 4, - "race": 1, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" - }, - { - "itemid": 10011, - "name": "2阵营觉醒材料", - "usetype": 9, - "color": 2, - "race": 2, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" - }, - { - "itemid": 10012, - "name": "2阵营觉醒材料", - "usetype": 9, - "color": 3, - "race": 2, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" - }, - { - "itemid": 10013, - "name": "2阵营觉醒材料", - "usetype": 9, - "color": 4, - "race": 2, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" - }, - { - "itemid": 10021, - "name": "3阵营觉醒材料", - "usetype": 9, - "color": 2, - "race": 3, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" - }, - { - "itemid": 10022, - "name": "3阵营觉醒材料", - "usetype": 9, - "color": 3, - "race": 3, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" - }, - { - "itemid": 10023, - "name": "3阵营觉醒材料", - "usetype": 9, - "color": 4, - "race": 3, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" - }, - { - "itemid": 10031, - "name": "4阵营觉醒材料", - "usetype": 9, - "color": 2, - "race": 4, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" - }, - { - "itemid": 10032, - "name": "4阵营觉醒材料", - "usetype": 9, - "color": 3, - "race": 4, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" - }, - { - "itemid": 10033, - "name": "4阵营觉醒材料", - "usetype": 9, - "color": 4, - "race": 4, - "bagtype": false, - "index": 10001, - "texiao": "", - "dlp": 0, - "composenum": 0, - "htype": 0, - "tujing": 0, - "usetz": 0, - "maxnum": 999, - "uselv": 1, - "ismutil": 1, - "type": 0, - "img": "", - "ico": "", - "intr": "", - "sale": "" + "synthetize_hero": 0, + "img": "item1", + "ico": "item1", + "intr": "绿色材料，可以合成蓝色材料", + "sale": [], + "boxhero": [] } ] \ No newline at end of file diff --git a/bin/json/game_newhero.json b/bin/json/game_newhero.json index dc30aaaff..465b5407f 100644 --- a/bin/json/game_newhero.json +++ b/bin/json/game_newhero.json @@ -1,7 +1,10 @@ [ { "hid": 13001, - "name": "闪闪", + "name": { + "key": "hero_13001", + "text": "" + }, "star": 3, "color": 2, "race": 1, @@ -9,11 +12,17 @@ "type": 1, "prefab": "13001", "icon": 13001, - "sound": 13001, + "sound": { + "key": "13001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "herointr_13001", + "text": "" + }, "events": "hero_13001", "cite": "", "effectstay": [], @@ -22,14 +31,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 13002, - "name": "食人鱼先生", + "name": { + "key": "hero_13002", + "text": "" + }, "star": 3, "color": 2, "race": 2, @@ -37,11 +49,17 @@ "type": 1, "prefab": "13002", "icon": 13002, - "sound": 13002, + "sound": { + "key": "13002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_13002", "cite": "", "effectstay": [], @@ -50,14 +68,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 13003, - "name": "啊啊", + "name": { + "key": "hero_13003", + "text": "" + }, "star": 3, "color": 2, "race": 3, @@ -65,11 +86,17 @@ "type": 1, "prefab": "13003", "icon": 13003, - "sound": 13003, + "sound": { + "key": "13003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_13003", "cite": "", "effectstay": [], @@ -78,14 +105,17 @@ "y": -0.69, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 13004, - "name": "法夸德勋爵", + "name": { + "key": "hero_13004", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -93,11 +123,17 @@ "type": 1, "prefab": "13004", "icon": 13004, - "sound": 13004, + "sound": { + "key": "13004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_13004", "cite": "", "effectstay": [], @@ -106,14 +142,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 13005, - "name": "大大", + "name": { + "key": "hero_13005", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -121,11 +160,17 @@ "type": 1, "prefab": "13005", "icon": 13005, - "sound": 13005, + "sound": { + "key": "13005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_13005", "cite": "", "effectstay": [], @@ -134,14 +179,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 14001, - "name": "史图依克", + "name": { + "key": "hero_14001", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -149,11 +197,17 @@ "type": 1, "prefab": "14001", "icon": 14001, - "sound": 14001, + "sound": { + "key": "14001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_14001", "cite": "", "effectstay": [], @@ -162,14 +216,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 14002, - "name": "大龙", + "name": { + "key": "hero_14002", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -177,11 +234,17 @@ "type": 1, "prefab": "14002", "icon": 14002, - "sound": 14002, + "sound": { + "key": "14002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_14002", "cite": "", "effectstay": [], @@ -190,14 +253,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 14003, - "name": "亚丝翠", + "name": { + "key": "hero_14003", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -205,11 +271,17 @@ "type": 1, "prefab": "14003", "icon": 14003, - "sound": 14003, + "sound": { + "key": "14003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_14003", "cite": "", "effectstay": [], @@ -218,14 +290,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 14004, - "name": "克莱尔·努涅斯", + "name": { + "key": "hero_14004", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -233,11 +308,17 @@ "type": 1, "prefab": "14004", "icon": 14004, - "sound": 14004, + "sound": { + "key": "14004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_14004", "cite": "", "effectstay": [], @@ -246,14 +327,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 14005, - "name": "鹤大师", + "name": { + "key": "hero_14005", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -261,11 +345,17 @@ "type": 1, "prefab": "14005", "icon": 14005, - "sound": 14005, + "sound": { + "key": "14005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_14005", "cite": "", "effectstay": [], @@ -274,14 +364,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 14006, - "name": "布兰奇", + "name": { + "key": "hero_14006", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -289,11 +382,17 @@ "type": 1, "prefab": "14006", "icon": 14006, - "sound": 14006, + "sound": { + "key": "14006", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_14006", "cite": "", "effectstay": [], @@ -302,14 +401,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 14007, - "name": "格里斯特王子", + "name": { + "key": "hero_14007", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -317,11 +419,17 @@ "type": 1, "prefab": "14007", "icon": 14007, - "sound": 14007, + "sound": { + "key": "14007", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_14007", "cite": "", "effectstay": [], @@ -330,14 +438,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 15001, - "name": "吉姆·莱克", + "name": { + "key": "hero_15001", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -345,11 +456,17 @@ "type": 1, "prefab": "15001", "icon": 15001, - "sound": 15001, + "sound": { + "key": "15001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_15001", "cite": "", "effectstay": [], @@ -358,14 +475,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 15002, - "name": "船长", + "name": { + "key": "hero_15002", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -373,11 +493,17 @@ "type": 1, "prefab": "15002", "icon": 15002, - "sound": 15002, + "sound": { + "key": "15002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_15002", "cite": "", "effectstay": [], @@ -386,14 +512,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 15003, - "name": "希沙窦斯", + "name": { + "key": "hero_15003", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -401,11 +530,17 @@ "type": 1, "prefab": "15003", "icon": 15003, - "sound": 15003, + "sound": { + "key": "15003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_15003", "cite": "", "effectstay": [], @@ -414,14 +549,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 15004, - "name": "小欧", + "name": { + "key": "hero_15004", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -429,11 +567,17 @@ "type": 1, "prefab": "15004", "icon": 15004, - "sound": 15004, + "sound": { + "key": "15004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_15004", "cite": "", "effectstay": [], @@ -442,14 +586,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 15005, - "name": "亚力克斯", + "name": { + "key": "hero_15005", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -457,11 +604,17 @@ "type": 1, "prefab": "15005", "icon": 15005, - "sound": 15005, + "sound": { + "key": "15005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_15005", "cite": "", "effectstay": [], @@ -470,14 +623,17 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000 }, { "hid": 23001, - "name": "斯梅克船长", + "name": { + "key": "hero_23001", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -485,11 +641,17 @@ "type": 1, "prefab": "23001", "icon": 23001, - "sound": 23001, + "sound": { + "key": "23001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_23001", "cite": "", "effectstay": [], @@ -499,13 +661,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 23002, - "name": "警卫队长", + "name": { + "key": "hero_23002", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -513,11 +678,17 @@ "type": 1, "prefab": "23002", "icon": 23002, - "sound": 23002, + "sound": { + "key": "23002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_23002", "cite": "", "effectstay": [], @@ -527,13 +698,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 23003, - "name": "泰德·邓普顿", + "name": { + "key": "hero_23003", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -541,11 +715,17 @@ "type": 1, "prefab": "23003", "icon": 23003, - "sound": 23003, + "sound": { + "key": "23003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_23003", "cite": "", "effectstay": [], @@ -555,13 +735,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 23004, - "name": "吉姆·普雷斯科特", + "name": { + "key": "hero_23004", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -569,11 +752,17 @@ "type": 1, "prefab": "23004", "icon": 23004, - "sound": 23004, + "sound": { + "key": "23004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_23004", "cite": "", "effectstay": [], @@ -583,13 +772,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 24001, - "name": "警长", + "name": { + "key": "hero_24001", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -597,11 +789,17 @@ "type": 1, "prefab": "24001", "icon": 24001, - "sound": 24001, + "sound": { + "key": "24001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_24001", "cite": "", "effectstay": [], @@ -611,13 +809,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 24002, - "name": "牙仙", + "name": { + "key": "hero_24002", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -625,11 +826,17 @@ "type": 1, "prefab": "24002", "icon": 24002, - "sound": 24002, + "sound": { + "key": "24002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_24002", "cite": "", "effectstay": [], @@ -639,13 +846,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 24003, - "name": "睡神沙人", + "name": { + "key": "hero_24003", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -653,11 +863,17 @@ "type": 1, "prefab": "24003", "icon": 24003, - "sound": 24003, + "sound": { + "key": "24003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_24003", "cite": "", "effectstay": [], @@ -667,13 +883,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 24004, - "name": "邦尼兔", + "name": { + "key": "hero_24004", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -681,11 +900,17 @@ "type": 1, "prefab": "24004", "icon": 24004, - "sound": 24004, + "sound": { + "key": "24004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_24004", "cite": "", "effectstay": [], @@ -695,13 +920,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 24005, - "name": "金猴", + "name": { + "key": "hero_24005", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -709,11 +937,17 @@ "type": 1, "prefab": "24005", "icon": 24005, - "sound": 24005, + "sound": { + "key": "24005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_24005", "cite": "", "effectstay": [], @@ -723,13 +957,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 24006, - "name": "凯尔", + "name": { + "key": "hero_24006", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -737,11 +974,17 @@ "type": 1, "prefab": "24006", "icon": 24006, - "sound": 24006, + "sound": { + "key": "24006", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_24006", "cite": "", "effectstay": [], @@ -751,13 +994,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 24007, - "name": "小钱", + "name": { + "key": "hero_24007", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -765,11 +1011,17 @@ "type": 1, "prefab": "24007", "icon": 24007, - "sound": 24007, + "sound": { + "key": "24007", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_24007", "cite": "", "effectstay": [], @@ -779,13 +1031,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 24008, - "name": "暴芙那特", + "name": { + "key": "hero_24008", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -793,11 +1048,17 @@ "type": 1, "prefab": "24008", "icon": 24008, - "sound": 24008, + "sound": { + "key": "24008", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_24008", "cite": "", "effectstay": [], @@ -807,13 +1068,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 24009, - "name": "云朵先生", + "name": { + "key": "hero_24009", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -821,11 +1085,17 @@ "type": 1, "prefab": "24009", "icon": 24009, - "sound": 24009, + "sound": { + "key": "24009", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_24009", "cite": "", "effectstay": [], @@ -835,13 +1105,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 25001, - "name": "阿宝", + "name": { + "key": "hero_25001", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -849,11 +1122,17 @@ "type": 1, "prefab": "25001", "icon": 25001, - "sound": 25001, + "sound": { + "key": "25001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_25001", "cite": "", "effectstay": [], @@ -863,13 +1142,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 25002, - "name": "沃尔夫先生", + "name": { + "key": "hero_25002", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -877,11 +1159,17 @@ "type": 1, "prefab": "25002", "icon": 25002, - "sound": 25002, + "sound": { + "key": "25002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_25002", "cite": "", "effectstay": [], @@ -891,13 +1179,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 25003, - "name": "无牙仔", + "name": { + "key": "hero_25003", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -905,11 +1196,17 @@ "type": 1, "prefab": "25003", "icon": 25003, - "sound": 25003, + "sound": { + "key": "25003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_25003", "cite": "", "effectstay": [], @@ -919,13 +1216,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 25004, - "name": "波比", + "name": { + "key": "hero_25004", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -933,11 +1233,17 @@ "type": 1, "prefab": "25004", "icon": 25004, - "sound": 25004, + "sound": { + "key": "25004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_25004", "cite": "", "effectstay": [], @@ -947,13 +1253,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 33001, - "name": "巫嘎", + "name": { + "key": "hero_33001", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -961,11 +1270,17 @@ "type": 1, "prefab": "33001", "icon": 33001, - "sound": 33001, + "sound": { + "key": "33001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_33001", "cite": "", "effectstay": [], @@ -975,13 +1290,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 33002, - "name": "坦克", + "name": { + "key": "hero_33002", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -989,11 +1307,17 @@ "type": 1, "prefab": "33002", "icon": 33002, - "sound": 33002, + "sound": { + "key": "33002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_33002", "cite": "", "effectstay": [], @@ -1003,13 +1327,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 33003, - "name": "胡德先生", + "name": { + "key": "hero_33003", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1017,11 +1344,17 @@ "type": 1, "prefab": "33003", "icon": 33003, - "sound": 33003, + "sound": { + "key": "33003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_33003", "cite": "", "effectstay": [], @@ -1031,13 +1364,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 33004, - "name": "普鲁格兰杰", + "name": { + "key": "hero_33004", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1045,11 +1381,17 @@ "type": 1, "prefab": "33004", "icon": 33004, - "sound": 33004, + "sound": { + "key": "33004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_33004", "cite": "", "effectstay": [], @@ -1059,13 +1401,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 33005, - "name": "鼻涕粗", + "name": { + "key": "hero_33005", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1073,11 +1418,17 @@ "type": 1, "prefab": "33005", "icon": 33005, - "sound": 33005, + "sound": { + "key": "33005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_33005", "cite": "", "effectstay": [], @@ -1087,13 +1438,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 33006, - "name": "珍妮丝·邓普顿", + "name": { + "key": "hero_33006", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1101,11 +1455,17 @@ "type": 1, "prefab": "33006", "icon": 33006, - "sound": 33006, + "sound": { + "key": "33006", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_33006", "cite": "", "effectstay": [], @@ -1115,13 +1475,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 34001, - "name": "贫嘴驴", + "name": { + "key": "hero_34001", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1129,11 +1492,17 @@ "type": 1, "prefab": "34001", "icon": 34001, - "sound": 34001, + "sound": { + "key": "34001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_34001", "cite": "", "effectstay": [], @@ -1143,13 +1512,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 34002, - "name": "蒂姆·邓普顿", + "name": { + "key": "hero_34002", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1157,11 +1529,17 @@ "type": 1, "prefab": "34002", "icon": 34002, - "sound": 34002, + "sound": { + "key": "34002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_34002", "cite": "", "effectstay": [], @@ -1171,13 +1549,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 34003, - "name": "圣诞老人", + "name": { + "key": "hero_34003", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1185,11 +1566,17 @@ "type": 1, "prefab": "34003", "icon": 34003, - "sound": 34003, + "sound": { + "key": "34003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_34003", "cite": "", "effectstay": [], @@ -1199,13 +1586,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 34004, - "name": "瓜哥", + "name": { + "key": "hero_34004", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1213,11 +1603,17 @@ "type": 1, "prefab": "34004", "icon": 34004, - "sound": 34004, + "sound": { + "key": "34004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_34004", "cite": "", "effectstay": [], @@ -1227,13 +1623,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 34005, - "name": "沃尔特·史翠克勒", + "name": { + "key": "hero_34005", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1241,11 +1640,17 @@ "type": 1, "prefab": "34005", "icon": 34005, - "sound": 34005, + "sound": { + "key": "34005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_34005", "cite": "", "effectstay": [], @@ -1255,13 +1660,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 34006, - "name": "冰霜杰克", + "name": { + "key": "hero_34006", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1269,11 +1677,17 @@ "type": 1, "prefab": "34006", "icon": 34006, - "sound": 34006, + "sound": { + "key": "34006", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_34006", "cite": "", "effectstay": [], @@ -1283,13 +1697,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 34007, - "name": "菲奥娜", + "name": { + "key": "hero_34007", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1297,11 +1714,17 @@ "type": 1, "prefab": "34007", "icon": 34007, - "sound": 34007, + "sound": { + "key": "34007", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_34007", "cite": "", "effectstay": [], @@ -1311,13 +1734,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 34008, - "name": "悍夫那特", + "name": { + "key": "hero_34008", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1325,11 +1751,17 @@ "type": 1, "prefab": "34008", "icon": 34008, - "sound": 34008, + "sound": { + "key": "34008", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_34008", "cite": "", "effectstay": [], @@ -1339,13 +1771,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 35001, - "name": "师父", + "name": { + "key": "hero_35001", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -1353,11 +1788,17 @@ "type": 1, "prefab": "35001", "icon": 35001, - "sound": 35001, + "sound": { + "key": "35001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_35001", "cite": "", "effectstay": [], @@ -1367,13 +1808,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 35002, - "name": "希卡普", + "name": { + "key": "hero_35002", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -1381,11 +1825,17 @@ "type": 1, "prefab": "35002", "icon": 35002, - "sound": 35002, + "sound": { + "key": "35002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_35002", "cite": "", "effectstay": [], @@ -1395,13 +1845,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 35003, - "name": "漆黑", + "name": { + "key": "hero_35003", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -1409,11 +1862,17 @@ "type": 1, "prefab": "35003", "icon": 35003, - "sound": 35003, + "sound": { + "key": "35003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_35003", "cite": "", "effectstay": [], @@ -1423,13 +1882,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 35004, - "name": "黛安·福克斯顿", + "name": { + "key": "hero_35004", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -1437,11 +1899,17 @@ "type": 1, "prefab": "35004", "icon": 35004, - "sound": 35004, + "sound": { + "key": "35004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_35004", "cite": "", "effectstay": [], @@ -1451,13 +1919,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 35005, - "name": "幸运·普雷斯科特", + "name": { + "key": "hero_35005", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -1465,11 +1936,17 @@ "type": 1, "prefab": "35005", "icon": 35005, - "sound": 35005, + "sound": { + "key": "35005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_35005", "cite": "", "effectstay": [], @@ -1479,13 +1956,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 35006, - "name": "平先生", + "name": { + "key": "hero_35006", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -1493,11 +1973,17 @@ "type": 1, "prefab": "35006", "icon": 35006, - "sound": 35006, + "sound": { + "key": "35006", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_35006", "cite": "", "effectstay": [], @@ -1507,13 +1993,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 43001, - "name": "阿比盖尔·斯通", + "name": { + "key": "hero_43001", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1521,11 +2010,17 @@ "type": 1, "prefab": "43001", "icon": 43001, - "sound": 43001, + "sound": { + "key": "43001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_43001", "cite": "", "effectstay": [], @@ -1535,13 +2030,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 43002, - "name": "果酱教授", + "name": { + "key": "hero_43002", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1549,11 +2047,17 @@ "type": 1, "prefab": "43002", "icon": 43002, - "sound": 43002, + "sound": { + "key": "43002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_43002", "cite": "", "effectstay": [], @@ -1563,13 +2067,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 43003, - "name": "史蒂夫·帕丘克", + "name": { + "key": "hero_43003", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1577,11 +2084,17 @@ "type": 1, "prefab": "43003", "icon": 43003, - "sound": 43003, + "sound": { + "key": "43003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_43003", "cite": "", "effectstay": [], @@ -1591,13 +2104,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 43004, - "name": "姜饼人", + "name": { + "key": "hero_43004", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1605,11 +2121,17 @@ "type": 1, "prefab": "43004", "icon": 43004, - "sound": 43004, + "sound": { + "key": "43004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_43004", "cite": "", "effectstay": [], @@ -1619,13 +2141,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 43005, - "name": "瓦希尔指挥官", + "name": { + "key": "hero_43005", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1633,11 +2158,17 @@ "type": 1, "prefab": "43005", "icon": 43005, - "sound": 43005, + "sound": { + "key": "43005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_43005", "cite": "", "effectstay": [], @@ -1647,13 +2178,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 43006, - "name": "布里奇特", + "name": { + "key": "hero_43006", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1661,11 +2195,17 @@ "type": 1, "prefab": "43006", "icon": 43006, - "sound": 43006, + "sound": { + "key": "43006", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_43006", "cite": "", "effectstay": [], @@ -1675,13 +2215,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 43007, - "name": "戈伯", + "name": { + "key": "hero_43007", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1689,11 +2232,17 @@ "type": 1, "prefab": "43007", "icon": 43007, - "sound": 43007, + "sound": { + "key": "43007", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_43007", "cite": "", "effectstay": [], @@ -1703,13 +2252,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 44001, - "name": "美肚鲨", + "name": { + "key": "hero_44001", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1717,11 +2269,17 @@ "type": 1, "prefab": "44001", "icon": 44001, - "sound": 44001, + "sound": { + "key": "44001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_44001", "cite": "", "effectstay": [], @@ -1731,13 +2289,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 44002, - "name": "蛇先生", + "name": { + "key": "hero_44002", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1745,11 +2306,17 @@ "type": 1, "prefab": "44002", "icon": 44002, - "sound": 44002, + "sound": { + "key": "44002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_44002", "cite": "", "effectstay": [], @@ -1759,13 +2326,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 44003, - "name": "匹诺曹", + "name": { + "key": "hero_44003", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1773,11 +2343,17 @@ "type": 1, "prefab": "44003", "icon": 44003, - "sound": 44003, + "sound": { + "key": "44003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_44003", "cite": "", "effectstay": [], @@ -1787,13 +2363,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 44004, - "name": "艾札塔伦", + "name": { + "key": "hero_44004", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1801,11 +2380,17 @@ "type": 1, "prefab": "44004", "icon": 44004, - "sound": 44004, + "sound": { + "key": "44004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_44004", "cite": "", "effectstay": [], @@ -1815,13 +2400,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 44005, - "name": "小伊", + "name": { + "key": "hero_44005", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1829,11 +2417,17 @@ "type": 1, "prefab": "44005", "icon": 44005, - "sound": 44005, + "sound": { + "key": "44005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_44005", "cite": "", "effectstay": [], @@ -1843,13 +2437,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 44006, - "name": "悍娇虎", + "name": { + "key": "hero_44006", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -1857,11 +2454,17 @@ "type": 1, "prefab": "44006", "icon": 44006, - "sound": 44006, + "sound": { + "key": "44006", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_44006", "cite": "", "effectstay": [], @@ -1871,13 +2474,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 45001, - "name": "乌龟大师", + "name": { + "key": "hero_45001", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -1885,11 +2491,17 @@ "type": 1, "prefab": "45001", "icon": 45001, - "sound": 45001, + "sound": { + "key": "45001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_45001", "cite": "", "effectstay": [], @@ -1899,13 +2511,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 45002, - "name": "梅林", + "name": { + "key": "hero_45002", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -1913,11 +2528,17 @@ "type": 1, "prefab": "45002", "icon": 45002, - "sound": 45002, + "sound": { + "key": "45002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_45002", "cite": "", "effectstay": [], @@ -1927,13 +2548,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 45003, - "name": "盖", + "name": { + "key": "hero_45003", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -1941,11 +2565,17 @@ "type": 1, "prefab": "45003", "icon": 45003, - "sound": 45003, + "sound": { + "key": "45003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_45003", "cite": "", "effectstay": [], @@ -1955,13 +2585,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 45004, - "name": "穿靴子的猫", + "name": { + "key": "hero_45004", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -1969,11 +2602,17 @@ "type": 1, "prefab": "45004", "icon": 45004, - "sound": 45004, + "sound": { + "key": "45004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_45004", "cite": "", "effectstay": [], @@ -1983,13 +2622,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 43901, - "name": "升星精灵", + "name": { + "key": "hero_43901", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -1997,11 +2639,17 @@ "type": 2, "prefab": "43901", "icon": 43901, - "sound": 43901, + "sound": { + "key": "43901", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_43901", "cite": "", "effectstay": [], @@ -2011,13 +2659,16 @@ "z": 0 }, "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill1": 1000, + "skill2": 2000, + "skill3": 3000 }, { "hid": 42911, - "name": "初级经验精灵", + "name": { + "key": "hero_42911", + "text": "" + }, "star": 2, "color": 1, "race": 4, @@ -2025,11 +2676,17 @@ "type": 3, "prefab": "42911", "icon": 42911, - "sound": 42911, + "sound": { + "key": "42911", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_42911", "cite": "", "effectstay": [], @@ -2045,7 +2702,10 @@ }, { "hid": 43911, - "name": "中级经验精灵", + "name": { + "key": "hero_43911", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -2053,11 +2713,17 @@ "type": 3, "prefab": "43911", "icon": 43911, - "sound": 43911, + "sound": { + "key": "43911", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_43911", "cite": "", "effectstay": [], @@ -2073,7 +2739,10 @@ }, { "hid": 44911, - "name": "高级经验精灵", + "name": { + "key": "hero_44911", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -2081,11 +2750,17 @@ "type": 3, "prefab": "44911", "icon": 44911, - "sound": 44911, + "sound": { + "key": "44911", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_44911", "cite": "", "effectstay": [], @@ -2101,7 +2776,10 @@ }, { "hid": 43921, - "name": "技能精灵·稀有", + "name": { + "key": "hero_43921", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -2109,11 +2787,17 @@ "type": 4, "prefab": "43921", "icon": 43921, - "sound": 43921, + "sound": { + "key": "43921", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_43921", "cite": "", "effectstay": [], @@ -2129,7 +2813,10 @@ }, { "hid": 44921, - "name": "技能精灵·史诗", + "name": { + "key": "hero_44921", + "text": "" + }, "star": 4, "color": 3, "race": 4, @@ -2137,11 +2824,17 @@ "type": 4, "prefab": "44921", "icon": 44921, - "sound": 44921, + "sound": { + "key": "44921", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_44921", "cite": "", "effectstay": [], @@ -2157,7 +2850,10 @@ }, { "hid": 45921, - "name": "技能精灵·传说", + "name": { + "key": "hero_45921", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -2165,11 +2861,17 @@ "type": 4, "prefab": "45921", "icon": 45921, - "sound": 45921, + "sound": { + "key": "45921", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_45921", "cite": "", "effectstay": [], @@ -2185,7 +2887,10 @@ }, { "hid": 51001, - "name": "啵啵星人（新增）", + "name": { + "key": "hero_51001", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2193,11 +2898,17 @@ "type": 5, "prefab": "51001", "icon": 51001, - "sound": 51001, + "sound": { + "key": "51001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51001", "cite": "", "effectstay": [], @@ -2213,7 +2924,10 @@ }, { "hid": 51002, - "name": "埃雷特手下1号（新增）", + "name": { + "key": "hero_51002", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2221,11 +2935,17 @@ "type": 5, "prefab": "51002", "icon": 51002, - "sound": 51002, + "sound": { + "key": "51002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51002", "cite": "", "effectstay": [], @@ -2241,7 +2961,10 @@ }, { "hid": 51003, - "name": "埃雷特手下2号（新增）", + "name": { + "key": "hero_51003", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2249,11 +2972,17 @@ "type": 5, "prefab": "51003", "icon": 51003, - "sound": 51003, + "sound": { + "key": "51003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51003", "cite": "", "effectstay": [], @@ -2269,7 +2998,10 @@ }, { "hid": 51004, - "name": "豺狼小怪（新增）", + "name": { + "key": "hero_51004", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2277,11 +3009,17 @@ "type": 5, "prefab": "51004", "icon": 51004, - "sound": 51004, + "sound": { + "key": "51004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51004", "cite": "", "effectstay": [], @@ -2297,7 +3035,10 @@ }, { "hid": 51005, - "name": "犀牛守卫（新增）", + "name": { + "key": "hero_51005", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2305,11 +3046,17 @@ "type": 5, "prefab": "51005", "icon": 51005, - "sound": 51005, + "sound": { + "key": "51005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51005", "cite": "", "effectstay": [], @@ -2325,7 +3072,10 @@ }, { "hid": 51006, - "name": "香塔尔 杜布瓦队长手下1号（新增）", + "name": { + "key": "hero_51006", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2333,11 +3083,17 @@ "type": 5, "prefab": "51006", "icon": 51006, - "sound": 51006, + "sound": { + "key": "51006", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51006", "cite": "", "effectstay": [], @@ -2353,7 +3109,10 @@ }, { "hid": 51007, - "name": "香塔尔 杜布瓦队长手下2号（新增）", + "name": { + "key": "hero_51007", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2361,11 +3120,17 @@ "type": 5, "prefab": "51007", "icon": 51007, - "sound": 51007, + "sound": { + "key": "51007", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51007", "cite": "", "effectstay": [], @@ -2381,7 +3146,10 @@ }, { "hid": 51008, - "name": "香塔尔 杜布瓦队长手下3号（新增）", + "name": { + "key": "hero_51008", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2389,11 +3157,17 @@ "type": 5, "prefab": "51008", "icon": 51008, - "sound": 51008, + "sound": { + "key": "51008", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51008", "cite": "", "effectstay": [], @@ -2409,7 +3183,10 @@ }, { "hid": 51009, - "name": "香塔尔 杜布瓦队长手下4号（新增）", + "name": { + "key": "hero_51009", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2417,11 +3194,17 @@ "type": 5, "prefab": "51009", "icon": 51009, - "sound": 51009, + "sound": { + "key": "51009", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51009", "cite": "", "effectstay": [], @@ -2437,7 +3220,10 @@ }, { "hid": 51010, - "name": "警卫1号（新增）", + "name": { + "key": "hero_51010", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2445,11 +3231,17 @@ "type": 5, "prefab": "51010", "icon": 51010, - "sound": 51010, + "sound": { + "key": "51010", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51010", "cite": "", "effectstay": [], @@ -2465,7 +3257,10 @@ }, { "hid": 51011, - "name": "警卫2号（新增）", + "name": { + "key": "hero_51011", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2473,11 +3268,17 @@ "type": 5, "prefab": "51011", "icon": 51011, - "sound": 51011, + "sound": { + "key": "51011", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51011", "cite": "", "effectstay": [], @@ -2493,7 +3294,10 @@ }, { "hid": 51012, - "name": "小猴子（新增）", + "name": { + "key": "hero_51012", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2501,11 +3305,17 @@ "type": 5, "prefab": "51012", "icon": 51012, - "sound": 51012, + "sound": { + "key": "51012", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51012", "cite": "", "effectstay": [], @@ -2521,7 +3331,10 @@ }, { "hid": 51013, - "name": "巨怪啰啰（新增）", + "name": { + "key": "hero_51013", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2529,11 +3342,17 @@ "type": 5, "prefab": "51013", "icon": 51013, - "sound": 51013, + "sound": { + "key": "51013", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51013", "cite": "", "effectstay": [], @@ -2549,7 +3368,10 @@ }, { "hid": 51014, - "name": "博啃族宫廷守卫（新增）", + "name": { + "key": "hero_51014", + "text": "" + }, "star": 1, "color": 0, "race": 4, @@ -2557,11 +3379,17 @@ "type": 5, "prefab": "51014", "icon": 51014, - "sound": 51014, + "sound": { + "key": "51014", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_51014", "cite": "", "effectstay": [], @@ -2577,7 +3405,10 @@ }, { "hid": 53001, - "name": "埃雷特（新增）", + "name": { + "key": "hero_53001", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -2585,11 +3416,17 @@ "type": 5, "prefab": "53001", "icon": 53001, - "sound": 53001, + "sound": { + "key": "53001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_53001", "cite": "", "effectstay": [], @@ -2605,7 +3442,10 @@ }, { "hid": 53002, - "name": "豺狼头领（新增）", + "name": { + "key": "hero_53002", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -2613,11 +3453,17 @@ "type": 5, "prefab": "53002", "icon": 53002, - "sound": 53002, + "sound": { + "key": "53002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_53002", "cite": "", "effectstay": [], @@ -2633,7 +3479,10 @@ }, { "hid": 53003, - "name": "豪猪大师（翡翠僵尸）（新增）", + "name": { + "key": "hero_53003", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -2641,11 +3490,17 @@ "type": 5, "prefab": "53003", "icon": 53003, - "sound": 53003, + "sound": { + "key": "53003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_53003", "cite": "", "effectstay": [], @@ -2661,7 +3516,10 @@ }, { "hid": 53004, - "name": "双獾大师（翡翠僵尸）（新增）", + "name": { + "key": "hero_53004", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -2669,11 +3527,17 @@ "type": 5, "prefab": "53004", "icon": 53004, - "sound": 53004, + "sound": { + "key": "53004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_53004", "cite": "", "effectstay": [], @@ -2689,7 +3553,10 @@ }, { "hid": 53005, - "name": "小猴子首领（新增）", + "name": { + "key": "hero_53005", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -2697,11 +3564,17 @@ "type": 5, "prefab": "53005", "icon": 53005, - "sound": 53005, + "sound": { + "key": "53005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_53005", "cite": "", "effectstay": [], @@ -2717,7 +3590,10 @@ }, { "hid": 53006, - "name": "巨怪首领（新增）", + "name": { + "key": "hero_53006", + "text": "" + }, "star": 3, "color": 2, "race": 4, @@ -2725,11 +3601,17 @@ "type": 5, "prefab": "53006", "icon": 53006, - "sound": 53006, + "sound": { + "key": "53006", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_53006", "cite": "", "effectstay": [], @@ -2745,7 +3627,10 @@ }, { "hid": 55001, - "name": "香塔尔 杜布瓦队长", + "name": { + "key": "hero_55001", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -2753,11 +3638,17 @@ "type": 5, "prefab": "55001", "icon": 55001, - "sound": 55001, + "sound": { + "key": "55001", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_55001", "cite": "", "effectstay": [], @@ -2773,7 +3664,10 @@ }, { "hid": 55002, - "name": "亨得利克斯（新增）", + "name": { + "key": "hero_55002", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -2781,11 +3675,17 @@ "type": 5, "prefab": "55002", "icon": 55002, - "sound": 55002, + "sound": { + "key": "55002", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_55002", "cite": "", "effectstay": [], @@ -2801,7 +3701,10 @@ }, { "hid": 55003, - "name": "巨型猩猩怪兽（新增）", + "name": { + "key": "hero_55003", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -2809,11 +3712,17 @@ "type": 5, "prefab": "55003", "icon": 55003, - "sound": 55003, + "sound": { + "key": "55003", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_55003", "cite": "", "effectstay": [], @@ -2829,7 +3738,10 @@ }, { "hid": 55004, - "name": "白龙王", + "name": { + "key": "hero_55004", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -2837,11 +3749,17 @@ "type": 5, "prefab": "55004", "icon": 55004, - "sound": 55004, + "sound": { + "key": "55004", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_55004", "cite": "", "effectstay": [], @@ -2857,7 +3775,10 @@ }, { "hid": 55005, - "name": "大厨（新增）", + "name": { + "key": "hero_55005", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -2865,11 +3786,17 @@ "type": 5, "prefab": "55005", "icon": 55005, - "sound": 55005, + "sound": { + "key": "55005", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_55005", "cite": "", "effectstay": [], @@ -2885,7 +3812,10 @@ }, { "hid": 55006, - "name": "德雷格（新增）", + "name": { + "key": "hero_55006", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -2893,11 +3823,17 @@ "type": 5, "prefab": "55006", "icon": 55006, - "sound": 55006, + "sound": { + "key": "55006", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_55006", "cite": "", "effectstay": [], @@ -2913,7 +3849,10 @@ }, { "hid": 55007, - "name": "莫甘娜巨怪", + "name": { + "key": "hero_55007", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -2921,11 +3860,17 @@ "type": 5, "prefab": "55007", "icon": 55007, - "sound": 55007, + "sound": { + "key": "55007", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_55007", "cite": "", "effectstay": [], @@ -2941,7 +3886,10 @@ }, { "hid": 55008, - "name": "莫甘娜二阶", + "name": { + "key": "hero_55008", + "text": "" + }, "star": 5, "color": 4, "race": 4, @@ -2949,11 +3897,17 @@ "type": 5, "prefab": "55008", "icon": 55008, - "sound": 55008, + "sound": { + "key": "55008", + "text": "" + }, "tujing": [ 1 ], - "intr": "", + "intr": { + "key": "", + "text": "" + }, "events": "hero_55008", "cite": "", "effectstay": [], diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 71e4f1b87..a9628498f 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -13,10 +13,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -33,10 +39,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,ProSou2=0,Pro2=Total_Def,ProPar2=1200", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -55,10 +67,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -77,10 +95,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -97,10 +121,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -119,10 +149,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -141,10 +177,16 @@ "FollowSK": [ 200017102 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -164,10 +206,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=50", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -184,9 +232,12 @@ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=400", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290019001, @@ -199,12 +250,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001002,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=0,BufParNum1=1,BufVal1=400", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002001,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=0,BufParNum1=1,BufVal1=400", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290020001, @@ -217,12 +271,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=600", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001002,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=600", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290021001, @@ -235,12 +292,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001004,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=0,BufParNum1=1,BufVal1=600", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002002,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=0,BufParNum1=1,BufVal1=600", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290022001, @@ -253,12 +313,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001005,Round=2,Type=ProBuff,BufPro1=Buff_Per_Agi,BufQuaType1=1,BufParNum1=1,BufVal1=300", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,Type=ProBuff,BufPro1=Buff_Per_Agi,BufQuaType1=1,BufParNum1=1,BufVal1=300", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290023001, @@ -271,12 +334,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001006,Round=2,Type=ProBuff,BufPro1=BBuff_Per_Agi,BufQuaType1=0,BufParNum1=1,BufVal1=300", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002003,Round=2,Type=ProBuff,BufPro1=BBuff_Per_Agi,BufQuaType1=0,BufParNum1=1,BufVal1=300", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290024001, @@ -289,12 +355,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001007,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=1,BufParNum1=1,BufVal1=300", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001004,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=1,BufParNum1=1,BufVal1=300", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290025001, @@ -307,12 +376,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001008,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=0,BufParNum1=1,BufVal1=300", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002004,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=0,BufParNum1=1,BufVal1=300", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290026001, @@ -325,12 +397,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001009,Round=2,Type=ProBuff,BufPro1=SufferDam,BufQuaType1=1,BufParNum1=1,BufVal1=25", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002005,Round=2,Type=ProBuff,BufPro1=SufferDam,BufQuaType1=1,BufParNum1=1,BufVal1=25", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290027001, @@ -343,12 +418,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001010,Round=2,Type=ProBuff,BufPro1=MissPr,BufQuaType1=1,BufParNum1=1,BufVal1=50", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002006,Round=2,Type=ProBuff,BufPro1=MissPr,BufQuaType1=1,BufParNum1=1,BufVal1=50", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290028001, @@ -361,12 +439,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=10,Id=390001011,Round=-1,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=50,BufPro2=SufferDam,BufQuaType2=0,BufParNum2=10,BufVal2=30", + "Argu": "DoVal=1,Pr=1000,NumVal=10,Id=390001006,Round=-1,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=50,BufPro2=SufferDam,BufQuaType2=0,BufParNum2=10,BufVal2=30", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290029001, @@ -379,12 +460,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001012,Round=2,Type=ProBuff,BufPro1=Add_SufCri,BufQuaType1=1,BufParNum1=1,BufVal1=300", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001005,Round=2,Type=ProBuff,BufPro1=Add_SufCri,BufQuaType1=1,BufParNum1=1,BufVal1=300", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290030001, @@ -397,12 +481,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002001,Round=2,Type=TagBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004001,Round=2,Type=TagBuff", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290031001, @@ -415,12 +502,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002002,Round=2,Type=TagBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004002,Round=2,Type=TagBuff", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290032001, @@ -433,12 +523,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002003,Round=2,Type=TagBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390006001,Round=2,Type=TagBuff", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290033001, @@ -451,12 +544,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002004,Round=2,Type=TagBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=2,Type=TagBuff", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290034001, @@ -469,12 +565,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002005,Round=2,Type=TagBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490001001,Round=2,Type=CallSkillPas,PasPr=1000,PasReVal=1", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290035001, @@ -487,12 +586,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002006,Round=2,Type=TagBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390003001,Round=2,Type=TagBuff", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290036001, @@ -505,12 +607,15 @@ ], "EmitPR": 1000, "Type": "AddBuff", - "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002007,Round=2,Type=TagBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004003,Round=2,Type=TagBuff", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290037001, @@ -526,10 +631,16 @@ "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -546,10 +657,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Def,ProPar1=500", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -568,10 +685,16 @@ "FollowSK": [ 290038002 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -588,10 +711,16 @@ "Argu": "DoVal=1,Pr=500,ActionType=0,BuffType=1,RelyType1=1,ID1=201,ActionVal=1", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -608,10 +737,16 @@ "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Def,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -628,10 +763,16 @@ "Argu": "DoVal=1,Pr=500,Cri=0,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=80,ProSouLim=0,ProLim=Total_Atk,ProParLim=500,AddDmgSk=290039002", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ - "112" + "114", + "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -648,10 +789,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,CriType1=1,CriVal1=300", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -668,10 +815,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,TempPro=CauseDam,TempCriTyp=1,TempCriVal=300", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -688,10 +841,16 @@ "Argu": "DoVal=3,Pr=1000,Cri=1,ProSou1=0,Pro1=Total_Def,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -708,10 +867,16 @@ "Argu": "DoVal=1,Pr=1000,Par=300", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ - "102" + "103", + "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "401" ] }, { @@ -728,10 +893,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Def,ProPar1=800,TempProTarget=0,TempPro=IgnoreDefPer,TempProType=1,TempProVal=1000,TempDetTarget=0,TempDetType=2,TempDetID=201,TempDetTpyeVal=1,TempDetQuaType=0,TempDetVal=200", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -748,10 +919,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,DetTarget1=0,DetType1=0,DetID1=Total_Agi,DetTpyeVal1=10,DetQuaType1=1,DetVal1=10", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -768,10 +945,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,DetTarget1=0,DetType1=2,DetID1=201,DetTpyeVal1=10,DetQuaType1=1,DetVal1=100", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -790,10 +973,16 @@ "FollowSK": [ 290046002 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -810,10 +999,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,TempProTarget=0,TempPro=CauseDam,TempFrontSkId=290046001,TempFrontType=3,TempFrontID=201,TempFrontTpyeVal=1,TempFrontQuaType=1,TempFrontVal=30", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -830,10 +1025,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -850,10 +1051,16 @@ "Argu": "DoVal=1,Pr=1000,DmgSourceType=0,DmgPar=400", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -870,10 +1077,15 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ - "102" + "103" + ], + "RelyTags": [], + "NoRelyTags": [ + "401" ] }, { @@ -890,10 +1102,15 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=200", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ - "102" + "103" + ], + "RelyTags": [], + "NoRelyTags": [ + "401" ] }, { @@ -910,9 +1127,12 @@ "Argu": "DoVal=1,Pr=1000,Pro1=ActValue,QuaType1=1,Val1=300", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290051001, @@ -928,9 +1148,12 @@ "Argu": "DoVal=1,Pr=1000,Pro1=ActValue,QuaType1=0,Val1=300", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290052001, @@ -946,9 +1169,12 @@ "Argu": "DoVal=1,Pr=1000,RobTarget=0,Pro=ActValue,Num=300", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290053001, @@ -964,9 +1190,16 @@ "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=202,BuffType2=0,RelyType2=0,ID2=390001004,ActionVal1=-1", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [ + "105" + ], + "RelyTags": [], + "NoRelyTags": [ + "403" + ] }, { "Id": 290054001, @@ -982,9 +1215,16 @@ "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=201,ActionVal=-1", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [ + "104" + ], + "RelyTags": [], + "NoRelyTags": [ + "303" + ] }, { "Id": 290055001, @@ -1000,9 +1240,16 @@ "Argu": "DoVal=1,Pr=1000,ActionType=1,BuffType1=1,RelyType1=1,ID1=201,ActionVal=-1,Tag=0", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [ + "106" + ], + "RelyTags": [], + "NoRelyTags": [ + "306" + ] }, { "Id": 290056001, @@ -1018,9 +1265,16 @@ "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=202,ActionVal=-1,Tag=1", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [ + "107" + ], + "RelyTags": [], + "NoRelyTags": [ + "307" + ] }, { "Id": 290057001, @@ -1036,9 +1290,12 @@ "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=201,QuaType=1,Val=1", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290058001, @@ -1054,9 +1311,12 @@ "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=202,QuaType=1,Val=1", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290059001, @@ -1072,9 +1332,12 @@ "Argu": "DoVal=1,Pr=1000,Val1=2,Type1=0,Par1=1,Val2=3,Type2=0,Par2=1,Val3=4,Type3=0,Par3=1", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290060001, @@ -1090,9 +1353,12 @@ "Argu": "DoVal=1,Pr=1000,Val1=2,Type1=1,Par1=1,Val2=3,Type2=1,Par2=1,Val3=4,Type3=1,Par3=1", "AddEffect": true, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290061001, @@ -1108,10 +1374,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -1128,9 +1400,12 @@ "Argu": "DoVal=1,Pr=1000,Val=1", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290062001, @@ -1146,9 +1421,12 @@ "Argu": "DoVal=1,Pr=1000", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290062002, @@ -1164,10 +1442,15 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=500", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ - "102" + "103" + ], + "RelyTags": [], + "NoRelyTags": [ + "401" ] }, { @@ -1186,10 +1469,16 @@ "FollowSK": [ 290063002 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -1206,9 +1495,12 @@ "Argu": "DoVal=1,Pr=500", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290064001, @@ -1224,10 +1516,16 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "Tags": [ + "102", "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" ] }, { @@ -1246,9 +1544,12 @@ "FollowSK": [ 290064002 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290065001, @@ -1264,9 +1565,12 @@ "Argu": "DoVal=1,Pr=500,Val=1,Id1=290065001,Id2=290065002,Id3=290065003", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290065002, @@ -1282,9 +1586,12 @@ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=400", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290065003, @@ -1300,9 +1607,12 @@ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001007,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=1,BufParNum1=1,BufVal1=300", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290065004, @@ -1318,9 +1628,12 @@ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=600", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] }, { "Id": 290066001, @@ -1336,11 +1649,19 @@ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", "AddEffect": false, "FollowSK": [ - 290066002 + 190066002 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [ + "102", + "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" + ] }, { "Id": 290066002, @@ -1351,11 +1672,1775 @@ "Order": [], "EmitPR": 500, "Type": "Dmg", - "Argu": "DoVal=1,Pr=1000,Id=290066001,ProSou1=0,Pro1=Total_Def,ProPar1=500", + "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Def,ProPar1=500", "AddEffect": false, "FollowSK": [], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, - "Tags": [] + "Tags": [ + "102", + "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" + ] + }, + { + "Id": 290067001, + "Desc": "被动1 每回合行动前对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490067001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290067002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [ + "102", + "101" + ], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290067002, + "Desc": "被动1 触发调用子技能，对敌方全体造成80%攻击力伤害", + "From": 2, + "Limit": 5, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "Dmg", + "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [ + "301" + ] + }, + { + "Id": 290068001, + "Desc": "回合行动前对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490068001,Round=1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [ + "102", + "101" + ], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290068002, + "Desc": "被动1 触发调用子技能，对敌方全体造成80%攻击力伤害", + "From": 2, + "Limit": 5, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "Dmg", + "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [ + "301" + ] + }, + { + "Id": 290069001, + "Desc": "每次攻击前对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490069001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290070001, + "Desc": "每次受到攻击前对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490070001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290071001, + "Desc": "暴击时回复自身5%最大生命值血量", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490071001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290071002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290071002, + "Desc": "回复自身5%最大生命值血量", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 0, + "Type": "Tre", + "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=50", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [ + "401" + ] + }, + { + "Id": 290072001, + "Desc": "被暴击时回复自身5%最大生命值血量", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490072001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290071002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290073001, + "Desc": "受到致死伤害后免除死亡，每场战斗最多1次", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102107,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasReVal=1,PasId1=200102112,PasId2=200102113", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290074001, + "Desc": "击破护盾时，对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490074001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290075001, + "Desc": "护盾被击破时，对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490075001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290076001, + "Desc": "攻击时，对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490076001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290077001, + "Desc": "受到攻击时，对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490077001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290078001, + "Desc": "击杀敌人后，对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490078001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290079001, + "Desc": "死亡后，立即复活", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490079001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290079002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290079002, + "Desc": "复活", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "Reborn", + "Argu": "DoVal=1,Pr=1000", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [ + "605" + ] + }, + { + "Id": 290080001, + "Desc": "复活后，对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490080001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290081001, + "Desc": "BUFF结束，对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490081001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290082001, + "Desc": "回合结束后，对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490082001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290083001, + "Desc": "行动结束前，对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490083001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290084001, + "Desc": "行动结束后，对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490084001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290068002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290085001, + "Desc": "增加敌方全体所有技能CD1回合", + "From": 2, + "Limit": 5, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "SkillCD", + "Argu": "DoVal=1,Pr=1000,Val1=2,infType1=1,Par1=1,Val1=3,infType1=1,Par1=1", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290086001, + "Desc": "减少己方全体所有技能CD1回合", + "From": 1, + "Limit": 5, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "SkillCD", + "Argu": "DoVal=1,Pr=1000,Val1=2,infType1=0,Par1=1,Val1=3,infType1=0,Par1=1", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200012101, + "Desc": "加主被动1 每回合结束后，调用子技能的触发类效果 调用引雷123", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400012101,Round=-1,Type=CallSkillPas,PasPr=1000,PasRouCD=4,PasCallType=1,PasId1=200012103,PasId2=200012104,PasId3=200012105", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200012102, + "Desc": "加主被动2 自身的任意主动技能命中敌人触发暴击时调用子技能", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400012102,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=1,PasId1=2000121009", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200012103, + "Desc": "被动1 引雷1 在自身新回合开始时，调用子技能的触发类效果", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400012103,Round=1,Type=CallSkillPas,PasPr=1000,PasCallType=1,PasId1=2000121006", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200012104, + "Desc": "被动1 引雷2 但出于不可行动状态时，调用子技能的触发类效果", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400012104,Round=1,Type=CallSkillPas,PasPr=1000,PasCallType=1,PasId1=2000121007", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200012105, + "Desc": "被动1 引雷3 【引雷】期间自身每次受到攻击时，调用子技能的触发类效果", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400012105,Round=1,Type=CallSkillPas,PasPr=1000,PasCallType=1,PasId1=2000121008", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200012106, + "Desc": "引雷1触发 调用子技能对敌方全体造成防御力110%的伤害。", + "From": 2, + "Limit": 5, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "Dmg", + "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Def,ProPar1=1100", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [ + "102", + "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" + ] + }, + { + "Id": 200012107, + "Desc": "引雷2触发 调用子技能但出于不可行动状态时解除【引雷】状态", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "BuffAction", + "Argu": "DoVal=3,Pr=1000,ActionType=2,BuffType1=1,RelyType1=1,ID1=1001", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200012108, + "Desc": "引雷3触发 调用子技能获得1层【雷之庇佑】", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001008,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=200", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 20001219, + "Desc": "主被动2触发 调用的子技能降低此技能1回合冷却", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "SkillCD", + "Argu": "DoVal=1,Pr=1000,Val1=3,infType1=0,Par1=1", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200022101, + "Desc": "加被动1 无法受到任何控制效果，", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390003003,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200022102, + "Desc": "加被动2 每回合行动前为己方全体清除任意一个非无法行动状态的减益状态并回复其5%最大生命值", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400022102,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200022104,PasId2=200022105", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200022103, + "Desc": "加被动3 且在任意队友获得减益状态时，自身获得20%行动值提升，每回合仅触发1次。", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400022103,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200022105", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200022104, + "Desc": "被动2 触发调用子技能1，己方全体清除任意一个非无法行动状态", + "From": 1, + "Limit": 5, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "BuffAction", + "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=202,BuffType2=1,RelyType2=0,ID2=604,ActionVal=1", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200022105, + "Desc": "被动2 触发调用子技能2，并回复其5%最大生命值", + "From": 1, + "Limit": 5, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "Tre", + "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=50", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200022106, + "Desc": "被动3 触发调用子技能，自身获得20%行动值提升，每回合仅触发1次", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "Pro", + "Argu": "DoVal=1,Pr=1000,Pro1=ActValue,QuaType1=1,Val1=200", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [ + "308" + ] + }, + { + "Id": 200092101, + "Desc": "被动1 自身攻击不会失手", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005003,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200092102, + "Desc": "被动2 当敌方单位使其友方减益状态提前结束时，令该单位失去30%当前生命值，同时失去全部增益状态并获得1回合【石化】效果。", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400092102,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasTarget=3,PasId1=200092103,PasId2=200092104,PasId3=200092105", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200092103, + "Desc": "被动2 触发调用子技能1，令该单位失去30%当前生命值", + "From": 0, + "Limit": 0, + "Where": [], + "Order": [], + "EmitPR": 1000, + "Type": "NowHpDmg", + "Argu": "DoVal=1,Pr=1000,Val=300", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [ + "301" + ] + }, + { + "Id": 200092104, + "Desc": "被动2 触发调用子技能2，同时失去全部增益状态", + "From": 0, + "Limit": 0, + "Where": [], + "Order": [], + "EmitPR": 1000, + "Type": "BuffAction", + "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=201", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [ + "303" + ] + }, + { + "Id": 200092105, + "Desc": "被动2 触发调用子技能3，获得1回合【石化】效果。", + "From": 0, + "Limit": 0, + "Where": [], + "Order": [], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004004,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102101, + "Desc": "被动1 无法获得任意增益状态，", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390006001,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102102, + "Desc": "被动2 无法获得任意减益状态，", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102103, + "Desc": "被动3 受到的所有伤害降低10%", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300102103,Round=-1,Type=ProBuff,BufPro1=SufferDam,BufQuaType1=0,BufParNum1=1,BufVal1=100", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102104, + "Desc": "被动4 每次被施加增益状态时，自身获得1层【叹息之力】", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102104,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200102109", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102105, + "Desc": "被动5 每次被施加减益状态时，自身获得1层【叹息之力】", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102105,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200102109", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102106, + "Desc": "被动6 每有1个队友死亡时，自身获得10层【叹息之力】", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=10,Id=400102106,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200102110", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102107, + "Desc": "被动7 每次战斗中首次受到致命伤害时，免除本次死亡", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102107,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasReVal=1,PasId1=200102112,PasId2=200102113", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102108, + "Desc": "被动8 每次战斗中首次受到致命伤害时，根据当前【叹息之力】层数回复自身生命值状态，每层回复自身1%最大生命值状态。", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102108,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200102111", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102109, + "Desc": "被动4,5 触发调用子技能，自身获得1层【叹息之力】", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001006,Round=-1", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102110, + "Desc": "被动6 触发调用子技能，自身获得10层【叹息之力】", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=10,Id=390001006,Round=-1", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102111, + "Desc": "被动8 触发调用子技能，根据当前【叹息之力】层数回复自身生命值状态，每层回复自身1%最大生命值状态。", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "Tre", + "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=NowTotal_Hp,ProPar1=0,DetTarget1=0,DetType1=1,DetID1=390001006,DetTpyeVal1=1,DetQuaType1=1,DetVal1=10", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [ + "103" + ], + "RelyTags": [], + "NoRelyTags": [ + "401" + ] + }, + { + "Id": 200102112, + "Desc": "免除死亡", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390003004,Round=1,Type=TagBuff,BufDoVal=1,BufPr=1000", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102113, + "Desc": "敌方行动结束前，移除免除死亡", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102113,Round=1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200102114", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200102114, + "Desc": "移除免除死亡", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "BuffAction", + "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=501", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200162101, + "Desc": "被动1 对己方任意目标造成治疗效果时会同时为其净化2个减益效果，若目标没有减益效果，则额外为其施加1回合【免疫】效果。", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400162101,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200162103,PasId2=200162104", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [ + "301" + ] + }, + { + "Id": 200162102, + "Desc": "被动2 对己方任意目标造成治疗效果时同时自身治疗量溢出的120%将转变为【护盾】效果，持续2回合。", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400162102,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200162105", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200162103, + "Desc": "被动1 触发调用子技能1，若目标有减益效果，净化2个减益效果", + "From": 0, + "Limit": 0, + "Where": [ + "Type=BuffRely,RelyType=1,Key=1,Op=0,Val=1" + ], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "BuffAction", + "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=202,ActionVal=2", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200162104, + "Desc": "被动1 触发调用子技能2，若目标没有减益效果，施加1回合【免疫】效果。", + "From": 0, + "Limit": 0, + "Where": [ + "Type=BuffRely,RelyType=1,Key=1,Op=3,Val=0" + ], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490001001,Round=1,Type=CallSkillPas,PasPr=1000,PasReVal=1", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200162105, + "Desc": "被动2 触发调用子技能1，自身治疗量溢出的120%将转变为【护盾】效果，持续2回合。", + "From": 0, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300162105,Round=2,Type=CallShieldBuff,BufDoVal=1,BufPr=1000,BufShieldSourceType=2,BufShieldPar=1200", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200191101, + "Desc": "对敌方单体造成攻击力130%的伤害", + "From": 4, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "Dmg", + "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=1300", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200191102, + "Desc": "，并附加1层【猫猫威慑】状态。", + "From": 4, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004008,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200191103, + "Desc": "给自己加检测敌方死亡的被动", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400191102,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200191104", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200191104, + "Desc": "敌方死亡 触发调用子技能，携带者阵亡时清除此状态，并对携带者一方全体造成崔佛（释放者）攻击力40%的效果附加伤害，每层使伤害系数提升40%，最多可叠加5层。", + "From": 2, + "Limit": 5, + "Where": [ + "Type=BuffRely,RelyType=0,Key=390004008,Op=4,Val=1" + ], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "Dmg", + "Argu": "DoVal=1,Pr=1000,DetTarget1=1,DetType1=1,DetID1=390004008,DetTpyeVal1=1,DetQuaType1=1,DetVal1=400", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192101, + "Desc": "被动1 每次攻击后，没有Buff5，且标的生命值比例高于50%，则给自己添加行动结束前触发的被动6。每回合仅触发1次 （同时修改被动2回合CD）", + "From": 3, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192101,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200192106,PasId2=200192107", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192102, + "Desc": "被动2 每次攻击后，没有Buff5，且目标的生命值比例小于等于50%，自身获得1层【猫猫推理】。每回合仅触发1次（同时修改被动1回合CD）", + "From": 3, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192102,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200191108,PasId2=200192109", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192103, + "Desc": "被动3 每次攻击后，若有Buff5，则给自己添加行动结束前触发的被动6，并修改被动1,2的回合CD", + "From": 3, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192103,Round=1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasReVal=-1,PasId1=200192106,PasId2=200192107,PasId3=200192109", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192104, + "Desc": "被动4 检测猫猫推理层数，达到2层立即重置全部技能的冷却时间，并且给自身加下一回合必定对目标进行重复攻击的标记Buff5，之后清除猫猫推理", + "From": 3, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192104,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=200192111,PasId2=200192112,PasId3=200192113,PasId4=200192115", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192106, + "Desc": "被动6 被动1，3 触发调用子技能1，给自己加行动结束前触发的被动6", + "From": 3, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192105,Round=1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasReVal=-1,PasId1=200192113", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192107, + "Desc": "被动1,3 触发调用子技能2，修改被动2回合CD", + "From": 3, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "BuffCD", + "Argu": "DoVal=1,Pr=1000,ActionType=,BuffType1=0,RelyType1=1,ID1=400192102,QuaType=1,Val=1", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192108, + "Desc": "被动2,3 触发调用子技能1，自身获得1层【猫猫推理】。每回合仅触发1次", + "From": 3, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddBuff", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300192114,Round=-1,Type=ProBuff,BufPro1=SufferDam,BufQuaType1=0,BufParNum1=1,BufVal1=150", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192109, + "Desc": "被动2 触发调用子技能2，修改被动1回合CD", + "From": 3, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "BuffCD", + "Argu": "DoVal=1,Pr=1000,ActionType=,BuffType1=0,RelyType1=1,ID1=400192101,QuaType=1,Val=1", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192111, + "Desc": "被动4 触发调用子技能1，重置自身全部技能冷却时间。", + "From": 3, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "SkillCD", + "Argu": "DoVal=1,Pr=1000,Val1=3,infType1=0,Par1=10000", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192112, + "Desc": "被动4 触发调用子技能2，给自己加下次攻击必定重复攻击的Buff5", + "From": 3, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192112,Round=1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasReVal=-1", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192113, + "Desc": "被动6 触发调用子技能，对该目标重复释放一次本次攻击所用技能", + "From": 0, + "Limit": 0, + "Where": [], + "Order": [], + "EmitPR": 1000, + "Type": "Again", + "Argu": "DoVal=1,Pr=1000", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200192115, + "Desc": "被动4 触发调用子技能3，移除猫猫推理", + "From": 0, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "BuffAction", + "Argu": "DoVal=3,Pr=1000,ActionType=0,BuffType1=0,RelyType1=1,ID1=300192114", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200622101, + "Desc": "被动1 当队友向敌方任意1个目标发起攻击时，给自己加被动2", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400622101,Round=-1,Type=CallSkillPas", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200622102, + "Desc": "被动2 友军行动结束前触发，跟随队友对目标造成攻击力40%的伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400622102,Round=1,Type=DmgParPas,PasPr=1000,PasCallType=0,PasTarget=1,PasReVal=-1,PasDmgPar=400,PasId1=200626101", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 200626101, + "Desc": "被动1 触发调用子技能，对目标造成攻击力40%的伤害", + "From": 0, + "Limit": 0, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "Dmg", + "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=400", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [ + "102", + "101" + ], + "RelyTags": [], + "NoRelyTags": [ + "301" + ] } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 76c6852b5..83b678992 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -1,9 +1,9 @@ [ { "Id": 190011000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "对敌方1个目标造成攻击力80%", "MaxLV": 6, "CD": [ 4, @@ -45,13 +45,20 @@ 290011101 ] } + ], + "Desc": [ + "对敌方1个目标造成攻击力80%", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190012000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "对敌方全体造成攻击力80%以及防御力120%的伤害", "MaxLV": 6, "CD": [ 4, @@ -93,13 +100,20 @@ 290012101 ] } + ], + "Desc": [ + "对敌方全体造成攻击力80%以及防御力120%的伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190013000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "对敌方全体攻击小于自身的目标造成攻击力80%的伤害", "MaxLV": 6, "CD": [ 4, @@ -141,13 +155,20 @@ 290013101 ] } + ], + "Desc": [ + "对敌方全体攻击小于自身的目标造成攻击力80%的伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190014000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "随机对敌方3个目标造成80%攻击力伤害，优先选择防御力小于自身的目标", "MaxLV": 6, "CD": [ 4, @@ -189,13 +210,20 @@ 290014101 ] } + ], + "Desc": [ + "随机对敌方3个目标造成80%攻击力伤害，优先选择防御力小于自身的目标", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190015000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "随机对敌方防御最低的3个目标造成80%攻击力伤害", "MaxLV": 6, "CD": [ 4, @@ -237,13 +265,20 @@ 290015101 ] } + ], + "Desc": [ + "随机对敌方防御最低的3个目标造成80%攻击力伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190016000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "对敌方全体防御力小于100的敌方造成80%攻击力伤害", "MaxLV": 6, "CD": [ 4, @@ -285,13 +320,20 @@ 290016101 ] } + ], + "Desc": [ + "对敌方全体防御力小于100的敌方造成80%攻击力伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190017000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "对敌方全体的敌方造成攻击力110%伤害，若自身攻击力大于100，则额外对全体敌方攻击力小于自身的目标造成攻击力50%伤害", "MaxLV": 6, "CD": [ 4, @@ -333,13 +375,20 @@ 290017101 ] } + ], + "Desc": [ + "对敌方全体的敌方造成攻击力110%伤害，若自身攻击力大于100，则额外对全体敌方攻击力小于自身的目标造成攻击力50%伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190018000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "己方全体附加攻击提升，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -381,13 +430,20 @@ 290018001 ] } + ], + "Desc": [ + "己方全体附加攻击提升，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190019000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "敌方单体附加攻击下降，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -429,13 +485,20 @@ 290019001 ] } + ], + "Desc": [ + "敌方单体附加攻击下降，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190020000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "己方全体附加防御提升，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -477,13 +540,20 @@ 290020001 ] } + ], + "Desc": [ + "己方全体附加防御提升，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190021000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "敌方单体附加防御下降，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -525,13 +595,20 @@ 290021001 ] } + ], + "Desc": [ + "敌方单体附加防御下降，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190022000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "己方全体附加速度提升，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -573,13 +650,20 @@ 290022001 ] } + ], + "Desc": [ + "己方全体附加速度提升，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190023000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "敌方单体附加速度下降，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -621,13 +705,20 @@ 290023001 ] } + ], + "Desc": [ + "敌方单体附加速度下降，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190024000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "己方全体附加暴击提升，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -669,13 +760,20 @@ 290024001 ] } + ], + "Desc": [ + "己方全体附加暴击提升，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190025000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "敌方单体附加暴击下降，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -717,13 +815,20 @@ 290025001 ] } + ], + "Desc": [ + "敌方单体附加暴击下降，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190026000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "敌方单体附加烙印，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -765,13 +870,20 @@ 290026001 ] } + ], + "Desc": [ + "敌方单体附加烙印，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190027000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "敌方单体附加失手率提升，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -813,13 +925,20 @@ 290027001 ] } + ], + "Desc": [ + "敌方单体附加失手率提升，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190028000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "己方全体附加10层叹息之力", "MaxLV": 6, "CD": [ 4, @@ -861,13 +980,20 @@ 290028001 ] } + ], + "Desc": [ + "己方全体附加10层叹息之力", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190029000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "己方全体附加暴击抵抗，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -909,13 +1035,20 @@ 290029001 ] } + ], + "Desc": [ + "己方全体附加暴击抵抗，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190030000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "敌方单体附加眩晕，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -957,13 +1090,20 @@ 290030001 ] } + ], + "Desc": [ + "敌方单体附加眩晕，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190031000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "敌方单体附加冰冻，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -1005,13 +1145,20 @@ 290031001 ] } + ], + "Desc": [ + "敌方单体附加冰冻，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190032000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "己方全体附加无法获得增益效果，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -1053,13 +1200,20 @@ 290032001 ] } + ], + "Desc": [ + "己方全体附加无法获得增益效果，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190033000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "己方全体附加无法获得减益效果，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -1101,13 +1255,20 @@ 290033001 ] } + ], + "Desc": [ + "己方全体附加无法获得减益效果，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190034000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "己方全体附加免疫，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -1149,13 +1310,20 @@ 290034001 ] } + ], + "Desc": [ + "己方全体附加免疫，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190035000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "己方全体附加无敌，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -1197,13 +1365,20 @@ 290035001 ] } + ], + "Desc": [ + "己方全体附加无敌，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190036000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "敌方单体附加禁疗，持续2回合", "MaxLV": 6, "CD": [ 4, @@ -1245,13 +1420,20 @@ 290036001 ] } + ], + "Desc": [ + "敌方单体附加禁疗，持续2回合", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190037000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "对敌方单体造成3次攻击力80%的伤害，有50%的概率再次对目标额外造成50%防御力的伤害", "MaxLV": 6, "CD": [ 4, @@ -1299,13 +1481,20 @@ 290037002 ] } + ], + "Desc": [ + "对敌方单体造成3次攻击力80%的伤害，有50%的概率再次对目标额外造成50%防御力的伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190038000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "对敌方全体造成攻击力80%的伤害，另有50%概率驱散敌方1个增益BUFF（表现为2次伤害飘字）", "MaxLV": 6, "CD": [ 4, @@ -1347,13 +1536,20 @@ 290038001 ] } + ], + "Desc": [ + "对敌方全体造成攻击力80%的伤害，另有50%概率驱散敌方1个增益BUFF（表现为2次伤害飘字）", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190039000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "对敌方单体造成3次攻击力80%的伤害，每次50%概率附加目标最大生命8%的伤害，此附加伤害不超过自身攻击50%（生命伤害不会暴击，整个技能表现为3次伤害飘字）", "MaxLV": 6, "CD": [ 4, @@ -1395,13 +1591,20 @@ 290039001 ] } + ], + "Desc": [ + "对敌方单体造成3次攻击力80%的伤害，每次50%概率附加目标最大生命8%的伤害，此附加伤害不超过自身攻击50%（生命伤害不会暴击，整个技能表现为3次伤害飘字）", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190040000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "对敌方单体目标造成80%攻击力伤害，触发暴击时，攻击力伤害系数增加30%", "MaxLV": 6, "CD": [ 4, @@ -1443,13 +1646,20 @@ 290040001 ] } + ], + "Desc": [ + "对敌方单体目标造成80%攻击力伤害，触发暴击时，攻击力伤害系数增加30%", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190041000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "对敌方单体目标造成80%攻击力伤害，触发暴击时，造成伤害增加30%", "MaxLV": 6, "CD": [ 4, @@ -1491,13 +1701,20 @@ 290041001 ] } + ], + "Desc": [ + "对敌方单体目标造成80%攻击力伤害，触发暴击时，造成伤害增加30%", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190042000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "对敌方单体目标造成80%攻击力伤害，回复本次伤害30%的血量，本次伤害必定暴击", "MaxLV": 6, "CD": [ 4, @@ -1545,13 +1762,20 @@ 290042002 ] } + ], + "Desc": [ + "对敌方单体目标造成80%攻击力伤害，回复本次伤害30%的血量，本次伤害必定暴击", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190043000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "对敌方全体目标造成80%攻击力伤害，本次伤害无视防御100%，敌方每有一个增益BUFF，无视防御减少20%", "MaxLV": 6, "CD": [ 4, @@ -1593,13 +1817,20 @@ 290043001 ] } + ], + "Desc": [ + "对敌方全体目标造成80%攻击力伤害，本次伤害无视防御100%，敌方每有一个增益BUFF，无视防御减少20%", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190044000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "对敌方单体目标造成80%攻击力伤害，自身每10点速度增加1%的攻击力伤害", "MaxLV": 6, "CD": [ 4, @@ -1641,13 +1872,20 @@ 290044001 ] } + ], + "Desc": [ + "对敌方单体目标造成80%攻击力伤害，自身每10点速度增加1%的攻击力伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190045000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "对敌方单体目标造成80%攻击力伤害，自身每个增益BUFF，增加攻击力10%的伤害", "MaxLV": 6, "CD": [ 4, @@ -1689,13 +1927,20 @@ 290045001 ] } + ], + "Desc": [ + "对敌方单体目标造成80%攻击力伤害，自身每个增益BUFF，增加攻击力10%的伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190046000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "驱散敌方全体增益效果，随后对敌方全体造成攻击力80%伤害，每驱散1个增益BUFF，对其造成的伤害增加3%", "MaxLV": 6, "CD": [ 4, @@ -1737,13 +1982,20 @@ 290046001 ] } + ], + "Desc": [ + "驱散敌方全体增益效果，随后对敌方全体造成攻击力80%伤害，每驱散1个增益BUFF，对其造成的伤害增加3%", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190047000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "对敌方单体造成80%攻击力伤害，对其他敌方目标造成此伤害40%的溅射伤害", "MaxLV": 6, "CD": [ 4, @@ -1791,13 +2043,20 @@ 290047002 ] } + ], + "Desc": [ + "对敌方单体造成80%攻击力伤害，对其他敌方目标造成此伤害40%的溅射伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190048000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "回复己方全体80%攻击力的血量", "MaxLV": 6, "CD": [ 4, @@ -1839,13 +2098,20 @@ 290048001 ] } + ], + "Desc": [ + "回复己方全体80%攻击力的血量", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190049000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "回复己方全体其最大生命值20%的血量", "MaxLV": 6, "CD": [ 4, @@ -1887,13 +2153,20 @@ 290049001 ] } + ], + "Desc": [ + "回复己方全体其最大生命值20%的血量", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190050000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "己方全体行动值增加30%", "MaxLV": 6, "CD": [ 4, @@ -1935,13 +2208,20 @@ 290050001 ] } + ], + "Desc": [ + "己方全体行动值增加30%", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190051000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "敌方全体行动值降低30%", "MaxLV": 6, "CD": [ 4, @@ -1983,13 +2263,20 @@ 290051001 ] } + ], + "Desc": [ + "敌方全体行动值降低30%", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190052000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "夺取敌方单体30%行动值", "MaxLV": 6, "CD": [ 4, @@ -2031,13 +2318,20 @@ 290052001 ] } + ], + "Desc": [ + "夺取敌方单体30%行动值", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190053000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "净化己方全体非防御下降类减益BUFF", "MaxLV": 6, "CD": [ 4, @@ -2079,13 +2373,20 @@ 290053001 ] } + ], + "Desc": [ + "净化己方全体非防御下降类减益BUFF", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190054000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "驱散敌方全体增益BUFF", "MaxLV": 6, "CD": [ 4, @@ -2127,13 +2428,20 @@ 290054001 ] } + ], + "Desc": [ + "驱散敌方全体增益BUFF", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190055000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "夺取敌方单体全部增益BUFF给自身", "MaxLV": 6, "CD": [ 4, @@ -2175,13 +2483,20 @@ 290055001 ] } + ], + "Desc": [ + "夺取敌方单体全部增益BUFF给自身", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190056000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "转移己方全体1个减益BUFF给敌方单体", "MaxLV": 6, "CD": [ 4, @@ -2223,13 +2538,20 @@ 290056001 ] } + ], + "Desc": [ + "转移己方全体1个减益BUFF给敌方单体", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190057000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "己方全体增益BUFF持续回合\u002B1", "MaxLV": 6, "CD": [ 4, @@ -2271,13 +2593,20 @@ 290057001 ] } + ], + "Desc": [ + "己方全体增益BUFF持续回合\u002B1", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190058000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "敌方全体减益BUFF持续回合\u002B1", "MaxLV": 6, "CD": [ 4, @@ -2319,13 +2648,20 @@ 290058001 ] } + ], + "Desc": [ + "敌方全体减益BUFF持续回合\u002B1", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190059000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "己方全体所有技能CD-1", "MaxLV": 6, "CD": [ 4, @@ -2367,13 +2703,20 @@ 290059001 ] } + ], + "Desc": [ + "己方全体所有技能CD-1", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190060000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "敌方全体所有技能CD\u002B1", "MaxLV": 6, "CD": [ 4, @@ -2415,13 +2758,20 @@ 290060001 ] } + ], + "Desc": [ + "敌方全体所有技能CD\u002B1", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190061000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "对敌方单体造成80%攻击力伤害，随后自身立即获得回合。", "MaxLV": 6, "CD": [ 4, @@ -2469,13 +2819,20 @@ 290061002 ] } + ], + "Desc": [ + "对敌方单体造成80%攻击力伤害，随后自身立即获得回合。", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190062000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "回复己方单体其最大生命50%的生命值。若目标为死亡状态，则复活目标，并回复其最大生命50%的生命", "MaxLV": 6, "CD": [ 4, @@ -2523,13 +2880,20 @@ 290062002 ] } + ], + "Desc": [ + "回复己方单体其最大生命50%的生命值。若目标为死亡状态，则复活目标，并回复其最大生命50%的生命", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190063000, - "Name": "", + "Name": "梦扣扣", + "ico": "dzjn_icon_001", "Type": 1, - "Desc": "对敌方单体造成80%攻击力伤害，有50%概率再次使用该技能进行追击", "MaxLV": 6, "CD": [ 4, @@ -2571,13 +2935,20 @@ 290063001 ] } + ], + "Desc": [ + "对敌方单体造成80%攻击力伤害，有50%概率再次使用该技能进行追击", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190064000, - "Name": "", + "Name": "梦之贪婪", + "ico": "jn_icon_001", "Type": 1, - "Desc": "对敌方单体造成80%攻击力伤害，有50%概率再次使用190063000技能进行追击", "MaxLV": 6, "CD": [ 4, @@ -2619,13 +2990,20 @@ 290064001 ] } + ], + "Desc": [ + "对敌方单体造成80%攻击力伤害，有50%概率再次使用190063000技能进行追击", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190065000, - "Name": "", + "Name": "梦妖姥姥", + "ico": "jn_icon_002", "Type": 1, - "Desc": "自身随机附加攻击提升，暴击提升，防御提升其中一种，持续2回合。", "MaxLV": 6, "CD": [ 4, @@ -2667,13 +3045,20 @@ 290065001 ] } + ], + "Desc": [ + "自身随机附加攻击提升，暴击提升，防御提升其中一种，持续2回合。", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" ] }, { "Id": 190066000, - "Name": "", + "Name": "梦龙闪耀", + "ico": "jn_icon_003", "Type": 1, - "Desc": "对敌方随机目标造成80%攻击力伤害，50%概率额外造成50%防御力伤害", "MaxLV": 6, "CD": [ 4, @@ -2715,6 +3100,1629 @@ 290066001 ] } + ], + "Desc": [ + "对敌方随机目标造成80%攻击力伤害，50%概率额外造成50%防御力伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" + ] + }, + { + "Id": 190067000, + "Name": "梦妖姥姥", + "ico": "jn_icon_002", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290067001 + ] + }, + { + "Id": [ + 290067001 + ] + }, + { + "Id": [ + 290067001 + ] + }, + { + "Id": [ + 290067001 + ] + }, + { + "Id": [ + 290067001 + ] + }, + { + "Id": [ + 290067001 + ] + } + ], + "Desc": [ + "每回合行动前对敌方全体造成80%攻击力伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" + ] + }, + { + "Id": 190068000, + "Name": "梦龙闪耀", + "ico": "jn_icon_003", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 2, + "ChildSkill": [ + { + "Id": [ + 290068001 + ] + }, + { + "Id": [ + 290068001 + ] + }, + { + "Id": [ + 290068001 + ] + }, + { + "Id": [ + 290068001 + ] + }, + { + "Id": [ + 290068001 + ] + }, + { + "Id": [ + 290068001 + ] + } + ], + "Desc": [ + "下回合行动前对敌方全体造成80%攻击力伤害", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" + ] + }, + { + "Id": 190069000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290069001 + ] + }, + { + "Id": [ + 290069001 + ] + }, + { + "Id": [ + 290069001 + ] + }, + { + "Id": [ + 290069001 + ] + }, + { + "Id": [ + 290069001 + ] + }, + { + "Id": [ + 290069001 + ] + } + ], + "Desc": [ + "每次攻击前对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190070000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290070001 + ] + }, + { + "Id": [ + 290070001 + ] + }, + { + "Id": [ + 290070001 + ] + }, + { + "Id": [ + 290070001 + ] + }, + { + "Id": [ + 290070001 + ] + }, + { + "Id": [ + 290070001 + ] + } + ], + "Desc": [ + "每次受到攻击前对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190071000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290071001 + ] + }, + { + "Id": [ + 290071001 + ] + }, + { + "Id": [ + 290071001 + ] + }, + { + "Id": [ + 290071001 + ] + }, + { + "Id": [ + 290071001 + ] + }, + { + "Id": [ + 290071001 + ] + } + ], + "Desc": [ + "暴击时回复自身5%最大生命值血量" + ] + }, + { + "Id": 190072000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290072001 + ] + }, + { + "Id": [ + 290072001 + ] + }, + { + "Id": [ + 290072001 + ] + }, + { + "Id": [ + 290072001 + ] + }, + { + "Id": [ + 290072001 + ] + }, + { + "Id": [ + 290072001 + ] + } + ], + "Desc": [ + "被暴击时回复自身5%最大生命值血量" + ] + }, + { + "Id": 190073000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290073001 + ] + }, + { + "Id": [ + 290073001 + ] + }, + { + "Id": [ + 290073001 + ] + }, + { + "Id": [ + 290073001 + ] + }, + { + "Id": [ + 290073001 + ] + }, + { + "Id": [ + 290073001 + ] + } + ], + "Desc": [ + "受到致死伤害后免除死亡，每场战斗最多1次" + ] + }, + { + "Id": 190074000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290074001 + ] + }, + { + "Id": [ + 290074001 + ] + }, + { + "Id": [ + 290074001 + ] + }, + { + "Id": [ + 290074001 + ] + }, + { + "Id": [ + 290074001 + ] + }, + { + "Id": [ + 290074001 + ] + } + ], + "Desc": [ + "击破护盾时，对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190075000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290075001 + ] + }, + { + "Id": [ + 290075001 + ] + }, + { + "Id": [ + 290075001 + ] + }, + { + "Id": [ + 290075001 + ] + }, + { + "Id": [ + 290075001 + ] + }, + { + "Id": [ + 290075001 + ] + } + ], + "Desc": [ + "护盾被击破时，对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190076000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290076001 + ] + }, + { + "Id": [ + 290076001 + ] + }, + { + "Id": [ + 290076001 + ] + }, + { + "Id": [ + 290076001 + ] + }, + { + "Id": [ + 290076001 + ] + }, + { + "Id": [ + 290076001 + ] + } + ], + "Desc": [ + "攻击时，对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190077000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290077001 + ] + }, + { + "Id": [ + 290077001 + ] + }, + { + "Id": [ + 290077001 + ] + }, + { + "Id": [ + 290077001 + ] + }, + { + "Id": [ + 290077001 + ] + }, + { + "Id": [ + 290077001 + ] + } + ], + "Desc": [ + "受到攻击时，对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190078000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290078001 + ] + }, + { + "Id": [ + 290078001 + ] + }, + { + "Id": [ + 290078001 + ] + }, + { + "Id": [ + 290078001 + ] + }, + { + "Id": [ + 290078001 + ] + }, + { + "Id": [ + 290078001 + ] + } + ], + "Desc": [ + "击杀敌人后，对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190079000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290079001 + ] + }, + { + "Id": [ + 290079001 + ] + }, + { + "Id": [ + 290079001 + ] + }, + { + "Id": [ + 290079001 + ] + }, + { + "Id": [ + 290079001 + ] + }, + { + "Id": [ + 290079001 + ] + } + ], + "Desc": [ + "死亡后，立即复活" + ] + }, + { + "Id": 190080000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290080001 + ] + }, + { + "Id": [ + 290080001 + ] + }, + { + "Id": [ + 290080001 + ] + }, + { + "Id": [ + 290080001 + ] + }, + { + "Id": [ + 290080001 + ] + }, + { + "Id": [ + 290080001 + ] + } + ], + "Desc": [ + "复活后，对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190081000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290081001 + ] + }, + { + "Id": [ + 290081001 + ] + }, + { + "Id": [ + 290081001 + ] + }, + { + "Id": [ + 290081001 + ] + }, + { + "Id": [ + 290081001 + ] + }, + { + "Id": [ + 290081001 + ] + } + ], + "Desc": [ + "BUFF结束，对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190082000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290082001 + ] + }, + { + "Id": [ + 290082001 + ] + }, + { + "Id": [ + 290082001 + ] + }, + { + "Id": [ + 290082001 + ] + }, + { + "Id": [ + 290082001 + ] + }, + { + "Id": [ + 290082001 + ] + } + ], + "Desc": [ + "回合结束后，对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190083000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290083001 + ] + }, + { + "Id": [ + 290083001 + ] + }, + { + "Id": [ + 290083001 + ] + }, + { + "Id": [ + 290083001 + ] + }, + { + "Id": [ + 290083001 + ] + }, + { + "Id": [ + 290083001 + ] + } + ], + "Desc": [ + "行动结束前，对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190084000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + } + ], + "Desc": [ + "行动结束后，对敌方全体造成80%攻击力伤害" + ] + }, + { + "Id": 190085000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290085001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + }, + { + "Id": [ + 290084001 + ] + } + ], + "Desc": [ + "增加敌方全体所有技能CD1回合" + ] + }, + { + "Id": 190086000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290086001 + ] + }, + { + "Id": [ + 290086001 + ] + }, + { + "Id": [ + 290086001 + ] + }, + { + "Id": [ + 290086001 + ] + }, + { + "Id": [ + 290086001 + ] + }, + { + "Id": [ + 290086001 + ] + } + ], + "Desc": [ + "减少己方全体所有技能CD1回合" + ] + }, + { + "Id": 100012100, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200012101, + 200012102 + ] + }, + { + "Id": [ + 200012101, + 200012102 + ] + }, + { + "Id": [ + 200012101, + 200012102 + ] + }, + { + "Id": [ + 200012101, + 200012102 + ] + }, + { + "Id": [ + 200012101, + 200012102 + ] + }, + { + "Id": [ + 200012101, + 200012102 + ] + } + ], + "Desc": [ + "每回合结束后，会进入【引雷】状态，持续1回合，在自身新回合开始时，对敌方全体造成防御力110%的伤害。【引雷】期间自身每次受到攻击时都会获得1层【雷之庇佑】，但出于不可行动状态时解除【引雷】状态。自身的任意主动技能命中敌人触发暴击时降低此技能1回合冷却（技能无论触发多少次暴击都只执行1次，也就是被动每行动只执行1次）", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" + ] + }, + { + "Id": 100022100, + "Name": "梦妖姥姥", + "ico": "jn_icon_002", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + }, + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + }, + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + }, + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + }, + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + }, + { + "Id": [ + 200022101, + 200022102, + 200022103 + ] + } + ], + "Desc": [ + "无法受到任何控制效果，每回合行动前为己方全体清除任意一个非无法行动状态的减益状态并回复其5%最大生命值；且在任意队友获得减益状态时，自身获得20%行动值提升，每回合仅触发1次。", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" + ] + }, + { + "Id": 100092100, + "Name": "梦龙闪耀", + "ico": "jn_icon_003", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200092101, + 200092102 + ] + }, + { + "Id": [ + 200092101, + 200092102 + ] + }, + { + "Id": [ + 200092101, + 200092102 + ] + }, + { + "Id": [ + 200092101, + 200092102 + ] + }, + { + "Id": [ + 200092101, + 200092102 + ] + }, + { + "Id": [ + 200092101, + 200092102 + ] + } + ], + "Desc": [ + "自身攻击不会失手。当敌方单位使其友方减益状态提前结束时，令该单位失去30%当前生命值，同时失去全部增益状态并获得1回合【石化】效果。", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" + ] + }, + { + "Id": 100102100, + "Name": "梦扣扣", + "ico": "dzjn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + }, + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + }, + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + }, + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + }, + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + }, + { + "Id": [ + 200102101, + 200102102, + 200102103, + 200102104, + 200102105, + 200102106 + ] + } + ], + "Desc": [ + "无法获得任意增益和减益状态，受到的所有伤害降低10%。同时，每次被施加增益或减益状态时，自身获得1层【叹息之力】；每有1个队友死亡时，自身获得10层【叹息之力】。最多可叠加50层。每次战斗中首次受到致命伤害时，免除本次死亡，并根据当前【叹息之力】层数回复自身生命值状态，每层回复自身1%最大生命值状态。（死亡是否驱散所有叹息之力）", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" + ] + }, + { + "Id": 100162100, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200162101, + 200162102 + ] + }, + { + "Id": [ + 200162101, + 200162102 + ] + }, + { + "Id": [ + 200162101, + 200162102 + ] + }, + { + "Id": [ + 200162101, + 200162102 + ] + }, + { + "Id": [ + 200162101, + 200162102 + ] + }, + { + "Id": [ + 200162101, + 200162102 + ] + } + ], + "Desc": [ + "对己方任意目标造成治疗效果时，会同时为其净化2个减益效果，若目标没有减益效果，则额外为其施加1回合【免疫】效果。同时自身治疗量溢出的120%将转变为【护盾】效果，持续2回合。", + "伤害提升至100%", + "伤害提升至110%", + "伤害提升至120%", + "伤害提升至130%" + ] + }, + { + "Id": 100191100, + "Name": "猫猫威慑", + "ico": "jn_icon_003", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 200191101, + 200191102 + ] + }, + { + "Id": [ + 200191101, + 200191102 + ] + }, + { + "Id": [ + 200191101, + 200191102 + ] + }, + { + "Id": [ + 200191101, + 200191102 + ] + }, + { + "Id": [ + 200191101, + 200191102 + ] + }, + { + "Id": [ + 200191101, + 200191102 + ] + } + ], + "Desc": [ + "对敌方单体造成攻击力130%的伤害，并附加1层【猫猫威慑】状态。" + ] + }, + { + "Id": 100192100, + "Name": "猫猫推理", + "ico": "dzjn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + }, + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + }, + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + }, + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + }, + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + }, + { + "Id": [ + 200192101, + 200192102, + 200192104 + ] + } + ], + "Desc": [ + "每次攻击后，若目标的生命值比例高于50%，则对该目标重复释放一次本次攻击所用技能，否则自身获得1层【猫猫推理】。每回合仅触发1次。每层【猫猫推理】提供15%伤害减免。" + ] + }, + { + "Id": 100193100, + "Name": "烙印", + "ico": "jn_icon_001", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 1, + "ChildSkill": [ + { + "Id": [ + 200193101 + ] + }, + { + "Id": [ + 200193101 + ] + } + ], + "Desc": [ + "对敌方单体造成攻击力210%的伤害，并附加2回合【烙印】状态。" + ] + }, + { + "Id": 100622100, + "Name": "烙印", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200622101 + ] + }, + { + "Id": [ + 200622101 + ] + }, + { + "Id": [ + 200622101 + ] + }, + { + "Id": [ + 200622101 + ] + }, + { + "Id": [ + 200622101 + ] + }, + { + "Id": [ + 200622101 + ] + } + ], + "Desc": [ + "当队友向敌方任意1个目标发起攻击时，都会跟随队友对目标造成攻击力40%的伤害" + ] + }, + { + "Id": 100626100, + "Name": "烙印", + "ico": "jn_icon_001", + "Type": 1, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 200626101 + ] + }, + { + "Id": [ + 200626101 + ] + }, + { + "Id": [ + 200626101 + ] + }, + { + "Id": [ + 200626101 + ] + }, + { + "Id": [ + 200626101 + ] + }, + { + "Id": [ + 200626101 + ] + } + ], + "Desc": [ + "对目标造成攻击力40%的伤害" ] } ] \ No newline at end of file diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 70d002f5a..55497f8ef 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -1,210 +1,496 @@ [ { "Id": 390001001, - "Type": "ProBuff", + "Type": "Type=ProBuff", "Name": "攻击提升", "Desc": "攻击提升40%", "Tags": [ "201" ], "OverlayTimes": 0, - "SameID": false + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "402" + ] }, { "Id": 390001002, - "Type": "ProBuff", - "Name": "攻击下降", - "Desc": "攻击下降40%", - "Tags": [ - "202" - ], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390001003, - "Type": "ProBuff", + "Type": "Type=ProBuff", "Name": "防御提升", "Desc": "防御提升60%", "Tags": [ "201" ], "OverlayTimes": 0, - "SameID": false + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "402" + ] }, { - "Id": 390001004, - "Type": "ProBuff", - "Name": "防御下降", - "Desc": "防御下降60%", - "Tags": [ - "202" - ], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390001005, - "Type": "ProBuff", + "Id": 390001003, + "Type": "Type=ProBuff", "Name": "速度提升", "Desc": "速度提升30%", "Tags": [ "201" ], "OverlayTimes": 0, - "SameID": false + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "402" + ] }, { - "Id": 390001006, - "Type": "ProBuff", - "Name": "速度下降", - "Desc": "速度下降30%", - "Tags": [ - "202" - ], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390001007, - "Type": "ProBuff", + "Id": 390001004, + "Type": "Type=ProBuff", "Name": "暴击提升", "Desc": "暴击率提升30%", "Tags": [ "201" ], "OverlayTimes": 0, - "SameID": false + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "402" + ] }, { - "Id": 390001008, - "Type": "ProBuff", - "Name": "暴击下降", - "Desc": "暴击率下降30%", - "Tags": [ - "202" - ], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390001009, - "Type": "ProBuff", - "Name": "烙印", - "Desc": "被攻击时，受到的伤害提高25%", - "Tags": [ - "202" - ], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390001010, - "Type": "ProBuff", - "Name": "失手率提升", - "Desc": "失手率提升50%", - "Tags": [ - "202" - ], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390001011, - "Type": "ProBuff", - "Name": "叹息之力", - "Desc": "（无法驱散类状态）每层使自身攻击力提升5%，每10层使自身受到伤害降低3%。最高可叠加50层", - "Tags": [ - "201", - "301" - ], - "OverlayTimes": 50, - "SameID": true - }, - { - "Id": 390001012, - "Type": "ProBuff", + "Id": 390001005, + "Type": "Type=ProBuff", "Name": "暴击抵抗", "Desc": "受到暴击概率降低30%", "Tags": [ "201" ], "OverlayTimes": 0, - "SameID": false + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "402" + ] + }, + { + "Id": 390001006, + "Type": "Type=ProBuff", + "Name": "叹息之力", + "Desc": "（无法驱散类状态）每层使自身攻击力提升5%，每10层使自身受到伤害降低3%。最高可叠加50层", + "Tags": [ + "303" + ], + "OverlayTimes": 50, + "SameID": true, + "RelyTags": [], + "NoRelyTags": [ + "402" + ] + }, + { + "Id": 390001007, + "Type": "Type=ProBuff", + "Name": "公牛之怒", + "Desc": "每层使自身基础防御提升10%，效果抵抗提升5%，最多可叠加10层。", + "Tags": [ + "201" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "402" + ] + }, + { + "Id": 390001008, + "Type": "Type=ProBuff", + "Name": "雷之庇佑", + "Desc": "每次受到攻击提升20%的防御，最多叠加5层", + "Tags": [ + "201" + ], + "OverlayTimes": 5, + "SameID": true, + "RelyTags": [], + "NoRelyTags": [ + "402" + ] }, { "Id": 390002001, - "Type": "TagBuff", - "Name": "眩晕", - "Desc": "无法进行任务行动", - "Tags": [ - "202", - "302" - ], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390002002, - "Type": "TagBuff", - "Name": "冰冻", - "Desc": "无法进行任何行动", - "Tags": [ - "202", - "302" - ], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390002003, - "Type": "TagBuff", - "Name": "无法获得增益效果", - "Desc": "无法附加增益状态（不可驱散）（不配置标签）", - "Tags": [], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390002004, - "Type": "TagBuff", - "Name": "无法获得减益效果", - "Desc": "无法获得减益效果（不可驱散）（不配置标签）", - "Tags": [], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390002005, - "Type": "TagBuff", - "Name": "免疫", - "Desc": "无法获得减益效果", - "Tags": [ - "201" - ], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390002006, - "Type": "TagBuff", - "Name": "无敌", - "Desc": "无法受到任何伤害", - "Tags": [ - "201" - ], - "OverlayTimes": 0, - "SameID": false - }, - { - "Id": 390002007, - "Type": "TagBuff", - "Name": "禁疗", - "Desc": "无法恢复生命", + "Type": "Type=ProBuff", + "Name": "攻击下降", + "Desc": "攻击下降40%", "Tags": [ "202" ], "OverlayTimes": 0, - "SameID": false + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302" + ] + }, + { + "Id": 390002002, + "Type": "Type=ProBuff", + "Name": "防御下降", + "Desc": "防御下降60%", + "Tags": [ + "202" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302" + ] + }, + { + "Id": 390002003, + "Type": "Type=ProBuff", + "Name": "速度下降", + "Desc": "速度下降30%", + "Tags": [ + "202" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302" + ] + }, + { + "Id": 390002004, + "Type": "Type=ProBuff", + "Name": "暴击下降", + "Desc": "暴击率下降30%", + "Tags": [ + "202" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302" + ] + }, + { + "Id": 390002005, + "Type": "Type=ProBuff", + "Name": "烙印", + "Desc": "被攻击时，受到的伤害提高25%", + "Tags": [ + "202" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302" + ] + }, + { + "Id": 390002006, + "Type": "Type=ProBuff", + "Name": "失手率提升", + "Desc": "失手率提升50%", + "Tags": [ + "202" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302" + ] + }, + { + "Id": 390003001, + "Type": "Type=TagBuff", + "Name": "无敌", + "Desc": "不会受到任何伤害", + "Tags": [ + "201", + "301" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "402" + ] + }, + { + "Id": 390003002, + "Type": "Type=TagBuff", + "Name": "对峙", + "Desc": "生命最低降为1", + "Tags": [ + "201", + "501" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "402" + ] + }, + { + "Id": 390003003, + "Type": "Type=TagBuff", + "Name": "免疫控制效果", + "Desc": "无法被附加任何控制效果", + "Tags": [ + "304" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "402" + ] + }, + { + "Id": 390003004, + "Type": "Type=TagBuff", + "Name": "免除死亡", + "Desc": "", + "Tags": [ + "501" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 390004001, + "Type": "Type=TagBuff", + "Name": "眩晕", + "Desc": "无法进行任务行动", + "Tags": [ + "202", + "604" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302" + ] + }, + { + "Id": 390004002, + "Type": "Type=TagBuff", + "Name": "冰冻", + "Desc": "无法进行任何行动", + "Tags": [ + "202", + "604" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302" + ] + }, + { + "Id": 390004003, + "Type": "Type=TagBuff", + "Name": "禁疗", + "Desc": "无法恢复生命", + "Tags": [ + "202", + "401" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302" + ] + }, + { + "Id": 390004004, + "Type": "Type=TagBuff", + "Name": "石化", + "Desc": "无法进行任何行动，不会随着回合到来降低技能冷却", + "Tags": [ + "202", + "604", + "602", + "204" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302", + "304" + ] + }, + { + "Id": 390004005, + "Type": "Type=TagBuff", + "Name": "沉默", + "Desc": "只能释放基础技能", + "Tags": [ + "202", + "603", + "204" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302", + "304" + ] + }, + { + "Id": 390004006, + "Type": "Type=TagBuff", + "Name": "吞噬", + "Desc": "无法进行任何行动，无法被选中，无法被攻击，无法获得任何强化及弱化效果", + "Tags": [ + "202", + "604", + "606", + "204" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302", + "304" + ] + }, + { + "Id": 390004007, + "Type": "Type=TagBuff", + "Name": "挑衅", + "Desc": "回合开始时，会被迫发起攻击，向附加状态者释放基础技能", + "Tags": [ + "202", + "204" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302", + "304" + ] + }, + { + "Id": 390004008, + "Type": "Type=TagBuff", + "Name": "猫猫威慑 ", + "Desc": "携带者阵亡时清除此状态，并对携带者一方全体造成崔佛（释放者）攻击力40%的效果附加伤害，每层使伤害系数提升40%，最多可叠加5层。", + "Tags": [ + "202" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [ + "302" + ] + }, + { + "Id": 390005001, + "Type": "Type=TagBuff", + "Name": "炎阳", + "Desc": "（无法驱散类状态）可以增强炎阳灼射的威力。", + "Tags": [ + "201", + "303" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 390005002, + "Type": "Type=TagBuff", + "Name": "无法获得减益", + "Desc": "无法获得减益效果（不可驱散）（不配置标签）", + "Tags": [ + "302" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 390005003, + "Type": "Type=TagBuff", + "Name": "不会失手", + "Desc": "不会失手", + "Tags": [ + "502" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 390006001, + "Type": "Type=TagBuff", + "Name": "无法获得增益", + "Desc": "无法附加增益状态（不可驱散）（不配置标签）", + "Tags": [ + "302" + ], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 300102103, + "Type": "Type=ProBuff", + "Name": "", + "Desc": "受到的所有伤害降低10%", + "Tags": [], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 300162105, + "Type": "Type=CallShieldBuff", + "Name": "", + "Desc": "", + "Tags": [], + "OverlayTimes": 0, + "SameID": false, + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 300192114, + "Type": "Type=ProBuff", + "Name": "猫猫推理", + "Desc": "每层为崔佛（释放者）提供15%伤害减免", + "Tags": [ + "201" + ], + "OverlayTimes": 2, + "SameID": true, + "RelyTags": [], + "NoRelyTags": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 0637a088a..0933541c4 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -1 +1,624 @@ -[] \ No newline at end of file +[ + { + "Id": 490001001, + "Desc": "免疫", + "When": "SufEff", + "Where": "Target=3,EffType=1,EffID=101", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [ + "302" + ], + "RelyTags": [], + "NoRelyTags": [ + "402" + ] + }, + { + "Id": 490067001, + "Desc": "被动1 每回合行动前对敌方全体造成80%攻击力伤害", + "When": "RouFro", + "Where": "Target=3", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490068001, + "Desc": "被动1 每回合行动前对敌方全体造成80%攻击力伤害", + "When": "RouFro", + "Where": "Target=3", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490069001, + "Desc": "每次攻击前对敌方全体造成80%攻击力伤害", + "When": "EffFro", + "Where": "Target=3,EffType=1,EffID=101", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490070001, + "Desc": "每次受到攻击前对敌方全体造成80%攻击力伤害", + "When": "SufEffFro", + "Where": "Target=3,EffType=1,EffID=101", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490071001, + "Desc": "暴击时回复自身5%最大生命值血量", + "When": "CriCal", + "Where": "Target=3,CriRely=1,TesLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490072001, + "Desc": "被暴击时回复自身5%最大生命值血量", + "When": "CovCriCal", + "Where": "Target=3,CriRely=1,TriLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490073001, + "Desc": "受到致死伤害后免除死亡，每场战斗最多1次", + "When": "SufDmg", + "Where": "Target=3,LetDmg=1,TriLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490074001, + "Desc": "击破护盾时，对敌方全体造成80%攻击力伤害", + "When": "BreShield", + "Where": "Target=3,TriLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490075001, + "Desc": "护盾被击破时，对敌方全体造成80%攻击力伤害", + "When": "ShieldBro", + "Where": "Target=3,TriLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490076001, + "Desc": "攻击时，对敌方全体造成80%攻击力伤害", + "When": "ImpEff", + "Where": "Target=3,EffType=1,EffID=101,TriLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490077001, + "Desc": "受到攻击时，对敌方全体造成80%攻击力伤害", + "When": "SufEff", + "Where": "Target=3,EffType=1,EffID=101,TriLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490078001, + "Desc": "击杀敌人后，对敌方全体造成80%攻击力伤害", + "When": "Kill", + "Where": "Target=3,TriLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490079001, + "Desc": "死亡后，立即复活", + "When": "Dead", + "Where": "Target=3,TriLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490080001, + "Desc": "复活后，对敌方全体造成80%攻击力伤害", + "When": "Resurrection", + "Where": "Target=3", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490081001, + "Desc": "BUFF结束，对敌方全体造成80%攻击力伤害", + "When": "BuffEnd", + "Where": "Target=3", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490082001, + "Desc": "回合结束后，对敌方全体造成80%攻击力伤害", + "When": "RouEnd", + "Where": "Target=3", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490083001, + "Desc": "行动结束前，对敌方全体造成80%攻击力伤害", + "When": "ActEndFro", + "Where": "Target=3", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 490084001, + "Desc": "行动结束后，对敌方全体造成80%攻击力伤害", + "When": "ActEnd", + "Where": "Target=3", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400012101, + "Desc": "主被动1 每回合结束后，调用子技能的触发类效果 调用引雷123", + "When": "RouFro", + "Where": "Target=3", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400012102, + "Desc": "主被动2 自身的任意主动技能命中敌人触发暴击时调用子技能", + "When": "CriCal", + "Where": "Target=3,CriRely=1,TriLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400012103, + "Desc": "引雷1 在自身新回合开始时，调用子技能的触发类效果", + "When": "RouFro", + "Where": "Target=3,CriRely=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [ + "1001" + ], + "NoRelyTags": [] + }, + { + "Id": 400012104, + "Desc": "引雷2 但出于不可行动状态时，调用子技能的触发类效果", + "When": "SufEff", + "Where": "Target=3,EffType=1,EffID=604,EffTakeRel=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [ + "1001" + ], + "NoRelyTags": [] + }, + { + "Id": 400012105, + "Desc": "引雷3 【引雷】期间自身每次受到攻击时，调用子技能的触发类效果", + "When": "SufEff", + "Where": "Target=3,EffType=1,EffID=101", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [ + "1001" + ], + "NoRelyTags": [] + }, + { + "Id": 400022102, + "Desc": "加被动2 每回合行动前为己方全体清除任意一个非无法行动状态的减益状态并回复其5%最大生命值", + "When": "RouFro", + "Where": "Target=3", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400022103, + "Desc": "加被动3 且在任意队友获得减益状态时，自身获得20%行动值提升，每回合仅触发1次。", + "When": "SufEff", + "Where": "Target=1,EffType=1,EffID=202,EffTakeRel=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400092102, + "Desc": "被动2 当敌方单位使其友方减益状态提前结束时，令该单位失去30%当前生命值，同时失去全部增益状态并获得1回合【石化】效果。", + "When": "ImpEff", + "Where": "Target=2,EffType=1,EffID=105,EffTakeRel=1,EffCovType=1,EffCovId=201,EffCovOp=0,EffReVal=1,TriLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400102104, + "Desc": "被动4 每次被施加增益状态时，自身获得1层【叹息之力】", + "When": "SufEff", + "Where": "Target=3,EffType=1,EffID=201", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400102105, + "Desc": "被动5 每次被施加减益状态时，自身获得1层【叹息之力】", + "When": "SufEff", + "Where": "Target=3,EffType=1,EffID=202", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400102106, + "Desc": "被动6 每有1个队友死亡时，自身获得10层【叹息之力】", + "When": "Dead", + "Where": "Target=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400102107, + "Desc": "被动7 每次战斗中首次受到致命伤害时，免除本次死亡", + "When": "SufDmg", + "Where": "Target=3,LetDmg=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400102108, + "Desc": "被动8 每次战斗中首次受到致命伤害时，根据当前【叹息之力】层数回复自身生命值状态，每层回复自身1%最大生命值状态。", + "When": "SufDmg", + "Where": "Target=3,LetDmg=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400102113, + "Desc": "敌方行动结束前，移除免除死亡", + "When": "ActEndFro", + "Where": "Target=3", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400162101, + "Desc": "被动1 对己方任意目标造成治疗效果时会同时为其净化2个减益效果，若目标没有减益效果，则额外为其施加1回合【免疫】效果。", + "When": "ImpEff", + "Where": "Target=1,EffType=1,EffID=103", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400162102, + "Desc": "被动2 对己方任意目标造成治疗效果时同时自身治疗量溢出的120%将转变为【护盾】效果，持续2回合。", + "When": "ImpEff", + "Where": "Target=1,EffType=1,EffID=103", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400191102, + "Desc": "猫猫威慑 敌方死亡后触发调用子技能", + "When": "Dead", + "Where": "Target=2", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400192101, + "Desc": "被动1 每次攻击后，没有Buff5，且标的生命值比例高于50%，则给自己添加行动结束前触发的被动6。每回合仅触发1次 （同时修改被动2回合CD）", + "When": "ImpEff", + "Where": "Target=3,EffType=1,EffID=101,TriLim=1", + "AddCon": [ + "Type=BuffRely,RelyType=0,Key=300192112,Op=1,Val=1", + "Type=ProJudge,JudgeType=1,Key=NowHp_Per,Op=0,Val=500" + ], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400192102, + "Desc": "被动2 每次攻击后，没有Buff5，且目标的生命值比例小于等于50%，自身获得1层【猫猫推理】。每回合仅触发1次（同时修改被动1回合CD）", + "When": "ImpEff", + "Where": "Target=3,EffType=1,EffID=101,TriLim=1", + "AddCon": [ + "Type=BuffRely,RelyType=0,Key=300192112,Op=1,Val=1", + "Type=ProJudge,JudgeType=1,Key=NowHp_Per,Op=5,Val=500" + ], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400192103, + "Desc": "被动3 每次攻击后，若有Buff5，则给自己添加行动结束前触发的被动6，并修改被动1,2的回合CD", + "When": "ImpEff", + "Where": "Target=3,EffType=1,EffID=101,TriLim=1", + "AddCon": [ + "Type=BuffRely,RelyType=0,Key=300192112,Op=0,Val=0" + ], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400192104, + "Desc": "被动4 检测猫猫推理层数，达到2层立即重置全部技能的冷却时间，并且给自身加下一回合必定对目标进行重复攻击的标记Buff5，之后清除猫猫推理", + "When": "ImpEff", + "Where": "Target=3,EffType=0,EffID=300192114", + "AddCon": [ + "Type=BuffRely,RelyType=0,Key=300192114,Op=0,Val=1" + ], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400192112, + "Desc": "被动6 行动结束前触发，对该目标重复释放一次本次攻击所用技能，触发后移除", + "When": "ActEndFro", + "Where": "Target=3", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400622101, + "Desc": "被动1 当队友向敌方任意1个目标发起攻击时，给自己加被动2", + "When": "ImpEff", + "Where": "Target=1,EffType=1,EffID=101,TriLim=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 400622102, + "Desc": "被动2 友军行动结束前触发，跟随队友对目标造成攻击力40%的伤害", + "When": "ActEndFro", + "Where": "Target=1,TarActTar=1", + "AddCon": [], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + } +] \ No newline at end of file diff --git a/bin/json/game_ui.json b/bin/json/game_ui.json index 978cf680f..f2467537d 100644 --- a/bin/json/game_ui.json +++ b/bin/json/game_ui.json @@ -35,18 +35,6 @@ "comname": "useragreement", "des": "登录界面用户隐私协议" }, - { - "id": "notice", - "file": "LoginNoticeWindow", - "unloadpkg": 0, - "loadtype": 1, - "full": 0, - "blur": 1, - "package": "login/login", - "packagename": "login", - "comname": "notice", - "des": "登录界面公告" - }, { "id": "serverlist", "file": "ServerListWindow", @@ -442,5 +430,29 @@ "packagename": "roledetails", "comname": "main", "des": "英雄详细信息" + }, + { + "id": "bag", + "file": "BagWindow", + "unloadpkg": 0, + "loadtype": 1, + "full": 1, + "blur": 0, + "package": "bag/bag", + "packagename": "bag", + "comname": "main", + "des": "背包" + }, + { + "id": "notice", + "file": "NoticeWindow", + "unloadpkg": 0, + "loadtype": 1, + "full": 0, + "blur": 0, + "package": "notice/notice", + "packagename": "notice", + "comname": "main", + "des": "背包" } ] \ No newline at end of file diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go index 88d97c635..460bc5409 100644 --- a/cmd/robot/hero.go +++ b/cmd/robot/hero.go @@ -68,7 +68,7 @@ var ( mainType: string(comm.ModuleHero), subType: hero.HeroSubTypeChouka, req: &pb.HeroChoukaReq{ - HeroIds: []int32{42911}, + HeroIds: []int32{14001, 14002, 14003, 14004, 14005, 14006, 14007}, }, rsp: &pb.HeroChoukaResp{}, // enabled: true, @@ -78,7 +78,7 @@ var ( subType: hero.HeroSubTypeList, req: &pb.HeroListReq{}, rsp: &pb.HeroListResp{}, - enabled: true, + // enabled: true, next: func(robot *Robot, rsp proto.Message) { if r, ok := rsp.(*pb.HeroListResp); ok { tcs := []*TestCase{} @@ -94,11 +94,13 @@ var ( HeroRace: []*pb.CostCardData{ { CostCardObj: heroId, + Amount: 1, }, }, Hero: []*pb.CostCardData{ { CostCardObj: heroId, + Amount: 1, }, }, }, @@ -111,18 +113,35 @@ var ( } }, }, { - - // enabled: true, - }, { + desc: "英雄列表", mainType: string(comm.ModuleHero), - subType: hero.StrengthenUplv, - req: &pb.HeroStrengthenUplvReq{ - HeroObjID: "62bd0489ff6632434a7d0d1f", - ExpCardID: "62bd0b4eca37634b8230d4be", - Amount: 1, + subType: hero.HeroSubTypeList, + req: &pb.HeroListReq{}, + rsp: &pb.HeroListResp{}, + enabled: true, + next: func(robot *Robot, rsp proto.Message) { + if r, ok := rsp.(*pb.HeroListResp); ok { + tcs := []*TestCase{} + // selHero := r.List[0] //选中的英雄 + for _, v := range r.List { + heroId := v.Id + tc := &TestCase{ + desc: "英雄升级", + mainType: string(comm.ModuleHero), + subType: hero.StrengthenUplv, + req: &pb.HeroStrengthenUplvReq{ + HeroObjID: heroId, + ExpCardID: "62d124700625e43054ba307d", + Amount: 1, + }, + rsp: &pb.HeroStrengthenUplvResp{}, + enabled: true, + } + tcs = append(tcs, tc) + } + robot.addBuilders(tcs) + } }, - rsp: &pb.HeroStrengthenUplvResp{}, - // enabled: true, }, } ) diff --git a/cmd/robot/robot.go b/cmd/robot/robot.go index c9f4b6fd1..da4b81e24 100644 --- a/cmd/robot/robot.go +++ b/cmd/robot/robot.go @@ -53,6 +53,7 @@ func initlog() { writers := []io.Writer{ file, os.Stdout} + //同时写文件和屏幕 fileAndStdoutWriter := io.MultiWriter(writers...) if err == nil { @@ -93,12 +94,6 @@ func (r *Robot) Run() { r.AccountLogin() } - // go func() { - // for { - // r.handleRsp() - // } - // }() - ticker := time.NewTicker(time.Second * 5) go func() { for { @@ -120,18 +115,17 @@ func (r *Robot) Run() { } type TestCase struct { - id string //用例ID 如果没有指定,会自动赋值uuid - desc string //用例描述 - mainType string //协议类型 L1 - subType string //协议类型 L2 - req proto.Message //请求类型 - rsp proto.Message //响应类型 - enabled bool //是否启用 - start time.Time //启用时间 - hs time.Duration //耗时 - // requested bool //是否是请求的case - print func(rsp proto.Message) //定义打印 - next func(robot *Robot, rsp proto.Message) //处理下一层用例请求 + id string //用例ID 如果没有指定,会自动赋值uuid + desc string //用例描述 + mainType string //协议类型 L1 + subType string //协议类型 L2 + req proto.Message //请求类型 + rsp proto.Message //响应类型 + enabled bool //是否启用 + start time.Time //启用时间 + hs time.Duration //耗时 + print func(rsp proto.Message) //定义打印 + next func(robot *Robot, rsp proto.Message) //处理下一层用例请求 } //添加测试用用例 @@ -162,7 +156,6 @@ func (r *Robot) handleReq() { for _, b := range r.builderMap { if b.enabled && b.req != nil { time.Sleep(time.Millisecond * 500) - // r.reqCh <- b.id b.start = time.Now() r.start = time.Now() head := &pb.UserMessage{MainType: b.mainType, SubType: b.subType} @@ -229,7 +222,6 @@ func (r *Robot) handleRsp(id string) { uuid = id } - // uuid := <-r.reqCh r.handleNotify(uuid, msg) if v, ok := r.builderMap[uuid]; ok { if v.enabled && diff --git a/cmd/robot/task.go b/cmd/robot/task.go index e7d61ee96..cf37b7c6f 100644 --- a/cmd/robot/task.go +++ b/cmd/robot/task.go @@ -1,7 +1,6 @@ package robot import ( - "fmt" "go_dreamfactory/comm" "go_dreamfactory/modules/task" "go_dreamfactory/pb" @@ -12,7 +11,6 @@ import ( var ( taskBuilders = []*TestCase{ { - //list desc: "任务列表", mainType: string(comm.ModuleTask), subType: task.TaskSubTypeList, @@ -20,13 +18,19 @@ var ( TaskTag: int32(comm.TASK_DAILY), }, rsp: &pb.TaskListResp{}, - print: func(rsp proto.Message) { - out := rsp.(*pb.TaskListResp) - for _, v := range out.List { - fmt.Printf("%v \n", v) - } - }, + // print: func(rsp proto.Message) { + // out := rsp.(*pb.TaskListResp) + // for _, v := range out.List { + // fmt.Printf("%v \n", v) + // } + // }, // enabled: true, + next: func(robot *Robot, rsp proto.Message) { + tcs := []*TestCase{} + if _, ok := rsp.(*pb.TaskListResp); ok { + } + robot.addBuilders(tcs) + }, }, { desc: "领取任务奖励", mainType: string(comm.ModuleTask), diff --git a/modules/hero/api_starUp.go b/modules/hero/api_starUp.go index 5dccd63db..33636ba8a 100644 --- a/modules/hero/api_starUp.go +++ b/modules/hero/api_starUp.go @@ -69,13 +69,13 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr } for _, value := range tagHeroConfig.GetDataList() { - if _hero.HeroID == value.Id && _hero.Star == value.Star && _hero.Lv >= value.Maxlevel { // 找到了 满足升星条件 + if _hero.HeroID == value.Id && _hero.Star == value.Star { //&& _hero.Lv >= value.Maxlevel { // 找到了 满足升星条件 target = value break } } if target == nil { - code = pb.ErrorCode_HeroNoExist + code = pb.ErrorCode_HeroStarErr //升星条件不满足 return } // 优先校验数量对不对 diff --git a/modules/hero/api_strengthen.go b/modules/hero/api_strengthen.go index 2158b1103..0a32f5623 100644 --- a/modules/hero/api_strengthen.go +++ b/modules/hero/api_strengthen.go @@ -10,11 +10,16 @@ import ( //参数校验 func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode) { - if req.HeroObjID == "" || req.ExpCardID == "" || req.Amount <= 0 { + if req.HeroObjID == "" || len(req.ExpCards) == 0 { code = pb.ErrorCode_ReqParameterError return } - + for k, v := range req.ExpCards { + if v <= 0 || k == "" { + code = pb.ErrorCode_ReqParameterError + return + } + } return } @@ -23,13 +28,13 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren var ( curLv int32 - curExp int32 // 当前英雄的经验 - addExp int32 // 需要增加的经验 - costRes map[string][]*cfg.Game_atn // 需要消耗的资源 - _hero *pb.DBHero // 目标英雄 - _expHero *pb.DBHero // 消耗英雄 + curExp int32 // 当前英雄的经验 + addExp int32 // 需要增加的经验 + costGold int32 // 需要消耗的资源 + _hero *pb.DBHero // 目标英雄 + _expHero *pb.DBHero // 消耗英雄 ) - costRes = make(map[string][]*cfg.Game_atn, 0) + code = this.StrengthenUplvCheck(session, req) // check if code != pb.ErrorCode_Success { return @@ -38,31 +43,43 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren if code != pb.ErrorCode_Success { return } + // 只有英雄卡才能升级 + if _hero.CardType != comm.CardTypeHero { + code = pb.ErrorCode_HeroTypeErr + return + } + for k, v := range req.ExpCards { + _expHero, code = this.module.GetHero(session.GetUserId(), k) // 校验需要消耗经验卡牌的对象是否存在 + if code != pb.ErrorCode_Success { + return + } + if _expHero.Block { // 锁定的卡不允许被消耗 + code = pb.ErrorCode_HeroIsLock + return + } - _expHero, code = this.module.GetHero(session.GetUserId(), req.ExpCardID) // 校验需要消耗经验卡牌的对象是否存在 - if code != pb.ErrorCode_Success { - return + if v > _expHero.SameCount { // 校验数量 + code = pb.ErrorCode_HeroNoEnough + return + } + // 查询 本次消耗会获得多少经验 + expConf := this.module.configure.GetHeroExp(_expHero.HeroID) + if expConf != nil { + addExp += expConf.Heroexp * v + } + costGold = expConf.Needgold * v // 需要消耗的金币 + if _expHero.SameCount < v { // 消耗经验卡片数量不足 + code = pb.ErrorCode_HeroNoEnough + return + } } - if req.Amount <= 0 { // 消耗数量校验 - code = pb.ErrorCode_HeroNoExist - return - } - if _expHero.Block { // 锁定的卡不允许被消耗 - code = pb.ErrorCode_HeroIsLock + if addExp == 0 { + code = pb.ErrorCode_HeroExpTypeErr return } curLv = _hero.Lv curExp = _hero.Exp // 当前英雄的经验 - addExp = 1000 - // 查询 本次消耗会获得多少经验 - expConf := this.module.configure.GetHeroExp(_expHero.HeroID) - if expConf != nil { - addExp = expConf.Heroexp * req.Amount - } - if _expHero.SameCount < req.Amount { // 消耗经验卡片数量不足 - code = pb.ErrorCode_HeroNoEnough - return - } + // 校验当前能不能升级 if _hero.Lv >= _hero.Star*comm.HeroStarLvRatio { // 达到最大等级 @@ -78,40 +95,6 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren code = pb.ErrorCode_HeroMaxLv return } - curExp += addExp // 先把经验加上 - for { // 死循环判断一键升级 - - if maxLv <= _hero.Lv && curExp >= _data.Heroexp[0].N { // 设置最大经验和等级 - curLv = maxLv - curExp = _data.Heroexp[0].N - break - } - - if _data.Heroexp[0].N > curExp { // 经验不够升级则不能执行升级操作 - break - } else { // 升级操作 - curExp -= _data.Heroexp[0].N - curLv += 1 // 经验够了 那么等级+1 - _data = this.module.configure.GetHeroLv(curLv) - if _data == nil { // 等级加失败了 回到原来的等级 - curLv -= 1 - break - } - for _, v := range _data.Gold { - if _, ok := costRes[v.T]; !ok { - costRes[v.T] = append(costRes[v.T], v) - } else { - for _, v1 := range costRes[v.T] { - if v1.T == v.T && v1.A == v.A { - v1.N += v.N - } - } - } - - } - } - } - } else { code = pb.ErrorCode_HeroNoExist return @@ -121,29 +104,39 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren return } - this.module.Debugf("升级后当前等级: %d,经验: %d,需要消耗的金币: %d,增加的经验: %d", curLv, curExp, costRes["gold"], addExp) - // 执行升级逻辑 - code = this.module.AddCardExp(session.GetUserId(), req.HeroObjID, addExp) // 加经验 + this.module.Debugf("升级后当前等级: %d,经验: %d,需要消耗的金币: %d,增加的经验: %d", curLv, curExp, costGold, addExp) + // 消耗金币 + res := make([]*cfg.Game_atn, 0) + _d := &cfg.Game_atn{ + A: "attr", + T: "gold", + N: costGold, + } + res = append(res, _d) + code = this.module.CheckConsumeRes(session.GetUserId(), res, true) if code != pb.ErrorCode_Success { return } - // 消耗道具 - for _, v := range costRes { - code = this.module.CheckConsumeRes(session.GetUserId(), v, true) - if code != pb.ErrorCode_Success { + + // 执行升级逻辑 + code = this.module.AddCardExp(session.GetUserId(), req.HeroObjID, addExp) // 加经验 + if code != pb.ErrorCode_Success { + // 升级失败资源回退 + code = this.module.DispenseRes(session.GetUserId(), res, true) + return + } + + // 删除经验卡 + for k, v := range req.ExpCards { + err1 := this.module.modelHero.consumeOneHeroCard(session.GetUserId(), k, v) + if err1 != nil { + code = pb.ErrorCode_HeroNoEnough + this.module.Errorf("delete err failed err:%T!", err1) return } } - // 删除经验卡 - err1 := this.module.modelHero.consumeOneHeroCard(session.GetUserId(), req.ExpCardID, req.Amount) - if err1 != nil { - code = pb.ErrorCode_HeroNoEnough - this.module.Errorf("delete err failed err:%T!", err1) - return - } - - err1 = this.module.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化 + err1 := this.module.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化 if err1 != nil { this.module.Errorf("PushHeroProperty err!") } diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go index 609f3ceec..987ac4c88 100644 --- a/modules/items/modelitems.go +++ b/modules/items/modelitems.go @@ -236,7 +236,7 @@ func (this *ModelItemsComp) Pack_AddItemToUserPackByGrid(uId string, gridid stri if num < 0 { err = ItemNotEnoughError } else { - if num > int64(conf.Maxnum) { + if num > int64(conf.UpperLimit) { err = GirdAmountUpper return } else { @@ -281,15 +281,15 @@ func (this *ModelItemsComp) pack_addItemToUserPack(uid string, items []*pb.DB_Us update = append(update, v) break } else if num > 0 && num > int64(v.Amount) { - if num <= int64(conf.Maxnum) { + if num <= int64(conf.UpperLimit) { leftnum = 0 v.Amount = uint32(num) update = append(update, v) break } else { - if v.Amount < uint32(conf.Maxnum) { - leftnum = int64(num - int64(conf.Maxnum)) - v.Amount = uint32(conf.Maxnum) + if v.Amount < uint32(conf.UpperLimit) { + leftnum = int64(num - int64(conf.UpperLimit)) + v.Amount = uint32(conf.UpperLimit) update = append(update, v) } } @@ -306,7 +306,7 @@ func (this *ModelItemsComp) pack_addItemToUserPack(uid string, items []*pb.DB_Us if leftnum > 0 { //还没有放完 寻找空的格子填充 index := int32(len(items)) for leftnum > 0 { //需要补充格子 - if leftnum <= int64(conf.Maxnum) { + if leftnum <= int64(conf.UpperLimit) { grid := &pb.DB_UserItemData{ GridId: primitive.NewObjectID().Hex(), UId: uid, @@ -320,12 +320,12 @@ func (this *ModelItemsComp) pack_addItemToUserPack(uid string, items []*pb.DB_Us leftnum = 0 break } else { - leftnum -= int64(conf.Maxnum) + leftnum -= int64(conf.UpperLimit) grid := &pb.DB_UserItemData{ GridId: primitive.NewObjectID().Hex(), UId: uid, ItemId: itemId, - Amount: uint32(conf.Maxnum), + Amount: uint32(conf.UpperLimit), CTime: time.Now().Unix(), IsNewItem: isNew, } diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 1810a18bd..f55709ac3 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -84,6 +84,10 @@ const ( ErrorCode_HeroMaxAwaken ErrorCode = 1312 // 达到最大觉醒等级 ErrorCode_HeroIsLock ErrorCode = 1313 // 英雄被锁定不能被消耗 ErrorCode_HeroMaxCount ErrorCode = 1314 // 英雄达到最大数量 + ErrorCode_HeroCostTypeErr ErrorCode = 1315 // 消耗英雄参数不匹配 + ErrorCode_HeroStarErr ErrorCode = 1316 // 不满足升星条件 + ErrorCode_HeroTypeErr ErrorCode = 1317 // 升级英雄类型不对 + ErrorCode_HeroExpTypeErr ErrorCode = 1318 // 技能升级卡类型不对 // equipment ErrorCode_EquipmentOnFoundEquipment ErrorCode = 1400 // 未找到武器 ErrorCode_EquipmentLvlimitReached ErrorCode = 1401 // 武器等级已达上限 @@ -160,6 +164,10 @@ var ( 1312: "HeroMaxAwaken", 1313: "HeroIsLock", 1314: "HeroMaxCount", + 1315: "HeroCostTypeErr", + 1316: "HeroStarErr", + 1317: "HeroTypeErr", + 1318: "HeroExpTypeErr", 1400: "EquipmentOnFoundEquipment", 1401: "EquipmentLvlimitReached", 1500: "StoryNotFindChapter", @@ -230,6 +238,10 @@ var ( "HeroMaxAwaken": 1312, "HeroIsLock": 1313, "HeroMaxCount": 1314, + "HeroCostTypeErr": 1315, + "HeroStarErr": 1316, + "HeroTypeErr": 1317, + "HeroExpTypeErr": 1318, "EquipmentOnFoundEquipment": 1400, "EquipmentLvlimitReached": 1401, "StoryNotFindChapter": 1500, @@ -275,7 +287,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0x87, 0x0b, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xd6, 0x0b, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -348,23 +360,28 @@ var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x10, 0xa0, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x10, 0xa1, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x10, 0xa2, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, - 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, - 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, - 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, - 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x74, - 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x12, - 0x0a, 0x0d, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, - 0xdd, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, - 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, - 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, - 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, - 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc6, 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, - 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, - 0xc4, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, - 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc5, 0x0c, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x6e, 0x74, 0x10, 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, + 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a, 0x0b, + 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12, 0x10, + 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5, 0x0a, + 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65, 0x45, + 0x72, 0x72, 0x10, 0xa6, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, + 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, + 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, + 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, + 0x10, 0xf9, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x74, 0x46, + 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x12, 0x0a, + 0x0d, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, + 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, + 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, + 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, + 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, + 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc6, 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, + 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc4, + 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, + 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc5, 0x0c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index d9b47f199..14a53512b 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -262,9 +262,8 @@ type HeroStrengthenUplvReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID - ExpCardID string `protobuf:"bytes,2,opt,name=expCardID,proto3" json:"expCardID"` // 经验卡对象ID - Amount int32 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount"` // 消耗经验卡数量} + HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID + ExpCards map[string]int32 `protobuf:"bytes,2,rep,name=expCards,proto3" json:"expCards" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` } func (x *HeroStrengthenUplvReq) Reset() { @@ -306,18 +305,11 @@ func (x *HeroStrengthenUplvReq) GetHeroObjID() string { return "" } -func (x *HeroStrengthenUplvReq) GetExpCardID() string { +func (x *HeroStrengthenUplvReq) GetExpCards() map[string]int32 { if x != nil { - return x.ExpCardID + return x.ExpCards } - return "" -} - -func (x *HeroStrengthenUplvReq) GetAmount() int32 { - if x != nil { - return x.Amount - } - return 0 + return nil } // 卡牌升级返回 @@ -1389,114 +1381,118 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x6b, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, - 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1c, - 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, - 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x09, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x22, 0x35, 0x0a, 0x16, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, - 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, - 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, - 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x48, 0x0a, 0x0c, 0x43, 0x6f, 0x73, - 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, - 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, - 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x12, 0x16, 0x0a, 0x06, 0x61, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x22, 0x85, 0x01, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, - 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xb4, 0x01, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, + 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x21, 0x0a, - 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, - 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, - 0x12, 0x29, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, - 0x61, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x37, 0x0a, 0x18, 0x48, - 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, - 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, + 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x40, 0x0a, + 0x08, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x24, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, + 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x71, 0x2e, 0x45, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x73, 0x1a, + 0x3b, 0x0a, 0x0d, 0x45, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x35, 0x0a, 0x16, + 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, + 0x6c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, + 0x65, 0x72, 0x6f, 0x22, 0x48, 0x0a, 0x0c, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, + 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, + 0x62, 0x6a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, + 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x85, 0x01, + 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, + 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, + 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, + 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x21, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, + 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x29, 0x0a, 0x08, 0x68, 0x65, + 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, + 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x68, 0x65, 0x72, + 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x37, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, + 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x5a, + 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, + 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, + 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, + 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, + 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, + 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x22, 0x38, 0x0a, 0x19, 0x48, 0x65, + 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, + 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, - 0x68, 0x65, 0x72, 0x6f, 0x22, 0x5a, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, - 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x71, + 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4e, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, + 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, + 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, + 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, + 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x4f, + 0x62, 0x6a, 0x49, 0x44, 0x22, 0x71, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, + 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, + 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, + 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x27, + 0x0a, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x0a, 0x75, 0x70, 0x53, + 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x52, + 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x20, - 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, - 0x22, 0x38, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, - 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, - 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, - 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4e, 0x0a, 0x10, 0x48, 0x65, - 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, - 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, - 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x09, 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x71, 0x0a, 0x11, 0x48, 0x65, - 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, - 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, - 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, - 0x65, 0x72, 0x67, 0x79, 0x12, 0x27, 0x0a, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, - 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, - 0x6f, 0x52, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x22, 0x35, 0x0a, - 0x15, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, - 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, - 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, - 0x62, 0x6a, 0x49, 0x44, 0x22, 0x4d, 0x0a, 0x16, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, - 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, + 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x4d, + 0x0a, 0x16, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, + 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, + 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x71, 0x0a, + 0x19, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, + 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, + 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, + 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, + 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x73, 0x65, + 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, + 0x22, 0x39, 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, + 0x65, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, - 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, - 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, - 0x72, 0x67, 0x79, 0x22, 0x71, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, - 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x71, - 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, - 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, - 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, - 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x39, 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, - 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, - 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, - 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, - 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, - 0x29, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x71, - 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x22, 0x31, 0x0a, 0x0e, 0x48, 0x65, - 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x06, - 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, - 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0x9e, 0x02, - 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, - 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x37, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, - 0x40, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, - 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x25, - 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, - 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, - 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, - 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, - 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x4e, 0x65, 0x77, 0x48, 0x65, 0x72, 0x6f, - 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, - 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, + 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, + 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, + 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, + 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, + 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x29, 0x0a, 0x0d, 0x48, 0x65, 0x72, + 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, + 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, + 0x6f, 0x49, 0x64, 0x73, 0x22, 0x31, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, + 0x6b, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, + 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0x9e, 0x02, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, + 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, + 0x12, 0x37, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x40, 0x0a, 0x0b, 0x61, 0x64, 0x64, + 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, + 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x41, 0x64, + 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, + 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, + 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, + 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, + 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0e, + 0x41, 0x64, 0x64, 0x4e, 0x65, 0x77, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, + 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, + 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1511,7 +1507,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { return file_hero_hero_msg_proto_rawDescData } -var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 28) +var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 29) var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroInfoReq)(nil), // 0: HeroInfoReq (*HeroInfoResp)(nil), // 1: HeroInfoResp @@ -1539,33 +1535,35 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroLockReq)(nil), // 23: HeroLockReq (*HeroLockResp)(nil), // 24: HeroLockResp (*AddNewHeroPush)(nil), // 25: AddNewHeroPush - nil, // 26: HeroProperty.PropertyEntry - nil, // 27: HeroProperty.AddPropertyEntry - (*DBHero)(nil), // 28: DBHero + nil, // 26: HeroStrengthenUplvReq.ExpCardsEntry + nil, // 27: HeroProperty.PropertyEntry + nil, // 28: HeroProperty.AddPropertyEntry + (*DBHero)(nil), // 29: DBHero } var file_hero_hero_msg_proto_depIdxs = []int32{ - 28, // 0: HeroInfoResp.base:type_name -> DBHero - 28, // 1: HeroListResp.list:type_name -> DBHero - 28, // 2: HeroStrengthenUplvResp.hero:type_name -> DBHero - 7, // 3: HeroStrengthenUpStarReq.hero:type_name -> CostCardData - 7, // 4: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData - 28, // 5: HeroStrengthenUpStarResp.hero:type_name -> DBHero - 28, // 6: HeroStrengthenUpSkillResp.hero:type_name -> DBHero - 28, // 7: HeroResonanceResp.hero:type_name -> DBHero - 28, // 8: HeroResonanceResp.upStarCard:type_name -> DBHero - 28, // 9: HeroResonanceResetResp.hero:type_name -> DBHero - 28, // 10: HeroResonanceUseEnergyResp.hero:type_name -> DBHero - 28, // 11: HeroAwakenResp.hero:type_name -> DBHero - 28, // 12: HeroChoukaResp.heroes:type_name -> DBHero - 26, // 13: HeroProperty.property:type_name -> HeroProperty.PropertyEntry - 27, // 14: HeroProperty.addProperty:type_name -> HeroProperty.AddPropertyEntry - 28, // 15: HeroLockResp.hero:type_name -> DBHero - 28, // 16: AddNewHeroPush.hero:type_name -> DBHero - 17, // [17:17] is the sub-list for method output_type - 17, // [17:17] is the sub-list for method input_type - 17, // [17:17] is the sub-list for extension type_name - 17, // [17:17] is the sub-list for extension extendee - 0, // [0:17] is the sub-list for field type_name + 29, // 0: HeroInfoResp.base:type_name -> DBHero + 29, // 1: HeroListResp.list:type_name -> DBHero + 26, // 2: HeroStrengthenUplvReq.expCards:type_name -> HeroStrengthenUplvReq.ExpCardsEntry + 29, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero + 7, // 4: HeroStrengthenUpStarReq.hero:type_name -> CostCardData + 7, // 5: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData + 29, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero + 29, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero + 29, // 8: HeroResonanceResp.hero:type_name -> DBHero + 29, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero + 29, // 10: HeroResonanceResetResp.hero:type_name -> DBHero + 29, // 11: HeroResonanceUseEnergyResp.hero:type_name -> DBHero + 29, // 12: HeroAwakenResp.hero:type_name -> DBHero + 29, // 13: HeroChoukaResp.heroes:type_name -> DBHero + 27, // 14: HeroProperty.property:type_name -> HeroProperty.PropertyEntry + 28, // 15: HeroProperty.addProperty:type_name -> HeroProperty.AddPropertyEntry + 29, // 16: HeroLockResp.hero:type_name -> DBHero + 29, // 17: AddNewHeroPush.hero:type_name -> DBHero + 18, // [18:18] is the sub-list for method output_type + 18, // [18:18] is the sub-list for method input_type + 18, // [18:18] is the sub-list for extension type_name + 18, // [18:18] is the sub-list for extension extendee + 0, // [0:18] is the sub-list for field type_name } func init() { file_hero_hero_msg_proto_init() } @@ -1894,7 +1892,7 @@ func file_hero_hero_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 28, + NumMessages: 29, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/proto/errorcode.proto b/pb/proto/errorcode.proto index a0f0941e2..e9bc637ef 100644 --- a/pb/proto/errorcode.proto +++ b/pb/proto/errorcode.proto @@ -68,6 +68,9 @@ enum ErrorCode { HeroIsLock = 1313; // 英雄被锁定不能被消耗 HeroMaxCount = 1314; // 英雄达到最大数量 HeroCostTypeErr = 1315; // 消耗英雄参数不匹配 + HeroStarErr = 1316; // 不满足升星条件 + HeroTypeErr = 1317; // 升级英雄类型不对 + HeroExpTypeErr = 1318; // 技能升级卡类型不对 // equipment EquipmentOnFoundEquipment = 1400; // 未找到武器 diff --git a/pb/proto/hero/hero_msg.proto b/pb/proto/hero/hero_msg.proto index 431f626ae..a8f9a9961 100644 --- a/pb/proto/hero/hero_msg.proto +++ b/pb/proto/hero/hero_msg.proto @@ -25,8 +25,7 @@ message ItemData { // 卡牌升级 message HeroStrengthenUplvReq { string heroObjID = 1; // 英雄对象ID - string expCardID = 2; // 经验卡对象ID - int32 amount = 3; // 消耗经验卡数量} + map expCards = 2; } // 卡牌升级返回 diff --git a/sys/configure/structs/ALocalizeConfig.go b/sys/configure/structs/ALocalizeConfig.go new file mode 100644 index 000000000..20153ce9e --- /dev/null +++ b/sys/configure/structs/ALocalizeConfig.go @@ -0,0 +1,37 @@ + +//------------------------------------------------------------------------------ +// +// 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 _ALocalizeConfig struct { + Key string +} + + +func New_ALocalizeConfig(_buf map[string]interface{}) (_v interface{}, err error) { + var id string + var _ok_ bool + if id, _ok_ = _buf["__type__"].(string) ; !_ok_ { + return nil, errors.New("type id missing") + } + switch id { + case "LocalizeConfig_CN": return New_LocalizeConfig_CN(_buf); + case "LocalizeConfig_EN": return New_LocalizeConfig_EN(_buf); + case "LocalizeConfig_TW": return New_LocalizeConfig_TW(_buf); + default: return nil, errors.New("unknown type id") + } + return +} + +func New_ALocalizeConfig_Body(_buf map[string]interface{}) (_v *_ALocalizeConfig, err error) { + _v = &_ALocalizeConfig{} + { var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } } + return +} diff --git a/sys/configure/structs/Localize.LocalizeConfig_CNCategory.go b/sys/configure/structs/Localize.LocalizeConfig_CNCategory.go new file mode 100644 index 000000000..47a76a588 --- /dev/null +++ b/sys/configure/structs/Localize.LocalizeConfig_CNCategory.go @@ -0,0 +1,42 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +package cfg + +type Localize_LocalizeConfig_CNCategory struct { + _dataMap map[string]*_LocalizeConfig_CN + _dataList []*_LocalizeConfig_CN +} + +func NewLocalize_LocalizeConfig_CNCategory(_buf []map[string]interface{}) (*Localize_LocalizeConfig_CNCategory, error) { + _dataList := make([]*_LocalizeConfig_CN, 0, len(_buf)) + dataMap := make(map[string]*_LocalizeConfig_CN) + for _, _ele_ := range _buf { + if _v, err2 := New_LocalizeConfig_CN(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &Localize_LocalizeConfig_CNCategory{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Localize_LocalizeConfig_CNCategory) GetDataMap() map[string]*_LocalizeConfig_CN { + return table._dataMap +} + +func (table *Localize_LocalizeConfig_CNCategory) GetDataList() []*_LocalizeConfig_CN { + return table._dataList +} + +func (table *Localize_LocalizeConfig_CNCategory) Get(key string) *_LocalizeConfig_CN { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Localize.LocalizeConfig_ENCategory.go b/sys/configure/structs/Localize.LocalizeConfig_ENCategory.go new file mode 100644 index 000000000..e5e0070f8 --- /dev/null +++ b/sys/configure/structs/Localize.LocalizeConfig_ENCategory.go @@ -0,0 +1,42 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +package cfg + +type Localize_LocalizeConfig_ENCategory struct { + _dataMap map[string]*_LocalizeConfig_EN + _dataList []*_LocalizeConfig_EN +} + +func NewLocalize_LocalizeConfig_ENCategory(_buf []map[string]interface{}) (*Localize_LocalizeConfig_ENCategory, error) { + _dataList := make([]*_LocalizeConfig_EN, 0, len(_buf)) + dataMap := make(map[string]*_LocalizeConfig_EN) + for _, _ele_ := range _buf { + if _v, err2 := New_LocalizeConfig_EN(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &Localize_LocalizeConfig_ENCategory{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Localize_LocalizeConfig_ENCategory) GetDataMap() map[string]*_LocalizeConfig_EN { + return table._dataMap +} + +func (table *Localize_LocalizeConfig_ENCategory) GetDataList() []*_LocalizeConfig_EN { + return table._dataList +} + +func (table *Localize_LocalizeConfig_ENCategory) Get(key string) *_LocalizeConfig_EN { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Localize.LocalizeConfig_TWCategory.go b/sys/configure/structs/Localize.LocalizeConfig_TWCategory.go new file mode 100644 index 000000000..37969713d --- /dev/null +++ b/sys/configure/structs/Localize.LocalizeConfig_TWCategory.go @@ -0,0 +1,42 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +package cfg + +type Localize_LocalizeConfig_TWCategory struct { + _dataMap map[string]*_LocalizeConfig_TW + _dataList []*_LocalizeConfig_TW +} + +func NewLocalize_LocalizeConfig_TWCategory(_buf []map[string]interface{}) (*Localize_LocalizeConfig_TWCategory, error) { + _dataList := make([]*_LocalizeConfig_TW, 0, len(_buf)) + dataMap := make(map[string]*_LocalizeConfig_TW) + for _, _ele_ := range _buf { + if _v, err2 := New_LocalizeConfig_TW(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &Localize_LocalizeConfig_TWCategory{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Localize_LocalizeConfig_TWCategory) GetDataMap() map[string]*_LocalizeConfig_TW { + return table._dataMap +} + +func (table *Localize_LocalizeConfig_TWCategory) GetDataList() []*_LocalizeConfig_TW { + return table._dataList +} + +func (table *Localize_LocalizeConfig_TWCategory) Get(key string) *_LocalizeConfig_TW { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/LocalizeConfig_CN.go b/sys/configure/structs/LocalizeConfig_CN.go new file mode 100644 index 000000000..9e7f934a5 --- /dev/null +++ b/sys/configure/structs/LocalizeConfig_CN.go @@ -0,0 +1,29 @@ + +//------------------------------------------------------------------------------ +// +// 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 _LocalizeConfig_CN struct { + _ALocalizeConfig + TextCn string +} + +func (_LocalizeConfig_CN) GetTypeId() int { + return 2049582687 +} + +func New_LocalizeConfig_CN(_buf map[string]interface{}) (_v *_LocalizeConfig_CN, err error) { + _v = &_LocalizeConfig_CN{} + var _p *_ALocalizeConfig + if _p, err = New_ALocalizeConfig_Body(_buf) ; err != nil { return } + _v._ALocalizeConfig = *_p + { var _ok_ bool; if _v.TextCn, _ok_ = _buf["text_cn"].(string); !_ok_ { err = errors.New("text_cn error"); return } } + return +} diff --git a/sys/configure/structs/LocalizeConfig_EN.go b/sys/configure/structs/LocalizeConfig_EN.go new file mode 100644 index 000000000..bc6a81130 --- /dev/null +++ b/sys/configure/structs/LocalizeConfig_EN.go @@ -0,0 +1,29 @@ + +//------------------------------------------------------------------------------ +// +// 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 _LocalizeConfig_EN struct { + _ALocalizeConfig + TextEn string +} + +func (_LocalizeConfig_EN) GetTypeId() int { + return 2049582749 +} + +func New_LocalizeConfig_EN(_buf map[string]interface{}) (_v *_LocalizeConfig_EN, err error) { + _v = &_LocalizeConfig_EN{} + var _p *_ALocalizeConfig + if _p, err = New_ALocalizeConfig_Body(_buf) ; err != nil { return } + _v._ALocalizeConfig = *_p + { var _ok_ bool; if _v.TextEn, _ok_ = _buf["text_en"].(string); !_ok_ { err = errors.New("text_en error"); return } } + return +} diff --git a/sys/configure/structs/LocalizeConfig_TW.go b/sys/configure/structs/LocalizeConfig_TW.go new file mode 100644 index 000000000..a35dec4c8 --- /dev/null +++ b/sys/configure/structs/LocalizeConfig_TW.go @@ -0,0 +1,29 @@ + +//------------------------------------------------------------------------------ +// +// 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 _LocalizeConfig_TW struct { + _ALocalizeConfig + TextTw string +} + +func (_LocalizeConfig_TW) GetTypeId() int { + return 2049583223 +} + +func New_LocalizeConfig_TW(_buf map[string]interface{}) (_v *_LocalizeConfig_TW, err error) { + _v = &_LocalizeConfig_TW{} + var _p *_ALocalizeConfig + if _p, err = New_ALocalizeConfig_Body(_buf) ; err != nil { return } + _v._ALocalizeConfig = *_p + { var _ok_ bool; if _v.TextTw, _ok_ = _buf["text_tw"].(string); !_ok_ { err = errors.New("text_tw error"); return } } + return +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index d689c13ab..afcb84891 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -12,12 +12,14 @@ package cfg type JsonLoader func(string) ([]map[string]interface{}, error) type Tables struct { + LocalizeConfig_CNCategory *Localize_LocalizeConfig_CNCategory + LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory + LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory global *Game_global hero *Game_hero ui *Game_ui skill *Game_skill plot *Game_plot - language *Game_language extservers *Game_extservers skillAtk *Game_skillAtk skillAfteratk *Game_skillAfteratk @@ -47,6 +49,9 @@ type Tables struct { storyHard *Game_storyHard storyPurgatory *Game_storyPurgatory serverList *Game_serverList + com *Game_com + newSkill *Game_newSkill + model *Game_model } func NewTables(loader JsonLoader) (*Tables, error) { @@ -54,6 +59,24 @@ func NewTables(loader JsonLoader) (*Tables, error) { var buf []map[string]interface{} tables := &Tables{} + if buf, err = loader("LocalizeConfig_CN") ; err != nil { + return nil, err + } + if tables.LocalizeConfig_CNCategory, err = NewLocalize_LocalizeConfig_CNCategory(buf) ; err != nil { + return nil, err + } + if buf, err = loader("LocalizeConfig_EN") ; err != nil { + return nil, err + } + if tables.LocalizeConfig_ENCategory, err = NewLocalize_LocalizeConfig_ENCategory(buf) ; err != nil { + return nil, err + } + if buf, err = loader("LocalizeConfig_TW") ; err != nil { + return nil, err + } + if tables.LocalizeConfig_TWCategory, err = NewLocalize_LocalizeConfig_TWCategory(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_global") ; err != nil { return nil, err } @@ -84,12 +107,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.plot, err = NewGame_plot(buf) ; err != nil { return nil, err } - if buf, err = loader("game_language") ; err != nil { - return nil, err - } - if tables.language, err = NewGame_language(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_extservers") ; err != nil { return nil, err } @@ -264,5 +281,23 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.serverList, err = NewGame_serverList(buf) ; err != nil { return nil, err } + if buf, err = loader("game_com") ; err != nil { + return nil, err + } + if tables.com, err = NewGame_com(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_newskill") ; err != nil { + return nil, err + } + if tables.newSkill, err = NewGame_newSkill(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_model") ; err != nil { + return nil, err + } + if tables.model, err = NewGame_model(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.com.go b/sys/configure/structs/game.com.go index 797fd9d22..e35c8ba0d 100644 --- a/sys/configure/structs/game.com.go +++ b/sys/configure/structs/game.com.go @@ -9,15 +9,15 @@ package cfg type Game_com struct { - _dataMap map[string]*Game_gameComData - _dataList []*Game_gameComData + _dataMap map[string]*Game_comData + _dataList []*Game_comData } func NewGame_com(_buf []map[string]interface{}) (*Game_com, error) { - _dataList := make([]*Game_gameComData, 0, len(_buf)) - dataMap := make(map[string]*Game_gameComData) + _dataList := make([]*Game_comData, 0, len(_buf)) + dataMap := make(map[string]*Game_comData) for _, _ele_ := range _buf { - if _v, err2 := NewGame_gameComData(_ele_); err2 != nil { + if _v, err2 := NewGame_comData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) @@ -27,15 +27,15 @@ func NewGame_com(_buf []map[string]interface{}) (*Game_com, error) { return &Game_com{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Game_com) GetDataMap() map[string]*Game_gameComData { +func (table *Game_com) GetDataMap() map[string]*Game_comData { return table._dataMap } -func (table *Game_com) GetDataList() []*Game_gameComData { +func (table *Game_com) GetDataList() []*Game_comData { return table._dataList } -func (table *Game_com) Get(key string) *Game_gameComData { +func (table *Game_com) Get(key string) *Game_comData { return table._dataMap[key] } diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go index f7a770308..da32b6712 100644 --- a/sys/configure/structs/game.heroData.go +++ b/sys/configure/structs/game.heroData.go @@ -42,7 +42,7 @@ func (Game_heroData) GetTypeId() int { func NewGame_heroData(_buf map[string]interface{}) (_v *Game_heroData, err error) { _v = &Game_heroData{} { 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; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) } diff --git a/sys/configure/structs/game.heroExpData.go b/sys/configure/structs/game.heroExpData.go index a48bbdeb4..ad3e8b752 100644 --- a/sys/configure/structs/game.heroExpData.go +++ b/sys/configure/structs/game.heroExpData.go @@ -17,6 +17,7 @@ type Game_heroExpData struct { Color int32 Heroexp int32 Skilllevelup int32 + Needgold int32 } func (Game_heroExpData) GetTypeId() int { @@ -31,5 +32,6 @@ func NewGame_heroExpData(_buf map[string]interface{}) (_v *Game_heroExpData, err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skilllevelup"].(float64); !_ok_ { err = errors.New("skilllevelup error"); return }; _v.Skilllevelup = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needgold"].(float64); !_ok_ { err = errors.New("needgold error"); return }; _v.Needgold = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.heroLevelupData.go b/sys/configure/structs/game.heroLevelupData.go index bb6c7eb65..7199065a2 100644 --- a/sys/configure/structs/game.heroLevelupData.go +++ b/sys/configure/structs/game.heroLevelupData.go @@ -13,7 +13,6 @@ import "errors" type Game_heroLevelupData struct { Level int32 Heroexp []*Game_atn - Gold []*Game_atn Hp float32 Atk float32 Def float32 @@ -40,20 +39,6 @@ func NewGame_heroLevelupData(_buf map[string]interface{}) (_v *Game_heroLevelupD } } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["gold"].([]interface{}); !_ok_ { err = errors.New("gold error"); return } - - _v.Gold = make([]*Game_atn, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ *Game_atn - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } } - _v.Gold = append(_v.Gold, _list_v_) - } - } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["def"].(float64); !_ok_ { err = errors.New("def error"); return }; _v.Def = float32(_tempNum_) } diff --git a/sys/configure/structs/game.heroStargrowData.go b/sys/configure/structs/game.heroStargrowData.go index e76aa6b09..e1cf7a0af 100644 --- a/sys/configure/structs/game.heroStargrowData.go +++ b/sys/configure/structs/game.heroStargrowData.go @@ -13,6 +13,7 @@ import "errors" type Game_heroStargrowData struct { Star int32 Level int32 + Maxlevel int32 StarupHp float32 StarupAtk float32 StarupDef float32 @@ -27,6 +28,7 @@ func NewGame_heroStargrowData(_buf map[string]interface{}) (_v *Game_heroStargro _v = &Game_heroStargrowData{} { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxlevel"].(float64); !_ok_ { err = errors.New("maxlevel error"); return }; _v.Maxlevel = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_hp"].(float64); !_ok_ { err = errors.New("starup_hp error"); return }; _v.StarupHp = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_atk"].(float64); !_ok_ { err = errors.New("starup_atk error"); return }; _v.StarupAtk = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_def"].(float64); !_ok_ { err = errors.New("starup_def error"); return }; _v.StarupDef = float32(_tempNum_) } diff --git a/sys/configure/structs/game.heroStarupData.go b/sys/configure/structs/game.heroStarupData.go index 4d3ee0549..c007dba6c 100644 --- a/sys/configure/structs/game.heroStarupData.go +++ b/sys/configure/structs/game.heroStarupData.go @@ -14,7 +14,6 @@ type Game_heroStarupData struct { Key int32 Id int32 Star int32 - Maxlevel int32 Needhero int32 Needherostar int32 Needheronum int32 @@ -33,7 +32,6 @@ func NewGame_heroStarupData(_buf map[string]interface{}) (_v *Game_heroStarupDat { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { 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["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxlevel"].(float64); !_ok_ { err = errors.New("maxlevel error"); return }; _v.Maxlevel = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needhero"].(float64); !_ok_ { err = errors.New("needhero error"); return }; _v.Needhero = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needherostar"].(float64); !_ok_ { err = errors.New("needherostar error"); return }; _v.Needherostar = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needheronum"].(float64); !_ok_ { err = errors.New("needheronum error"); return }; _v.Needheronum = int32(_tempNum_) } diff --git a/sys/configure/structs/game.item.go b/sys/configure/structs/game.item.go index 98a567268..79a6cda49 100644 --- a/sys/configure/structs/game.item.go +++ b/sys/configure/structs/game.item.go @@ -21,7 +21,7 @@ func NewGame_item(_buf []map[string]interface{}) (*Game_item, error) { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Itemid] = _v + dataMap[_v.Id] = _v } } return &Game_item{_dataList:_dataList, _dataMap:dataMap}, nil diff --git a/sys/configure/structs/game.itemData.go b/sys/configure/structs/game.itemData.go index af691d78b..2bca5db65 100644 --- a/sys/configure/structs/game.itemData.go +++ b/sys/configure/structs/game.itemData.go @@ -11,27 +11,29 @@ package cfg import "errors" type Game_itemData struct { - Itemid int32 + Id int32 Name string Usetype int32 Color int32 - Race int32 - Bagtype bool + Bagtype int32 Index int32 - Texiao string - Dlp int32 - Composenum int32 - Htype int32 - Tujing int32 - Usetz int32 - Maxnum int32 + SpecialType int32 + Effects string + Drop int32 + SynthetizeNum int32 + Access int32 + UseSkip int32 + UpperLimit int32 Uselv int32 - Ismutil int32 - Type int32 + Isani int32 + Star int32 + Race int32 + SynthetizeHero int32 Img string Ico string Intr string - Sale string + Sale []*Game_atn + Boxhero []*Game_atn } func (Game_itemData) GetTypeId() int { @@ -40,26 +42,54 @@ func (Game_itemData) GetTypeId() int { func NewGame_itemData(_buf map[string]interface{}) (_v *Game_itemData, err error) { _v = &Game_itemData{} - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["itemid"].(float64); !_ok_ { err = errors.New("itemid error"); return }; _v.Itemid = int32(_tempNum_) } + { 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; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["usetype"].(float64); !_ok_ { err = errors.New("usetype error"); return }; _v.Usetype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) } - { var _ok_ bool; if _v.Bagtype, _ok_ = _buf["bagtype"].(bool); !_ok_ { err = errors.New("bagtype error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bagtype"].(float64); !_ok_ { err = errors.New("bagtype error"); return }; _v.Bagtype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) } - { var _ok_ bool; if _v.Texiao, _ok_ = _buf["texiao"].(string); !_ok_ { err = errors.New("texiao error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dlp"].(float64); !_ok_ { err = errors.New("dlp error"); return }; _v.Dlp = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["composenum"].(float64); !_ok_ { err = errors.New("composenum error"); return }; _v.Composenum = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["htype"].(float64); !_ok_ { err = errors.New("htype error"); return }; _v.Htype = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tujing"].(float64); !_ok_ { err = errors.New("tujing error"); return }; _v.Tujing = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["usetz"].(float64); !_ok_ { err = errors.New("usetz error"); return }; _v.Usetz = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxnum"].(float64); !_ok_ { err = errors.New("maxnum error"); return }; _v.Maxnum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["special_type"].(float64); !_ok_ { err = errors.New("special_type error"); return }; _v.SpecialType = int32(_tempNum_) } + { var _ok_ bool; if _v.Effects, _ok_ = _buf["effects"].(string); !_ok_ { err = errors.New("effects error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["synthetize_num"].(float64); !_ok_ { err = errors.New("synthetize_num error"); return }; _v.SynthetizeNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["access"].(float64); !_ok_ { err = errors.New("access error"); return }; _v.Access = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["use_skip"].(float64); !_ok_ { err = errors.New("use_skip error"); return }; _v.UseSkip = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["upper_limit"].(float64); !_ok_ { err = errors.New("upper_limit error"); return }; _v.UpperLimit = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["uselv"].(float64); !_ok_ { err = errors.New("uselv error"); return }; _v.Uselv = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ismutil"].(float64); !_ok_ { err = errors.New("ismutil error"); return }; _v.Ismutil = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["isani"].(float64); !_ok_ { err = errors.New("isani error"); return }; _v.Isani = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["synthetize_hero"].(float64); !_ok_ { err = errors.New("synthetize_hero error"); return }; _v.SynthetizeHero = int32(_tempNum_) } { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } { var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } } - { var _ok_ bool; if _v.Sale, _ok_ = _buf["sale"].(string); !_ok_ { err = errors.New("sale error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["sale"].([]interface{}); !_ok_ { err = errors.New("sale error"); return } + + _v.Sale = make([]*Game_atn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Game_atn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } } + _v.Sale = append(_v.Sale, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["boxhero"].([]interface{}); !_ok_ { err = errors.New("boxhero error"); return } + + _v.Boxhero = make([]*Game_atn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Game_atn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } } + _v.Boxhero = append(_v.Boxhero, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.model.go b/sys/configure/structs/game.model.go new file mode 100644 index 000000000..6cdf57516 --- /dev/null +++ b/sys/configure/structs/game.model.go @@ -0,0 +1,42 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +package cfg + +type Game_model struct { + _dataMap map[int32]*Game_modelData + _dataList []*Game_modelData +} + +func NewGame_model(_buf []map[string]interface{}) (*Game_model, error) { + _dataList := make([]*Game_modelData, 0, len(_buf)) + dataMap := make(map[int32]*Game_modelData) + for _, _ele_ := range _buf { + if _v, err2 := NewGame_modelData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &Game_model{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Game_model) GetDataMap() map[int32]*Game_modelData { + return table._dataMap +} + +func (table *Game_model) GetDataList() []*Game_modelData { + return table._dataList +} + +func (table *Game_model) Get(key int32) *Game_modelData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.modelData.go b/sys/configure/structs/game.modelData.go new file mode 100644 index 000000000..b5beb177b --- /dev/null +++ b/sys/configure/structs/game.modelData.go @@ -0,0 +1,35 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +package cfg + +import "errors" + +type Game_modelData struct { + Id int32 + Preson string + Ico string + Img string + Heroimg string + Portrait string +} + +func (Game_modelData) GetTypeId() int { + return -1307411593 +} + +func NewGame_modelData(_buf map[string]interface{}) (_v *Game_modelData, err error) { + _v = &Game_modelData{} + { 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; if _v.Preson, _ok_ = _buf["preson"].(string); !_ok_ { err = errors.New("preson error"); return } } + { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } + { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } + { var _ok_ bool; if _v.Heroimg, _ok_ = _buf["heroimg"].(string); !_ok_ { err = errors.New("heroimg error"); return } } + { var _ok_ bool; if _v.Portrait, _ok_ = _buf["portrait"].(string); !_ok_ { err = errors.New("portrait error"); return } } + return +} diff --git a/sys/configure/structs/game.newHeroData.go b/sys/configure/structs/game.newHeroData.go index c69185f07..507d6cb27 100644 --- a/sys/configure/structs/game.newHeroData.go +++ b/sys/configure/structs/game.newHeroData.go @@ -21,7 +21,7 @@ type Game_newHeroData struct { Type int32 Prefab string Icon int32 - Sound int32 + Sound string Tujing []int32 Intr string Events string @@ -41,7 +41,7 @@ func (Game_newHeroData) GetTypeId() int { func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err error) { _v = &Game_newHeroData{} { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hid"].(float64); !_ok_ { err = errors.New("hid error"); return }; _v.Hid = int32(_tempNum_) } - { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) } @@ -49,7 +49,7 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; if _v.Prefab, _ok_ = _buf["prefab"].(string); !_ok_ { err = errors.New("prefab error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icon"].(float64); !_ok_ { err = errors.New("icon error"); return }; _v.Icon = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sound"].(float64); !_ok_ { err = errors.New("sound error"); return }; _v.Sound = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["sound"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Sound error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Sound, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _arr_ []interface{} var _ok_ bool @@ -64,7 +64,7 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err } } - { var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Events, _ok_ = _buf["events"].(string); !_ok_ { err = errors.New("events error"); return } } { var _ok_ bool; if _v.Cite, _ok_ = _buf["cite"].(string); !_ok_ { err = errors.New("cite error"); return } } { diff --git a/sys/configure/structs/game.newSkill.go b/sys/configure/structs/game.newSkill.go new file mode 100644 index 000000000..af6d3dbd7 --- /dev/null +++ b/sys/configure/structs/game.newSkill.go @@ -0,0 +1,42 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +package cfg + +type Game_newSkill struct { + _dataMap map[int32]*Game_newSkillData + _dataList []*Game_newSkillData +} + +func NewGame_newSkill(_buf []map[string]interface{}) (*Game_newSkill, error) { + _dataList := make([]*Game_newSkillData, 0, len(_buf)) + dataMap := make(map[int32]*Game_newSkillData) + for _, _ele_ := range _buf { + if _v, err2 := NewGame_newSkillData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &Game_newSkill{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Game_newSkill) GetDataMap() map[int32]*Game_newSkillData { + return table._dataMap +} + +func (table *Game_newSkill) GetDataList() []*Game_newSkillData { + return table._dataList +} + +func (table *Game_newSkill) Get(key int32) *Game_newSkillData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.newSkillData.go b/sys/configure/structs/game.newSkillData.go new file mode 100644 index 000000000..1f47a4f01 --- /dev/null +++ b/sys/configure/structs/game.newSkillData.go @@ -0,0 +1,80 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +package cfg + +import "errors" + +type Game_newSkillData struct { + Id int32 + Name string + Ico string + Type int32 + MaxLV int32 + CD []int32 + Target int32 + ChildSkill []*Game_ChildSkills + Desc []string +} + +func (Game_newSkillData) GetTypeId() int { + return -1344126889 +} + +func NewGame_newSkillData(_buf map[string]interface{}) (_v *Game_newSkillData, err error) { + _v = &Game_newSkillData{} + { 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; if _v.Name, _ok_ = _buf["Name"].(string); !_ok_ { err = errors.New("Name error"); return } } + { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxLV"].(float64); !_ok_ { err = errors.New("MaxLV error"); return }; _v.MaxLV = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["CD"].([]interface{}); !_ok_ { err = errors.New("CD error"); return } + + _v.CD = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.CD = append(_v.CD, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Target"].(float64); !_ok_ { err = errors.New("Target error"); return }; _v.Target = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["ChildSkill"].([]interface{}); !_ok_ { err = errors.New("ChildSkill error"); return } + + _v.ChildSkill = make([]*Game_ChildSkills, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Game_ChildSkills + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_ChildSkills(_x_); err != nil { return } } + _v.ChildSkill = append(_v.ChildSkill, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["Desc"].([]interface{}); !_ok_ { err = errors.New("Desc error"); return } + + _v.Desc = 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.Desc = append(_v.Desc, _list_v_) + } + } + + return +} diff --git a/sys/configure/structs/game.skillAfteratkData.go b/sys/configure/structs/game.skillAfteratkData.go index 3d87fe99c..1fb48a675 100644 --- a/sys/configure/structs/game.skillAfteratkData.go +++ b/sys/configure/structs/game.skillAfteratkData.go @@ -22,9 +22,12 @@ type Game_skillAfteratkData struct { Argu string AddEffect bool FollowSK []int32 + SucFollowSK []string FailFollowSK []string MustHit bool Tags []string + RelyTags []string + NoRelyTags []string } func (Game_skillAfteratkData) GetTypeId() int { @@ -83,6 +86,20 @@ func NewGame_skillAfteratkData(_buf map[string]interface{}) (_v *Game_skillAfter } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["SucFollowSK"].([]interface{}); !_ok_ { err = errors.New("SucFollowSK error"); return } + + _v.SucFollowSK = 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.SucFollowSK = append(_v.SucFollowSK, _list_v_) + } + } + { var _arr_ []interface{} var _ok_ bool @@ -112,5 +129,33 @@ func NewGame_skillAfteratkData(_buf map[string]interface{}) (_v *Game_skillAfter } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["RelyTags"].([]interface{}); !_ok_ { err = errors.New("RelyTags error"); return } + + _v.RelyTags = 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.RelyTags = append(_v.RelyTags, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["NoRelyTags"].([]interface{}); !_ok_ { err = errors.New("NoRelyTags error"); return } + + _v.NoRelyTags = 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.NoRelyTags = append(_v.NoRelyTags, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.skillAtkData.go b/sys/configure/structs/game.skillAtkData.go index f66600142..97fa4e7b3 100644 --- a/sys/configure/structs/game.skillAtkData.go +++ b/sys/configure/structs/game.skillAtkData.go @@ -13,12 +13,13 @@ import "errors" type Game_skillAtkData struct { Id int32 Name string + Ico string Type int32 - Desc string MaxLV int32 CD []int32 Target int32 ChildSkill []*Game_ChildSkills + Desc []string } func (Game_skillAtkData) GetTypeId() int { @@ -29,8 +30,8 @@ func NewGame_skillAtkData(_buf map[string]interface{}) (_v *Game_skillAtkData, e _v = &Game_skillAtkData{} { 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; if _v.Name, _ok_ = _buf["Name"].(string); !_ok_ { err = errors.New("Name error"); return } } + { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) } - { var _ok_ bool; if _v.Desc, _ok_ = _buf["Desc"].(string); !_ok_ { err = errors.New("Desc error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxLV"].(float64); !_ok_ { err = errors.New("MaxLV error"); return }; _v.MaxLV = int32(_tempNum_) } { var _arr_ []interface{} @@ -61,5 +62,19 @@ func NewGame_skillAtkData(_buf map[string]interface{}) (_v *Game_skillAtkData, e } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["Desc"].([]interface{}); !_ok_ { err = errors.New("Desc error"); return } + + _v.Desc = 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.Desc = append(_v.Desc, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.skillBuffData.go b/sys/configure/structs/game.skillBuffData.go index f88448576..7ba8c86e8 100644 --- a/sys/configure/structs/game.skillBuffData.go +++ b/sys/configure/structs/game.skillBuffData.go @@ -18,6 +18,8 @@ type Game_skillBuffData struct { Tags []string OverlayTimes byte SameID bool + RelyTags []string + NoRelyTags []string } func (Game_skillBuffData) GetTypeId() int { @@ -46,5 +48,33 @@ func NewGame_skillBuffData(_buf map[string]interface{}) (_v *Game_skillBuffData, { 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 _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["RelyTags"].([]interface{}); !_ok_ { err = errors.New("RelyTags error"); return } + + _v.RelyTags = 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.RelyTags = append(_v.RelyTags, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["NoRelyTags"].([]interface{}); !_ok_ { err = errors.New("NoRelyTags error"); return } + + _v.NoRelyTags = 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.NoRelyTags = append(_v.NoRelyTags, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.skillPassiveData.go b/sys/configure/structs/game.skillPassiveData.go index 08eefa13e..e6ce3b814 100644 --- a/sys/configure/structs/game.skillPassiveData.go +++ b/sys/configure/structs/game.skillPassiveData.go @@ -14,10 +14,15 @@ type Game_skillPassiveData struct { Id int32 Desc string When string + Where string + AddCon []string Type string - Argu []string MaxEmitTimes int32 + OverlayTimes byte + SameID bool Tags []string + RelyTags []string + NoRelyTags []string } func (Game_skillPassiveData) GetTypeId() int { @@ -29,22 +34,25 @@ func NewGame_skillPassiveData(_buf map[string]interface{}) (_v *Game_skillPassiv { 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; if _v.Desc, _ok_ = _buf["Desc"].(string); !_ok_ { err = errors.New("Desc error"); return } } { var _ok_ bool; if _v.When, _ok_ = _buf["When"].(string); !_ok_ { err = errors.New("When error"); return } } - { var _ok_ bool; if _v.Type, _ok_ = _buf["Type"].(string); !_ok_ { err = errors.New("Type error"); return } } + { var _ok_ bool; if _v.Where, _ok_ = _buf["Where"].(string); !_ok_ { err = errors.New("Where error"); return } } { var _arr_ []interface{} var _ok_ bool - if _arr_, _ok_ = _buf["Argu"].([]interface{}); !_ok_ { err = errors.New("Argu error"); return } + if _arr_, _ok_ = _buf["AddCon"].([]interface{}); !_ok_ { err = errors.New("AddCon error"); return } - _v.Argu = make([]string, 0, len(_arr_)) + _v.AddCon = 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.Argu = append(_v.Argu, _list_v_) + _v.AddCon = append(_v.AddCon, _list_v_) } } + { var _ok_ bool; if _v.Type, _ok_ = _buf["Type"].(string); !_ok_ { err = errors.New("Type error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxEmitTimes"].(float64); !_ok_ { err = errors.New("MaxEmitTimes error"); return }; _v.MaxEmitTimes = 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 _arr_ []interface{} var _ok_ bool @@ -59,5 +67,33 @@ func NewGame_skillPassiveData(_buf map[string]interface{}) (_v *Game_skillPassiv } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["RelyTags"].([]interface{}); !_ok_ { err = errors.New("RelyTags error"); return } + + _v.RelyTags = 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.RelyTags = append(_v.RelyTags, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["NoRelyTags"].([]interface{}); !_ok_ { err = errors.New("NoRelyTags error"); return } + + _v.NoRelyTags = 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.NoRelyTags = append(_v.NoRelyTags, _list_v_) + } + } + return }