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

dev_chengFeng
ZhangBiao 2021-09-13 19:53:14 +08:00
commit 1251150a9e
2 changed files with 11 additions and 1 deletions

View File

@ -1030,6 +1030,11 @@ local passivityList = {
-- if lastTrigger > 1 then --加入限定避免循环触发
-- return
-- end
--如果是boss 并且额外伤害是根据最大生命则返回
local isBoss=BattleUtil.CheckIsBoss(defRole)
if isBoss and f1==12 then
return
end
if skill and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill ) then
local ar1 = floor(BattleUtil.FP_Mul(defRole:GetRoleData(RoleDataName.MaxHp), f1))
--local ar2 = BattleUtil.FP_Mul(role:GetRoleData(RoleDataName.Attack), 2.5)

View File

@ -118,7 +118,12 @@ function this.SingleHeroDataShow(go,_equipTreasureData)
Util.GetGameObject(_go.transform, "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(_equipTreasureData.itemConfig.Quantity))
Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(_equipTreasureData.itemConfig.ResourceID))
Util.GetGameObject(_go.transform, "equipTreaseureStoringLv"):GetComponent("Text").text = _equipTreasureData.lv > 0 and _equipTreasureData.lv or ""
Util.GetGameObject(_go.transform, "equipTreaseureRefine"):GetComponent("Text").text = _equipTreasureData.refineLv > 0 and _equipTreasureData.refineLv or ""
if _equipTreasureData.refineLv > 0 then
Util.GetGameObject(_go.transform, "equipTreaseureRefine"):GetComponent("Text").text = "+".._equipTreasureData.refineLv
else
Util.GetGameObject(_go.transform, "equipTreaseureRefine"):GetComponent("Text").text = ""
end
Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text =SubString2(GetLanguageStrById(_equipTreasureData.itemConfig.Name),8)
Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(_equipTreasureData.itemConfig.PropertyName))
local choosed =Util.GetGameObject(_go.transform, "choosed")