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

熊润斐
2 parents 696ddd64 f854f3a3
Showing 4 changed files with 34 additions and 31 deletions Show diff stats
src/actions/AdvAction.lua
src/actions/HangAction.lua
src/models/Diner.lua
src/models/RolePlugin.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
@@ -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})
@@ -193,10 +193,6 @@ function Diner:calSellReward(sell, delta, dishData, isExpedite)
 	local addReward = {}
 	for key, value in pairs(dishData.item_normal:toNumMap()) do
 		addReward[key] = (addReward[key] or 0) + value * delta
-		if key == ItemId.Gold then
-			local goldPriceAdd = self.owner:getBnousDiner(4,value)
-			addReward[key] = addReward[key] + goldPriceAdd * delta
-		end
 	end
 	popular = dishData.famous_normal * delta
@@ -234,10 +230,16 @@ function Diner:calSellReward(sell, delta, dishData, isExpedite)
 	end
 	upValue[-1] = (upValue[-1] or 0) + collectAdd
+	-- 电波塔加成
+	local goldCount = self.owner:getBnousDiner(4,addReward[ItemId.Gold])
+
 	for id, count in pairs(addReward) do
 		addReward[id] = math.floor(count * (1 + (upValue[id] or 0) / 100))
 		reward = reward:incrv(id, addReward[id])
 	end
+
+	reward = reward:incrv(ItemId.Gold, goldCount)
+
 	popular = math.floor(popular * (1 + (upValue[-1] or 0) / 100))
 	return reward, popular
@@ -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