Commit 82520a235a365ce01e40058e0f1bf106f946b679
Merge branch 'tr/bugfix' into tr/bugfix-qa
* tr/bugfix: 美食币计算错误 开启x品质时钟箱任务计数错误bug 活动结束回收邮件 # Conflicts: # src/models/Activity.lua
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
src/models/Activity.lua
| @@ -717,8 +717,8 @@ function Activity:closeActivity(actId, notify, notUpdateAct) | @@ -717,8 +717,8 @@ function Activity:closeActivity(actId, notify, notUpdateAct) | ||
| 717 | local actType = actData.showType | 717 | local actType = actData.showType |
| 718 | if activityFunc[actType] and activityFunc[actType]['close'] then | 718 | if activityFunc[actType] and activityFunc[actType]['close'] then |
| 719 | activityFunc[actType]["close"](self, actType, notify, actId) | 719 | activityFunc[actType]["close"](self, actType, notify, actId) |
| 720 | - self:recycleActItem(actId) | ||
| 721 | end | 720 | end |
| 721 | + self:recycleActItem(actId) | ||
| 722 | if Activity.schema["act".. actType] then | 722 | if Activity.schema["act".. actType] then |
| 723 | if not Activity.schema["act" .. actType][3] then | 723 | if not Activity.schema["act" .. actType][3] then |
| 724 | self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct) | 724 | self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct) |
src/models/Diner.lua
| @@ -201,7 +201,7 @@ function Diner:calSellReward(sell, delta, dishData) | @@ -201,7 +201,7 @@ function Diner:calSellReward(sell, delta, dishData) | ||
| 201 | upValue[ItemId.Gold] = (upValue[ItemId.Gold] or 0) + buildData.gold_up | 201 | upValue[ItemId.Gold] = (upValue[ItemId.Gold] or 0) + buildData.gold_up |
| 202 | end | 202 | end |
| 203 | if buildData.item_up > 0 then | 203 | if buildData.item_up > 0 then |
| 204 | - upValue[ItemId.DinerCoin] = (upValue[ItemId.DinerCoin] or 0) + buildData.gold_up | 204 | + upValue[ItemId.DinerCoin] = (upValue[ItemId.DinerCoin] or 0) + buildData.item_up |
| 205 | end | 205 | end |
| 206 | if buildData and buildData.famous_up > 0 then | 206 | if buildData and buildData.famous_up > 0 then |
| 207 | upValue[-1] = (upValue[-1] or 0) + buildData.famous_up | 207 | upValue[-1] = (upValue[-1] or 0) + buildData.famous_up |