Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop

zhanghualin
2 parents 58ded685 5cf05cda
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
src/actions/StoreAction.lua
@@ -399,7 +399,6 @@ function _M.shopBuyRpc(agent , data)
 	end
  
 	if not role:checkItemEnough(cost) then return 4 end
-	if not role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, long1= dataSet.shop}}) then return 5 end
  
 	local buyRecord = role.storeData:getProperty("buyR")
 	if math.illegalNum(count, 1, (dataSet.limit == 0 and 10000 or dataSet.limit - (buyRecord[id] or 0))) then
@@ -407,6 +406,8 @@ function _M.shopBuyRpc(agent , data)
 		return 6
 	end
  
+	if not role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, long1= dataSet.shop}}) then return 5 end
+
 	local limitStr = ""
 	if dataSet.limit ~= 0 then
 		buyRecord[id] = (buyRecord[id] or 0) + count