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

* tr/bugfix: 主动效果 Revert "主动效果" 主动效果修改gm添加满级英雄指令，开启特权时，加速道具效果未受影响 # Conflicts: # src/csvdata

Merge branch 'tr/bugfix' into tr/publish/release
* tr/bugfix: 主动效果 Revert "主动效果" 主动效果修改gm添加满级英雄指令，开启特权时，加速道具效果未受影响 # Conflicts: # src/csvdata
zhouhaihai
2 parents d0a3939c 263f2579
Showing 4 changed files with 58 additions and 15 deletions Show diff stats
src/actions/GmAction.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/adv/AdvMap.lua
@@ -297,14 +297,15 @@ function _M.get(role, pms)
 		end
 	elseif pms.pm1 == "MAXHERO" then
 		-- 给英雄
-		for itemId = 400 , 700 do
-			if csvdb["itemCsv"][itemId] then
-				role:award({[itemId] = 1}, {log = {desc = "gm"}})
+		for heroId = 100, 500 do 
+			local heroCfg = csvdb["unitCsv"][heroId]
+			if heroCfg and heroCfg.open == 1 then
+				role:award({[heroId + 300] = 1}, {log = {desc = "gm"}})
 			end
 		end
 		-- 升满级
 		for _, hero in ipairs(role.heros) do
-			hero:updateProperty({field = "level", value = 140})
+			_M.herol(role, {pm1 = hero:getProperty("type"), pm2 = 130})
 			hero:updateProperty({field = "wakeL", value = #csvdb["unit_wakeCsv"]})
 		end
  
@@ -754,6 +754,17 @@ function _M.openSpeedUpBoxRpc(agent, data)
 		role:costItems({[id] = count}, {log = {desc = "speedUpBox"}})
 	end
  
+	local doubleCoef = role.activity:isOpen("DoubleDrop") and 2 or 1
+	-- 特权卡获取加速获得额外道具
+	local coef = role.storeData:getProduceItemSpeedCoef()
+	if coef > 1 or doubleCoef > 1 then
+		for k, cnt in pairs(reward) do
+			if k == ItemId.Gold or k == ItemId.Exp then
+				reward[k] = math.floor(cnt * coef * doubleCoef)
+			end
+		end
+	end
+
 	local change
 	reward, change = role:award(reward, {log = {desc = "speedUpBox"}})
  
@@ -2127,6 +2127,32 @@ function Adv:doActive(activeId, target)
 		self.battle.player:addBaseAttr(attr, value, vtype)
 		return true
 	end
+	-- 13=将目标移动至地图随机点，可以移动至未翻开的空格
+	doActiveEffect[13] = function(_)
+		for _, target in ipairs(targers) do
+		end
+		return true
+	end
+	-- 14=获得drop，在有坐标时需要道具飞入背包的展现。
+	doActiveEffect[14] = function(_, dropId)
+		local gift = nil
+		local dropData = csvdb["event_dropCsv"][dropId]
+		if dropData then
+			local item = dropData["range"]:randWeight(true)
+			if item[1] ~= 0 then
+				gift = {}
+				gift[item[1]] = (gift[item[1]] or 0) + item[2]
+			end
+		end
+		local roomId, blockId
+		if not target or not target.roomId or not target.blockId then
+			roomId, blockId = target.roomId, target.blockId
+		end
+		if gift then
+			self:award(gift, {log = {desc = "doActive",  int1 = activeId}}, {roomId = roomId, blockId = blockId})
+		end
+		return true
+	end
  
 	for _, effect in ipairs(activeData.effect:toArray()) do
 		local cur = effect:toArray(true, "=")
@@ -97,23 +97,28 @@ function Map:checkOver()
 	end
 end
  
+function Map:randEmptyBlock()
+	local pool = {}
+	for _, room_ in pairs(self.rooms) do
+		for _, block_ in pairs(room_.blocks) do
+			if block_.isOpen and not block_.event then
+				table.insert(pool, {room_, block_})
+			end
+		end
+	end
+	if not next(pool) then return end
+	local idx = math.randomInt(1, #pool)
+	return pool[idx][1], pool[idx][2]
+end
+
 --随机一个空的位置生成怪， 如果没有就没有	
 function Map:addNewMonsterRand(monsterId, where)
 	local room, block
 	if where then
 		room, block = where[1], where[2]
 	else
-		local pool = {}
-		for _, room_ in pairs(self.rooms) do
-			for _, block_ in pairs(room_.blocks) do
-				if block_.isOpen and not block_.event then
-					table.insert(pool, {room_, block_})
-				end
-			end
-		end
-		if not next(pool) then return end
-		local idx = math.randomInt(1, #pool)
-		room, block = pool[idx][1], pool[idx][2]
+		room, block = self:randEmptyBlock()
+		if not room then return end
 	end
  
 	if not monsterId then