From a42130ee4ba6ad329d4de08c9c8cb558bee16441 Mon Sep 17 00:00:00 2001
From: chenyueqi <chenyueqi@qq.com>
Date: Wed, 10 Mar 2021 17:15:03 +0800
Subject: [PATCH] 电波塔加成错误

---
 src/actions/AdvAction.lua  |  6 ++----
 src/actions/HangAction.lua |  5 +++--
 src/models/RolePlugin.lua  | 44 +++++++++++++++++++++++---------------------
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/actions/AdvAction.lua b/src/actions/AdvAction.lua
index 81b98ca..b9442ee 100644
--- a/src/actions/AdvAction.lua
+++ b/src/actions/AdvAction.lua
@@ -276,8 +276,7 @@ function _M.startHangRpc(agent, data)
 	if not adv_idle_time or not adv_idle_energy or not adv_idle_reward_coef then
 		return 2
 	end
-	local timeAdd = role:getBnousHangTime()
-	adv_idle_time = adv_idle_time * 60 + timeAdd
+	adv_idle_time = adv_idle_time * 60
 
 
 	local advHang = role:getProperty("advHang")
@@ -418,8 +417,7 @@ function _M.endHangRpc(agent, data)
 	if not adv_idle_time or not adv_idle_energy or not adv_idle_reward_coef then
 		return 2
 	end
-	local timeAdd = role:getBnousHangTime()
-	adv_idle_time = adv_idle_time * 60 + timeAdd
+	adv_idle_time = adv_idle_time * 60
 	
 	local reward, isFull, change, heroFaithMap
 	local heroCnt = 0
diff --git a/src/actions/HangAction.lua b/src/actions/HangAction.lua
index c0702d4..5700d7a 100644
--- a/src/actions/HangAction.lua
+++ b/src/actions/HangAction.lua
@@ -381,8 +381,9 @@ function _M.getRewardRpc(agent , data)
 	table.clear(items)
 	local hangInfo = role:getProperty("hangInfo")
 	local nowTime = skynet.timex()
-	hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max
-	hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max
+	local timeAdd = role:getBnousHangTime()
+	hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max + timeAdd
+	hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max + timeAdd
 	hangInfo.coinTime = nowTime
 	hangInfo.itemTime = nowTime
 	role:updateProperty({field = "hangBag", value = items})
diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua
index 0ea5787..a8835bd 100644
--- a/src/models/RolePlugin.lua
+++ b/src/models/RolePlugin.lua
@@ -2191,29 +2191,31 @@ function RolePlugin.bind(Role)
 		for towerIdx, Set in pairs(towerBnous) do
 			for id, _ in pairs(Set) do
 				local data = bnousCsv[towerIdx][id]
-				local effects = data.effect:toTableArraySec()
-				for _, effect in pairs(effects) do
-					local pm1, pm2, pm3, pm4 = tonumber(effect[1]), tonumber(effect[2]), tonumber(effect[3]), tonumber(effect[4])
-					if not self.towerBnousActive[pm1] then
-						self.towerBnousActive[pm1] = {}
-					end
-					if pm1 == SystemBnousType.TowerBuff then
-						if not self.towerBnousActive[pm1][pm2] then
-							self.towerBnousActive[pm1][pm2] = {}
-						end
-						table.insert(self.towerBnousActive[pm1][pm2],pm3)
-					elseif pm1 == SystemBnousType.Adv then
-						if not self.towerBnousActive[pm1][pm4] then
-							self.towerBnousActive[pm1][pm4] = {}
+				if data then
+					local effects = data.effect:toTableArraySec()
+					for _, effect in pairs(effects) do
+						local pm1, pm2, pm3, pm4 = tonumber(effect[1]), tonumber(effect[2]), tonumber(effect[3]), tonumber(effect[4])
+						if not self.towerBnousActive[pm1] then
+							self.towerBnousActive[pm1] = {}
 						end
-						self.towerBnousActive[pm1][pm4][pm2] = (self.towerBnousActive[pm1][pm4][pm2] or 0) + pm3
-					elseif pm1 == SystemBnousType.HangTime then
-						if type(self.towerBnousActive[pm1]) == "table" then
-							self.towerBnousActive[pm1] = 0
+						if pm1 == SystemBnousType.TowerBuff then
+							if not self.towerBnousActive[pm1][pm2] then
+								self.towerBnousActive[pm1][pm2] = {}
+							end
+							table.insert(self.towerBnousActive[pm1][pm2],pm3)
+						elseif pm1 == SystemBnousType.Adv then
+							if not self.towerBnousActive[pm1][pm4] then
+								self.towerBnousActive[pm1][pm4] = {}
+							end
+							self.towerBnousActive[pm1][pm4][pm2] = (self.towerBnousActive[pm1][pm4][pm2] or 0) + pm3
+						elseif pm1 == SystemBnousType.HangTime then
+							if type(self.towerBnousActive[pm1]) == "table" then
+								self.towerBnousActive[pm1] = 0
+							end
+							self.towerBnousActive[pm1] = self.towerBnousActive[pm1] + pm2
+						else
+							self.towerBnousActive[pm1][pm2] = (self.towerBnousActive[pm1][pm2] or 0) + pm3
 						end
-						self.towerBnousActive[pm1] = self.towerBnousActive[pm1] + pm2
-					else
-						self.towerBnousActive[pm1][pm2] = (self.towerBnousActive[pm1][pm2] or 0) + pm3
 					end
 				end
 			end
--
libgit2 0.21.2