Merge branch 'cn/develop' into cn/publish/release

jiyue
2 parents 84193e7a c00d76f7
Showing 4 changed files with 3 additions and 4 deletions Show diff stats
src/actions/CarAction.lua
src/actions/PvpAction.lua
src/actions/StoreAction.lua
src/models/RolePlugin.lua
@@ -90,7 +90,7 @@ function _M.equipUpRpc( agent, data )
 	local nextEquip = dataSet[nextLv]
 	if not nextEquip then return 23 end
-	local limit = csvdb["itemCsv"][nextEquip.id].limit ~= 0 and csvdb["itemCsv"][nextEquip.id].limit or math.huge
+	local limit = csvdb["itemCsv"][nextEquip.id].limit ~= 0 and csvdb["itemCsv"][nextEquip.id].limit or 10000
 	if math.illegalNum(count, 1, limit)  then return 0 end
@@ -237,7 +237,7 @@ function _M.buyCountRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local count = msg.count
-	if math.illegalNum(count, 1, math.huge) then
+	if math.illegalNum(count, 1, 10000) then
 		return 1
 	end
@@ -327,7 +327,7 @@ function _M.shopBuyRpc(agent , data)
 	end
 	local buyRecord = role.storeData:getProperty("buyR")
-	if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (buyRecord[id] or 0))) then 
+	if math.illegalNum(count, 1, (dataSet.limit == 0 and 10000 or dataSet.limit - (buyRecord[id] or 0))) then 
 		skynet.error(string.format("shop buy over limit, user_id:%d, goods_id:%d", role:getProperty("id"), id))
 		return 1 
 	end
@@ -2929,7 +2929,6 @@ function RolePlugin.bind(Role)
 		elseif type == 4 then
 			bonus = self:bonusMerged(towerBnous[SystemBnousType.DinerPrice], levelBnous[SystemBnousType.DinerPrice])
 		end
-		dump(bonus)
 		if not flag then
 			return self:getDeltaValue(bonus, value) + (bonus[0] or 0)
         else