Merge branch 'cn/develop' into cn/publish/preview

熊润斐
2 parents c43c4173 92b6691c
Showing 1 changed file with 8 additions and 1 deletions Show diff stats
src/models/Daily.lua
@@ -201,6 +201,13 @@ function Daily:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
 	local treasure
 	if next(chapters) == nil then return end
  
+    --扣除在挖宝列表里未过期宝藏的资源值
+	for _, val in pairs(treasureList) do
+		if not val["expire_time"] then
+			treasureBase = treasureBase - val["treasure_value"]
+		end
+	end
+
 	while next(tmptreasure) do
 		local tmp, num = self:checkTreasureBase(tmptreasure, treasureBase, removeId)
  
@@ -335,7 +342,7 @@ function Daily:getTreasrueList()
 	local tmpcsv = csvdb["idle_treasureCsv"]
 	local treasureList = self:getProperty("treasureList") or {} --挖宝列表 过期删除 领取奖励删除 跨天更新
 	local tmptreasure = {}
-	local treasureBase = globalCsv.idle_treasure_base
+	local treasureBase = globalCsv.idle_treasure_base + self.owner:getBnousTreasureBaseMaximum()
 	for id, val in pairs(tmpcsv) do
 		if self:checkUnlock(val) == true then
 			local treasure = self:checkTreasureExpired(val, treasureList)