中继层

zhouhaihai
1 parent 76dc6fb7
Showing 9 changed files with 134 additions and 45 deletions Show diff stats
src/GlobalVar.lua
src/actions/AdvAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvMap.lua
src/adv/AdvRoom.lua
src/models/Daily.lua
src/models/Role.lua
src/models/RolePlugin.lua
@@ -60,7 +60,7 @@ ItemType = {
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
 FuncOpenType = {
 	AdvEndless 					= 2, -- 无尽模式
-	AdvRelay 					= 3, -- 中继开放
+	AdvRelay 					= 3, -- 中继开放  -- 删掉了
 	AdvWS 						= 6, -- 工坊解锁
 	AdvWheelSurf 				= 7, -- 抽奖解锁
 	TimeBoxSlot 				= 8, -- 时钟箱槽
@@ -102,6 +102,9 @@ AdvSpecialStage = {
 	[2] = "Out",
 	[3] = "BOSS",
 	[4] = "LinkChoose",
+	[5] = "Exit", 
+	[6] = "InOut", 
+	[7] = "Diner"
 }
 --客户端需要知道这个
 AdvEventType = {
@@ -110,6 +113,11 @@ AdvEventType = {
 	Out = -2,	--出口
 	BOSS = -3,  -- boss
 	LinkChoose = -4,  -- 连续选择
+	Exit = -5, -- 中继点专属退出出口
+	InOut = -6, -- 出入口集合体
+	Diner = -7, -- 料理台
+
+
 	-- 普通事件(随机）
 	Choose = 1,  --选择点
 	Drop = 2,  --物品掉落点
@@ -91,36 +91,32 @@ function _M.startAdvRpc( agent, data )
 	local chapterData = csvdb["adv_chapterCsv"][chapterId]
 	if not chapterData or layer < 1 then return  1 end
-	--是否是中继层
-	if (layer - 1) % globalCsv.adv_can_out_layer_pre ~= 0 then return 3 end
-
 	local advPass = role:getProperty("advPass")
-	if AdvCommon.isEndless(chapterId) then
+
+	if AdvCommon.isEndless(chapterId) then -- 无尽模式判断
+
 		if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节
 		if not isOpenEndless(role) then return end
+
 		if role.dailyData:getProperty("advElC") >= role:getAdvElLimit() then return 2 end -- 是否有体力
-		if not role:isFuncOpen(FuncOpenType.AdvEndless) or not role:isFuncOpen(FuncOpenType.AdvRelay) then return 11 end -- 开放了中继模式 和 无尽模式 才可以玩儿无尽模式
-		local maxl = math.floor(role:getProperty("advElM") / 10) * 10
-		local openLayer = {}
-		for i = 0, (globalCsv.adv_endless_open_relay - 1) do
-			local l = maxl - i * globalCsv.adv_can_out_layer_pre
-			if l < 0 then
-				break
-			end
-			openLayer[l] = 1
-		end
-		if not openLayer[layer - 1] then return 10 end
+		if not role:isFuncOpen(FuncOpenType.AdvEndless) then return 11 end -- 无尽模式 才可以玩儿无尽模式
+
+		local advElM = role:getProperty("advElM")  --最高通关的层数
 		if layer == 1 then
 			if not role:advChapterIsOpen(chapterId, layer) then return 13 end
+		else
+			local relayData = role:getAdvData():isHaveRelay(layer, chapterId) 
+			if not relayData then return end  -- 不是中继层
+			if advElM < relayData.unlockfloor then return end --未解锁
 		end
-	else
+	else   -- 普通模式判断
 		if role.dailyData:getProperty("advC") >= role:getAdvHangLimit() then return 2 end -- 是否有体力
 		if layer > chapterData.limitlevel  then return 4 end
 		-- 关卡开放判断
 		if not role:advChapterIsOpen(chapterId, layer) then return 5 end
-		--中继开放判断
-		if layer ~= 1 and (not role:isFuncOpen(FuncOpenType.AdvRelay) or (advPass[chapterId] or 0) < (layer - 1)) then return 6 end
+		-- 普通模式没有中继 只能从1 开始 中继开放判断
+		if layer ~= 1 then return 6 end
 	end
 	if not checkFormat(role, format) then return 7 end
@@ -141,7 +137,7 @@ function _M.startAdvRpc( agent, data )
 		role.dailyData:updateProperty({field = "advC", delta = 1})
 	end
-	role:getAdvData():initByChapter(chapterId, layer)
+	role:getAdvData():initByChapter(chapterId, layer, false, false, layer ~= 1, true)
 	role:checkTaskEnter("AdvStart", {id = chapterId})
 	role:checkTaskEnter("AdvStartSelf", {id = chapterId})
 	SendPacket(actionCodes.Adv_startAdvRpc, '')
@@ -241,10 +237,10 @@ function _M.buyAdvCountRpc(agent , data)
 	local isEl = msg.isEl -- 是否是无尽模式
 	local cost
 	if isEl then
-		if math.illegalNum(count, 1, math.min(globalCsv.adv_endless_daily_buy_count - role.dailyData:getProperty("advElBC"), role.dailyData:getProperty("advElC"))) then return end
+		if math.illegalNum(count, 1, globalCsv.adv_endless_daily_buy_count - role.dailyData:getProperty("advElBC")) then return end
 		cost = {[ItemId.Diamond] = count * globalCsv.adv_endless_daily_buy_cost}
 	else
-		if math.illegalNum(count, 1, math.min(globalCsv.adv_daily_buy_count - role.dailyData:getProperty("advBC"), role.dailyData:getProperty("advC"))) then return end
+		if math.illegalNum(count, 1, globalCsv.adv_daily_buy_count - role.dailyData:getProperty("advBC")) then return end
 		cost = {[ItemId.Diamond] = count * globalCsv.adv_daily_buy_cost}
 	end
@@ -31,6 +31,7 @@ function Adv:initByInfo(advInfo)
 	self.level = advInfo.level or 1
 	self.round = advInfo.round or 0
 	self.score = advInfo.score or {}
+	self.isRelay = advInfo.isRelay
 	self.lastEnemyId = advInfo.lastEId or 1
 	self.mapStack = advInfo.mstack or {}
 	self.lchoose = advInfo.lch or {}
@@ -45,9 +46,23 @@ function Adv:initByInfo(advInfo)
 	self:initBattle()
 end
+-- 找出level 是否存在中继层
+function Adv:isHaveRelay(level, chapterId)
+	level = chapterId or self.level
+	chapterId = chapterId or self.chapterId
+	if level == 1 then return end
+	
+	local campsiteCsv = csvdb["adv_chapter_campsiteCsv"][chapterId]
+	for _, campsite in ipairs(campsiteCsv) do
+		if campsite.floor == level then
+			return campsite
+		end
+	end
+	return nil
+end
 -- 随机新的地图
-function Adv:initByChapter(chapterId, level, isToNext, notNotify)
+function Adv:initByChapter(chapterId, level, isToNext, notNotify, isRelay, isEnter)
 	if not self.chapterId then -- 开始新的章节
 		self.chapterId = chapterId
 		self:checkAchievement(Adv.AchievType.StartBattle, 1)
@@ -65,9 +80,33 @@ function Adv:initByChapter(chapterId, level, isToNext, notNotify)
 	self.shopStatus = self.shopStatus or {}
 	-- 随机出地图
-	local mapId = self:randomMapId(chapterId, level)
+	local mapId 
+	if isRelay then
+		local relayData = self:isHaveRelay(level, chapterId)
+		if relayData then 
+			mapId = relayData.map
+		else
+			isRelay = false
+			mapId = self:randomMapId(chapterId, level)
+		end
+	else
+		mapId = self:randomMapId(chapterId, level)
+	end
+	self.isRelay = isRelay
+	local isNewRelay = false
+	if self.isRelay then -- 中继层
+		local advRelay = self.owner:getProperty("advRelay")
+		local chapter = self:isEndless() and -1 or self.chapterId
+		if not (advRelay[chapter] or {})[self.level] then
+			isNewRelay = true
+			advRelay[chapter] = advRelay[chapter] or {}
+			advRelay[chapter][self.level] = 1
+			self.owner:updateProperty({field = advRelay, value = advRelay})
+		end
+	end
+
 	self.maps = {}
-	self.maps[1] = AdvMap.new(self, 1, mapId)
+	self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay)
 	self:initBattle()
@@ -95,6 +134,7 @@ function Adv:clear()
 	self.maps = {}
 	self.battle = nil
 	self.waitArtifact = nil
+	self.isRelay = nil
 	self.cacheUnlock = {}
 	self.shopStatus = {}
 end
@@ -128,6 +168,7 @@ function Adv:saveDB(notNotify)
 		advInfo.level = self.level
 		advInfo.round = self.round
 		advInfo.score = self.score
+		advInfo.isRelay = self.isRelay
 		advInfo.lastEId = self.lastEnemyId
 		advInfo.mstack = self.mapStack
 		advInfo.lch = self.lchoose
@@ -586,14 +627,12 @@ local function clickOut(self, room, block, params)
 					self.owner:changeUpdates({{type = "advPass", field = self.chapterId, value = self.level}})
 				end
 			end
-			if params.relay then
-				if self.level % globalCsv.adv_can_out_layer_pre ~= 0  or not self.owner:isFuncOpen(FuncOpenType.AdvRelay) then return end
-			end
-			
+
 			self:checkAchievement(Adv.AchievType.OverWin, 1, self.level)
 			self:checkAdvUnlock(2, self.level)
 			local levellimit = csvdb["adv_chapterCsv"][self.chapterId].limitlevel
-			if params.relay or (not self:isEndless() and (self.level >= levellimit or not self.owner:advChapterIsOpen(self.chapterId, self.level + 1))) then --关卡结束
+
+			if not self:isEndless() and (self.level >= levellimit or not self.owner:advChapterIsOpen(self.chapterId, self.level + 1)) then --关卡结束
 				self:over(true, not self:isEndless() and self.level >= levellimit)
 			else
 				self.battle.player:triggerPassive(Passive.DOWN_LAYER)
@@ -601,7 +640,12 @@ local function clickOut(self, room, block, params)
 				if curFloorData then
 					self:backReward(self:award({[ItemId.AdvPoint] = curFloorData.exp}))
 				end
-				self:initByChapter(self.chapterId, self.level + 1, true, true)
+				local isHaveRelay = self:isHaveRelay(self.level)
+				if isHaveRelay and not self.isRelay then 
+					self:initByChapter(self.chapterId, self.level, true, true, true, false)
+				else
+					self:initByChapter(self.chapterId, self.level + 1, true, true, false, false)
+				end
 				self:backNext() --下一关
 			end
@@ -611,6 +655,11 @@ local function clickOut(self, room, block, params)
 	end
 end
+local function clickExit(self, room, block, params)
+	self:over(true, not self:isEndless() and self.level >= levellimit)
+	return true
+end
+
 --战斗 普通攻击
 local function clickMonster(self, room, block, params)
 	self.battle:battleBegin(room.roomId, block.blockId, params)
@@ -937,6 +986,8 @@ end
 local eventCallFunc = {
 	[AdvEventType.Out] = clickOut,
+	[AdvEventType.InOut] = clickOut,
+	[AdvEventType.Exit] = clickExit,
 	[AdvEventType.BOSS] = clickMonster,
 	[AdvEventType.Monster] = clickMonster,
 	[AdvEventType.Choose] = clickChoose,
@@ -991,7 +1042,7 @@ function Adv:clickBlock(roomId, blockId, params)
 	end
 	local needChange = true
 	if clickEvent and block.event then
-		if block:getEventType() == AdvEventType.Out then
+		if block:getEventType() == AdvEventType.Out or block:getEventType() == AdvEventType.InOut or block:getEventType() == AdvEventType.Exit then
 			needChange = false
 		end
 	end
@@ -63,6 +63,10 @@ function Battle:initPlayer()
 		player = {}
 		player.level = 1
+		if self.adv.level ~= 1 then
+			local relayData = self.adv:isHaveRelay()
+			player.level = relayData.level
+		end
 		player.exp = 0
 		player.sp = getAdvLvAttrUp(advAddAttrs, "sp", 100)
 		player.growth = {}
@@ -89,6 +93,7 @@ function Battle:initPlayer()
 			end
 			player[attrName] = getAdvLvAttrUp(advAddAttrs, attrName, player[attrName])
 			player.growth[attrName] = player[attrName] * 0.025
+			player[attrName] = player[attrName] + player.growth[attrName] * (player.level - 1)
 		end
 		player.hpMax = player.hp or 0
@@ -8,10 +8,10 @@ local Map = class(&quot;AdvMap&quot;)
 local createMap, getEventLib
-function Map:ctor(adv, mapIdx, mapInfo)
+function Map:ctor(adv, mapIdx, mapInfo, isEnter, isNewRelay)
 	self.adv = adv
 	if type(mapInfo) == "number" then -- mapInfo 传入 id
-		mapInfo = createMap(self, mapInfo)  -- 生成地图
+		mapInfo = createMap(self, mapInfo, isEnter, isNewRelay)  -- 生成地图
 	end
 	if not mapInfo then return end
@@ -217,7 +217,8 @@ end
 -----------------------------随机地图-----------------------------
-createMap = function(self, mapId)
+-- isEnter isNewRelay 区分中继层的类型   --是否是开始进入  是否是第一次进入
+createMap = function(self, mapId, isEnter, isNewRelay)
 	local mapInfo = {}
 	mapInfo.rooms = {}
 	mapInfo.mapId = mapId
@@ -260,6 +261,18 @@ createMap = function(self, mapId)
 		randomFunc[AdvEventType.In] = function()end
 		--出口
 		randomFunc[AdvEventType.Out] = function() end
+		--中继点出口
+		randomFunc[AdvEventType.Exit] = function() 
+			if not self.adv.isRelay or isEnter then return false end
+		end
+		--开放出口
+		randomFunc[AdvEventType.InOut] = function() end
+
+		--开放出口
+		randomFunc[AdvEventType.Diner] = function() 
+			if not self.adv.isRelay or isEnter or isNewRelay then return false end
+		end
+
 		--boss
 		randomFunc[AdvEventType.BOSS] = function()
 			if haveBoss then return false end
@@ -294,9 +307,15 @@ createMap = function(self, mapId)
 		--掉落点
 		randomFunc[AdvEventType.Drop] = randomCommon
 		--交易所
-		randomFunc[AdvEventType.Trader] = randomCommon
+		randomFunc[AdvEventType.Trader] = function()
+			if self.adv.isRelay and isNewRelay then return false end
+			return randomCommon()
+		end
 		--建筑
-		randomFunc[AdvEventType.Build] = randomCommon
+		randomFunc[AdvEventType.Build] = function()
+			if self.adv.isRelay and isEnter then return false end
+			return randomCommon()
+		end
 		--陷阱
 		randomFunc[AdvEventType.Trap] = randomCommon
 		--点击生效
@@ -15,19 +15,22 @@ function Room:ctor(map, roomId, csvData, info, isPath)
 	self.blocks = {}
 	self:loadBlocks(csvData, info)
-	
 end
 function Room:loadBlocks(csvData, info)
 	for blockId, _ in pairs(csvData["blocks"]) do
 		self.blocks[blockId] = Block.new(self, blockId, info.event[blockId], info.open == 1 or info.open[blockId], info.trap[blockId])
+		if self.map.adv.isRelay then  -- 中继层全部开放
+			self.blocks[blockId].isOpen = true
+			self.blocks[blockId]:randomEvent()
+		end
 		if not self.isPath and self.blocks[blockId]:isBoss() then
 			self.isBossRoom = true 
 		end
 		if self.blocks[blockId].isOpen then
 			self.isShow = true
 		else
-			if self.blocks[blockId]:getEventType() == AdvEventType.In then -- 开放
+			if self.blocks[blockId]:getEventType() == AdvEventType.In or self.blocks[blockId]:getEventType() == AdvEventType.InOut then -- 开放
 				self.isShow = true
 				self.blocks[blockId].isOpen = true
 				--入口房间只会在这里首次展示开放 --触发固有技
@@ -48,7 +48,11 @@ function Daily:refreshDailyData(notify)
 	redisproxy:del(FRIEND_POINT:format(self.owner:getProperty("id")))
 	local dataMap = {}
 	for field, schema in pairs(self.schema) do
-		if field ~= "key" then
+		if field == "advC" or field == "advElC" then
+			if self:getProperty("field") > 0 then
+				dataMap[field] = 0
+			end
+		elseif field ~= "key" then
 			local typ, def = table.unpack(schema)
 			dataMap[field] = def
 		end
@@ -75,6 +75,7 @@ Role.schema = {
 	advStoryB			= {"table", {}}, -- 冒险故事完成记录 （连锁事件绑定的故事） -- {storyId = 1}
 	advShop				= {"table", {}}, -- 冒险內的商店限制购买次数记录 {goodId = count}
 	advEAchiev			= {"table", {}}, -- 冒险无尽冒险手册
+	advRelay			= {"table", {}}, -- 冒险中继点记录  {[chapter] = {[level] = 1}, [-1] = {[level] = 1}}  -- -1 无尽 方便重置
 	--挂机相关
 	hangPass 			= {"table", {}}, -- 挂机通过的最大关卡
@@ -257,6 +258,7 @@ function Role:data()
 		advAchiev = self:getProperty("advAchiev"),
 		advL = self:getProperty("advL"),
 		advElM = self:getProperty("advElM"),
+		advElS = self:getProperty("advElS"),
 		advElChapter = self.advElChapter,
 		advOverTime = self.advOverTime,
 		advAFGet = self:getProperty("advAFGet"),
@@ -776,11 +776,10 @@ function RolePlugin.bind(Role)
 		--  重置一下冒险
 		local nowSeason = tonum(redisproxy:hget("adv_season", "idx"))
 		if self:getProperty("advElS") ~= nowSeason then
-			local ml = self:getProperty("advElM")
-
-			local nl = math.max(0, ml - (math.floor(ml / 50) + 2) * 10)
-			self:setProperty("advElM", math.floor(nl / 10) * 10)
-			self:setProperty("advElS", nowSeason)
+			-- 胡博文让注释掉 衰减 从0开始
+			-- local ml = self:getProperty("advElM")
+			-- local nl = math.max(0, ml - (math.floor(ml / 50) + 2) * 10)
+			-- self:setProperty("advElM", math.floor(nl / 10) * 10)
 			-- 正在无尽冒险清掉
 			local adv = self:getAdvData()
@@ -801,6 +800,8 @@ function RolePlugin.bind(Role)
 			-- 清掉冒险手册
 			self:updateProperties({
 				advEAchiev = {},
+				advElM = 0,
+				advElS = nowSeason,
 			}, notNotify)
 		end
 	end