Merge branch 'bugfix' into tr/ob

* bugfix: 掉落活动配置最大掉落周期数拆解周活动跨轮数据异常bug 道具开时钟箱，检查箱子够不够 # Conflicts: # src/csvdata

Merge branch 'bugfix' into tr/ob
* bugfix: 掉落活动配置最大掉落周期数拆解周活动跨轮数据异常bug 道具开时钟箱，检查箱子够不够 # Conflicts: # src/csvdata
zhouhaihai
2 parents 786de7e5 6662e7d2
Showing 3 changed files with 48 additions and 27 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/RoleAction.lua
src/models/Activity.lua
@@ -375,6 +375,8 @@ function _M.hangDropRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local actid = msg.actid
 	if not role.activity:isOpenById(actid, "HangDrop") then return 1 end
+	local actCtrlData = csvdb["activity_ctrlCsv"][actid]
+	if not actCtrlData then return end
  
 	local actCfg = csvdb["activity_putCsv"][actid]
 	if not actCfg then return 2 end
@@ -407,7 +409,7 @@ function _M.hangDropRpc(agent, data)
 		return 4
 	end
 	local num = math.floor((timeNow - actData)/ period)
-	num = num > 8 and 8 or num
+	num = num > actCtrlData.condition and actCtrlData.condition or num
 	if num == 0 then
 		return 5
 	end
@@ -640,6 +640,7 @@ function _M.openTimeBoxRpc(agent, data)
 		end
  
 		if role:getItemCount(costId) < count then return 8 end
+		if not role:checkItemEnough(costs) then return 9 end
  
 		role:costItems({[costId] = count}, {log = {desc = "openTimeBox"}})
  
@@ -277,38 +277,56 @@ function Activity:checkWeeklyAct(actType, notify, count, pool)
 		local totalCnt = 0
 		local finishCnt = 0
 		local maxCondition = 0
-		for k, cfg in pairs(csvdb[info.table] or {}) do
-			totalCnt = totalCnt + 1
-			if maxCondition < cfg.condition1 then
-				maxCondition = cfg.condition1
-			end
-			if not curData[cfg.id] and curData[0] >= cfg.condition1 then
-				if info.mailId then 
+		local flag = true
+		while flag do
+			--print("tatal number :", curData[0])
+			for i = 1, #csvdb[info.table] do
+				local cfg = csvdb[info.table][i]
+			--for k, cfg in pairs(csvdb[info.table] or {}) do
+				totalCnt = totalCnt + 1
+				if maxCondition < cfg.condition1 then
+					maxCondition = cfg.condition1
+				end
+				--print("cur condition", cfg.condition1)
+				if curData[0] < cfg.condition1 then
+					flag = false
+					break
+				end
  
-					self.owner:log("activity", {
-						activity_id = cfg.id, -- 活动ID（或活动指定任务的ID）
-						activity_type = actType, -- 活动类型，见活动类型枚举表
-						activity_reward = cfg.reward:toNumMap(), -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
-					})
+				--print(curData[0], cfg.condition1)
+				if not curData[cfg.id] and curData[0] >= cfg.condition1 then
+					if info.mailId then 
  
-					self.owner:sendMail(info.mailId, nil, cfg.reward, {cfg.condition1})
-					curData[cfg.id] = 1
+						self.owner:log("activity", {
+							activity_id = cfg.id, -- 活动ID（或活动指定任务的ID）
+							activity_type = actType, -- 活动类型，见活动类型枚举表
+							activity_reward = cfg.reward:toNumMap(), -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+						})
+
+						self.owner:sendMail(info.mailId, nil, cfg.reward, {cfg.condition1})
+						curData[cfg.id] = 1
+					end
+				end
+				if curData[cfg.id] then
+					finishCnt = finishCnt + 1
 				end
 			end
-			if curData[cfg.id] then
-				finishCnt = finishCnt + 1
-			end
-		end
-		if totalCnt == finishCnt then
-			roundData[actType] = curRound + 1
-			for k,v in pairs(curData) do
-				if k == 0 then
-					curData[k] = curData[0] >= maxCondition and curData[0] - maxCondition or 0
-				else
-					curData[k] = nil
+			if totalCnt == finishCnt then
+				roundData[actType] = (roundData[actType] or 0) + 1
+				for k,v in pairs(curData) do
+					if k == 0 then
+						curData[k] = curData[0] >= maxCondition and curData[0] - maxCondition or 0
+					else
+						curData[k] = nil
+					end
+				end
+				--print("cur round ".. roundData[actType], ctrlData.condition)
+				if roundData[actType] >= ctrlData.condition then
+					curData[0] = maxCondition
+					flag = false
 				end
+				self:updateProperty({field = "round", value = roundData, notNotify = not notify})
 			end
-			self:updateProperty({field = "round", value = roundData, notNotify = not notify})
 		end
 		self:updateActData(actType, curData, not notify)
 end