fix confict

liuzujun
2 parents b620581a c0017f72
Showing 8 changed files with 83 additions and 12 deletions Show diff stats
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/CarAction.lua
src/actions/HeroAction.lua
src/models/Activity.lua
src/models/RoleLog.lua
src/models/RolePvp.lua
src/services/pvpd.lua
@@ -232,7 +232,8 @@ actionCodes = {
 	Activity_commonSignRpc = 666,
 	Activity_friendHelpRpc = 667,
 	Activity_battleCommandRpc = 668,
-	Activity_actCalendaTmpTaskRpc = 659,
+	Activity_actCalendaTmpTaskRpc = 669,
+	Activity_newSignRpc = 670,
  
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -250,4 +251,4 @@ for key, value in pairs(actionCodes) do
 		actionHandlers[value + rpcResponseBegin] = handlerName .. "Response"
 	end
 	actionHandlers[value] = string.gsub(key, "_", ".")
-end
 \ No newline at end of file
+end
@@ -583,7 +583,7 @@ function _M.startBattleRpc(agent, data)
 			bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"] * count
 		end
  
-		bi["sum"] = bi["sum"] + bi["top"]
+		bi["sum"] = bi["sum"] + bi["top"] * count
 		actData["ticket"] = ticket - num
 		actData[id] = bi
 		changeFlag = true
@@ -1237,4 +1237,34 @@ function _M.buyBattleCommandLvlRpc(agent, data)
 	return true
 end
  
-return _M
 \ No newline at end of file
+function _M.newSignRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local index = msg.index
+
+	if not role.activity:isOpenById(actid, "NewSign") then return 1 end
+
+	local actData = role.activity:getActData("NewSign")
+	if (actData[0] or 0) < index then
+		return 2
+	end
+	if (actData[index] or 0) == 1 then
+		return 3
+	end
+
+	local actCfg = csvdb["activity_signInCsv"][actid]
+	if not actCfg then return 4 end
+	actCfg = actCfg[index]
+	if not actCfg then return 5 end
+
+	actData[index] = 1
+	role.activity:updateActData("NewSign", actData)
+
+	local award = actCfg.reward:toNumMap()
+	local reward, change = role:award(award, {log = {desc = "newSign", int1 = actid, int2 = index}})
+	SendPacket(actionCodes.Activity_newSignRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+return _M
@@ -124,8 +124,8 @@ function _M.runeUpRpc( agent, data )
 	local runeData = runeSet[id]
 	if not runeData then return 5 end
  
-	local maxLv = #csvdb["rune_buildCsv"]
-	if level >= maxLv then return 6 end
+	--local maxLv = #csvdb["rune_buildCsv"]
+	if level >= runeData.lvLimit then return 6 end
 	local lvData = csvdb["rune_buildCsv"][level]
 	local cost = lvData.cost:toNumMap()
 	if not role:checkItemEnough(cost) then
@@ -617,7 +617,7 @@ function _M.getResetRewardRpc(agent, data)
 	if level <= 1 and talent == "" then return end
  
 	local pay = true
-	if level <= 60 then
+	if level <= 60 or role.activity:isOpen("HeroBackFree") then
 		pay = false
 	end
  
@@ -853,6 +853,10 @@ function _M.drawHeroRpc(agent, data)
 		elseif values[1] == HeroQuality.SSR then
 			weight = unitPool["up_ssr_weight"]
 			up_pool = unitPool["up_ssr_id"]
+			if btype == 5 then
+				local wishPool = role:getProperty("wishPool") or {}
+				weight = weight * #wishPool
+			end
 		end
 		--print(poolId, rand_v, weight, up_pool, values[1])
 		if rand_v < weight and up_pool then
@@ -879,6 +883,15 @@ function _M.drawHeroRpc(agent, data)
 								if heroData[field] ~= values[idx] then ok = false break end
 							end
 						end
+						-- 随机剔除up池中的角色
+						if up_pool then
+							for k, v in ipairs(up_pool) do
+								if v == itemData.id then
+									ok = false
+									break
+								end
+							end
+						end
 						if not ok then break end
 						if oneData[pool_str] > 0 then
 							resultPool[itemId] = {oneData[pool_str]}  -- itemId, count, 概率
@@ -35,6 +35,8 @@ Activity.ActivityType = {
 	FriendEnergy = 30, -- 好友互赠能量活动 
 	AdvLevel = 33,	-- 拾荒关卡
 	BattleCommand = 34, -- 战令活动
+	NewSign = 36, -- 活动签到，单独的签到界面
+	HeroBackFree = 37, -- 无损耗归还
  
 	CalendaTaskTmp = 38, -- 新春任务活动
 }
@@ -85,6 +87,7 @@ Activity.schema = {
 	act30 		= {"table", {}}, -- {magic = 0, limit = 0, reward = {id = 1, id = 1}, giveAE = {}, getAE = {}} 奖励字段1表示领取过奖励
  
 	act34		= {"table", {}},	-- 战令记录{unlock = 1, freeR = "", payR = "", lvl = 10, sum = 100}
+	act36 		= {"table", {}}, -- 每日活跃签到 {0=day, 1=1,2=1,3=1}
 }
  
 function Activity:data()
@@ -110,6 +113,7 @@ function Activity:data()
 		act30 = self:getProperty("act30"),
  
 		act34 = self:getProperty("act34"),
+		act36 = self:getProperty("act36"),
 	}
 end
  
@@ -1001,4 +1005,25 @@ activityFunc[Activity.ActivityType.BattleCommand] = {
 }
  
  
+activityFunc[Activity.ActivityType.NewSign] = {
+	-- ["check"] = function(self, actType, notify) -- 检查
+	-- end,
+	["init"] = function(self, actType, isCrossDay, notify)
+		if not isCrossDay then
+			activityFunc[Activity.ActivityType.NewSign]["crossDay"](self, actType, notify)
+		end
+	end,
+	-- ["close"] = function(self, actType, notify)
+	-- end,
+	["crossDay"] = function(self, actType, notify)
+		local curData = self:getActData(actType)
+		curData[0] = (curData[0] or 0) + 1
+		local actData = csvdb["activity_signInCsv"][48] or {}
+		if curData[0] > #actData then return end -- 满了就忽略了
+
+		-- 没满更新一下
+		self:updateActData(actType, curData, not notify)
+	end,
+}
+
 return Activity
@@ -55,6 +55,7 @@ local ItemReason = {
 	actFriendHelp = 139,-- 好友能量互助活动
 	actBattleCommand = 140,	-- 活动战令
 	actBuyBpLevel = 141, -- 购买活动战令等级
+	newSign = 142,-- 新的活动签到
  
  
 	advHang = 301, -- 拾荒挂机
@@ -126,6 +127,7 @@ local ItemReason = {
  
 	-- pvp 
 	pvpCHead = 1301, -- pvp 跨服竞技场头像
+	crossPvpBet = 1302, -- 竞猜
  
 	--adv
 	chooseEvent = 1351, -- 冒险选择
@@ -879,4 +881,4 @@ function RoleLog.bind(Role)
  
  
 end
-return RoleLog
 \ No newline at end of file
+return RoleLog
@@ -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 -- 当前在本天 经过多少时间
@@ -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 -- 当前在本天 经过多少时间