Commit 43839638b4dc4361b73b29d5e0026447f09e1493
Merge branch 'tr/bugfix' into tr/publish/release
* tr/bugfix: 活动结束回收邮件
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
src/models/Activity.lua
@@ -598,8 +598,8 @@ function Activity:closeActivity(actId, notify, notUpdateAct) | @@ -598,8 +598,8 @@ function Activity:closeActivity(actId, notify, notUpdateAct) | ||
598 | local actType = actData.showType | 598 | local actType = actData.showType |
599 | if activityFunc[actType] and activityFunc[actType]['close'] then | 599 | if activityFunc[actType] and activityFunc[actType]['close'] then |
600 | activityFunc[actType]["close"](self, actType, notify, actId) | 600 | activityFunc[actType]["close"](self, actType, notify, actId) |
601 | - self:recycleActItem(actId) | ||
602 | end | 601 | end |
602 | + self:recycleActItem(actId) | ||
603 | if Activity.schema["act".. actType] then | 603 | if Activity.schema["act".. actType] then |
604 | if not Activity.schema["act" .. actType][3] then | 604 | if not Activity.schema["act" .. actType][3] then |
605 | self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct) | 605 | self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct) |