From 0446679e6ed104d60935b78ef9d8de9780326abd Mon Sep 17 00:00:00 2001 From: zhouhaihai Date: Thu, 30 Apr 2020 17:14:56 +0800 Subject: [PATCH] bug --- src/GlobalVar.lua | 6 ++++++ src/models/HeroPlugin.lua | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/GlobalVar.lua b/src/GlobalVar.lua index 91efce4..cfbebf0 100644 --- a/src/GlobalVar.lua +++ b/src/GlobalVar.lua @@ -43,6 +43,12 @@ AttsEnumEx = { [9] = "vampire", -- 吸血 [10] = "pierce", -- 穿透 } +TalentAttsEnumEx = { + [1] = "atk", + [2] = "def", + [3] = "hit", + [4] = "miss", +} ItemType = { Coin = 1, -- 货币&材料（金币、钻石、经验、突破材料等） diff --git a/src/models/HeroPlugin.lua b/src/models/HeroPlugin.lua index 69330cc..e59e749 100644 --- a/src/models/HeroPlugin.lua +++ b/src/models/HeroPlugin.lua @@ -36,23 +36,23 @@ function HeroPlugin.bind(Hero) curData = csvdb["unit_talentCsv"][#csvdb["unit_talentCsv"]] local strength = curData[#curData].strength for i = 1, 4 do - talentAttrS[AttsEnumEx[i]] = (talentAttrS[AttsEnumEx[i]] or 0) + strength + talentAttrS[TalentAttsEnumEx[i]] = (talentAttrS[TalentAttsEnumEx[i]] or 0) + strength end else for i = 1, 4 do --4个天赋 - talentAttrS[AttsEnumEx[i]] = (talentAttrS[AttsEnumEx[i]] or 0) + curData[talent:getv(i, 0)].strength + talentAttrS[TalentAttsEnumEx[i]] = (talentAttrS[TalentAttsEnumEx[i]] or 0) + curData[talent:getv(i, 0)].strength end end --阶段属性 for i = 1, (talent:getv(0, 1) - 1) do local curData = csvdb["unit_talentCsv"][i] local effect = curData[#curData].effect:toArray(true, "=") - talentAttrS[AttsEnumEx[effect[1]]] = (talentAttrS[AttsEnumEx[effect[1]]] or 0) + effect[2] + talentAttrS[TalentAttsEnumEx[effect[1]]] = (talentAttrS[TalentAttsEnumEx[effect[1]]] or 0) + effect[2] end for i = 1, 4 do - talentAttrS[AttsEnumEx[i]] = (unitData[AttsEnumEx[i]] or 0) * talentAttrS[AttsEnumEx[i]] + talentAttrS[TalentAttsEnumEx[i]] = (unitData[TalentAttsEnumEx[i]] or 0) * talentAttrS[TalentAttsEnumEx[i]] end local attrs = {} -- libgit2 0.21.2