天赋升级修改，增加英雄信赖

liuzujun
1 parent 50bcef87
Showing 5 changed files with 95 additions and 86 deletions Show diff stats
src/actions/AdvAction.lua
src/actions/HeroAction.lua
src/csvdata
src/models/Hero.lua
src/models/HeroPlugin.lua
@@ -266,6 +266,16 @@ function _M.startHangRpc(agent, data)
 	return true
 end
+local function addHeroFaith(role, heroId, exp)
+	local hero = role.heros[heroId]
+	if not hero then
+		return
+	end
+
+	hero:addHeroFaith(exp)
+	return hero:getProperty("faith")
+end
+
 function _M.quickHangRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -333,7 +343,7 @@ function _M.endHangRpc(agent, data)
 	end
 	adv_idle_time = adv_idle_time * 60
-	local reward, isFull, change
+	local reward, isFull, change, heroFaithMap
 	if skynet.timex() >= info.time then
 		-- 最新需求加成取消
 		--[[
@@ -362,6 +372,14 @@ function _M.endHangRpc(agent, data)
 		if not maxCampsite then return end
 		]]
+		-- 增加英雄信赖
+		local exp = info.duration / 60
+		heroFaithMap = {}
+		for _, heroId in pairs(info.format.heros) do
+			local curFaith = addHeroFaith(role, heroId, exp)
+			heroFaithMap[heroId] = curFaith
+		end
+
 		local totalReward = campSiteData.idleReward_1 .. " " .. campSiteData.idleReward_2
 		local idleReward = totalReward:toNumMap()
@@ -389,7 +407,7 @@ function _M.endHangRpc(agent, data)
 	role:checkTaskEnter("AdvHang", {})
-	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull}))
+	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull, heroFaith = heroFaithMap}))
 	return true
 end
@@ -143,74 +143,45 @@ function _M.talentRpc(agent, data)
 	local hero = role.heros[msg.id]
 	if not hero then return 1 end
-	local index = msg.index -- 第几个天赋
-	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 heroCfgId = hero:getProperty("type")
 	local curStage = talent:getv(0, 1)
-	local curData = csvdb["unit_talentCsv"][curStage]
-	if not curData then return 4 end
+	local curLevel = talent:getv(1, 1)
+	local curData = csvdb["unit_talent_"..heroCfgId.."Csv"][curStage]
+	if not curData then return 1 end
 	local oldSkillLv = hero:getSkillLevel(1)
 	local cost = {}
-	if index == 0 then
-		--是否进阶
-		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)
-			for i = 1, 4 do
-				talent = talent:setv(i, 0)
-			end
-		else
-			return 12
-		end
+	if curLevel == #curData then
+		talent = talent:setv(0, curStage + 1)
+		talent = talent:setv(1, 1)
 	else
-		
-		local level = talent:getv(index, 0)
-		if level >= #curData then return 5 end
+		if curLevel > #curData then return 2 end
-		local talentData = curData[level]
-		if not talentData then return end
+		local talentData = curData[curLevel]
+		if not talentData then return 3 end
-		if talentData.lvRequire > hero:getProperty("level") then return 6 end
+		if talentData.lvRequire > hero:getProperty("level") then return 4 end
 		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
+		if not role:checkItemEnough(cost) then return 5 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})
+		talent = talent:setv(1, curLevel + 1)
 	end
+	curStage = talent:getv(0, 1)
+	role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = curStage})
 	hero:updateProperty({field = "talent", value = talent})
 	role:log("hero_talent", {
 		hero_id = hero:getProperty("type"), --英雄ID
-		hero_talent_id = index, --天赋ID
+		hero_talent_id = curStage, --天赋ID
 		hero_talent_cost = cost, -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		hero_talent_levelbef = oldSkillLv, -- 英雄技能升级前等级
 		hero_talent_level = hero:getSkillLevel(1), -- 英雄技能升级后等级
 	})
-	hero:mylog({desc = "talent", int1 = index, int2 = talent:getv(index, 0)})
+	hero:mylog({desc = "talent", int1 = talent:getv(0, 1), int2 = talent:getv(1, 1)})
 	SendPacket(actionCodes.Hero_talentRpc, '')
 	return true
@@ -641,6 +612,7 @@ function _M.getResetRewardRpc(agent, data)
 	local level = hero:getProperty("level")
 	local breakL = hero:getProperty("breakL")
 	local talent = hero:getProperty("talent")
+	local heroCfgId = hero:getProperty("type")
 	local tmpLevel = level
 	if level <= 1 and talent == "" then return end
@@ -669,32 +641,18 @@ function _M.getResetRewardRpc(agent, data)
 	end
 	local stage = talent:getv(0, 1)
-	local tlevel = {talent:getv(1, 0), talent:getv(2, 0), talent:getv(3, 0), talent:getv(4, 0)}
+	local curTalentLvl = talent:getv(1, 1)
+	--local tlevel = {talent:getv(1, 0), talent:getv(2, 0), talent:getv(3, 0), talent:getv(4, 0)}
-	local talentCostIds = globalCsv.unit_talent_cost[csvdb["unitCsv"][hero:getProperty("type")].camp]
 	while stage > 0 do
-		local curData = csvdb["unit_talentCsv"][stage]
-		for level = math.max(table.unpack(tlevel)), 1, -1 do
-			local add = 0
-			for i = 1, 4 do
-				if tlevel[i] == level then
-					add = add + 1
-					tlevel[i] = tlevel[i] - 1
-				end
-			end
-			local talentData = curData[level - 1]
+		local curData = csvdb["unit_talent_"..heroCfgId.."Csv"][stage]
+		for lvl = 1, curTalentLvl - 1 do
+			local talentData = curData[lvl]
 			for itemId, count in pairs(talentData.money:toNumMap()) do
-				reward[itemId] = (reward[itemId] or 0) + count * add
-			end
-			for idx , count in pairs(talentData.cost:toNumMap()) do
-				reward[talentCostIds[idx]] = (reward[talentCostIds[idx]] or 0) + count * add
+				reward[itemId] = (reward[itemId] or 0) + count
 			end
 		end
 		stage = stage - 1
-		curData = csvdb["unit_talentCsv"][stage]
-		if curData then
-			tlevel = {#curData, #curData, #curData, #curData}
-		end
 	end
 	local equip = hero:getProperty("equip")
-Subproject commit 02a9bbbb10bb99a91cc5d67f62dc7e5b49d8cb46
+Subproject commit 0f60ee4ca695995942574454c696747a4390ee5d
@@ -15,6 +15,7 @@ Hero.schema = {
 	-- loveL		= {"number", 0},		--好感度等级
 	equip       = {"string",""},        --装备 type=level
 	rune       = {"string",""},        --零件 type=id
+	faith	   = {"number", 0},			-- 信赖
 }
 function Hero:ctor( properties )
@@ -102,6 +103,7 @@ function Hero:data()
 		-- loveL = self:getProperty("loveL"),
 		equip = self:getProperty("equip"),
 		rune = self:getProperty("rune"),
+		faith = self:getProperty("faith")
 	}
 end
@@ -48,34 +48,44 @@ function HeroPlugin.bind(Hero)
 		local breakL = params.breakL or self:getProperty("breakL")
 		local wakeL = params.wakeL or self:getProperty("wakeL")
 		local talent = params.talent or self:getProperty("talent")
-
+		local heroCfgId = self:getProperty("type")
 		--天赋
 		local talentAttrS = {}
 		-- 四个基础属性
 		local curData = csvdb["unit_talentCsv"][talent:getv(0, 1)]
+		local curTalentLvl = 0
 		if not curData then -- 已经满阶段了
-			curData = csvdb["unit_talentCsv"][#csvdb["unit_talentCsv"]]
-			local strength = curData[#curData].strength
-			for i = 1, 4 do
-				talentAttrS[TalentAttsEnumEx[i]] = (talentAttrS[TalentAttsEnumEx[i]] or 0) + strength
-			end
+			local cfgName = "unit_talent_"..heroCfgId.."Csv"
+			curData = csvdb[cfgName][#csvdb[cfgName]]
 		else
-			for i = 1, 4 do --4个天赋
-				talentAttrS[TalentAttsEnumEx[i]] = (talentAttrS[TalentAttsEnumEx[i]] or 0) + curData[talent:getv(i, 0)].strength
-			end
+			curTalentLvl = talent:getv(1, 1)
 		end
-		--阶段属性
-		for i = 1, (talent:getv(0, 1) - 1) do
-			local curData = csvdb["unit_talentCsv"][i]
-			local effect = curData[#curData].effect:toArray(true, "=")
-			talentAttrS[AttsEnumEx[effect[1]]] = (talentAttrS[AttsEnumEx[effect[1]]] or 0) + effect[2]
+		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
+					end
+				end
+			end
 		end
-
 		for _, attrName in pairs(AttsEnumEx) do
 			if talentAttrS[attrName] then
-				talentAttrS[attrName] = addAttr(unitData[attrName], talentAttrS[attrName], 1, attrName)
+				talentAttrS[attrName] = addAttr(unitData[attrName], talentAttrS[attrName], 0, attrName)
+			end
+		end
+
+		-- 信赖属性
+		local faithAttr = {}
+		local faith = self:getProperty("faith")
+		local faithConfig = csvdb["unit_trustCsv"]
+		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]
 			end
 		end
@@ -90,7 +100,7 @@ function HeroPlugin.bind(Hero)
 		for attr, value in pairs(attrs) do
 			attrs[attr] = attrs[attr] + addAttr(attrs[attr], lData[attr .. "Level"], 1, attr)
 			attrs[attr] = attrs[attr] + addAttr(attrs[attr], blData[attr .. "Level"], 1, attr)
-			attrs[attr] = attrs[attr] + addAttr(attrs[attr], wData[attr .. "Level"], 1, attr) + (talentAttrS[attr] or 0)
+			attrs[attr] = attrs[attr] + addAttr(attrs[attr], wData[attr .. "Level"], 1, attr) + (talentAttrS[attr] or 0) + (faithAttr[attr] or 0)
 		end
 		return attrs
@@ -296,6 +306,27 @@ function HeroPlugin.bind(Hero)
 	    end
 	    return
 	end
+
+	-- 添加英雄信赖
+	function Hero:addHeroFaith(exp)
+		local faith = self:getProperty("faith")
+		local config = csvdb["unit_trustCsv"]
+		local star = self:getProperty("wakeL")
+		local tmpExp = faith + exp
+		for lvl = 1, #config do
+			if star < config[lvl].star then
+				break
+			end
+			if tmpExp < config[lvl].exp then
+				faith = tmpExp
+				break
+			else
+				faith = config[lvl].exp
+			end
+		end
+		self:setProperty("faith", faith)
+	end
+
 end