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

liuzujun
2 parents d3706f9a 235d8a37
Showing 2 changed files with 24 additions and 7 deletions Show diff stats
src/actions/HeroAction.lua
src/actions/RoleAction.lua
@@ -202,11 +202,8 @@ function _M.talentRpc(agent, data)
  
  
 	local cost = {}
-	if curLevel == #curData then
-		talent = talent:setv(0, curStage + 1)
-		talent = talent:setv(1, 1)
-	else
-		if curLevel > #curData then return 2 end
+	if curLevel < #curData then
+		--if curLevel > #curData then return 2 end
  
 		local talentData = curData[curLevel]
 		if not talentData then return 3 end
@@ -217,6 +214,13 @@ 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})
@@ -100,6 +100,18 @@ function _M.loginRpc( agent, data )
 		role:startActionUcode()
 	else
 		role:reloadWhenLogin()
+		if role:getProperty("del") == 1 then
+			local ret, res= roleByUid(role:getProperty("uid"))
+			if not ret then
+				response.result = "NOT_EXIST"
+				SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
+			end
+			role = require("models.Role").new({key = tostring(res["id"])})
+			role:load()
+			role:loadAll()
+			role:startActionUcode()
+			agent.role = role
+		end
 	end
  
  
@@ -490,7 +502,7 @@ function _M.createRpc(agent, data)
 			skynet.error("[ERROR] cbbackd cant call center uid: " .. uid .. " roleId:" .. roleId)
 		end
 	end)
-	
+
     -- cb1活跃回馈
     onCb1Back(newRole)
  
@@ -506,7 +518,8 @@ function _M.unRegisterRpc(agent, data)
         return 0
 	end
  
-	if not roleUnRegister(roleId) then return 1 end
+	role:setProperty("del", 1)
+	--if not roleUnRegister(roleId) then return 1 end
 	SendPacket(actionCodes.Role_unRegisterRpc, MsgPack.pack({}))
 	return true
 end