From 69a45034d692762608f9f53ea6ac7a02769f6545 Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Wed, 13 Jan 2021 11:46:46 +0800
Subject: [PATCH] 跨服竞技场

---
 src/models/RoleLog.lua | 1 +
 src/models/RolePvp.lua | 4 ++--
 src/services/pvpd.lua  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/models/RoleLog.lua b/src/models/RoleLog.lua
index bd325d3..7ff9e68 100644
--- a/src/models/RoleLog.lua
+++ b/src/models/RoleLog.lua
@@ -122,6 +122,7 @@ local ItemReason = {
 
 	-- pvp 
 	pvpCHead = 1301, -- pvp 跨服竞技场头像
+	crossPvpBet = 1302, -- 竞猜
 
 	--adv
 	chooseEvent = 1351, -- 冒险选择
diff --git a/src/models/RolePvp.lua b/src/models/RolePvp.lua
index cb3f6f9..58bf8b0 100644
--- a/src/models/RolePvp.lua
+++ b/src/models/RolePvp.lua
@@ -521,7 +521,7 @@ function Role:changeCrossServerPvpSelfInfo(cType)
 		change[cType] = self:getProperty(cType)
 	elseif cType == "format" then
 		-- 是否过了时间
-		local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross)
+		local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross) + RESET_TIME * 3600
 		local aday = 3600 * 24
 		local day = math.ceil(crossTime / aday) -- 当前是第几个比赛日
 		local ctime = crossTime % aday -- 当前在本天 经过多少时间
@@ -615,7 +615,7 @@ end
 
 function Role:setCrossServerPvpBet(idx)
 	if not self:isTimeResetOpen(TimeReset.PvpCross) then return false , 1 end
-	local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross)
+	local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross) +  RESET_TIME * 3600
 	local aday = 3600 * 24
 	local day = math.ceil(crossTime / aday) -- 当前是第几个比赛日
 	local ctime = crossTime % aday -- 当前在本天 经过多少时间
diff --git a/src/services/pvpd.lua b/src/services/pvpd.lua
index 9861631..89d8765 100644
--- a/src/services/pvpd.lua
+++ b/src/services/pvpd.lua
@@ -84,7 +84,7 @@ function CMD.updateRoleInfo(change)
 	CMD.refreshRoleInfo(change)
 	local pvpd = cluster.query("center", "pvpd")
 	if pvpd then
-		pcall(cluster.call, "center", pvpd, "updateRoleInfo", change)
+		pcall(cluster.send, "center", pvpd, "updateRoleInfo", change)
 	end
 end
 
@@ -92,7 +92,7 @@ local function getDayAndTime()
 	local startTime = getStartTime()
 	local now = skynet.timex()
 
-	local crossTime = now - startTime
+	local crossTime = now - startTime + RESET_TIME * 3600
 	local aday = 3600 * 24
 	local day = math.ceil(crossTime / aday) -- 当前是第几个比赛日
 	local ctime = crossTime % aday -- 当前在本天 经过多少时间
--
libgit2 0.21.2