Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-11-22 15:00:54 +08:00
commit 99c4b8f81d
3 changed files with 15 additions and 15 deletions

View File

@ -6256,7 +6256,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6CD5\u5B9D\u4E4B\u9B42\u5171\u9E23"
m_Text: "\u6CD5\u5B9D\u4E4B\u7075\u5171\u9E23"
--- !u!114 &3523274889559435842
MonoBehaviour:
m_ObjectHideFlags: 0
@ -28924,7 +28924,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.000045116692}
m_AnchoredPosition: {x: 0, y: 0.000014984968}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &6617612647759148344
@ -33639,7 +33639,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

View File

@ -8,7 +8,7 @@ local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig)
local jewelRankupConfig = ConfigManager.GetConfig(ConfigName.JewelRankupConfig)
local jewelResonanceConfig = ConfigManager.GetConfig(ConfigName.JewelResonanceConfig)
local passiveSkillLogicConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillLogicConfig)
local XiuXianSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig)
Hero_Prop_Type = {
Base = 0, -- 基础属性,自身成长
Equip = 1, -- 装备

View File

@ -15,22 +15,22 @@ public class RoleProperty : MonoBehaviour
"速度",
"伤害加成系数(%",
"伤害减免系数(%",
"施法率%",
"后期基础施法率(%",
"命中lv%",
"闪避率(%",
"暴击率(%",
"暴击伤害系数(%",
"抗暴率(%",
"治疗加成系数(%",
"受到治疗加成系数(%",
"队伍伤害加成系数%",
"队伍伤害减免系数%",
"火系伤害减免系数%",
"风系伤害减免系数%",
"冰系伤害减免系数%",
"地系伤害减免系数%",
"光系伤害减免系数%",
"暗系伤害减免系数%",
"属性伤害加成系数%",
"人系伤害加成%",
"佛系伤害加成%",
"妖系伤害加成%",
"道系伤害加成%",
"人系伤害减免%",
"佛系伤害减免%",
"妖系伤害减免%",
"道系伤害减免%",
"暴击伤害减免%",
"初始怒气值",
};
private Dictionary<string, float> _dic = new Dictionary<string, float>();