diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 6e97f5e12..36859bcc3 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -256,7 +256,7 @@ "img": "item_10000007", "intr": { "key": "item_item_intr_7", - "text": "周常活跃度" + "text": "周常活跃度,获得一定活跃度可以领取周常奖励" }, "sale": [] }, @@ -3036,7 +3036,7 @@ "img": "xxtx_js_13001", "intr": { "key": "item_item_intr_93", - "text": "闪闪守护之心,可用于守护者觉醒与技能提升" + "text": "闪闪守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3075,7 +3075,7 @@ "img": "xxtx_js_13002", "intr": { "key": "item_item_intr_94", - "text": "食人鱼先生守护之心,可用于守护者觉醒与技能提升" + "text": "食人鱼先生守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3114,7 +3114,7 @@ "img": "xxtx_js_13003", "intr": { "key": "item_item_intr_95", - "text": "啊啊守护之心,可用于守护者觉醒与技能提升" + "text": "啊啊守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3153,7 +3153,7 @@ "img": "xxtx_js_13004", "intr": { "key": "item_item_intr_96", - "text": "法夸德勋爵守护之心,可用于守护者觉醒与技能提升" + "text": "法夸德勋爵守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3192,7 +3192,7 @@ "img": "xxtx_js_13005", "intr": { "key": "item_item_intr_97", - "text": "大大守护之心,可用于守护者觉醒与技能提升" + "text": "大大守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3231,7 +3231,7 @@ "img": "xxtx_js_14001", "intr": { "key": "item_item_intr_98", - "text": "史图依克守护之心,可用于守护者觉醒与技能提升" + "text": "史图依克守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3270,7 +3270,7 @@ "img": "xxtx_js_14002", "intr": { "key": "item_item_intr_99", - "text": "大龙守护之心,可用于守护者觉醒与技能提升" + "text": "大龙守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3309,7 +3309,7 @@ "img": "xxtx_js_14003", "intr": { "key": "item_item_intr_100", - "text": "亚丝翠守护之心,可用于守护者觉醒与技能提升" + "text": "亚丝翠守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3348,7 +3348,7 @@ "img": "xxtx_js_14004", "intr": { "key": "item_item_intr_101", - "text": "克莱尔·努涅斯守护之心,可用于守护者觉醒与技能提升" + "text": "克莱尔·努涅斯守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3387,7 +3387,7 @@ "img": "xxtx_js_14005", "intr": { "key": "item_item_intr_102", - "text": "鹤大师守护之心,可用于守护者觉醒与技能提升" + "text": "鹤大师守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3426,7 +3426,7 @@ "img": "xxtx_js_14006", "intr": { "key": "item_item_intr_103", - "text": "布兰奇守护之心,可用于守护者觉醒与技能提升" + "text": "布兰奇守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3465,7 +3465,7 @@ "img": "xxtx_js_14007", "intr": { "key": "item_item_intr_104", - "text": "格里斯特王子守护之心,可用于守护者觉醒与技能提升" + "text": "格里斯特王子守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3504,7 +3504,7 @@ "img": "xxtx_js_15001", "intr": { "key": "item_item_intr_105", - "text": "吉姆·莱克守护之心,可用于守护者觉醒与技能提升" + "text": "吉姆·莱克守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3543,7 +3543,7 @@ "img": "xxtx_js_15002", "intr": { "key": "item_item_intr_106", - "text": "船长守护之心,可用于守护者觉醒与技能提升" + "text": "船长守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3582,7 +3582,7 @@ "img": "xxtx_js_15003", "intr": { "key": "item_item_intr_107", - "text": "希沙窦斯守护之心,可用于守护者觉醒与技能提升" + "text": "希沙窦斯守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3621,7 +3621,7 @@ "img": "xxtx_js_15004", "intr": { "key": "item_item_intr_108", - "text": "小欧守护之心,可用于守护者觉醒与技能提升" + "text": "小欧守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3660,7 +3660,7 @@ "img": "xxtx_js_15005", "intr": { "key": "item_item_intr_109", - "text": "亚力克斯守护之心,可用于守护者觉醒与技能提升" + "text": "亚力克斯守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3699,7 +3699,7 @@ "img": "xxtx_js_23001", "intr": { "key": "item_item_intr_110", - "text": "斯梅克船长守护之心,可用于守护者觉醒与技能提升" + "text": "斯梅克船长守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3738,7 +3738,7 @@ "img": "xxtx_js_23002", "intr": { "key": "item_item_intr_111", - "text": "警卫队长守护之心,可用于守护者觉醒与技能提升" + "text": "警卫队长守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3777,7 +3777,7 @@ "img": "xxtx_js_23003", "intr": { "key": "item_item_intr_112", - "text": "黛塔黛恩守护之心,可用于守护者觉醒与技能提升" + "text": "黛塔黛恩守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3816,7 +3816,7 @@ "img": "xxtx_js_23004", "intr": { "key": "item_item_intr_113", - "text": "吉姆·普雷斯科特守护之心,可用于守护者觉醒与技能提升" + "text": "吉姆·普雷斯科特守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3855,7 +3855,7 @@ "img": "xxtx_js_24001", "intr": { "key": "item_item_intr_114", - "text": "警长守护之心,可用于守护者觉醒与技能提升" + "text": "警长守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3894,7 +3894,7 @@ "img": "xxtx_js_24002", "intr": { "key": "item_item_intr_115", - "text": "牙仙守护之心,可用于守护者觉醒与技能提升" + "text": "牙仙守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3933,7 +3933,7 @@ "img": "xxtx_js_24003", "intr": { "key": "item_item_intr_116", - "text": "睡神沙人守护之心,可用于守护者觉醒与技能提升" + "text": "睡神沙人守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -3972,7 +3972,7 @@ "img": "xxtx_js_24004", "intr": { "key": "item_item_intr_117", - "text": "邦尼兔守护之心,可用于守护者觉醒与技能提升" + "text": "邦尼兔守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4011,7 +4011,7 @@ "img": "xxtx_js_24005", "intr": { "key": "item_item_intr_118", - "text": "金猴守护之心,可用于守护者觉醒与技能提升" + "text": "金猴守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4050,7 +4050,7 @@ "img": "xxtx_js_24006", "intr": { "key": "item_item_intr_119", - "text": "凯尔守护之心,可用于守护者觉醒与技能提升" + "text": "凯尔守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4089,7 +4089,7 @@ "img": "xxtx_js_24007", "intr": { "key": "item_item_intr_120", - "text": "小钱守护之心,可用于守护者觉醒与技能提升" + "text": "小钱守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4128,7 +4128,7 @@ "img": "xxtx_js_24008", "intr": { "key": "item_item_intr_121", - "text": "暴芙那特守护之心,可用于守护者觉醒与技能提升" + "text": "暴芙那特守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4167,7 +4167,7 @@ "img": "xxtx_js_24009", "intr": { "key": "item_item_intr_122", - "text": "云朵先生守护之心,可用于守护者觉醒与技能提升" + "text": "云朵先生守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4206,7 +4206,7 @@ "img": "xxtx_js_25001", "intr": { "key": "item_item_intr_123", - "text": "阿宝守护之心,可用于守护者觉醒与技能提升" + "text": "阿宝守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4245,7 +4245,7 @@ "img": "xxtx_js_25002", "intr": { "key": "item_item_intr_124", - "text": "沃尔夫先生守护之心,可用于守护者觉醒与技能提升" + "text": "沃尔夫先生守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4284,7 +4284,7 @@ "img": "xxtx_js_25003", "intr": { "key": "item_item_intr_125", - "text": "羊仙姑守护之心,可用于守护者觉醒与技能提升" + "text": "羊仙姑守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4323,7 +4323,7 @@ "img": "xxtx_js_25004", "intr": { "key": "item_item_intr_126", - "text": "波比守护之心,可用于守护者觉醒与技能提升" + "text": "波比守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4362,7 +4362,7 @@ "img": "xxtx_js_33001", "intr": { "key": "item_item_intr_127", - "text": "巫嘎守护之心,可用于守护者觉醒与技能提升" + "text": "巫嘎守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4401,7 +4401,7 @@ "img": "xxtx_js_33002", "intr": { "key": "item_item_intr_128", - "text": "坦克守护之心,可用于守护者觉醒与技能提升" + "text": "坦克守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4440,7 +4440,7 @@ "img": "xxtx_js_33003", "intr": { "key": "item_item_intr_129", - "text": "胡德先生守护之心,可用于守护者觉醒与技能提升" + "text": "胡德先生守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4479,7 +4479,7 @@ "img": "xxtx_js_33004", "intr": { "key": "item_item_intr_130", - "text": "普鲁格兰杰守护之心,可用于守护者觉醒与技能提升" + "text": "普鲁格兰杰守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4518,7 +4518,7 @@ "img": "xxtx_js_33005", "intr": { "key": "item_item_intr_131", - "text": "鼻涕粗守护之心,可用于守护者觉醒与技能提升" + "text": "鼻涕粗守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4557,7 +4557,7 @@ "img": "xxtx_js_33006", "intr": { "key": "item_item_intr_132", - "text": "珍妮丝·邓普顿守护之心,可用于守护者觉醒与技能提升" + "text": "珍妮丝·邓普顿守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4596,7 +4596,7 @@ "img": "xxtx_js_34001", "intr": { "key": "item_item_intr_133", - "text": "贫嘴驴守护之心,可用于守护者觉醒与技能提升" + "text": "贫嘴驴守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4635,7 +4635,7 @@ "img": "xxtx_js_34002", "intr": { "key": "item_item_intr_134", - "text": "蒂姆·邓普顿守护之心,可用于守护者觉醒与技能提升" + "text": "蒂姆·邓普顿守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4674,7 +4674,7 @@ "img": "xxtx_js_34003", "intr": { "key": "item_item_intr_135", - "text": "圣诞老人守护之心,可用于守护者觉醒与技能提升" + "text": "圣诞老人守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4713,7 +4713,7 @@ "img": "xxtx_js_34004", "intr": { "key": "item_item_intr_136", - "text": "瓜哥守护之心,可用于守护者觉醒与技能提升" + "text": "瓜哥守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4752,7 +4752,7 @@ "img": "xxtx_js_34005", "intr": { "key": "item_item_intr_137", - "text": "沃尔特·史翠克勒守护之心,可用于守护者觉醒与技能提升" + "text": "沃尔特·史翠克勒守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4791,7 +4791,7 @@ "img": "xxtx_js_34006", "intr": { "key": "item_item_intr_138", - "text": "冰霜杰克守护之心,可用于守护者觉醒与技能提升" + "text": "冰霜杰克守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4830,7 +4830,7 @@ "img": "xxtx_js_34007", "intr": { "key": "item_item_intr_139", - "text": "菲奥娜守护之心,可用于守护者觉醒与技能提升" + "text": "菲奥娜守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4869,7 +4869,7 @@ "img": "xxtx_js_34008", "intr": { "key": "item_item_intr_140", - "text": "悍夫那特守护之心,可用于守护者觉醒与技能提升" + "text": "悍夫那特守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4908,7 +4908,7 @@ "img": "xxtx_js_35001", "intr": { "key": "item_item_intr_141", - "text": "师父守护之心,可用于守护者觉醒与技能提升" + "text": "师父守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4947,7 +4947,7 @@ "img": "xxtx_js_35002", "intr": { "key": "item_item_intr_142", - "text": "希卡普守护之心,可用于守护者觉醒与技能提升" + "text": "希卡普守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -4986,7 +4986,7 @@ "img": "xxtx_js_35003", "intr": { "key": "item_item_intr_143", - "text": "漆黑守护之心,可用于守护者觉醒与技能提升" + "text": "漆黑守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5025,7 +5025,7 @@ "img": "xxtx_js_35004", "intr": { "key": "item_item_intr_144", - "text": "黛安·福克斯顿守护之心,可用于守护者觉醒与技能提升" + "text": "黛安·福克斯顿守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5064,7 +5064,7 @@ "img": "xxtx_js_35005", "intr": { "key": "item_item_intr_145", - "text": "幸运·普雷斯科特守护之心,可用于守护者觉醒与技能提升" + "text": "幸运·普雷斯科特守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5103,7 +5103,7 @@ "img": "xxtx_js_35006", "intr": { "key": "item_item_intr_146", - "text": "平先生守护之心,可用于守护者觉醒与技能提升" + "text": "平先生守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5142,7 +5142,7 @@ "img": "xxtx_js_43001", "intr": { "key": "item_item_intr_147", - "text": "阿比盖尔·斯通守护之心,可用于守护者觉醒与技能提升" + "text": "阿比盖尔·斯通守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5181,7 +5181,7 @@ "img": "xxtx_js_43002", "intr": { "key": "item_item_intr_148", - "text": "果酱教授守护之心,可用于守护者觉醒与技能提升" + "text": "果酱教授守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5220,7 +5220,7 @@ "img": "xxtx_js_43003", "intr": { "key": "item_item_intr_149", - "text": "史蒂夫·帕丘克守护之心,可用于守护者觉醒与技能提升" + "text": "史蒂夫·帕丘克守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5259,7 +5259,7 @@ "img": "xxtx_js_43004", "intr": { "key": "item_item_intr_150", - "text": "姜饼人守护之心,可用于守护者觉醒与技能提升" + "text": "姜饼人守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5298,7 +5298,7 @@ "img": "xxtx_js_43005", "intr": { "key": "item_item_intr_151", - "text": "瓦希尔指挥官守护之心,可用于守护者觉醒与技能提升" + "text": "瓦希尔指挥官守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5337,7 +5337,7 @@ "img": "xxtx_js_43006", "intr": { "key": "item_item_intr_152", - "text": "布里奇特守护之心,可用于守护者觉醒与技能提升" + "text": "布里奇特守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5376,7 +5376,7 @@ "img": "xxtx_js_43007", "intr": { "key": "item_item_intr_153", - "text": "戈伯守护之心,可用于守护者觉醒与技能提升" + "text": "戈伯守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5415,7 +5415,7 @@ "img": "xxtx_js_44001", "intr": { "key": "item_item_intr_154", - "text": "美肚鲨守护之心,可用于守护者觉醒与技能提升" + "text": "美肚鲨守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5454,7 +5454,7 @@ "img": "xxtx_js_44002", "intr": { "key": "item_item_intr_155", - "text": "蛇先生守护之心,可用于守护者觉醒与技能提升" + "text": "蛇先生守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5493,7 +5493,7 @@ "img": "xxtx_js_44003", "intr": { "key": "item_item_intr_156", - "text": "匹诺曹守护之心,可用于守护者觉醒与技能提升" + "text": "匹诺曹守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5532,7 +5532,7 @@ "img": "xxtx_js_44004", "intr": { "key": "item_item_intr_157", - "text": "骇客蛛守护之心,可用于守护者觉醒与技能提升" + "text": "骇客蛛守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5571,7 +5571,7 @@ "img": "xxtx_js_44005", "intr": { "key": "item_item_intr_158", - "text": "小伊守护之心,可用于守护者觉醒与技能提升" + "text": "小伊守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5610,7 +5610,7 @@ "img": "xxtx_js_44006", "intr": { "key": "item_item_intr_159", - "text": "悍娇虎守护之心,可用于守护者觉醒与技能提升" + "text": "悍娇虎守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5649,7 +5649,7 @@ "img": "xxtx_js_45001", "intr": { "key": "item_item_intr_160", - "text": "乌龟大师守护之心,可用于守护者觉醒与技能提升" + "text": "乌龟大师守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5688,7 +5688,7 @@ "img": "xxtx_js_45002", "intr": { "key": "item_item_intr_161", - "text": "梅林守护之心,可用于守护者觉醒与技能提升" + "text": "梅林守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5727,7 +5727,7 @@ "img": "xxtx_js_45003", "intr": { "key": "item_item_intr_162", - "text": "盖守护之心,可用于守护者觉醒与技能提升" + "text": "盖守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -5766,7 +5766,7 @@ "img": "xxtx_js_45004", "intr": { "key": "item_item_intr_163", - "text": "穿靴子的猫守护之心,可用于守护者觉醒与技能提升" + "text": "穿靴子的猫守护之心,可用于相应守护者的觉醒等级提升" }, "sale": [ { @@ -8666,7 +8666,7 @@ "img": "item_15000101", "intr": { "key": "item_item_intr_251", - "text": "狩猎头目的初级掉落物,可用于守护者共鸣" + "text": "狩猎头目的初级掉落物,可用于守护者回响" }, "sale": [ { @@ -8717,7 +8717,7 @@ "img": "item_15000102", "intr": { "key": "item_item_intr_252", - "text": "狩猎头目的初级掉落物,可用于守护者共鸣" + "text": "狩猎头目的初级掉落物,可用于守护者回响" }, "sale": [ { @@ -8768,7 +8768,7 @@ "img": "item_15000103", "intr": { "key": "item_item_intr_253", - "text": "狩猎头目的初级掉落物,可用于守护者共鸣" + "text": "狩猎头目的初级掉落物,可用于守护者回响" }, "sale": [ { @@ -8819,7 +8819,7 @@ "img": "item_15000104", "intr": { "key": "item_item_intr_254", - "text": "狩猎头目的初级掉落物,可用于守护者共鸣" + "text": "狩猎头目的初级掉落物,可用于守护者回响" }, "sale": [ { @@ -8882,7 +8882,7 @@ "img": "item_15000201", "intr": { "key": "item_item_intr_255", - "text": "狩猎头目的中级掉落物,可用于守护者共鸣" + "text": "狩猎头目的中级掉落物,可用于守护者回响" }, "sale": [ { @@ -8945,7 +8945,7 @@ "img": "item_15000202", "intr": { "key": "item_item_intr_256", - "text": "狩猎头目的中级掉落物,可用于守护者共鸣" + "text": "狩猎头目的中级掉落物,可用于守护者回响" }, "sale": [ { @@ -9008,7 +9008,7 @@ "img": "item_15000203", "intr": { "key": "item_item_intr_257", - "text": "狩猎头目的中级掉落物,可用于守护者共鸣" + "text": "狩猎头目的中级掉落物,可用于守护者回响" }, "sale": [ { @@ -9071,7 +9071,7 @@ "img": "item_15000204", "intr": { "key": "item_item_intr_258", - "text": "狩猎头目的中级掉落物,可用于守护者共鸣" + "text": "狩猎头目的中级掉落物,可用于守护者回响" }, "sale": [ { @@ -9122,7 +9122,7 @@ "img": "item_15000301", "intr": { "key": "item_item_intr_259", - "text": "狩猎头目的高级掉落物,可用于守护者共鸣" + "text": "狩猎头目的高级掉落物,可用于守护者回响" }, "sale": [ { @@ -9173,7 +9173,7 @@ "img": "item_15000302", "intr": { "key": "item_item_intr_260", - "text": "狩猎头目的高级掉落物,可用于守护者共鸣" + "text": "狩猎头目的高级掉落物,可用于守护者回响" }, "sale": [ { @@ -9224,7 +9224,7 @@ "img": "item_15000303", "intr": { "key": "item_item_intr_261", - "text": "狩猎头目的高级掉落物,可用于守护者共鸣" + "text": "狩猎头目的高级掉落物,可用于守护者回响" }, "sale": [ { @@ -9275,7 +9275,7 @@ "img": "item_15000304", "intr": { "key": "item_item_intr_262", - "text": "狩猎头目的高级掉落物,可用于守护者共鸣" + "text": "狩猎头目的高级掉落物,可用于守护者回响" }, "sale": [ { diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 77e7a353c..e6ab3de30 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -115670,9 +115670,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 1.5, "atkpro": 0.35, - "defpro": 0.1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index b02eee2aa..22ad4c357 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -1629,6 +1629,10 @@ { "key": 1, "param": 10 + }, + { + "key": 3, + "param": 20080 } ], "wkqbx": 3, @@ -1752,6 +1756,10 @@ { "key": 2, "param": 1100504 + }, + { + "key": 3, + "param": 20080 } ], "wkqbx": 0, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 8f078da4a..bd8bfdf62 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -1608,7 +1608,7 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json index f18132992..f713e236b 100644 --- a/bin/json/game_shopitem.json +++ b/bin/json/game_shopitem.json @@ -24782,7 +24782,7 @@ "need": [ { "a": "attr", - "t": "guildexp", + "t": "guildcoin", "n": 1000 } ], @@ -24818,7 +24818,7 @@ "need": [ { "a": "attr", - "t": "guildexp", + "t": "guildcoin", "n": 200 } ], @@ -24854,7 +24854,7 @@ "need": [ { "a": "attr", - "t": "guildexp", + "t": "guildcoin", "n": 250 } ], @@ -24890,7 +24890,7 @@ "need": [ { "a": "attr", - "t": "guildexp", + "t": "guildcoin", "n": 250 } ], @@ -24926,7 +24926,7 @@ "need": [ { "a": "attr", - "t": "guildexp", + "t": "guildcoin", "n": 50 } ], @@ -24962,7 +24962,7 @@ "need": [ { "a": "attr", - "t": "guildexp", + "t": "guildcoin", "n": 50 } ], diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index b4520ba0b..90c2c91c5 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -1597,7 +1597,7 @@ "Argu": [ 1, 4, - 2300 + 3000 ], "FollowSK": [], "SucFollowSK": [ @@ -1646,7 +1646,7 @@ "Argu": [ 1, 4, - 2400 + 3100 ], "FollowSK": [], "SucFollowSK": [ @@ -1695,7 +1695,7 @@ "Argu": [ 1, 4, - 2500 + 3200 ], "FollowSK": [], "SucFollowSK": [ @@ -1744,7 +1744,7 @@ "Argu": [ 1, 4, - 2600 + 3300 ], "FollowSK": [], "SucFollowSK": [ @@ -1793,7 +1793,7 @@ "Argu": [ 1, 4, - 2700 + 3400 ], "FollowSK": [], "SucFollowSK": [ @@ -2352,7 +2352,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -2401,7 +2401,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -2450,7 +2450,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -2499,7 +2499,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -2548,7 +2548,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -2597,7 +2597,7 @@ "Argu": [ 1, 4, - 1170 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -2643,7 +2643,7 @@ "Argu": [ 1, 4, - 1170 + 1300 ], "FollowSK": [], "SucFollowSK": [ @@ -2689,7 +2689,7 @@ "Argu": [ 1, 4, - 1270 + 1400 ], "FollowSK": [], "SucFollowSK": [ @@ -2735,7 +2735,7 @@ "Argu": [ 1, 4, - 1370 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -2781,7 +2781,7 @@ "Argu": [ 1, 4, - 4000 + 6000 ], "FollowSK": [], "SucFollowSK": [ @@ -2855,7 +2855,7 @@ "Argu": [ 1, 4, - 4100 + 6100 ], "FollowSK": [], "SucFollowSK": [ @@ -2929,7 +2929,7 @@ "Argu": [ 1, 4, - 4200 + 6200 ], "FollowSK": [], "SucFollowSK": [ @@ -3003,7 +3003,7 @@ "Argu": [ 1, 4, - 4300 + 6300 ], "FollowSK": [], "SucFollowSK": [ @@ -3077,7 +3077,7 @@ "Argu": [ 1, 4, - 4400 + 6400 ], "FollowSK": [], "SucFollowSK": [ @@ -3333,7 +3333,7 @@ "Argu": [ 1, 4, - 800, + 700, 1, 5, 1200 @@ -3385,7 +3385,7 @@ "Argu": [ 1, 4, - 800, + 700, 1, 5, 1300 @@ -3437,7 +3437,7 @@ "Argu": [ 1, 4, - 800, + 700, 1, 5, 1400 @@ -3489,7 +3489,7 @@ "Argu": [ 1, 4, - 800, + 700, 1, 5, 1500 @@ -3541,7 +3541,7 @@ "Argu": [ 1, 4, - 800, + 700, 1, 5, 1600 @@ -3710,7 +3710,7 @@ "Argu": [ 1, 5, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [], @@ -3850,7 +3850,7 @@ "Argu": [ 1, 5, - 1550 + 2050 ], "FollowSK": [], "SucFollowSK": [], @@ -3990,7 +3990,7 @@ "Argu": [ 1, 5, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [], @@ -4130,7 +4130,7 @@ "Argu": [ 1, 5, - 1650 + 2150 ], "FollowSK": [], "SucFollowSK": [], @@ -4270,7 +4270,7 @@ "Argu": [ 1, 5, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [], @@ -4341,7 +4341,7 @@ "Argu": [ 1, 4, - 800, + 1000, 1, 5, 2500 @@ -4367,7 +4367,7 @@ "Argu": [ 1, 4, - 800, + 1000, 1, 5, 2550 @@ -4393,7 +4393,7 @@ "Argu": [ 1, 4, - 800, + 1000, 1, 5, 2600 @@ -4419,7 +4419,7 @@ "Argu": [ 1, 4, - 800, + 1000, 1, 5, 2650 @@ -4469,7 +4469,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -4515,7 +4515,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -4561,7 +4561,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -4607,7 +4607,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -4653,7 +4653,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -4699,7 +4699,7 @@ "Argu": [ 1, 4, - 1000 + 1225 ], "FollowSK": [], "SucFollowSK": [ @@ -4748,7 +4748,7 @@ "Argu": [ 1, 4, - 1050 + 1235 ], "FollowSK": [], "SucFollowSK": [ @@ -4797,7 +4797,7 @@ "Argu": [ 1, 4, - 1100 + 1245 ], "FollowSK": [], "SucFollowSK": [ @@ -4846,7 +4846,7 @@ "Argu": [ 1, 4, - 1150 + 1255 ], "FollowSK": [], "SucFollowSK": [ @@ -4895,7 +4895,7 @@ "Argu": [ 1, 4, - 1200 + 1265 ], "FollowSK": [], "SucFollowSK": [ @@ -4944,7 +4944,7 @@ "Argu": [ 1, 4, - 5500 + 6000 ], "FollowSK": [], "SucFollowSK": [], @@ -5034,7 +5034,7 @@ "Argu": [ 1, 4, - 5600 + 6100 ], "FollowSK": [], "SucFollowSK": [], @@ -5080,7 +5080,7 @@ "Argu": [ 1, 4, - 5700 + 6200 ], "FollowSK": [], "SucFollowSK": [], @@ -5126,7 +5126,7 @@ "Argu": [ 1, 4, - 5800 + 6300 ], "FollowSK": [], "SucFollowSK": [], @@ -5250,7 +5250,7 @@ "Argu": [ 1, 4, - 700 + 1000 ], "FollowSK": [], "SucFollowSK": [ @@ -5384,7 +5384,7 @@ "Argu": [ 1, 4, - 800 + 1100 ], "FollowSK": [], "SucFollowSK": [], @@ -5430,7 +5430,7 @@ "Argu": [ 1, 4, - 900 + 1200 ], "FollowSK": [], "SucFollowSK": [], @@ -5476,7 +5476,7 @@ "Argu": [ 1, 4, - 1000 + 1300 ], "FollowSK": [], "SucFollowSK": [], @@ -5522,7 +5522,7 @@ "Argu": [ 1, 4, - 1100 + 1400 ], "FollowSK": [], "SucFollowSK": [], @@ -5568,7 +5568,7 @@ "Argu": [ 1, 4, - 1200 + 1500 ], "FollowSK": [], "SucFollowSK": [], @@ -5614,7 +5614,7 @@ "Argu": [ 1, 4, - 2000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -5661,7 +5661,7 @@ "Argu": [ 1, 4, - 2100 + 3100 ], "FollowSK": [], "SucFollowSK": [], @@ -5684,7 +5684,7 @@ "Argu": [ 1, 4, - 2200 + 3200 ], "FollowSK": [], "SucFollowSK": [], @@ -5707,7 +5707,7 @@ "Argu": [ 1, 4, - 2300 + 3300 ], "FollowSK": [], "SucFollowSK": [], @@ -5802,7 +5802,7 @@ "Argu": [ 1, 4, - 1750 + 2000 ], "FollowSK": [], "SucFollowSK": [], @@ -5825,7 +5825,7 @@ "Argu": [ 1, 4, - 1850 + 2050 ], "FollowSK": [], "SucFollowSK": [], @@ -5848,7 +5848,7 @@ "Argu": [ 1, 4, - 1950 + 2100 ], "FollowSK": [], "SucFollowSK": [], @@ -6012,7 +6012,7 @@ "Argu": [ 1, 4, - 2000 + 3500 ], "FollowSK": [], "SucFollowSK": [ @@ -6061,7 +6061,7 @@ "Argu": [ 1, 4, - 2100 + 3600 ], "FollowSK": [], "SucFollowSK": [ @@ -6110,7 +6110,7 @@ "Argu": [ 1, 4, - 2200 + 3700 ], "FollowSK": [], "SucFollowSK": [ @@ -6159,7 +6159,7 @@ "Argu": [ 1, 4, - 2300 + 3800 ], "FollowSK": [], "SucFollowSK": [ @@ -6208,7 +6208,7 @@ "Argu": [ 1, 4, - 2400 + 3900 ], "FollowSK": [], "SucFollowSK": [ @@ -6325,7 +6325,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001003, + 390001008, 1000, 1, 2 @@ -6375,7 +6375,7 @@ "Argu": [ 1, 4, - 1750 + 5100 ], "FollowSK": [], "SucFollowSK": [], @@ -6398,7 +6398,7 @@ "Argu": [ 1, 4, - 1800 + 5200 ], "FollowSK": [], "SucFollowSK": [], @@ -6421,7 +6421,7 @@ "Argu": [ 1, 4, - 1850 + 5300 ], "FollowSK": [], "SucFollowSK": [], @@ -6444,7 +6444,7 @@ "Argu": [ 1, 4, - 1900 + 5400 ], "FollowSK": [], "SucFollowSK": [], @@ -6467,7 +6467,7 @@ "Argu": [ 1, 4, - 1950 + 5500 ], "FollowSK": [], "SucFollowSK": [], @@ -9077,7 +9077,7 @@ "Argu": [ 1, 4, - 1100 + 1400 ], "FollowSK": [ 224002112 @@ -9104,7 +9104,7 @@ "Argu": [ 1, 4, - 900 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9153,7 +9153,7 @@ "Argu": [ 1, 4, - 1200 + 1500 ], "FollowSK": [ 224002122 @@ -9180,7 +9180,7 @@ "Argu": [ 1, 4, - 900 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9205,7 +9205,7 @@ "Argu": [ 1, 4, - 1200 + 1600 ], "FollowSK": [ 224002132 @@ -9232,7 +9232,7 @@ "Argu": [ 1, 4, - 1000 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9257,7 +9257,7 @@ "Argu": [ 1, 4, - 1300 + 1700 ], "FollowSK": [ 224002142 @@ -9284,7 +9284,7 @@ "Argu": [ 1, 4, - 1000 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9309,7 +9309,7 @@ "Argu": [ 1, 4, - 1300 + 1800 ], "FollowSK": [ 224002152 @@ -9336,7 +9336,7 @@ "Argu": [ 1, 4, - 1100 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9361,7 +9361,7 @@ "Argu": [ 1, 4, - 1400 + 1900 ], "FollowSK": [ 224002162 @@ -9388,7 +9388,7 @@ "Argu": [ 1, 4, - 1100 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9532,7 +9532,7 @@ "Argu": [ 1, 4, - 1000 + 1250 ], "FollowSK": [], "SucFollowSK": [], @@ -10652,7 +10652,7 @@ "Argu": [ 1, 4, - 1500 + 1600 ], "FollowSK": [], "SucFollowSK": [ @@ -10722,7 +10722,7 @@ "Argu": [ 1, 4, - 1650 + 1700 ], "FollowSK": [], "SucFollowSK": [ @@ -10814,7 +10814,7 @@ "Argu": [ 1, 4, - 1950 + 1900 ], "FollowSK": [], "SucFollowSK": [ @@ -10860,7 +10860,7 @@ "Argu": [ 1, 4, - 2100 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -10953,7 +10953,7 @@ "Argu": [ 1, 4, - 2000 + 2250 ], "FollowSK": [], "SucFollowSK": [ @@ -11002,7 +11002,7 @@ "Argu": [ 1, 4, - 2050 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -11051,7 +11051,7 @@ "Argu": [ 1, 4, - 2100 + 2350 ], "FollowSK": [], "SucFollowSK": [ @@ -11100,7 +11100,7 @@ "Argu": [ 1, 4, - 2150 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -11417,7 +11417,7 @@ "Argu": [ 1, 4, - 3000, + 1500, 1, 2, 55 @@ -11466,7 +11466,7 @@ "Argu": [ 1, 4, - 3100, + 1600, 1, 2, 55 @@ -11494,7 +11494,7 @@ "Argu": [ 1, 4, - 3200, + 1700, 1, 2, 55 @@ -11522,7 +11522,7 @@ "Argu": [ 1, 4, - 3300, + 1800, 1, 2, 55 @@ -11550,7 +11550,7 @@ "Argu": [ 1, 4, - 3400, + 1900, 1, 2, 55 @@ -13305,7 +13305,7 @@ "Argu": [ 1, 4, - 3000, + 4000, 1, 6, 45 @@ -13331,7 +13331,7 @@ "Argu": [ 1, 4, - 3050, + 4050, 1, 6, 45 @@ -13357,7 +13357,7 @@ "Argu": [ 1, 4, - 3100, + 4100, 1, 6, 45 @@ -13383,7 +13383,7 @@ "Argu": [ 1, 4, - 3150, + 4150, 1, 6, 45 @@ -13409,7 +13409,7 @@ "Argu": [ 1, 4, - 3200, + 4200, 1, 6, 45 @@ -13435,7 +13435,7 @@ "Argu": [ 1, 4, - 2500 + 3500 ], "FollowSK": [], "SucFollowSK": [ @@ -13484,7 +13484,7 @@ "Argu": [ 1, 4, - 2550 + 3550 ], "FollowSK": [], "SucFollowSK": [ @@ -13509,7 +13509,7 @@ "Argu": [ 1, 4, - 2600 + 3600 ], "FollowSK": [], "SucFollowSK": [ @@ -13534,7 +13534,7 @@ "Argu": [ 1, 4, - 2650 + 3650 ], "FollowSK": [], "SucFollowSK": [ @@ -13559,7 +13559,7 @@ "Argu": [ 1, 4, - 2700 + 3700 ], "FollowSK": [], "SucFollowSK": [ @@ -14110,7 +14110,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -14183,7 +14183,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -14209,7 +14209,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -14235,7 +14235,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -14261,7 +14261,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -14287,7 +14287,7 @@ "Argu": [ 1, 4, - 900 + 1000 ], "FollowSK": [], "SucFollowSK": [ @@ -14312,7 +14312,7 @@ "Argu": [ 1, 4, - 1100 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -14532,7 +14532,7 @@ "Argu": [ 1, 4, - 4000 + 4200 ], "FollowSK": [], "SucFollowSK": [ @@ -15241,7 +15241,7 @@ "Argu": [ 1, 4, - 1000 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -15339,7 +15339,7 @@ "Argu": [ 1, 4, - 1050 + 1550 ], "FollowSK": [], "SucFollowSK": [ @@ -15364,7 +15364,7 @@ "Argu": [ 1, 4, - 1100 + 1600 ], "FollowSK": [], "SucFollowSK": [ @@ -15389,7 +15389,7 @@ "Argu": [ 1, 4, - 1150 + 1650 ], "FollowSK": [], "SucFollowSK": [ @@ -15414,7 +15414,7 @@ "Argu": [ 1, 4, - 1200 + 1700 ], "FollowSK": [], "SucFollowSK": [ @@ -15439,7 +15439,7 @@ "Argu": [ 1, 4, - 1800 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -15560,7 +15560,7 @@ "Argu": [ 1, 4, - 1900 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -15585,7 +15585,7 @@ "Argu": [ 1, 4, - 2000 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -15610,7 +15610,7 @@ "Argu": [ 1, 4, - 2100 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -15635,7 +15635,7 @@ "Argu": [ 1, 4, - 2200 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -15684,7 +15684,7 @@ "Argu": [ 1, 4, - 1000 + 1400 ], "FollowSK": [], "SucFollowSK": [], @@ -15731,7 +15731,7 @@ "Argu": [ 1, 4, - 1100 + 1450 ], "FollowSK": [], "SucFollowSK": [], @@ -15754,7 +15754,7 @@ "Argu": [ 1, 4, - 1200 + 1500 ], "FollowSK": [], "SucFollowSK": [], @@ -15777,7 +15777,7 @@ "Argu": [ 1, 4, - 1300 + 1550 ], "FollowSK": [], "SucFollowSK": [], @@ -15800,7 +15800,7 @@ "Argu": [ 1, 4, - 1400 + 1600 ], "FollowSK": [], "SucFollowSK": [], @@ -16453,7 +16453,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [], @@ -16523,7 +16523,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [], @@ -16546,7 +16546,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [], @@ -16569,7 +16569,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [], "SucFollowSK": [], @@ -16592,7 +16592,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [], "SucFollowSK": [], @@ -16615,7 +16615,7 @@ "Argu": [ 1, 4, - 2000 + 3000 ], "FollowSK": [], "SucFollowSK": [ @@ -16664,7 +16664,7 @@ "Argu": [ 1, 4, - 2100 + 3100 ], "FollowSK": [], "SucFollowSK": [ @@ -16689,7 +16689,7 @@ "Argu": [ 1, 4, - 2200 + 3200 ], "FollowSK": [], "SucFollowSK": [ @@ -16714,7 +16714,7 @@ "Argu": [ 1, 4, - 2300 + 3300 ], "FollowSK": [], "SucFollowSK": [ @@ -16739,7 +16739,7 @@ "Argu": [ 1, 4, - 2400 + 3400 ], "FollowSK": [], "SucFollowSK": [ @@ -16810,7 +16810,7 @@ "Argu": [ 1, 4, - 3000 + 4000 ], "FollowSK": [], "SucFollowSK": [], @@ -16833,7 +16833,7 @@ "Argu": [ 1, 4, - 3100 + 4100 ], "FollowSK": [], "SucFollowSK": [], @@ -16856,7 +16856,7 @@ "Argu": [ 1, 4, - 3200 + 4200 ], "FollowSK": [], "SucFollowSK": [], @@ -16879,7 +16879,7 @@ "Argu": [ 1, 4, - 3300 + 4300 ], "FollowSK": [], "SucFollowSK": [], @@ -16902,7 +16902,7 @@ "Argu": [ 1, 4, - 3400 + 4400 ], "FollowSK": [], "SucFollowSK": [], @@ -16925,7 +16925,7 @@ "Argu": [ 1, 4, - 2000 + 2500 ], "FollowSK": [], "SucFollowSK": [], @@ -16948,7 +16948,7 @@ "Argu": [ 1, 4, - 1600 + 2600 ], "FollowSK": [], "SucFollowSK": [], @@ -16971,7 +16971,7 @@ "Argu": [ 1, 4, - 1700 + 2700 ], "FollowSK": [], "SucFollowSK": [], @@ -16994,7 +16994,7 @@ "Argu": [ 1, 4, - 1800 + 2800 ], "FollowSK": [], "SucFollowSK": [], @@ -17017,7 +17017,7 @@ "Argu": [ 1, 4, - 1900 + 2900 ], "FollowSK": [], "SucFollowSK": [], @@ -18646,7 +18646,7 @@ "Argu": [ 1, 4, - 3000 + 3500 ], "FollowSK": [], "SucFollowSK": [ @@ -18695,7 +18695,7 @@ "Argu": [ 1, 4, - 3100 + 3600 ], "FollowSK": [], "SucFollowSK": [ @@ -18720,7 +18720,7 @@ "Argu": [ 1, 4, - 3200 + 3700 ], "FollowSK": [], "SucFollowSK": [ @@ -18745,7 +18745,7 @@ "Argu": [ 1, 4, - 3300 + 3800 ], "FollowSK": [], "SucFollowSK": [ @@ -18770,7 +18770,7 @@ "Argu": [ 1, 4, - 3400 + 3900 ], "FollowSK": [], "SucFollowSK": [ @@ -18942,7 +18942,7 @@ "Argu": [ 1, 4, - 4000 + 4500 ], "FollowSK": [], "SucFollowSK": [ @@ -19036,7 +19036,7 @@ "Argu": [ 1, 4, - 4100 + 4600 ], "FollowSK": [], "SucFollowSK": [ @@ -19063,7 +19063,7 @@ "Argu": [ 1, 4, - 4200 + 4700 ], "FollowSK": [], "SucFollowSK": [ @@ -19090,7 +19090,7 @@ "Argu": [ 1, 4, - 4300 + 4800 ], "FollowSK": [], "SucFollowSK": [ @@ -19117,7 +19117,7 @@ "Argu": [ 1, 4, - 4400 + 4900 ], "FollowSK": [], "SucFollowSK": [ @@ -19356,7 +19356,7 @@ "Argu": [ 1, 4, - 1000 + 2000 ], "FollowSK": [], "SucFollowSK": [], @@ -19426,7 +19426,7 @@ "Argu": [ 1, 4, - 1100 + 2100 ], "FollowSK": [], "SucFollowSK": [], @@ -19449,7 +19449,7 @@ "Argu": [ 1, 4, - 1200 + 2200 ], "FollowSK": [], "SucFollowSK": [], @@ -19472,7 +19472,7 @@ "Argu": [ 1, 4, - 1300 + 2300 ], "FollowSK": [], "SucFollowSK": [], @@ -19495,7 +19495,7 @@ "Argu": [ 1, 4, - 1400 + 2400 ], "FollowSK": [], "SucFollowSK": [], @@ -19566,7 +19566,7 @@ "Argu": [ 1, 4, - 2000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -19589,7 +19589,7 @@ "Argu": [ 1, 4, - 2100 + 3100 ], "FollowSK": [], "SucFollowSK": [], @@ -19612,7 +19612,7 @@ "Argu": [ 1, 4, - 2200 + 3200 ], "FollowSK": [], "SucFollowSK": [], @@ -19635,7 +19635,7 @@ "Argu": [ 1, 4, - 2300 + 3300 ], "FollowSK": [], "SucFollowSK": [], @@ -19658,7 +19658,7 @@ "Argu": [ 1, 4, - 2400 + 3400 ], "FollowSK": [], "SucFollowSK": [], @@ -19868,7 +19868,7 @@ "Argu": [ 1, 4, - 1500 + 3000 ], "FollowSK": [], "SucFollowSK": [ @@ -19942,7 +19942,7 @@ "Argu": [ 1, 4, - 1600 + 3100 ], "FollowSK": [], "SucFollowSK": [ @@ -19968,7 +19968,7 @@ "Argu": [ 1, 4, - 1700 + 3200 ], "FollowSK": [], "SucFollowSK": [ @@ -19994,7 +19994,7 @@ "Argu": [ 1, 4, - 1800 + 3300 ], "FollowSK": [], "SucFollowSK": [ @@ -20020,7 +20020,7 @@ "Argu": [ 1, 4, - 1900 + 3400 ], "FollowSK": [], "SucFollowSK": [ @@ -20069,7 +20069,7 @@ "Argu": [ 1, 4, - 1250 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -20143,7 +20143,7 @@ "Argu": [ 1, 4, - 1350 + 2050 ], "FollowSK": [], "SucFollowSK": [ @@ -20169,7 +20169,7 @@ "Argu": [ 1, 4, - 1450 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -20195,7 +20195,7 @@ "Argu": [ 1, 4, - 1550 + 2150 ], "FollowSK": [], "SucFollowSK": [ @@ -20221,7 +20221,7 @@ "Argu": [ 1, 4, - 1650 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -20743,7 +20743,7 @@ "Argu": [ 1, 4, - 2000 + 2500 ], "FollowSK": [], "SucFollowSK": [ @@ -20792,7 +20792,7 @@ "Argu": [ 1, 4, - 2100 + 2600 ], "FollowSK": [], "SucFollowSK": [ @@ -20817,7 +20817,7 @@ "Argu": [ 1, 4, - 2200 + 2700 ], "FollowSK": [], "SucFollowSK": [ @@ -20842,7 +20842,7 @@ "Argu": [ 1, 4, - 2300 + 2800 ], "FollowSK": [], "SucFollowSK": [ @@ -20867,7 +20867,7 @@ "Argu": [ 1, 4, - 2400 + 2900 ], "FollowSK": [], "SucFollowSK": [ @@ -20892,7 +20892,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -20963,7 +20963,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -20989,7 +20989,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -21015,7 +21015,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -21041,7 +21041,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -21067,7 +21067,7 @@ "Argu": [ 1, 4, - 3000 + 4000 ], "FollowSK": [], "SucFollowSK": [ @@ -21138,7 +21138,7 @@ "Argu": [ 1, 4, - 3100 + 4100 ], "FollowSK": [], "SucFollowSK": [ @@ -21163,7 +21163,7 @@ "Argu": [ 1, 4, - 3200 + 4200 ], "FollowSK": [], "SucFollowSK": [ @@ -21188,7 +21188,7 @@ "Argu": [ 1, 4, - 3300 + 4300 ], "FollowSK": [], "SucFollowSK": [ @@ -21213,7 +21213,7 @@ "Argu": [ 1, 4, - 3400 + 4400 ], "FollowSK": [], "SucFollowSK": [ @@ -23744,7 +23744,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [ 214005112 @@ -23792,7 +23792,7 @@ "Argu": [ 1, 4, - 1550 + 2100 ], "FollowSK": [ 214005112 @@ -23817,7 +23817,7 @@ "Argu": [ 1, 4, - 1600 + 2200 ], "FollowSK": [ 214005112 @@ -23842,7 +23842,7 @@ "Argu": [ 1, 4, - 1650 + 2300 ], "FollowSK": [ 214005112 @@ -23867,7 +23867,7 @@ "Argu": [ 1, 4, - 1700 + 2400 ], "FollowSK": [ 214005112 @@ -23892,7 +23892,7 @@ "Argu": [ 1, 4, - 667 + 1000 ], "FollowSK": [], "SucFollowSK": [], @@ -23985,7 +23985,7 @@ "Argu": [ 1, 4, - 677 + 1050 ], "FollowSK": [], "SucFollowSK": [], @@ -24008,7 +24008,7 @@ "Argu": [ 1, 4, - 687 + 1100 ], "FollowSK": [], "SucFollowSK": [], @@ -24031,7 +24031,7 @@ "Argu": [ 1, 4, - 697 + 1150 ], "FollowSK": [], "SucFollowSK": [], @@ -24054,7 +24054,7 @@ "Argu": [ 1, 4, - 707 + 1200 ], "FollowSK": [], "SucFollowSK": [], @@ -25709,7 +25709,7 @@ "Argu": [ 1, 4, - 3000 + 3500 ], "FollowSK": [], "SucFollowSK": [], @@ -25753,7 +25753,7 @@ "Argu": [ 1, 4, - 3100 + 3600 ], "FollowSK": [], "SucFollowSK": [], @@ -25776,7 +25776,7 @@ "Argu": [ 1, 4, - 3200 + 3700 ], "FollowSK": [], "SucFollowSK": [], @@ -25799,7 +25799,7 @@ "Argu": [ 1, 4, - 3300 + 3800 ], "FollowSK": [], "SucFollowSK": [], @@ -25822,7 +25822,7 @@ "Argu": [ 1, 4, - 3400 + 3900 ], "FollowSK": [], "SucFollowSK": [], @@ -27402,7 +27402,7 @@ "Argu": [ 1, 4, - 600 + 1000 ], "FollowSK": [], "SucFollowSK": [ @@ -27451,7 +27451,7 @@ "Argu": [ 1, 4, - 700 + 1100 ], "FollowSK": [], "SucFollowSK": [ @@ -27476,7 +27476,7 @@ "Argu": [ 1, 4, - 800 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -27501,7 +27501,7 @@ "Argu": [ 1, 4, - 900 + 1300 ], "FollowSK": [], "SucFollowSK": [ @@ -27526,7 +27526,7 @@ "Argu": [ 1, 4, - 1000 + 1400 ], "FollowSK": [], "SucFollowSK": [ @@ -27551,7 +27551,7 @@ "Argu": [ 1, 4, - 667 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -27645,7 +27645,7 @@ "Argu": [ 1, 4, - 677 + 1250 ], "FollowSK": [], "SucFollowSK": [ @@ -27670,7 +27670,7 @@ "Argu": [ 1, 4, - 687 + 1300 ], "FollowSK": [], "SucFollowSK": [ @@ -27695,7 +27695,7 @@ "Argu": [ 1, 4, - 697 + 1350 ], "FollowSK": [], "SucFollowSK": [ @@ -27720,7 +27720,7 @@ "Argu": [ 1, 4, - 707 + 1400 ], "FollowSK": [], "SucFollowSK": [ @@ -27745,7 +27745,7 @@ "Argu": [ 1, 4, - 2500 + 4000 ], "FollowSK": [], "SucFollowSK": [], @@ -27771,7 +27771,7 @@ "Argu": [ 1, 4, - 2600 + 4100 ], "FollowSK": [], "SucFollowSK": [], @@ -27797,7 +27797,7 @@ "Argu": [ 1, 4, - 2700 + 4200 ], "FollowSK": [], "SucFollowSK": [], @@ -27823,7 +27823,7 @@ "Argu": [ 1, 4, - 2800 + 4300 ], "FollowSK": [], "SucFollowSK": [], @@ -27849,7 +27849,7 @@ "Argu": [ 1, 4, - 2900 + 4400 ], "FollowSK": [], "SucFollowSK": [], @@ -28627,7 +28627,7 @@ "Argu": [ 1, 4, - 2500 + 5000 ], "FollowSK": [ 255005112 @@ -28789,7 +28789,7 @@ "Argu": [ 1, 4, - 300 + 600 ], "FollowSK": [], "SucFollowSK": [], @@ -28812,7 +28812,7 @@ "Argu": [ 1, 4, - 5500 + 11000 ], "FollowSK": [ 255005313 @@ -29371,7 +29371,7 @@ "Argu": [ 390001415, 1000, - 10, + 5, -1 ], "FollowSK": [], @@ -33012,7 +33012,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [ 215003112 @@ -33058,7 +33058,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [ 215003112 @@ -33083,7 +33083,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [ 215003112 @@ -33108,7 +33108,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [ 215003112 @@ -33133,7 +33133,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [ 215003112 @@ -33158,7 +33158,7 @@ "Argu": [ 1, 4, - 625 + 700 ], "FollowSK": [ 215003212, @@ -33335,7 +33335,7 @@ "Argu": [ 1, 4, - 600 + 1000 ], "FollowSK": [ 215003312 diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 354efe9e2..9869c2fb8 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -2908,7 +2908,7 @@ "AddEffect": false, "RemoveType": true, "NotOverlay": 0, - "OverlayTimes": 3, + "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_shts15", diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index a5212e15e..c4bb7ef58 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -10,7 +10,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 102, @@ -23,7 +24,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 103, @@ -36,7 +38,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 104, @@ -49,7 +52,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 105, @@ -62,7 +66,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 106, @@ -75,7 +80,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 107, @@ -88,7 +94,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 108, @@ -101,7 +108,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 109, @@ -114,7 +122,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 110, @@ -127,7 +136,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 111, @@ -140,7 +150,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 112, @@ -153,7 +164,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 113, @@ -166,7 +178,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 114, @@ -179,7 +192,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 115, @@ -192,7 +206,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 116, @@ -205,7 +220,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 117, @@ -218,7 +234,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 118, @@ -231,7 +248,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 119, @@ -244,7 +262,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 120, @@ -257,7 +276,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 121, @@ -270,7 +290,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 122, @@ -283,7 +304,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 123, @@ -296,7 +318,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 180, @@ -309,6 +332,7 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 } ] \ No newline at end of file diff --git a/modules/gm/module.go b/modules/gm/module.go index 6f214a319..06b5ed495 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -331,12 +331,13 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er ) data := this.configure.GetHeroConfigData() for _, v := range data { - res = append(res, &cfg.Gameatn{ - A: "hero", - T: v.Hid, - N: 1, - }) - + if v.Handbook != -1 { + res = append(res, &cfg.Gameatn{ + A: "hero", + T: v.Hid, + N: 1, + }) + } } errdata = this.DispenseRes(session, res, true) if errdata != nil { diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go index 0f351669b..bb7e1a2a9 100644 --- a/modules/worldtask/api_battlefinish.go +++ b/modules/worldtask/api_battlefinish.go @@ -90,6 +90,17 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa if errdata, isWin = ibattle.CheckBattleReport(session, req.Report); errdata == nil { if isWin { if battleConf, ok := battleConf.GetDataMap()[req.BattleConfId]; ok { + + if battleConf.Carexe > 0 { + if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { + for _, v := range req.Report.Info.Redflist[0].Team { + if !v.Ishelp { // 助战英雄不加经验 + this.module.ModuleHero.AddHeroExp(session, v.Oid, battleConf.Carexe) + } + } + } + } + if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{battleConf.Playexp}, true); errdata != nil { this.module.Error("世界任务战斗玩家经验结算", log.Field{Key: "uid", Value: uid}, @@ -114,6 +125,7 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa //判断是否配置了通知module if len(taskConf.Module) == 0 { + // 发奖 // if errdata = this.module.DispenseRes(session, taskConf.Reword, true); errdata != nil { // this.module.Error("资源发放", diff --git a/sys/configure/structs/Game.WorldBattleData.go b/sys/configure/structs/Game.WorldBattleData.go index e67dbac39..396456717 100644 --- a/sys/configure/structs/Game.WorldBattleData.go +++ b/sys/configure/structs/Game.WorldBattleData.go @@ -16,6 +16,7 @@ type GameWorldBattleData struct { BattleReadyID int32 EventList []int32 Playexp *Gameatn + Carexe int32 } const TypeId_GameWorldBattleData = 1096332216 @@ -56,6 +57,7 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["playexp"].(map[string]interface{}); !_ok_ { err = errors.New("playexp error"); return }; if _v.Playexp, err = DeserializeGameatn(_x_); err != nil { return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["carexe"].(float64); !_ok_ { err = errors.New("carexe error"); return }; _v.Carexe = int32(_tempNum_) } return }