Merge branch 'bugfix' into develop

* bugfix: (22 commits) 拾荒失败也要触发成就引导掉落活动配置最大掉落周期数拆解周活动跨轮数据异常bug 道具开时钟箱，检查箱子够不够增加电台任务日志完成类型空的是nil appid 讨伐电台日志增加开始结束 log 发现的bug bug 取消抽卡保底的保底次数默认值，因为有些卡池不需要保底邮件活动奖励bug cb 返利调整世界boss 胜利才扣门票，扫荡根据之前的最大值给行动点任务付费签到规则改为按登录天数计算进度，世界boss 解锁条件修改活动卡池保底出指定英雄拆解术式充能的时候领取道具，获得个数计算错误 ... # Conflicts: # src/actions/RadioAction.lua # src/csvdata

Merge branch 'bugfix' into develop
* bugfix: (22 commits) 拾荒失败也要触发成就引导掉落活动配置最大掉落周期数拆解周活动跨轮数据异常bug 道具开时钟箱，检查箱子够不够增加电台任务日志完成类型空的是nil appid 讨伐电台日志增加开始结束 log 发现的bug bug 取消抽卡保底的保底次数默认值，因为有些卡池不需要保底邮件活动奖励bug cb 返利调整世界boss 胜利才扣门票，扫荡根据之前的最大值给行动点任务付费签到规则改为按登录天数计算进度，世界boss 解锁条件修改活动卡池保底出指定英雄拆解术式充能的时候领取道具，获得个数计算错误 ... # Conflicts: # src/actions/RadioAction.lua # src/csvdata
zhouhaihai
2 parents 66e696ae 4bd10b43
Showing 13 changed files with 134 additions and 58 deletions Show diff stats
src/GlobalVar.lua
src/actions/ActivityAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RadioAction.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/models/Activity.lua
src/models/Email.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/Store.lua
@@ -323,6 +323,7 @@ MailId = {
 	PaySignAward = 241,
 	PayBackAward = 242,
 	CBBackAward = 243,
+	CBBackAward2 = 244,
 }
  
 TriggerEventType = {
@@ -192,13 +192,13 @@ function _M.actPaySignRpc(agent, data)
 	local open, actId = role.activity:isOpen("PaySignIn")
 	if not open then return 2 end
  
-	local diffDay = diffFromTs(ts) + 1
+	--local diffDay = diffFromTs(ts) + 1
  
 	local curData = role.activity:getActData("PaySignIn")
 	if not curData then return 3 end
 	local reward, change = {}
 	for day, csvData in ipairs(csvdb["pay_signInCsv"]) do
-		if day <= diffDay and day == dayIndex then
+		if day <= (curData[0] or 0) and day == dayIndex then
 			if not curData[day] then
 				curData[day] = 1
 				-- 奖励
@@ -378,6 +378,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
@@ -410,7 +412,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
@@ -528,6 +530,10 @@ function _M.startBattleRpc(agent, data)
 		local reward, change  = role:award(award, {log = {desc = "actBattle", int1 = actid, int2 = count or 0}})
 		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack(role:packReward(reward, change)))
  
+		if battleCfg.worldBoss_award ~= 0 and (bi["maxP"] or 0) > 0 then
+			bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"]
+		end
+
 		bi["sum"] = bi["sum"] + bi["top"]
 		actData["ticket"] = ticket - num
 		actData[id] = bi
@@ -659,7 +665,7 @@ function _M.endBattleRpc(agent, data)
 		battleInfo["star"] = curStar
 	end
  
-	if battleCfg.rank ~= 0 then
+	if battleCfg.rank ~= 0 and isWin then
 		-- 消耗门票
 		role.activity:getBattleTicket(actid)
 		local num = battleCfg.type:toArray(true, "=")[3]
@@ -678,8 +684,6 @@ function _M.endBattleRpc(agent, data)
 			role:updateRankCommon(RANK_TYPE.ActBattleBoss, rankVal)
 		end
 	end
-	actData[id] = battleInfo
-	role.activity:updateActData("ChallengeLevel", actData)
  
 	if (oldStarNum == 0 and newStarNum > 0) or battleCfg.rank ~= 0 then
 		reward = battleCfg.item_clear:toNumMap()
@@ -708,7 +712,10 @@ function _M.endBattleRpc(agent, data)
  
 	if battleCfg.worldBoss_award ~= 0 and msg.point then
 		battleInfo["bossP"] = (battleInfo["bossP"] or 0) + msg.point
+		battleInfo["maxP"] = math.max(msg.point, (battleInfo["maxP"] or 0))
 	end
+	actData[id] = battleInfo
+	role.activity:updateActData("ChallengeLevel", actData)
  
 	reward, change  = role:award(reward, {log = {desc = "actBattle", int1 = actid, int2 = newStarNum}})
  
@@ -837,6 +844,10 @@ function _M.bossRewardRpc(agent, data)
 	if bossPoint < 1 then return 7 end
  
 	local bossRecord = battleInfo["bossR"] or ""
+	local r = string.char(string.getbit(bossRecord, index))
+	if r == "1" then
+		return 9
+	end
 	local ok = false
 	if #preList == 0 then
 		ok = true
@@ -852,6 +863,7 @@ function _M.bossRewardRpc(agent, data)
 	if not ok then return 8 end
  
 	battleInfo["bossR"] = string.setbit(bossRecord, index)
+	battleInfo["bossP"] = bossPoint - 1
 	actData[id] = battleInfo
 	role.activity:updateActData("ChallengeLevel", actData)
  
@@ -560,10 +560,10 @@ function _M.startBonusBattleRpc(agent, data)
 	end
  
 	if not bonusData then return 3 end
-	if not role:checkHangPass(bonusData.unlock) then return 4 end
+	local bonusStar = role:getProperty("bonusStar")
  
+	if bonusData.unlock ~= 0 and (not bonusStar[bonusData.unlock] or bonusStar[bonusData.unlock] == 0) then return 4 end
  
-	local bonusStar = role:getProperty("bonusStar")
 	if bonusStar[id] and bonusStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then 
 			local bonusC = role.dailyData:getProperty("bonusC")
 			bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
@@ -724,6 +724,9 @@ function _M.drawHeroRpc(agent, data)
 		subType = 1
 		if btype == 4 and role:getProperty("newerDraw") >= 10 then
 			subType = 2
+			if(role:getProperty("newerDraw") >= 30) then
+				return 30
+			end
 		end
 	end
  
@@ -993,7 +996,7 @@ function _M.drawHeroRpc(agent, data)
 			local even = repayHeroMaxCount % 2
 			local id = 0
 			if even == 1 then
-				id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
 			else
 				local giftHeroSet = {}
 				for gid, cfg in pairs(csvdb["build_giftCsv"]) do
@@ -1006,7 +1009,7 @@ function _M.drawHeroRpc(agent, data)
 				end
 			end
 			if id == 0 then
-				id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
 			end
  
 			local r,change = {}
@@ -102,6 +102,25 @@ function _M.startQuestRpc(agent, data)
     role:updateProperty({field="radioTask", value=radioTask, notNotify=true})
  
     SendPacket(actionCodes.Radio_startQuestRpc, MsgPack.pack({id=id, task=taskData}))
+
+    local herolist = {}
+    for _, heroId in ipairs(heros) do
+        local hero = role.heros[heroId]
+        if hero then
+            table.insert(herolist, hero:getProperty("type"))
+        end
+    end
+
+	--  讨伐行动 
+	role:log("punitive_action", {
+		mission_id	= id, --关卡ID
+		mission_herolist = herolist, -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
+		mission_success_rate = 0, -- 大成功几率
+		mission_reward = {}, -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
+		mission_result = 0, -- 战斗结果(0-无效，1-胜利，2-失败)
+        mission_roundtime = 0, -- 完成耗时（秒）
+        mission_cleartype = 1,  -- 1-开始; 2-完成(领取奖励时）
+	})
 	return true
 end
  
@@ -177,7 +196,8 @@ function _M.finishQuestRpc(agent, data)
 		mission_success_rate = totalCoef, -- 大成功几率
 		mission_reward = r, -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
 		mission_result = 1, -- 战斗结果(0-无效，1-胜利，2-失败)
-		mission_roundtime = config.time, -- 完成耗时（秒）
+        mission_roundtime = config.time, -- 完成耗时（秒）
+        mission_cleartype = 2,  -- 1-开始; 2-完成(领取奖励时）
 	})
  
 	return true
@@ -385,12 +385,16 @@ function _M.createRpc(agent, data)
 		if cbbackd then
 			local status, back = pcall(cluster.call, "center", cbbackd, "getCbBack", {uid = uid, id = roleId})
 			if status then
-				if back and next(back) then
+				if back and next(back) and back.reward and next(back.reward) then
 					local reward = ""
-					for itemId, count in pairs(back) do
+					for itemId, count in pairs(back.reward) do
 						reward = reward:setv(itemId, count)
 					end
-					redisproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward, createtime = skynet.timex(), attachments = reward})
+					if back.reward[70] then
+						redisproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward2, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
+					else
+						redisproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
+					end
 					newRole:mylog("cbback", {key1 = uid, int2 = roleId})
 				end
 			else
@@ -607,6 +611,8 @@ function _M.openTimeBoxRpc(agent, data)
 			local costKey = math.ceil((stopTime - nowTime) / (cost_pre[1] * 60)) * cost_pre[2]
 			if not role:checkItemEnough({[ItemId.Diamond] = costKey}) then return 5 end
 			role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot}})
+		else
+			stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600)
 		end
 		role:pushCancel({type = "box", slot = slot})
  
@@ -634,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"}})
  
@@ -847,10 +847,10 @@ function Adv:over(success, rewardRatio, overType)
 				red:hset(RANK_ADV_INFO, roleId,  MsgPack.pack(curInfo))
 			end)
 		end
-		-- 通关的时候要把引导步骤设定到成就引导
-		if not self.owner:checkOverGuide(57) then
-			self.owner:saveGuide(57,1,true)
-		end
+	end
+	-- 通关的时候要把引导步骤设定到成就引导
+	if not self.owner:checkOverGuide(57) then
+		self.owner:saveGuide(57,1,true)
 	end
 	self:clearAdvUnlockCache()
  
@@ -61,7 +61,7 @@ Activity.schema = {
 	actime 		= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
 	round		= {"table", {}},  -- 记录活动到了第几轮  {id = roundnum}
 	act4		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
-	act6		= {"table", {}},  -- {1 = 1, 2 = 1} == 付费签到活动
+	act6		= {"table", {}},  -- {0 = day, 1 = 1, 2 = 1} == 付费签到活动
 	act8		= {"number", 0},  -- 充值返利 
  
 	act11		= {"table", {}},  -- {0 = 贩卖数量, 1=1, 2=1}  贩卖周活动  1表示领取过该档位的奖励
@@ -287,38 +287,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
@@ -396,6 +414,11 @@ activityFunc[Activity.ActivityType.PaySignIn] = {
 	["init"] = function(self, actType, isCrossDay, notify)
 		self:updateActData(actType, {}, not notify)
 	end,
+	["crossDay"] = function(self, actType, notify)
+		local curData = self:getActData(actType)
+		curData[0] = (curData[0] or 0) + 1
+		self:updateActData(actType, curData, not notify)
+	end,
 	["close"] = function(self, actType, notify)
 		self.owner.storeData:SetActGoodsFlag("paySignIn", 0)
  
@@ -807,7 +830,7 @@ activityFunc[Activity.ActivityType.Crisis] = {
 					local reward
 					if actSet.loop == 1 then
 						local rcount = math.floor(status / actSet.condition1)
-						local reward = actSet.reward:toNumMap()
+						reward = actSet.reward:toNumMap()
 						for itemId, itemC in pairs(reward) do
 							reward[itemId] = itemC * rcount
 						end
@@ -816,6 +839,7 @@ activityFunc[Activity.ActivityType.Crisis] = {
 						reward = actSet.reward
 						status = -1
 					end
+
 					self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
 				end
 				actData.task[id] = status
@@ -62,7 +62,11 @@ function Email:data()
 		end
  
 		if attachments == "" and emailData.attachment ~= "" then
-			attachments = emailData.attachment:format(table.unpack(rewardPms))
+			if next(rewardPms) then
+				attachments = emailData.attachment:format(table.unpack(rewardPms))
+			else
+				attachments = emailData.attachment
+			end
 		end
 	end
  
@@ -508,11 +508,12 @@ local MethodType = {
 	},
 	punitive_action = { --  讨伐行动 --TODO
 		mission_id	= true, --关卡ID
-		mission_herolist = true, -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
+		mission_herolist = "json", -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
 		mission_success_rate = true, -- 大成功几率
-		mission_reward = true, -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
+		mission_reward = "json", -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
 		mission_result = true, -- 战斗结果(0-无效，1-胜利，2-失败)
 		mission_roundtime = true, -- 完成耗时（秒）
+		mission_cleartype = true, -- 1-开始; 2-完成(领取奖励时）
 	},
 	hero_talent = { --英雄精进（原英雄天赋升级）  TODO
 		hero_id = true, --英雄ID
@@ -390,13 +390,14 @@ function RolePlugin.bind(Role)
 			if not self:costDiamond(pms) then
 				return
 			end
-			itemCountT[ItemId.Diamond] = nil
 		end
 		for itemId, count in pairs(itemCountT) do
-			pms.itemId = itemId
-			pms.count = - count
-			self:addItem(pms)
-			self:itemDeltaEvent(pms)
+			if itemId ~= ItemId.Diamond then
+				pms.itemId = itemId
+				pms.count = - count
+				self:addItem(pms)
+				self:itemDeltaEvent(pms)
+			end
 		end
 		return true
 	end
@@ -1396,7 +1397,7 @@ function RolePlugin.bind(Role)
 		end
 		format.heros = heros
 		format.supports = team.supports or {}
-		format.tactics = team.tactics or {}
+		format.tactics = team.tactics or nil
 		return format
 	end
  
@@ -154,7 +154,7 @@ local CommonListener = {
 		[TaskType.AdvStartSelf] = {{24}},
 		[TaskType.ShopAll] = {{25, f("count")}},
 		[TaskType.RuneUp] = {{26}},
-		[TaskType.OpenBox] = {{27, 1, f("id")}},
+		[TaskType.OpenBox] = {{27, f("count"), f("id")}},
 		[TaskType.AdvDraw] = {{28, f("count"), f("ptype")}},
 		[TaskType.PotionMake] = {{29, f("count"), f("id")}},
 	}
@@ -180,7 +180,7 @@ local AchievListener = {
 		[TaskType.FoodSellGold] = {{15, f("count")}},
 		[TaskType.DinerPopular] = {{16, f("count")}},
 		[TaskType.TowerPass] = {{17, f("level")}},
-		[TaskType.OpenBox] = {{18}},
+		[TaskType.OpenBox] = {{18, f("count")}},
 		[TaskType.DinerLevelUp] = {{19, f("level"), f("type")}},
 		[TaskType.DinerTalentUp] = {{20, 1, f("type")}},
 		[TaskType.HangGetGold] = {{21, f("count")}},
@@ -217,7 +217,7 @@ local SudokuListener = {
 		[TaskType.AdvDraw] = {{10, f("count")}},
 		[TaskType.DinerLevelUp] = {{11, f("level"), f("type")}},
 		[TaskType.FoodSell] = {{12, f("count")}},
-		[TaskType.OpenBox] = {{13, 1}},
+		[TaskType.OpenBox] = {{13, f("count")}},
 		[TaskType.TowerPass] = {{14, f("level")}},
 		[TaskType.PvpWin] = {{15, 1}},
 		[TaskType.DinerTalentUp] = {{16, f("level"), f("type")}},
@@ -392,6 +392,9 @@ function Store:onBuyPaySignCard(dur)
 	curTs = getServerOpenTs()
  
     self:SetActGoodsFlag("paySignIn", curTs)
+    local actData = self.owner.activity:getActData("PaySignIn")
+    actData[0] = 1
+    self.owner.activity:updateActData("PaySignIn", actData)
  
     --local actGoodsFlag = self:getProperty("actGoodsFlag") or {}
     --local goodsIndex = GetActGoodsIndex("paySignIn")