Merge branch 'develop' into player

zhouhaihai
2 parents 404d5bee 71003290
Showing 9 changed files with 60 additions and 41 deletions Show diff stats
src/actions/DinerAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/StoreAction.lua
src/adv/AdvBuff.lua
src/models/RoleCross.lua
src/models/RoleLog.lua
src/models/RoleTask.lua
@@ -40,7 +40,7 @@ function _M.addSellRpc( agent, data )
 		deltaTime = 0,
 		lastCount = 0,
 	}
-	local count = sellData.count
+	local count = sellData.count or 0
 	local maxDishCount = role.dinerData:getMaxDishs()
 	if math.illegalNum(count + calSell.lastCount, 1, maxDishCount) then
 		return 5
@@ -121,7 +121,7 @@ function _M.herol(role, pms)
 		return "等级已满"
 	end
 	local nextLevel = math.min(addLevel + hero:getProperty("level"), MaxLv)
-	for i = 0, 10 do
+	for i = 0, #csvdb["unit_breakCsv"] do
 		local upLimit = csvdb["unit_breakCsv"][i].levelLimit
 		local lowLimit = csvdb["unit_breakCsv"][i - 1] and csvdb["unit_breakCsv"][i - 1].levelLimit or 0
 		if upLimit > nextLevel and lowLimit <= nextLevel then
@@ -356,7 +356,9 @@ function _M.adv(role, pms)
  
 	local advData = csvdb["adv_chapterCsv"][chapterId]
 	if not advData then return end
-	layer = math.min(layer, advData.limitlevel)
+	if math.floor(chapterId / 100) ~= 2 then
+		layer = math.min(layer, advData.limitlevel)
+	end
 	local advPass = role:getProperty("advPass")
 	local addPre 
 	addPre = function(chapterId)
@@ -384,13 +386,15 @@ function _M.advt(role, pms)
 	local layer = tonum(pms.pm2)
 	local advData = csvdb["adv_chapterCsv"][chapterId]
 	if not advData then return "不存在的章节" end
-	layer = math.min(layer, advData.limitlevel)
-	local advData = role:getAdvData()
  
+	local advData = role:getAdvData()
 	if not advData.chapterId then
 		return "先随便开启一关"
 	end
-
+	if not advData:isEndless() then
+		layer = math.min(layer, advData.limitlevel)
+	end
+	
 	_M.adv(role, {pm1 = chapterId, pm2 = layer - 1})
  
  
@@ -120,6 +120,7 @@ function _M.checkRpc(agent, data)
 	return true
 end
  
+local _BattleKey = nil
 function _M.startBattleRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -141,12 +142,10 @@ function _M.startBattleRpc(agent, data)
 		return 3
 	end
  
-	local key = tostring(math.random())
-	hangInfo.key = key
-	local nowTime = skynet.timex()
-	role:updateProperty({field = "hangInfo", value = hangInfo})
+	_BattleKey = tostring(math.random())
+
 	role:checkTaskEnter("HangBattle", {id = carbonId})
-	SendPacket(actionCodes.Hang_startBattleRpc, MsgPack.pack({key = key}))
+	SendPacket(actionCodes.Hang_startBattleRpc, MsgPack.pack({key = _BattleKey}))
 	return true
 end
  
@@ -154,7 +153,7 @@ function _M.endBattleRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local hangInfo = role:getProperty("hangInfo")
-	if not msg.key or msg.key ~= hangInfo.key then 
+	if not msg.key or msg.key ~= _BattleKey then 
 		return 1
 	end
 	local carbonId = msg.carbonId
@@ -190,7 +189,6 @@ function _M.endBattleRpc(agent, data)
  
 		role:checkTaskEnter("HangPass", {id = carbonId})
 	end
-	hangInfo.key = nil
 	role:updateProperty({field = "hangInfo", value = hangInfo})
  
 	role:log("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId})
@@ -202,23 +200,31 @@ function _M.endBattleRpc(agent, data)
 	return true
 end
  
+local function checkLeader(heros, leader)
+	if not leader then return end
+	for slot, heroId in pairs(heros) do
+		if heroId == leader then return true end
+	end
+end
+
 function _M.roleFormatRpc(agent , data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local hangTeam = role:getProperty("hangTeam")
 	for slot, heroId in pairs(msg.heros) do
 		if not role.heros[heroId] then
-			return
+			return 1
 		end
 	end
  
 	local supports = {}
 	for slot, support in pairs(msg.supports or {}) do
-		if slot ~= 1 and slot ~= 2 then return end
+		if slot ~= 1 and slot ~= 2 then return 2 end
 		local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
-		if level <= 0 then return end
+		if level <= 0 then return 3 end
 		supports[slot] = support
 	end
+	if not checkLeader(msg.heros, msg.leader) then return 4 end
  
 	table.clear(hangTeam)
 	hangTeam.heros = {}
@@ -377,7 +383,8 @@ function _M.bonusFormatRpc(agent , data)
 		if level <= 0 then return end
 		supports[slot] = support
 	end
-
+	if not checkLeader(msg.heros, msg.leader) then return end
+	
 	table.clear(bTeam)
 	bTeam.heros = {}
 	for slot, heroId in pairs(msg.heros) do
@@ -815,7 +815,7 @@ function _M.drawHeroRpc(agent, data)
 			end
 			if not fillPoolFunc[rateTypes[rateType]] then return 4 end
 			if isFloorBack then
-				fillPoolFunc[rateTypes[rateType]](4) -- 保底
+				fillPoolFunc[rateTypes[rateType]](3) -- 保底 sr 【郑斌】明确
 			else
 				fillPoolFunc[rateTypes[rateType]]()
 			end
@@ -825,9 +825,12 @@ function _M.drawHeroRpc(agent, data)
 		local temp = resultPool[idx]
 		local itemData = csvdb["itemCsv"][temp[1]]
  
-		if itemData.type == ItemType.Hero and itemData.quality == 4 then
-			ssrCount = ssrCount + 1
-			floorHeroCount = 0
+		if itemData.type == ItemType.Hero then
+			if itemData.quality == 4 then
+				ssrCount = ssrCount + 1
+			elseif itemData.quality == 3 then
+				floorHeroCount = 0
+			end
 		end
  
 		if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
@@ -59,7 +59,7 @@ function _M.dailyBuyRpc(agent , data)
 		return 3 
 	end
  
-	if not role:costDiamond({count = cost * count}, {log = {desc = "dailyShop", int1 = id, int2 = count}}) then
+	if not role:costDiamond({count = cost * count, log = {desc = "dailyShop", int1 = id, int2 = count}}) then
 		return 4 
 	end
  
@@ -237,7 +237,7 @@ local BuffFactory = {
 		_Buff._init = function(self)
 			for _, buff in ipairs(self.owner.buffs) do -- 挂上就清除一下子
 				if not buff.isDel and self:canEffect(buff.id) and not self.isDel then
-					if not buff.isDel and not self.isDel then
+					while not buff.isDel and not self.isDel do
 						self:effect()
 						buff:uncover()
 					end
@@ -308,7 +308,7 @@ function CMD.pvpHInfo(roleId)
 end
  
 -- 高级pvp 排行榜
-function CMD:pvpHRankInfo()
+function CMD:pvpHRankInfo(roleId)
 	local info = CMD.getProperties(roleId, {"name", "level", "headId", "pvpTBVH", "ltime"})
 	local info = {
 		name = info.name,
@@ -71,6 +71,10 @@ local commonRoleField = {
 	rmbC = "integer",
 }
  
+local function printError(info)
+	print(info)
+	print(debug.traceback())
+end
  
 local function checkType(logType, field, value, ctype)
 	local typecheckfunc = {
@@ -78,10 +82,10 @@ local function checkType(logType, field, value, ctype)
 			--长度不超过256
 			if type(value) ~= "string" then
 				value = tostring(value)
-				print(string.format("LOG ERROR: logType [%s] field [%s] isn't [keyword], value : %s", logType, field, value))
+				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [keyword], value : %s", logType, field, value))
 			else
 				if #value > 256 then
-					print(string.format("LOG ERROR: logType [%s] field [%s] [keyword] type to long. value : %s", logType, field, value))
+					printError(string.format("LOG ERROR: logType [%s] field [%s] [keyword] type to long. value : %s", logType, field, value))
 				end
 			end
 			return value
@@ -89,26 +93,26 @@ local function checkType(logType, field, value, ctype)
 		text = function()
 			if type(value) ~= "string" then
 				value = tostring(value)
-				print(string.format("LOG ERROR: logType [%s] field [%s] isn't [text], value : %s", logType, field, value))
+				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [text], value : %s", logType, field, value))
 			end
 			return value
 		end,
 		integer = function()
 			if type(value) ~= "number" then
 				value = tonumber(value)
-				print(string.format("LOG ERROR: logType [%s] field [%s] isn't [integer], value : %s", logType, field, value))
+				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [integer], value : %s", logType, field, value))
 			end
 			if value then
 				if math.type(value) ~= "integer" then
 					local oldValue = value
 					value = math.floor(value)
 					if value ~= oldValue then
-						print(string.format("LOG ERROR: logType [%s] field [%s] isn't [integer], is float, value : %s", logType, field, value))
+						printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [integer], is float, value : %s", logType, field, value))
 					end
 				end
 				if -2147483648 > value or value > 2147483647 then
+					printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [integer], too big, value : %s", logType, field, value))
 					value = nil
-					print(string.format("LOG ERROR: logType [%s] field [%s] isn't [integer], too big, value : %s", logType, field, value))
 				end
 			end 
 			return value
@@ -116,20 +120,20 @@ local function checkType(logType, field, value, ctype)
 		short = function()
 			if type(value) ~= "number" then
 				value = tonumber(value)
-				print(string.format("LOG ERROR: logType [%s] field [%s] isn't [short], value : %s", logType, field, value))
+				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [short], value : %s", logType, field, value))
 			end
 			if value then
 				if math.type(value) ~= "integer" then
 					local oldValue = value
 					value = math.floor(value)
 					if value ~= oldValue then
-						print(string.format("LOG ERROR: logType [%s] field [%s] isn't [short], is float, value : %s", logType, field, value))
+						printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [short], is float, value : %s", logType, field, value))
 					end
 				end
  
 				if -32768 > value or value > 32768 then
+					printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [short], too big, value : %s", logType, field, value))
 					value = nil
-					print(string.format("LOG ERROR: logType [%s] field [%s] isn't [short], too big, value : %s", logType, field, value))
 				end
 			end 
 			return value
@@ -137,17 +141,17 @@ local function checkType(logType, field, value, ctype)
 		long = function()
 			if type(value) ~= "number" then
 				value = tonumber(value)
-				print(string.format("LOG ERROR: logType [%s] field [%s] isn't [long], value : %s", logType, field, value))
+				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [long], value : %s", logType, field, value))
 			end
 			if value then
 				if math.type(value) ~= "integer" then
 					local oldValue = value
 					value = math.floor(value)
 					if type(value) ~= "integer" then
+						printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [long], too big, value : %s", logType, field, value))
 						value = nil
-						print(string.format("LOG ERROR: logType [%s] field [%s] isn't [long], too big, value : %s", logType, field, value))
 					elseif value ~= oldValue then
-						print(string.format("LOG ERROR: logType [%s] field [%s] isn't [long], is float, value : %s", logType, field, value))
+						printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [long], is float, value : %s", logType, field, value))
 					end
 				end
 			end 
@@ -156,7 +160,7 @@ local function checkType(logType, field, value, ctype)
 		float = function()
 			if type(value) ~= "number" then
 				value = tonumber(value)
-				print(string.format("LOG ERROR: logType [%s] field [%s] isn't [float], value : %s", logType, field, value))
+				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [float], value : %s", logType, field, value))
 			end
 			return value
 		end,
@@ -165,7 +169,7 @@ local function checkType(logType, field, value, ctype)
 	if typecheckfunc[ctype] then
 		return typecheckfunc[ctype]()
 	else
-		print(string.format("LOG ERROR: logType [%s] field [%s] have a new type [%s] need add check.", logType, field, ctype))
+		printError(string.format("LOG ERROR: logType [%s] field [%s] have a new type [%s] need add check.", logType, field, ctype))
 		return nil
 	end
 end
@@ -176,13 +180,13 @@ function RoleLog.bind(Role)
 		contents = contents or {}
 		local _logType = LogType[logType]
 		if not _logType then 
-			print(string.format("LOG ERROR: new logType [%s] need Add Maping.", logType))
+			printError(string.format("LOG ERROR: new logType [%s] need Add Maping.", logType))
 			return 
 		end
 		local doc = {}
 		for field, ctype in pairs(commonRoleField) do
 			if contents[field] then
-				print(string.format("LOG ERROR: logType [%s] had field [%s] overwrite default.", logType, field))
+				printError(string.format("LOG ERROR: logType [%s] had field [%s] overwrite default.", logType, field))
 			end
 			doc[field] = checkType("commonRoleField", field, self:getProperty(field), ctype)
 		end
@@ -197,7 +201,7 @@ function RoleLog.bind(Role)
 			if ftype then
 				doc[field] = checkType(logType, field, value, ftype)
 			else
-				print(string.format("LOG ERROR: logType [%s] have new field [%s] no type in mapping.", logType, field))
+				printError(string.format("LOG ERROR: logType [%s] have new field [%s] no type in mapping.", logType, field))
 			end
 		end
 		if not logd then return end
@@ -343,6 +343,7 @@ function RoleTask.bind(Role)
 			[22] = true,
 			[23] = true,
 			[25] = true,
+			[37] = true,
 		}
  
 		for tId , achiveData in pairs(csvdb["achievement_typeCsv"]) do