From 670320141cd28ee6a292c9e5b9c9da9c3e13fff3 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 18 Nov 2021 17:17:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E6=80=92=E6=B0=94=E5=92=8C=E7=88=86=E4=BC=A4=E5=87=8F?= =?UTF-8?q?=E5=85=8D=E7=9A=84=E9=A1=BA=E5=BA=8F=E4=BA=A4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Battle/BattleManager.lua | 4 ++-- .../~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index c681b7ae94..155151c37b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -644,8 +644,8 @@ function this.GetMonsterPros(id, lv, star) table.insert(allProVal, 22, proList[HeroProType.FoReduce] or 0) -- 抗佛 table.insert(allProVal, 23, proList[HeroProType.YaoReduce] or 0) -- 抗妖 table.insert(allProVal, 24, proList[HeroProType.DaoReduce] or 0) -- 抗道 - table.insert(allProVal, 25, proList[HeroProType.InitRage] or 0) -- 初始怒气 - table.insert(allProVal, 26, proList[HeroProType.AntiCritDamageFactor] or 0) -- 爆伤减免 + table.insert(allProVal, 25, proList[HeroProType.AntiCritDamageFactor] or 0) -- 爆伤减免 + table.insert(allProVal, 26, proList[HeroProType.InitRage] or 0) -- 初始怒气 local pros = table.concat(allProVal, "#") return pros end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 51a10a37a2..507b2e3d61 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -216,8 +216,8 @@ RoleDataName = { FoReduce = indexAdd(), --佛系伤害减免 YaoReduce = indexAdd(), --妖系伤害减免 DaoReduce = indexAdd(), --道系伤害减免 - InitRage = indexAdd(), --初始怒气值 CritDamageReduce = indexAdd(), --暴击伤害减免 + InitRage = indexAdd(), --初始怒气值 } -- 战斗表属性id对应战斗中属性数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index a5595afef8..bb4c28c090 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2213,10 +2213,10 @@ function this.CalculateWarAllProVal(heroDid) table.insert(allProVal, 23, allEquipAddProVal[HeroProType.YaoReduce]) -- 道系伤害减免 table.insert(allProVal, 24, allEquipAddProVal[HeroProType.DaoReduce]) - -- 怒气 - table.insert(allProVal, 25, allEquipAddProVal[HeroProType.InitRage]) -- 爆伤减免 - table.insert(allProVal, 26, allEquipAddProVal[HeroProType.AntiCritDamageFactor]) + table.insert(allProVal, 25, allEquipAddProVal[HeroProType.AntiCritDamageFactor]) + -- 怒气 + table.insert(allProVal, 26, allEquipAddProVal[HeroProType.InitRage]) return allProVal end