Merge branch 'tr/bugfix' into tr/publish/release

* tr/bugfix: 计算英雄战斗力，天赋，信赖错误的多队挂机电台任务英雄也不能重用冒险次数取消特权卡餐厅加速获得额外道具功能 # Conflicts: # src/csvdata

Merge branch 'tr/bugfix' into tr/publish/release
* tr/bugfix: 计算英雄战斗力，天赋，信赖错误的多队挂机电台任务英雄也不能重用冒险次数取消特权卡餐厅加速获得额外道具功能 # Conflicts: # src/csvdata
zhouhaihai
2 parents 1791bbc5 b021e351
Showing 4 changed files with 45 additions and 42 deletions Show diff stats
src/actions/AdvAction.lua
src/actions/DinerAction.lua
src/adv/Adv.lua
src/models/HeroPlugin.lua
@@ -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
@@ -102,6 +111,8 @@ function _M.startAdvRpc( agent, data )
  
 	local advPass = role:getProperty("advPass")
  
+	if not checkFormat(role) then return 7 end
+
 	if AdvCommon.isEndless(chapterId) then -- 无尽模式判断
  
 		if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节
@@ -118,37 +129,23 @@ function _M.startAdvRpc( agent, data )
 			if not relayData then return 14 end  -- 不是中继层
 			if advElM < relayData.unlockfloor then return 15 end --未解锁
 		end 
+
+		role.dailyData:updateProperty({field = "advElC", delta = 1})
 	else   -- 普通模式判断
-		if not role:checkAdvCount(chapterData.limitlevel) then return 2 end -- 是否有体力
 		if layer >= chapterData.limitlevel  then return 4 end
-		-- 关卡开放判断
-		if not role:advChapterIsOpen(chapterId) then return 5 end
  
+		local relayData = role:getAdvData():isHaveRelay(layer, chapterId, true) 
+		if not relayData then return 6 end  -- 不是中继层
 		if layer ~= 1 then
-			local relayData = role:getAdvData():isHaveRelay(layer, chapterId) 
-			if not relayData then return 6 end  -- 不是中继层
 			if (advPass[chapterId] or 0) < relayData.floor then return 21 end
 		end
-	end
-	
-	if not checkFormat(role) then return 7 end
-
-	--local advTeam = role:getProperty("advTeam")
-	--table.clear(advTeam)
+		if not role:checkAdvCount(relayData.supply) then return 2 end -- 是否有体力
+		-- 关卡开放判断
+		if not role:advChapterIsOpen(chapterId) then return 5 end
  
-	--advTeam.heros = {}
-	--for slot, heroId in pairs(format.heros) do
-	--	advTeam.heros[slot] = heroId
-	--end
-	--advTeam.leader = format.leader
-	--advTeam.leader2 = format.leader2
-	--role:updateProperty({field = "advTeam", value = advTeam})
-	if AdvCommon.isEndless(chapterId) then
-		role.dailyData:updateProperty({field = "advElC", delta = 1})
-	else
-		role:changeAdvCount(chapterData.limitlevel)
+		role:changeAdvCount(relayData.supply)
 	end
-
+	
 	local support = {}  -- 支援效果
 	if AdvCommon.isEndless(chapterId) then
 		-- 选择的支援效果
@@ -168,6 +165,7 @@ function _M.startAdvRpc( agent, data )
 			end
 		end
 	end
+
 	role:getAdvData():initByChapter({
 		chapterId = chapterId, 
 		level = layer, 
@@ -175,6 +173,7 @@ function _M.startAdvRpc( agent, data )
 		isEnter = true, 
 		support = support,
 	})
+	
 	role:checkTaskEnter("AdvStart", {id = chapterId})
 	role:checkTaskEnter("AdvStartSelf", {id = chapterId})
 	role:getAdvData():popBackEvents() -- 清一下事件
@@ -236,7 +235,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 = {}
@@ -305,7 +305,7 @@ function _M.expediteSellRpc( agent, data )
 	local gift = reward:toNumMap()
  
 	-- 特权卡获取加速获得额外道具
-	local coef = role.storeData:getProduceItemSpeedCoef()
+	local coef = 1 --role.storeData:getProduceItemSpeedCoef()
 	for k, v in pairs(gift) do
 		if coef > 1 then
 			v = math.floor(v * coef)
@@ -61,10 +61,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
@@ -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