From c0cc27a47007bdc967a9ffc3664b1cd64dc47172 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 1 Feb 2021 17:34:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E5=90=88=E6=88=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E9=AD=82=E5=8D=B0=E5=90=88=E6=88=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua index 4acf54edf8..292d316ba7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua @@ -150,7 +150,7 @@ function this.SingleItemDataShow(_go,_curequipSign) Util.GetGameObject(_go.transform,"circleFrameBg/Icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(itemConfig[curequipSign.Id].ResourceID)) Util.GetGameObject(_go.transform,"circleFrameBg/circleFrame"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circle) Util.GetGameObject(_go.transform,"circleFrameBg"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circleBg2) - Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=curequipSign.Name + Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text= string.gsub(curequipSign.Name,"魂印","",1);--curequipSign.Name Util.GetGameObject(_go.transform, "UI_effect_WuCai_Kuang"):SetActive(curequipSign.Quality == 7) Util.AddParticleSortLayer( Util.GetGameObject(_go,"UI_effect_WuCai_Kuang/juneng_chenggong (1)"), sortingOrder - sortingOrder2 ) local choosed =Util.GetGameObject(_go.transform, "choosed") From 1a647499e0361a76e3473b7635f5f8e725a757e4 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 1 Feb 2021 17:58:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E8=A3=85=E5=A4=87=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96=E8=A3=85=E5=A4=87=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E7=9A=84=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E6=89=A9=E5=85=85=E5=8D=95=E4=BB=B6=E8=A3=85=E5=A4=87=E7=9A=84?= =?UTF-8?q?=E5=A0=86=E5=8F=A0=E4=B8=8A=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index ccb3f51743..50176416ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -159,12 +159,12 @@ function this.OnClickTabBtn(_index, _clickBtn, isTop) print("_index ".._index) if _index == ItemBaseType.Equip then local allEquipData = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip) - local allEquipNum = 0 + -- local allEquipNum = 0 for i, v in pairs(allEquipData) do table.insert(itemData, v) - allEquipNum = allEquipNum + v.num + -- allEquipNum = allEquipNum + v.num end - itemNumText.text = Language[10188]..allEquipNum.."/"..ConfigManager.GetConfigData(ConfigName.GameSetting,1).EquipNumlimit + itemNumText.text = Language[10188]..LengthOfTable(allEquipData).."/"..ConfigManager.GetConfigData(ConfigName.GameSetting,1).EquipNumlimit this:SetItemData(itemData, isTop) -- elseif _index == 0 then -- this:OnClickAllBtn() From d18c0fd8d44c7b3a6c273ccd8d8d825b0be92ad5 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 1 Feb 2021 19:15:19 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=E7=A6=81=E7=96=97=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=A1=80=E9=87=8F=20+0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 0162785348..d8447bf86e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -801,6 +801,10 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag return end if targetRole.ctrl_noheal or targetRole:IsDead() then --禁疗和死亡无法加血 + --禁疗并且没有死亡的单位显示血量+0 不走后面代码,防止触发后面的被动 by:王振兴 2021/1/27 + if targetRole.ctrl_noheal and not targetRole:IsDead() then + targetRole.Event:DispatchEvent(BattleEventName.RoleBeTreated, castRole, 0, 0) + end return end baseFactor = baseFactor or 1