From 81421a2e49572b7ca6a2dfbe070ff31dbfa9f6d9 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 10 Sep 2021 18:34:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=E3=80=91=E6=96=87=E5=AD=97=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 17e1b6f64e..9084829bad 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -22,9 +22,9 @@ local activityType = { [4] = {name = "心魔试炼礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26,Text = Language[12321]}, [5] = {name = "灵兽推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 31,Text = "恭喜您获得极品灵兽,这是为您准备的灵兽成长礼包,助您实力飞升"}, [6] = {name = "惊喜礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 33,Text = "购买惊喜礼盒成功激活限时豪礼,祝您战力飞升,一路通关"}, -[7] = {name = "轩辕宝镜推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 36,Text = "恭喜您挑战了轩辕宝镜,这是为您准备的宝物礼包,助您实力飞升"}, +[7] = {name = "轩辕宝境推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 36,Text = "恭喜您挑战了轩辕宝境,这是为您准备的宝物礼包,助您实力飞升"}, [8] = {name = "神树养成礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 37,Text = "恭喜您完成了宝物精炼,这是为您准备的宝物进阶礼包,助您实力飞升"}, -[9] = {name = "轩辕宝镜推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 38,Text = "恭喜您挑战了四灵试炼,这是为您准备的神树养成礼包,助您实力飞升"}, +[9] = {name = "轩辕宝境推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 38,Text = "恭喜您挑战了四灵试炼,这是为您准备的神树养成礼包,助您实力飞升"}, [10] = {name = "神树养成礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 39,Text = "恭喜您获得了红色品质宝物,这是为您准备的红色宝物礼包,助您实力飞升"}, } --初始化组件(用于子类重写) From ad182335d9809ecdaeb0dab96ddaf86cb21ed774 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 10 Sep 2021 19:51:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=E3=80=91=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 9084829bad..9c14394a20 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -23,9 +23,9 @@ local activityType = { [5] = {name = "灵兽推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 31,Text = "恭喜您获得极品灵兽,这是为您准备的灵兽成长礼包,助您实力飞升"}, [6] = {name = "惊喜礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 33,Text = "购买惊喜礼盒成功激活限时豪礼,祝您战力飞升,一路通关"}, [7] = {name = "轩辕宝境推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 36,Text = "恭喜您挑战了轩辕宝境,这是为您准备的宝物礼包,助您实力飞升"}, -[8] = {name = "神树养成礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 37,Text = "恭喜您完成了宝物精炼,这是为您准备的宝物进阶礼包,助您实力飞升"}, -[9] = {name = "轩辕宝境推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 38,Text = "恭喜您挑战了四灵试炼,这是为您准备的神树养成礼包,助您实力飞升"}, -[10] = {name = "神树养成礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 39,Text = "恭喜您获得了红色品质宝物,这是为您准备的红色宝物礼包,助您实力飞升"}, +[8] = {name = "宝物精炼礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 37,Text = "恭喜您完成了宝物精炼,这是为您准备的宝物进阶礼包,助您实力飞升"}, +[9] = {name = "四灵试炼推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 38,Text = "恭喜您挑战了四灵试炼,这是为您准备的神树养成礼包,助您实力飞升"}, +[10] = {name = "红色宝物礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 39,Text = "恭喜您获得了红色品质宝物,这是为您准备的红色宝物礼包,助您实力飞升"}, } --初始化组件(用于子类重写) function this:InitComponent() @@ -183,7 +183,7 @@ function this:Refresh() for k,v in pairs(activityType) do Util.GetGameObject(self.gameObject,v.comp):SetActive(false) end - Util.GetGameObject(self.gameObject,activityType[curType].comp):SetActive(true) + Util.GetGameObject(self.gameObject, activityType[curType].comp):SetActive(true) rechargeNum= VipManager.GetChargedNum() curGiftId = rechargeData.goodsId From 79778b6eec1cd7bdbf9c60323683d10c70e28cee Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 11 Sep 2021 16:04:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8261=20=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 19 +++++++++++++++---- 1 file changed, 15 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 1820250173..5ebf320502 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -5696,11 +5696,12 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role) end, - --本次技能中如果有[a]目标,额外回复[b]点怒气 - -- a[持续伤害状态],b[int] + --本次技能中如果有[a]目标,额外回复[b]点怒气,[c]buff的类型(a 填效果类型里面的具体类型; c 不填/1为dot, 2为controll ) + -- a[持续伤害状态],b[int],c[int ] [261]=function(role,args,id,judge) local dot=args[1] - local i1 = args[2]--defRole, damage, bCrit, finalDmg, damageType, skill + local i1 = args[2] + local type = args[3] local OnRoleHit = function(skill) -- if skill and skill.owner==role and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra) and role.camp~=defRole.camp and defRole and BattleLogic.BuffMgr:HasBuff(defRole, BuffName.DOT, function(buff) return buff.damageType == dot end) then -- role:AddRage(i1, CountTypeName.Add) @@ -5714,8 +5715,18 @@ local passivityList = { return end local num=0 + local buffName=BuffName.DOT + if type then + if type==1 then + buffName=BuffName.DOT + elseif type==2 then + buffName=BuffName.Control + end + end for key, value in pairs(list) do - local isHave=BattleLogic.BuffMgr:HasBuff(value, BuffName.DOT, function(buff) return buff.damageType == dot and buff.caster==role and buff.startRound == BattleLogic.GetCurRound() end,role,dot) + local isHave=BattleLogic.BuffMgr:HasBuff(value, buffName,function(buff) return + (buffName==BuffName.DOT and buff.damageType==dot or buff.ctrlType==dot) and buff.caster==role and buff.startRound == BattleLogic.GetCurRound() + end,role,dot) if isHave then num=num+1 end