wasteland / server

Commit ec5df7a055e028c0fb634a21e93988606a1d1883

Authored by zhouhaihai
2 parents 3da4db4f abdf8cf1

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

* tr/bugfix-qa:
  单位分
  通知邮件
  选择 bug
  战令-周任务没有刷新, 日活跃签到初始化时候检测当前活跃度是否达到签到标准
Showing 6 changed files with 31 additions and 8 deletions   Show diff stats
Inline Side-by-side
@@ -155,6 +155,23 @@ TimeReset = { @@ -155,6 +155,23 @@ TimeReset = {
155 DrawType3 = 19, -- 魔法 抽卡加成 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 GuideStep = { 175 GuideStep = {
159 AdvGuide = 41, 176 AdvGuide = 41,
160 AdvRelay = 42, 177 AdvRelay = 42,
@@ -327,6 +344,7 @@ MailId = { @@ -327,6 +344,7 @@ MailId = {
327 CBBackAward = 243, 344 CBBackAward = 243,
328 CBBackAward2 = 244, 345 CBBackAward2 = 244,
329 ActivityPoolRet = 280, 346 ActivityPoolRet = 280,
  347 + MyCardBuy = 300,
330 } 348 }
331 349
332 TriggerEventType = { 350 TriggerEventType = {
src/actions/StoreAction.lua
  Show/Hide comments   View file @ec5df7a
@@ -23,7 +23,7 @@ function _M.rechargeRpc(agent , data) @@ -23,7 +23,7 @@ function _M.rechargeRpc(agent , data)
23 skynet.timeout(10, function () 23 skynet.timeout(10, function ()
24 role:handlePurchase({ 24 role:handlePurchase({
25 order = partnerOrderId, 25 order = partnerOrderId,
26 - amount = dataSet.rmb, 26 + amount = dataSet.rmb * 100,
27 game_money = dataSet.diamond, 27 game_money = dataSet.diamond,
28 product_id = dataSet.productId, 28 product_id = dataSet.productId,
29 pay_time = skynet.timex(), 29 pay_time = skynet.timex(),
1 -Subproject commit 5c618b16315e74aaa111b3e84dbc4da3f7b3d699 1 +Subproject commit b86293f02222b1fbd499e57de9ead6cbd6e0d736
src/models/Activity.lua
  Show/Hide comments   View file @ec5df7a
@@ -1001,6 +1001,8 @@ activityFunc[Activity.ActivityType.CommonSignIn] = { @@ -1001,6 +1001,8 @@ activityFunc[Activity.ActivityType.CommonSignIn] = {
1001 if not isCrossDay then 1001 if not isCrossDay then
1002 activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId) 1002 activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId)
1003 end 1003 end
  1004 + local taskStatus = self.owner:getProperty("dTask")
  1005 + activityFunc[Activity.ActivityType.CommonSignIn]["check"](self, actType, notify, 0, (taskStatus["a"] or 0))
1004 end, 1006 end,
1005 ["crossDay"] = function(self, actType, notify, actId) 1007 ["crossDay"] = function(self, actType, notify, actId)
1006 local actCfg = csvdb["activity_ctrlCsv"][actId] 1008 local actCfg = csvdb["activity_ctrlCsv"][actId]
src/models/RolePlugin.lua
  Show/Hide comments   View file @ec5df7a
@@ -1861,8 +1861,7 @@ function RolePlugin.bind(Role) @@ -1861,8 +1861,7 @@ function RolePlugin.bind(Role)
1861 1861
1862 if not status then 1862 if not status then
1863 if params.extension_info == "mycard_web" then 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 end 1865 end
1867 SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr, 1866 SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
1868 result = "success", reward = reward})) 1867 result = "success", reward = reward}))
src/models/RoleTimeReset.lua
  Show/Hide comments   View file @ec5df7a
@@ -84,10 +84,14 @@ function Role:updateTimeReset(now, notify) @@ -84,10 +84,14 @@ function Role:updateTimeReset(now, notify)
84 local resetMode = {} 84 local resetMode = {}
85 85
86 local response = {} 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 end 95 end
92 end 96 end
93 97