Merge branch 'bugfix' into tr/ob

* bugfix: log 发现的bug bug 取消抽卡保底的保底次数默认值，因为有些卡池不需要保底邮件活动奖励bug cb 返利调整世界boss 胜利才扣门票，扫荡根据之前的最大值给行动点任务付费签到规则改为按登录天数计算进度，世界boss 解锁条件修改 # Conflicts: # src/csvdata

Merge branch 'bugfix' into tr/ob
* bugfix: log 发现的bug bug 取消抽卡保底的保底次数默认值，因为有些卡池不需要保底邮件活动奖励bug cb 返利调整世界boss 胜利才扣门票，扫荡根据之前的最大值给行动点任务付费签到规则改为按登录天数计算进度，世界boss 解锁条件修改 # Conflicts: # src/csvdata
zhouhaihai
2 parents f7bde944 0a6fcddc
Showing 11 changed files with 52 additions and 23 deletions Show diff stats
src/GlobalVar.lua
src/actions/ActivityAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.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
 				-- 奖励
@@ -525,6 +525,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
@@ -656,7 +660,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]
@@ -675,8 +679,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()
@@ -705,7 +707,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}})
@@ -834,6 +839,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
@@ -849,6 +858,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}
@@ -764,7 +764,7 @@ function _M.drawHeroRpc(agent, data)
 	local drawCount = {1, 10} -- 抽取次数
 	if not drawCount[drawType] then return 3 end
-	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype] or 10
+	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
 	local floorHeroCount = role:getProperty("floorHero")[btype] or 0
 	-- 计算抽卡消耗品
@@ -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
@@ -58,7 +58,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表示领取过该档位的奖励
@@ -386,6 +386,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)
@@ -757,7 +762,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
@@ -766,6 +771,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,7 +508,7 @@ local MethodType = {
 		mission_id	= true, --关卡ID
 		mission_herolist = true, -- 英雄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, -- 完成耗时（秒）
 	},
@@ -356,13 +356,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
@@ -148,7 +148,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")}},
 	}
@@ -174,7 +174,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")}},
@@ -211,7 +211,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")