diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3 new file mode 100644 index 0000000000..52b1d90fb4 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3 new file mode 100644 index 0000000000..508afa8a27 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3 differ diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 4d1ec51847..64105d42c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1609,7 +1609,7 @@ local passivityList = { if skill and not skill.isTriggerJudge and judge==1 then return end - if skill.type == BattleSkillType.Special then + if skill.type == BattleSkillType.Special or skill.type == BattleSkillType.DeadSkill then role.Event:AddEvent(BattleEventName.PassiveTreating, passiveTreating,nil,nil,role) end end @@ -1617,7 +1617,7 @@ local passivityList = { if skill and not skill.isTriggerJudge and judge==1 then return end - if skill.type == BattleSkillType.Special then + if skill.type == BattleSkillType.Special or skill.type == BattleSkillType.DeadSkill then role.Event:RemoveEvent(BattleEventName.PassiveTreating, passiveTreating) end end @@ -7023,18 +7023,16 @@ local passivityList = { if role:IsDead() then return end - -- if skill and not skill.isTriggerJudge and judge==1 then - -- return - -- end - -- LogYellow("307 1") - if skill and (skill.type==BattleSkillType.Special or skill.type== BattleSkillType.Extra or skill.type== BattleSkillType.Monster) then --技能造成的直接伤害 + if skill and (skill.type==BattleSkillType.Special or skill.type== BattleSkillType.Extra or skill.type== BattleSkillType.DeadSkill) then --技能造成的直接伤害 local list = RoleManager.NoOrder(function(v) return v.camp == role.camp end) BattleUtil.SortByHpFactor(list, 1) - -- LogYellow("307 2") if list[1] then - -- LogYellow("307 3") local val = floor(BattleUtil.FP_Mul(f1, list[1]:GetRoleData(BattlePropList[pro]))) - BattleUtil.CalTreat(role, list[1], val) + if pro==12 then + BattleUtil.FinalTreat(role, list[1], val) + else + BattleUtil.CalTreat(role, list[1], val) + end end end end @@ -7089,11 +7087,26 @@ local passivityList = { local ctr2 = args[3] local ctr3 = args[4] local ctr4 = args[5] - local SkillCast = function(damagingFunc, defRole, damage, skill) + local ctrls={} + if ctrl then + table.insert(ctrls,ctrl) + end + if ctr2 then + table.insert(ctrls,ctr2) + end + if ctr3 then + table.insert(ctrls,ctr3) + end + local SkillCast = function(skill) + if not skill then + return + end + if skill.type ~= BattleSkillType.Special and skill.type ~= BattleSkillType.Extra and skill.type ~= BattleSkillType.DeadSkill then + return + end local list = RoleManager.Query(function(v) return v.camp == role.camp end) BattleUtil.SortByHpFactor(list, 1) local target = nil - -- LogYellow("309 1: "..#list) for i = 1, #list do if not list[i]:IsRealDead() then target = list[i] @@ -7101,10 +7114,8 @@ local passivityList = { end end if target and target.roleData.element==ele then - -- LogYellow("309 2") BattleLogic.BuffMgr:ClearBuff(target, function(buff) - -- LogYellow("309 3: "..buff.type.." "..buff.ctrlType) - return buff.type == BuffName.Control and (buff.ctrlType == ctrl or buff.immuneType == ctr2 or buff.immuneType == ctr3 or buff.immuneType == ctr4) + return buff.type == BuffName.Control and BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType) end) end end @@ -8287,7 +8298,7 @@ local passivityList = { end, - --每回合开始,为自己添加[a][b]%的御甲 + --自身行动回合开始前,为自己添加[a][b]%的御甲 --a[int],b[float] [351] = function(role, args,id,judge) local pro = args[1] @@ -8301,7 +8312,7 @@ local passivityList = { role:AddBuff(Buff.Create(role, BuffName.Blood,0, val)) end end - BattleLogic.Event:AddEvent(BattleEventName.BattleRoundStart, onRoundChange,nil,nil,role) + role.Event:AddEvent(BattleEventName.RoleTurnStart, onRoundChange,nil,nil,role) end, -- 行动击杀目标,追加[a]次普攻 -- a[int] diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua index f26e4080d1..6f1fe653a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua @@ -110,7 +110,7 @@ function this.On_Btn2_Click() PopupTipPanel.ShowTip("挑战编队为空") return end - FormationManager.RefreshFormation( + FormationManager.SaveFormation( this.root.curFormationIndex, newteam, FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index 7b06b05cea..1cf67f5fe3 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -287,7 +287,7 @@ function this.SaveFormation(curType) table.insert(choosedList, {heroId = teamInfo.heroId,position=teamInfo.position}) end end - FormationManager.RefreshFormation( + FormationManager.SaveFormation( (3000 + curType), choosedList, FormationManager.formationList[(3000 + curType)].teamPokemonInfos @@ -493,7 +493,7 @@ function this.SetFriendHelpHero(helpFightList,trailType) end end if LengthOfTable(newteam) ~= LengthOfTable(team.teamHeroInfos) then - FormationManager.RefreshFormation( + FormationManager.SaveFormation( i + 3000, newteam, FormationManager.formationList[i + 3000].teamPokemonInfos) @@ -531,7 +531,7 @@ function this.SetFriendHelpHero(helpFightList,trailType) end end if LengthOfTable(newteam) ~= LengthOfTable(team.teamHeroInfos) then - FormationManager.RefreshFormation( + FormationManager.SaveFormation( trailType + 3000, newteam, FormationManager.formationList[trailType + 3000].teamPokemonInfos) @@ -547,7 +547,7 @@ function this.SetFriendHelpHero(helpFightList,trailType) end end if LengthOfTable(newteam) ~= LengthOfTable(team.teamHeroInfos) then - FormationManager.RefreshFormation( + FormationManager.SaveFormation( this.root.curFormationIndex, this.root.choosedList, FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) diff --git a/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua b/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua index 0bc0fdabc2..8ad8fc111b 100644 --- a/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua +++ b/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua @@ -114,7 +114,7 @@ function FourTrailSingleHelpHero:SetIcon1(heroData,player) table.insert(choosedList, {heroId = teamInfo.heroId,position=teamInfo.position}) end end - FormationManager.RefreshFormation( + FormationManager.SaveFormation( (1700 + self.curType), choosedList, FormationManager.formationList[(1700 + self.curType)].teamPokemonInfos