From 828538d28a1739e7365b43694c0271d48320b9d5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 13 Sep 2021 18:46:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=B2=BE=E7=82=BC=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua index 428ce5618d..9ee3fb2eb9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua @@ -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") From b468cb6164f02c1a9422628763380f2abbb66265 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 13 Sep 2021 19:43:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A856=E4=BF=AE=E6=94=B9=20=20boss?= =?UTF-8?q?=E5=85=8D=E7=96=AB=E9=A2=9D=E5=A4=96=E7=94=9F=E5=91=BD=E7=99=BE?= =?UTF-8?q?=E5=88=86=E6=AF=94=E4=BC=A4=E5=AE=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 5ebf320502..6cb34a1122 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -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)