From 1face65dbbcd45bfdd5c5440e3295e8d18f7b642 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 13 Nov 2020 19:34:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E5=85=8D?= =?UTF-8?q?=E7=96=AB=E6=95=88=E6=9E=9C=E8=87=AA=E5=AE=9A=E4=B9=89=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=B7=BB=E5=8A=A0=EF=BC=8C=E5=85=8D=E7=96=AB=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/BattleManager.lua | 14 ++++++++++++++ .../~Lua/Modules/Battle/Logic/Buff/Immune.lua | 18 +++++++++++++++--- .../Modules/Battle/Logic/Misc/BattleDefine.lua | 5 +++++ .../Modules/Battle/Logic/Misc/BattleUtil.lua | 2 +- .../Modules/Battle/View/Unit/EnemyView.lua | 9 +++++++++ .../Modules/Battle/View/Unit/PlayerView.lua | 9 +++++++++ 6 files changed, 53 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index d0afa30f02..0ef1064bc9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -924,4 +924,18 @@ function this.GetCombatIdBySkin(skillId, skinId) return eid end +--+++++++++++++++++++++++++++++++++++++++++++ +local _BattleArtFontConfig = { + [BattleArtFontType.Immune] = {type = 2, content = Language[12391]} +} + +function this.GetArtFontConfig(_ArtFontType) + if _BattleArtFontConfig[_ArtFontType] then + return _BattleArtFontConfig[_ArtFontType] + end +end + +--++++++++++++++++++++++++++++++++++++++++++ + + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua index b8946b60fa..6e812f039a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua @@ -13,11 +13,13 @@ end local immune3 = function(buff) return buff.type == BuffName.Shield and buff.shieldType == ShieldTypeName.AllReduce end +--自定义免疫 +local immune4=nil --初始化Buff,通过传入一些自定义参数控制成长相关的数值 -function Immune:SetData(...) - - self.immuneType = ... +function Immune:SetData(type,func) + self.immuneType =type + immune4=func self.isBuff = true -- 刷新排序等级 @@ -35,6 +37,13 @@ function Immune:OnStart() self.target.buffFilter:Add(immune2) elseif self.immuneType == 3 then --免疫无敌盾 self.target.buffFilter:Add(immune3) + elseif self.immuneType==4 then--自定义免疫 + if immune4 then + self.target.buffFilter:Add(immune4) + end + end + if condition then + -- body end end @@ -56,6 +65,9 @@ function Immune:OnEnd() immune = immune2 elseif self.immuneType == 3 then --免疫无敌盾 immune = immune3 + elseif self.immuneType == 3 then--自定义免疫 + mmune=immune4 + immune4=nil end for i = 1, self.target.buffFilter.size do if self.target.buffFilter.buffer[i] == immune then diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 53fa0012d3..bd0fad8fe8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -230,6 +230,7 @@ skill1={1012051,1,0,1,{200000,{1,0.41,2}}}, skill2={1132051,0.8,0,1,{200212,{1,0.89,2}}}, skill3={1151111,0.05,0,1,{220000,{1,0.86,2}}}, skill4={10000351,0.3,0.5,4,{400000,{1,1.75,1}}}, +skill5={12011001,0.3,0.5,4,{400000,{1,2.2,1}}}, } @@ -277,4 +278,8 @@ BattleRoleElementType = { FO = 2, YAO = 3, DAO = 4 +} + +BattleArtFontType = { + Immune = 1, -- 免疫文字 } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index ababee7095..fd213ded25 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -304,7 +304,7 @@ function BattleUtil.CheckIsBoss(role) end if role.data.enemyType==EnemyType.Boss then --弹免疫 - role.Event:DispatchEvent(BattleEventName.ShowHintText,2, 12391) + role.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Immune) return true else return false diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index f1ec3a49fc..53beb6719f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -299,6 +299,15 @@ function EnemyView:PlaySpineAnim(gog, time, name, isLoop) end +--单纯显示提示文字 +function EnemyView:OnShowHintText(_ArtFontType) + local config = BattleManager.GetArtFontConfig(_ArtFontType) + if config then + self.Floater:TextBuffFloating(config.type, config.content) + end +end + + function EnemyView:OnSkillPlay() self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "attack", false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index 68c86f8c3d..89f792434a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -318,6 +318,15 @@ function PlayerView:PlaySpineAnim(gog, time, name, isLoop) end +--单纯显示提示文字 +function PlayerView:OnShowHintText(_ArtFontType) + local config = BattleManager.GetArtFontConfig(_ArtFontType) + if config then + self.Floater:TextBuffFloating(config.type, config.content) + end +end + + function PlayerView:OnSkillPlay() local battleSorting = BattleManager.GetBattleSorting()