From e191704a5485349793f0a448cdda940fb42741f8 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 2 Mar 2022 13:42:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90ID1011199=E3=80=91=20=E8=B6=85?= =?UTF-8?q?=E5=80=BC=E8=BF=94=E5=88=A9=E5=9B=BE=E6=A0=87=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/DynamicActivity/DynamicActivityManager.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 602cf1f868..942f6439a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -848,15 +848,15 @@ end function this.CheckRedPointPremium() local day = TimeToD(GetTimeStamp()) if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.chaozhifanli) then - -- if PlayerPrefs.GetInt("chaozhifanli"..PlayerManager.uid) ~= day then - -- return true - -- else + if PlayerPrefs.GetInt("chaozhifanli"..PlayerManager.uid) ~= day then + return true + else if this.CheckRedPointPremiumSingle(ActivityTypeDef.chaozhifanli) then return true else return this.CheckRedPointPremiumSingle(ActivityTypeDef.chaozhifanli30) end - --end + end end return false end From a27d5107308ebe1c0d48bacc4793fb61d5e6a48e Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 2 Mar 2022 14:07:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E8=A2=AB=E5=8A=A8=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D339=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 11 +++++++++-- .../~Lua/Modules/Battle/View/BattleView.lua | 9 +++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index fdd1d5089f..46b87f2d69 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -8220,8 +8220,15 @@ local passivityList = { local onTurnEnd=function(role) role.Event:RemoveEvent(BattleEventName.RoleKill,onRoleKill,nil,nil,role) if isNoDie then - local damage=floor(BattleUtil.FP_Mul(role.curMainTarget:GetRoleData(BattlePropList[p1]),v1)) - BattleUtil.FinalDamage(nil,role,role.curMainTarget,damage) + if role.curMainTarget then + local isBoss=BattleUtil.CheckIsBoss(role.curMainTarget) + if isBoss then + return + end + local damage=floor(BattleUtil.FP_Mul(role.curMainTarget:GetRoleData(BattlePropList[p1]),v1)) + BattleUtil.FinalDamage(nil,role,role.curMainTarget,damage) + end + end isNoDie=true end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index a6af7c7f8c..63ed5fcf26 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -422,14 +422,19 @@ function this.SetHeadShow() local enemy = MonsterManager.GetMonster(1, 100) -- 敌方主角 if enemy then this.enemy:SetActive(true) - this.enemy:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[enemy.sex]) + if enemy.sex then + this.enemy:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[enemy.sex]) + end else this.enemy:SetActive(false) end local player = MonsterManager.GetMonster(0, 100) -- 我方主角 if player then this.player:SetActive(true) - this.player:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[player.sex]) + if player.sex then + this.player:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[player.sex]) + end + else this.player:SetActive(false) end