From 59bcf41d6a0bcdf0d3165f85e61616aa68035f19 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 4 Nov 2020 14:37:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=88=98=E6=96=97?= =?UTF-8?q?=E4=BC=A4=E5=AE=B3log=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/BattleLogic.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index c3338a3c99..0d6fb87266 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua @@ -76,10 +76,8 @@ function BattleLogic.Init(data, _userData, maxRound) -- 监听英雄受到治疗 BattleLogic.Event:AddEvent(BattleEventName.RoleBeTreated,function (castRole, realTreat, treat) if castRole.camp==0 then - LogBattle("我方 英雄治疗"..treat) allHeroDamage=allHeroDamage+treat else - LogBattle("敌方 英雄治疗"..treat) allEnemyDamage=allEnemyDamage+treat end end) @@ -88,11 +86,9 @@ function BattleLogic.Init(data, _userData, maxRound) --我方阵营总攻击 if atkRole.camp==0 then allHeroDamage=allHeroDamage+damage - LogBattle("我方 英雄攻击"..damage) --敌方阵营 else allEnemyDamage=allEnemyDamage+damage - LogBattle("敌方 英雄攻击"..damage) end end) From 750a87c168077a9e1d2100f783fd03365c88ad1a Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 4 Nov 2020 15:04:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E9=AD=82=E5=8D=B0=E3=80=91=20?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E9=A6=96=E6=AC=A1=E6=89=93=E5=BC=80=E7=A5=9E?= =?UTF-8?q?=E5=B0=86=E9=AD=82=E5=8D=B0=E7=95=8C=E9=9D=A2=E6=9C=89=E6=97=B6?= =?UTF-8?q?=E4=BC=9A=E5=BC=B9=E5=87=BA=E6=88=98=E5=8A=9B=E5=8F=98=E5=8C=96?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua | 4 ++++ .../~Lua/Modules/SoulPrint/SoulPrintPanel.lua | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua index 1c3385b4d1..a4cb206270 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua @@ -103,6 +103,8 @@ function SoulPrintPopUp:BindEvent() UIManager.OpenPanel(UIName.SoulPrintPopUpV2,2,curHeroData,localData,function() self:ClosePanel() SoulPrintPanel.RefreshShow() + --对比战力并更新战力值 播放战力变更动画 + HeroManager.CompareWarPower(curHeroData.dynamicId) end) return end @@ -126,6 +128,8 @@ function SoulPrintPopUp:BindEvent() HeroManager.AddSoulPrintUpHeroDynamicId(curHeroData.dynamicId,localData.id,pos) PopupTipPanel.ShowTip(Language[11604]) SoulPrintPanel.RefreshShow() + --对比战力并更新战力值 播放战力变更动画 + HeroManager.CompareWarPower(curHeroData.dynamicId) self:ClosePanel() end) end) diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua index 94104f20c5..5b78c7ecb0 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua @@ -198,7 +198,7 @@ function this.RefreshShow() this.SetHero() this.SetScrollData() --对比战力并更新战力值 播放战力变更动画 - HeroManager.CompareWarPower(curHeroData.dynamicId) + -- HeroManager.CompareWarPower(curHeroData.dynamicId) -- local allPro = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false) local allAddProVal --计算面板属性 @@ -310,6 +310,8 @@ function this.SetLoopPre(root,type,index,data,curIndex) UIManager.OpenPanel(UIName.SoulPrintPopUp,2,curHeroData.dynamicId,data.equipId,pos,function() PopupTipPanel.ShowTip(Language[11949]) this.RefreshShow() + --对比战力并更新战力值 播放战力变更动画 + HeroManager.CompareWarPower(curHeroData.dynamicId) end) end) end @@ -415,6 +417,8 @@ function this.SetScrollPre(root,data) UIManager.OpenPanel(UIName.SoulPrintPopUp,1,curHeroData.dynamicId,data.id,pos,function() PopupTipPanel.ShowTip(Language[11604]) this.RefreshShow() + --对比战力并更新战力值 播放战力变更动画 + HeroManager.CompareWarPower(curHeroData.dynamicId) end,data) -- end end)