Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

liuzujun
2 parents 2bc706ab e59430d5
Showing 4 changed files with 78 additions and 48 deletions Show diff stats
src/GlobalVar.lua
src/adv/Adv.lua
src/adv/AdvMap.lua
src/adv/AdvPassive.lua
@@ -214,6 +214,7 @@ AdvBackEventType = {
 	Level = 25, -- 升级
 	LinkChooseOver = 26, -- 连锁事件结束
 	BuffEffect = 27, -- buff 效果
+	PassiveEffect = 28, -- 被动 效果
 }
 AdvScoreType = {
@@ -1388,19 +1388,31 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			[14] = function() -- 指定地块召唤 指定类型的id
 				local change = self:getCurMap():layEventToStage(effect[2], effect[3], effect[4], effect[5])
 				for _, one in ipairs(change) do
-					self:backBlockChange(one[1].roomId, one[2].blockId)
+					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+						clearBlock = false
+					else
+						self:backBlockChange(one[1].roomId, one[2].blockId)
+					end
 				end
 			end,
 			[15] = function() -- 移除指定事件
 				local change = self:getCurMap():clearEventById(effect[2], effect[3], effect[4])
 				for _, one in ipairs(change) do
-					self:backBlockChange(one[1].roomId, one[2].blockId)
+					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+						clearBlock = false
+					else
+						self:backBlockChange(one[1].roomId, one[2].blockId)
+					end
 				end
 			end,
 			[16] = function() -- 指定事件转移
 				local change = self:getCurMap():eventChangeToOther(effect[2], effect[3], effect[4], effect[5], effect[6])
 				for _, one in ipairs(change) do
-					self:backBlockChange(one[1].roomId, one[2].blockId)
+					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+						clearBlock = false
+					else
+						self:backBlockChange(one[1].roomId, one[2].blockId)
+					end
 				end
 			end,
 		}
@@ -1526,6 +1538,24 @@ local function clickBuild(self, room, block, params)
 	local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "build")
 	if not status then return end
+	local isMine = false -- 是不是宝藏怪
+	for _, mid in ipairs(globalCsv.adv_egg_treasureLayer_id) do 
+		if mid == oldId then
+			isMine = true
+			break
+		end
+	end
+	if isMine then
+		local advMine = self.owner:getProperty("advMine")
+		advMine[2] = advMine[2] or {}
+		local mineCo2 = advMine[2].co or {}
+		if chooseData.limit ~= 0 then
+			mineCo2[oldId] = (mineCo2[oldId] or 0) + 1
+		end
+		advMine[2].co = mineCo2
+		self.owner:setProperty("advMine", advMine)
+	end
+
 	self:checkTask(Adv.TaskType.Build, 1, oldId)
 	self:checkAchievement(Adv.AchievType.Build, 1, oldId)
 	self:checkAchievement(Adv.AchievType.BuildBySelect, 1, oldId, choose)
@@ -1960,6 +1990,7 @@ function Adv:enemyDead(enemy, escape)
 					break
 				end
 			end
+
 			if isMine then
 				local advMine = self.owner:getProperty("advMine")
 				advMine[1] = advMine[1] or {}
@@ -1986,9 +2017,6 @@ function Adv:enemyDead(enemy, escape)
 							etype = AdvEventType.Build,
 							id = cId
 						})
-						if csvdb["event_buildingCsv"][cId].limit ~= 0 then
-							mineCo2[cId] = (mineCo2[cId] or 0) + 1
-						end
 						had = true
 					end
 				end
@@ -13,12 +13,12 @@ local createMap, getEventLib
 function Map:ctor(adv, mapIdx, mapInfo, isEnter, isNewRelay)
 	self.adv = adv
 	local isNew = type(mapInfo) == "number"
+	self.mapIdx = mapIdx
 	if isNew then -- mapInfo 传入 id
 		mapInfo = createMap(self, mapInfo, isEnter, isNewRelay)  -- 生成地图
 	end
 	if not mapInfo then return end
-	self.mapIdx = mapIdx
 	self.mapId = mapInfo.mapId
 	self.isShow = mapInfo.isShow  -- 是否全部展示 -- 客户端用
 	self.rooms = {}
@@ -349,8 +349,8 @@ function Map:getDistance(froomId, fblockId, troomId, tblockId)
 	local room1 = self.rooms[froomId]
 	local room2 = self.rooms[troomId]
 	if room1 and room2 then
-		local block1 = room1[fblockId]
-		local block2 = room2[tblockId]
+		local block1 = room1.blocks[fblockId]
+		local block2 = room2.blocks[tblockId]
 		if block1 and block2 then
 			local c1, r1 = room1:tranLtoG(block1.col, block1.row)
 			local c2, r2 = room2:tranLtoG(block2.col, block2.row)
@@ -811,46 +811,47 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 			end
 		end
 	end
-
 	-- 宝藏怪刷新
-	for idx = #(stagePool["global"][AdvCodeRandomStage] or {}), 1, -1 do
-		local c = stagePool["global"][AdvCodeRandomStage][idx] --  {room = roomId, block = blockId}
-		if mapInfo.rooms[c["room"]]["event"][c["block"]] then -- 存在
-			table.remove(stagePool["global"][AdvCodeRandomStage], idx)
-		end
-	end
-	local ln = #(stagePool["global"][AdvCodeRandomStage] or {})
-	local advMine = self.adv.owner:getProperty("advMine")
-	advMine[1] = advMine[1] or {}
-	local mineCh = advMine[1].ch or globalCsv.adv_egg_treasureMonster_showup
-	local mineCo = advMine[1].co or {}
-	local had = false
-	if ln > 0 then
-		if math.randomInt(1, 100) <= mineCh then -- 刷出来了
-			local mpool = {}
-			for _, mid in ipairs(globalCsv.adv_egg_treasureMonster_id) do
-				local monster = csvdb["event_monsterCsv"][mid]
-				if (not mineCo[mid] or monster.limit == 0 or mineCo[mid] < monster.limit) and monster.showup > 0 then
-					mpool[mid] = {monster.showup}
-				end
-			end
-			if next(mpool) then
-				local idx = math.randomInt(1, ln)
-				local cur = stagePool["global"][AdvCodeRandomStage][idx]
-				giveEvent(cur["room"], cur["block"], AdvEventType.Monster, math.randWeight(mpool, 1))
+	if self.mapIdx == 1 and not self.adv.isRelay then
+		for idx = #(stagePool["global"][AdvCodeRandomStage] or {}), 1, -1 do
+			local c = stagePool["global"][AdvCodeRandomStage][idx] --  {room = roomId, block = blockId}
+			if mapInfo.rooms[c["room"]]["event"][c["block"]] then -- 存在
 				table.remove(stagePool["global"][AdvCodeRandomStage], idx)
-				ln = ln - 1
-				had = true
 			end
 		end
+		local ln = #(stagePool["global"][AdvCodeRandomStage] or {})
+		local advMine = self.adv.owner:getProperty("advMine")
+		advMine[1] = advMine[1] or {}
+		local mineCh = advMine[1].ch or globalCsv.adv_egg_treasureMonster_showup
+		local mineCo = advMine[1].co or {}
+		local had = false
+		if ln > 0 then
+			if math.randomInt(1, 100) <= mineCh then -- 刷出来了
+				local mpool = {}
+				for _, mid in ipairs(globalCsv.adv_egg_treasureMonster_id) do
+					local monster = csvdb["event_monsterCsv"][mid]
+					if (not mineCo[mid] or monster.limit == 0 or mineCo[mid] < monster.limit) and monster.showup > 0 then
+						mpool[mid] = {monster.showup}
+					end
+				end
+				if next(mpool) then
+					local idx = math.randomInt(1, ln)
+					local cur = stagePool["global"][AdvCodeRandomStage][idx]
+					giveEvent(cur["room"], cur["block"], AdvEventType.Monster, math.randWeight(mpool, 1))
+					table.remove(stagePool["global"][AdvCodeRandomStage], idx)
+					ln = ln - 1
+					had = true
+				end
+			end
+		end
+		if not had then
+			mineCh = math.min(mineCh + globalCsv.adv_egg_treasureMonster_showup_add, 100)
+		else
+			mineCh = nil
+		end
+		advMine[1].ch = mineCh
+		self.adv.owner:setProperty("advMine", advMine)
 	end
-	if not had then
-		mineCh = math.min(mineCh + globalCsv.adv_egg_treasureMonster_showup_add, 100)
-	else
-		mineCh = nil
-	end
-	advMine[1].ch = mineCh
-	self.adv.owner:setProperty("advMine", advMine)
 	if mapCsvData.clearType == 1 and not haveBoss then
@@ -50,7 +50,7 @@ end
 FilterFactory[Filter.RANGE] = function (_Filter)
 	_Filter._execute = function (self, target, params)
-		if self.owner.blockId and self.owner.roomId  and params.blockId and params.roomId then
+		if params and self.owner.blockId and self.owner.roomId  and params.blockId and params.roomId then
 			local distance = self.owner.battle.adv:getCurMap():getDistance(self.owner.roomId, self.owner.blockId, params.roomId, params.blockId)
 			return distance ~= -1 and distance <= self.value
 		end
@@ -95,9 +95,8 @@ function Filter:execute(params)
 	if not target then
 		return
 	end
-	if self:_execute(target) then
-		return self:_execute(target, params)
-	end
+
+	return self:_execute(target, params)
 end
 -->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -414,6 +413,7 @@ function Passive:trigger(condType, params) --触发检查
 	if self.round and self.round > 0 then  -- cd
 		return
 	end
+	self.owner.battle.adv:pushBackEvent(AdvBackEventType.PassiveEffect, {show = self.passiveData.show, roomId = self.owner.roomId, blockId = self.owner.blockId })
 	self:effect(params)
 end