Merge branch 'develop' into qa

zhouhaihai
2 parents 8ccecbf9 d284e3ee
Showing 5 changed files with 8 additions and 6 deletions Show diff stats
src/actions/EmailAction.lua
src/actions/StoreAction.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
src/models/Diner.lua
@@ -43,7 +43,7 @@ function _M.listRpc(agent, data)
 			if tonum(email.createtime) > role:getProperty("ctime") 
 				and ( not email.mid or tonum(email.mid) == mid ) 
 				and ( not email.endtime or tonum(email.endtime) > now )then
-				local time = email.timestamp and tonum(email.timestamp) or email.createtime
+				local time = math.max(tonum(email.timestamp, 0) or email.createtime)
 				redisproxy:insertEmail({
 					roleId = roleId, 
 					emailId = 0,
@@ -228,7 +228,7 @@ function _M.dinerBuyRpc(agent , data)
 	local dinerS = role:getProperty("dinerS")
 	if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (dinerS[id] or 0))) then return 1 end
  
-	local cost = {[ItemId.DinerCoin] = dataSet.cost}
+	local cost = {[ItemId.DinerCoin] = dataSet.cost * count}
 	if not role:checkItemEnough(cost) then return end
  
 	if dataSet.limit ~= 0 then
@@ -300,7 +300,8 @@ function Passive:canEffect(effType, effValue)
 		return
 	end
 	--禁用被动技
-	if self.owner:getDisablePassiveCount() == 0 or self.owner:getPassiveIdx(self) <= self.owner:getDisablePassiveCount() then
+	local count, bc = self.owner:getDisablePassiveCount()
+	if bc > 0 and (count == 0 or self.owner:getPassiveIdx(self) <= count) then
 		return
 	end
 	return true
@@ -114,13 +114,14 @@ function BaseObject:getPassiveIdx(passive)
 end
  
 function BaseObject:getDisablePassiveCount()
-	local count = 0
+	local count, bc = 0, 0
 	for _, buff in ipairs(self.buffs) do
 		if not buff.isDel and buff:getType() == Buff.DISABLE_BUFF then
 			count = count + buff:effect()
+			bc = bc + 1
 		end
 	end
-	return count
+	return count, bc
 end
  
 function BaseObject:addBuff(buffId, releaser)
@@ -72,7 +72,7 @@ function Diner:refreshDailyData(notify)
  
 	local guide = self.owner:getProperty("newerGuide")
 	local master, slave = string.match(guide,"(%d+)=(%d+)")
-	if tonumber(master) <= 26 then
+	if self.owner:getProperty("funcGuide"):getv(51,0) == 0 or tonumber(master) <= 26 then
 		entrust[1] = 1001
 		entrust[2] = 1
 	elseif tonumber(master) <= 29 then