From aaf6a9e6c2a046c54748e10f6dfd69383853a5e4 Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Sat, 7 Dec 2019 11:50:20 +0800
Subject: [PATCH] 分数默认1000

---
 src/actions/PvpAction.lua | 11 +++--------
 src/models/RolePvp.lua    | 13 +++----------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/actions/PvpAction.lua b/src/actions/PvpAction.lua
index 91bedde..017b44a 100644
--- a/src/actions/PvpAction.lua
+++ b/src/actions/PvpAction.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])
diff --git a/src/models/RolePvp.lua b/src/models/RolePvp.lua
index c077d66..8127950 100644
--- a/src/models/RolePvp.lua
+++ b/src/models/RolePvp.lua
@@ -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)
--
libgit2 0.21.2