冒险的一些bug

zhouhaihai
1 parent cd498e53
Showing 5 changed files with 30 additions and 7 deletions Show diff stats
src/actions/AdvAction.lua
src/adv/Adv.lua
src/adv/AdvMap.lua
src/adv/AdvRoom.lua
src/adv/AdvTask.lua
@@ -694,13 +694,14 @@ function _M.rankRpc(agent, data)
 	local role = agent.role
  
 	local list = {}
-	local ids = redisproxy:zrevrange(RANK_ADV, 0 , 99)
+	local ids = redisproxy:zrevrange(RANK_ADV, 0 , 99, "WITHSCORES")
 	local redret = {}
 	if ids and next(ids) then
 		redret = redisproxy:pipelining(function (red)
-			for i = 1, #ids do
+			for i = 1, #ids, 2 do
 				local roleId = ids[i]
-				table.insert(list, {roleId = tonumber(roleId)})
+				local score = tonum(ids[i + 1])
+				table.insert(list, {roleId = tonumber(roleId), score = score})
 				red:hget(RANK_ADV_INFO, roleId)
 			end
 		end)
@@ -377,6 +377,11 @@ function Adv:initBattle()
 		self.battle:triggerPassive(passiveC[1], passiveC[2])
 	end
 	self.cachePassiveEvent = {}
+
+	-- after init battle
+	for idx, map in pairs(self.maps) do
+		map:initBattleAfter()
+	end
 end
  
 function Adv:triggerPassive(condType, params)
@@ -1142,6 +1147,7 @@ local function clickLayer(self, room, block, params)
  
 		self.maps[mapIdx] = AdvMap.new(self, mapIdx, mapId)
 		self.battle:initMapEnemys(mapIdx)
+		self.maps[mapIdx]:initBattleAfter()
 		self:checkAchievement(Adv.AchievType.EnterILayer, 1, mapId)
 	end
 	self:backLayer(1)
@@ -34,6 +34,12 @@ function Map:loadRooms(rooms)
 	end 
 end
  
+function Map:initBattleAfter()
+	for roomId, room in pairs(self.rooms) do
+		room:initBattleAfter()
+	end
+end
+
 function Map:getDB()
 	local map = {}
 	map.mapId = self.mapId
@@ -12,6 +12,7 @@ function Room:ctor(map, roomId, csvData, info, isPath)
 	self.isPath = isPath
 	self.isBossRoom = false -- boss房间   --击败boss 以后重置为false
 	self.isShow = false
+	self.battleAfterCall = {}
  
 	self.blocks = {}
 	self:loadBlocks(csvData, info)
@@ -38,10 +39,19 @@ function Room:loadBlocks(csvData, info)
 	end
 	--中继层全部开放   boss 房间 开启所有的地块
 	if  self.map.adv.isRelay or (self.isBossRoom and self.isShow and isFirstOpen) then
-		for _, block in pairs(self.blocks) do
-			self:openBlock(block)
-		end
+		table.insert(self.battleAfterCall, function()
+			for _, block in pairs(self.blocks) do
+				self:openBlock(block)
+			end
+		end)
+	end
+end
+
+function Room:initBattleAfter()	
+	for _, callback in ipairs(self.battleAfterCall) do
+		callback()
 	end
+	self.battleAfterCall = {}
 end
  
 function Room:getDB()
@@ -137,7 +137,7 @@ function AdvTask.bind(Adv)
  
 			local item = csvdb["event_dropCsv"][taskData.drop]["range"]:randWeight(true)
 			reward[item[1]] = (reward[item[1]] or 0) + item[2]
-			reward = self.owner:award(reward)
+			reward = self:award(reward)
  
 			self.advTask[taskId] = nil
 			ok = true