Merge branch 'cn/develop' into cn/player

熊润斐
2 parents a0b219dd 63c0245e
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)
 			end
 		elseif field == "id" then
             -- skip
+		elseif field == "treasureBase" then
+			dataMap[field] = globalCsv.idle_treasure_base
 		elseif field == "treasureList" then
 			dataMap[field] = self:getTreasrueList()
 		elseif field == "pvpBought" then
@@ -136,10 +138,6 @@ function Daily:checkTreasureExpired(treasureAttr, treasureList)
 				end
 				curInfo = clone(treasureAttr)
 			end
-		elseif curInfo["end_time"] then
-			print("end_time")
-			print(curInfo["end_time"])
-			print(skynet.timex())
 		end
 	else
 		curInfo = clone(treasureAttr)
@@ -409,6 +407,7 @@ function Daily:data()
 		goldBuyT = self:getProperty("goldBuyT"),
 		unlockPool = self:getProperty("unlockPool"),
 		curPool = self:getProperty("curPool"),
+		treasureBase = self:getProperty("treasureBase"),
 		treasureList = self:getProperty("treasureList"),
 	}
 end