fix: 挂机图鉴-绑定关卡

1. 绑定的关卡需要已经解锁 2. 通关10120刷新宝鉴 3。关卡10120是从表获取的数据

fix: 挂机图鉴-绑定关卡
1. 绑定的关卡需要已经解锁 2. 通关10120刷新宝鉴 3。关卡10120是从表获取的数据
zhangqijia
1 parent 1199daf9
Showing 2 changed files with 55 additions and 11 deletions Show diff stats
src/actions/HangAction.lua
src/models/Daily.lua
@@ -266,7 +266,7 @@ function _M.endBattleRpc(agent, data)
 	--	end
 	--end
-	if role:checkHangPass(carbonId) then 
+	if role:checkHangPass(carbonId) then
 		return 4
 	end
@@ -338,6 +338,12 @@ function _M.endBattleRpc(agent, data)
 		--	hangInfo.bossTime = skynet.timex() + cfg.idle_time
 		--end
 	end
+
+	--刷新宝藏图鉴
+	if isWin and globalCsv.idle_treasure_point and globalCsv.idle_treasure_point == carbonId then
+		role.dailyData:getTreasrueList()
+	end
+
 	role:updateProperty({field = "hangInfo", value = hangInfo})
 	role:checkBattle("hang", {
@@ -97,7 +97,7 @@ function Daily:checkUnlock(treaval)
 	local treasureC = treaval.unlock:toArray(true, "=")
 	local show = false
 	if treasureC[1] == 1 then --通关关卡
-		if not self.owner:checkHangPass(treasureC[2]) then show = true end
+		if  self.owner:checkHangPass(treasureC[2]) then show = true end
 	elseif treasureC[1] == 2 then --通关拾荒章节=x层
 		local chapterId = treasureC[2]
 		local layer = 1
@@ -128,16 +128,22 @@ function Daily:checkTreasureExpired(treasureAttr, treasureList)
 		-- check finish
 		if curInfo["expire_time"] then
 			if curInfo.cool_time > 1 then
-				if skynet.timex() >= curInfo["expire_time"]  then --已过期
+				if skynet.timex() >= curInfo["expire_time"] then
 					treasureList[treasureAttr.id] = nil
-				elseif skynet.timex() > curInfo["expire_time"] - curInfo.cool_time * oneDay then --未冷却
+					curInfo = clone(treasureAttr)
+				elseif skynet.timex() >= curInfo["expire_time"] -  curInfo.cool_time * oneDay then --未冷却
 					curInfo = nil
+				else
+					curInfo = clone(treasureAttr)
 				end
 			else
 				if skynet.timex() >= curInfo["expire_time"] then
 					treasureList[treasureAttr.id] = nil
 				end
+				curInfo = clone(treasureAttr)
 			end
+		else
+			curInfo = clone(treasureAttr)
 		end
 	else
 		curInfo = clone(treasureAttr)
@@ -158,14 +164,51 @@ function Daily:checkTreasureBase(treasureList, treasureBase, removeId)
 				tmptreasure[val.id] = val
 			end
 		end
-		
+
 	end
 	return tmptreasure
 end
+--绑定通关关卡
+function Daily:checkChapters()
+	local  chapters = {}
+	local tmp_chapters = {}
+	local treasureList = self:getProperty("treasureList")
+	if next(treasureList) ~= nil then
+		for id, curInfo in pairs(treasureList) do
+			if curInfo["end_time"] then
+				if skynet.timex() >= curInfo["end_time"] then
+					curInfo = nil
+				end
+			else
+				curInfo = nil
+			end
+			if curInfo ~= nil then
+				tmp_chapters[curInfo.chapter_id] = curInfo
+			end
+		end
+	end
+
+	for chapter_id, val in pairs(csvdb["idle_battleCsv"]) do
+		if self.owner:checkHangPass(chapter_id) then
+			if next(tmp_chapters) == nil then
+				chapters[chapter_id] = val
+			else
+				if not tmp_chapters[chapter_id] then
+					chapters[chapter_id] = val
+				end
+			end
+		end
+	end
+	return chapters
+end
+
 --权重
 function Daily:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
 	local removeId
+	local chapters = self:checkChapters()
+	if next(chapters) == nil then return end
+
 	while next(tmptreasure) do
 		local tmp = self:checkTreasureBase(tmptreasure, treasureBase, removeId)
 		local id = math.randWeight(tmp, "weight") --宝藏id
@@ -180,8 +223,7 @@ function Daily:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
 		else
 			break
 		end
-
-		local chapterId = math.randWeight(csvdb["idle_battleCsv"], "treasure_weight") --关卡id
+		local chapterId = math.randWeight(chapters, "treasure_weight") --关卡id
 		if not chapterId then
 			break
 		end
@@ -263,7 +305,6 @@ function Daily:buyTreasure(treasureList)
 		treasureBase = treasureBase - val.treasure_value
 		if treasureBase < 0 then
 			treasureBase = treasureBase + val.treasure_value
-			print("资源余额不足")
 			return
 		else
 			boughtTreasurer[id] = val
@@ -280,7 +321,6 @@ end
 --宝藏图鉴
 function Daily:getTreasrueList()
-	print("宝藏图鉴...")
 	local tmpcsv = csvdb["idle_treasureCsv"]
 	local treasureList = self:getProperty("treasureList") --挖宝列表 过期删除 领取奖励删除 跨天更新
 	local tmptreasure = {}
@@ -303,7 +343,6 @@ end
 --检索挖宝列表
 function Daily:checkTreasureList(chapterId)
-	print("检索挖宝列表")
 	local treasureList = self:getProperty("treasureList")
 	local tmptreasure = {}
 	for id, val in pairs(treasureList) do
@@ -314,7 +353,6 @@ function Daily:checkTreasureList(chapterId)
 	end
 	if next(tmptreasure) == nil then
-		print("宝藏列表为空")
 		return nil
 	end
 	local boughtTreasurer = self:buyTreasure(tmptreasure)