增加~= 0 判定

zhouhaihai
1 parent 866852ff
Showing 3 changed files with 15 additions and 5 deletions Show diff stats
src/adv/Adv.lua
src/adv/AdvBlock.lua
src/adv/AdvPassive.lua
@@ -265,7 +265,9 @@ function Adv:awardRelay(relayData, notNotify)
 				local dropData = csvdb["event_dropCsv"][dropId]
 				if dropData then
 					local item = dropData["range"]:randWeight(true)
-					gift[item[1]] = (gift[item[1]] or 0) + item[2]
+					if item[1] ~= 0 then
+						gift[item[1]] = (gift[item[1]] or 0) + item[2]
+					end
 				else
 					skynet.error(string.format("[ERROR]: event_dropCsv no id %s,  adv_chapter_campsite",  dropId))
 				end
@@ -1471,7 +1473,9 @@ local function doChooseEffect(self, effectStr, room, block, tag, chooseData)
 				local dropData = csvdb["event_dropCsv"][dropId]
 				if dropData then
 					local item = dropData["range"]:randWeight(true)
-					reward[item[1]] = (reward[item[1]] or 0) + item[2]
+					if item[1] ~= 0 then
+						reward[item[1]] = (reward[item[1]] or 0) + item[2]
+					end
 				else
 					skynet.error(string.format("[ERROR]: event_dropCsv no id %s in %s id: %s",  dropId, tag, chooseData.id))
 				end
@@ -1778,7 +1782,9 @@ local function clickClick(self, room, block, params)
 			local reward = {}
 			for _, dropId in ipairs(clickData.effect:toArray(true, "=")) do
 				local item = csvdb["event_dropCsv"][dropId]["range"]:randWeight(true)
-				reward[item[1]] = (reward[item[1]] or 0) + item[2]
+				if item[1] ~= 0 then
+					reward[item[1]] = (reward[item[1]] or 0) + item[2]
+				end
 			end
 			self:award(reward, {log = {desc = "clickClick", int1 = block.event.id}}, {roomId = room.roomId, blockId = block.blockId})
 		end,
@@ -134,6 +134,9 @@ function Block:randomEvent()
 	randomFunc[AdvEventType.Drop] = function()
 		if not self.event.item then
 			self.event.item = csvdb["event_dropCsv"][self.event.id]["range"]:randWeight(true)
+			if self.event.item[1] == 0 then
+				self:clear()
+			end
 		end
 	end
 	--交易
@@ -527,8 +527,9 @@ function Passive:effect8(dropId)
 		skynet.error(string.format("CSVDATA Error  adv_map_passive %s effect 8 not id %s in event_drop", self.id, dropId))
 	end
 	local item = dropData["range"]:randWeight(true)
-	self.owner.battle.adv:award({[item[1]] = item[2]}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
-	
+	if item[1] ~= 0 then
+		self.owner.battle.adv:award({[item[1]] = item[2]}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
+	end
 end
  
 --9=直接获得item（可在结算触发时使用）