Merge branch 'cn/develop' into cn/publish/zhaolu_test

liuzujun
2 parents 9d828fa3 50f22d1e
Showing 1 changed file with 5 additions and 9 deletions Show diff stats
src/actions/HeroAction.lua
@@ -202,8 +202,11 @@ function _M.talentRpc(agent, data)
 	local cost = {}
-	if curLevel < #curData then
-		--if curLevel > #curData then return 2 end
+	if curLevel == #curData + 1 then
+		talent = talent:setv(0, curStage + 1)
+		talent = talent:setv(1, 1)
+	else
+		if curLevel > #curData then return 2 end
 		local talentData = curData[curLevel]
 		if not talentData then return 3 end
@@ -214,13 +217,6 @@ function _M.talentRpc(agent, data)
 		if not role:checkItemEnough(cost) then return 5 end
 		if not role:costItems(cost, {log = {desc = "heroTalent", int1 = msg.id, int2 = hero:getProperty("type")}})  then return 6 end
 		talent = talent:setv(1, curLevel + 1)
-
-		if curLevel + 1 == #curData then
-			talent = talent:setv(0, curStage + 1)
-			talent = talent:setv(1, 1)
-		end
-	else
-		return 2
 	end
 	curStage = talent:getv(0, 1)
 	role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = curStage, count = 1})