diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 597597d7..eceaa97a 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -978,8 +978,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 88, - "height": 112 + "width": 106, + "height": 126 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1015,7 +1015,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@e6454", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@c6c69", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1030,7 +1030,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -19118,7 +19121,7 @@ "__id__": 1162 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 1179 diff --git a/assets/resources/language/json/zh.json b/assets/resources/language/json/zh.json index b86bdf5d..584203aa 100644 --- a/assets/resources/language/json/zh.json +++ b/assets/resources/language/json/zh.json @@ -30,10 +30,10 @@ "htype_mid": "中程", "htype_long": "远程", - "hero_name_5001": "盾战士", - "hero_name_5002": "圣骑士", + "hero_name_5001": "盾战士1", + "hero_name_5002": "圣骑士1", "hero_name_5003": "风行剑士", - "hero_name_5004": "刺客", + "hero_name_5004": "刺客1", "hero_name_5005": "自然骑士", "hero_name_5101": "奥术法师", "hero_name_5102": "火焰法师", @@ -78,34 +78,6 @@ "mon_name_6104": "亡灵法师(boss)", "mon_name_6105": "兽人首领(BOSS)", - "skill_name_6401": "单体攻击", - "skill_name_6402": "单体生命", - "skill_name_6403": "单体全能", - "skill_name_6404": "群体攻击", - "skill_name_6405": "群体生命", - "skill_name_6406": "群体全能", - "skill_name_6304": "神圣治疗", - "skill_name_6305": "群体护盾", - - "skill_info_6401": "随机{0}个友方+{1}攻击", - "skill_info_6402": "随机{0}个友方+{1}最大生命值", - "skill_info_6403": "随机{0}个友方+{1}攻击,+{2}最大生命值", - "skill_info_6404": "随机{0}个友方+{1}攻击", - "skill_info_6405": "随机{0}个友方+{1}最大生命值", - "skill_info_6406": "随机{0}个友方+{1}攻击,+{2}最大生命值", - - "scard_name_7001": "战术晋升", - "scard_name_7002": "进阶战术", - "scard_name_7101": "近战征召", - "scard_name_7102": "远程征召", - "scard_name_7103": "精英筛选", - - "scard_info_7001": "升级场上随机1个1级英雄到2级", - "scard_info_7002": "升级场上随机1个2级英雄到3级", - "scard_info_7101": "刷新卡池,都是近战英雄", - "scard_info_7102": "刷新卡池,都是远程英雄", - "scard_info_7103": "刷新卡池,都是3级卡池等级英雄", - "skill_name_6001": "攻击", "skill_name_6002": "火球", "skill_name_6003": "飓风", @@ -144,6 +116,34 @@ "skill_info_6305": "随机{0}个友方获得{1}次伤害免疫", "skill_info_6501": "立即复活,获得{0}%生命", + "skill_name_6401": "单体攻击", + "skill_name_6402": "单体生命", + "skill_name_6403": "单体全能", + "skill_name_6404": "群体攻击", + "skill_name_6405": "群体生命", + "skill_name_6406": "群体全能", + "skill_name_6304": "神圣治疗", + "skill_name_6305": "群体护盾", + + "skill_info_6401": "随机{0}个友方+{1}攻击", + "skill_info_6402": "随机{0}个友方+{1}最大生命值", + "skill_info_6403": "随机{0}个友方+{1}攻击,+{2}最大生命值", + "skill_info_6404": "随机{0}个友方+{1}攻击", + "skill_info_6405": "随机{0}个友方+{1}最大生命值", + "skill_info_6406": "随机{0}个友方+{1}攻击,+{2}最大生命值", + + "scard_name_7001": "战术晋升", + "scard_name_7002": "进阶战术", + "scard_name_7101": "近战征召", + "scard_name_7102": "远程征召", + "scard_name_7103": "精英筛选", + + "scard_info_7001": "升级场上随机1个1级英雄到2级", + "scard_info_7002": "升级场上随机1个2级英雄到3级", + "scard_info_7101": "刷新卡池,都是近战英雄", + "scard_info_7102": "刷新卡池,都是远程英雄", + "scard_info_7103": "刷新卡池,都是3级卡池等级英雄", + "fskill_name_7001": "召唤精通", "fskill_name_7002": "亡灵统御", "fskill_name_7003": "先发制人",