diff --git a/bin/json/game_block.json b/bin/json/game_block.json index 5234d25b1..3c1308603 100644 --- a/bin/json/game_block.json +++ b/bin/json/game_block.json @@ -9,7 +9,7 @@ "icon": "sx_fk_dhs", "icon2": "sx_fk_ls", "weight": 1500, - "effect": "", + "effect": "effect_sx_xiaochu_dhs", "choseeffect": "effect_sx_trail_dhs", "pointeffect": "effect_sx_liuguang_dhs", "score": 1, @@ -26,7 +26,7 @@ "icon": "sx_fk_ls", "icon2": "sx_fk_dhs", "weight": 1500, - "effect": "", + "effect": "effect_sx_xiaochu_ls", "choseeffect": "effect_sx_trail_fhs", "pointeffect": "effect_sx_liuguang_ls", "score": 1, @@ -43,7 +43,7 @@ "icon": "sx_fk_lvs", "icon2": "sx_fk_lvs", "weight": 1500, - "effect": "", + "effect": "effect_sx_xiaochu_lvs", "choseeffect": "effect_sx_trail_hs", "pointeffect": "effect_sx_liuguang_lvs", "score": 1, @@ -60,7 +60,7 @@ "icon": "sx_fk_zs", "icon2": "sx_fk_zs", "weight": 1500, - "effect": "", + "effect": "effect_sx_xiaochu_zs", "choseeffect": "effect_sx_trail_ls", "pointeffect": "effect_sx_liuguang_zs", "score": 1, @@ -77,7 +77,7 @@ "icon": "sx_fk_hs", "icon2": "sx_fk_hs", "weight": 1500, - "effect": "", + "effect": "effect_sx_xiaochu_hs", "choseeffect": "effect_sx_trail_lvs", "pointeffect": "effect_sx_liuguang_hs", "score": 1, @@ -94,7 +94,7 @@ "icon": "sx_fk_fhs", "icon2": "sx_fk_fhs", "weight": 1500, - "effect": "", + "effect": "effect_sx_xiaochu_fhs", "choseeffect": "effect_sx_trail_zs", "pointeffect": "effect_sx_liuguang_fhs", "score": 1, diff --git a/bin/json/game_enchantboss.json b/bin/json/game_enchantboss.json index a19505dee..707797c88 100644 --- a/bin/json/game_enchantboss.json +++ b/bin/json/game_enchantboss.json @@ -17,7 +17,7 @@ "n": 1 } ], - "heroId": "55005", + "heroId": "85001", "main_text": { "key": "enchantboss_boss_main_text_01", "text": "BOSS主界面描述" @@ -45,7 +45,7 @@ ], "BattleReadyID": 4101, "heroexp": 10, - "spine": "bossShow_huolong", + "spine": "bossShow_huoyantaitan", "icon": "hkz_wftj_wjyz03", "back_png": "wjyz_img003", "bossIcon": "gl_img_55005" @@ -68,7 +68,7 @@ "n": 1 } ], - "heroId": "55007", + "heroId": "85003", "main_text": { "key": "enchantboss_boss_main_text_02", "text": "BOSS主界面描述" @@ -96,7 +96,7 @@ ], "BattleReadyID": 4201, "heroexp": 10, - "spine": "bossShow_huolong", + "spine": "bossShow_bingshuangtaitan", "icon": "hkz_wftj_wjyz02", "back_png": "wjyz_img001", "bossIcon": "gl_img_55007" @@ -129,7 +129,7 @@ "n": 1 } ], - "heroId": "55006", + "heroId": "85002", "main_text": { "key": "enchantboss_boss_main_text_03", "text": "BOSS主界面描述" @@ -157,7 +157,7 @@ ], "BattleReadyID": 4301, "heroexp": 10, - "spine": "bossShow_huolong", + "spine": "bossShow_senlin", "icon": "hkz_wftj_wjyz01", "back_png": "wjyz_img002", "bossIcon": "gl_img_55006" diff --git a/bin/json/game_integralbuff.json b/bin/json/game_integralbuff.json index 5da2ff766..b2b941891 100644 --- a/bin/json/game_integralbuff.json +++ b/bin/json/game_integralbuff.json @@ -12,7 +12,7 @@ "key": "IntegralBoss_Integralbuff_name_01", "text": "我方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_sjbb", "des": { "key": "IntegralBoss_Integralbuff_des_01", "text": "我方守护者生命上限提升30%" @@ -31,7 +31,7 @@ "key": "IntegralBoss_Integralbuff_name_02", "text": "我方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_ygbh", "des": { "key": "IntegralBoss_Integralbuff_des_02", "text": "我方守护者受到伤害降低30%" @@ -50,7 +50,7 @@ "key": "IntegralBoss_Integralbuff_name_03", "text": "我方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_jjfj", "des": { "key": "IntegralBoss_Integralbuff_des_03", "text": "守护者血量低于30%时,伤害提升60%" @@ -69,7 +69,7 @@ "key": "IntegralBoss_Integralbuff_name_04", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_ycem", "des": { "key": "IntegralBoss_Integralbuff_des_04", "text": "敌方全体伤害提升10%" @@ -88,7 +88,7 @@ "key": "IntegralBoss_Integralbuff_name_05", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_ecem", "des": { "key": "IntegralBoss_Integralbuff_des_05", "text": "敌方全体伤害提升20%" @@ -107,7 +107,7 @@ "key": "IntegralBoss_Integralbuff_name_06", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_scem", "des": { "key": "IntegralBoss_Integralbuff_des_06", "text": "敌方全体伤害提升30%" @@ -126,7 +126,7 @@ "key": "IntegralBoss_Integralbuff_name_07", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_ysj", "des": { "key": "IntegralBoss_Integralbuff_des_07", "text": "敌方全体速度+2" @@ -145,7 +145,7 @@ "key": "IntegralBoss_Integralbuff_name_08", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_esj", "des": { "key": "IntegralBoss_Integralbuff_des_08", "text": "敌方全体速度+3" @@ -164,7 +164,7 @@ "key": "IntegralBoss_Integralbuff_name_09", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_ssj", "des": { "key": "IntegralBoss_Integralbuff_des_09", "text": "敌方全体速度+4" @@ -183,7 +183,7 @@ "key": "IntegralBoss_Integralbuff_name_10", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_yccl", "des": { "key": "IntegralBoss_Integralbuff_des_10", "text": "我方守护者受到的治疗效果降低10%" @@ -202,7 +202,7 @@ "key": "IntegralBoss_Integralbuff_name_11", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_eccl", "des": { "key": "IntegralBoss_Integralbuff_des_11", "text": "我方守护者受到的治疗效果降低20%" @@ -221,7 +221,7 @@ "key": "IntegralBoss_Integralbuff_name_12", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_sccl", "des": { "key": "IntegralBoss_Integralbuff_des_12", "text": "我方守护者受到的治疗效果降低30%" @@ -240,7 +240,7 @@ "key": "IntegralBoss_Integralbuff_name_13", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_xybz", "des": { "key": "IntegralBoss_Integralbuff_des_13", "text": "战斗开始后,我方随机2名守护者获得2回合的流血" @@ -259,7 +259,7 @@ "key": "IntegralBoss_Integralbuff_name_14", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_bxcx", "des": { "key": "IntegralBoss_Integralbuff_des_14", "text": "敌方造成的流血和眩晕将额外增加1回合持续时间" @@ -278,7 +278,7 @@ "key": "IntegralBoss_Integralbuff_name_15", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_sjsr", "des": { "key": "IntegralBoss_Integralbuff_des_15", "text": "敌方攻击眩晕状态的敌人时,无视受击者15%防御" @@ -297,7 +297,7 @@ "key": "IntegralBoss_Integralbuff_name_16", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_yxsg", "des": { "key": "IntegralBoss_Integralbuff_des_16", "text": "敌方攻击处于流血状态的敌人时,额外增加40%暴击伤害" @@ -316,7 +316,7 @@ "key": "IntegralBoss_Integralbuff_name_17", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_mjzz", "des": { "key": "IntegralBoss_Integralbuff_des_17", "text": "每3回合,驱散敌方全部减益1次" @@ -335,7 +335,7 @@ "key": "IntegralBoss_Integralbuff_name_18", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_sjcz", "des": { "key": "IntegralBoss_Integralbuff_des_18", "text": "除BOSS外,所有友方技能最大冷却时间增加1回合" @@ -354,7 +354,7 @@ "key": "IntegralBoss_Integralbuff_name_19", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_wjjw", "des": { "key": "IntegralBoss_Integralbuff_des_19", "text": "每3回合,驱散我方守护者全部增益1次" @@ -373,7 +373,7 @@ "key": "IntegralBoss_Integralbuff_name_20", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_zmsm", "des": { "key": "IntegralBoss_Integralbuff_des_20", "text": "战斗开始后,我方全体各自失去20%生命" @@ -392,7 +392,7 @@ "key": "IntegralBoss_Integralbuff_name_21", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_emsm", "des": { "key": "IntegralBoss_Integralbuff_des_21", "text": "敌方会心提升20%" @@ -411,7 +411,7 @@ "key": "IntegralBoss_Integralbuff_name_22", "text": "敌方增益" }, - "icon": "wp_icon_10021", + "icon": "ty_icon_buff_jgwx", "des": { "key": "IntegralBoss_Integralbuff_des_22", "text": "敌方全体免疫控制效果(小怪生效)" diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 1ee6dd6f0..1e5a8ce41 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -18349,7 +18349,7 @@ "img": "item_10000036", "intr": { "key": "item_item_intr_10000036", - "text": "在秘境中获得,可以用于各个事件消耗用。" + "text": "在秘境中获得,结算退出石阵秘境后即清空。" }, "describe": { "key": "item_item_describe_10000036", diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 8a8f2115c..054842f0e 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -12,7 +12,7 @@ "img": "sbkp_js_12003", "heroimg": "hbkp_js_12003", "portrait": "zm_img_12003", - "bust": "bust_25001", + "bust": "bust_12003", "postxyz": [ 0.08, 0, @@ -47,7 +47,7 @@ "img": "sbkp_js_13001", "heroimg": "hbkp_js_13001", "portrait": "zm_img_13001", - "bust": "bust_25001", + "bust": "bust_13001", "postxyz": [ 0, 0, @@ -82,7 +82,7 @@ "img": "sbkp_js_13002", "heroimg": "hbkp_js_13002", "portrait": "zm_img_13002", - "bust": "bust_25001", + "bust": "bust_13002", "postxyz": [ 0, 0, @@ -117,7 +117,7 @@ "img": "sbkp_js_13003", "heroimg": "hbkp_js_13003", "portrait": "zm_img_13003", - "bust": "bust_25001", + "bust": "bust_13003", "postxyz": [ 0, 0, @@ -152,7 +152,7 @@ "img": "sbkp_js_13004", "heroimg": "hbkp_js_13004", "portrait": "zm_img_13004", - "bust": "bust_25001", + "bust": "bust_13004", "postxyz": [ 0, 0, @@ -187,7 +187,7 @@ "img": "sbkp_js_13005", "heroimg": "hbkp_js_13005", "portrait": "zm_img_13005", - "bust": "bust_25001", + "bust": "bust_13005", "postxyz": [ 0, 0, @@ -222,7 +222,7 @@ "img": "sbkp_js_14001", "heroimg": "hbkp_js_14001", "portrait": "zm_img_14001", - "bust": "bust_25001", + "bust": "bust_14001", "postxyz": [ 0, 0, @@ -257,7 +257,7 @@ "img": "sbkp_js_14002", "heroimg": "hbkp_js_14002", "portrait": "zm_img_14002", - "bust": "bust_25001", + "bust": "bust_14002", "postxyz": [ 0, 0, @@ -292,7 +292,7 @@ "img": "sbkp_js_14003", "heroimg": "hbkp_js_14003", "portrait": "zm_img_14003", - "bust": "bust_25001", + "bust": "bust_14003", "postxyz": [ 0, 0, @@ -327,7 +327,7 @@ "img": "sbkp_js_14004", "heroimg": "hbkp_js_14004", "portrait": "zm_img_14004", - "bust": "bust_25001", + "bust": "bust_14004", "postxyz": [ 0, 0, @@ -362,7 +362,7 @@ "img": "sbkp_js_14005", "heroimg": "hbkp_js_14005", "portrait": "zm_img_14005", - "bust": "bust_25001", + "bust": "bust_14005", "postxyz": [ 0, 0, @@ -397,7 +397,7 @@ "img": "sbkp_js_14006", "heroimg": "hbkp_js_14006", "portrait": "zm_img_14006", - "bust": "bust_25001", + "bust": "bust_14006", "postxyz": [ 0, 0, @@ -432,7 +432,7 @@ "img": "sbkp_js_14007", "heroimg": "hbkp_js_14007", "portrait": "zm_img_14007", - "bust": "bust_25001", + "bust": "bust_14007", "postxyz": [ 0, 0, @@ -467,7 +467,7 @@ "img": "sbkp_js_15001", "heroimg": "hbkp_js_15001", "portrait": "zm_img_15001", - "bust": "bust_25001", + "bust": "bust_15001", "postxyz": [ 0, 0, @@ -502,7 +502,7 @@ "img": "sbkp_js_15002", "heroimg": "hbkp_js_15002", "portrait": "zm_img_15002", - "bust": "bust_25001", + "bust": "bust_15002", "postxyz": [ 0, 0, @@ -537,7 +537,7 @@ "img": "sbkp_js_15003", "heroimg": "hbkp_js_15003", "portrait": "zm_img_15003", - "bust": "bust_25001", + "bust": "bust_15003", "postxyz": [ 0, 0, @@ -572,7 +572,7 @@ "img": "sbkp_js_15004", "heroimg": "hbkp_js_15004", "portrait": "zm_img_15004", - "bust": "bust_25001", + "bust": "bust_15004", "postxyz": [ 0, 0, @@ -607,7 +607,7 @@ "img": "sbkp_js_15005", "heroimg": "hbkp_js_15005", "portrait": "zm_img_15005", - "bust": "bust_25001", + "bust": "bust_15005", "postxyz": [ 0, 0, @@ -642,7 +642,7 @@ "img": "sbkp_js_23001", "heroimg": "hbkp_js_23001", "portrait": "zm_img_23001", - "bust": "bust_25001", + "bust": "bust_23001", "postxyz": [ 0, 0, @@ -677,7 +677,7 @@ "img": "sbkp_js_23002", "heroimg": "hbkp_js_23002", "portrait": "zm_img_23002", - "bust": "bust_25001", + "bust": "bust_23002", "postxyz": [ 0, 0, @@ -712,7 +712,7 @@ "img": "sbkp_js_23003", "heroimg": "hbkp_js_23003", "portrait": "zm_img_23003", - "bust": "bust_25001", + "bust": "bust_23003", "postxyz": [ 0, 0, @@ -747,7 +747,7 @@ "img": "sbkp_js_23004", "heroimg": "hbkp_js_23004", "portrait": "zm_img_23004", - "bust": "bust_25001", + "bust": "bust_23004", "postxyz": [ 0, 0, @@ -782,7 +782,7 @@ "img": "sbkp_js_24001", "heroimg": "hbkp_js_24001", "portrait": "zm_img_24001", - "bust": "bust_25001", + "bust": "bust_24001", "postxyz": [ 0, 0, @@ -817,7 +817,7 @@ "img": "sbkp_js_24002", "heroimg": "hbkp_js_24002", "portrait": "zm_img_24002", - "bust": "bust_25001", + "bust": "bust_24002", "postxyz": [ 0, 0, @@ -852,7 +852,7 @@ "img": "sbkp_js_24003", "heroimg": "hbkp_js_24003", "portrait": "zm_img_24003", - "bust": "bust_25001", + "bust": "bust_24003", "postxyz": [ 0, 0, @@ -887,7 +887,7 @@ "img": "sbkp_js_24004", "heroimg": "hbkp_js_24004", "portrait": "zm_img_24004", - "bust": "bust_25001", + "bust": "bust_24004", "postxyz": [ 0, 0, @@ -922,7 +922,7 @@ "img": "sbkp_js_24005", "heroimg": "hbkp_js_24005", "portrait": "zm_img_24005", - "bust": "bust_25001", + "bust": "bust_24005", "postxyz": [ 0, 0, @@ -957,7 +957,7 @@ "img": "sbkp_js_24006", "heroimg": "hbkp_js_24006", "portrait": "zm_img_24006", - "bust": "bust_25001", + "bust": "bust_24006", "postxyz": [ 0, 0, @@ -992,7 +992,7 @@ "img": "sbkp_js_24007", "heroimg": "hbkp_js_24007", "portrait": "zm_img_24007", - "bust": "bust_25001", + "bust": "bust_24007", "postxyz": [ 0, 0, @@ -1027,7 +1027,7 @@ "img": "sbkp_js_24008", "heroimg": "hbkp_js_24008", "portrait": "zm_img_24008", - "bust": "bust_25001", + "bust": "bust_24008", "postxyz": [ 0, 0, @@ -1062,7 +1062,7 @@ "img": "sbkp_js_24009", "heroimg": "hbkp_js_24009", "portrait": "zm_img_24009", - "bust": "bust_25001", + "bust": "bust_24009", "postxyz": [ 0, 0, @@ -1132,7 +1132,7 @@ "img": "sbkp_js_23011", "heroimg": "hbkp_js_23011", "portrait": "zm_img_23011", - "bust": "bust_25001", + "bust": "bust_23011", "postxyz": [ 0, 0, @@ -1167,7 +1167,7 @@ "img": "sbkp_js_25002", "heroimg": "hbkp_js_25002", "portrait": "zm_img_25002", - "bust": "bust_25001", + "bust": "bust_25002", "postxyz": [ 0, 0, @@ -1202,7 +1202,7 @@ "img": "sbkp_js_25003", "heroimg": "hbkp_js_25003", "portrait": "zm_img_25003", - "bust": "bust_25001", + "bust": "bust_25003", "postxyz": [ 0, 0, @@ -1237,7 +1237,7 @@ "img": "sbkp_js_25004", "heroimg": "hbkp_js_25004", "portrait": "zm_img_25004", - "bust": "bust_25001", + "bust": "bust_25004", "postxyz": [ 0.08, 0, @@ -1272,7 +1272,7 @@ "img": "sbkp_js_33001", "heroimg": "hbkp_js_33001", "portrait": "zm_img_33001", - "bust": "bust_25001", + "bust": "bust_33001", "postxyz": [ 0, 0, @@ -1307,7 +1307,7 @@ "img": "sbkp_js_33002", "heroimg": "hbkp_js_33002", "portrait": "zm_img_33002", - "bust": "bust_25001", + "bust": "bust_33002", "postxyz": [ 0, 0, @@ -1342,7 +1342,7 @@ "img": "sbkp_js_33003", "heroimg": "hbkp_js_33003", "portrait": "zm_img_33003", - "bust": "bust_25001", + "bust": "bust_33003", "postxyz": [ 0, 0, @@ -1377,7 +1377,7 @@ "img": "sbkp_js_33004", "heroimg": "hbkp_js_33004", "portrait": "zm_img_33004", - "bust": "bust_25001", + "bust": "bust_33004", "postxyz": [ 0, 0, @@ -1412,7 +1412,7 @@ "img": "sbkp_js_33005", "heroimg": "hbkp_js_33005", "portrait": "zm_img_33005", - "bust": "bust_25001", + "bust": "bust_33005", "postxyz": [ 0, 0, @@ -1447,7 +1447,7 @@ "img": "sbkp_js_33006", "heroimg": "hbkp_js_33006", "portrait": "zm_img_33006", - "bust": "bust_25001", + "bust": "bust_33006", "postxyz": [ 0, 0, @@ -1482,7 +1482,7 @@ "img": "sbkp_js_34001", "heroimg": "hbkp_js_34001", "portrait": "zm_img_34001", - "bust": "bust_25001", + "bust": "bust_34001", "postxyz": [ 0, 0, @@ -1517,7 +1517,7 @@ "img": "sbkp_js_34002", "heroimg": "hbkp_js_34002", "portrait": "zm_img_34002", - "bust": "bust_25001", + "bust": "bust_34002", "postxyz": [ 0, 0, @@ -1552,7 +1552,7 @@ "img": "sbkp_js_34003", "heroimg": "hbkp_js_34003", "portrait": "zm_img_34003", - "bust": "bust_25001", + "bust": "bust_34003", "postxyz": [ 0, 0, @@ -1587,7 +1587,7 @@ "img": "sbkp_js_34004", "heroimg": "hbkp_js_34004", "portrait": "zm_img_34004", - "bust": "bust_25001", + "bust": "bust_34004", "postxyz": [ 0, 0, @@ -1622,7 +1622,7 @@ "img": "sbkp_js_34005", "heroimg": "hbkp_js_34005", "portrait": "zm_img_34005", - "bust": "bust_25001", + "bust": "bust_34005", "postxyz": [ 0, 0, @@ -1657,7 +1657,7 @@ "img": "sbkp_js_34006", "heroimg": "hbkp_js_34006", "portrait": "zm_img_34006", - "bust": "bust_25001", + "bust": "bust_34006", "postxyz": [ 0, 0, @@ -1692,7 +1692,7 @@ "img": "sbkp_js_34007", "heroimg": "hbkp_js_34007", "portrait": "zm_img_34007", - "bust": "bust_25001", + "bust": "bust_34007", "postxyz": [ 0, 0, @@ -1727,7 +1727,7 @@ "img": "sbkp_js_34008", "heroimg": "hbkp_js_34008", "portrait": "zm_img_34008", - "bust": "bust_25001", + "bust": "bust_34008", "postxyz": [ 0, 0, @@ -1762,7 +1762,7 @@ "img": "sbkp_js_35001", "heroimg": "hbkp_js_35001", "portrait": "zm_img_35001", - "bust": "bust_25001", + "bust": "bust_35001", "postxyz": [ 0, 0, @@ -1797,7 +1797,7 @@ "img": "sbkp_js_35002", "heroimg": "hbkp_js_35002", "portrait": "zm_img_35002", - "bust": "bust_25001", + "bust": "bust_35002", "postxyz": [ 0, 0, @@ -1832,7 +1832,7 @@ "img": "sbkp_js_35003", "heroimg": "hbkp_js_35003", "portrait": "zm_img_35003", - "bust": "bust_25001", + "bust": "bust_35003", "postxyz": [ 0, 0, @@ -1867,7 +1867,7 @@ "img": "sbkp_js_35004", "heroimg": "hbkp_js_35004", "portrait": "zm_img_35004", - "bust": "bust_25001", + "bust": "bust_35004", "postxyz": [ 0, 0, @@ -1902,7 +1902,7 @@ "img": "sbkp_js_35005", "heroimg": "hbkp_js_35005", "portrait": "zm_img_35005", - "bust": "bust_25001", + "bust": "bust_35005", "postxyz": [ 0, 0, @@ -1937,7 +1937,7 @@ "img": "sbkp_js_35006", "heroimg": "hbkp_js_35006", "portrait": "zm_img_35006", - "bust": "bust_25001", + "bust": "bust_35006", "postxyz": [ 0, 0, @@ -1972,7 +1972,7 @@ "img": "sbkp_js_43001", "heroimg": "hbkp_js_43001", "portrait": "zm_img_43001", - "bust": "bust_25001", + "bust": "bust_43001", "postxyz": [ 0, 0, @@ -2007,7 +2007,7 @@ "img": "sbkp_js_43002", "heroimg": "hbkp_js_43002", "portrait": "zm_img_43002", - "bust": "bust_25001", + "bust": "bust_43002", "postxyz": [ 0, 0, @@ -2042,7 +2042,7 @@ "img": "sbkp_js_43003", "heroimg": "hbkp_js_43003", "portrait": "zm_img_43003", - "bust": "bust_25001", + "bust": "bust_43003", "postxyz": [ 0, 0, @@ -2077,7 +2077,7 @@ "img": "sbkp_js_43004", "heroimg": "hbkp_js_43004", "portrait": "zm_img_43004", - "bust": "bust_25001", + "bust": "bust_43004", "postxyz": [ 0, 0, @@ -2112,7 +2112,7 @@ "img": "sbkp_js_43005", "heroimg": "hbkp_js_43005", "portrait": "zm_img_43005", - "bust": "bust_25001", + "bust": "bust_43005", "postxyz": [ 0, 0, @@ -2147,7 +2147,7 @@ "img": "sbkp_js_43006", "heroimg": "hbkp_js_43006", "portrait": "zm_img_43006", - "bust": "bust_25001", + "bust": "bust_43006", "postxyz": [ 0, 0, @@ -2182,7 +2182,7 @@ "img": "sbkp_js_43007", "heroimg": "hbkp_js_43007", "portrait": "zm_img_43007", - "bust": "bust_25001", + "bust": "bust_43007", "postxyz": [ 0, 0, @@ -2217,7 +2217,7 @@ "img": "sbkp_js_44001", "heroimg": "hbkp_js_44001", "portrait": "zm_img_44001", - "bust": "bust_25001", + "bust": "bust_44001", "postxyz": [ 0, 0, @@ -2252,7 +2252,7 @@ "img": "sbkp_js_44002", "heroimg": "hbkp_js_44002", "portrait": "zm_img_44002", - "bust": "bust_25001", + "bust": "bust_44002", "postxyz": [ 0, 0, @@ -2287,7 +2287,7 @@ "img": "sbkp_js_44003", "heroimg": "hbkp_js_44003", "portrait": "zm_img_44003", - "bust": "bust_25001", + "bust": "bust_44003", "postxyz": [ 0, 0, @@ -2322,7 +2322,7 @@ "img": "sbkp_js_44004", "heroimg": "hbkp_js_44004", "portrait": "zm_img_44004", - "bust": "bust_25001", + "bust": "bust_44004", "postxyz": [ 0, 0, @@ -2357,7 +2357,7 @@ "img": "sbkp_js_44005", "heroimg": "hbkp_js_44005", "portrait": "zm_img_44005", - "bust": "bust_25001", + "bust": "bust_44005", "postxyz": [ 0, 0, @@ -2392,7 +2392,7 @@ "img": "sbkp_js_44006", "heroimg": "hbkp_js_44006", "portrait": "zm_img_44006", - "bust": "bust_25001", + "bust": "bust_44006", "postxyz": [ 0, 0, @@ -2427,7 +2427,7 @@ "img": "sbkp_js_45001", "heroimg": "hbkp_js_45001", "portrait": "zm_img_45001", - "bust": "bust_25001", + "bust": "bust_45001", "postxyz": [ 0, 0, @@ -2462,7 +2462,7 @@ "img": "sbkp_js_45002", "heroimg": "hbkp_js_45002", "portrait": "zm_img_45002", - "bust": "bust_25001", + "bust": "bust_45002", "postxyz": [ 0, 0, @@ -2497,7 +2497,7 @@ "img": "sbkp_js_45003", "heroimg": "hbkp_js_45003", "portrait": "zm_img_45003", - "bust": "bust_25001", + "bust": "bust_45003", "postxyz": [ 0, 0, @@ -2532,7 +2532,7 @@ "img": "sbkp_js_45004", "heroimg": "hbkp_js_45004", "portrait": "zm_img_45004", - "bust": "bust_25001", + "bust": "bust_45004", "postxyz": [ 0, 0, @@ -2567,7 +2567,7 @@ "img": "sbkp_js_43901", "heroimg": "hbkp_js_43901", "portrait": "zm_img_43901", - "bust": "bust_25001", + "bust": "bust_43901", "postxyz": [ 0, 0, @@ -2602,7 +2602,7 @@ "img": "sbkp_js_42911", "heroimg": "hbkp_js_42911", "portrait": "zm_img_42911", - "bust": "bust_25001", + "bust": "bust_42911", "postxyz": [ 0, 0, @@ -2637,7 +2637,7 @@ "img": "sbkp_js_43911", "heroimg": "hbkp_js_43911", "portrait": "zm_img_43911", - "bust": "bust_25001", + "bust": "bust_43911", "postxyz": [ 0, 0, @@ -2672,7 +2672,7 @@ "img": "sbkp_js_44911", "heroimg": "hbkp_js_44911", "portrait": "zm_img_44911", - "bust": "bust_25001", + "bust": "bust_44911", "postxyz": [ 0, 0, @@ -2707,7 +2707,7 @@ "img": "sbkp_js_43921", "heroimg": "hbkp_js_43921", "portrait": "zm_img_35002", - "bust": "bust_25001", + "bust": "bust_43921", "postxyz": [ 0, 0, @@ -2742,7 +2742,7 @@ "img": "sbkp_js_44921", "heroimg": "hbkp_js_44921", "portrait": "zm_img_35002", - "bust": "bust_25001", + "bust": "bust_44921", "postxyz": [ 0, 0, @@ -2777,7 +2777,7 @@ "img": "sbkp_js_45921", "heroimg": "hbkp_js_45921", "portrait": "zm_img_35002", - "bust": "bust_25001", + "bust": "bust_45921", "postxyz": [ 0, 0, @@ -2812,7 +2812,7 @@ "img": "sbkp_js_51001", "heroimg": "hbkp_js_51001", "portrait": "zm_img_51001", - "bust": "bust_25001", + "bust": "bust_51001", "postxyz": [ 0, 0, @@ -2847,7 +2847,7 @@ "img": "sbkp_js_51002", "heroimg": "hbkp_js_51002", "portrait": "zm_img_51002", - "bust": "bust_25001", + "bust": "bust_51002", "postxyz": [ 0, 0, @@ -2882,7 +2882,7 @@ "img": "sbkp_js_51003", "heroimg": "hbkp_js_51003", "portrait": "zm_img_51003", - "bust": "bust_25001", + "bust": "bust_51003", "postxyz": [ 0, 0, @@ -2917,7 +2917,7 @@ "img": "sbkp_js_51004", "heroimg": "hbkp_js_51004", "portrait": "zm_img_51004", - "bust": "bust_25001", + "bust": "bust_51004", "postxyz": [ 0, 0, @@ -2952,7 +2952,7 @@ "img": "sbkp_js_51005", "heroimg": "hbkp_js_51005", "portrait": "zm_img_51005", - "bust": "bust_25001", + "bust": "bust_51005", "postxyz": [ 0, 0, @@ -2987,7 +2987,7 @@ "img": "sbkp_js_51006", "heroimg": "hbkp_js_51006", "portrait": "zm_img_51006", - "bust": "bust_25001", + "bust": "bust_51006", "postxyz": [ 0, 0, @@ -3022,7 +3022,7 @@ "img": "sbkp_js_51007", "heroimg": "hbkp_js_51007", "portrait": "zm_img_51007", - "bust": "bust_25001", + "bust": "bust_51007", "postxyz": [ 0, 0, @@ -3057,7 +3057,7 @@ "img": "sbkp_js_51008", "heroimg": "hbkp_js_51008", "portrait": "zm_img_51008", - "bust": "bust_25001", + "bust": "bust_51008", "postxyz": [ 0, 0, @@ -3092,7 +3092,7 @@ "img": "sbkp_js_51009", "heroimg": "hbkp_js_51009", "portrait": "zm_img_51009", - "bust": "bust_25001", + "bust": "bust_51009", "postxyz": [ 0, 0, @@ -3127,7 +3127,7 @@ "img": "sbkp_js_51010", "heroimg": "hbkp_js_51010", "portrait": "zm_img_51010", - "bust": "bust_25001", + "bust": "bust_51010", "postxyz": [ 0, 0, @@ -3162,7 +3162,7 @@ "img": "sbkp_js_51011", "heroimg": "hbkp_js_51011", "portrait": "zm_img_51011", - "bust": "bust_25001", + "bust": "bust_51011", "postxyz": [ 0, 0, @@ -3197,7 +3197,7 @@ "img": "sbkp_js_51012", "heroimg": "hbkp_js_51012", "portrait": "zm_img_51012", - "bust": "bust_25001", + "bust": "bust_51012", "postxyz": [ 0, 0, @@ -3232,7 +3232,7 @@ "img": "sbkp_js_51013", "heroimg": "hbkp_js_51013", "portrait": "zm_img_51013", - "bust": "bust_25001", + "bust": "bust_51013", "postxyz": [ 0, 0, @@ -3267,7 +3267,7 @@ "img": "sbkp_js_51014", "heroimg": "hbkp_js_51014", "portrait": "zm_img_51014", - "bust": "bust_25001", + "bust": "bust_51014", "postxyz": [ 0, 0, @@ -3302,7 +3302,7 @@ "img": "sbkp_js_53001", "heroimg": "hbkp_js_53001", "portrait": "zm_img_53001", - "bust": "bust_25001", + "bust": "bust_53001", "postxyz": [ 0, 0, @@ -3337,7 +3337,7 @@ "img": "sbkp_js_51004", "heroimg": "hbkp_js_53002", "portrait": "zm_img_53002", - "bust": "bust_25001", + "bust": "bust_53002", "postxyz": [ 0, 0, @@ -3372,7 +3372,7 @@ "img": "sbkp_js_53003", "heroimg": "hbkp_js_53003", "portrait": "zm_img_53003", - "bust": "bust_25001", + "bust": "bust_53003", "postxyz": [ 0, 0, @@ -3407,7 +3407,7 @@ "img": "sbkp_js_53004", "heroimg": "hbkp_js_53004", "portrait": "zm_img_53004", - "bust": "bust_25001", + "bust": "bust_53004", "postxyz": [ 0, 0, @@ -3442,7 +3442,7 @@ "img": "sbkp_js_53005", "heroimg": "hbkp_js_53005", "portrait": "zm_img_53005", - "bust": "bust_25001", + "bust": "bust_53005", "postxyz": [ 0, 0, @@ -3477,7 +3477,7 @@ "img": "sbkp_js_53006", "heroimg": "hbkp_js_53006", "portrait": "zm_img_53006", - "bust": "bust_25001", + "bust": "bust_53006", "postxyz": [ 0, 0, @@ -3512,7 +3512,7 @@ "img": "sbkp_js_55001", "heroimg": "hbkp_js_55001", "portrait": "zm_img_55001", - "bust": "bust_25001", + "bust": "bust_55001", "postxyz": [ 0, 0, @@ -3547,7 +3547,7 @@ "img": "sbkp_js_55002", "heroimg": "hbkp_js_55002", "portrait": "zm_img_55002", - "bust": "bust_25001", + "bust": "bust_55002", "postxyz": [ 0, 0, @@ -3582,7 +3582,7 @@ "img": "sbkp_js_55003", "heroimg": "hbkp_js_55003", "portrait": "zm_img_55003", - "bust": "bust_25001", + "bust": "bust_55003", "postxyz": [ 0, 0, @@ -3617,7 +3617,7 @@ "img": "sbkp_js_55004", "heroimg": "hbkp_js_55004", "portrait": "zm_img_55004", - "bust": "bust_25001", + "bust": "bust_55004", "postxyz": [ 0, 0, @@ -3652,7 +3652,7 @@ "img": "sbkp_js_55005", "heroimg": "hbkp_js_55005", "portrait": "zm_img_55005", - "bust": "bust_25001", + "bust": "bust_55005", "postxyz": [ 0, 0, @@ -3687,7 +3687,7 @@ "img": "sbkp_js_55006", "heroimg": "hbkp_js_55006", "portrait": "zm_img_55006", - "bust": "bust_25001", + "bust": "bust_55006", "postxyz": [ 0, 0, @@ -3722,7 +3722,7 @@ "img": "sbkp_js_55007", "heroimg": "hbkp_js_55007", "portrait": "zm_img_55007", - "bust": "bust_25001", + "bust": "bust_55007", "postxyz": [ 0, 0, @@ -3757,7 +3757,7 @@ "img": "sbkp_js_63002", "heroimg": "hbkp_js_63002", "portrait": "zm_img_63002", - "bust": "bust_25001", + "bust": "bust_63002", "postxyz": [ 0, 0, @@ -3792,7 +3792,7 @@ "img": "sbkp_js_63003", "heroimg": "hbkp_js_63003", "portrait": "zm_img_63003", - "bust": "bust_25001", + "bust": "bust_63003", "postxyz": [ 0, 0, @@ -3827,7 +3827,7 @@ "img": "sbkp_js_63004", "heroimg": "hbkp_js_63004", "portrait": "zm_img_63004", - "bust": "bust_25001", + "bust": "bust_63004", "postxyz": [ 0, 0, @@ -3862,7 +3862,7 @@ "img": "sbkp_js_64003", "heroimg": "hbkp_js_64003", "portrait": "zm_img_64003", - "bust": "bust_25001", + "bust": "bust_64003", "postxyz": [ 0, 0, @@ -3897,7 +3897,7 @@ "img": "sbkp_js_74002", "heroimg": "hbkp_js_74002", "portrait": "zm_img_74002", - "bust": "bust_25001", + "bust": "bust_74002", "postxyz": [ 0, 0, @@ -3932,7 +3932,7 @@ "img": "sbkp_js_74003", "heroimg": "hbkp_js_74003", "portrait": "zm_img_74003", - "bust": "bust_25001", + "bust": "bust_74003", "postxyz": [ 0, 0, @@ -3967,7 +3967,7 @@ "img": "sbkp_js_74004", "heroimg": "hbkp_js_74004", "portrait": "zm_img_74004", - "bust": "bust_25001", + "bust": "bust_74004", "postxyz": [ 0, 0, @@ -4002,7 +4002,7 @@ "img": "sbkp_js_83002", "heroimg": "hbkp_js_83002", "portrait": "zm_img_83002", - "bust": "bust_25001", + "bust": "bust_83002", "postxyz": [ 0, 0, @@ -4037,7 +4037,7 @@ "img": "sbkp_js_83006", "heroimg": "hbkp_js_83006", "portrait": "zm_img_83006", - "bust": "bust_25001", + "bust": "bust_83006", "postxyz": [ 0, 0, @@ -4072,7 +4072,7 @@ "img": "sbkp_js_84002", "heroimg": "hbkp_js_84002", "portrait": "zm_img_84002", - "bust": "bust_25001", + "bust": "bust_84002", "postxyz": [ 0, 0, @@ -4107,7 +4107,7 @@ "img": "sbkp_js_94002", "heroimg": "hbkp_js_94002", "portrait": "zm_img_94002", - "bust": "bust_25001", + "bust": "bust_94002", "postxyz": [ 0, 0, @@ -4142,7 +4142,7 @@ "img": "sbkp_js_94005", "heroimg": "hbkp_js_94005", "portrait": "zm_img_94005", - "bust": "bust_25001", + "bust": "bust_94005", "postxyz": [ 0, 0, @@ -4177,7 +4177,7 @@ "img": "sbkp_js_64007", "heroimg": "hbkp_js_64007", "portrait": "zm_img_64007", - "bust": "bust_25001", + "bust": "bust_64007", "postxyz": [ 0, 0, @@ -4212,7 +4212,7 @@ "img": "sbkp_js_101004", "heroimg": "hbkp_js_101004", "portrait": "zm_img_101004", - "bust": "bust_25001", + "bust": "bust_101004", "postxyz": [ 0, 0, @@ -4247,7 +4247,7 @@ "img": "sbkp_js_11021", "heroimg": "hbkp_js_11021", "portrait": "zm_img_11021", - "bust": "bust_25001", + "bust": "bust_11021", "postxyz": [ 0, 0, @@ -4282,7 +4282,7 @@ "img": "sbkp_js_51015", "heroimg": "hbkp_js_51015", "portrait": "zm_img_51015", - "bust": "bust_25001", + "bust": "bust_51015", "postxyz": [ 0, 0, @@ -4317,7 +4317,7 @@ "img": "sbkp_js_51016", "heroimg": "hbkp_js_51016", "portrait": "zm_img_51016", - "bust": "bust_25001", + "bust": "bust_51016", "postxyz": [ 0, 0, @@ -4352,7 +4352,7 @@ "img": "sbkp_js_51017", "heroimg": "hbkp_js_51017", "portrait": "zm_img_51017", - "bust": "bust_25001", + "bust": "bust_51017", "postxyz": [ 0, 0, @@ -4387,7 +4387,7 @@ "img": "sbkp_js_51018", "heroimg": "hbkp_js_51018", "portrait": "zm_img_51018", - "bust": "bust_25001", + "bust": "bust_51018", "postxyz": [ 0, 0, @@ -4422,7 +4422,7 @@ "img": "sbkp_js_51019", "heroimg": "hbkp_js_51019", "portrait": "zm_img_51019", - "bust": "bust_25001", + "bust": "bust_51019", "postxyz": [ 0, 0, @@ -4457,7 +4457,7 @@ "img": "sbkp_js_51020", "heroimg": "hbkp_js_51020", "portrait": "zm_img_51020", - "bust": "bust_25001", + "bust": "bust_51020", "postxyz": [ 0, 0, @@ -4492,7 +4492,7 @@ "img": "sbkp_js_51012", "heroimg": "hbkp_js_51021", "portrait": "zm_img_51021", - "bust": "bust_25001", + "bust": "bust_51021", "postxyz": [ 0, 0, @@ -4527,7 +4527,7 @@ "img": "sbkp_js_51012", "heroimg": "hbkp_js_51022", "portrait": "zm_img_51022", - "bust": "bust_25001", + "bust": "bust_51022", "postxyz": [ 0, 0, @@ -4562,7 +4562,7 @@ "img": "sbkp_js_51023", "heroimg": "hbkp_js_51023", "portrait": "zm_img_51023", - "bust": "bust_25001", + "bust": "bust_51023", "postxyz": [ 0, 0, @@ -4597,7 +4597,7 @@ "img": "sbkp_js_51024", "heroimg": "hbkp_js_51024", "portrait": "zm_img_51024", - "bust": "bust_25001", + "bust": "bust_51024", "postxyz": [ 0, 0, @@ -4632,7 +4632,7 @@ "img": "sbkp_js_51025", "heroimg": "hbkp_js_51025", "portrait": "zm_img_51025", - "bust": "bust_25001", + "bust": "bust_51025", "postxyz": [ 0, 0, @@ -4667,7 +4667,7 @@ "img": "sbkp_js_51026", "heroimg": "hbkp_js_51026", "portrait": "zm_img_51026", - "bust": "bust_25001", + "bust": "bust_51026", "postxyz": [ 0, 0, @@ -4702,7 +4702,7 @@ "img": "sbkp_js_51027", "heroimg": "hbkp_js_51027", "portrait": "zm_img_51027", - "bust": "bust_25001", + "bust": "bust_51027", "postxyz": [ 0, 0, @@ -4737,7 +4737,7 @@ "img": "sbkp_js_51028", "heroimg": "hbkp_js_51028", "portrait": "zm_img_51028", - "bust": "bust_25001", + "bust": "bust_51028", "postxyz": [ 0, 0, @@ -4772,7 +4772,7 @@ "img": "sbkp_js_51029", "heroimg": "hbkp_js_51029", "portrait": "zm_img_51029", - "bust": "bust_25001", + "bust": "bust_51029", "postxyz": [ 0, 0, @@ -4807,7 +4807,7 @@ "img": "sbkp_js_51030", "heroimg": "hbkp_js_51030", "portrait": "zm_img_51030", - "bust": "bust_25001", + "bust": "bust_51030", "postxyz": [ 0, 0, @@ -4842,7 +4842,7 @@ "img": "sbkp_js_51031", "heroimg": "hbkp_js_51031", "portrait": "zm_img_51031", - "bust": "bust_25001", + "bust": "bust_51031", "postxyz": [ 0, 0, @@ -4877,7 +4877,7 @@ "img": "sbkp_js_51032", "heroimg": "hbkp_js_51032", "portrait": "zm_img_51032", - "bust": "bust_25001", + "bust": "bust_51032", "postxyz": [ 0, 0, @@ -4912,7 +4912,7 @@ "img": "sbkp_js_51033", "heroimg": "hbkp_js_51033", "portrait": "zm_img_51033", - "bust": "bust_25001", + "bust": "bust_51033", "postxyz": [ 0, 0, @@ -4947,7 +4947,7 @@ "img": "sbkp_js_51050", "heroimg": "hbkp_js_51050", "portrait": "zm_img_51050", - "bust": "bust_25001", + "bust": "bust_51050", "postxyz": [ 0, 0, @@ -4982,7 +4982,7 @@ "img": "sbkp_js_51051", "heroimg": "hbkp_js_51051", "portrait": "zm_img_51051", - "bust": "bust_25001", + "bust": "bust_51051", "postxyz": [ 0, 0, @@ -5017,7 +5017,7 @@ "img": "sbkp_js_51052", "heroimg": "hbkp_js_51052", "portrait": "zm_img_51052", - "bust": "bust_25001", + "bust": "bust_51052", "postxyz": [ 0, 0, @@ -5052,7 +5052,7 @@ "img": "sbkp_js_51053", "heroimg": "hbkp_js_51053", "portrait": "zm_img_51053", - "bust": "bust_25001", + "bust": "bust_51053", "postxyz": [ 0, 0, @@ -5087,7 +5087,7 @@ "img": "sbkp_js_51054", "heroimg": "hbkp_js_51054", "portrait": "zm_img_51054", - "bust": "bust_25001", + "bust": "bust_51054", "postxyz": [ 0, 0, @@ -5122,7 +5122,7 @@ "img": "sbkp_js_51002", "heroimg": "hbkp_js_51002", "portrait": "zm_img_51002", - "bust": "bust_25001", + "bust": "bust_51100", "postxyz": [ 0, 0, @@ -5157,7 +5157,7 @@ "img": "sbkp_js_51003", "heroimg": "hbkp_js_51003", "portrait": "zm_img_51003", - "bust": "bust_25001", + "bust": "bust_51101", "postxyz": [ 0, 0, @@ -5192,7 +5192,7 @@ "img": "sbkp_js_51004", "heroimg": "hbkp_js_51004", "portrait": "zm_img_51004", - "bust": "bust_25001", + "bust": "bust_51102", "postxyz": [ 0, 0, @@ -5227,7 +5227,7 @@ "img": "sbkp_js_51005", "heroimg": "hbkp_js_51005", "portrait": "zm_img_51005", - "bust": "bust_25001", + "bust": "bust_51103", "postxyz": [ 0, 0, @@ -5262,7 +5262,7 @@ "img": "sbkp_js_51006", "heroimg": "hbkp_js_51006", "portrait": "zm_img_51006", - "bust": "bust_25001", + "bust": "bust_51104", "postxyz": [ 0, 0, @@ -5297,7 +5297,7 @@ "img": "sbkp_js_51010", "heroimg": "hbkp_js_51010", "portrait": "zm_img_51010", - "bust": "bust_25001", + "bust": "bust_51105", "postxyz": [ 0, 0, @@ -5332,7 +5332,7 @@ "img": "sbkp_js_51011", "heroimg": "hbkp_js_51011", "portrait": "zm_img_51011", - "bust": "bust_25001", + "bust": "bust_51106", "postxyz": [ 0, 0, @@ -5367,7 +5367,7 @@ "img": "sbkp_js_53001", "heroimg": "hbkp_js_53001", "portrait": "zm_img_53001", - "bust": "bust_25001", + "bust": "bust_51107", "postxyz": [ 0, 0, @@ -5402,7 +5402,7 @@ "img": "sbkp_js_53002", "heroimg": "hbkp_js_53002", "portrait": "zm_img_53002", - "bust": "bust_25001", + "bust": "bust_51108", "postxyz": [ 0, 0, @@ -5437,7 +5437,7 @@ "img": "sbkp_js_53003", "heroimg": "hbkp_js_53003", "portrait": "zm_img_53003", - "bust": "bust_25001", + "bust": "bust_51109", "postxyz": [ 0, 0, @@ -5472,7 +5472,7 @@ "img": "sbkp_js_51012", "heroimg": "hbkp_js_51012", "portrait": "zm_img_51012", - "bust": "bust_25001", + "bust": "bust_51110", "postxyz": [ 0, 0, @@ -5507,7 +5507,7 @@ "img": "sbkp_js_51050", "heroimg": "hbkp_js_51050", "portrait": "zm_img_51050", - "bust": "bust_25001", + "bust": "bust_51111", "postxyz": [ 0, 0, @@ -5542,7 +5542,7 @@ "img": "sbkp_js_51051", "heroimg": "hbkp_js_51051", "portrait": "zm_img_51051", - "bust": "bust_25001", + "bust": "bust_51112", "postxyz": [ 0, 0, @@ -5577,7 +5577,7 @@ "img": "sbkp_js_51052", "heroimg": "hbkp_js_51052", "portrait": "zm_img_51052", - "bust": "bust_25001", + "bust": "bust_51113", "postxyz": [ 0, 0, @@ -5612,7 +5612,7 @@ "img": "sbkp_js_51053", "heroimg": "hbkp_js_51053", "portrait": "zm_img_51053", - "bust": "bust_25001", + "bust": "bust_51114", "postxyz": [ 0, 0, @@ -5647,7 +5647,7 @@ "img": "sbkp_js_51002", "heroimg": "hbkp_js_51002", "portrait": "zm_img_51002", - "bust": "bust_25001", + "bust": "bust_51300", "postxyz": [ 0, 0, @@ -5682,7 +5682,7 @@ "img": "sbkp_js_51003", "heroimg": "hbkp_js_51003", "portrait": "zm_img_51003", - "bust": "bust_25001", + "bust": "bust_51301", "postxyz": [ 0, 0, @@ -5717,7 +5717,7 @@ "img": "sbkp_js_51004", "heroimg": "hbkp_js_51004", "portrait": "zm_img_51004", - "bust": "bust_25001", + "bust": "bust_51302", "postxyz": [ 0, 0, @@ -5752,7 +5752,7 @@ "img": "sbkp_js_51005", "heroimg": "hbkp_js_51005", "portrait": "zm_img_51005", - "bust": "bust_25001", + "bust": "bust_51303", "postxyz": [ 0, 0, @@ -5787,7 +5787,7 @@ "img": "sbkp_js_51006", "heroimg": "hbkp_js_51006", "portrait": "zm_img_51006", - "bust": "bust_25001", + "bust": "bust_51304", "postxyz": [ 0, 0, @@ -5822,7 +5822,7 @@ "img": "sbkp_js_51010", "heroimg": "hbkp_js_51010", "portrait": "zm_img_51010", - "bust": "bust_25001", + "bust": "bust_51305", "postxyz": [ 0, 0, @@ -5857,7 +5857,7 @@ "img": "sbkp_js_51011", "heroimg": "hbkp_js_51011", "portrait": "zm_img_51011", - "bust": "bust_25001", + "bust": "bust_51306", "postxyz": [ 0, 0, @@ -5892,7 +5892,7 @@ "img": "sbkp_js_53001", "heroimg": "hbkp_js_53001", "portrait": "zm_img_53001", - "bust": "bust_25001", + "bust": "bust_51307", "postxyz": [ 0, 0, @@ -5927,7 +5927,7 @@ "img": "sbkp_js_53002", "heroimg": "hbkp_js_53002", "portrait": "zm_img_53002", - "bust": "bust_25001", + "bust": "bust_51308", "postxyz": [ 0, 0, @@ -5962,7 +5962,7 @@ "img": "sbkp_js_53003", "heroimg": "hbkp_js_53003", "portrait": "zm_img_53003", - "bust": "bust_25001", + "bust": "bust_51309", "postxyz": [ 0, 0, @@ -5997,7 +5997,7 @@ "img": "sbkp_js_51012", "heroimg": "hbkp_js_51012", "portrait": "zm_img_51012", - "bust": "bust_25001", + "bust": "bust_51310", "postxyz": [ 0, 0, @@ -6032,7 +6032,7 @@ "img": "sbkp_js_51050", "heroimg": "hbkp_js_51050", "portrait": "zm_img_51050", - "bust": "bust_25001", + "bust": "bust_51311", "postxyz": [ 0, 0, @@ -6067,7 +6067,7 @@ "img": "sbkp_js_51051", "heroimg": "hbkp_js_51051", "portrait": "zm_img_51051", - "bust": "bust_25001", + "bust": "bust_51312", "postxyz": [ 0, 0, @@ -6102,7 +6102,7 @@ "img": "sbkp_js_51052", "heroimg": "hbkp_js_51052", "portrait": "zm_img_51052", - "bust": "bust_25001", + "bust": "bust_51313", "postxyz": [ 0, 0, @@ -6137,7 +6137,7 @@ "img": "sbkp_js_51053", "heroimg": "hbkp_js_51053", "portrait": "zm_img_51053", - "bust": "bust_25001", + "bust": "bust_51314", "postxyz": [ 0, 0, @@ -6172,7 +6172,7 @@ "img": "sbkp_js_51002", "heroimg": "hbkp_js_51002", "portrait": "zm_img_51002", - "bust": "bust_25001", + "bust": "bust_51500", "postxyz": [ 0, 0, @@ -6207,7 +6207,7 @@ "img": "sbkp_js_51003", "heroimg": "hbkp_js_51003", "portrait": "zm_img_51003", - "bust": "bust_25001", + "bust": "bust_51501", "postxyz": [ 0, 0, @@ -6242,7 +6242,7 @@ "img": "sbkp_js_51004", "heroimg": "hbkp_js_51004", "portrait": "zm_img_51004", - "bust": "bust_25001", + "bust": "bust_51502", "postxyz": [ 0, 0, @@ -6277,7 +6277,7 @@ "img": "sbkp_js_51005", "heroimg": "hbkp_js_51005", "portrait": "zm_img_51005", - "bust": "bust_25001", + "bust": "bust_51503", "postxyz": [ 0, 0, @@ -6312,7 +6312,7 @@ "img": "sbkp_js_51006", "heroimg": "hbkp_js_51006", "portrait": "zm_img_51006", - "bust": "bust_25001", + "bust": "bust_51504", "postxyz": [ 0, 0, @@ -6347,7 +6347,7 @@ "img": "sbkp_js_51010", "heroimg": "hbkp_js_51010", "portrait": "zm_img_51010", - "bust": "bust_25001", + "bust": "bust_51505", "postxyz": [ 0, 0, @@ -6382,7 +6382,7 @@ "img": "sbkp_js_51011", "heroimg": "hbkp_js_51011", "portrait": "zm_img_51011", - "bust": "bust_25001", + "bust": "bust_51506", "postxyz": [ 0, 0, @@ -6417,7 +6417,7 @@ "img": "sbkp_js_53001", "heroimg": "hbkp_js_53001", "portrait": "zm_img_53001", - "bust": "bust_25001", + "bust": "bust_51507", "postxyz": [ 0, 0, @@ -6452,7 +6452,7 @@ "img": "sbkp_js_53002", "heroimg": "hbkp_js_53002", "portrait": "zm_img_53002", - "bust": "bust_25001", + "bust": "bust_51508", "postxyz": [ 0, 0, @@ -6487,7 +6487,7 @@ "img": "sbkp_js_53003", "heroimg": "hbkp_js_53003", "portrait": "zm_img_53003", - "bust": "bust_25001", + "bust": "bust_51509", "postxyz": [ 0, 0, @@ -6522,7 +6522,7 @@ "img": "sbkp_js_51012", "heroimg": "hbkp_js_51012", "portrait": "zm_img_51012", - "bust": "bust_25001", + "bust": "bust_51510", "postxyz": [ 0, 0, @@ -6557,7 +6557,7 @@ "img": "sbkp_js_51050", "heroimg": "hbkp_js_51050", "portrait": "zm_img_51050", - "bust": "bust_25001", + "bust": "bust_51511", "postxyz": [ 0, 0, @@ -6592,7 +6592,7 @@ "img": "sbkp_js_51051", "heroimg": "hbkp_js_51051", "portrait": "zm_img_51051", - "bust": "bust_25001", + "bust": "bust_51512", "postxyz": [ 0, 0, @@ -6627,7 +6627,7 @@ "img": "sbkp_js_51052", "heroimg": "hbkp_js_51052", "portrait": "zm_img_51052", - "bust": "bust_25001", + "bust": "bust_51513", "postxyz": [ 0, 0, @@ -6662,7 +6662,7 @@ "img": "sbkp_js_51053", "heroimg": "hbkp_js_51053", "portrait": "zm_img_51053", - "bust": "bust_25001", + "bust": "bust_51514", "postxyz": [ 0, 0, @@ -6697,7 +6697,7 @@ "img": "sbkp_js_51056", "heroimg": "hbkp_js_51056", "portrait": "zm_img_51056", - "bust": "bust_25001", + "bust": "bust_51056", "postxyz": [ 0, 0, @@ -6732,7 +6732,7 @@ "img": "sbkp_js_51057", "heroimg": "hbkp_js_51057", "portrait": "zm_img_51057", - "bust": "bust_25001", + "bust": "bust_51057", "postxyz": [ 0, 0, @@ -6767,7 +6767,7 @@ "img": "sbkp_js_54011", "heroimg": "hbkp_js_54011", "portrait": "zm_img_54011", - "bust": "bust_25001", + "bust": "bust_54011", "postxyz": [ 0, 0, @@ -6802,7 +6802,7 @@ "img": "sbkp_js_54012", "heroimg": "hbkp_js_54012", "portrait": "zm_img_54012", - "bust": "bust_25001", + "bust": "bust_54012", "postxyz": [ 0, 0, @@ -6837,7 +6837,7 @@ "img": "sbkp_js_54013", "heroimg": "hbkp_js_54013", "portrait": "zm_img_54013", - "bust": "bust_25001", + "bust": "bust_54013", "postxyz": [ 0, 0, @@ -6872,7 +6872,7 @@ "img": "sbkp_js_54014", "heroimg": "hbkp_js_54014", "portrait": "zm_img_54014", - "bust": "bust_25001", + "bust": "bust_54014", "postxyz": [ 0, 0, @@ -6907,7 +6907,7 @@ "img": "sbkp_js_54015", "heroimg": "hbkp_js_54015", "portrait": "zm_img_54015", - "bust": "bust_25001", + "bust": "bust_54015", "postxyz": [ 0, 0, @@ -6942,7 +6942,7 @@ "img": "sbkp_js_54016", "heroimg": "hbkp_js_54016", "portrait": "zm_img_54016", - "bust": "bust_25001", + "bust": "bust_54016", "postxyz": [ 0, 0, @@ -6977,7 +6977,7 @@ "img": "sbkp_js_54017", "heroimg": "hbkp_js_54017", "portrait": "zm_img_54017", - "bust": "bust_25001", + "bust": "bust_54017", "postxyz": [ 0, 0, @@ -7012,7 +7012,7 @@ "img": "sbkp_js_33003", "heroimg": "hbkp_js_33003", "portrait": "zm_img_33003", - "bust": "bust_25001", + "bust": "bust_75001", "postxyz": [ 0, 0, @@ -7047,7 +7047,7 @@ "img": "sbkp_js_51005", "heroimg": "hbkp_js_51005", "portrait": "zm_img_51005", - "bust": "bust_25001", + "bust": "bust_75002", "postxyz": [ 0, 0, @@ -7082,7 +7082,7 @@ "img": "sbkp_js_23004", "heroimg": "hbkp_js_23004", "portrait": "zm_img_23004", - "bust": "bust_25001", + "bust": "bust_75003", "postxyz": [ 0, 0, @@ -7117,7 +7117,7 @@ "img": "sbkp_js_53001", "heroimg": "hbkp_js_53001", "portrait": "zm_img_53001", - "bust": "bust_25001", + "bust": "bust_75004", "postxyz": [ 0, 0, @@ -7152,7 +7152,7 @@ "img": "sbkp_js_14001", "heroimg": "hbkp_js_14001", "portrait": "zm_img_14001", - "bust": "bust_25001", + "bust": "bust_75005", "postxyz": [ 0, 0, @@ -7187,7 +7187,7 @@ "img": "sbkp_js_51050", "heroimg": "hbkp_js_51050", "portrait": "zm_img_51050", - "bust": "bust_25001", + "bust": "bust_53007", "postxyz": [ 0, 0, @@ -7222,7 +7222,7 @@ "img": "sbkp_js_54018", "heroimg": "hbkp_js_54018", "portrait": "zm_img_54018", - "bust": "bust_25001", + "bust": "bust_54018", "postxyz": [ 0, 0, @@ -7257,7 +7257,7 @@ "img": "sbkp_js_54019", "heroimg": "hbkp_js_54019", "portrait": "zm_img_54019", - "bust": "bust_25001", + "bust": "bust_54019", "postxyz": [ 0, 0, @@ -7292,7 +7292,7 @@ "img": "sbkp_js_54020", "heroimg": "hbkp_js_54020", "portrait": "zm_img_54020", - "bust": "bust_25001", + "bust": "bust_54020", "postxyz": [ 0, 0, @@ -7327,7 +7327,7 @@ "img": "sbkp_js_54021", "heroimg": "hbkp_js_54021", "portrait": "zm_img_54021", - "bust": "bust_25001", + "bust": "bust_54021", "postxyz": [ 0, 0, @@ -7362,7 +7362,7 @@ "img": "sbkp_js_54022", "heroimg": "hbkp_js_54022", "portrait": "zm_img_54022", - "bust": "bust_25001", + "bust": "bust_54022", "postxyz": [ 0, 0, @@ -7397,7 +7397,7 @@ "img": "sbkp_js_54023", "heroimg": "hbkp_js_54023", "portrait": "zm_img_54023", - "bust": "bust_25001", + "bust": "bust_54023", "postxyz": [ 0, 0, @@ -7432,7 +7432,7 @@ "img": "sbkp_js_54024", "heroimg": "hbkp_js_54024", "portrait": "zm_img_54024", - "bust": "bust_25001", + "bust": "bust_54024", "postxyz": [ 0, 0, @@ -7467,7 +7467,7 @@ "img": "sbkp_js_54025", "heroimg": "hbkp_js_54025", "portrait": "zm_img_54025", - "bust": "bust_25001", + "bust": "bust_54025", "postxyz": [ 0, 0, @@ -7502,7 +7502,7 @@ "img": "sbkp_js_83007", "heroimg": "hbkp_js_83007", "portrait": "zm_img_83007", - "bust": "bust_25001", + "bust": "bust_83007", "postxyz": [ 0, 0, @@ -7537,7 +7537,7 @@ "img": "sbkp_js_51012", "heroimg": "hbkp_js_51012", "portrait": "zm_img_51012", - "bust": "bust_25001", + "bust": "bust_83008", "postxyz": [ 0, 0, @@ -7572,7 +7572,7 @@ "img": "sbkp_js_85001", "heroimg": "hbkp_js_85001", "portrait": "zm_img_85001", - "bust": "bust_25001", + "bust": "bust_85001", "postxyz": [ 0, 0, @@ -7607,7 +7607,7 @@ "img": "sbkp_js_85002", "heroimg": "hbkp_js_85002", "portrait": "zm_img_85002", - "bust": "bust_25001", + "bust": "bust_85002", "postxyz": [ 0, 0, @@ -7642,7 +7642,7 @@ "img": "sbkp_js_85003", "heroimg": "hbkp_js_85003", "portrait": "zm_img_85003", - "bust": "bust_25001", + "bust": "bust_85003", "postxyz": [ 0, 0, @@ -7677,7 +7677,7 @@ "img": "sbkp_js_54003", "heroimg": "hbkp_js_54003", "portrait": "zm_img_54003", - "bust": "bust_25001", + "bust": "bust_54003", "postxyz": [ 0, 0, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index aa68b5741..d5b299998 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -390180,7 +390180,9 @@ "heroid": 55001, "star": 3, "equip": [], - "newskill": [], + "newskill": [ + 134006011 + ], "lv": 20, "hppro": 10, "atkpro": 0.5, @@ -390495,7 +390497,9 @@ "heroid": 55001, "star": 3, "equip": [], - "newskill": [], + "newskill": [ + 134006011 + ], "lv": 30, "hppro": 10, "atkpro": 0.5, @@ -390810,7 +390814,9 @@ "heroid": 55001, "star": 3, "equip": [], - "newskill": [], + "newskill": [ + 134006011 + ], "lv": 40, "hppro": 10, "atkpro": 0.5, @@ -391125,7 +391131,9 @@ "heroid": 55001, "star": 4, "equip": [], - "newskill": [], + "newskill": [ + 134006011 + ], "lv": 50, "hppro": 10, "atkpro": 0.5, @@ -391440,7 +391448,9 @@ "heroid": 55001, "star": 5, "equip": [], - "newskill": [], + "newskill": [ + 134006011 + ], "lv": 60, "hppro": 10, "atkpro": 0.5, @@ -391755,7 +391765,9 @@ "heroid": 55001, "star": 5, "equip": [], - "newskill": [], + "newskill": [ + 134006011 + ], "lv": 70, "hppro": 10, "atkpro": 0.5, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index df1474d26..d8b09a728 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -9195,7 +9195,7 @@ }, { "id": 60118, - "heroid": 25001, + "heroid": 35006, "Levelid": 0, "datas": [ "GameMain", @@ -9392,7 +9392,7 @@ }, { "id": 60168, - "heroid": 25001, + "heroid": 43007, "Levelid": 0, "datas": [ "GameMain", diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index abcd52168..3553ebf7a 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -74289,11 +74289,11 @@ 4, 7000 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 285001312, 285001313 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -74668,11 +74668,11 @@ 4, 7000 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 285002312, 285002313 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -75046,11 +75046,11 @@ 4, 7000 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 285003312, 285003313 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index b8bc86f9d..b1d2518cc 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -61012,7 +61012,7 @@ "key": "skill_skill_atk_Name_185001111", "text": "火岩熔心" }, - "ico": "jn_85001_1", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -61045,7 +61045,7 @@ "key": "skill_skill_atk_Name_185001211", "text": "熔魂重塑" }, - "ico": "jn_85001_2", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -61078,7 +61078,7 @@ "key": "skill_skill_atk_Name_185001311", "text": "熔焰迸发" }, - "ico": "jn_85001_3", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -61111,7 +61111,7 @@ "key": "skill_skill_atk_Name_185001411", "text": "岩浆倾泻" }, - "ico": "jn_85001_4", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_4", @@ -61144,7 +61144,7 @@ "key": "skill_skill_atk_Name_185001511", "text": "熔岩爆裂" }, - "ico": "jn_85001_5", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_5", @@ -61158,7 +61158,9 @@ 285001513 ] }, - "passSkill": [], + "passSkill": [ + 285001513 + ], "Desc": { "key": "skill_skill_atk_Desc_185001511_1", "text": "对敌方全体造成伤害,并引爆当前叠加层数的【炽热岩浆】,引爆时将根据【炽热岩浆】的剩余层数提升本次伤害。释放该技能后,若清除掉的【炽热岩浆】层数达到目标,火焰泰坦会短暂进入破防状态。" @@ -61178,7 +61180,7 @@ "key": "skill_skill_atk_Name_185001611", "text": "炽热散落" }, - "ico": "jn_85001_6", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_6", @@ -61212,7 +61214,7 @@ "key": "skill_skill_atk_Name_185002111", "text": "荆棘窒息" }, - "ico": "jn_85002_1", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -61245,7 +61247,7 @@ "key": "skill_skill_atk_Name_185002211", "text": "森魂复苏" }, - "ico": "jn_85002_2", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -61278,7 +61280,7 @@ "key": "skill_skill_atk_Name_185002311", "text": "盘根错节" }, - "ico": "jn_85002_3", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -61311,7 +61313,7 @@ "key": "skill_skill_atk_Name_185002411", "text": "痛苦蔓延" }, - "ico": "jn_85002_4", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_4", @@ -61344,7 +61346,7 @@ "key": "skill_skill_atk_Name_185002511", "text": "藤蔓狂舞" }, - "ico": "jn_85002_5", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_5", @@ -61358,7 +61360,9 @@ 285002513 ] }, - "passSkill": [], + "passSkill": [ + 285002513 + ], "Desc": { "key": "skill_skill_atk_Desc_185002511_1", "text": "对敌方全体造成伤害,并引爆当前叠加层数的【疯缠树枝】,引爆时将根据【疯缠树枝】的剩余层数提升本次伤害。释放该技能后,若清除掉的【疯缠树枝】层数达到目标,森林泰坦会短暂进入破防状态。" @@ -61378,7 +61382,7 @@ "key": "skill_skill_atk_Name_185002611", "text": "大地震撼" }, - "ico": "jn_85002_6", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_6", @@ -61412,7 +61416,7 @@ "key": "skill_skill_atk_Name_185003111", "text": "冰寒彻骨" }, - "ico": "jn_85003_1", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_1", @@ -61445,7 +61449,7 @@ "key": "skill_skill_atk_Name_185003211", "text": "冰魂觉醒" }, - "ico": "jn_85003_2", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_2", @@ -61478,7 +61482,7 @@ "key": "skill_skill_atk_Name_185003311", "text": "寒风凛冽" }, - "ico": "jn_85003_3", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_3", @@ -61511,7 +61515,7 @@ "key": "skill_skill_atk_Name_185003411", "text": "冰冻三尺" }, - "ico": "jn_85003_4", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_4", @@ -61544,7 +61548,7 @@ "key": "skill_skill_atk_Name_185003511", "text": "冰霜呼啸" }, - "ico": "jn_85003_5", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_5", @@ -61558,7 +61562,9 @@ 285003513 ] }, - "passSkill": [], + "passSkill": [ + 285003513 + ], "Desc": { "key": "skill_skill_atk_Desc_185003511_1", "text": "对敌方全体造成伤害,并引爆当前叠加层数的【寒骨冰棱】,引爆时将根据【寒骨冰棱】的剩余层数提升本次伤害。释放该技能后,若清除掉的【寒骨冰棱】层数达到目标,冰霜泰坦会短暂进入破防状态。" @@ -61578,7 +61584,7 @@ "key": "skill_skill_atk_Name_185003611", "text": "冰川雪崩" }, - "ico": "jn_85003_6", + "ico": "jn_51056_1", "CorrectPos": 0, "IsMelee": 0, "act": "Skill_6", diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index a90e38cbf..23f381682 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -14667,7 +14667,7 @@ "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", - "buffIcon": "", + "buffIcon": "ty_icon_buff_fcsz", "buffeffect": "", "buffpos": "", "AddTrigger": 0, diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index bf26e09bf..7d913ae71 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -13431,12 +13431,14 @@ "icon": "", "When": 16, "FromCheck": "Target=3", - "TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000116,OverlayNum=25", + "TargetCheck": "Target=2", "MainSkillCheck": "SkillPos=5", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", - "AddCon": [], + "AddCon": [ + "BuffTotalOverlayNumLess=391000116,OverlayNum=25" + ], "PasPr": 1000, "PasCorrection": 0, "TriggerAnim": "", @@ -13457,12 +13459,14 @@ "icon": "", "When": 16, "FromCheck": "Target=3", - "TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000123,OverlayNum=25", + "TargetCheck": "Target=2", "MainSkillCheck": "SkillPos=5", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", - "AddCon": [], + "AddCon": [ + "BuffTotalOverlayNumLess=391000123,OverlayNum=25" + ], "PasPr": 1000, "PasCorrection": 0, "TriggerAnim": "", @@ -13483,12 +13487,14 @@ "icon": "", "When": 16, "FromCheck": "Target=3", - "TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000127,OverlayNum=25", + "TargetCheck": "Target=2", "MainSkillCheck": "SkillPos=5", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", - "AddCon": [], + "AddCon": [ + "BuffTotalOverlayNumLess=391000127,OverlayNum=25" + ], "PasPr": 1000, "PasCorrection": 0, "TriggerAnim": "", diff --git a/modules/comp_model.go b/modules/comp_model.go index 8bf9d68a2..74b8cfa9a 100644 --- a/modules/comp_model.go +++ b/modules/comp_model.go @@ -198,3 +198,7 @@ func (this *MCompModel) DelListlds(uid string, ids []string, opt ...db.DBOption) func (this *MCompModel) BatchDelLists(uid string) (err error) { return this.DBModel.BatchDelLists(uid) } + +func (this *MCompModel) RedisDels(uids []string) (err error) { + return this.DBModel.RedisDels(uids) +} diff --git a/modules/plunder/api_getlist.go b/modules/plunder/api_getlist.go index 79d692cb2..62149e640 100644 --- a/modules/plunder/api_getlist.go +++ b/modules/plunder/api_getlist.go @@ -39,6 +39,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PlunderGetListRe return } list.Landid = land.Id + update["landid"] = land.Id } else { // 校验是否过期 if list.Etime > configure.Now().Unix() { diff --git a/modules/plunder/model_land.go b/modules/plunder/model_land.go index 95f00b7cd..cbec30f6b 100644 --- a/modules/plunder/model_land.go +++ b/modules/plunder/model_land.go @@ -49,6 +49,7 @@ func (this *modelLand) changePlunderLandData(id string, update map[string]interf func (this *modelLand) createPlunderLandData(user *pb.DBPlunder) (land *pb.DBPlunderLand, err error) { var ( uids []string + other []string users []*pb.DBPlunder socre int32 ) @@ -69,6 +70,7 @@ func (this *modelLand) createPlunderLandData(user *pb.DBPlunder) (land *pb.DBPlu tmp := &pb.DBPlunder{} if err = cur.Decode(tmp); err == nil { users = append(users, tmp) + other = append(other, tmp.Uid) } } @@ -85,7 +87,11 @@ func (this *modelLand) createPlunderLandData(user *pb.DBPlunder) (land *pb.DBPlu for _, v := range users { uids = append(uids, v.Uid) } - if err = this.module.modelPlunder.BatchChange(uids, map[string]interface{}{"landid": land.Id}); err != nil { + if err = this.module.modelPlunder.RedisDels(other); err != nil { + return + } + if _, err = this.DB.UpdateMany(core.SqlTable(comm.TablePlunder), bson.M{"uid": bson.M{"$in": uids}}, bson.M{"$set": bson.M{"landid": land.Id}}); err != nil { + fmt.Printf("err:%v", err) return } return diff --git a/modules/plunder/model_plunder.go b/modules/plunder/model_plunder.go index 8e4dc669a..12815d4b5 100644 --- a/modules/plunder/model_plunder.go +++ b/modules/plunder/model_plunder.go @@ -10,6 +10,8 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/sys/db" + mgooptions "go.mongodb.org/mongo-driver/mongo/options" + "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/x/bsonx" @@ -25,7 +27,8 @@ func (this *modelPlunder) Init(service core.IService, module core.IModule, comp this.TableName = comm.TablePlunder this.module = module.(*Plunder) this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ - Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + Options: mgooptions.Index().SetUnique(true), }) this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ Keys: bsonx.Doc{{Key: "score", Value: bsonx.Int32(1)}}, @@ -66,28 +69,30 @@ func (this *modelPlunder) getPlunderData(session comm.IUserSession) (info *pb.DB this.module.Errorln(err) return } - user, err = this.module.GetUserForSession(session) - if err != nil { - this.module.Errorln(err) - return - } - info = &pb.DBPlunder{ - Id: primitive.NewObjectID().Hex(), - Uid: session.GetUserId(), - Uinfo: comm.GetUserBaseInfo(user), - Ctime: configure.Now().Unix(), - Develop: make(map[int32]int32), - } + if err == mgo.MongodbNil { + user, err = this.module.GetUserForSession(session) + if err != nil { + this.module.Errorln(err) + return + } + info = &pb.DBPlunder{ + Id: primitive.NewObjectID().Hex(), + Uid: session.GetUserId(), + Uinfo: comm.GetUserBaseInfo(user), + Ctime: configure.Now().Unix(), + Develop: make(map[int32]int32), + } - for i := 0; i < 3; i++ { // 队列固定三条 - info.Line = append(info.Line, &pb.TransportLine{}) + for i := 0; i < 3; i++ { // 队列固定三条 + info.Line = append(info.Line, &pb.TransportLine{}) + } + info.Line = append(info.Line, &pb.TransportLine{ + Closetime: -1, // 需要手动解锁 + }) + // 刷新货物信息 + info.Source, _ = this.refreshGoodsInfo() + err = this.Add(session.GetUserId(), info) } - info.Line = append(info.Line, &pb.TransportLine{ - Closetime: -1, // 需要手动解锁 - }) - // 刷新货物信息 - info.Source, _ = this.refreshGoodsInfo() - err = this.Add(session.GetUserId(), info) return } diff --git a/sys/configure/structs/TEnum.ETaskDesType.go b/sys/configure/structs/TEnum.ETaskDesType.go index 02241bfed..4ca654641 100644 --- a/sys/configure/structs/TEnum.ETaskDesType.go +++ b/sys/configure/structs/TEnum.ETaskDesType.go @@ -15,4 +15,5 @@ const ( TEnumETaskDesType_Weekly = 4 TEnumETaskDesType_Caravan = 5 TEnumETaskDesType_EasterEgg = 6 + TEnumETaskDesType_Guild = 7 ) diff --git a/sys/db/dbmodel.go b/sys/db/dbmodel.go index 3c66ff6d3..e5fffff0f 100644 --- a/sys/db/dbmodel.go +++ b/sys/db/dbmodel.go @@ -399,6 +399,7 @@ func (this *DBModel) ChangeLists(uid string, datas map[string]interface{}, opt . func (this *DBModel) BatchChange(uids []string, datas map[string]interface{}, opt ...DBOption) (err error) { pipe := this.Redis.RedisPipe(context.TODO()) for _, uid := range uids { + if err = pipe.HMSet(this.ukey(uid), datas); err != nil { log.Error("DBModel ChangeList", log.Field{Key: "err", Value: err.Error()}) return @@ -1367,3 +1368,16 @@ func (this *DBModel) BatchDelLists(uid string) (err error) { } return } + +// 删除卸载redis +func (this *DBModel) RedisDels(uids []string) (err error) { + pipe := this.Redis.RedisPipe(context.TODO()) + for _, uid := range uids { + if err = pipe.Delete(this.ukey(uid)); err != nil { + log.Error("DBModel RedisDels", log.Field{Key: "err", Value: err.Error()}) + return + } + } + _, err = pipe.Exec() + return +} diff --git a/sys/db/init_test.go b/sys/db/init_test.go index 91b3a8d04..48cf38ec6 100644 --- a/sys/db/init_test.go +++ b/sys/db/init_test.go @@ -5,6 +5,7 @@ import ( "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/log" "go_dreamfactory/lego/sys/mgo" r "go_dreamfactory/lego/sys/redis" "go_dreamfactory/pb" @@ -131,31 +132,20 @@ func TestRa(t *testing.T) { r.SetRedisType(r.Redis_Single), r.SetRedis_Single_Addr("10.0.0.9:10011"), r.SetRedis_Single_Password("li13451234"), - r.SetRedis_Single_DB(15), + r.SetRedis_Single_DB(3), ); err != nil { fmt.Printf("err:%v", err) return } else { - s, err2 := sys.ZRevRange("sociatyboss:personalrank", 0, 10).Result() - if err2 != nil { - t.Fatal(err2) + pipe := sys.RedisPipe(context.TODO()) + uids := []string{"dfli-plunder:dfli_65b3b051d7569e684039d273"} + for _, uid := range uids { + if err = pipe.Delete(uid); err != nil { + log.Error("DBModel RedisDels", log.Field{Key: "err", Value: err.Error()}) + return + } } - // m := &redis.Z{Score: float64(1), Member: "dd"} - // sys.ZAdd("sociatyrank", m) - - // sys.ZIncrBy("sociatyrank", 10, "a100aa") - // sys.ZIncrBy("sociatyrank", 10, "a100ab") - - for _, v := range s { - // fmt.Println(v) - score, _ := sys.ZScore("sociatyboss:personalrank", v) - ranking, _ := sys.ZRevRank("sociatyboss:personalrank", v) - fmt.Printf("%d %v - %d \n", (ranking + 1), v, int64(score)) - - result, _ := sys.ZRevRank("sociatyboss:personalrank", v) - fmt.Println(result) - } - + _, err = pipe.Exec() } }