From 9a8af78c3ffd81569adff87579f8ac047a295233 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 16 Jan 2024 09:42:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_annulartaskall.json | 4 + bin/json/game_catchbugstage.json | 16 +- bin/json/game_consumehero.json | 6 +- bin/json/game_drawpool.json | 34 +- bin/json/game_drawreplace.json | 24 +- bin/json/game_hero.json | 4 +- bin/json/game_item.json | 205 ++ bin/json/game_lattice.json | 12 + bin/json/game_lottery.json | 120 + bin/json/game_opencond.json | 704 ----- bin/json/game_rdtasknpc.json | 72 +- bin/json/game_searchitemall.json | 36 +- bin/json/game_searchitembox.json | 10 +- bin/json/game_skillafteratk.json | 36 +- bin/json/game_skillatk.json | 8 +- bin/json/game_skillpassive.json | 2568 ++++++++++++++++- modules/pagoda/comp_configure.go | 44 - sys/configure/structs/Game.LatticeData.go | 2 + sys/configure/structs/game.opencondData.go | 15 - .../structs/game.skillPassiveData.go | 4 + 20 files changed, 3030 insertions(+), 894 deletions(-) diff --git a/bin/json/game_annulartaskall.json b/bin/json/game_annulartaskall.json index d2a498791..7ef42231e 100644 --- a/bin/json/game_annulartaskall.json +++ b/bin/json/game_annulartaskall.json @@ -2,6 +2,7 @@ { "taskgroup": 10010, "taskdetail": [ + 60000010, 60000070, 60000080, 60000090, @@ -46,6 +47,7 @@ { "taskgroup": 10020, "taskdetail": [ + 60000010, 60000070, 60000080, 60000090, @@ -90,6 +92,7 @@ { "taskgroup": 10030, "taskdetail": [ + 60000010, 60000070, 60000080, 60000090, @@ -134,6 +137,7 @@ { "taskgroup": 10040, "taskdetail": [ + 60000010, 60000070, 60000080, 60000090, diff --git a/bin/json/game_catchbugstage.json b/bin/json/game_catchbugstage.json index 27bbc79f9..0ead39591 100644 --- a/bin/json/game_catchbugstage.json +++ b/bin/json/game_catchbugstage.json @@ -9,9 +9,9 @@ "skill": [], "skilltime": [], "deducttime": [ - 1, - 2, - 3 + 0, + 0, + 0 ], "rewardtime": [ 0, @@ -35,7 +35,7 @@ "k": 4, "v": 4 }, - "stagetime": 180, + "stagetime": 120, "skill": [], "skilltime": [], "deducttime": [ @@ -71,7 +71,7 @@ "k": 4, "v": 4 }, - "stagetime": 180, + "stagetime": 120, "skill": [ 1 ], @@ -111,7 +111,7 @@ "k": 4, "v": 4 }, - "stagetime": 180, + "stagetime": 120, "skill": [ 2 ], @@ -151,7 +151,7 @@ "k": 4, "v": 4 }, - "stagetime": 180, + "stagetime": 120, "skill": [ 3 ], @@ -191,7 +191,7 @@ "k": 4, "v": 4 }, - "stagetime": 180, + "stagetime": 120, "skill": [ 4 ], diff --git a/bin/json/game_consumehero.json b/bin/json/game_consumehero.json index 25ca250ad..ab7871910 100644 --- a/bin/json/game_consumehero.json +++ b/bin/json/game_consumehero.json @@ -469,7 +469,7 @@ }, "skilltxt": { "key": "consume_consume_hero_skilltxt_08", - "text": "随机选择2中颜色，然后消除盘面上所有对应颜色的方块" + "text": "随机选择2种颜色，然后消除盘面上所有对应颜色的方块" }, "failtxt": { "key": "consume_consume_hero_failtxt_08", @@ -725,7 +725,7 @@ }, "intr": { "key": "consume_consume_hero_intr_12", - "text": "盖的毒苹果酒吧桌游卡" + "text": "盖的毒苹果酒吧桌游卡。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。
" }, "skillname": { "key": "consume_consume_hero_skillname_12", @@ -733,7 +733,7 @@ }, "skilltxt": { "key": "consume_consume_hero_skilltxt_12", - "text": "随机将盘面内8个方块变为“烟火”，并从消除通过该技能生成的4个烟火。" + "text": "随机将盘面内8个方块变为“烟火”，并从消除通过该技能生成的其中4个烟火。" }, "failtxt": { "key": "consume_consume_hero_failtxt_12", diff --git a/bin/json/game_drawpool.json b/bin/json/game_drawpool.json index 66c034a56..d2be19ee3 100644 --- a/bin/json/game_drawpool.json +++ b/bin/json/game_drawpool.json @@ -32,8 +32,8 @@ }, "weightreadonly": [ "2%", - "20%", - "78%" + "14%", + "84%" ], "upweight": 0 }, @@ -93,12 +93,12 @@ ], "baodihelp": { "key": "drawcard_drawpool_baodihelp_2", - "text": "1.常驻卡池，每次抽取将消耗圣桃枝
2.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
3.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率
4.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]
5.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]
6.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]
7.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌" + "text": "
1.常驻卡池，每次抽取将消耗圣桃枝。
2.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
3.卡池中SSR概率为2%。SR概率为14%，R的概率为84%，第[color=#37d8a9]70抽[/color]必为SSR卡牌" }, "weightreadonly": [ "2%", - "20%", - "78%" + "14%", + "84%" ], "upweight": 0 }, @@ -149,12 +149,12 @@ ], "baodihelp": { "key": "drawcard_drawpool_baodihelp_3", - "text": "1.在阵营召唤中，将召唤指定阵营的英雄
2.每次召唤将消耗对应阵营的圣桃枝
3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
4.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率
5.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]
6.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]
7.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]
8.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌
9.所有阵营的召唤保底次数[color=#37d8a9]共享" + "text": "1.在阵营召唤中，将召唤指定阵营的英雄
2.每次召唤将消耗对应阵营的圣桃枝
3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
4.卡池中SSR概率为2%。SR概率为14%，R的概率为84%，第[color=#37d8a9]70抽[/color]必为SSR卡牌
5.所有阵营的召唤保底次数[color=#37d8a9]共享" }, "weightreadonly": [ "2%", - "20%", - "78%" + "14%", + "84%" ], "upweight": 0 }, @@ -205,12 +205,12 @@ ], "baodihelp": { "key": "drawcard_drawpool_baodihelp_4", - "text": "1.在阵营召唤中，将召唤指定阵营的英雄
2.每次召唤将消耗对应阵营的圣桃枝
3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
4.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率
5.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]
6.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]
7.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]
8.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌
9.所有阵营的召唤保底次数[color=#37d8a9]共享" + "text": "1.在阵营召唤中，将召唤指定阵营的英雄
2.每次召唤将消耗对应阵营的圣桃枝
3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
4.卡池中SSR概率为2%。SR概率为14%，R的概率为84%，第[color=#37d8a9]70抽[/color]必为SSR卡牌
5.所有阵营的召唤保底次数[color=#37d8a9]共享" }, "weightreadonly": [ "2%", - "20%", - "78%" + "14%", + "84%" ], "upweight": 0 }, @@ -261,12 +261,12 @@ ], "baodihelp": { "key": "drawcard_drawpool_baodihelp_5", - "text": "1.在阵营召唤中，将召唤指定阵营的英雄
2.每次召唤将消耗对应阵营的圣桃枝
3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
4.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率
5.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]
6.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]
7.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]
8.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌
9.所有阵营的召唤保底次数[color=#37d8a9]共享" + "text": "1.在阵营召唤中，将召唤指定阵营的英雄
2.每次召唤将消耗对应阵营的圣桃枝
3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
4.卡池中SSR概率为2%。SR概率为14%，R的概率为84%，第[color=#37d8a9]70抽[/color]必为SSR卡牌
5.所有阵营的召唤保底次数[color=#37d8a9]共享" }, "weightreadonly": [ "2%", - "20%", - "78%" + "14%", + "84%" ], "upweight": 0 }, @@ -305,12 +305,12 @@ "consumeB10": [], "baodihelp": { "key": "drawcard_drawpool_baodihelp_7", - "text": "1.召唤中，获取SSR卡时有[color=#37d8a9]50%[/color]概率可获得本次卡池概率提升的SSR卡
2.可以在列表中，选择心仪的守护者作为本期的概率提升SSR
3.每次召唤到的SSR角色不是保底SSR角色时，下次召唤到的SSR角色必为该保底SSR角色
4.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
5.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率
6.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]
7.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]
8.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]
9.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌
10.中途更换选定英雄，仍将[color=#37d8a9]保留[/color]保底次数
11.限定卡池结束后，召唤保底次数将[color=#37d8a9]保留[/color]至下个限定卡池" + "text": "1.召唤中，获取SSR卡时有[color=#37d8a9]50%[/color]概率可获得本次卡池概率提升的SSR卡。
2.可以在列表中，选择心仪的守护者作为本期的概率提升SSR
3.每次召唤到的SSR角色不是保底SSR角色时，下次召唤到的SSR角色必为该保底SSR角色
4.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者
5.卡池中SSR概率为2%。SR概率为14%，R的概率为84%，第[color=#37d8a9]70抽[/color]必为SSR卡牌
6.中途更换选定英雄，仍将[color=#37d8a9]保留[/color]保底次数
7.限定卡池结束后，召唤保底次数将[color=#37d8a9]保留[/color]至下个限定卡池" }, "weightreadonly": [ "2%", - "20%", - "78%" + "14%", + "84%" ], "upweight": 500 }, diff --git a/bin/json/game_drawreplace.json b/bin/json/game_drawreplace.json index 77a9af167..e437b045a 100644 --- a/bin/json/game_drawreplace.json +++ b/bin/json/game_drawreplace.json @@ -2,7 +2,7 @@ { "id": 1, "pool": 1, - "hero_initial": "14003", + "hero_initial": "15005", "hero_replace": "15005", "replace_cd": 0, "replace_num": 0, @@ -15,7 +15,7 @@ { "id": 2, "pool": 1, - "hero_initial": "14003", + "hero_initial": "15005", "hero_replace": "35005", "replace_cd": 0, "replace_num": 0, @@ -28,7 +28,7 @@ { "id": 3, "pool": 1, - "hero_initial": "14003", + "hero_initial": "15005", "hero_replace": "45003", "replace_cd": 0, "replace_num": 0, @@ -41,7 +41,7 @@ { "id": 4, "pool": 2, - "hero_initial": "15002", + "hero_initial": "35001", "hero_replace": "35001", "replace_cd": 5184000, "replace_num": 0, @@ -54,7 +54,7 @@ { "id": 5, "pool": 2, - "hero_initial": "15002", + "hero_initial": "35001", "hero_replace": "15004", "replace_cd": 5184000, "replace_num": 200, @@ -67,7 +67,7 @@ { "id": 6, "pool": 2, - "hero_initial": "15002", + "hero_initial": "35001", "hero_replace": "15005", "replace_cd": 5184000, "replace_num": 200, @@ -80,7 +80,7 @@ { "id": 7, "pool": 2, - "hero_initial": "15002", + "hero_initial": "35001", "hero_replace": "25002", "replace_cd": 5184000, "replace_num": 200, @@ -93,7 +93,7 @@ { "id": 8, "pool": 2, - "hero_initial": "15002", + "hero_initial": "35001", "hero_replace": "15002", "replace_cd": 5184000, "replace_num": 200, @@ -106,7 +106,7 @@ { "id": 9, "pool": 2, - "hero_initial": "15002", + "hero_initial": "35001", "hero_replace": "35002", "replace_cd": 5184000, "replace_num": 500, @@ -119,7 +119,7 @@ { "id": 10, "pool": 2, - "hero_initial": "15002", + "hero_initial": "35001", "hero_replace": "35005", "replace_cd": 5184000, "replace_num": 500, @@ -132,7 +132,7 @@ { "id": 11, "pool": 2, - "hero_initial": "15002", + "hero_initial": "35001", "hero_replace": "44005", "replace_cd": 5184000, "replace_num": 500, @@ -145,7 +145,7 @@ { "id": 12, "pool": 2, - "hero_initial": "15002", + "hero_initial": "35001", "hero_replace": "44002", "replace_cd": 5184000, "replace_num": 500, diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 4f666060a..9401ebde5 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -7473,7 +7473,7 @@ "hid": "54003", "name": { "key": "hero_main_name_54003", - "text": "黑猫" + "text": "阿奇波德" }, "star": 3, "color": 2, @@ -7549,7 +7549,7 @@ "expitemnum": 7, "herointr": { "key": "hero_main_herointr_54003", - "text": "传说中的守护者“黑猫”,拥有不俗的战斗能力" + "text": "传说中的守护者“阿奇波德”,拥有不俗的战斗能力" } }, { diff --git a/bin/json/game_item.json b/bin/json/game_item.json index d4f2c5326..e7e1be80e 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -46765,5 +46765,210 @@ } ], "gm": 1 + }, + { + "id": "25010001", + "name": { + "key": "item_item_name_25010001", + "text": "希卡普的头盔" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_25010001", + "intr": { + "key": "item_item_intr_25010001", + "text": "希卡普的头盔，看上去已经有些年头了。" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 + }, + { + "id": "25010002", + "name": { + "key": "item_item_name_25010002", + "text": "阿比盖尔的马鞍" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_25010002", + "intr": { + "key": "item_item_intr_25010002", + "text": "久经使用的马鞍，上面有明显的洗刷痕迹。" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 + }, + { + "id": "25010003", + "name": { + "key": "item_item_name_25010003", + "text": "波比的琴" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_25010003", + "intr": { + "key": "item_item_intr_25010003", + "text": "造型夸张的小竖琴，想必它的主人是一位小巧可爱的家伙。" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 + }, + { + "id": "25010004", + "name": { + "key": "item_item_name_25010004", + "text": "菲奥娜的魔药书" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_25010004", + "intr": { + "key": "item_item_intr_25010004", + "text": "十分厚重的书籍，上面有一股很奇怪的味道，说不出来是香味，还是苦味。" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 + }, + { + "id": "25010005", + "name": { + "key": "item_item_name_25010005", + "text": "戈伯的工具箱" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_25010005", + "intr": { + "key": "item_item_intr_25010005", + "text": "摇起来哐当作响，大多都是些锯齿，锤子之类的东西，而且规格看上去也十分统一。" + }, + "describe": { + "key": "", + "text": "" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 } ] \ No newline at end of file diff --git a/bin/json/game_lattice.json b/bin/json/game_lattice.json index ef9389b6a..f0cba5530 100644 --- a/bin/json/game_lattice.json +++ b/bin/json/game_lattice.json @@ -1,6 +1,10 @@ [ { "key": 1, + "txt": { + "key": "consume_consume_lattice_txt_01", + "text": "锣鼓喧天" + }, "belongto": 5, "regular": 1, "place": { @@ -15,6 +19,10 @@ }, { "key": 2, + "txt": { + "key": "consume_consume_lattice_txt_02", + "text": "电闪雷鸣" + }, "belongto": 6, "regular": 2, "place": { @@ -32,6 +40,10 @@ }, { "key": 3, + "txt": { + "key": "consume_consume_lattice_txt_03", + "text": "飞天舞女" + }, "belongto": 7, "regular": 2, "place": { diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json index 184eae04b..bc12e0017 100644 --- a/bin/json/game_lottery.json +++ b/bin/json/game_lottery.json @@ -98542,5 +98542,125 @@ "playerlvmin": 0, "playerlvmax": 0, "notice": 0 + }, + { + "id": 4107, + "lotteryid": 18001020, + "description": "跑环希卡普的头盔", + "type": 1, + "groupwt": 1000, + "groupid": 1000, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "25010001", + "n": 1 + }, + "itemdes": "希卡普的头盔", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 4108, + "lotteryid": 18001021, + "description": "跑环阿比盖尔的马鞍", + "type": 1, + "groupwt": 1000, + "groupid": 1000, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "25010002", + "n": 1 + }, + "itemdes": "阿比盖尔的马鞍", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 4109, + "lotteryid": 18001022, + "description": "跑环波比的琴", + "type": 1, + "groupwt": 1000, + "groupid": 1000, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "25010003", + "n": 1 + }, + "itemdes": "波比的琴", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 4110, + "lotteryid": 18001023, + "description": "跑环菲奥娜的魔药书", + "type": 1, + "groupwt": 1000, + "groupid": 1000, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "25010004", + "n": 1 + }, + "itemdes": "菲奥娜的魔药书", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 4111, + "lotteryid": 18001024, + "description": "跑环戈伯的工具箱", + "type": 1, + "groupwt": 1000, + "groupid": 1000, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "25010005", + "n": 1 + }, + "itemdes": "戈伯的工具箱", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 } ] \ No newline at end of file diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 74ece5427..bc4fe556c 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -5,12 +5,6 @@ "key": "opencond_opencond_name_1", "text": "守护者" }, - "main": [ - { - "key": 3, - "param": 20034 - } - ], "opencondi": [ 18000001 ], @@ -36,12 +30,6 @@ "key": "opencond_opencond_name_2", "text": "守护者详情" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000002 ], @@ -67,12 +55,6 @@ "key": "opencond_opencond_name_3", "text": "守护者技能" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000003 ], @@ -98,12 +80,6 @@ "key": "opencond_opencond_name_4", "text": "守护者装备" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000004 ], @@ -129,12 +105,6 @@ "key": "opencond_opencond_name_5", "text": "守护者觉醒" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000005 ], @@ -160,12 +130,6 @@ "key": "opencond_opencond_name_6", "text": "守护者回响" }, - "main": [ - { - "key": 3, - "param": 20261 - } - ], "opencondi": [ 18000006 ], @@ -191,12 +155,6 @@ "key": "opencond_opencond_name_7", "text": "背包" }, - "main": [ - { - "key": 3, - "param": 20034 - } - ], "opencondi": [ 18000007 ], @@ -222,12 +180,6 @@ "key": "opencond_opencond_name_8", "text": "购物" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000008 ], @@ -253,12 +205,6 @@ "key": "opencond_opencond_name_9", "text": "好友" }, - "main": [ - { - "key": 2, - "param": 1101000 - } - ], "opencondi": [ 18000009 ], @@ -284,12 +230,6 @@ "key": "opencond_opencond_name_10", "text": "商城" }, - "main": [ - { - "key": 2, - "param": 1101016 - } - ], "opencondi": [ 18000010 ], @@ -315,12 +255,6 @@ "key": "opencond_opencond_name_11", "text": "随机任务总览" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000011 ], @@ -346,12 +280,6 @@ "key": "opencond_opencond_name_12", "text": "充值" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000012 ], @@ -377,12 +305,6 @@ "key": "opencond_opencond_name_13", "text": "活动" }, - "main": [ - { - "key": 3, - "param": 20050 - } - ], "opencondi": [ 18000013 ], @@ -408,12 +330,6 @@ "key": "opencond_opencond_name_14", "text": "任务" }, - "main": [ - { - "key": 2, - "param": 1101000 - } - ], "opencondi": [ 18000014 ], @@ -439,12 +355,6 @@ "key": "opencond_opencond_name_15", "text": "主线入口" }, - "main": [ - { - "key": 3, - "param": 20030 - } - ], "opencondi": [ 18000015 ], @@ -470,12 +380,6 @@ "key": "opencond_opencond_name_16", "text": "召唤" }, - "main": [ - { - "key": 3, - "param": 20032 - } - ], "opencondi": [ 18000016 ], @@ -501,12 +405,6 @@ "key": "opencond_opencond_name_17", "text": "剧情副本" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000017 ], @@ -532,12 +430,6 @@ "key": "opencond_opencond_name_18", "text": "熊猫武馆" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000018 ], @@ -563,12 +455,6 @@ "key": "opencond_opencond_name_19", "text": "巨龙之岛" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000019 ], @@ -594,12 +480,6 @@ "key": "opencond_opencond_name_20", "text": "灾厄之岛" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000020 ], @@ -625,12 +505,6 @@ "key": "opencond_opencond_name_21", "text": "维京-装备副本" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000021 ], @@ -656,12 +530,6 @@ "key": "opencond_opencond_name_22", "text": "维京-武器副本" }, - "main": [ - { - "key": 1, - "param": 9999 - } - ], "opencondi": [ 18000022 ], @@ -687,12 +555,6 @@ "key": "opencond_opencond_name_23", "text": "维京-饰品副本" }, - "main": [ - { - "key": 1, - "param": 9999 - } - ], "opencondi": [ 18000023 ], @@ -718,12 +580,6 @@ "key": "opencond_opencond_name_24", "text": "炼金塔" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000024 ], @@ -749,12 +605,6 @@ "key": "opencond_opencond_name_25", "text": "捕羊大赛" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000025 ], @@ -780,12 +630,6 @@ "key": "opencond_opencond_name_26", "text": "黑暗料理大赛" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000026 ], @@ -811,12 +655,6 @@ "key": "opencond_opencond_name_27", "text": "地下角斗场" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000027 ], @@ -842,12 +680,6 @@ "key": "opencond_opencond_name_28", "text": "疯狂竞技赛" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000028 ], @@ -873,12 +705,6 @@ "key": "opencond_opencond_name_29", "text": "五侠擂台" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000029 ], @@ -904,12 +730,6 @@ "key": "opencond_opencond_name_30", "text": "藏书馆" }, - "main": [ - { - "key": 3, - "param": 20130 - } - ], "opencondi": [ 18000030 ], @@ -935,12 +755,6 @@ "key": "opencond_opencond_name_31", "text": "篝火舞会" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000031 ], @@ -966,12 +780,6 @@ "key": "opencond_opencond_name_32", "text": "商队" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000032 ], @@ -997,12 +805,6 @@ "key": "opencond_opencond_name_33", "text": "美食馆" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000033 ], @@ -1028,12 +830,6 @@ "key": "opencond_opencond_name_34", "text": "戈伯铁匠铺" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000034 ], @@ -1059,12 +855,6 @@ "key": "opencond_opencond_name_35", "text": "猎魂" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000035 ], @@ -1090,12 +880,6 @@ "key": "opencond_opencond_name_36", "text": "聊天" }, - "main": [ - { - "key": 3, - "param": 20050 - } - ], "opencondi": [ 18000036 ], @@ -1121,12 +905,6 @@ "key": "opencond_opencond_name_37", "text": "世界聊天" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000037 ], @@ -1152,12 +930,6 @@ "key": "opencond_opencond_name_38", "text": "俱乐部聊天" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000038 ], @@ -1183,12 +955,6 @@ "key": "opencond_opencond_name_39", "text": "私聊聊天" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000039 ], @@ -1214,12 +980,6 @@ "key": "opencond_opencond_name_40", "text": "跨服聊天" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000040 ], @@ -1245,12 +1005,6 @@ "key": "opencond_opencond_name_41", "text": "系统聊天" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000041 ], @@ -1276,12 +1030,6 @@ "key": "opencond_opencond_name_42", "text": "俱乐部" }, - "main": [ - { - "key": 3, - "param": 20128 - } - ], "opencondi": [ 18000042 ], @@ -1307,12 +1055,6 @@ "key": "opencond_opencond_name_43", "text": "竞技场" }, - "main": [ - { - "key": 3, - "param": 20140 - } - ], "opencondi": [ 18000043 ], @@ -1338,12 +1080,6 @@ "key": "opencond_opencond_name_44", "text": "签到" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000044 ], @@ -1369,12 +1105,6 @@ "key": "opencond_opencond_name_45", "text": "红点集成" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000045 ], @@ -1400,12 +1130,6 @@ "key": "opencond_opencond_name_46", "text": "月卡" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000046 ], @@ -1431,12 +1155,6 @@ "key": "opencond_opencond_name_47", "text": "日周月礼包" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000047 ], @@ -1462,12 +1180,6 @@ "key": "opencond_opencond_name_48", "text": "主角头像" }, - "main": [ - { - "key": 3, - "param": 20020 - } - ], "opencondi": [ 18000048 ], @@ -1493,12 +1205,6 @@ "key": "", "text": "" }, - "main": [ - { - "key": 3, - "param": 20020 - } - ], "opencondi": [ 18000049 ], @@ -1524,12 +1230,6 @@ "key": "opencond_opencond_name_45", "text": "月之秘境" }, - "main": [ - { - "key": 1, - "param": 70 - } - ], "opencondi": [ 18000050 ], @@ -1555,12 +1255,6 @@ "key": "opencond_opencond_name_46", "text": "收益统计" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000051 ], @@ -1586,12 +1280,6 @@ "key": "opencond_opencond_name_47", "text": "卡牌融合" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000052 ], @@ -1617,12 +1305,6 @@ "key": "opencond_opencond_name_48", "text": "成长之路" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000053 ], @@ -1648,12 +1330,6 @@ "key": "opencond_opencond_name_49", "text": "战斗退出" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000054 ], @@ -1679,12 +1355,6 @@ "key": "opencond_opencond_name_50", "text": "战斗倍速" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000055 ], @@ -1710,12 +1380,6 @@ "key": "opencond_opencond_name_51", "text": "自动战斗" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000056 ], @@ -1741,12 +1405,6 @@ "key": "opencond_opencond_name_52", "text": "装备铸造" }, - "main": [ - { - "key": 3, - "param": 20140 - } - ], "opencondi": [ 18000057 ], @@ -1772,12 +1430,6 @@ "key": "opencond_opencond_name_53", "text": "装备铸造-中级" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000058 ], @@ -1803,12 +1455,6 @@ "key": "opencond_opencond_name_54", "text": "装备铸造-高级" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000059 ], @@ -1834,12 +1480,6 @@ "key": "opencond_opencond_name_55", "text": "主线关卡-困难" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000060 ], @@ -1865,12 +1505,6 @@ "key": "opencond_opencond_name_56", "text": "邮件" }, - "main": [ - { - "key": 3, - "param": 20033 - } - ], "opencondi": [ 18000061 ], @@ -1896,12 +1530,6 @@ "key": "opencond_opencond_name_57", "text": "联盟学院" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000062 ], @@ -1927,12 +1555,6 @@ "key": "opencond_opencond_name_58", "text": "世界任务" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000063 ], @@ -1958,12 +1580,6 @@ "key": "opencond_opencond_name_59", "text": "战令" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000064 ], @@ -1989,12 +1605,6 @@ "key": "opencond_opencond_name_60", "text": "附魔副本" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000065 ], @@ -2020,7 +1630,6 @@ "key": "opencond_opencond_name_61", "text": "维京远征总入口" }, - "main": [], "opencondi": [ 18000066 ], @@ -2046,12 +1655,6 @@ "key": "opencond_opencond_name_62", "text": "俱乐部BOSS入口" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000067 ], @@ -2077,12 +1680,6 @@ "key": "opencond_opencond_name_63", "text": "" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000068 ], @@ -2108,12 +1705,6 @@ "key": "opencond_opencond_name_64", "text": "" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000069 ], @@ -2139,12 +1730,6 @@ "key": "opencond_opencond_name_65", "text": "" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000070 ], @@ -2170,12 +1755,6 @@ "key": "opencond_opencond_name_66", "text": "炼金塔" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000071 ], @@ -2201,12 +1780,6 @@ "key": "opencond_opencond_name_67", "text": "练功木桩1" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000072 ], @@ -2234,12 +1807,6 @@ "key": "opencond_opencond_name_68", "text": "练功木桩2" }, - "main": [ - { - "key": 1, - "param": 6 - } - ], "opencondi": [ 18000073 ], @@ -2267,12 +1834,6 @@ "key": "opencond_opencond_name_69", "text": "练功木桩3" }, - "main": [ - { - "key": 1, - "param": 10 - } - ], "opencondi": [ 18000074 ], @@ -2300,12 +1861,6 @@ "key": "opencond_opencond_name_70", "text": "" }, - "main": [ - { - "key": 1, - "param": 2 - } - ], "opencondi": [ 18000075 ], @@ -2331,12 +1886,6 @@ "key": "opencond_opencond_name_71", "text": "塔岗监狱" }, - "main": [ - { - "key": 2, - "param": 1101012 - } - ], "opencondi": [ 18000076 ], @@ -2362,12 +1911,6 @@ "key": "opencond_opencond_name_72", "text": "守护者教习" }, - "main": [ - { - "key": 1, - "param": 10 - } - ], "opencondi": [ 18000077 ], @@ -2393,12 +1936,6 @@ "key": "opencond_opencond_name_73", "text": "踢馆" }, - "main": [ - { - "key": 1, - "param": 70 - } - ], "opencondi": [ 18000078 ], @@ -2424,12 +1961,6 @@ "key": "opencond_opencond_name_74", "text": "主线关卡-精英" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000079 ], @@ -2455,12 +1986,6 @@ "key": "opencond_opencond_name_75", "text": "主线关卡-炼狱" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000080 ], @@ -2486,12 +2011,6 @@ "key": "opencond_opencond_name_76", "text": "波比周常" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000081 ], @@ -2517,12 +2036,6 @@ "key": "opencond_opencond_name_77", "text": "每日一练" }, - "main": [ - { - "key": 3, - "param": 20050 - } - ], "opencondi": [ 18000082 ], @@ -2548,12 +2061,6 @@ "key": "opencond_opencond_name_78", "text": "悬赏任务" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000083 ], @@ -2579,12 +2086,6 @@ "key": "opencond_opencond_name_79", "text": "拼图签到" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000084 ], @@ -2610,12 +2111,6 @@ "key": "opencond_opencond_name_80", "text": "烹饪功能" }, - "main": [ - { - "key": 3, - "param": 20250 - } - ], "opencondi": [ 18000085 ], @@ -2641,12 +2136,6 @@ "key": "opencond_opencond_name_81", "text": "好友木桩" }, - "main": [ - { - "key": 4, - "param": 10 - } - ], "opencondi": [ 18000086 ], @@ -2672,12 +2161,6 @@ "key": "opencond_opencond_name_82", "text": "六合塔" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000087 ], @@ -2703,7 +2186,6 @@ "key": "opencond_opencond_name_83", "text": "无极塔" }, - "main": [], "opencondi": [ 18000088 ], @@ -2729,12 +2211,6 @@ "key": "opencond_opencond_name_84", "text": "月光护符" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000089 ], @@ -2760,12 +2236,6 @@ "key": "opencond_opencond_name_85", "text": "石阵秘镜" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000090 ], @@ -2791,12 +2261,6 @@ "key": "opencond_opencond_name_86", "text": "活动指南" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000091 ], @@ -2822,12 +2286,6 @@ "key": "opencond_opencond_name_87", "text": "每日任务" }, - "main": [ - { - "key": 1, - "param": 40 - } - ], "opencondi": [ 18000092 ], @@ -2855,12 +2313,6 @@ "key": "opencond_opencond_name_88", "text": "功能入口合集" }, - "main": [ - { - "key": 3, - "param": 20050 - } - ], "opencondi": [ 18000093 ], @@ -2886,12 +2338,6 @@ "key": "opencond_opencond_name_89", "text": "推送礼包" }, - "main": [ - { - "key": 1, - "param": 10 - } - ], "opencondi": [ 18000094 ], @@ -2917,12 +2363,6 @@ "key": "opencond_opencond_name_90", "text": "成就" }, - "main": [ - { - "key": 2, - "param": 1101000 - } - ], "opencondi": [ 18000095 ], @@ -2948,12 +2388,6 @@ "key": "opencond_opencond_name_91", "text": "照相" }, - "main": [ - { - "key": 3, - "param": 20140 - } - ], "opencondi": [ 18000096 ], @@ -2979,12 +2413,6 @@ "key": "opencond_opencond_name_92", "text": "导航" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000097 ], @@ -3010,12 +2438,6 @@ "key": "opencond_opencond_name_93", "text": "金币商店" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000098 ], @@ -3041,12 +2463,6 @@ "key": "opencond_opencond_name_94", "text": "月光原石商店" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000099 ], @@ -3072,12 +2488,6 @@ "key": "opencond_opencond_name_95", "text": "友情专柜" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000100 ], @@ -3103,12 +2513,6 @@ "key": "opencond_opencond_name_96", "text": "斗士专柜" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000101 ], @@ -3134,12 +2538,6 @@ "key": "opencond_opencond_name_97", "text": "名流专柜" }, - "main": [ - { - "key": 1, - "param": 2 - } - ], "opencondi": [ 18000102 ], @@ -3165,12 +2563,6 @@ "key": "opencond_opencond_name_98", "text": "守护专柜" }, - "main": [ - { - "key": 1, - "param": 3 - } - ], "opencondi": [ 18000103 ], @@ -3196,12 +2588,6 @@ "key": "opencond_opencond_name_99", "text": "第一章商店" }, - "main": [ - { - "key": 2, - "param": 1101017 - } - ], "opencondi": [ 18000104 ], @@ -3227,12 +2613,6 @@ "key": "opencond_opencond_name_100", "text": "第二章商店" }, - "main": [ - { - "key": 2, - "param": 1102020 - } - ], "opencondi": [ 18000105 ], @@ -3258,12 +2638,6 @@ "key": "opencond_opencond_name_101", "text": "第三章商店" }, - "main": [ - { - "key": 2, - "param": 1103015 - } - ], "opencondi": [ 18000106 ], @@ -3289,12 +2663,6 @@ "key": "opencond_opencond_name_102", "text": "第四章商店" }, - "main": [ - { - "key": 2, - "param": 1104031 - } - ], "opencondi": [ 18000107 ], @@ -3320,12 +2688,6 @@ "key": "opencond_opencond_name_103", "text": "第五章商店" }, - "main": [ - { - "key": 1, - "param": 70 - } - ], "opencondi": [ 18000108 ], @@ -3351,12 +2713,6 @@ "key": "opencond_opencond_name_104", "text": "第六章商店" }, - "main": [ - { - "key": 1, - "param": 71 - } - ], "opencondi": [ 18000109 ], @@ -3382,12 +2738,6 @@ "key": "opencond_opencond_name_105", "text": "第七章商店" }, - "main": [ - { - "key": 1, - "param": 72 - } - ], "opencondi": [ 18000110 ], @@ -3413,12 +2763,6 @@ "key": "opencond_opencond_name_106", "text": "第八章商店" }, - "main": [ - { - "key": 1, - "param": 73 - } - ], "opencondi": [ 18000111 ], @@ -3444,12 +2788,6 @@ "key": "opencond_opencond_name_107", "text": "捕羊大赛" }, - "main": [ - { - "key": 2, - "param": 1101037 - } - ], "opencondi": [ 18000112 ], @@ -3475,12 +2813,6 @@ "key": "opencond_opencond_name_108", "text": "藏宝图" }, - "main": [ - { - "key": 2, - "param": 1101004 - } - ], "opencondi": [ 18000113 ], @@ -3506,12 +2838,6 @@ "key": "opencond_opencond_name_109", "text": "辉月" }, - "main": [ - { - "key": 2, - "param": 1101012 - } - ], "opencondi": [ 18000114 ], @@ -3537,12 +2863,6 @@ "key": "opencond_opencond_name_110", "text": "驯龙养成" }, - "main": [ - { - "key": 2, - "param": 1101018 - } - ], "opencondi": [ 18000115 ], @@ -3568,12 +2888,6 @@ "key": "opencond_opencond_name_111", "text": "指挥部退出按钮" }, - "main": [ - { - "key": 3, - "param": 20250 - } - ], "opencondi": [ 18000116 ], @@ -3599,12 +2913,6 @@ "key": "opencond_opencond_name_112", "text": "设置" }, - "main": [ - { - "key": 1, - "param": 1 - } - ], "opencondi": [ 18000117 ], @@ -3630,12 +2938,6 @@ "key": "opencond_opencond_name_113", "text": "玩法" }, - "main": [ - { - "key": 2, - "param": 1101012 - } - ], "opencondi": [ 18000118 ], @@ -3661,12 +2963,6 @@ "key": "opencond_opencond_name_114", "text": "获取途径" }, - "main": [ - { - "key": 2, - "param": 1102023 - } - ], "opencondi": [ 18000119 ], diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 17dbc3886..a8f7dd754 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -8718,9 +8718,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -8748,9 +8748,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -8808,9 +8808,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -8838,9 +8838,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -8853,9 +8853,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -8883,9 +8883,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -8898,9 +8898,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -8928,9 +8928,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -8943,9 +8943,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -8973,9 +8973,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -8988,9 +8988,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, @@ -9018,9 +9018,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "功能入口-浇水拼图", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, diff --git a/bin/json/game_searchitemall.json b/bin/json/game_searchitemall.json index b5de5b1c5..0a0caef4a 100644 --- a/bin/json/game_searchitemall.json +++ b/bin/json/game_searchitemall.json @@ -4,12 +4,10 @@ "tasktype": 1, "pointnum": 1, "point": [ - 1, - 2 + 1 ], "pointweight": [ - 2000, - 2000 + 10000 ] }, { @@ -17,12 +15,10 @@ "tasktype": 1, "pointnum": 1, "point": [ - 3, - 4 + 2 ], "pointweight": [ - 2000, - 2000 + 10000 ] }, { @@ -30,12 +26,10 @@ "tasktype": 1, "pointnum": 1, "point": [ - 5, - 6 + 3 ], "pointweight": [ - 2000, - 2000 + 10000 ] }, { @@ -43,12 +37,10 @@ "tasktype": 1, "pointnum": 1, "point": [ - 7, - 8 + 4 ], "pointweight": [ - 2000, - 2000 + 10000 ] }, { @@ -56,12 +48,10 @@ "tasktype": 1, "pointnum": 1, "point": [ - 9, - 10 + 5 ], "pointweight": [ - 2000, - 2000 + 10000 ] }, { @@ -69,12 +59,10 @@ "tasktype": 1, "pointnum": 1, "point": [ - 6, - 10 + 6 ], "pointweight": [ - 5000, - 5000 + 10000 ] }, { diff --git a/bin/json/game_searchitembox.json b/bin/json/game_searchitembox.json index 906f621ff..1d4828592 100644 --- a/bin/json/game_searchitembox.json +++ b/bin/json/game_searchitembox.json @@ -6,7 +6,7 @@ "GameMain", "位置1" ], - "drown": 14010000, + "drown": 18001022, "pointweight": 1000 }, { @@ -16,7 +16,7 @@ "GameMain", "位置2" ], - "drown": 14010000, + "drown": 18001020, "pointweight": 1000 }, { @@ -26,7 +26,7 @@ "GameMain", "位置3" ], - "drown": 14010000, + "drown": 18001023, "pointweight": 1000 }, { @@ -36,7 +36,7 @@ "GameMain", "位置4" ], - "drown": 14010000, + "drown": 18001024, "pointweight": 1000 }, { @@ -46,7 +46,7 @@ "GameMain", "位置5" ], - "drown": 14010000, + "drown": 18001021, "pointweight": 1000 }, { diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 674e0c44a..fa35fe195 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -3586,7 +3586,7 @@ "Order": "", "Limit": 1, "ExecuteCnt": 1, - "TriggerAnim": "", + "TriggerAnim": "Passive", "Type": 3, "Argu": [ 390001209, @@ -3732,7 +3732,7 @@ "Order": "", "Limit": 1, "ExecuteCnt": 1, - "TriggerAnim": "", + "TriggerAnim": "Passive", "Type": 3, "Argu": [ 390001209, @@ -3878,7 +3878,7 @@ "Order": "", "Limit": 1, "ExecuteCnt": 1, - "TriggerAnim": "", + "TriggerAnim": "Passive", "Type": 3, "Argu": [ 390001209, @@ -6036,7 +6036,7 @@ "TriggerAnim": "", "Type": 2, "Argu": [ - 413002211, + 413002212, -1, 1 ], @@ -32918,10 +32918,10 @@ 4, 2300 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 243007112 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -32944,10 +32944,10 @@ 4, 2400 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 243007112 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -32970,10 +32970,10 @@ 4, 2500 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 243007112 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -32996,10 +32996,10 @@ 4, 2600 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 243007112 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -33022,10 +33022,10 @@ 4, 2700 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 243007112 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -33036,7 +33036,7 @@ { "Id": 243007112, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -38611,7 +38611,7 @@ "TriggerAnim": "", "Type": 2, "Argu": [ - 435004212, + 435004211, -1, 1 ], @@ -40373,10 +40373,10 @@ { "Id": 225002215, "EmitPR": 1000, - "From": 1, + "From": 3, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "TriggerAnim": "", "Type": 2, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index d200f4dda..3fb2fb41a 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -27722,7 +27722,7 @@ "key": "skill_skill_atk_Name_133005211", "text": "振奋怒吼" }, - "ico": "jn_34003_2", + "ico": "jn_33005_2", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -27732,8 +27732,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 233005211, - 233005213 + 233005211 ] }, "passSkill": [ @@ -28497,8 +28496,7 @@ "Target": 1, "ChildSkill": { "Id": [ - 244003211, - 244003212 + 244003211 ] }, "passSkill": [ diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index d188afa11..8a9773bca 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -1,6 +1,11 @@ [ { "Id": 425004311, + "Name": { + "key": "skill_skill_passive_Name_425004311", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=1", "TargetCheck": "", @@ -23,6 +28,11 @@ }, { "Id": 425004321, + "Name": { + "key": "skill_skill_passive_Name_425004321", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=1", "TargetCheck": "", @@ -45,6 +55,11 @@ }, { "Id": 425004331, + "Name": { + "key": "skill_skill_passive_Name_425004331", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=1", "TargetCheck": "", @@ -67,6 +82,11 @@ }, { "Id": 425004341, + "Name": { + "key": "skill_skill_passive_Name_425004341", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=1", "TargetCheck": "", @@ -89,6 +109,11 @@ }, { "Id": 435002211, + "Name": { + "key": "skill_skill_passive_Name_435002211", + "text": "（被动）无所畏惧" + }, + "icon": "jn_35002_2", "When": 18, "FromCheck": "Target=2", "TargetCheck": "Target=2", @@ -112,6 +137,11 @@ }, { "Id": 434006211, + "Name": { + "key": "skill_skill_passive_Name_434006211", + "text": "" + }, + "icon": "", "When": 5, "FromCheck": "Target=2", "TargetCheck": "", @@ -133,6 +163,11 @@ }, { "Id": 425001211, + "Name": { + "key": "skill_skill_passive_Name_425001211", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 21, "FromCheck": "Target=3", "TargetCheck": "", @@ -154,6 +189,11 @@ }, { "Id": 425001212, + "Name": { + "key": "skill_skill_passive_Name_425001212", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -175,6 +215,11 @@ }, { "Id": 425001213, + "Name": { + "key": "skill_skill_passive_Name_425001213", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 2, "FromCheck": "Target=3,HasBuff=390001209", "TargetCheck": "", @@ -196,6 +241,11 @@ }, { "Id": 425001221, + "Name": { + "key": "skill_skill_passive_Name_425001221", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 21, "FromCheck": "Target=3", "TargetCheck": "", @@ -217,6 +267,11 @@ }, { "Id": 425001222, + "Name": { + "key": "skill_skill_passive_Name_425001222", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -238,6 +293,11 @@ }, { "Id": 425001223, + "Name": { + "key": "skill_skill_passive_Name_425001223", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 2, "FromCheck": "Target=3,HasBuff=390001209", "TargetCheck": "", @@ -259,6 +319,11 @@ }, { "Id": 425001231, + "Name": { + "key": "skill_skill_passive_Name_425001231", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 21, "FromCheck": "Target=3", "TargetCheck": "", @@ -280,6 +345,11 @@ }, { "Id": 425001232, + "Name": { + "key": "skill_skill_passive_Name_425001232", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -301,6 +371,11 @@ }, { "Id": 425001233, + "Name": { + "key": "skill_skill_passive_Name_425001233", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 2, "FromCheck": "Target=3,HasBuff=390001209", "TargetCheck": "", @@ -322,6 +397,11 @@ }, { "Id": 425001241, + "Name": { + "key": "skill_skill_passive_Name_425001241", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 21, "FromCheck": "Target=3", "TargetCheck": "", @@ -343,6 +423,11 @@ }, { "Id": 425001242, + "Name": { + "key": "skill_skill_passive_Name_425001242", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -364,6 +449,11 @@ }, { "Id": 425001243, + "Name": { + "key": "skill_skill_passive_Name_425001243", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 2, "FromCheck": "Target=3,HasBuff=390001209", "TargetCheck": "", @@ -385,6 +475,11 @@ }, { "Id": 425001251, + "Name": { + "key": "skill_skill_passive_Name_425001251", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 21, "FromCheck": "Target=3", "TargetCheck": "", @@ -406,6 +501,11 @@ }, { "Id": 425001252, + "Name": { + "key": "skill_skill_passive_Name_425001252", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -427,6 +527,11 @@ }, { "Id": 425001253, + "Name": { + "key": "skill_skill_passive_Name_425001253", + "text": "（被动）太极一式" + }, + "icon": "jn_25001_2", "When": 2, "FromCheck": "Target=3,HasBuff=390001209", "TargetCheck": "", @@ -448,6 +553,11 @@ }, { "Id": 444005311, + "Name": { + "key": "skill_skill_passive_Name_444005311", + "text": "" + }, + "icon": "", "When": 18, "FromCheck": "", "TargetCheck": "Target=2", @@ -469,6 +579,11 @@ }, { "Id": 435001211, + "Name": { + "key": "skill_skill_passive_Name_435001211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -490,6 +605,11 @@ }, { "Id": 435001212, + "Name": { + "key": "skill_skill_passive_Name_435001212", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -511,6 +631,11 @@ }, { "Id": 444006211, + "Name": { + "key": "skill_skill_passive_Name_444006211", + "text": "（被动）腾飞虎跃" + }, + "icon": "jn_44006_2", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -533,6 +658,11 @@ }, { "Id": 444006311, + "Name": { + "key": "skill_skill_passive_Name_444006311", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -554,6 +684,11 @@ }, { "Id": 444006321, + "Name": { + "key": "skill_skill_passive_Name_444006321", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -575,6 +710,11 @@ }, { "Id": 444006331, + "Name": { + "key": "skill_skill_passive_Name_444006331", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -596,6 +736,11 @@ }, { "Id": 444006341, + "Name": { + "key": "skill_skill_passive_Name_444006341", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -617,6 +762,11 @@ }, { "Id": 444006351, + "Name": { + "key": "skill_skill_passive_Name_444006351", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -638,6 +788,11 @@ }, { "Id": 415005211, + "Name": { + "key": "skill_skill_passive_Name_415005211", + "text": "（被动）快乐烟花" + }, + "icon": "jn_15005_2", "When": 17, "FromCheck": "Target=3", "TargetCheck": "", @@ -659,6 +814,11 @@ }, { "Id": 415005212, + "Name": { + "key": "skill_skill_passive_Name_415005212", + "text": "" + }, + "icon": "", "When": 17, "FromCheck": "Target=3", "TargetCheck": "HpproGreater=1000", @@ -680,6 +840,11 @@ }, { "Id": 424002211, + "Name": { + "key": "skill_skill_passive_Name_424002211", + "text": "（被动）术前漱口" + }, + "icon": "jn_24002_2", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2,HasBuff=390001211", @@ -701,6 +866,11 @@ }, { "Id": 424002212, + "Name": { + "key": "skill_skill_passive_Name_424002212", + "text": "（被动）术前漱口" + }, + "icon": "jn_24002_2", "When": 16, "FromCheck": "HasBuff=390001211", "TargetCheck": "Target=3", @@ -723,6 +893,11 @@ }, { "Id": 414007211, + "Name": { + "key": "skill_skill_passive_Name_414007211", + "text": "（被动）王子的愤怒" + }, + "icon": "jn_14007_2", "When": 14, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -745,6 +920,11 @@ }, { "Id": 414003211, + "Name": { + "key": "skill_skill_passive_Name_414003211", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -766,6 +946,11 @@ }, { "Id": 445003211, + "Name": { + "key": "skill_skill_passive_Name_445003211", + "text": "（被动）奔向明天" + }, + "icon": "jn_45003_2", "When": 15, "FromCheck": "", "TargetCheck": "Target=3", @@ -789,6 +974,11 @@ }, { "Id": 435003211, + "Name": { + "key": "skill_skill_passive_Name_435003211", + "text": "" + }, + "icon": "", "When": 5, "FromCheck": "", "TargetCheck": "Target=3", @@ -810,6 +1000,11 @@ }, { "Id": 435003212, + "Name": { + "key": "skill_skill_passive_Name_435003212", + "text": "" + }, + "icon": "", "When": 5, "FromCheck": "", "TargetCheck": "Target=3", @@ -831,6 +1026,11 @@ }, { "Id": 435003213, + "Name": { + "key": "skill_skill_passive_Name_435003213", + "text": "（被动）噩梦缠绕" + }, + "icon": "jn_35003_2", "When": 14, "FromCheck": "", "TargetCheck": "Target=3", @@ -855,6 +1055,11 @@ }, { "Id": 413003211, + "Name": { + "key": "skill_skill_passive_Name_413003211", + "text": "" + }, + "icon": "", "When": 18, "FromCheck": "", "TargetCheck": "2", @@ -876,6 +1081,11 @@ }, { "Id": 415001111, + "Name": { + "key": "skill_skill_passive_Name_415001111", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -897,6 +1107,11 @@ }, { "Id": 415001211, + "Name": { + "key": "skill_skill_passive_Name_415001211", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -918,6 +1133,11 @@ }, { "Id": 415001212, + "Name": { + "key": "skill_skill_passive_Name_415001212", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -939,6 +1159,11 @@ }, { "Id": 415001311, + "Name": { + "key": "skill_skill_passive_Name_415001311", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -960,6 +1185,11 @@ }, { "Id": 445001111, + "Name": { + "key": "skill_skill_passive_Name_445001111", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "Target=3", "TargetCheck": "Target=3", @@ -981,6 +1211,11 @@ }, { "Id": 445001311, + "Name": { + "key": "skill_skill_passive_Name_445001311", + "text": "" + }, + "icon": "", "When": 18, "FromCheck": "", "TargetCheck": "Target=2", @@ -1002,6 +1237,11 @@ }, { "Id": 414001111, + "Name": { + "key": "skill_skill_passive_Name_414001111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -1023,6 +1263,11 @@ }, { "Id": 414001211, + "Name": { + "key": "skill_skill_passive_Name_414001211", + "text": "（被动）如山的背影" + }, + "icon": "jn_14001_2", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -1044,6 +1289,11 @@ }, { "Id": 414001212, + "Name": { + "key": "skill_skill_passive_Name_414001212", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "Target=3,HasBuff=390001202,OverlayNum=10", "TargetCheck": "Target=3", @@ -1065,6 +1315,11 @@ }, { "Id": 414001311, + "Name": { + "key": "skill_skill_passive_Name_414001311", + "text": "" + }, + "icon": "", "When": 3, "FromCheck": "Target=3,HasBuff=390001202,OverlayNum=10", "TargetCheck": "Target=2", @@ -1086,6 +1341,11 @@ }, { "Id": 414001312, + "Name": { + "key": "skill_skill_passive_Name_414001312", + "text": "" + }, + "icon": "", "When": 18, "FromCheck": "Target=3", "TargetCheck": "Target=3", @@ -1107,6 +1367,11 @@ }, { "Id": 424004111, + "Name": { + "key": "skill_skill_passive_Name_424004111", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -1128,6 +1393,11 @@ }, { "Id": 424004311, + "Name": { + "key": "skill_skill_passive_Name_424004311", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -1149,6 +1419,11 @@ }, { "Id": 424004312, + "Name": { + "key": "skill_skill_passive_Name_424004312", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -1170,6 +1445,11 @@ }, { "Id": 443002211, + "Name": { + "key": "skill_skill_passive_Name_443002211", + "text": "（被动）诡计注视" + }, + "icon": "jn_43002_2", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -1191,6 +1471,11 @@ }, { "Id": 443002212, + "Name": { + "key": "skill_skill_passive_Name_443002212", + "text": "（被动）诡计注视" + }, + "icon": "jn_43002_2", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2,AVless=300", @@ -1212,6 +1497,11 @@ }, { "Id": 443002311, + "Name": { + "key": "skill_skill_passive_Name_443002311", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2,HasBuff=1", @@ -1233,6 +1523,11 @@ }, { "Id": 414006111, + "Name": { + "key": "skill_skill_passive_Name_414006111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -1254,6 +1549,11 @@ }, { "Id": 414006211, + "Name": { + "key": "skill_skill_passive_Name_414006211", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "Target=3", "TargetCheck": "Target=3", @@ -1275,6 +1575,11 @@ }, { "Id": 435006311, + "Name": { + "key": "skill_skill_passive_Name_435006311", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -1296,6 +1601,11 @@ }, { "Id": 413004111, + "Name": { + "key": "skill_skill_passive_Name_413004111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3,Hpproless=500", "TargetCheck": "", @@ -1317,6 +1627,11 @@ }, { "Id": 433003211, + "Name": { + "key": "skill_skill_passive_Name_433003211", + "text": "（被动）乘火打劫" + }, + "icon": "jn_33003_2", "When": 16, "FromCheck": "Target=4", "TargetCheck": "", @@ -1338,6 +1653,11 @@ }, { "Id": 434003311, + "Name": { + "key": "skill_skill_passive_Name_434003311", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -1359,6 +1679,11 @@ }, { "Id": 434007111, + "Name": { + "key": "skill_skill_passive_Name_434007111", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -1380,6 +1705,11 @@ }, { "Id": 434007311, + "Name": { + "key": "skill_skill_passive_Name_434007311", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -1401,6 +1731,11 @@ }, { "Id": 443006211, + "Name": { + "key": "skill_skill_passive_Name_443006211", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=4", "TargetCheck": "", @@ -1424,6 +1759,11 @@ }, { "Id": 424005211, + "Name": { + "key": "skill_skill_passive_Name_424005211", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=1", "TargetCheck": "", @@ -1445,6 +1785,11 @@ }, { "Id": 413001211, + "Name": { + "key": "skill_skill_passive_Name_413001211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=1", @@ -1469,6 +1814,11 @@ }, { "Id": 414005211, + "Name": { + "key": "skill_skill_passive_Name_414005211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2,Nobuff=3", @@ -1490,6 +1840,11 @@ }, { "Id": 414005212, + "Name": { + "key": "skill_skill_passive_Name_414005212", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "", @@ -1511,6 +1866,11 @@ }, { "Id": 443003311, + "Name": { + "key": "skill_skill_passive_Name_443003311", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "Target=1,Alive=0", @@ -1532,6 +1892,11 @@ }, { "Id": 443005211, + "Name": { + "key": "skill_skill_passive_Name_443005211", + "text": "" + }, + "icon": "", "When": 18, "FromCheck": "Target=3", "TargetCheck": "Target=1", @@ -1553,6 +1918,11 @@ }, { "Id": 443005212, + "Name": { + "key": "skill_skill_passive_Name_443005212", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -1574,6 +1944,11 @@ }, { "Id": 415002211, + "Name": { + "key": "skill_skill_passive_Name_415002211", + "text": "（被动）临场妙算" + }, + "icon": "jn_15002_2", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -1595,6 +1970,11 @@ }, { "Id": 415002212, + "Name": { + "key": "skill_skill_passive_Name_415002212", + "text": "（被动）临场妙算" + }, + "icon": "jn_15002_2", "When": 19, "FromCheck": "Target=3", "TargetCheck": "Target=3,HasBuff=3", @@ -1616,6 +1996,11 @@ }, { "Id": 415002311, + "Name": { + "key": "skill_skill_passive_Name_415002311", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "", @@ -1637,6 +2022,11 @@ }, { "Id": 415002312, + "Name": { + "key": "skill_skill_passive_Name_415002312", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3,HasBuff=390001205,OverlayNum=5", "TargetCheck": "", @@ -1658,6 +2048,11 @@ }, { "Id": 415002313, + "Name": { + "key": "skill_skill_passive_Name_415002313", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3,HasBuff=390001205,OverlayNum=6", "TargetCheck": "", @@ -1679,6 +2074,11 @@ }, { "Id": 415002314, + "Name": { + "key": "skill_skill_passive_Name_415002314", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3,HasBuff=390001205,OverlayNum=7", "TargetCheck": "", @@ -1700,6 +2100,11 @@ }, { "Id": 415002315, + "Name": { + "key": "skill_skill_passive_Name_415002315", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3,HasBuff=390001205,OverlayNum=8", "TargetCheck": "", @@ -1721,6 +2126,11 @@ }, { "Id": 413005211, + "Name": { + "key": "skill_skill_passive_Name_413005211", + "text": "（被动）上吧小指头" + }, + "icon": "jn_13005_2", "When": 2, "FromCheck": "Target=3,NoBuff=2", "TargetCheck": "", @@ -1742,6 +2152,11 @@ }, { "Id": 413005212, + "Name": { + "key": "skill_skill_passive_Name_413005212", + "text": "（被动）上吧小指头" + }, + "icon": "jn_13005_2", "When": 3, "FromCheck": "", "TargetCheck": "Target=1,HasBuff=390001001", @@ -1763,6 +2178,11 @@ }, { "Id": 413005213, + "Name": { + "key": "skill_skill_passive_Name_413005213", + "text": "" + }, + "icon": "", "When": 3, "FromCheck": "", "TargetCheck": "Target=1,HasBuff=390001001", @@ -1784,6 +2204,11 @@ }, { "Id": 424009011, + "Name": { + "key": "skill_skill_passive_Name_424009011", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -1805,6 +2230,11 @@ }, { "Id": 424009012, + "Name": { + "key": "skill_skill_passive_Name_424009012", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -1826,6 +2256,11 @@ }, { "Id": 424009013, + "Name": { + "key": "skill_skill_passive_Name_424009013", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -1847,6 +2282,11 @@ }, { "Id": 424001111, + "Name": { + "key": "skill_skill_passive_Name_424001111", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -1868,6 +2308,11 @@ }, { "Id": 424001311, + "Name": { + "key": "skill_skill_passive_Name_424001311", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "3", @@ -1889,6 +2334,11 @@ }, { "Id": 433002211, + "Name": { + "key": "skill_skill_passive_Name_433002211", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -1910,6 +2360,11 @@ }, { "Id": 433002311, + "Name": { + "key": "skill_skill_passive_Name_433002311", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3,HasBuff=1", "TargetCheck": "2", @@ -1929,6 +2384,11 @@ }, { "Id": 455004211, + "Name": { + "key": "skill_skill_passive_Name_455004211", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=1", "TargetCheck": "Target=2", @@ -1950,6 +2410,11 @@ }, { "Id": 445004211, + "Name": { + "key": "skill_skill_passive_Name_445004211", + "text": "" + }, + "icon": "", "When": 12, "FromCheck": "Target=3", "TargetCheck": "Target=2,Hpproless=500", @@ -1971,6 +2436,11 @@ }, { "Id": 445004212, + "Name": { + "key": "skill_skill_passive_Name_445004212", + "text": "" + }, + "icon": "", "When": 12, "FromCheck": "Target=3", "TargetCheck": "Target=2,HpproGreater=500", @@ -1990,6 +2460,11 @@ }, { "Id": 445004214, + "Name": { + "key": "skill_skill_passive_Name_445004214", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -2011,6 +2486,11 @@ }, { "Id": 455003211, + "Name": { + "key": "skill_skill_passive_Name_455003211", + "text": "（被动）尖利装甲" + }, + "icon": "jn_55003_2", "When": 15, "FromCheck": "Target=1", "TargetCheck": "Target=2", @@ -2032,6 +2512,11 @@ }, { "Id": 455005211, + "Name": { + "key": "skill_skill_passive_Name_455005211", + "text": "（被动）熔焰威慑" + }, + "icon": "jn_55005_2", "When": 15, "FromCheck": "", "TargetCheck": "Target=2", @@ -2053,6 +2538,11 @@ }, { "Id": 455005212, + "Name": { + "key": "skill_skill_passive_Name_455005212", + "text": "（被动）熔焰威慑" + }, + "icon": "jn_55005_2", "When": 21, "FromCheck": "", "TargetCheck": "", @@ -2074,6 +2564,11 @@ }, { "Id": 455005312, + "Name": { + "key": "skill_skill_passive_Name_455005312", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -2095,6 +2590,11 @@ }, { "Id": 455006211, + "Name": { + "key": "skill_skill_passive_Name_455006211", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3,HasBuff=2", "TargetCheck": "Target=2", @@ -2116,6 +2616,11 @@ }, { "Id": 455006311, + "Name": { + "key": "skill_skill_passive_Name_455006311", + "text": "（被动）腐根钻心" + }, + "icon": "jn_55006_3", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -2139,6 +2644,11 @@ }, { "Id": 455006312, + "Name": { + "key": "skill_skill_passive_Name_455006312", + "text": "（被动）腐根钻心" + }, + "icon": "jn_55006_3", "When": 19, "FromCheck": "", "TargetCheck": "Target=3,HasBuff=390001447,OverlayNum=7", @@ -2161,6 +2671,11 @@ }, { "Id": 455007112, + "Name": { + "key": "skill_skill_passive_Name_455007112", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=2", @@ -2182,6 +2697,11 @@ }, { "Id": 455007115, + "Name": { + "key": "skill_skill_passive_Name_455007115", + "text": "" + }, + "icon": "", "When": 12, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -2205,6 +2725,11 @@ }, { "Id": 455007211, + "Name": { + "key": "skill_skill_passive_Name_455007211", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "Target=3", @@ -2228,6 +2753,11 @@ }, { "Id": 455007214, + "Name": { + "key": "skill_skill_passive_Name_455007214", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -2249,6 +2779,11 @@ }, { "Id": 455007311, + "Name": { + "key": "skill_skill_passive_Name_455007311", + "text": "（被动）坚冰如铁" + }, + "icon": "jn_55007_3", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -2271,6 +2806,11 @@ }, { "Id": 455007312, + "Name": { + "key": "skill_skill_passive_Name_455007312", + "text": "（被动）坚冰如铁" + }, + "icon": "jn_55007_3", "When": 4, "FromCheck": "", "TargetCheck": "Target=3，NoBuff=390001415", @@ -2292,6 +2832,11 @@ }, { "Id": 455007313, + "Name": { + "key": "skill_skill_passive_Name_455007313", + "text": "（被动）坚冰如铁" + }, + "icon": "jn_55007_3", "When": 5, "FromCheck": "Target=3,HasBuff=3", "TargetCheck": "", @@ -2313,6 +2858,11 @@ }, { "Id": 455007314, + "Name": { + "key": "skill_skill_passive_Name_455007314", + "text": "（被动）坚冰如铁" + }, + "icon": "jn_55007_3", "When": 27, "FromCheck": "Target=3", "TargetCheck": "", @@ -2334,6 +2884,11 @@ }, { "Id": 455006214, + "Name": { + "key": "skill_skill_passive_Name_455006214", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -2356,6 +2911,11 @@ }, { "Id": 455002211, + "Name": { + "key": "skill_skill_passive_Name_455002211", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=1", @@ -2379,6 +2939,11 @@ }, { "Id": 455002212, + "Name": { + "key": "skill_skill_passive_Name_455002212", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -2400,6 +2965,11 @@ }, { "Id": 414002212, + "Name": { + "key": "skill_skill_passive_Name_414002212", + "text": "（被动）嗜血反扑" + }, + "icon": "jn_14002_2", "When": 16, "FromCheck": "Target=2,HasBuff=390001426", "TargetCheck": "Target=3", @@ -2423,6 +2993,11 @@ }, { "Id": 414002213, + "Name": { + "key": "skill_skill_passive_Name_414002213", + "text": "（被动）嗜血反扑" + }, + "icon": "jn_14002_2", "When": 16, "FromCheck": "Target=2,HasBuff=390001426", "TargetCheck": "Target=4", @@ -2445,6 +3020,11 @@ }, { "Id": 443007211, + "Name": { + "key": "skill_skill_passive_Name_443007211", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -2466,6 +3046,11 @@ }, { "Id": 434001211, + "Name": { + "key": "skill_skill_passive_Name_434001211", + "text": "（被动）针锋相对" + }, + "icon": "jn_34001_2", "When": 12, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -2487,6 +3072,11 @@ }, { "Id": 424007213, + "Name": { + "key": "skill_skill_passive_Name_424007213", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "HasBuff=SPDUP", @@ -2510,6 +3100,11 @@ }, { "Id": 423002211, + "Name": { + "key": "skill_skill_passive_Name_423002211", + "text": "（被动）还施彼身" + }, + "icon": "jn_23002_2", "When": 4, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -2531,6 +3126,11 @@ }, { "Id": 433005211, + "Name": { + "key": "skill_skill_passive_Name_433005211", + "text": "（被动）振奋怒吼" + }, + "icon": "jn_33005_2", "When": 21, "FromCheck": "Target=3,NoBuff=2", "TargetCheck": "", @@ -2547,11 +3147,17 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 1, "Callback": [ - 233005212 + 233005212, + 233005213 ] }, { "Id": 451013211, + "Name": { + "key": "skill_skill_passive_Name_451013211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -2575,6 +3181,11 @@ }, { "Id": 451010111, + "Name": { + "key": "skill_skill_passive_Name_451010111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "3", @@ -2596,6 +3207,11 @@ }, { "Id": 451010211, + "Name": { + "key": "skill_skill_passive_Name_451010211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "3", @@ -2617,6 +3233,11 @@ }, { "Id": 451010212, + "Name": { + "key": "skill_skill_passive_Name_451010212", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "3", @@ -2638,6 +3259,11 @@ }, { "Id": 451010213, + "Name": { + "key": "skill_skill_passive_Name_451010213", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "3", @@ -2659,6 +3285,11 @@ }, { "Id": 451010214, + "Name": { + "key": "skill_skill_passive_Name_451010214", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "3", @@ -2680,6 +3311,11 @@ }, { "Id": 451011211, + "Name": { + "key": "skill_skill_passive_Name_451011211", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3,HasBuff=1", "TargetCheck": "2", @@ -2701,6 +3337,11 @@ }, { "Id": 444003211, + "Name": { + "key": "skill_skill_passive_Name_444003211", + "text": "（被动）鼻子变长" + }, + "icon": "jn_44003_2", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -2722,6 +3363,11 @@ }, { "Id": 444003311, + "Name": { + "key": "skill_skill_passive_Name_444003311", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=1", @@ -2745,6 +3391,11 @@ }, { "Id": 443004211, + "Name": { + "key": "skill_skill_passive_Name_443004211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -2766,6 +3417,11 @@ }, { "Id": 444001113, + "Name": { + "key": "skill_skill_passive_Name_444001113", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -2787,6 +3443,11 @@ }, { "Id": 444001213, + "Name": { + "key": "skill_skill_passive_Name_444001213", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -2808,6 +3469,11 @@ }, { "Id": 435004211, + "Name": { + "key": "skill_skill_passive_Name_435004211", + "text": "（被动）狡黠烟雾弹" + }, + "icon": "jn_35004_2", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -2829,6 +3495,11 @@ }, { "Id": 435004212, + "Name": { + "key": "skill_skill_passive_Name_435004212", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=4", @@ -2850,6 +3521,11 @@ }, { "Id": 424006211, + "Name": { + "key": "skill_skill_passive_Name_424006211", + "text": "" + }, + "icon": "", "When": 21, "FromCheck": "Target=3", "TargetCheck": "Target=1", @@ -2871,6 +3547,11 @@ }, { "Id": 433004312, + "Name": { + "key": "skill_skill_passive_Name_433004312", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -2892,6 +3573,11 @@ }, { "Id": 453006211, + "Name": { + "key": "skill_skill_passive_Name_453006211", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "Target=3,Hpproless=500", @@ -2913,6 +3599,11 @@ }, { "Id": 453006311, + "Name": { + "key": "skill_skill_passive_Name_453006311", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "Target=1", @@ -2934,6 +3625,11 @@ }, { "Id": 425002211, + "Name": { + "key": "skill_skill_passive_Name_425002211", + "text": "（被动）金蝉脱壳" + }, + "icon": "jn_25002_2", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -2955,6 +3651,11 @@ }, { "Id": 434005211, + "Name": { + "key": "skill_skill_passive_Name_434005211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=3，HasBuff=390001433", @@ -2976,6 +3677,11 @@ }, { "Id": 425002215, + "Name": { + "key": "skill_skill_passive_Name_425002215", + "text": "（被动）金蝉脱壳" + }, + "icon": "jn_25002_2", "When": 19, "FromCheck": "", "TargetCheck": "Target=1", @@ -2997,6 +3703,11 @@ }, { "Id": 445002211, + "Name": { + "key": "skill_skill_passive_Name_445002211", + "text": "" + }, + "icon": "", "When": 21, "FromCheck": "Target=3,HasBuff=2", "TargetCheck": "", @@ -3018,6 +3729,11 @@ }, { "Id": 445002213, + "Name": { + "key": "skill_skill_passive_Name_445002213", + "text": "" + }, + "icon": "", "When": 21, "FromCheck": "Target=2", "TargetCheck": "", @@ -3039,6 +3755,11 @@ }, { "Id": 444002313, + "Name": { + "key": "skill_skill_passive_Name_444002313", + "text": "" + }, + "icon": "", "When": 18, "FromCheck": "Target=1", "TargetCheck": "", @@ -3060,6 +3781,11 @@ }, { "Id": 400003001, + "Name": { + "key": "skill_skill_passive_Name_400003001", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -3081,6 +3807,11 @@ }, { "Id": 400006001, + "Name": { + "key": "skill_skill_passive_Name_400006001", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3102,6 +3833,11 @@ }, { "Id": 400007001, + "Name": { + "key": "skill_skill_passive_Name_400007001", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -3123,6 +3859,11 @@ }, { "Id": 400001401, + "Name": { + "key": "skill_skill_passive_Name_400001401", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -3145,6 +3886,11 @@ }, { "Id": 400001501, + "Name": { + "key": "skill_skill_passive_Name_400001501", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3166,6 +3912,11 @@ }, { "Id": 400001001, + "Name": { + "key": "skill_skill_passive_Name_400001001", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3,HasBuff=2", "TargetCheck": "", @@ -3187,6 +3938,11 @@ }, { "Id": 400009001, + "Name": { + "key": "skill_skill_passive_Name_400009001", + "text": "" + }, + "icon": "", "When": 21, "FromCheck": "Target=3,HasBuff=2", "TargetCheck": "", @@ -3208,6 +3964,11 @@ }, { "Id": 400001701, + "Name": { + "key": "skill_skill_passive_Name_400001701", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "Target=3", "TargetCheck": "2", @@ -3229,6 +3990,11 @@ }, { "Id": 400001901, + "Name": { + "key": "skill_skill_passive_Name_400001901", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3250,6 +4016,11 @@ }, { "Id": 411021111, + "Name": { + "key": "skill_skill_passive_Name_411021111", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "Target=3", @@ -3271,6 +4042,11 @@ }, { "Id": 451017111, + "Name": { + "key": "skill_skill_passive_Name_451017111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2,HasBuff=390001401", @@ -3292,6 +4068,11 @@ }, { "Id": 455005214, + "Name": { + "key": "skill_skill_passive_Name_455005214", + "text": "" + }, + "icon": "", "When": 21, "FromCheck": "Target=0", "TargetCheck": "", @@ -3313,6 +4094,11 @@ }, { "Id": 455002213, + "Name": { + "key": "skill_skill_passive_Name_455002213", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=300", @@ -3334,6 +4120,11 @@ }, { "Id": 455001211, + "Name": { + "key": "skill_skill_passive_Name_455001211", + "text": "（被动）触怒逆鳞" + }, + "icon": "jn_55001_2", "When": 15, "FromCheck": "Target=1", "TargetCheck": "Target=2", @@ -3355,6 +4146,11 @@ }, { "Id": 444004211, + "Name": { + "key": "skill_skill_passive_Name_444004211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -3377,6 +4173,11 @@ }, { "Id": 455007411, + "Name": { + "key": "skill_skill_passive_Name_455007411", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3,HasBuff=3", "TargetCheck": "Target=2", @@ -3398,6 +4199,11 @@ }, { "Id": 455007412, + "Name": { + "key": "skill_skill_passive_Name_455007412", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3419,6 +4225,11 @@ }, { "Id": 455001111, + "Name": { + "key": "skill_skill_passive_Name_455001111", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3440,6 +4251,11 @@ }, { "Id": 455002111, + "Name": { + "key": "skill_skill_passive_Name_455002111", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3461,6 +4277,11 @@ }, { "Id": 455003111, + "Name": { + "key": "skill_skill_passive_Name_455003111", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3482,6 +4303,11 @@ }, { "Id": 455004111, + "Name": { + "key": "skill_skill_passive_Name_455004111", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3503,6 +4329,11 @@ }, { "Id": 455005111, + "Name": { + "key": "skill_skill_passive_Name_455005111", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3524,6 +4355,11 @@ }, { "Id": 455006111, + "Name": { + "key": "skill_skill_passive_Name_455006111", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3545,6 +4381,11 @@ }, { "Id": 455007111, + "Name": { + "key": "skill_skill_passive_Name_455007111", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3566,6 +4407,11 @@ }, { "Id": 424008111, + "Name": { + "key": "skill_skill_passive_Name_424008111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -3589,6 +4435,11 @@ }, { "Id": 424008211, + "Name": { + "key": "skill_skill_passive_Name_424008211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -3612,6 +4463,11 @@ }, { "Id": 434008111, + "Name": { + "key": "skill_skill_passive_Name_434008111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -3635,6 +4491,11 @@ }, { "Id": 434008211, + "Name": { + "key": "skill_skill_passive_Name_434008211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -3658,6 +4519,11 @@ }, { "Id": 455007315, + "Name": { + "key": "skill_skill_passive_Name_455007315", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -3681,6 +4547,11 @@ }, { "Id": 451051211, + "Name": { + "key": "skill_skill_passive_Name_451051211", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=3", @@ -3702,6 +4573,11 @@ }, { "Id": 470009111, + "Name": { + "key": "skill_skill_passive_Name_470009111", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3723,6 +4599,11 @@ }, { "Id": 470009121, + "Name": { + "key": "skill_skill_passive_Name_470009121", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -3744,6 +4625,11 @@ }, { "Id": 470011111, + "Name": { + "key": "skill_skill_passive_Name_470011111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -3765,6 +4651,11 @@ }, { "Id": 470011121, + "Name": { + "key": "skill_skill_passive_Name_470011121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -3786,6 +4677,11 @@ }, { "Id": 470011123, + "Name": { + "key": "skill_skill_passive_Name_470011123", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=300", @@ -3807,6 +4703,11 @@ }, { "Id": 470012111, + "Name": { + "key": "skill_skill_passive_Name_470012111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -3829,6 +4730,11 @@ }, { "Id": 470012121, + "Name": { + "key": "skill_skill_passive_Name_470012121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -3851,6 +4757,11 @@ }, { "Id": 470013121, + "Name": { + "key": "skill_skill_passive_Name_470013121", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "", @@ -3872,6 +4783,11 @@ }, { "Id": 470015111, + "Name": { + "key": "skill_skill_passive_Name_470015111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -3893,6 +4809,11 @@ }, { "Id": 470015121, + "Name": { + "key": "skill_skill_passive_Name_470015121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -3914,6 +4835,11 @@ }, { "Id": 470015123, + "Name": { + "key": "skill_skill_passive_Name_470015123", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=300", @@ -3935,6 +4861,11 @@ }, { "Id": 470017111, + "Name": { + "key": "skill_skill_passive_Name_470017111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -3956,6 +4887,11 @@ }, { "Id": 470017121, + "Name": { + "key": "skill_skill_passive_Name_470017121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -3977,6 +4913,11 @@ }, { "Id": 470019111, + "Name": { + "key": "skill_skill_passive_Name_470019111", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -3998,6 +4939,11 @@ }, { "Id": 470019121, + "Name": { + "key": "skill_skill_passive_Name_470019121", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -4019,6 +4965,11 @@ }, { "Id": 470020111, + "Name": { + "key": "skill_skill_passive_Name_470020111", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=2", @@ -4040,6 +4991,11 @@ }, { "Id": 470020121, + "Name": { + "key": "skill_skill_passive_Name_470020121", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=2", @@ -4062,6 +5018,11 @@ }, { "Id": 470029111, + "Name": { + "key": "skill_skill_passive_Name_470029111", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -4083,6 +5044,11 @@ }, { "Id": 470029121, + "Name": { + "key": "skill_skill_passive_Name_470029121", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -4104,6 +5070,11 @@ }, { "Id": 470034111, + "Name": { + "key": "skill_skill_passive_Name_470034111", + "text": "" + }, + "icon": "", "When": 17, "FromCheck": "", "TargetCheck": "Target=3", @@ -4125,6 +5096,11 @@ }, { "Id": 470034121, + "Name": { + "key": "skill_skill_passive_Name_470034121", + "text": "" + }, + "icon": "", "When": 17, "FromCheck": "", "TargetCheck": "Target=3", @@ -4146,6 +5122,11 @@ }, { "Id": 470035111, + "Name": { + "key": "skill_skill_passive_Name_470035111", + "text": "" + }, + "icon": "", "When": 17, "FromCheck": "", "TargetCheck": "Target=3", @@ -4167,6 +5148,11 @@ }, { "Id": 470035121, + "Name": { + "key": "skill_skill_passive_Name_470035121", + "text": "" + }, + "icon": "", "When": 17, "FromCheck": "", "TargetCheck": "Target=3", @@ -4188,6 +5174,11 @@ }, { "Id": 470038111, + "Name": { + "key": "skill_skill_passive_Name_470038111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -4210,6 +5201,11 @@ }, { "Id": 470038121, + "Name": { + "key": "skill_skill_passive_Name_470038121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -4232,6 +5228,11 @@ }, { "Id": 470043111, + "Name": { + "key": "skill_skill_passive_Name_470043111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -4253,6 +5254,11 @@ }, { "Id": 470043121, + "Name": { + "key": "skill_skill_passive_Name_470043121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -4274,6 +5280,11 @@ }, { "Id": 470044111, + "Name": { + "key": "skill_skill_passive_Name_470044111", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -4295,6 +5306,11 @@ }, { "Id": 470044121, + "Name": { + "key": "skill_skill_passive_Name_470044121", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -4317,6 +5333,11 @@ }, { "Id": 470045111, + "Name": { + "key": "skill_skill_passive_Name_470045111", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -4338,6 +5359,11 @@ }, { "Id": 470045121, + "Name": { + "key": "skill_skill_passive_Name_470045121", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -4360,6 +5386,11 @@ }, { "Id": 470046111, + "Name": { + "key": "skill_skill_passive_Name_470046111", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=2", @@ -4381,6 +5412,11 @@ }, { "Id": 470046121, + "Name": { + "key": "skill_skill_passive_Name_470046121", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=1", @@ -4403,6 +5439,11 @@ }, { "Id": 470039111, + "Name": { + "key": "skill_skill_passive_Name_470039111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -4424,6 +5465,11 @@ }, { "Id": 470039121, + "Name": { + "key": "skill_skill_passive_Name_470039121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -4445,6 +5491,11 @@ }, { "Id": 470051111, + "Name": { + "key": "skill_skill_passive_Name_470051111", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "HasBuff=390001401,HasBuff=390001404", @@ -4466,6 +5517,11 @@ }, { "Id": 470051121, + "Name": { + "key": "skill_skill_passive_Name_470051121", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "HasBuff=390001401,HasBuff=390001404", @@ -4487,6 +5543,11 @@ }, { "Id": 470052111, + "Name": { + "key": "skill_skill_passive_Name_470052111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -4508,6 +5569,11 @@ }, { "Id": 470052121, + "Name": { + "key": "skill_skill_passive_Name_470052121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -4529,6 +5595,11 @@ }, { "Id": 470053111, + "Name": { + "key": "skill_skill_passive_Name_470053111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -4550,6 +5621,11 @@ }, { "Id": 470053121, + "Name": { + "key": "skill_skill_passive_Name_470053121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -4571,6 +5647,11 @@ }, { "Id": 470055111, + "Name": { + "key": "skill_skill_passive_Name_470055111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=2", "TargetCheck": "", @@ -4592,6 +5673,11 @@ }, { "Id": 470055121, + "Name": { + "key": "skill_skill_passive_Name_470055121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=2", "TargetCheck": "", @@ -4613,6 +5699,11 @@ }, { "Id": 470056111, + "Name": { + "key": "skill_skill_passive_Name_470056111", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001401,HasBuff=390001404", @@ -4634,6 +5725,11 @@ }, { "Id": 470056121, + "Name": { + "key": "skill_skill_passive_Name_470056121", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001401,HasBuff=390001404", @@ -4655,6 +5751,11 @@ }, { "Id": 470057111, + "Name": { + "key": "skill_skill_passive_Name_470057111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=400", @@ -4676,6 +5777,11 @@ }, { "Id": 270057122, + "Name": { + "key": "skill_skill_passive_Name_270057122", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=400", @@ -4698,6 +5804,11 @@ }, { "Id": 470058111, + "Name": { + "key": "skill_skill_passive_Name_470058111", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=3", @@ -4719,6 +5830,11 @@ }, { "Id": 470058121, + "Name": { + "key": "skill_skill_passive_Name_470058121", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=3", @@ -4741,6 +5857,11 @@ }, { "Id": 470064111, + "Name": { + "key": "skill_skill_passive_Name_470064111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -4762,6 +5883,11 @@ }, { "Id": 470064121, + "Name": { + "key": "skill_skill_passive_Name_470064121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -4783,6 +5909,11 @@ }, { "Id": 470065111, + "Name": { + "key": "skill_skill_passive_Name_470065111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001106", @@ -4805,6 +5936,11 @@ }, { "Id": 470065121, + "Name": { + "key": "skill_skill_passive_Name_470065121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001106", @@ -4826,6 +5962,11 @@ }, { "Id": 470066111, + "Name": { + "key": "skill_skill_passive_Name_470066111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -4847,6 +5988,11 @@ }, { "Id": 470066121, + "Name": { + "key": "skill_skill_passive_Name_470066121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -4868,6 +6014,11 @@ }, { "Id": 470067111, + "Name": { + "key": "skill_skill_passive_Name_470067111", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=2", @@ -4889,6 +6040,11 @@ }, { "Id": 470067121, + "Name": { + "key": "skill_skill_passive_Name_470067121", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=2", @@ -4910,6 +6066,11 @@ }, { "Id": 470068111, + "Name": { + "key": "skill_skill_passive_Name_470068111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -4931,6 +6092,11 @@ }, { "Id": 470068121, + "Name": { + "key": "skill_skill_passive_Name_470068121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -4952,6 +6118,11 @@ }, { "Id": 470069111, + "Name": { + "key": "skill_skill_passive_Name_470069111", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=2", @@ -4973,6 +6144,11 @@ }, { "Id": 470069121, + "Name": { + "key": "skill_skill_passive_Name_470069121", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=2", @@ -4994,6 +6170,11 @@ }, { "Id": 470070111, + "Name": { + "key": "skill_skill_passive_Name_470070111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5015,6 +6196,11 @@ }, { "Id": 470070121, + "Name": { + "key": "skill_skill_passive_Name_470070121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5036,6 +6222,11 @@ }, { "Id": 470071111, + "Name": { + "key": "skill_skill_passive_Name_470071111", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=2", @@ -5057,6 +6248,11 @@ }, { "Id": 470071121, + "Name": { + "key": "skill_skill_passive_Name_470071121", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=2", @@ -5078,6 +6274,11 @@ }, { "Id": 470072111, + "Name": { + "key": "skill_skill_passive_Name_470072111", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -5099,6 +6300,11 @@ }, { "Id": 470072121, + "Name": { + "key": "skill_skill_passive_Name_470072121", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -5120,6 +6326,11 @@ }, { "Id": 470073111, + "Name": { + "key": "skill_skill_passive_Name_470073111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5141,6 +6352,11 @@ }, { "Id": 470073121, + "Name": { + "key": "skill_skill_passive_Name_470073121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5162,6 +6378,11 @@ }, { "Id": 470074111, + "Name": { + "key": "skill_skill_passive_Name_470074111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5183,6 +6404,11 @@ }, { "Id": 470074121, + "Name": { + "key": "skill_skill_passive_Name_470074121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5204,6 +6430,11 @@ }, { "Id": 470075111, + "Name": { + "key": "skill_skill_passive_Name_470075111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5225,6 +6456,11 @@ }, { "Id": 470075121, + "Name": { + "key": "skill_skill_passive_Name_470075121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5246,6 +6482,11 @@ }, { "Id": 470076111, + "Name": { + "key": "skill_skill_passive_Name_470076111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5267,6 +6508,11 @@ }, { "Id": 470076121, + "Name": { + "key": "skill_skill_passive_Name_470076121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5288,6 +6534,11 @@ }, { "Id": 470077111, + "Name": { + "key": "skill_skill_passive_Name_470077111", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "", @@ -5309,6 +6560,11 @@ }, { "Id": 470077121, + "Name": { + "key": "skill_skill_passive_Name_470077121", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "", @@ -5330,6 +6586,11 @@ }, { "Id": 470078111, + "Name": { + "key": "skill_skill_passive_Name_470078111", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -5351,6 +6612,11 @@ }, { "Id": 470078121, + "Name": { + "key": "skill_skill_passive_Name_470078121", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -5373,6 +6639,11 @@ }, { "Id": 470079111, + "Name": { + "key": "skill_skill_passive_Name_470079111", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=2", @@ -5394,6 +6665,11 @@ }, { "Id": 470079121, + "Name": { + "key": "skill_skill_passive_Name_470079121", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=2", @@ -5415,6 +6691,11 @@ }, { "Id": 470079122, + "Name": { + "key": "skill_skill_passive_Name_470079122", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=1", @@ -5436,6 +6717,11 @@ }, { "Id": 470080111, + "Name": { + "key": "skill_skill_passive_Name_470080111", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -5457,6 +6743,11 @@ }, { "Id": 470080121, + "Name": { + "key": "skill_skill_passive_Name_470080121", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3", @@ -5478,6 +6769,11 @@ }, { "Id": 491003111, + "Name": { + "key": "skill_skill_passive_Name_491003111", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -5500,6 +6796,11 @@ }, { "Id": 491005111, + "Name": { + "key": "skill_skill_passive_Name_491005111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5521,6 +6822,11 @@ }, { "Id": 491006111, + "Name": { + "key": "skill_skill_passive_Name_491006111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5542,6 +6848,11 @@ }, { "Id": 491003211, + "Name": { + "key": "skill_skill_passive_Name_491003211", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -5564,6 +6875,11 @@ }, { "Id": 491005211, + "Name": { + "key": "skill_skill_passive_Name_491005211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5585,6 +6901,11 @@ }, { "Id": 491006211, + "Name": { + "key": "skill_skill_passive_Name_491006211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5606,6 +6927,11 @@ }, { "Id": 461004111, + "Name": { + "key": "skill_skill_passive_Name_461004111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -5627,6 +6953,11 @@ }, { "Id": 470016111, + "Name": { + "key": "skill_skill_passive_Name_470016111", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "", @@ -5648,6 +6979,11 @@ }, { "Id": 470016121, + "Name": { + "key": "skill_skill_passive_Name_470016121", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "", @@ -5670,6 +7006,11 @@ }, { "Id": 470063111, + "Name": { + "key": "skill_skill_passive_Name_470063111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2", @@ -5691,6 +7032,11 @@ }, { "Id": 470063121, + "Name": { + "key": "skill_skill_passive_Name_470063121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2", @@ -5712,6 +7058,11 @@ }, { "Id": 491007111, + "Name": { + "key": "skill_skill_passive_Name_491007111", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -5735,6 +7086,11 @@ }, { "Id": 491002211, + "Name": { + "key": "skill_skill_passive_Name_491002211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -5756,6 +7112,11 @@ }, { "Id": 491007211, + "Name": { + "key": "skill_skill_passive_Name_491007211", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -5779,6 +7140,11 @@ }, { "Id": 481300121, + "Name": { + "key": "skill_skill_passive_Name_481300121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2,HasBuff=390001109", @@ -5800,6 +7166,11 @@ }, { "Id": 481300122, + "Name": { + "key": "skill_skill_passive_Name_481300122", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "Target=2,HpproGreater=500", @@ -5821,6 +7192,11 @@ }, { "Id": 481300131, + "Name": { + "key": "skill_skill_passive_Name_481300131", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3,HpproGreater=500", @@ -5842,6 +7218,11 @@ }, { "Id": 481300132, + "Name": { + "key": "skill_skill_passive_Name_481300132", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -5863,6 +7244,11 @@ }, { "Id": 481300221, + "Name": { + "key": "skill_skill_passive_Name_481300221", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "", "TargetCheck": "Target=2,Hpproless=500", @@ -5884,6 +7270,11 @@ }, { "Id": 481300222, + "Name": { + "key": "skill_skill_passive_Name_481300222", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001401", @@ -5905,6 +7296,11 @@ }, { "Id": 481300321, + "Name": { + "key": "skill_skill_passive_Name_481300321", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=600", @@ -5926,6 +7322,11 @@ }, { "Id": 481300421, + "Name": { + "key": "skill_skill_passive_Name_481300421", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=600", @@ -5947,6 +7348,11 @@ }, { "Id": 481300422, + "Name": { + "key": "skill_skill_passive_Name_481300422", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=600", @@ -5968,6 +7374,11 @@ }, { "Id": 481300521, + "Name": { + "key": "skill_skill_passive_Name_481300521", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -5989,6 +7400,11 @@ }, { "Id": 481300522, + "Name": { + "key": "skill_skill_passive_Name_481300522", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3", @@ -6010,6 +7426,11 @@ }, { "Id": 481400121, + "Name": { + "key": "skill_skill_passive_Name_481400121", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=2", @@ -6031,6 +7452,11 @@ }, { "Id": 481400122, + "Name": { + "key": "skill_skill_passive_Name_481400122", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -6052,6 +7478,11 @@ }, { "Id": 481400123, + "Name": { + "key": "skill_skill_passive_Name_481400123", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=600", @@ -6073,6 +7504,11 @@ }, { "Id": 481400221, + "Name": { + "key": "skill_skill_passive_Name_481400221", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -6094,6 +7530,11 @@ }, { "Id": 481400321, + "Name": { + "key": "skill_skill_passive_Name_481400321", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -6115,6 +7556,11 @@ }, { "Id": 481400521, + "Name": { + "key": "skill_skill_passive_Name_481400521", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -6136,6 +7582,11 @@ }, { "Id": 481400721, + "Name": { + "key": "skill_skill_passive_Name_481400721", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -6157,6 +7608,11 @@ }, { "Id": 481400722, + "Name": { + "key": "skill_skill_passive_Name_481400722", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=3", @@ -6178,6 +7634,11 @@ }, { "Id": 481400723, + "Name": { + "key": "skill_skill_passive_Name_481400723", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3,HasBuff=390001104", "TargetCheck": "", @@ -6199,6 +7660,11 @@ }, { "Id": 481500221, + "Name": { + "key": "skill_skill_passive_Name_481500221", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,HpproGreater=600", @@ -6220,6 +7686,11 @@ }, { "Id": 481500222, + "Name": { + "key": "skill_skill_passive_Name_481500222", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3,HasBuff=390001205,OverlayNum=8", @@ -6241,6 +7712,11 @@ }, { "Id": 481500321, + "Name": { + "key": "skill_skill_passive_Name_481500321", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=3", @@ -6262,6 +7738,11 @@ }, { "Id": 481500421, + "Name": { + "key": "skill_skill_passive_Name_481500421", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3,HpproGreater=600", @@ -6283,6 +7764,11 @@ }, { "Id": 481500422, + "Name": { + "key": "skill_skill_passive_Name_481500422", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "Target=2,AVless=0", @@ -6304,6 +7790,11 @@ }, { "Id": 481500521, + "Name": { + "key": "skill_skill_passive_Name_481500521", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -6325,6 +7816,11 @@ }, { "Id": 481500522, + "Name": { + "key": "skill_skill_passive_Name_481500522", + "text": "" + }, + "icon": "", "When": 17, "FromCheck": "Target=3", "TargetCheck": "", @@ -6346,6 +7842,11 @@ }, { "Id": 482300421, + "Name": { + "key": "skill_skill_passive_Name_482300421", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3,HpproGreater=600", @@ -6367,6 +7868,11 @@ }, { "Id": 482300422, + "Name": { + "key": "skill_skill_passive_Name_482300422", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,HasBuff=390001105", @@ -6388,6 +7894,11 @@ }, { "Id": 482400111, + "Name": { + "key": "skill_skill_passive_Name_482400111", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -6409,6 +7920,11 @@ }, { "Id": 482400121, + "Name": { + "key": "skill_skill_passive_Name_482400121", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3,HpproGreater=600", @@ -6430,6 +7946,11 @@ }, { "Id": 482400221, + "Name": { + "key": "skill_skill_passive_Name_482400221", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3,Hpproless=1000", "TargetCheck": "", @@ -6451,6 +7972,11 @@ }, { "Id": 482400222, + "Name": { + "key": "skill_skill_passive_Name_482400222", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=3,HasBuff=390001211", @@ -6473,6 +7999,11 @@ }, { "Id": 482400321, + "Name": { + "key": "skill_skill_passive_Name_482400321", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -6494,6 +8025,11 @@ }, { "Id": 482400421, + "Name": { + "key": "skill_skill_passive_Name_482400421", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,Hpproless=500", @@ -6515,6 +8051,11 @@ }, { "Id": 482400422, + "Name": { + "key": "skill_skill_passive_Name_482400422", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001105", @@ -6536,6 +8077,11 @@ }, { "Id": 482400521, + "Name": { + "key": "skill_skill_passive_Name_482400521", + "text": "" + }, + "icon": "", "When": 1, "FromCheck": "", "TargetCheck": "Target=3", @@ -6557,6 +8103,11 @@ }, { "Id": 482400522, + "Name": { + "key": "skill_skill_passive_Name_482400522", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3", @@ -6578,6 +8129,11 @@ }, { "Id": 482400523, + "Name": { + "key": "skill_skill_passive_Name_482400523", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3,SkillPose=-1,CD=1", @@ -6599,6 +8155,11 @@ }, { "Id": 482400821, + "Name": { + "key": "skill_skill_passive_Name_482400821", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3,Hpproless=1000", "TargetCheck": "", @@ -6620,6 +8181,11 @@ }, { "Id": 482400921, + "Name": { + "key": "skill_skill_passive_Name_482400921", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -6641,6 +8207,11 @@ }, { "Id": 482400922, + "Name": { + "key": "skill_skill_passive_Name_482400922", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "Target=2,HasBuff=2", @@ -6662,6 +8233,11 @@ }, { "Id": 482500121, + "Name": { + "key": "skill_skill_passive_Name_482500121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=300", @@ -6683,6 +8259,11 @@ }, { "Id": 482500122, + "Name": { + "key": "skill_skill_passive_Name_482500122", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -6704,6 +8285,11 @@ }, { "Id": 482500421, + "Name": { + "key": "skill_skill_passive_Name_482500421", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3,Hpproless=1000", "TargetCheck": "", @@ -6725,6 +8311,11 @@ }, { "Id": 482500422, + "Name": { + "key": "skill_skill_passive_Name_482500422", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=1,HasBuff=2", @@ -6746,6 +8337,11 @@ }, { "Id": 483300121, + "Name": { + "key": "skill_skill_passive_Name_483300121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -6767,6 +8363,11 @@ }, { "Id": 483300122, + "Name": { + "key": "skill_skill_passive_Name_483300122", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001106", @@ -6788,6 +8389,11 @@ }, { "Id": 483300123, + "Name": { + "key": "skill_skill_passive_Name_483300123", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001008", @@ -6809,6 +8415,11 @@ }, { "Id": 483300221, + "Name": { + "key": "skill_skill_passive_Name_483300221", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=600", @@ -6830,6 +8441,11 @@ }, { "Id": 483300222, + "Name": { + "key": "skill_skill_passive_Name_483300222", + "text": "" + }, + "icon": "", "When": 3, "FromCheck": "Target=3,NoBuff=1", "TargetCheck": "", @@ -6851,6 +8467,11 @@ }, { "Id": 483300311, + "Name": { + "key": "skill_skill_passive_Name_483300311", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -6873,6 +8494,11 @@ }, { "Id": 483300321, + "Name": { + "key": "skill_skill_passive_Name_483300321", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -6894,6 +8520,11 @@ }, { "Id": 483300322, + "Name": { + "key": "skill_skill_passive_Name_483300322", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -6915,6 +8546,11 @@ }, { "Id": 483400221, + "Name": { + "key": "skill_skill_passive_Name_483400221", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -6936,6 +8572,11 @@ }, { "Id": 483400321, + "Name": { + "key": "skill_skill_passive_Name_483400321", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3,Hpproless=1000", "TargetCheck": "", @@ -6957,6 +8598,11 @@ }, { "Id": 483400322, + "Name": { + "key": "skill_skill_passive_Name_483400322", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -6978,6 +8624,11 @@ }, { "Id": 483400521, + "Name": { + "key": "skill_skill_passive_Name_483400521", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "", @@ -6999,6 +8650,11 @@ }, { "Id": 483400522, + "Name": { + "key": "skill_skill_passive_Name_483400522", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -7020,6 +8676,11 @@ }, { "Id": 483400621, + "Name": { + "key": "skill_skill_passive_Name_483400621", + "text": "" + }, + "icon": "", "When": 1, "FromCheck": "", "TargetCheck": "Target=3", @@ -7041,6 +8702,11 @@ }, { "Id": 483400622, + "Name": { + "key": "skill_skill_passive_Name_483400622", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3", @@ -7062,6 +8728,11 @@ }, { "Id": 483400623, + "Name": { + "key": "skill_skill_passive_Name_483400623", + "text": "" + }, + "icon": "", "When": 1, "FromCheck": "", "TargetCheck": "Target=3", @@ -7083,6 +8754,11 @@ }, { "Id": 483400721, + "Name": { + "key": "skill_skill_passive_Name_483400721", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=300", @@ -7104,6 +8780,11 @@ }, { "Id": 483400722, + "Name": { + "key": "skill_skill_passive_Name_483400722", + "text": "" + }, + "icon": "", "When": 5, "FromCheck": "", "TargetCheck": "Target=3,HasBuff=390001434", @@ -7125,6 +8806,11 @@ }, { "Id": 483400821, + "Name": { + "key": "skill_skill_passive_Name_483400821", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -7146,6 +8832,11 @@ }, { "Id": 483400822, + "Name": { + "key": "skill_skill_passive_Name_483400822", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "Target=2,HasBuff=2", @@ -7167,6 +8858,11 @@ }, { "Id": 483500121, + "Name": { + "key": "skill_skill_passive_Name_483500121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -7188,6 +8884,11 @@ }, { "Id": 483500221, + "Name": { + "key": "skill_skill_passive_Name_483500221", + "text": "" + }, + "icon": "", "When": 1, "FromCheck": "", "TargetCheck": "Target=3", @@ -7209,6 +8910,11 @@ }, { "Id": 483500222, + "Name": { + "key": "skill_skill_passive_Name_483500222", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3", @@ -7230,6 +8936,11 @@ }, { "Id": 483500223, + "Name": { + "key": "skill_skill_passive_Name_483500223", + "text": "" + }, + "icon": "", "When": 31, "FromCheck": "Target=3,HasBuff=1", "TargetCheck": "Target=2", @@ -7251,6 +8962,11 @@ }, { "Id": 483500224, + "Name": { + "key": "skill_skill_passive_Name_483500224", + "text": "" + }, + "icon": "", "When": 28, "FromCheck": "Target=3", "TargetCheck": "Target=2,HasBuff=1", @@ -7272,6 +8988,11 @@ }, { "Id": 483500421, + "Name": { + "key": "skill_skill_passive_Name_483500421", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "", @@ -7293,6 +9014,11 @@ }, { "Id": 483500621, + "Name": { + "key": "skill_skill_passive_Name_483500621", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -7314,6 +9040,11 @@ }, { "Id": 483500622, + "Name": { + "key": "skill_skill_passive_Name_483500622", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3,SKILLSPACE=-1,CD=1", @@ -7335,6 +9066,11 @@ }, { "Id": 484300121, + "Name": { + "key": "skill_skill_passive_Name_484300121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -7356,6 +9092,11 @@ }, { "Id": 484300122, + "Name": { + "key": "skill_skill_passive_Name_484300122", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "", "TargetCheck": "Target=3,SKILLSPACE=-1,CD=1", @@ -7377,6 +9118,11 @@ }, { "Id": 484300221, + "Name": { + "key": "skill_skill_passive_Name_484300221", + "text": "" + }, + "icon": "", "When": 1, "FromCheck": "", "TargetCheck": "Target=3", @@ -7398,6 +9144,11 @@ }, { "Id": 484300222, + "Name": { + "key": "skill_skill_passive_Name_484300222", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=1", @@ -7419,6 +9170,11 @@ }, { "Id": 484300321, + "Name": { + "key": "skill_skill_passive_Name_484300321", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -7440,6 +9196,11 @@ }, { "Id": 484300621, + "Name": { + "key": "skill_skill_passive_Name_484300621", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3,HasBuff=2", "TargetCheck": "", @@ -7461,6 +9222,11 @@ }, { "Id": 484300622, + "Name": { + "key": "skill_skill_passive_Name_484300622", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "Target=3", "TargetCheck": "Target=1,HasBuff=3", @@ -7482,6 +9248,11 @@ }, { "Id": 484400121, + "Name": { + "key": "skill_skill_passive_Name_484400121", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -7503,6 +9274,11 @@ }, { "Id": 484400122, + "Name": { + "key": "skill_skill_passive_Name_484400122", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -7524,6 +9300,11 @@ }, { "Id": 484400123, + "Name": { + "key": "skill_skill_passive_Name_484400123", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -7545,6 +9326,11 @@ }, { "Id": 484400421, + "Name": { + "key": "skill_skill_passive_Name_484400421", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=300", @@ -7566,6 +9352,11 @@ }, { "Id": 484400521, + "Name": { + "key": "skill_skill_passive_Name_484400521", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3,Hpproless=1000", "TargetCheck": "", @@ -7587,6 +9378,11 @@ }, { "Id": 484400522, + "Name": { + "key": "skill_skill_passive_Name_484400522", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "", "TargetCheck": "Target=2", @@ -7608,6 +9404,11 @@ }, { "Id": 484400621, + "Name": { + "key": "skill_skill_passive_Name_484400621", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -7629,6 +9430,11 @@ }, { "Id": 484500121, + "Name": { + "key": "skill_skill_passive_Name_484500121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -7650,6 +9456,11 @@ }, { "Id": 484500122, + "Name": { + "key": "skill_skill_passive_Name_484500122", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -7671,6 +9482,11 @@ }, { "Id": 484500321, + "Name": { + "key": "skill_skill_passive_Name_484500321", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -7692,6 +9508,11 @@ }, { "Id": 490067001, + "Name": { + "key": "skill_skill_passive_Name_490067001", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "", @@ -7713,6 +9534,11 @@ }, { "Id": 490068001, + "Name": { + "key": "skill_skill_passive_Name_490068001", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3,Hpproless=500", "TargetCheck": "", @@ -7734,6 +9560,11 @@ }, { "Id": 491300141, + "Name": { + "key": "skill_skill_passive_Name_491300141", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -7755,6 +9586,11 @@ }, { "Id": 491300311, + "Name": { + "key": "skill_skill_passive_Name_491300311", + "text": "" + }, + "icon": "", "When": 2, "FromCheck": "Target=3", "TargetCheck": "Target=2,HasBuff=390001113", @@ -7776,6 +9612,11 @@ }, { "Id": 491300531, + "Name": { + "key": "skill_skill_passive_Name_491300531", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "Target=3", "TargetCheck": "Target=1,HasBuff=390001001", @@ -7797,6 +9638,11 @@ }, { "Id": 491400131, + "Name": { + "key": "skill_skill_passive_Name_491400131", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=3,HasBuff=390001202,OverlayNum=10", @@ -7818,6 +9664,11 @@ }, { "Id": 491400132, + "Name": { + "key": "skill_skill_passive_Name_491400132", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3,HasBuff=390001202", "TargetCheck": "", @@ -7839,6 +9690,11 @@ }, { "Id": 491400831, + "Name": { + "key": "skill_skill_passive_Name_491400831", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -7860,6 +9716,11 @@ }, { "Id": 491400331, + "Name": { + "key": "skill_skill_passive_Name_491400331", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=1", @@ -7881,6 +9742,11 @@ }, { "Id": 491400531, + "Name": { + "key": "skill_skill_passive_Name_491400531", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "Target=2,NoBuff=3", @@ -7902,6 +9768,11 @@ }, { "Id": 491400532, + "Name": { + "key": "skill_skill_passive_Name_491400532", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -7923,6 +9794,11 @@ }, { "Id": 491400731, + "Name": { + "key": "skill_skill_passive_Name_491400731", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "Target=2,DefCompare=0", @@ -7944,6 +9820,11 @@ }, { "Id": 491400732, + "Name": { + "key": "skill_skill_passive_Name_491400732", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "Target=2,DefCompare=0", @@ -7965,6 +9846,11 @@ }, { "Id": 491500231, + "Name": { + "key": "skill_skill_passive_Name_491500231", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=1", @@ -7986,6 +9872,11 @@ }, { "Id": 491500232, + "Name": { + "key": "skill_skill_passive_Name_491500232", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8007,6 +9898,11 @@ }, { "Id": 491500233, + "Name": { + "key": "skill_skill_passive_Name_491500233", + "text": "" + }, + "icon": "", "When": 17, "FromCheck": "Target=3", "TargetCheck": "", @@ -8028,6 +9924,11 @@ }, { "Id": 491500531, + "Name": { + "key": "skill_skill_passive_Name_491500531", + "text": "" + }, + "icon": "", "When": 5, "FromCheck": "", "TargetCheck": "Target=1,NoBuff=1", @@ -8049,6 +9950,11 @@ }, { "Id": 491500532, + "Name": { + "key": "skill_skill_passive_Name_491500532", + "text": "" + }, + "icon": "", "When": 17, "FromCheck": "Target=3", "TargetCheck": "", @@ -8070,6 +9976,11 @@ }, { "Id": 492400831, + "Name": { + "key": "skill_skill_passive_Name_492400831", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8093,6 +10004,11 @@ }, { "Id": 492400931, + "Name": { + "key": "skill_skill_passive_Name_492400931", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -8114,6 +10030,11 @@ }, { "Id": 492500131, + "Name": { + "key": "skill_skill_passive_Name_492500131", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,HasBuff=390001209", @@ -8136,6 +10057,11 @@ }, { "Id": 492500431, + "Name": { + "key": "skill_skill_passive_Name_492500431", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "Target=3", "TargetCheck": "", @@ -8157,6 +10083,11 @@ }, { "Id": 493300331, + "Name": { + "key": "skill_skill_passive_Name_493300331", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8179,6 +10110,11 @@ }, { "Id": 493400331, + "Name": { + "key": "skill_skill_passive_Name_493400331", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "", "TargetCheck": "Target=2,NoBuff=3", @@ -8200,6 +10136,11 @@ }, { "Id": 493400531, + "Name": { + "key": "skill_skill_passive_Name_493400531", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001401", @@ -8221,6 +10162,11 @@ }, { "Id": 493400631, + "Name": { + "key": "skill_skill_passive_Name_493400631", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001008", @@ -8242,6 +10188,11 @@ }, { "Id": 493400731, + "Name": { + "key": "skill_skill_passive_Name_493400731", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -8264,6 +10215,11 @@ }, { "Id": 493500431, + "Name": { + "key": "skill_skill_passive_Name_493500431", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "Target=3", "TargetCheck": "", @@ -8285,6 +10241,11 @@ }, { "Id": 494300331, + "Name": { + "key": "skill_skill_passive_Name_494300331", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "", @@ -8306,6 +10267,11 @@ }, { "Id": 494300631, + "Name": { + "key": "skill_skill_passive_Name_494300631", + "text": "" + }, + "icon": "", "When": 7, "FromCheck": "", "TargetCheck": "Target=1,Hpproless=500", @@ -8327,6 +10293,11 @@ }, { "Id": 494400131, + "Name": { + "key": "skill_skill_passive_Name_494400131", + "text": "" + }, + "icon": "", "When": 4, "FromCheck": "", "TargetCheck": "Target=2,HpproGreater=600", @@ -8348,6 +10319,11 @@ }, { "Id": 494400531, + "Name": { + "key": "skill_skill_passive_Name_494400531", + "text": "" + }, + "icon": "", "When": 28, "FromCheck": "Target=3", "TargetCheck": "", @@ -8369,6 +10345,11 @@ }, { "Id": 494400532, + "Name": { + "key": "skill_skill_passive_Name_494400532", + "text": "" + }, + "icon": "", "When": 29, "FromCheck": "Target=3", "TargetCheck": "", @@ -8390,6 +10371,11 @@ }, { "Id": 494400433, + "Name": { + "key": "skill_skill_passive_Name_494400433", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8411,6 +10397,11 @@ }, { "Id": 494400631, + "Name": { + "key": "skill_skill_passive_Name_494400631", + "text": "" + }, + "icon": "", "When": 28, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=1", @@ -8432,6 +10423,11 @@ }, { "Id": 494400632, + "Name": { + "key": "skill_skill_passive_Name_494400632", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "Target=2", @@ -8453,6 +10449,11 @@ }, { "Id": 494500131, + "Name": { + "key": "skill_skill_passive_Name_494500131", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "Target=3", "TargetCheck": "", @@ -8474,6 +10475,11 @@ }, { "Id": 494500132, + "Name": { + "key": "skill_skill_passive_Name_494500132", + "text": "" + }, + "icon": "", "When": 18, "FromCheck": "Target=3", "TargetCheck": "Target=1", @@ -8495,6 +10501,11 @@ }, { "Id": 494500321, + "Name": { + "key": "skill_skill_passive_Name_494500321", + "text": "" + }, + "icon": "", "When": 30, "FromCheck": "Target=3", "TargetCheck": "Target=1", @@ -8516,6 +10527,11 @@ }, { "Id": 434007211, + "Name": { + "key": "skill_skill_passive_Name_434007211", + "text": "" + }, + "icon": "", "When": 28, "FromCheck": "Target=3", "TargetCheck": "", @@ -8537,6 +10553,11 @@ }, { "Id": 475003211, + "Name": { + "key": "skill_skill_passive_Name_475003211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=2", "TargetCheck": "Target=3", @@ -8560,6 +10581,11 @@ }, { "Id": 475005211, + "Name": { + "key": "skill_skill_passive_Name_475005211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3,HasBuff=390001211", "TargetCheck": "", @@ -8581,6 +10607,11 @@ }, { "Id": 413002211, + "Name": { + "key": "skill_skill_passive_Name_413002211", + "text": "（被动）潜行伏击" + }, + "icon": "jn_13002_2", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8602,6 +10633,11 @@ }, { "Id": 491300211, + "Name": { + "key": "skill_skill_passive_Name_491300211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8623,6 +10659,11 @@ }, { "Id": 491400231, + "Name": { + "key": "skill_skill_passive_Name_491400231", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3", @@ -8646,6 +10687,11 @@ }, { "Id": 491300532, + "Name": { + "key": "skill_skill_passive_Name_491300532", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "Target=3", "TargetCheck": "", @@ -8667,6 +10713,11 @@ }, { "Id": 491300533, + "Name": { + "key": "skill_skill_passive_Name_491300533", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "Target=3", "TargetCheck": "", @@ -8688,6 +10739,11 @@ }, { "Id": 491500431, + "Name": { + "key": "skill_skill_passive_Name_491500431", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8709,6 +10765,11 @@ }, { "Id": 491500432, + "Name": { + "key": "skill_skill_passive_Name_491500432", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8730,6 +10791,11 @@ }, { "Id": 492300332, + "Name": { + "key": "skill_skill_passive_Name_492300332", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "Target=3", "TargetCheck": "", @@ -8751,6 +10817,11 @@ }, { "Id": 491300331, + "Name": { + "key": "skill_skill_passive_Name_491300331", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8772,6 +10843,11 @@ }, { "Id": 491500331, + "Name": { + "key": "skill_skill_passive_Name_491500331", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8793,6 +10869,11 @@ }, { "Id": 491500332, + "Name": { + "key": "skill_skill_passive_Name_491500332", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8814,6 +10895,11 @@ }, { "Id": 492300431, + "Name": { + "key": "skill_skill_passive_Name_492300431", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8835,6 +10921,11 @@ }, { "Id": 492400131, + "Name": { + "key": "skill_skill_passive_Name_492400131", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8856,6 +10947,11 @@ }, { "Id": 492400132, + "Name": { + "key": "skill_skill_passive_Name_492400132", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8877,6 +10973,11 @@ }, { "Id": 492400231, + "Name": { + "key": "skill_skill_passive_Name_492400231", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8898,6 +10999,11 @@ }, { "Id": 492400331, + "Name": { + "key": "skill_skill_passive_Name_492400331", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8919,6 +11025,11 @@ }, { "Id": 492400431, + "Name": { + "key": "skill_skill_passive_Name_492400431", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -8940,6 +11051,11 @@ }, { "Id": 492400432, + "Name": { + "key": "skill_skill_passive_Name_492400432", + "text": "" + }, + "icon": "", "When": 3, "FromCheck": "Target=3", "TargetCheck": "", @@ -8961,6 +11077,11 @@ }, { "Id": 492400531, + "Name": { + "key": "skill_skill_passive_Name_492400531", + "text": "" + }, + "icon": "", "When": 3, "FromCheck": "Target=3", "TargetCheck": "", @@ -8982,6 +11103,11 @@ }, { "Id": 493300131, + "Name": { + "key": "skill_skill_passive_Name_493300131", + "text": "" + }, + "icon": "", "When": 3, "FromCheck": "Target=3", "TargetCheck": "", @@ -9003,6 +11129,11 @@ }, { "Id": 493400231, + "Name": { + "key": "skill_skill_passive_Name_493400231", + "text": "" + }, + "icon": "", "When": 3, "FromCheck": "", "TargetCheck": "Target=3", @@ -9024,6 +11155,11 @@ }, { "Id": 493400831, + "Name": { + "key": "skill_skill_passive_Name_493400831", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9045,6 +11181,11 @@ }, { "Id": 493500231, + "Name": { + "key": "skill_skill_passive_Name_493500231", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "Target=3", "TargetCheck": "", @@ -9066,6 +11207,11 @@ }, { "Id": 493500531, + "Name": { + "key": "skill_skill_passive_Name_493500531", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9087,6 +11233,11 @@ }, { "Id": 493500631, + "Name": { + "key": "skill_skill_passive_Name_493500631", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "Target=3", "TargetCheck": "", @@ -9108,6 +11259,11 @@ }, { "Id": 494300131, + "Name": { + "key": "skill_skill_passive_Name_494300131", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9129,6 +11285,11 @@ }, { "Id": 494300231, + "Name": { + "key": "skill_skill_passive_Name_494300231", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9150,6 +11311,11 @@ }, { "Id": 481300123, + "Name": { + "key": "skill_skill_passive_Name_481300123", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9171,6 +11337,11 @@ }, { "Id": 481300211, + "Name": { + "key": "skill_skill_passive_Name_481300211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9192,6 +11363,11 @@ }, { "Id": 484500322, + "Name": { + "key": "skill_skill_passive_Name_484500322", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9213,6 +11389,11 @@ }, { "Id": 491400332, + "Name": { + "key": "skill_skill_passive_Name_491400332", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9234,6 +11415,11 @@ }, { "Id": 453007211, + "Name": { + "key": "skill_skill_passive_Name_453007211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9255,6 +11441,11 @@ }, { "Id": 494400533, + "Name": { + "key": "skill_skill_passive_Name_494400533", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9276,6 +11467,11 @@ }, { "Id": 435001213, + "Name": { + "key": "skill_skill_passive_Name_435001213", + "text": "" + }, + "icon": "", "When": 18, "FromCheck": "", "TargetCheck": "Target=3", @@ -9297,6 +11493,11 @@ }, { "Id": 493400232, + "Name": { + "key": "skill_skill_passive_Name_493400232", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "", "TargetCheck": "Target=3", @@ -9318,6 +11519,11 @@ }, { "Id": 481300223, + "Name": { + "key": "skill_skill_passive_Name_481300223", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9339,6 +11545,11 @@ }, { "Id": 481300423, + "Name": { + "key": "skill_skill_passive_Name_481300423", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9360,6 +11571,11 @@ }, { "Id": 481400322, + "Name": { + "key": "skill_skill_passive_Name_481400322", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2", @@ -9381,6 +11597,11 @@ }, { "Id": 491300332, + "Name": { + "key": "skill_skill_passive_Name_491300332", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2", @@ -9402,6 +11623,11 @@ }, { "Id": 481500211, + "Name": { + "key": "skill_skill_passive_Name_481500211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9423,6 +11649,11 @@ }, { "Id": 482500431, + "Name": { + "key": "skill_skill_passive_Name_482500431", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3,Hpproless=1000", "TargetCheck": "", @@ -9444,6 +11675,11 @@ }, { "Id": 482500423, + "Name": { + "key": "skill_skill_passive_Name_482500423", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "Target=3", "TargetCheck": "", @@ -9465,6 +11701,11 @@ }, { "Id": 482400322, + "Name": { + "key": "skill_skill_passive_Name_482400322", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "Target=3", "TargetCheck": "", @@ -9486,6 +11727,11 @@ }, { "Id": 482400323, + "Name": { + "key": "skill_skill_passive_Name_482400323", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "Target=3", "TargetCheck": "", @@ -9507,6 +11753,11 @@ }, { "Id": 483400624, + "Name": { + "key": "skill_skill_passive_Name_483400624", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9528,6 +11779,11 @@ }, { "Id": 482500123, + "Name": { + "key": "skill_skill_passive_Name_482500123", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9549,6 +11805,11 @@ }, { "Id": 484400523, + "Name": { + "key": "skill_skill_passive_Name_484400523", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9570,6 +11831,11 @@ }, { "Id": 481300212, + "Name": { + "key": "skill_skill_passive_Name_481300212", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9591,6 +11857,11 @@ }, { "Id": 481500423, + "Name": { + "key": "skill_skill_passive_Name_481500423", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9612,6 +11883,11 @@ }, { "Id": 413002212, + "Name": { + "key": "skill_skill_passive_Name_413002212", + "text": "（被动）潜行伏击" + }, + "icon": "jn_13002_2", "When": 28, "FromCheck": "", "TargetCheck": "Target=2", @@ -9633,6 +11909,11 @@ }, { "Id": 423003311, + "Name": { + "key": "skill_skill_passive_Name_423003311", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "", "TargetCheck": "Target=1", @@ -9654,6 +11935,11 @@ }, { "Id": 443002312, + "Name": { + "key": "skill_skill_passive_Name_443002312", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=391000092,OverlayNum=6", @@ -9676,6 +11962,11 @@ }, { "Id": 445001211, + "Name": { + "key": "skill_skill_passive_Name_445001211", + "text": "（被动）点到即止" + }, + "icon": "jn_45001_2", "When": 2, "FromCheck": "", "TargetCheck": "Target=3", @@ -9697,6 +11988,11 @@ }, { "Id": 445001212, + "Name": { + "key": "skill_skill_passive_Name_445001212", + "text": "（被动）点到即止" + }, + "icon": "jn_45001_2", "When": 19, "FromCheck": "", "TargetCheck": "Target=1", @@ -9718,6 +12014,11 @@ }, { "Id": 434004211, + "Name": { + "key": "skill_skill_passive_Name_434004211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9739,6 +12040,11 @@ }, { "Id": 434004212, + "Name": { + "key": "skill_skill_passive_Name_434004212", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3,HasBuff=391000098", "TargetCheck": "Target=2", @@ -9760,6 +12066,11 @@ }, { "Id": 423011311, + "Name": { + "key": "skill_skill_passive_Name_423011311", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -9781,6 +12092,11 @@ }, { "Id": 445012311, + "Name": { + "key": "skill_skill_passive_Name_445012311", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=3", @@ -9802,6 +12118,11 @@ }, { "Id": 435012211, + "Name": { + "key": "skill_skill_passive_Name_435012211", + "text": "" + }, + "icon": "", "When": 21, "FromCheck": "Target=3", "TargetCheck": "", @@ -9824,6 +12145,11 @@ }, { "Id": 445004111, + "Name": { + "key": "skill_skill_passive_Name_445004111", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9845,6 +12171,11 @@ }, { "Id": 445004221, + "Name": { + "key": "skill_skill_passive_Name_445004221", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -9866,6 +12197,11 @@ }, { "Id": 482301131, + "Name": { + "key": "skill_skill_passive_Name_482301131", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -9887,6 +12223,11 @@ }, { "Id": 492301121, + "Name": { + "key": "skill_skill_passive_Name_492301121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001404", @@ -9908,6 +12249,11 @@ }, { "Id": 483500321, + "Name": { + "key": "skill_skill_passive_Name_483500321", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=500", @@ -9929,6 +12275,11 @@ }, { "Id": 483500322, + "Name": { + "key": "skill_skill_passive_Name_483500322", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,HasBuff=391000095,OverlayNum=10", @@ -9950,6 +12301,11 @@ }, { "Id": 483500323, + "Name": { + "key": "skill_skill_passive_Name_483500323", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,HasBuff=391000095", @@ -9972,6 +12328,11 @@ }, { "Id": 483300521, + "Name": { + "key": "skill_skill_passive_Name_483300521", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=600", @@ -9993,6 +12354,11 @@ }, { "Id": 483300522, + "Name": { + "key": "skill_skill_passive_Name_483300522", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10014,6 +12380,11 @@ }, { "Id": 493300531, + "Name": { + "key": "skill_skill_passive_Name_493300531", + "text": "" + }, + "icon": "", "When": 29, "FromCheck": "Target=3", "TargetCheck": "", @@ -10035,6 +12406,11 @@ }, { "Id": 451105211, + "Name": { + "key": "skill_skill_passive_Name_451105211", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -10056,6 +12432,11 @@ }, { "Id": 451112211, + "Name": { + "key": "skill_skill_passive_Name_451112211", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=3", @@ -10077,6 +12458,11 @@ }, { "Id": 451305111, + "Name": { + "key": "skill_skill_passive_Name_451305111", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -10098,6 +12484,11 @@ }, { "Id": 451305211, + "Name": { + "key": "skill_skill_passive_Name_451305211", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -10119,6 +12510,11 @@ }, { "Id": 451312211, + "Name": { + "key": "skill_skill_passive_Name_451312211", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=3", @@ -10140,6 +12536,11 @@ }, { "Id": 451505111, + "Name": { + "key": "skill_skill_passive_Name_451505111", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -10161,6 +12562,11 @@ }, { "Id": 451505211, + "Name": { + "key": "skill_skill_passive_Name_451505211", + "text": "" + }, + "icon": "", "When": 10, "FromCheck": "Target=3", "TargetCheck": "", @@ -10182,6 +12588,11 @@ }, { "Id": 451512211, + "Name": { + "key": "skill_skill_passive_Name_451512211", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "", "TargetCheck": "Target=3", @@ -10203,6 +12614,11 @@ }, { "Id": 484300421, + "Name": { + "key": "skill_skill_passive_Name_484300421", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=600", @@ -10224,6 +12640,11 @@ }, { "Id": 484300422, + "Name": { + "key": "skill_skill_passive_Name_484300422", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=300", @@ -10245,6 +12666,11 @@ }, { "Id": 484300423, + "Name": { + "key": "skill_skill_passive_Name_484300423", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10266,6 +12692,11 @@ }, { "Id": 494300431, + "Name": { + "key": "skill_skill_passive_Name_494300431", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10287,6 +12718,11 @@ }, { "Id": 484300721, + "Name": { + "key": "skill_skill_passive_Name_484300721", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=600", @@ -10308,6 +12744,11 @@ }, { "Id": 484300722, + "Name": { + "key": "skill_skill_passive_Name_484300722", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10329,6 +12770,11 @@ }, { "Id": 494300731, + "Name": { + "key": "skill_skill_passive_Name_494300731", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10350,6 +12796,11 @@ }, { "Id": 484400221, + "Name": { + "key": "skill_skill_passive_Name_484400221", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10371,6 +12822,11 @@ }, { "Id": 494400231, + "Name": { + "key": "skill_skill_passive_Name_494400231", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10392,6 +12848,11 @@ }, { "Id": 484400321, + "Name": { + "key": "skill_skill_passive_Name_484400321", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=600", @@ -10413,6 +12874,11 @@ }, { "Id": 484400322, + "Name": { + "key": "skill_skill_passive_Name_484400322", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=600", @@ -10434,6 +12900,11 @@ }, { "Id": 483400421, + "Name": { + "key": "skill_skill_passive_Name_483400421", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10455,6 +12926,11 @@ }, { "Id": 493400431, + "Name": { + "key": "skill_skill_passive_Name_493400431", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10476,6 +12952,11 @@ }, { "Id": 482500221, + "Name": { + "key": "skill_skill_passive_Name_482500221", + "text": "" + }, + "icon": "", "When": 29, "FromCheck": "Target=3", "TargetCheck": "", @@ -10497,6 +12978,11 @@ }, { "Id": 492500231, + "Name": { + "key": "skill_skill_passive_Name_492500231", + "text": "" + }, + "icon": "", "When": 18, "FromCheck": "Target=3", "TargetCheck": "Target=2,HasBuff=1", @@ -10518,6 +13004,11 @@ }, { "Id": 482501222, + "Name": { + "key": "skill_skill_passive_Name_482501222", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10539,6 +13030,11 @@ }, { "Id": 492501231, + "Name": { + "key": "skill_skill_passive_Name_492501231", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10560,6 +13056,11 @@ }, { "Id": 484501221, + "Name": { + "key": "skill_skill_passive_Name_484501221", + "text": "" + }, + "icon": "", "When": 19, "FromCheck": "Target=3", "TargetCheck": "", @@ -10581,6 +13082,11 @@ }, { "Id": 484501222, + "Name": { + "key": "skill_skill_passive_Name_484501222", + "text": "" + }, + "icon": "", "When": 18, "FromCheck": "Target=3", "TargetCheck": "", @@ -10602,6 +13108,11 @@ }, { "Id": 494501231, + "Name": { + "key": "skill_skill_passive_Name_494501231", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10623,6 +13134,11 @@ }, { "Id": 484500421, + "Name": { + "key": "skill_skill_passive_Name_484500421", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10646,6 +13162,11 @@ }, { "Id": 494500431, + "Name": { + "key": "skill_skill_passive_Name_494500431", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10667,6 +13188,11 @@ }, { "Id": 483501121, + "Name": { + "key": "skill_skill_passive_Name_483501121", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10690,6 +13216,11 @@ }, { "Id": 493501131, + "Name": { + "key": "skill_skill_passive_Name_493501131", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10711,6 +13242,11 @@ }, { "Id": 484501321, + "Name": { + "key": "skill_skill_passive_Name_484501321", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10732,6 +13268,11 @@ }, { "Id": 494501331, + "Name": { + "key": "skill_skill_passive_Name_494501331", + "text": "" + }, + "icon": "", "When": 15, "FromCheck": "Target=3", "TargetCheck": "Target=3", @@ -10753,6 +13294,11 @@ }, { "Id": 483501211, + "Name": { + "key": "skill_skill_passive_Name_483501211", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10774,6 +13320,11 @@ }, { "Id": 493501231, + "Name": { + "key": "skill_skill_passive_Name_493501231", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", @@ -10795,6 +13346,11 @@ }, { "Id": 482500321, + "Name": { + "key": "skill_skill_passive_Name_482500321", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "", "TargetCheck": "Target=3,Hpproless=600", @@ -10816,6 +13372,11 @@ }, { "Id": 482500322, + "Name": { + "key": "skill_skill_passive_Name_482500322", + "text": "" + }, + "icon": "", "When": 20, "FromCheck": "Target=3", "TargetCheck": "", @@ -10837,6 +13398,11 @@ }, { "Id": 492500331, + "Name": { + "key": "skill_skill_passive_Name_492500331", + "text": "" + }, + "icon": "", "When": 16, "FromCheck": "Target=3", "TargetCheck": "", diff --git a/modules/pagoda/comp_configure.go b/modules/pagoda/comp_configure.go index f3f2edc23..2da2be71f 100644 --- a/modules/pagoda/comp_configure.go +++ b/modules/pagoda/comp_configure.go @@ -276,47 +276,3 @@ func (this *configureComp) GetSixDirectionsConf(boxid int32) (conf []*cfg.GameSi this.hlock.RUnlock() return } - - -//# File: .github/workflows/repo-sync.yml -name: sync-sazs34-scripts -on: - schedule: - - cron: '5 0,7,15 * * *' - workflow_dispatch: - watch: - types: started - repository_dispatch: - types: sync-sazs34-scripts -jobs: - repo-sync: - env: - PAT: ${{ secrets.PAT || github.event.client_payload.PAT }} #此处PAT需要申请,教程详见:https://www.jianshu.com/p/bb82b3ad1d11 - runs-on: ubuntu-latest - if: github.event.repository.owner.id == github.event.sender.id - steps: - - uses: actions/checkout@v2 - with: - persist-credentials: false - - - name: sync sazs34-scripts - uses: repo-sync/github-sync@v2 - if: env.PAT - with: - source_repo: "https://github.com/sazs34/MyActions.git" - source_branch: "master" - destination_branch: "main" - github_token: ${{ secrets.PAT || github.event.client_payload.PAT }} - - UPSTREAM_REPO=https://github.com/mx730129/auto-workflow-JD.com-jdcoin.git -BRANCHES=master:main -Resetting origin to: ***github.com/mxf007/tesjdcoin -Adding tmp_upstream https://github.com/mx730129/auto-workflow-JD.com-jdcoin.git -Fetching tmp_upstream -origin ***github.com/mxf007/tesjdcoin (fetch) -origin ***github.com/mxf007/tesjdcoin (push) -tmp_upstream https://github.com/mx730129/auto-workflow-JD.com-jdcoin.git (fetch) -tmp_upstream https://github.com/mx730129/auto-workflow-JD.com-jdcoin.git (push) -Pushing changings from tmp_upstream to origin -error: src refspec refs/remotes/tmp_upstream/master does not match any -error: failed to push some refs to '***github.com/mxf007/tesjdcoin' \ No newline at end of file diff --git a/sys/configure/structs/Game.LatticeData.go b/sys/configure/structs/Game.LatticeData.go index 075e1591b..e8b2e5131 100644 --- a/sys/configure/structs/Game.LatticeData.go +++ b/sys/configure/structs/Game.LatticeData.go @@ -13,6 +13,7 @@ import "bright/serialization" type GameLatticeData struct { Key int32 + Txt string Belongto int32 Regular int32 Place serialization.Vector2 @@ -31,6 +32,7 @@ func (*GameLatticeData) GetTypeId() int32 { func (_v *GameLatticeData)Deserialize(_buf map[string]interface{}) (err error) { { 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 __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["belongto"].(float64); !_ok_ { err = errors.New("belongto error"); return }; _v.Belongto = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["regular"].(float64); !_ok_ { err = errors.New("regular error"); return }; _v.Regular = int32(_tempNum_) } { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["place"].(map[string]interface{}); !_ok_ { err = errors.New("place error"); return } diff --git a/sys/configure/structs/game.opencondData.go b/sys/configure/structs/game.opencondData.go index f875ed9d2..b5e64c2ab 100644 --- a/sys/configure/structs/game.opencondData.go +++ b/sys/configure/structs/game.opencondData.go @@ -13,7 +13,6 @@ import "errors" type GameOpencondData struct { Id string Name string - Main []*GameOpenedCond Opencondi []int32 Wkqbx int32 Img string @@ -35,20 +34,6 @@ func (*GameOpencondData) GetTypeId() int32 { func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id 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 _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["main"].([]interface{}); !_ok_ { err = errors.New("main error"); return } - - _v.Main = make([]*GameOpenedCond, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ *GameOpenedCond - { 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 = DeserializeGameOpenedCond(_x_); err != nil { return } } - _v.Main = append(_v.Main, _list_v_) - } - } - { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/game.skillPassiveData.go b/sys/configure/structs/game.skillPassiveData.go index a820f8d40..cb5403c9b 100644 --- a/sys/configure/structs/game.skillPassiveData.go +++ b/sys/configure/structs/game.skillPassiveData.go @@ -12,6 +12,8 @@ import "errors" type GameSkillPassiveData struct { Id int32 + Name string + Icon string When int32 FromCheck string TargetCheck string @@ -38,6 +40,8 @@ func (*GameSkillPassiveData) GetTypeId() int32 { func (_v *GameSkillPassiveData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) } + {var _ok_ bool; var __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; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["When"].(float64); !_ok_ { err = errors.New("When error"); return }; _v.When = int32(_tempNum_) } { var _ok_ bool; if _v.FromCheck, _ok_ = _buf["FromCheck"].(string); !_ok_ { err = errors.New("FromCheck error"); return } } { var _ok_ bool; if _v.TargetCheck, _ok_ = _buf["TargetCheck"].(string); !_ok_ { err = errors.New("TargetCheck error"); return } }