去除advmap monster类型

测试
2 parents 493a8b1f 1c1ea691
Showing 7 changed files with 58 additions and 31 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/StoreAction.lua
src/adv/Adv.lua
src/csvdata
src/models/HeroPlugin.lua
src/preload.lua
@@ -612,7 +612,10 @@ function _M.endBattleRpc(agent, data)
 	local isWin = msg.isWin
 	local heros = msg.heros
 	local support = msg.support
-	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then
+		SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({}))
+		return true
+	end
  
 	if not role.__actBattleCache then return 2 end
  
@@ -1179,14 +1182,13 @@ function _M.battleCommandRpc(agent, data)
 				local flag = string.char(string.getbit(record, i))
 				if flag == "0" then
 					record = string.setbit(record, i)
+					local awd = cfg[rewardKey]
+					for k, v in pairs(awd:toNumMap()) do
+						award[k] = (award[k] or 0) + v
+					end
 				end
-				record = string.setbit(record, i)
 				actData[typeKey] = record
  
-				local awd = cfg[rewardKey]
-				for k, v in pairs(awd:toNumMap()) do
-					award[k] = (award[k] or 0) + v
-				end
 			end
 		end
 	else
@@ -57,6 +57,15 @@ local function checkFormat(role, format, checkAdvTeam)
 		end
 	end
  
+	-- 多队挂机 电台任务英雄也不能重用
+	local radioTask = role:getProperty("radioTask")
+	for id, taskInfo in pairs(radioTask) do
+		local heros = taskInfo["heros"] or {}
+		for _, heroId in ipairs(heros) do
+			hadHero[heroId] = true
+		end
+	end
+
 	if not format.leader then return end
 	if format.leader2 == format.leader then return end
 	local hadLeader = false
@@ -158,7 +167,7 @@ function _M.startAdvRpc( agent, data )
 	else   -- 普通模式判断
 		if layer >= chapterData.limitlevel  then return 4 end
  
-		local relayData = role:getAdvData():isHaveRelay(layer, chapterId) 
+		local relayData = role:getAdvData():isHaveRelay(layer, chapterId, true) 
 		if not relayData then return 6 end  -- 不是中继层
 		if layer ~= 1 then
 			if (advPass[chapterId] or 0) < relayData.floor then return 21 end
@@ -227,8 +236,10 @@ function _M.startHangRpc(agent, data)
 		actCfg = actCfg[chapterId]
 		if not actCfg then return 22 end
  
-		local st = toUnixtime(actCfg["unlockTime"]..string_format("%02x", RESET_TIME))
-		if st > skynet.timex() then return 23 end
+		if actCfg["unlockTime"] ~= 0 then
+			local st = toUnixtime(actCfg["unlockTime"]..string_format("%02x", RESET_TIME))
+			if st > skynet.timex() then return 23 end
+		end
  
 		if actCfg["prepose"] ~= "" then
 			local type, cid = actCfg["prepose"]:toArray(true, "=")
@@ -292,7 +303,8 @@ function _M.startHangRpc(agent, data)
 		+ 0.226 * player["hit"]
 		+ 0.26 * player["miss"]
  
-	if battleV < campSiteData.idleValue then return 9 end -- 战斗力是否满足
+	--print(math.ceil(battleV), campSiteData.idleValue)
+	if math.ceil(battleV) < campSiteData.idleValue then return 9 end -- 战斗力是否满足
  
 	local info = {}
 	info.format = {}
@@ -232,6 +232,13 @@ function _M.getFreeChestRpc(agent, data)
 	local config = csvdb["shop_rechargeCsv"][id]
 	if not config then return end
  
+	--判断是否是活动商品
+	if config.activity_id ~= 0 then
+		local actCfg = csvdb["activity_ctrlCsv"][config.activity_id]
+		if not actCfg then return 2 end
+		if not role.activity:isOpenById(config.activity_id, "ActShopGoods") then return 3 end
+	end
+
     local rechargeRecord = role.storeData:getProperty("payR")
 	local getCount = (rechargeRecord[id] or 0)
 	if getCount >= config.limit then
@@ -62,10 +62,10 @@ function Adv:initByInfo(advInfo)
 	self:initBattle(advInfo)
 end
 -- 找出level 是否存在中继层
-function Adv:isHaveRelay(level, chapterId)
+function Adv:isHaveRelay(level, chapterId, force)
 	level = level or self.level
 	chapterId = chapterId or self.chapterId
-	if level == 1 then return end
+	if level == 1 and not force then return end
  
 	local campsiteCsv = csvdb["adv_chapter_campsiteCsv"][chapterId]
 	for _, campsite in ipairs(campsiteCsv) do
@@ -815,7 +815,8 @@ function Adv:over(success, rewardRatio, overType)
 			if not actCfg then break end
 			actCfg = actCfg[self.chapterId]
 			if not actCfg then break end
-			itemId, scoreCoef = actCfg["transform"]:toArray(true, "=")
+			local arr = actCfg["transform"]:toArray(true, "=")
+			itemId, scoreCoef = arr[1], arr[2]
 			local actData = self.owner.activity:getActData("AdvLevel")
  
 			-- 计算活动积分up
@@ -830,6 +831,7 @@ function Adv:over(success, rewardRatio, overType)
 			score = math.floor(score * (1 + upVal / 100))
  
 			local advInfo = actData[self.chapterId] or {}
+			--print("upVal", upVal, score, advInfo["max"], itemId, scoreCoef)
 			local maxScore = advInfo["max"] or 0
 			local flag = false
 			if success then
@@ -955,6 +957,7 @@ function Adv:over(success, rewardRatio, overType)
 	})
  
 	local chapterId = self.chapterId
+	local actid = self.actid
 	self:clear()
 	self.owner:checkTaskEnter("AdvScore", {score = score})
  
@@ -973,7 +976,7 @@ function Adv:over(success, rewardRatio, overType)
 		scoreAward = scoreReward,
 		chapterId = chapterId,
 		backAdvCount = backAdvCount,
-		actid = self.actid
+		actid = actid
 	})
 end
  
-Subproject commit 6c4fe16bc9b0ea28206200e893ebf0f4bf11de9b
+Subproject commit 9d6f538d3e33bbfa8568be9a8aabbc0e6f09d5b9
@@ -53,22 +53,25 @@ function HeroPlugin.bind(Hero)
 		local talentAttrS = {}
  
 		-- 四个基础属性
-		local curData = csvdb["unit_talentCsv"][talent:getv(0, 1)]
-		local curTalentLvl = 0
-		if not curData then -- 已经满阶段了
-			local cfgName = "unit_talent_"..heroCfgId.."Csv"
-			curData = csvdb[cfgName][#csvdb[cfgName]]
-		else
-			curTalentLvl = talent:getv(1, 1)
-		end
-		for lvl, cfg in pairs(curData) do
-			if lvl < curTalentLvl or curTalentLvl == 0 then
-				if cfg.effect ~= 99 then
-					local curVal = talentAttrS[cfg.effect] or 0
-					if curVal < cfg.strength then
-						talentAttrS[cfg.effect] = cfg.strength
+		local cfgName = "unit_talent_"..heroCfgId.."Csv"
+		local curRank = talent:getv(0, 1)
+		local curLv = talent:getv(1,1) - 1
+		for i, value in ipairs(csvdb[cfgName]) do
+			if i <= curRank then
+				for lv, cfg in ipairs(value) do
+					if i < curRank or lv <= curLv then
+						if cfg.effect ~= 99 then
+							if not talentAttrS[cfg.effect] then
+								talentAttrS[AttsEnumEx[cfg.effect]] = 0
+							end
+							talentAttrS[AttsEnumEx[cfg.effect]] = cfg.strength
+						end
+					else
+						break
 					end
 				end
+			else
+				break
 			end
 		end
  
@@ -85,7 +88,7 @@ function HeroPlugin.bind(Hero)
 		for lvl = 1, #faithConfig do
 			if faith >= faithConfig[lvl].exp then
 				local add = faithConfig[lvl]["position_"..unitData.position]:toArray(true, "=")
-				faithAttr[add[1]] = (faithAttr[add[1]] or 0) + add[2]
+				faithAttr[AttsEnumEx[add[1]]] = (faithAttr[AttsEnumEx[add[1]]] or 0) + add[2]
 			end
 		end
 		for _, attrName in pairs(AttsEnumEx) do
@@ -2,5 +2,5 @@
 local skynet = require "skynet"
  
 skynet.timex = function ()
-	return math.floor(skynet.time())
+	return math.floor(skynet.time()) + 1900772 + 7 * DAY_SEC
 end
 \ No newline at end of file