From 5df1a395e799b6d72d647b3df11510e8ecc3b6eb Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 15 Mar 2021 10:38:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=85=85=E5=80=BC=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E5=85=85=E5=A5=96=E5=8A=B1=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/FirstRecharge/DayRewardItem.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/DayRewardItem.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/DayRewardItem.lua index d14a74faa7..a7ca71e96c 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/DayRewardItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/DayRewardItem.lua @@ -52,7 +52,8 @@ function DayRewardItem:SetValue(context,_sortingOrder) AccumRecharge = missInfo.progress end end - if AccumRecharge >= self.context.Values[1][1] then + if (self.context.Values[1][1] == 1 and AccumRecharge > 0) + or AccumRecharge >= self.context.Values[1][1] then local day = GetTimePass(FirstRechargeManager.GetRechargeTime())--FirstRechargeManager.GetRechargeTime() if self.context.Values[1][2] <= day then local state = ActivityGiftManager.GetActivityInfo(context.ActivityId, context.Id).state From d1f4aae4cd5f0d58a28b4ec8709f44e3a692631d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 16 Mar 2021 10:43:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"Revert=20"[=E6=88=98=E6=96=97]=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D249=E4=BF=AE=E6=94=B9""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7a8de27f1cfcb5f78fa7ad22f9074222805c608f. --- .../Modules/Battle/Logic/Base/Passivity.lua | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index ff1c6374c7..2a696f2f6c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -5209,6 +5209,7 @@ local passivityList = { [249] = function(role, args,id,judge) local f1 = args[1] local round = 0 + local isKill =false -- 释放技能后 local onRoleHit = function(target,damage, bCrit, finalDmg, damageType, skill) if skill and not skill.isTriggerJudge and judge==1 then @@ -5218,16 +5219,11 @@ local passivityList = { if skill and BattleUtil.ChecklistIsContainValue(skill.triggerPassivityId,id) then return end - local curRound=BattleLogic.GetCurRound() - --每个回合只会生效一次 - if curRound>round then - round=curRound - else - return - end + if target:IsDead() and not BattleUtil.CheckIsNoDead(target) then - local buff = Buff.Create(role, BuffName.PropertyChange, 1, RoleDataName.Crit, f1, CountTypeName.Add) - role:AddBuff(buff) + -- local buff = Buff.Create(role, BuffName.PropertyChange, 1, RoleDataName.Crit, f1, CountTypeName.Add) + -- role:AddBuff(buff) + isKill = true if skill then --skill.isTriggePassivity=true table.insert(skill.triggerPassivityId,id) @@ -5235,6 +5231,26 @@ local passivityList = { end end role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit) + + local onRoundChange=function(round2) + if round2==round+1 and isKill then + role.mustCrit=true + else + role.mustCrit=false + isKill=false + end + round=round2 + end + + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange, onRoundChange) + + + local onRoundStart=function(round2) + isKill=false + end + + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundStart, onRoundStart) + end, -- 直接伤害每次击杀目标增加自身伤害[a]%,[b]改变,可叠加持续至战斗结束 重写132 一次技能只触发一次被动