Commit 70bd2bb012c30aa04372788a89a01f7cb7f08a73

Authored by zhouhaihai
2 parents 5d51be8b 8b65a363

Merge branch 'develop' into player

src/actions/RoleAction.lua
@@ -295,7 +295,7 @@ function _M.createRpc(agent, data) @@ -295,7 +295,7 @@ function _M.createRpc(agent, data)
295 return true 295 return true
296 end 296 end
297 newRole:startActionUcode() 297 newRole:startActionUcode()
298 - newRole:award(globalCsv.birthItem, {log = {desc = "birth"}}) 298 + newRole:award(globalCsv.birthItem, {log = {desc = "birth"}, notNotify = true})
299 -- 欢迎邮件 299 -- 欢迎邮件
300 redisproxy:insertEmail({roleId = roleId, emailId = 1}) 300 redisproxy:insertEmail({roleId = roleId, emailId = 1})
301 301
src/models/RoleTimeReset.lua
@@ -9,7 +9,7 @@ ResetFunc["CrossDay"] = function(self, notify, response) @@ -9,7 +9,7 @@ ResetFunc["CrossDay"] = function(self, notify, response)
9 self.dinerData:refreshDailyData(notify) 9 self.dinerData:refreshDailyData(notify)
10 10
11 self:setProperty("dTask", {}) 11 self:setProperty("dTask", {})
12 - self:advRandomSupportEffect() 12 + self:advRandomSupportEffect(not notify)
13 13
14 self:checkExpireItem(not notify) 14 self:checkExpireItem(not notify)
15 15