Commit 427520d2bd7d71f5649b59df0aec9a494308afcb

Authored by 熊润斐
2 parents 82520a23 2d046fcb

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

src/GlobalVar.lua
... ... @@ -155,6 +155,23 @@ TimeReset = {
155 155 DrawType3 = 19, -- 魔法 抽卡加成
156 156 }
157 157  
  158 +-- TimeReset 索引数组
  159 +TimeResetArray = {
  160 + "CrossDay", --通用跨天
  161 + "CrossWeek", --通用跨周
  162 + "DinerRank", -- 餐厅排行榜
  163 + "PvpRank", -- pvp排行榜
  164 + "PvpHight", --高级竞技场
  165 + "PvpCross", -- 跨服竞技场
  166 + "PvpShop", -- 竞技场商城
  167 + "DailyBattle2", -- 特殊-每日副本(贴纸)
  168 + "DailyBattle1", -- 特殊-每日副本(装备)
  169 + "DailyBattle3", -- 特殊-每日副本(时钟箱)
  170 + "DrawType1", -- 变异 抽卡加成
  171 + "DrawType2", -- 通常 抽卡加成
  172 + "DrawType3", -- 魔法 抽卡加成
  173 +}
  174 +
158 175 GuideStep = {
159 176 AdvGuide = 41,
160 177 AdvRelay = 42,
... ... @@ -327,6 +344,7 @@ MailId = {
327 344 CBBackAward = 243,
328 345 CBBackAward2 = 244,
329 346 ActivityPoolRet = 280,
  347 + MyCardBuy = 300,
330 348 }
331 349  
332 350 TriggerEventType = {
... ...
src/adv/Adv.lua
... ... @@ -1613,7 +1613,8 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
1613 1613 if not chooseData or not chooseData["button".. choose .."cond"] then return end
1614 1614 if not checkChooseCondFunc(self, chooseData["button".. choose .."cond"], room, block, tag, chooseData) then return end
1615 1615 local clearBlock = chooseData.keep ~= 1
1616   - clearBlock = clearBlock and doChooseEffect(self, chooseData["button".. choose .."effect"], room, block, tag, chooseData)
  1616 + local clearBlock_ = doChooseEffect(self, chooseData["button".. choose .."effect"], room, block, tag, chooseData)
  1617 + clearBlock = clearBlock and clearBlock_
1617 1618 self:scoreChange(AdvScoreType.Event, chooseData.advScore) --增加加分
1618 1619 return true, clearBlock
1619 1620 end
... ...
1   -Subproject commit 5c618b16315e74aaa111b3e84dbc4da3f7b3d699
  1 +Subproject commit b86293f02222b1fbd499e57de9ead6cbd6e0d736
... ...
src/models/Activity.lua
... ... @@ -1001,6 +1001,8 @@ activityFunc[Activity.ActivityType.CommonSignIn] = {
1001 1001 if not isCrossDay then
1002 1002 activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId)
1003 1003 end
  1004 + local taskStatus = self.owner:getProperty("dTask")
  1005 + activityFunc[Activity.ActivityType.CommonSignIn]["check"](self, actType, notify, 0, (taskStatus["a"] or 0))
1004 1006 end,
1005 1007 ["crossDay"] = function(self, actType, notify, actId)
1006 1008 local actCfg = csvdb["activity_ctrlCsv"][actId]
... ...
src/models/RolePlugin.lua
... ... @@ -1861,8 +1861,7 @@ function RolePlugin.bind(Role)
1861 1861  
1862 1862 if not status then
1863 1863 if params.extension_info == "mycard_web" then
1864   - -- todo 发邮件
1865   - skynet.error("mycard_web " .. params.order)
  1864 + self:sendMail(MailId.MyCardBuy, nil, nil, {rechargeId})
1866 1865 end
1867 1866 SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
1868 1867 result = "success", reward = reward}))
... ...
src/models/RoleTimeReset.lua
... ... @@ -84,10 +84,14 @@ function Role:updateTimeReset(now, notify)
84 84 local resetMode = {}
85 85  
86 86 local response = {}
87   - for funcName, resetId in pairs(TimeReset) do
88   - if needResetId[resetId] and ResetFunc[funcName] then
89   - ResetFunc[funcName](self, notify, response, now)
90   - resetMode[funcName] = true
  87 + for idx = 1, #TimeResetArray do
  88 + local funcName = TimeResetArray[idx]
  89 + local resetId = TimeReset[funcName]
  90 + if resetId then
  91 + if needResetId[resetId] and ResetFunc[funcName] then
  92 + ResetFunc[funcName](self, notify, response, now)
  93 + resetMode[funcName] = true
  94 + end
91 95 end
92 96 end
93 97  
... ...