Merge branch 'develop' into player

zhouhaihai
2 parents 4b6f2d84 cdbe8a36
Showing 3 changed files with 12 additions and 5 deletions Show diff stats
src/GlobalVar.lua
src/actions/HeroAction.lua
src/models/HeroPlugin.lua
@@ -43,6 +43,12 @@ AttsEnumEx = {
 	[9] = "vampire", 	-- 吸血
 	[10] = "pierce", 	-- 穿透
 }
+TalentAttsEnumEx = {
+	[1] = "atk",
+	[2] = "def",
+	[3] = "hit",
+	[4] = "miss",
+}
 ItemType = {
 	Coin						= 1, 	-- 货币&材料（金币、钻石、经验、突破材料等）
@@ -105,7 +105,6 @@ function _M.talentRpc(agent, data)
 	if not curData then return 4 end
 	if index == 0 then
-		if not csvdb["unit_talentCsv"][curStage + 1] then return 11 end
 		--是否进阶
 		local max = true
 		for i = 1, 4 do
@@ -36,11 +36,11 @@ 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
 		--阶段属性
@@ -51,8 +51,10 @@ function HeroPlugin.bind(Hero)
 		end
-		for i = 1, 4 do
-			talentAttrS[AttsEnumEx[i]] = (unitData[AttsEnumEx[i]] or 0) * talentAttrS[AttsEnumEx[i]]
+		for _, attrName in pairs(AttsEnumEx) do
+			if talentAttrS[attrName] then
+				talentAttrS[attrName] = (unitData[attrName] or 0) * talentAttrS[attrName]
+			end
 		end
 		local attrs = {}