分数默认1000

zhouhaihai
1 parent 8c20d812
Showing 2 changed files with 6 additions and 18 deletions Show diff stats
src/actions/PvpAction.lua
src/models/RolePvp.lua
@@ -91,11 +91,9 @@ function _M.infoRpc(agent, data)
 			red:zscore(RANK_PVP_COMMON, roleId)
 			red:zrevrank(RANK_PVP_COMMON, roleId)
 		end)
-		local score = role:unpackPvpScore(redret[1] or 0)
+		local score = role:unpackPvpScore(redret[1])
 		local rank = tonumber(redret[2] or -2) + 1  --排名 1 - ...  -1 未上榜 没打过pvp
-		if rank == -1 then
-			score = globalCsv.pvp_base_score
-		end
+
 		local pvpMC = role:getProperty("pvpMC")
 		if not next(pvpMC) then --没有分配过对手
 			role:refreshPvpMatchC(score)
@@ -315,11 +313,8 @@ function _M.rankListRpc(agent, data)
 			red:zrevrank(RANK_PVP_COMMON, roleId)
 			red:zrevrange(RANK_PVP_COMMON, 0, 99, "WITHSCORES")
 		end)
-		local score = role:unpackPvpScore(redret[1] or 0)
+		local score = role:unpackPvpScore(redret[1])
 		local rank = tonumber(redret[2] or -2) + 1  --排名 1 - ...  -1 未上榜 没打过pvp
-		if rank == -1 then
-			score = globalCsv.pvp_base_score
-		end
 		local rankList = {}
 		for i = 1, #redret[3], 2 do
 			local roleId = tonumber(redret[3][i])
@@ -10,7 +10,8 @@ local PVP_RANK_ROBOT_SCORE = globalCsv.pvp_base_score -- 机器人积分
  
  
 function Role:unpackPvpScore(score)
-	score = tonumber(score or 0)
+	if not score then return globalCsv.pvp_base_score end
+	score = tonumber(score)
 	return math.floor(score / PVP_RANK_TIME_SORT_PLACE)
 end
  
@@ -70,15 +71,7 @@ end
  
 function Role:refreshPvpMatchC(score)
 	local roleId = self:getProperty("id")
-	
-	if not score then
-		local tempScore = redisproxy:zscore(RANK_PVP_COMMON, roleId)
-		if not tempScore then
-			score = globalCsv.pvp_base_score
-		else
-			score = self:unpackPvpScore(tempScore)
-		end
-	end
+	score =  score or self:unpackPvpScore(redisproxy:zscore(RANK_PVP_COMMON, roleId))
  
 	local function getPlayers(levels)
 		local redret = redisproxy:pipelining(function(red)