diff --git a/src/GlobalVar.lua b/src/GlobalVar.lua index 2df61cb..8d04609 100644 --- a/src/GlobalVar.lua +++ b/src/GlobalVar.lua @@ -293,8 +293,6 @@ MailId = { SuperMonthCardEx = 204, BattleCardAward = 210, - PaySignAward = 222, - ActSellFood = 231, ActDrawCard = 232, ActAdvDraw = 233, @@ -303,6 +301,9 @@ MailId = { ActDrawCardReward = 222, ActAdvDrawReward = 223, ActOpenBoxReward = 224, + + PaySignAward = 241, + PayBackAward = 242, } TriggerEventType = { diff --git a/src/csvdata b/src/csvdata index 9ce6c8d..5751e98 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit 9ce6c8d165817a183c2867c4e7dca9d6a5600669 +Subproject commit 5751e98613ad7ade246cb9068c6752ecca115163 diff --git a/src/models/Activity.lua b/src/models/Activity.lua index 83a521e..e205207 100644 --- a/src/models/Activity.lua +++ b/src/models/Activity.lua @@ -334,7 +334,7 @@ activityFunc[Activity.ActivityType.PayBack] = { local newVal = oldVal + twd local gift = self.owner:getPaybackReward(oldVal, newVal) if gift ~= "" then - self.owner:sendMail(MailId.MonthCard, nil, gift) + self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal}) end self:updateActData(actType, newVal, not notify) end, diff --git a/src/models/Email.lua b/src/models/Email.lua index f593395..56b4a88 100644 --- a/src/models/Email.lua +++ b/src/models/Email.lua @@ -49,7 +49,7 @@ function Email:data() if emailData then -- 如果内容是直接插入到数据库 if content == "" and emailData.body ~= "" then - content = io.readfile("src/" .. emailData.body) + content = io.readfile("src/" .. emailData.body) or "" content = content:format(table.unpack(contentPms)) end -- libgit2 0.21.2