挂机加成

zhouhaihai
1 parent 9250904b
Showing 1 changed file with 93 additions and 7 deletions Show diff stats
src/actions/AdvAction.lua
@@ -89,6 +89,9 @@ function _M.startAdvRpc( agent, data )
  
 	--上一个关卡结束才可以开始新的关卡
 	if role:getAdvData():isRunning() then return 8 end
+	local advHang = role:getProperty("advHang")
+	if advHang[chapterId] then return 9 end --正在挂机
+
  
 	local chapterData = csvdb["adv_chapterCsv"][chapterId]
 	if not chapterData or layer < 1 then return  1 end
@@ -176,7 +179,51 @@ function _M.startAdvRpc( agent, data )
 	SendPacket(actionCodes.Adv_startAdvRpc, '')
 	return true
 end
+function Role:getAdvTeamAttrs(team)
+	local activeRelation = self:getHeroActiveRelation(team.heros)
  
+	local player = {hp = 0, atk = 0, def = 0, hit = 0, miss = 0,
+					growth = {hp = 0, atk = 0, def = 0, hit = 0, miss = 0}}
+
+	for slot, id in pairs(team.heros or {}) do
+		local info = {}
+		local hero = self.heros[id]
+		if not hero then
+			Logger.log("error heroid " .. id)
+		end
+		local attrs = hero:getTotalAttrs({activeRelation = activeRelation})
+
+		for attrName, _ in pairs(AdvAttsEnum) do
+			player[attrName] = (player[attrName] or 0) + (attrs[attrName] or 0)
+		end
+	end
+	for attrName, _ in pairs(AdvAttsEnum) do
+		player[attrName] = player[attrName] * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
+		player.growth[attrName] = player[attrName] * (globalCsv.adv_battle_attr_growth_ratio[attrName] or 1)
+	end
+	
+	return player
+end
+
+---战斗力=1*生命+2*攻击+1.25*防御+0.226*命中+0.26*闪避
+function Role:getAdvTeamBattleV(attrs)
+	local attrs = role:getTeamBattleInfo(advTeam).heros
+
+
+		for attrName, _ in pairs(AdvAttsEnum) do
+			for _, hero in pairs(attrs) do
+				player[attrName] = (player[attrName] or 0) + hero[attrName]
+			end
+			player[attrName] = getAdvLvAttrUp(advAddAttrs, attrName, player[attrName]) * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
+			player.growth[attrName] = player[attrName] * (globalCsv.adv_battle_attr_growth_ratio[attrName] or 1)
+			player[attrName] = player[attrName] + player.growth[attrName] * (player.level - 1)
+		end
+	return 1 * attrs[AttsEnum.hp]
+			+ 2 * attrs[AttsEnum.atk]
+			+ 1.25 * attrs[AttsEnum.def]
+			+ 0.226 * attrs[AttsEnum.hit]
+			+ 0.26 * attrs[AttsEnum.miss]
+end
  
 function _M.startHangRpc(agent, data)
 	local role = agent.role
@@ -186,24 +233,39 @@ function _M.startHangRpc(agent, data)
  
 	local chapterData = csvdb["adv_chapterCsv"][chapterId]
 	if not chapterData then return end
+	if chapterData.idleReward == "" then return end --没有奖励 没有挂机
  
 	local advHang = role:getProperty("advHang")
 	if advHang[chapterId] then return end --正在挂机
  
 	if role:getAdvData():isRunning() and role:getAdvData().chapterId == chapterId then return end
  
-	local advPass = role:getProperty("advPass")
-	if AdvCommon.isEndless(chapterId) or advPass[chapterId] ~= chapterData.limitlevel then return end -- 没有全通关
+	if AdvCommon.isEndless(chapterId) then return end -- 无尽没有代理
+
+	local advRelay = self.owner:getProperty("advRelay") 
+	if not next(advRelay[chapterId] or {}) then return end -- 没有开放
+
  
 	if role.dailyData:getProperty("advC") >= role:getAdvHangLimit() then return end -- 是否有体力
  
 	if not checkFormat(role, format, role:getAdvData():isRunning()) then return end --编队是否正确
  
-	local battleV = 0
-	for _, heroId in pairs(format.heros) do
-		local hero = role.heros[heroId]
-		battleV = battleV + hero:getProperty("battleV")
+	local player = {}
+	local attrs = role:getTeamBattleInfo(format).heros
+	for attrName, _ in pairs(AdvAttsEnum) do
+		for _, hero in pairs(attrs) do
+			player[attrName] = (player[attrName] or 0) + hero[attrName]
+		end
+		player[attrName] = player[attrName] * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
+		player.growth[attrName] = player[attrName] * (globalCsv.adv_battle_attr_growth_ratio[attrName] or 1)
 	end
+
+	local battleV = 1 * player["hp"]
+		+ 2 * player["atk"]
+		+ 1.25 * player["def"]
+		+ 0.226 * player["hit"]
+		+ 0.26 * player["miss"]
+
 	if battleV < chapterData.idleValue then return end -- 战斗力是否满足
  
 	local info = {}
@@ -276,7 +338,31 @@ function _M.endHangRpc(agent, data)
  
 	local reward, isFull
 	if skynet.timex() >= info.time then
-		reward = role:award(chapterData.idleReward, {log = {desc = "advHang", int1 = chapterId}})
+		-- 英雄加成
+		local idleUnit = chapterData.idleUnit:toNumMap()
+		local upUnit = 0
+		for slot, heroId in pairs(info.format or {}) do
+			if idleUnit[heroId] then
+				upUnit = upUnit + idleUnit[heroId]
+			end
+		end
+		-- 中继加成
+		local advPass = role:getProperty("advPass")
+		local maxCampsite = nil
+		local campsiteCsv = csvdb["adv_chapter_campsiteCsv"][chapterId]
+		for _, campsite in ipairs(campsiteCsv) do
+			if campsite.floor <= advPass[chapterId] then
+				maxCampsite = campsite
+			end
+		end
+
+		if not maxCampsite then return end
+
+		local idleReward = chapterData.idleReward:toNumMap()
+		for itemId, count in pairs(idleReward) do
+			idleReward[itemId] = count * (maxCampsite.idleValue + upUnit) / 100
+		end
+		reward = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
 	else
 		if cancel then
 			if role.dailyData:getProperty("advC") <= 0 then