Merge branch 'tr/bugfix' into tr/publish/preview

熊润斐
2 parents fdddc188 2d046fcb
Showing 6 changed files with 32 additions and 8 deletions Show diff stats
src/GlobalVar.lua
src/adv/Adv.lua
src/csvdata
src/models/Activity.lua
src/models/RolePlugin.lua
src/models/RoleTimeReset.lua
@@ -155,6 +155,23 @@ TimeReset = {
 	DrawType3 = 19, -- 魔法 抽卡加成
 }
+-- TimeReset 索引数组
+TimeResetArray = {
+	"CrossDay",  --通用跨天
+	"CrossWeek",  --通用跨周
+	"DinerRank",  -- 餐厅排行榜
+	"PvpRank",  -- pvp排行榜
+	"PvpHight",  --高级竞技场
+	"PvpCross",  -- 跨服竞技场
+	"PvpShop", -- 竞技场商城
+	"DailyBattle2", -- 特殊-每日副本（贴纸）
+	"DailyBattle1", -- 特殊-每日副本（装备）
+	"DailyBattle3", -- 特殊-每日副本（时钟箱）
+	"DrawType1", -- 变异 抽卡加成
+	"DrawType2", -- 通常 抽卡加成
+	"DrawType3", -- 魔法 抽卡加成
+}
+
 GuideStep = {
 	AdvGuide = 41,
 	AdvRelay = 42,
@@ -327,6 +344,7 @@ MailId = {
 	CBBackAward = 243,
 	CBBackAward2 = 244,
 	ActivityPoolRet = 280,
+	MyCardBuy = 300,
 }
 TriggerEventType = {
@@ -1613,7 +1613,8 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 	if not chooseData or not chooseData["button".. choose .."cond"] then return end
  	if not checkChooseCondFunc(self, chooseData["button".. choose .."cond"], room, block, tag, chooseData) then return end
 	local clearBlock = chooseData.keep ~= 1
-	clearBlock = clearBlock and doChooseEffect(self, chooseData["button".. choose .."effect"], room, block, tag, chooseData)
+	local clearBlock_ = doChooseEffect(self, chooseData["button".. choose .."effect"], room, block, tag, chooseData)
+	clearBlock = clearBlock and clearBlock_
 	self:scoreChange(AdvScoreType.Event, chooseData.advScore) --增加加分
 	return true, clearBlock
 end
-Subproject commit 5c618b16315e74aaa111b3e84dbc4da3f7b3d699
+Subproject commit b86293f02222b1fbd499e57de9ead6cbd6e0d736
@@ -1001,6 +1001,8 @@ activityFunc[Activity.ActivityType.CommonSignIn] = {
 		if not isCrossDay then
 			activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId)
 		end
+		local taskStatus = self.owner:getProperty("dTask")
+		activityFunc[Activity.ActivityType.CommonSignIn]["check"](self, actType, notify, 0, (taskStatus["a"] or 0))
 	end,
 	["crossDay"] = function(self, actType, notify, actId)
 		local actCfg = csvdb["activity_ctrlCsv"][actId]
@@ -1861,8 +1861,7 @@ function RolePlugin.bind(Role)
 		if not status then
 			if params.extension_info == "mycard_web" then
-				-- todo 发邮件
-				skynet.error("mycard_web " .. params.order)
+				self:sendMail(MailId.MyCardBuy, nil, nil, {rechargeId})
 			end
 			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
 				result = "success", reward = reward}))
@@ -84,10 +84,14 @@ function Role:updateTimeReset(now, notify)
 	local resetMode = {}
 	local response = {}
-	for funcName, resetId in pairs(TimeReset) do
-		if needResetId[resetId] and ResetFunc[funcName] then
-			ResetFunc[funcName](self, notify, response, now)
-			resetMode[funcName] = true
+	for idx = 1, #TimeResetArray do
+		local funcName = TimeResetArray[idx]
+		local resetId = TimeReset[funcName]
+		if resetId then
+			if needResetId[resetId] and ResetFunc[funcName] then
+				ResetFunc[funcName](self, notify, response, now)
+				resetMode[funcName] = true
+			end
 		end
 	end