wasteland / server

Commit 2e611bcfd102bfa09c19ed1f95cbb0fe04604ad2

Authored by liuzujun
2 parents e5d884a5 7245bc4b

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

* tr/bugfix:
  登入刷新兑换活动商店
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
Inline Side-by-side
1 -Subproject commit 34a04e7f3c37fcb088e46c2c5a05fe558cb67946 1 +Subproject commit b86293f02222b1fbd499e57de9ead6cbd6e0d736
src/models/Activity.lua
  Show/Hide comments   View file @2e611bc
@@ -493,7 +493,7 @@ activityFunc[Activity.ActivityType.Exchange] = { @@ -493,7 +493,7 @@ activityFunc[Activity.ActivityType.Exchange] = {
493 self:updateActData(actType, actData, not notify) 493 self:updateActData(actType, actData, not notify)
494 end, 494 end,
495 ["login"] = function(self, actType, actId) 495 ["login"] = function(self, actType, actId)
496 - activityFunc[Activity.ActivityType.Sign]["crossDay"](self, actType, true, actId) 496 + activityFunc[Activity.ActivityType.Exchange]["crossDay"](self, actType, true, actId)
497 end, 497 end,
498 ["crossDay"] = function(self, actType, notify, actId) 498 ["crossDay"] = function(self, actType, notify, actId)
499 local actData = self:getActData(actType) or {} 499 local actData = self:getActData(actType) or {}