计算电波塔层数的加成效果

chenyueqi
1 parent 03c619fb
Showing 3 changed files with 49 additions and 12 deletions Show diff stats
src/actions/GmAction.lua
src/actions/TowerAction.lua
src/models/RolePlugin.lua
@@ -483,13 +483,25 @@ function _M.advit(role, pms)
 end
  
  
-table.insert(helpDes, {"爬塔到指定层", "tower", "层数"})
+table.insert(helpDes, {"爬塔到指定层", "tower", "塔id", "层数"})
 function _M.tower(role, pms)
-	local level = tonum(pms.pm1, 1)
-	if not csvdb["tower_battleCsv"][level] then return  "不存在" end
-	role:updateProperty({field = "towerInfo", value = {c = globalCsv.tower_count_limit, l = level}})
-
-	role:mylog("gm_action", {desc = "tower", int1 = level, key1 = pms.sender})
+	local tType = tonum(pms.pm1, 1)
+	local level = tonum(pms.pm2, 1)
+	local layer = (tType - 1) * 10000 + level
+	if not csvdb["tower_battleCsv"][tType][level] then return  "不存在" end
+	local values = role:getProperty("towerInfo")
+	if tType == 1 then
+		values.l = level
+	elseif tType == 2 then
+		values.l1 = level
+	elseif tType == 3 then
+		values.l2 = level
+	elseif tType == 4 then
+		values.l3 = level
+	end
+	role:updateProperty({field = "towerInfo", value = values})
+
+	role:mylog("gm_action", {desc = "tower", int1 = tType, int2 = layer, key1 = pms.sender})
  
 	return "成功"
 end
@@ -185,7 +185,7 @@ function _M.activeTowerBonusRpc(agent, data)
 	local tType = msg.tower
 	local id = msg.id
  
-	local bnousCsv = csvdb["tower_bnousCsv"]
+	local bnousCsv = csvdb["tower_battle_additionCsv"]
  
 	if not tType or not id or not bnousCsv[tType] then return 0 end
 	local bnousData = bnousCsv[tType][id]
@@ -2168,15 +2168,40 @@ function RolePlugin.bind(Role)
 		local towerInfo = role:getProperty("towerInfo")
 		local towerLevel = {towerInfo.l or 1, towerInfo.l1 or 10001, towerInfo.l2 or 20001, towerInfo.l3 or 30001}
 		local towerBnous = self:getProperty("towerBnous")
-		local bnousCsv = csvdb["tower_bnousCsv"]
+		local bnousCsv = csvdb["tower_battle_additionCsv"]
 		self.towerBnousActive = {}
-		for towerIdx, Set in ipairs(towerLevel) do
-			for id, data in pairs(Set) do
-				if (towerLevel[towerIdx] - 1) >= data.level then
-					self.towerBnousActive[data.type] = (self.towerBnousActive[data.type] or 0) + data.value
+
+		for towerIdx, Set in pairs(towerBnous) do
+			for id, _ in pairs(Set) do
+				local data = bnousCsv[towerIdx][id]
+				local effects = data.effect:toTableArray(true)
+				for _, effect in pairs(effects) do
+					local pm1, pm2 = effect[1], effect[2]
+					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],effect[3])
+					elseif pm1 == SystemBnousType.Adv then
+						if not self.towerBnousActive[pm1][effect[4]] then
+							self.towerBnousActive[pm1][effect[4]] = {}
+						end
+						self.towerBnousActive[pm1][effect[4]][pm2] = (self.towerBnousActive[pm1][effect[4]][pm2] or 0) + effect[3]
+					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) + effect[3]
+					end
 				end
 			end
 		end
+
 		return self.towerBnousActive
 	end