新随机订单

zhouhaihai
1 parent 550ba7e7
Showing 1 changed file with 7 additions and 6 deletions Show diff stats
src/actions/DinerAction.lua
@@ -455,11 +455,12 @@ function _M.refreshTaskRpc( agent, data )
 	local orders = json.decode(role.dinerData:getProperty("order"))
 	local hadTask = {}
-	local needCount = globalCsv.diner_task_count
+	local needCount = 0
 	for idx, temp in pairs(orders) do
-		if temp.lock ~= 0 and temp.status ~= 0 then
+		if temp.lock ~= 0 or temp.status ~= 0 then
 			hadTask[temp.id] = 1
-			needCount = needCount - 1
+		else
+			needCount = needCount + 1
 		end
 	end
@@ -489,9 +490,9 @@ function _M.refreshTaskRpc( agent, data )
 	role:costItems(cost)
-	for idx = 1, globalCsv.diner_task_count do
-		local order = orders[idx]
-		if not order or (order.lock == 0 and order.status == 0) then
+
+	for idx, order in ipairs(orders) do
+		if (order.lock == 0 and order.status == 0) then
 			if needCount > 0 then
 				local index = math.randWeight(pool, "chance")
 				local data = pool[index]