Merge branch 'develop' into player

zhouhaihai
2 parents d1aa92e4 aa5cbb54
Showing 21 changed files with 227 additions and 157 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/AdvAction.lua
src/actions/DinerAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/PvpAction.lua
src/actions/StoreAction.lua
src/adv/Adv.lua
src/adv/AdvBlock.lua
src/adv/AdvMap.lua
src/adv/AdvRoom.lua
src/models/Daily.lua
src/models/Diner.lua
src/models/Hero.lua
src/models/HeroPlugin.lua
src/models/RoleCross.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
@@ -110,7 +110,8 @@ ItemId = {
 	DinerSpTask = 20, -- 餐厅任务采购券
 	LoveBreak = 21, --好感度突破道具
 	PvpKey = 22, -- pvp钥匙
-	LunchFragment = 23, 
+	LunchFragment = 23,
+	RuneFragment = 24,
 	HeroFC = {700, 701, 702, 703},  --通用角色碎片
 	AdvKey = 80, -- 冒险钥匙
 	BoxKey = 60, -- 拆解工具
@@ -129,6 +130,11 @@ TimeReset = {
 	DailyBattle3 = 16, -- 特殊-每日副本（时钟箱）
 }
  
+GuideStep = {
+	AdvGuide = 1010,
+	AdvRelay = 1012,
+}
+
 --客户端不需要知道这个
 AdvSpecialStage = {
 	[1]= "In",
@@ -178,7 +184,7 @@ AdvBackEventType = {
 	Dead = 11, --怪死亡
 	Trader = 12, -- 召唤商人
 	Monster = 13, -- 召唤怪物
-
+	RelayReward = 14, -- 中级层奖励
  
 	Cost = 16, -- 消耗道具
 	Trap = 17, --陷阱
@@ -69,7 +69,7 @@ actionCodes = {
 	Hero_levelUpRpc = 203,
 	Hero_breakRpc = 204,
 	Hero_wakeRpc = 205,
-	Hero_skillUpRpc = 206,
+
 	Hero_talentRpc = 207,
 	Hero_likeHeroRpc = 208,
 	Hero_commentHeroRpc = 209,
@@ -350,15 +350,22 @@ function _M.clickBlockRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
  
-	if not isCanContinue(role) then return end
+	local function returnFail(status)
+		SendPacket(actionCodes.Adv_clickBlockRpc, MsgPack.pack({events = {}}))
+		return true or status -- 调试使用 status
+	end
+
+	if not isCanContinue(role) then
+		return returnFail()
+	end
 	local adv = role:getAdvData()
  
-	if adv:isWaitChooseArtifact() then return end
+	if adv:isWaitChooseArtifact() then return returnFail() end
  
 	adv:log({desc = "clickBlock", int1 = msg.roomId, int2 = msg.blockId})
  
 	local status, errorCode = adv:clickBlock(msg.roomId, msg.blockId, msg)
-	if not status then return errorCode end
+	if not status then return returnFail(errorCode) end
  
 	SendPacket(actionCodes.Adv_clickBlockRpc, MsgPack.pack({events = adv:popBackEvents()}))
 	return true
@@ -636,10 +643,10 @@ function _M.wheelSurfRpc(agent, data)
 	local drawData = drawTypeData[role:getAdvWheelSurfLv(ptype)]
 	if not drawData then return 4 end
  
-	local costs = drawData.cost:toNumMap()
-	for id, count_ in pairs(costs) do
-		costs[id] = count_ * count
-	end
+	local cost = drawData.cost:toArray(true, "=")
+	local costs = {[ItemId.OldCoin] = cost[ctype]}
+	if not next(costs) then return 6 end
+
  
 	if not role:checkItemEnough(costs) then return 5 end
 	role:costItems(costs, {log = {desc = "advWheelSurf", int1 = ptype}})
@@ -648,10 +655,10 @@ function _M.wheelSurfRpc(agent, data)
 	advDrawB[ptype] = (advDrawB[ptype] or 0) + count
 	role:updateProperty({field = "advDrawB", value = advDrawB})
 	-- 随机池子
-	local pool = drawData.weight:randWeight()
 	local reward = {}
 	local backReward = {}
 	for i = 1, count do
+		local pool = drawData.weight:randWeight()
 		local gift = drawData["pool" .. pool]:randWeight(true)
 		reward[gift[1]] = (reward[gift[1]] or 0) + gift[2]
 		table.insert(backReward, gift)
@@ -565,8 +565,17 @@ function _M.refreshTaskRpc( agent, data )
 	end
  
 	local pool = {}
+
+	local dishTree = role.dinerData:getProperty("dishTree")
 	for id, temp in pairs(taskData) do
-		if not hadTask[id] then
+		local unlock = true
+		for _, front in ipairs(temp.front:toArray(true, "=")) do
+			if dishTree:getv(front, 0) == 0 then
+				unlock = false
+				break
+			end
+		end
+		if not hadTask[id] and unlock then
 			table.insert(pool, temp)
 		end
 	end
@@ -354,16 +354,16 @@ function _M.adv(role, pms)
 	local chapterId = tonum(pms.pm1)
 	local layer = tonum(pms.pm2)
  
-	local advData = csvdb["adv_chapterCsv"][chapterId]
-	if not advData then return end
+	local advCsv = csvdb["adv_chapterCsv"][chapterId]
+	if not advCsv then return end
 	if math.floor(chapterId / 100) ~= 2 then
-		layer = math.min(layer, advData.limitlevel)
+		layer = math.min(layer, advCsv.limitlevel)
 	end
 	local advPass = role:getProperty("advPass")
 	local addPre 
 	addPre = function(chapterId)
-		local advData = csvdb["adv_chapterCsv"][chapterId]
-		for pre, l in ipairs(advData.prepose:toNumMap()) do
+		local advCsv = csvdb["adv_chapterCsv"][chapterId]
+		for pre, l in ipairs(advCsv.prepose:toNumMap()) do
 			if (advPass[pre] or 0) < l then
 				advPass[pre] = l
 				addPre(pre)
@@ -384,15 +384,15 @@ table.insert(helpDes, {&quot;冒险到达指定层&quot;, &quot;advt&quot;, &quot;章节id&quot;, &quot;层数&quot;})
 function _M.advt(role, pms)
 	local chapterId = tonum(pms.pm1)
 	local layer = tonum(pms.pm2)
-	local advData = csvdb["adv_chapterCsv"][chapterId]
-	if not advData then return "不存在的章节" end
+	local advCsv = csvdb["adv_chapterCsv"][chapterId]
+	if not advCsv then return "不存在的章节" end
  
 	local advData = role:getAdvData()
 	if not advData.chapterId then
 		return "先随便开启一关"
 	end
 	if not advData:isEndless() then
-		layer = math.min(layer, advData.limitlevel)
+		layer = math.min(layer, advCsv.limitlevel)
 	end
  
 	_M.adv(role, {pm1 = chapterId, pm2 = layer - 1})
@@ -89,11 +89,14 @@ function _M.startRpc( agent, data )
 	local isNew = not hangInfo.carbonId
 	hangInfo.carbonId = carbonId
 	local nowTime = skynet.timex()
-	hangInfo.coinTime = nowTime
-	hangInfo.itemTime = nowTime
 	if isNew then
+		hangInfo.coinTime = nowTime
+		hangInfo.itemTime = nowTime
 		hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max
 		hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max
+	else
+		hangInfo.coinTime = math.min(nowTime, hangInfo.endCoinTime)
+		hangInfo.itemTime = math.min(nowTime, hangInfo.endItemTime)
 	end
 	if not hangPass[carbonId] then
 		hangInfo.bossTime = nowTime + carbonData.idle_time
@@ -444,8 +447,6 @@ function _M.startBonusBattleRpc(agent, data)
 	local bonusC = role.dailyData:getProperty("bonusC")
 	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
 	if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 4 end
-	bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1
-	role.dailyData:updateProperty({field = "bonusC", value = bonusC})
  
  
 	role.__bonusBattleCache = {
@@ -469,6 +470,13 @@ function _M.endBonusBattleRpc(agent, data)
  
 	local reward
  	if starNum and starNum > 0 then
+ 		-- 胜利扣除次数
+ 		local bonusC = role.dailyData:getProperty("bonusC")
+		bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
+		if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 3 end
+		bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1
+		role.dailyData:updateProperty({field = "bonusC", value = bonusC})
+
  		reward = role:award(bonusData.reward, {log = {desc = "bonusBattle", int1 = id}})
  		role:checkTaskEnter("BonusPass", {id = id})
  	end
@@ -72,24 +72,8 @@ function _M.wakeRpc(agent, data)
 		return 4
 	end
  
-	local skills = {}
-	for _,v in pairs(wakeData.skill:toArray(true,"=") ) do
-		local skillSet = hero:getSkillData(v)
-		if skillSet and next(skillSet) then
-			local skillLv = hero:getSkillLevel(v)+1
-			local skillData = skillSet[skillLv]
-			if skillData and next(skillData) then
-				skills[v] = skillLv
-			else
-				return 5
-			end
-		end
-	end
-
 	role:costItems(cost, {log = {desc = "heroWake", int1 = msg.id, int2 = hero:getProperty("type")}})
-	for k,v in pairs(skills) do
-		hero:updateProperty({field = "skillL", value = hero:getProperty("skillL"):setv(k, v)})
-	end
+
 	hero:updateProperty({field = "wakeL", delta = 1})
  
 	local curLevel = hero:getProperty("wakeL")
@@ -104,22 +88,6 @@ function _M.wakeRpc(agent, data)
 	return true
 end
  
--- 已取消技能升级功能，觉醒时自动升级技能
-function _M.skillUpRpc(agent, data)
-	local role = agent.role
-	local msg = MsgPack.unpack(data)
-	local index = msg.skillIdx -- 第几个技能 -- 1  2  3
-	local hero = role.heros[msg.id]
-	if not hero then return end
-	local curLevel = hero:getSkillLevel(index)
-	if hero:getLSPoint() <= 0 or curLevel >= #hero:getSkillData(index) then return end
-	hero:updateProperty({field = "skillL", value = hero:getProperty("skillL"):setv(index, curLevel + 1)})
-
-	hero:log({desc = "skillUp", int1 = index, int2 = curLevel + 1})
-
-	SendPacket(actionCodes.Hero_skillUpRpc, '')
-	return true
-end
  
 function _M.talentRpc(agent, data)
 	local role = agent.role
@@ -128,52 +96,62 @@ function _M.talentRpc(agent, data)
 	if not hero then return 1 end
  
 	local index = msg.index -- 第几个天赋
-	local need = {[1] = 1, [2] = 1, [3] = 1, [4] = 1}
+	local need = {[0] = 1, [1] = 1, [2] = 1, [3] = 1, [4] = 1}
 	if not need[index] then return 2 end
  
 	local talent = hero:getProperty("talent")
 	local curStage = talent:getv(0, 1)
-	if curStage > csvdb["unit_breakCsv"][hero:getProperty("breakL")].talent then return 3 end
-
 	local curData = csvdb["unit_talentCsv"][curStage]
 	if not curData then return 4 end
  
-	local level = talent:getv(index, 0)
-	if level >= #curData then return 5 end
-
-	local talentData = curData[level]
-	if not talentData then return end
-	local cost = talentData.money:toNumMap()
-	local cost2 = talentData.cost:toNumMap()
-	for k,v in pairs(cost2) do
-		cost[globalCsv.unit_talent_cost[csvdb["unitCsv"][hero:getProperty("type")].camp][k]] = v
-	end
-	if not role:checkItemEnough(cost) then return 6 end
-	role:costItems(cost, {log = {desc = "heroTalent", int1 = msg.id, int2 = hero:getProperty("type")}})
-	talent = talent:incrv(index, 1)
-
-	--是否进阶
-	local max = true
-	for i = 1, 4 do
-		if talent:getv(i, 0) < #curData then
-			max = false
-			break
-		end
-	end
-	if max then
-		talent = talent:setv(0, curStage + 1)
+	if index == 0 then
+		if not csvdb["unit_talentCsv"][curStage + 1] then return 11 end
+		--是否进阶
+		local max = true
 		for i = 1, 4 do
-			talent = talent:setv(i, 0)
+			if talent:getv(i, 0) < #curData then
+				max = false
+				break
+			end
 		end
+		if max then
+			talent = talent:setv(0, curStage + 1)
+			for i = 1, 4 do
+				talent = talent:setv(i, 0)
+			end
+		else
+			return 12
+		end
+	else
+		
+		local level = talent:getv(index, 0)
+		if level >= #curData then return 5 end
+
+		local talentData = curData[level]
+		if not talentData then return end
+
+		if talentData.lvRequire > hero:getProperty("level") then return 6 end
+
+		local cost = talentData.money:toNumMap()
+		local cost2 = talentData.cost:toNumMap()
+		for k,v in pairs(cost2) do
+			cost[globalCsv.unit_talent_cost[csvdb["unitCsv"][hero:getProperty("type")].camp][k]] = v
+		end
+		if not role:checkItemEnough(cost) then return 6 end
+		role:costItems(cost, {log = {desc = "heroTalent", int1 = msg.id, int2 = hero:getProperty("type")}})
+		talent = talent:incrv(index, 1)
+
+
+		local aheadLevel = 0
+		for i = 1, talent:getv(0, 1) - 1 do
+			aheadLevel = aheadLevel + #csvdb["unit_talentCsv"][i]
+		end
+		aheadLevel = aheadLevel + talent:getv(index, 0)
+
+		role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = aheadLevel})
 	end
-	hero:updateProperty({field = "talent", value = talent})
-	local aheadLevel = 0
-	for i = 1, talent:getv(0, 1) - 1 do
-		aheadLevel = aheadLevel + #csvdb["unit_talentCsv"][i]
-	end
-	aheadLevel = aheadLevel + talent:getv(index, 0)
  
-	role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = aheadLevel})
+	hero:updateProperty({field = "talent", value = talent})
  
 	hero:log({desc = "talent", int1 = index, int2 = talent:getv(index, 0)})
  
@@ -181,6 +159,7 @@ function _M.talentRpc(agent, data)
 	return true
 end
  
+
 -- 暂时没有这个功能
 function _M.likeHeroRpc(agent, data)
 	local role = agent.role
@@ -817,7 +817,7 @@ function _M.highDivisionGiftRpc(agent, data)
 	local role = agent.role
 	local roleId = role:getProperty("id")
  
-	local pvpHGTime = self:getProperty("pvpHGTime")
+	local pvpHGTime = role:getProperty("pvpHGTime")
 	if pvpHGTime == 0 then return end
 	local score = role:unpackPvpScore(redisproxy:zscore(role:getPvpDBKey(RANK_PVP_HIGHT), roleId))
  
@@ -833,7 +833,7 @@ function _M.highDivisionGiftRpc(agent, data)
 	local newTime, newReward = role:calculatePvpHGift(divisionId)
 	if not next(newReward) then return end
  
-	self:updateProperties({
+	role:updateProperties({
 		pvpHGTime = newTime,
 		pvpHGift = {},
 	})
@@ -28,7 +28,7 @@ function _M.rechargeRpc(agent , data)
 	local rmb = dataSet.rmb
 	role:updateProperty({field = "rmbC", delta = rmb})
  
-	role:log("role_action", {desc = "recharge", int1 = id})
+	role:log("role_action", {desc = "recharge", int1 = id, int2 = rmb})
  
 	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({diamond = diamondCount}))
 	return true
@@ -49,14 +49,10 @@ function _M.dailyBuyRpc(agent , data)
 	if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (dailySDC[id] or 0))) then return 1 end
  
 	local cost = dataSet.cost
-	if dataSet.type == 0 then
-		local dailySDD = role.dailyData:getProperty("dailySDD")
-		if dailySDD[id] then -- 折扣
-			cost = math.ceil(cost * (1 - dataSet.disount / 100))
-		end
-	elseif dataSet.type == 1 then
-	else
-		return 3 
+
+	local dailySDD = role.dailyData:getProperty("dailySDD")
+	if dailySDD[id] then -- 折扣
+		cost = math.ceil(cost * (1 - dataSet.disount / 100))
 	end
  
 	if not role:costDiamond({count = cost * count, log = {desc = "dailyShop", int1 = id, int2 = count}}) then
@@ -67,7 +63,11 @@ function _M.dailyBuyRpc(agent , data)
 		dailySDC[id] = (dailySDC[id] or 0) + count
 		role.dailyData:updateProperty({field = "dailySDC", value = dailySDC})
 	end
-	local reward = role:award(dataSet.gift, {log = {desc = "dailyShop", int1 = id, int2 = count}})
+	local gift = {}
+	for itemId, count_ in pairs(dataSet.gift:toNumMap()) do
+		gift[itemId] = count_ * count
+	end
+	local reward = role:award(gift, {log = {desc = "dailyShop", int1 = id, int2 = count}})
  
 	role:log("role_action", {desc = "dailyShop", int1 = id, int2 = count})
  
@@ -111,6 +111,11 @@ function Adv:initByChapter(chapterId, level, isToNext, notNotify, isRelay, isEnt
 	else
 		mapId = self:randomMapId(chapterId, level)
 	end
+
+	if isEnter and not self.owner:checkOverGuide(GuideStep.AdvGuide) then
+		mapId = 101
+	end
+
 	self.isRelay = isRelay
 	local isNewRelay = false
 	if self.isRelay then -- 中继层
@@ -120,7 +125,7 @@ function Adv:initByChapter(chapterId, level, isToNext, notNotify, isRelay, isEnt
 			isNewRelay = true
 			advRelay[chapter] = advRelay[chapter] or {}
 			advRelay[chapter][self.level] = 1
-			self.owner:updateProperty({field = advRelay, value = advRelay})
+			self.owner:updateProperty({field = "advRelay", value = advRelay})
 		end
 	end
  
@@ -454,8 +459,9 @@ function Adv:awardArtifact(id, params)
 	else
 		print("awardArtifact no log ", debug.traceback())
 	end
-
-	self:pushBackEvent(AdvBackEventType.Artifact, {id = id})
+	if not params.isChoose then
+		self:pushBackEvent(AdvBackEventType.Artifact, {id = id})
+	end
 end
  
  
@@ -645,7 +651,7 @@ end
  
 function Adv:chooseArtifact(index)
 	if not self.waitArtifact or not self.waitArtifact[index] then return end
-	self:award({[self.waitArtifact[index]] = 1}, {log = {desc = "chooseArtifact"}})
+	self:award({[self.waitArtifact[index]] = 1}, {log = {desc = "chooseArtifact"}, isChoose = true})
  
 	self:log({desc = "chooseArtifact", int1 = self.waitArtifact[index]})
  
@@ -882,8 +888,13 @@ function Adv:cost(item, params, check)
 end
  
 --事件点击处理
-local function clickOut(self, room, block, params)
+local function clickOut(self, room, block, params, isExit)
 	if self:getCurMap():checkOver() then --检查是否可以出去了
+		if isExit then
+			self:over(true)
+			return true
+		end
+
 		if #self.mapStack > 1 then -- 处于夹层中
 			table.remove(self.mapStack) --退出夹层
 			self:backLayer(-1)
@@ -937,8 +948,7 @@ local function clickOut(self, room, block, params)
 end
  
 local function clickExit(self, room, block, params)
-	self:over(true)
-	return true
+	return clickOut(self, room, block, params, true)
 end
  
 --战斗 普通攻击
@@ -1351,8 +1361,14 @@ function Adv:clickBlock(roomId, blockId, params)
 	end
  
 	if not block.isOpen then
-		if checkAroundBlocks() then --开放
+		if self.isRelay or checkAroundBlocks() then --开放
 			self:getCurMap():openBlock(roomId, blockId, true, true)
+			if self.isRelay and self:getCurMap():isAllOpen() then  -- 发放翻开的奖励
+				local relayData = self:isHaveRelay()
+				if relayData and relayData.award ~= "" then
+					self:pushBackEvent(AdvBackEventType.RelayReward, {items = self:award(relayData.award:toNumMap(), {log = {desc = "relayReward"}})})
+				end
+			end
 			status = true
 		end
 	else
@@ -158,6 +158,8 @@ function Block:randomEvent()
 		for _, buffId in ipairs(buffs) do
 			adv.battle.player:addBuff(buffId)
 		end
+
+		local backTrap = true
 		if data.target == 1 then-- 给所有敌人同样增加buff
 			local enemys = adv.battle.player:getTeam(2)
 			for k , enemy in ipairs(enemys) do
@@ -165,7 +167,11 @@ function Block:randomEvent()
 					enemy:addBuff(buffId)
 				end
 			end
+		elseif data.target == 2 then -- 翻开房间
+			self.room.map.adv:getCurMap():openBlocksByRoom(self.room.roomId)
+			backTrap = false
 		end
+
 		if data.specialEff ~= "" then
 			local effect = data.specialEff:toArray(true, "=")
 			if effect[1] == 1 then
@@ -174,7 +180,9 @@ function Block:randomEvent()
 		end
  
 		adv:checkAchievement(adv.AchievType.Trap, 1, self.event.id)
-		adv:backTrap()
+		if backTrap then
+			adv:backTrap()
+		end
 		self:clear()
 	end
  
@@ -19,17 +19,17 @@ function Map:ctor(adv, mapIdx, mapInfo, isEnter, isNewRelay)
 	self.mapId = mapInfo.mapId
 	self.isShow = mapInfo.isShow  -- 是否全部展示 -- 客户端用
 	self.rooms = {}
-	self:loadRooms(mapInfo.rooms)
+	self:loadRooms(mapInfo.rooms, isNewRelay)
 end
  
-function Map:loadRooms(rooms)
+function Map:loadRooms(rooms, isNewRelay)
 	local mapData = csvdb["map_" .. csvdb["mapCsv"][self.mapId]["path"] .. "Csv"]
 	for roomId, roomName in pairs(mapData["rooms"]) do
 		if roomName == "path" then
-			self.rooms[roomId] = Room.new(self, roomId, mapData["path"], rooms[roomId], true)
+			self.rooms[roomId] = Room.new(self, roomId, mapData["path"], rooms[roomId], true, isNewRelay)
 		else
 			roomName = roomName:gsub("/", "_")
-			self.rooms[roomId] = Room.new(self, roomId, csvdb["room_" .. roomName .. "Csv"], rooms[roomId], false)
+			self.rooms[roomId] = Room.new(self, roomId, csvdb["room_" .. roomName .. "Csv"], rooms[roomId], false, isNewRelay)
 		end
 	end 
 end
@@ -55,6 +55,17 @@ function Map:showMap()
 	self.isShow = true
 end
  
+function Map:isAllOpen()
+	for roomId, room in pairs(self.rooms) do
+		for blockId, block in pairs(room.blocks) do
+			if not block.isOpen then
+				return false
+			end
+		end
+	end
+	return true
+end
+
 --结束本层的时候调用
 function Map:checkOver()
 	local mapCsv = csvdb["mapCsv"][self.mapId]
@@ -65,6 +76,8 @@ function Map:checkOver()
 		if #self.adv.battle.player:getTeam(2) == 0 then return true end
 	elseif mapCsv.clearType == 3 then -- 持有
 		if self.adv:cost(mapCsv.clear:toNumMap(), {}, true) then return true end
+	elseif mapCsv.clearType == 4 then
+		return self:isAllOpen()
 	else
 		return true
 	end
@@ -279,13 +292,13 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 		randomFunc[AdvEventType.In] = function()end
 		--出口
 		randomFunc[AdvEventType.Out] = function() 
-			if not self.adv:isEndless() and isNewRelay then
+			if not self.adv:isEndless() and self.adv.isRelay and not self.adv.owner:checkOverGuide(GuideStep.AdvRelay) then
 				return false
 			end
 		end
 		--中继点出口
 		randomFunc[AdvEventType.Exit] = function() 
-			if not self.adv.isRelay or isEnter then return false end
+			if not self.adv.isRelay or self.adv.owner:checkOverGuide(GuideStep.AdvRelay) then return false end
 		end
 		--开放出口
 		randomFunc[AdvEventType.InOut] = function() end
@@ -390,6 +403,8 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 	if self.adv.isRelay and isNewRelay then
 		local relayData = self.adv:isHaveRelay()
 		if relayData then
+
+			-- choose
 			local choose = relayData.choose:toArray(true, "=")
 			local lastCount = stagePool["global"][AdvCodeRandomStage] and #stagePool["global"][AdvCodeRandomStage] or 0
 			for _, chooseId in pairs(choose) do
@@ -403,6 +418,22 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 				lastCount = lastCount - 1
 				stagePool[cur["room"]][AdvCodeRandomStage][cur["block"]] = nil
 			end
+
+			-- 掉落
+			local drop = relayData.drop:toNumMap()
+			for dropId, dropCount in pairs(drop) do
+				for i = 1, dropCount do
+					if lastCount <= 0 then break end
+					local idx = math.randomInt(1, lastCount)
+					local cur = stagePool["global"][AdvCodeRandomStage][idx]
+
+					giveEvent(cur["room"], cur["block"], AdvEventType.Drop, dropId)
+
+					table.remove(stagePool["global"][AdvCodeRandomStage], idx)
+					lastCount = lastCount - 1
+					stagePool[cur["room"]][AdvCodeRandomStage][cur["block"]] = nil
+				end
+			end
 		end
 	end
  
@@ -5,7 +5,7 @@ local Block = require &quot;adv.AdvBlock&quot;
 local Passive = require "adv.AdvPassive"
  
 local Room = class("AdvRoom")
-function Room:ctor(map, roomId, csvData, info, isPath)
+function Room:ctor(map, roomId, csvData, info, isPath, isNewRelay)
 	self.map = map
 	self.roomId = roomId
 	self.col, self.row = AdvCommon.getCrById(self.roomId)
@@ -15,10 +15,10 @@ function Room:ctor(map, roomId, csvData, info, isPath)
 	self.battleAfterCall = {}
  
 	self.blocks = {}
-	self:loadBlocks(csvData, info)
+	self:loadBlocks(csvData, info, isNewRelay)
 end
  
-function Room:loadBlocks(csvData, info)
+function Room:loadBlocks(csvData, info, isNewRelay)
 	local isFirstOpen = false
 	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])
@@ -38,7 +38,7 @@ function Room:loadBlocks(csvData, info)
 		end
 	end
 	--中继层全部开放   boss 房间 开启所有的地块
-	if  self.map.adv.isRelay or (self.isBossRoom and self.isShow and isFirstOpen) then
+	if  (self.map.adv.isRelay and not isNewRelay) or (self.isBossRoom and self.isShow and isFirstOpen) then
 		table.insert(self.battleAfterCall, function()
 			for _, block in pairs(self.blocks) do
 				self:openBlock(block)
@@ -64,7 +64,7 @@ function Daily:refreshDailyData(notify)
 	local dailySDD = {}
 	local sddPool = {}
 	for id, data in pairs(csvdb["shop_diamondCsv"]) do
-		if data.type == 0 and data.disount ~= 0 then
+		if data.disount ~= 0 then
 			table.insert(sddPool, id)
 		end
 	end
@@ -52,14 +52,14 @@ function Diner:refreshDailyData(notify)
 						end
 					end
 					if show then
-						table.insert(pool, id)
+						table.insert(pool, {id, data.chance})
 					end
 				end
 			end
  
 			if #pool > 0 then
-				local idx = math.randomInt(1, #pool)
-				entrust[i] = pool[idx]
+				local idx = math.randWeight(pool, 2)
+				entrust[i] = pool[idx][1]
 				change = true
 				table.remove(pool, idx)
 			end
@@ -92,8 +92,16 @@ function Diner:refreshDailyData(notify)
 	local taskData = csvdb["diner_questCsv"][taskLevel]
 	if not taskData then return end
 	local pool = {}
+	local dishTree = self:getProperty("dishTree")
 	for id, temp in pairs(taskData) do
-		if not hadTask[id] then
+		local unlock = true
+		for _, front in ipairs(temp.front:toArray(true, "=")) do
+			if dishTree:getv(front, 0) == 0 then
+				unlock = false
+				break
+			end
+		end
+		if not hadTask[id] and unlock then
 			table.insert(pool, temp)
 		end
 	end
@@ -9,7 +9,6 @@ Hero.schema = {
 	level		= {"number", 1},		-- 等级
 	breakL		= {"number", 0},		-- 突破等级
 	wakeL		= {"number", 1},		-- 觉醒等级
-	skillL		= {"string", ""},		-- 技能等级 1=1 2=1 3=1
 	talent		= {"string", ""},		-- 0=阶段 1=1 2=1 3=1 4=1 四个天赋当前阶段的等级  阶段默认为1  等级默认为0
 	battleV		= {"number", 0},		-- 保存战斗力
 	-- loveExp		= {"number", 0},		--好感度经验
@@ -97,7 +96,6 @@ function Hero:data()
 		level = self:getProperty("level"),
 		breakL = self:getProperty("breakL"),
 		wakeL = self:getProperty("wakeL"),
-		skillL = self:getProperty("skillL"),
 		talent  = self:getProperty("talent"),
 		battleV = self:getProperty("battleV"),
 		-- loveExp = self:getProperty("loveExp"),
@@ -18,24 +18,6 @@ function HeroPlugin.bind(Hero)
 		return math.min(#csvdb["unit_expCsv"], csvdb["unit_breakCsv"][self:getProperty("breakL")].levelLimit)
 	end
  
-	function Hero:getSPoint()
-		local point = 0
-		for i = 0, self:getProperty("wakeL") do
-			if csvdb["unit_wakeCsv"][i] then
-				point = point + csvdb["unit_wakeCsv"][i].sp
-			end
-		end
-		return point
-	end
-
-	function Hero:getLSPoint()
-		local point = self:getSPoint()
-		for skill, level in pairs(self:getProperty("skillL"):toNumMap()) do
-			point = point - (level - 1)
-		end
-		return point
-	end
-
 	--角色属性值 = 基础属性值（unit）* [ 1 + 升级属性（unit_exp）+ 突破属性（unit_break）] * [ 1 + 觉醒属性（unit_wake）+ 天赋属性（unit_talent）]
 	function Hero:getBaseAttrs(params)
 		params = params or {}
@@ -211,7 +193,16 @@ function HeroPlugin.bind(Hero)
  
 	-- 技能1234 对应必杀技，冒险技，被动技，战斗技
 	function Hero:getSkillLevel(idx)
-		return self:getProperty("skillL"):getv(idx, 1)
+		local level = 1
+		for wakeL = 1, self:getProperty("wakeL") do
+			local wakeData = csvdb["unit_wakeCsv"][wakeL]
+			for _, slot in ipairs(wakeData.skill:toArray(true,"=")) do
+				if slot == idx then
+					level = level + 1
+				end
+			end
+		end
+		return level
 	end
  
 	function Hero:getSkillData(idx)
@@ -308,7 +308,7 @@ function CMD.pvpHInfo(roleId)
 end
  
 -- 高级pvp 排行榜
-function CMD:pvpHRankInfo(roleId)
+function CMD.pvpHRankInfo(roleId)
 	local info = CMD.getProperties(roleId, {"name", "level", "headId", "pvpTBVH", "ltime"})
 	local info = {
 		name = info.name,
@@ -36,7 +36,7 @@ local LogType = {
  
 -- 如要修改 要提前修改 _template mapping -- 对应 mapping 为 gamelog-*
 local Mapping = {
-	-- 预留一些数据格式
+	-- 预留一些数据格式  担心integer 范围不够用 将 通用的int* 全部换为long
 	common = {
 		desc = "keyword",--索引的短字符串
 		ucode = "keyword",--关联日志对应ucode
@@ -46,15 +46,15 @@ local Mapping = {
 		text1 = "text",  --长字符串不索引的类型
 		-- 五个不同类型的数字 基本上满足数量要求 尽量从低到高用
 		short1 = "short", 
-		int1 = "integer",
-		int2 = "integer",
+		int1 = "long",
+		int2 = "long",
 		long1 = "long",
 		float1 = "float",
  
 		-- 底层使用的 一些参数
-		cint1 = "integer",
-		cint2 = "integer",
-		cint3 = "integer",
+		cint1 = "long",
+		cint2 = "long",
+		cint3 = "long",
 	}
 }
  
@@ -1372,6 +1372,15 @@ function RolePlugin.bind(Role)
 		return RANK_ADV[idx]
 	end
  
+	-- 是否需要进行引导
+	function Role:checkOverGuide(guideId)
+		local funcGuide = self:getProperty("funcGuide")
+		if funcGuide:getv(guideId, 0) > 0 then
+			return true
+		end
+		return false
+	end
+
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -98,7 +98,7 @@ function Role:calculatePvpHGift(division)
 		newTime = oldTime + times * globalCsv.pvp_high_reward_add_pre
  
 		for itemId, count in pairs(divisionData.reward:toNumMap()) do
-			newReward[itemId] = math.min((newReward[itemId] or 0) + count, divisionData.limit)
+			newReward[itemId] = math.min((newReward[itemId] or 0) + count * times, divisionData.limit)
 		end
 	end
 	return newTime, newReward