wasteland / server

Commit 9782bfc3990dfad86e3d956d6d4aa9e9c4b912d6

Authored by liuzujun
2 parents 7f9f002d 75614d9f

Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/actions/RoleAction.lua
  Show/Hide comments   View file @9782bfc
@@ -95,7 +95,6 @@ function _M.loginRpc( agent, data ) @@ -95,7 +95,6 @@ function _M.loginRpc( agent, data )
95 role:load() 95 role:load()
96 role:loadAll() 96 role:loadAll()
97 role:startActionUcode() 97 role:startActionUcode()
98 - role:setProperty("ltime", now)  
99 else 98 else
100 role:reloadWhenLogin() 99 role:reloadWhenLogin()
101 end 100 end
src/models/RoleTimeReset.lua
  Show/Hide comments   View file @9782bfc
@@ -86,8 +86,10 @@ function Role:updateTimeReset(now, notify) @@ -86,8 +86,10 @@ function Role:updateTimeReset(now, notify)
86 for resetId, round in pairs(needResetId) do 86 for resetId, round in pairs(needResetId) do
87 timeReset[resetId] = round 87 timeReset[resetId] = round
88 end 88 end
89 - self:setProperty("timeReset", timeReset) 89 + self:setProperties({timeReset = timeReset, ltime = now})
  90 +
90 response.timeReset = timeReset 91 response.timeReset = timeReset
  92 + response.ltime = ltime
91 93
92 if notify then 94 if notify then
93 self:notifyUpdateProperties(response) 95 self:notifyUpdateProperties(response)