Commit 1dbeabff082c7c98179a58b6f4fa42c6547138bf
Merge branch 'cn/develop' into cn/player
Showing
1 changed file
with
3 additions
and
4 deletions
Show diff stats
src/models/Daily.lua
| @@ -68,6 +68,8 @@ function Daily:refreshDailyData(notify) | @@ -68,6 +68,8 @@ function Daily:refreshDailyData(notify) | ||
| 68 | end | 68 | end |
| 69 | elseif field == "id" then | 69 | elseif field == "id" then |
| 70 | -- skip | 70 | -- skip |
| 71 | + elseif field == "treasureBase" then | ||
| 72 | + dataMap[field] = globalCsv.idle_treasure_base | ||
| 71 | elseif field == "treasureList" then | 73 | elseif field == "treasureList" then |
| 72 | dataMap[field] = self:getTreasrueList() | 74 | dataMap[field] = self:getTreasrueList() |
| 73 | elseif field == "pvpBought" then | 75 | elseif field == "pvpBought" then |
| @@ -136,10 +138,6 @@ function Daily:checkTreasureExpired(treasureAttr, treasureList) | @@ -136,10 +138,6 @@ function Daily:checkTreasureExpired(treasureAttr, treasureList) | ||
| 136 | end | 138 | end |
| 137 | curInfo = clone(treasureAttr) | 139 | curInfo = clone(treasureAttr) |
| 138 | end | 140 | end |
| 139 | - elseif curInfo["end_time"] then | ||
| 140 | - print("end_time") | ||
| 141 | - print(curInfo["end_time"]) | ||
| 142 | - print(skynet.timex()) | ||
| 143 | end | 141 | end |
| 144 | else | 142 | else |
| 145 | curInfo = clone(treasureAttr) | 143 | curInfo = clone(treasureAttr) |
| @@ -409,6 +407,7 @@ function Daily:data() | @@ -409,6 +407,7 @@ function Daily:data() | ||
| 409 | goldBuyT = self:getProperty("goldBuyT"), | 407 | goldBuyT = self:getProperty("goldBuyT"), |
| 410 | unlockPool = self:getProperty("unlockPool"), | 408 | unlockPool = self:getProperty("unlockPool"), |
| 411 | curPool = self:getProperty("curPool"), | 409 | curPool = self:getProperty("curPool"), |
| 410 | + treasureBase = self:getProperty("treasureBase"), | ||
| 412 | treasureList = self:getProperty("treasureList"), | 411 | treasureList = self:getProperty("treasureList"), |
| 413 | } | 412 | } |
| 414 | end | 413 | end |