Merge branch 'cn/develop_door' into cn/develop

zhangqijia
2 parents d42dd693 f0de8a60
Showing 1 changed file with 4 additions and 4 deletions Show diff stats
src/models/Daily.lua
@@ -33,6 +33,7 @@ Daily.schema = {
 	curPool 		= {"number", 0},		-- 属性卡池当前索引
 	drawHeroCnt		= {"number", 0},		-- 每日抽卡次数
+	treasureBase	= {"number", 0}, 		-- 资源值
 	treasureList 	= {"table", {}}, 		--挂机图鉴
 }
@@ -144,8 +145,6 @@ function Daily:checkTreasureExpired(treasureAttr, treasureList)
 				end
 				curInfo = clone(treasureAttr)
 			end
-		else
-			curInfo = clone(treasureAttr)
 		end
 	else
 		curInfo = clone(treasureAttr)
@@ -305,7 +304,7 @@ end
 function Daily:buyTreasure(treasureList)
 	local boughtTreasurer = {}
-	local treasureBase = globalCsv.idle_treasure_base
+	local treasureBase = self:getProperty("treasureBase")
 	for id, val in pairs(treasureList) do
 		treasureBase = treasureBase - val.treasure_value
 		if treasureBase < 0 then
@@ -315,7 +314,7 @@ function Daily:buyTreasure(treasureList)
 			boughtTreasurer[id] = val
 		end
 	end
-	--self:updateProperty({field = "treasureBase", value = treasureBase})
+	self:updateProperty({field = "treasureBase", value = treasureBase})
 	return boughtTreasurer
 end
@@ -342,6 +341,7 @@ function Daily:getTreasrueList()
 	self:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
 	self:updateProperty({field = "treasureList", value = treasureList})
+	self:updateProperty({field = "treasureBase", value = treasureBase})
 	return treasureList
 end