Merge branch 'tr/bugfix-qa' into tr/publish/qa-out

熊润斐
2 parents 9d2a3cb2 28b0c285
Showing 3 changed files with 26 additions and 6 deletions Show diff stats
src/actions/HangAction.lua
src/services/globald.lua
src/utils/CommonFunc.lua
@@ -846,7 +846,7 @@ function _M.startWorkBattleRpc(agent, data)
 		if needCount > 0 then
 			role:costItems({[ticketId] = needCount}, {log = {desc = "workBattle", int1 = id}})
 		end
-		redisproxy:hincrby(WORK_BATTLE_COUNT,  role:getTimeResetRound(TimeReset["WorkBattle" .. bonusData.type]) * 10 + bonusData.type, count)
+		redisproxy:hincrby(WORK_BATTLE_COUNT,  role:getTimeResetRound(TimeReset["WorkBattle" .. bonusData.type]) * 10 + bonusData.type, count * bonusData.target_add)
 		local reward, change = workWinReward(role, bonusData, 3, count, true)
 		SendPacket(actionCodes.Hang_startWorkBattleRpc, MsgPack.pack({reward = reward, change = change}))
 	else
@@ -970,14 +970,14 @@ function _M.endWorkBattleRpc(agent, data)
  			local workBattle = role:getProperty("workBattle")
 			workBattle[bonusData.type] = workBattle[bonusData.type] or 0
 			local needCount = 1 - (workBattle[bonusData.type] == 0 and 1 or 0)
-			if workBattle[1] == 0 then
-				workBattle[1] = 1
+			if workBattle[bonusData.type] == 0 then
+				workBattle[bonusData.type] = 1
 				role:updateProperty({field = "workBattle", value = workBattle})
 			end
 			if needCount > 0 then
 				role:costItems({[ticketId] = needCount}, {log = {desc = "workBattle", int1 = id}})
 			end
-			redisproxy:hincrby(WORK_BATTLE_COUNT,  role:getTimeResetRound(TimeReset["WorkBattle" .. bonusData.type]) * 10 + bonusData.type, 1)
+			redisproxy:hincrby(WORK_BATTLE_COUNT,  role:getTimeResetRound(TimeReset["WorkBattle" .. bonusData.type]) * 10 + bonusData.type, bonusData.target_add)
 	 		reward, change = workWinReward(role, bonusData, rewardType)
 	 	end
  	else
@@ -245,6 +245,23 @@ local function check_trade_seaport_donate()
 	skynet.timeout(interval * 100, check_trade_seaport_donate)
 end
+local function check_work_battle()
+	local csvdb = require "shared.csvdata"
+	local now = skynet.timex()
+	local day = weekday(now)
+	local workMainCsv = csvdb["work_mainCsv"][day]
+	if workMainCsv and isSpecTime(now - RESET_TIME * 3600, csvdb["time_resetCsv"][TimeReset["WorkBattle1"]].start / 3600, 24) then
+		local round = math.floor((now - START_RESET_TIME) / 604800)
+		local field = round * 10 + day
+		local count = tonum(redisproxy:hget(WORK_BATTLE_COUNT, field))
+		if count < workMainCsv.target_num then
+			local add = math.floor(workMainCsv.target_num * math.randomInt(3125, 5000) / 100000)
+			redisproxy:hincrby(WORK_BATTLE_COUNT, field, add)
+		end
+	end
+	skynet.timeout(math.randomInt(10 * 60, 15 * 60) * 100, check_work_battle)
+end
+
 local CMD = {}
@@ -266,10 +283,12 @@ end
 function CMD.start()
+	math.randomInit(skynet.timex())
 	check_mail_queue()
 	--check_battle_act_close()
 	check_trade_seaport_status()
 	check_trade_seaport_donate()
+	check_work_battle()
 end
 local function __init__()
@@ -235,8 +235,9 @@ function specMonday(now)
 	return time - (wday - 1) * 86400
 end
-function isSpecTime(startHour, endHour, specday)
-	local tm = os.date("*t", skynet.timex())
+function isSpecTime(ctime, startHour, endHour, specday)
+	ctime = ctime or skynet.timex()
+	local tm = os.date("*t", ctime)
 	if specday then
 		local day = (tm.wday+6)%7
 		if day == 0 then day = 7 end