Blame view

src/actions/DinerAction.lua 29.9 KB
87cc3a35   zhengshouren   餐厅建筑升级逻辑
1
2
3
4
5
6
7
8
9
10
11
  local ipairs = ipairs
  local table = table
  local math = math
  local redisproxy = redisproxy
  local MsgPack = MsgPack
  
  local _M = {}
  
  function _M.addSellRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
03a6166a   zhouhaihai   餐厅优化
12
  	local sellData = msg
87cc3a35   zhengshouren   餐厅建筑升级逻辑
13
  
03a6166a   zhouhaihai   餐厅优化
14
15
16
17
18
19
20
21
22
  	local slot = sellData.slot
  	local sells = json.decode(role.dinerData:getProperty("sells"))
  	if sells[slot] and sells[slot].count and sells[slot].count ~= 0 then
  		return 0
  	end
  	if math.illegalNum(slot, 1, role.dinerData:getMaxSlots()) then
  		return 1
  	end
  	slot = tostring(slot)
36204e3c   zhengshouren   贩卖逻辑
23
  
03a6166a   zhouhaihai   餐厅优化
24
25
26
27
28
29
30
31
32
33
34
35
36
  	local dish = sellData.dish
  	local dishSet = csvdb["diner_dishCsv"][dish]
  	if not dishSet then
  		return 2
  	end
  	local dishLevel = role.dinerData:getProperty("dishTree"):getv(dish, 0)
  	if dishLevel == 0 then
  		return 3
  	end
  	local dishData = dishSet[dishLevel]
  	if not dishData then
  		return 4
  	end
87cc3a35   zhengshouren   餐厅建筑升级逻辑
37
  
03a6166a   zhouhaihai   餐厅优化
38
39
40
41
42
  	local calSell = role.dinerData:updateSell(slot, true) or {
  		deltaCount = 0,
  		deltaTime = 0,
  		lastCount = 0,
  	}
d8ba6e11   zhouhaihai   保护
43
  	local count = sellData.count or 0
03a6166a   zhouhaihai   餐厅优化
44
45
46
47
  	local maxDishCount = role.dinerData:getMaxDishs()
  	if math.illegalNum(count + calSell.lastCount, 1, maxDishCount) then
  		return 5
  	end
36204e3c   zhengshouren   贩卖逻辑
48
  
03a6166a   zhouhaihai   餐厅优化
49
50
51
52
53
54
55
  	local cost = dishData.material:toNumMap()
  	for k, n in pairs(cost) do
  		cost[k] = n * count
  	end
  	if not role:checkItemEnough(cost) then
  		return 6
  	end
36204e3c   zhengshouren   贩卖逻辑
56
  
3133cb76   zhouhaihai   日志
57
  	role:costItems(cost, {log = {desc = "addSell"}})
03a6166a   zhouhaihai   餐厅优化
58
  	role.dinerData:updateSell(slot)
cc796aaf   zhengshouren   增加餐厅任务计数逻辑
59
  
03a6166a   zhouhaihai   餐厅优化
60
61
62
63
64
65
66
67
68
69
  	role:checkTaskEnter("MakeFood", {id = dish, count = count})
  	-- local dirty = false
  	-- if dirty then
  	-- 	role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
  	-- end
  
  	sells = json.decode(role.dinerData:getProperty("sells"))
  	if not sells[slot] then
  		sells[slot] = {
  			reward = "",
59835765   zhouhaihai   排行榜
70
  			popular = 0,
03a6166a   zhouhaihai   餐厅优化
71
  		}
36204e3c   zhengshouren   贩卖逻辑
72
  	end
03a6166a   zhouhaihai   餐厅优化
73
74
75
76
  	sells[slot].dish = dish
  	sells[slot].level = dishLevel
  	sells[slot].count = count
  	sells[slot].time = skynet.timex() - calSell.deltaTime
ed322ed2   zhouhaihai   餐厅 顾客 系统
77
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
78
79
  	local timeSub = role:getBnousDiner(3,dishData.sell_time)
  	local needTime = sells[slot].count * (dishData.sell_time + timeSub) + sells[slot].time - skynet.timex()
072db127   zhouhaihai   推送
80
81
  	role:pushMsg({type = "food", slot = slot, time = needTime})
  
ed322ed2   zhouhaihai   餐厅 顾客 系统
82
83
84
85
86
87
88
89
  	-- 检查解锁的顾客
  	local had = {}
  	for _, sell in pairs(sells) do
  		if sell.dish then
  			had[sell.dish] = sell.level
  		end
  	end
  
ae820b73   zhouhaihai   bug
90
  	local customer = role.dinerData:getProperty("customer")
ed322ed2   zhouhaihai   餐厅 顾客 系统
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
  	local change = false
  	for cId, cData in pairs(csvdb["diner_customerCsv"]) do
  		if not customer[cId] then
  			local unlock = true
  			for needId, lv in pairs(cData.unlock:toNumMap()) do
  				if not had[needId] or had[needId] < lv then
  					unlock = false
  					break
  				end
  			end
  			if unlock then
  				change = true
  				customer[cId] = 0
  			end
  		end
  	end
  
  	if change then 
  		role.dinerData:updateProperty({field = "customer", value = customer})
  	end
1e9cb217   chenyueqi   服务器记录控制引导过程
111
  	role:finishGuide(28)
3133cb76   zhouhaihai   日志
112
  
f22a33af   zhouhaihai   自己的日志
113
114
  	role:mylog("diner_action", {desc = "addSell", int1 = dish, int2 = count})
  
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
115
116
  	role:mylog("diner_action", {desc = "onSell", short1 = 1, int1 = dish, int2 = count, cint1 = msg.slot, cint2 = count, cint3 = dishLevel})
  
03a6166a   zhouhaihai   餐厅优化
117
  	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
36204e3c   zhengshouren   贩卖逻辑
118
  	SendPacket(actionCodes.Diner_addSellRpc, "")
36204e3c   zhengshouren   贩卖逻辑
119
  	return true
87cc3a35   zhengshouren   餐厅建筑升级逻辑
120
121
  end
  
1ab9458f   gaofengduan   add 下菜操作
122
123
124
125
126
127
128
129
130
131
132
133
134
135
  function _M.removeSellRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local slot = msg.slot
  	if math.illegalNum(slot, 1, role.dinerData:getMaxSlots()) then
  		return 1
  	end
  	slot = tostring(slot)
  	local sells = json.decode(role.dinerData:getProperty("sells"))
  	local sell = sells[slot]
  	if not sell then
  		return 2
  	end
1ab9458f   gaofengduan   add 下菜操作
136
137
138
139
140
141
142
143
144
145
146
147
148
149
  	local dish = sell.dish
  	local dishSet = csvdb["diner_dishCsv"][dish]
  	if not dishSet then
  		return 3
  	end
  	local dishLevel = role.dinerData:getProperty("dishTree"):getv(dish, 0)
  	if dishLevel == 0 then
  		return 4
  	end
  	local dishData = dishSet[dishLevel]
  	if not dishData then
  		return 5
  	end
  
b8c1be12   zhouhaihai   一些 bug
150
151
152
153
154
  	local temp = role.dinerData:updateSell(slot) or {
  		deltaCount = 0,
  		deltaTime = 0,
  		lastCount = 0,
  	}
7bb30dca   zhouhaihai   修改发奖
155
  	local reward, change = {}
1ab9458f   gaofengduan   add 下菜操作
156
157
158
  	local cost = dishData.material:toNumMap()
  	for k, n in pairs(cost) do
  		local sum = n*sell.count
1ab9458f   gaofengduan   add 下菜操作
159
160
  		reward[k] = sum
  	end
7bb30dca   zhouhaihai   修改发奖
161
  	reward, change = role:award(reward, {log = {desc = "removeSell"}})
5a307eb6   gaofengduan   fix diner
162
  	sells[slot].count = 0
3133cb76   zhouhaihai   日志
163
  
072db127   zhouhaihai   推送
164
  	role:pushCancel({type = "food", slot = slot})
c59e058b   zhouhaihai   新一批日志记录
165
166
167
168
169
170
171
172
  	role:log("restaurant_sale", {
  		item_id = dish, -- 售卖物品ID
  		restaurant_sale_seat = slot, -- 售卖物品所在位置
  		restaurant_sale_time = temp.deltaTime or 0, -- 售卖时长
  		restaurant_sale_type = 2, -- 售卖方式,正常售卖:0,  加速:1,移除售卖:2
  		restaurant_sale_coin = reward[ItemId.DinerCoin] or 0, -- 售卖获得美食币
  		restaurant_sale_gear = reward[ItemId.Gold] or 0, -- 售卖获得齿轮
  	})
f22a33af   zhouhaihai   自己的日志
173
  	role:mylog("diner_action", {desc = "removeSell", int1 = dish})
3133cb76   zhouhaihai   日志
174
  
1ab9458f   gaofengduan   add 下菜操作
175
  	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
7bb30dca   zhouhaihai   修改发奖
176
  	SendPacket(actionCodes.Diner_removeSellRpc, MsgPack.pack({reward = reward, change = change}))
1ab9458f   gaofengduan   add 下菜操作
177
178
179
  	return true
  end
  
87cc3a35   zhengshouren   餐厅建筑升级逻辑
180
  function _M.getSellRewardRpc( agent, data )
5d57bd79   gaofengduan   add 餐车 getSellRew...
181
  	local role = agent.role
cc796aaf   zhengshouren   增加餐厅任务计数逻辑
182
  	local dirty = false
59835765   zhouhaihai   排行榜
183
  	local reward, popular = "", 0
5d57bd79   gaofengduan   add 餐车 getSellRew...
184
  	local sells = json.decode(role.dinerData:getProperty("sells"))
c59e058b   zhouhaihai   新一批日志记录
185
186
  
  	local deltaTimes = {}
70fb62d1   liuzujun   服务器数据打点
187
188
189
  	for slot, sell in pairs(sells) do
  		local oldCount = sell.count
  		local sellDish = sell.dish
b8c1be12   zhouhaihai   一些 bug
190
191
192
193
194
  		local temp = role.dinerData:updateSell(slot) or {
  			deltaCount = 0,
  			deltaTime = 0,
  			lastCount = 0,
  		}
c59e058b   zhouhaihai   新一批日志记录
195
  		deltaTimes[slot] = temp.deltaTime
70fb62d1   liuzujun   服务器数据打点
196
  		local sellCount = oldCount - temp.lastCount
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
197
198
199
200
          if sellCount > 0 then
              role:mylog("diner_action", {desc = "sell", int1 = sellDish, int2 = sellCount})
              role:mylog("diner_action", {desc = "onSell", short1 = 2, int1 = sellDish, int2 = sellCount, cint1 = tonumber(slot), cint2 = temp.lastCount, cint3 = sell.level})
          end
32161569   gaofengduan   fix diner
201
202
203
  	end
  	sells = json.decode(role.dinerData:getProperty("sells"))
  	for slot, sell in pairs(sells) do
cc796aaf   zhengshouren   增加餐厅任务计数逻辑
204
205
  		local rewards = sell.reward:toNumMap()
  		for k,v in pairs(rewards) do
f5c07b1b   gaofengduan   fix diner
206
  			reward = reward:incrv(k, v)
5d57bd79   gaofengduan   add 餐车 getSellRew...
207
  		end
59835765   zhouhaihai   排行榜
208
  		popular = popular + (sell.popular or 0)
77302523   zhouhaihai   任务
209
  		
cc796aaf   zhengshouren   增加餐厅任务计数逻辑
210
  		if rewards[ItemId.Gold] and rewards[ItemId.Gold] > 0 then
da6362db   gaofengduan   fix dinerData
211
  			if role.dinerData:checkDinerTask(DinerTask.DishWithGold, rewards[ItemId.Gold], sell.dish, nil, true) then
cc796aaf   zhengshouren   增加餐厅任务计数逻辑
212
213
  				dirty = true
  			end
77302523   zhouhaihai   任务
214
215
216
217
218
219
220
  			if role.dinerData:checkDinerTask(DinerTask.DishWithGoldType, rewards[ItemId.Gold], math.ceil(sell.dish / 100), nil, true) then
  				dirty = true
  			end
  			local dishData = csvdb["diner_dishCsv"][sell.dish][sell.level]
  			if role.dinerData:checkDinerTask(DinerTask.DishWithGoldRare, rewards[ItemId.Gold], dishData.rarity, nil, true) then
  				dirty = true
  			end
cc796aaf   zhengshouren   增加餐厅任务计数逻辑
221
  		end
32161569   gaofengduan   fix diner
222
  		sells[slot].reward = ""
59835765   zhouhaihai   排行榜
223
  		sells[slot].popular = 0
c59e058b   zhouhaihai   新一批日志记录
224
225
226
227
228
229
230
231
232
  
  		role:log("restaurant_sale", {
  			item_id = sell.dish, -- 售卖物品ID
  			restaurant_sale_seat = slot, -- 售卖物品所在位置
  			restaurant_sale_time = deltaTimes[slot] or 0, -- 售卖时长
  			restaurant_sale_type = 0, -- 售卖方式,正常售卖:0,  加速:1,移除售卖:2
  			restaurant_sale_coin = rewards[ItemId.DinerCoin] or 0, -- 售卖获得美食币
  			restaurant_sale_gear = rewards[ItemId.Gold] or 0, -- 售卖获得齿轮
  		})
5d57bd79   gaofengduan   add 餐车 getSellRew...
233
  	end
f5c07b1b   gaofengduan   fix diner
234
  	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
3133cb76   zhouhaihai   日志
235
236
  	local gift = reward:toNumMap()
  	for k, v in pairs(gift) do
53e8037e   zhouhaihai   任务
237
238
239
  		if k == ItemId.Gold then
  			role:checkTaskEnter("FoodSellGold", {count = v})
  		end
5d57bd79   gaofengduan   add 餐车 getSellRew...
240
  	end
7bb30dca   zhouhaihai   修改发奖
241
  	local reward, change = role:award(gift, {log = {desc = "dinerSell"}})
3133cb76   zhouhaihai   日志
242
  
32161569   gaofengduan   fix diner
243
  
59835765   zhouhaihai   排行榜
244
245
  	role.dinerData:popularAdd(popular)
  
cc796aaf   zhengshouren   增加餐厅任务计数逻辑
246
  	if dirty then
da6362db   gaofengduan   fix dinerData
247
  		role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
cc796aaf   zhengshouren   增加餐厅任务计数逻辑
248
  	end
3133cb76   zhouhaihai   日志
249
  
70fb62d1   liuzujun   服务器数据打点
250
  	--role:mylog("diner_action", {desc = "sell"})
3133cb76   zhouhaihai   日志
251
  
7bb30dca   zhouhaihai   修改发奖
252
  	SendPacket(actionCodes.Diner_getSellRewardRpc, MsgPack.pack({reward = reward, change = change}))
5d57bd79   gaofengduan   add 餐车 getSellRew...
253
  	return true
87cc3a35   zhengshouren   餐厅建筑升级逻辑
254
255
  end
  
2050d40d   gaofengduan   add diner expedit...
256
257
  function _M.expediteSellRpc( agent, data )
  	local role = agent.role
020fc7ed   gaofengduan   fix diner expedit...
258
  	local count = role.dinerData:getProperty("expedite")
e2e205be   zhangqijia   feat: 玩家等级奖励
259
260
261
262
263
264
265
266
267
268
269
  	local maxIdx = #globalCsv.diner_sell_quick_cost
  
  	-- 增加今日餐厅加速次数
  	local max = maxIdx + role:getBnousUpSpeedNum(UpSpeedType.Restaurant)
  	if count > max then return 1 end
  
  	local costs = clone(globalCsv.diner_sell_quick_cost)
  	if count > maxIdx then
  		for idx = maxIdx+1, count do
  			costs[idx] = costs[maxIdx]
  		end
020fc7ed   gaofengduan   fix diner expedit...
270
  	end
e2e205be   zhangqijia   feat: 玩家等级奖励
271
272
  
  	local diamond = costs[count]
10974097   gaofengduan   fix diner
273
  	if diamond > 0 then
3d8050ef   liuzujun   钻石3改成虹光玉8
274
  		local cost = {[ItemId.Jade] = diamond}
10974097   gaofengduan   fix diner
275
276
277
  		if not role:checkItemEnough(cost) then
  			return 2
  		end
3133cb76   zhouhaihai   日志
278
  		role:costItems(cost, {log = {desc = "dinerSellQ"}})
020fc7ed   gaofengduan   fix diner expedit...
279
  	end
020fc7ed   gaofengduan   fix diner expedit...
280
  
2050d40d   gaofengduan   add diner expedit...
281
  	local dirty = false
59835765   zhouhaihai   排行榜
282
  	local reward,popular = "", 0
2050d40d   gaofengduan   add diner expedit...
283
284
285
286
287
288
  	local sells = json.decode(role.dinerData:getProperty("sells"))
  	for slot, _ in pairs(sells) do
  		role.dinerData:updateSell(slot)
  	end
  	sells = json.decode(role.dinerData:getProperty("sells"))
  	for slot, sell in pairs(sells) do
020fc7ed   gaofengduan   fix diner expedit...
289
  		local result = role.dinerData:expediteSell(slot)
6991df1b   gaofengduan   fix bug
290
291
292
293
294
295
  		if result then
  			local rewards = result.reward:toNumMap()
  			for k,v in pairs(result.reward:toNumMap()) do
  				reward = reward:incrv(k,v)
  			end
  			popular = popular + result.popular
2050d40d   gaofengduan   add diner expedit...
296
  
6991df1b   gaofengduan   fix bug
297
298
299
300
  			if rewards[ItemId.Gold] and rewards[ItemId.Gold] > 0 then
  				if role.dinerData:checkDinerTask(DinerTask.DishWithGold, rewards[ItemId.Gold], sell.dish, nil, true) then
  					dirty = true
  				end
77302523   zhouhaihai   任务
301
302
303
304
305
306
307
  				if role.dinerData:checkDinerTask(DinerTask.DishWithGoldType, rewards[ItemId.Gold], math.ceil(sell.dish / 100), nil, true) then
  					dirty = true
  				end
  				local dishData = csvdb["diner_dishCsv"][sell.dish][sell.level]
  				if role.dinerData:checkDinerTask(DinerTask.DishWithGoldRare, rewards[ItemId.Gold], dishData.rarity, nil, true) then
  					dirty = true
  				end
2050d40d   gaofengduan   add diner expedit...
308
  			end
c59e058b   zhouhaihai   新一批日志记录
309
310
311
312
313
314
315
316
317
  
  			role:log("restaurant_sale", {
  				item_id = sell.dish, -- 售卖物品ID
  				restaurant_sale_seat = slot, -- 售卖物品所在位置
  				restaurant_sale_time = result.deltaTime or 0, -- 售卖时长
  				restaurant_sale_type = 1, -- 售卖方式,正常售卖:0,  加速:1,移除售卖:2
  				restaurant_sale_coin = rewards[ItemId.DinerCoin] or 0, -- 售卖获得美食币
  				restaurant_sale_gear = rewards[ItemId.Gold] or 0, -- 售卖获得齿轮
  			})
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
318
319
320
              if result.expediteCount > 0 then
                  role:mylog("diner_action", {desc = "onSell", short1 = 3, int1 = sell.dish, int2 = result.expediteCount, cint1 = tonumber(slot), cint2 = result.lastCount, cint3 = sell.level})
              end
2050d40d   gaofengduan   add diner expedit...
321
322
323
  		end
  	end
  
020fc7ed   gaofengduan   fix diner expedit...
324
325
326
  	role.dinerData:notifyUpdateProperty("sells", role.dinerData:getProperty("sells"))
  	role.dinerData:setProperty("expedite",count+1)
  	role.dinerData:notifyUpdateProperty("expedite", count+1)
3133cb76   zhouhaihai   日志
327
  	local gift = reward:toNumMap()
317a46a9   liuzujun   添加特权卡
328
329
  
  	-- 特权卡获取加速获得额外道具
e089be2e   liuzujun   取消特权卡餐厅加速获得额外道具功能
330
  	local coef = 1 --role.storeData:getProduceItemSpeedCoef()
3133cb76   zhouhaihai   日志
331
  	for k, v in pairs(gift) do
317a46a9   liuzujun   添加特权卡
332
333
334
335
  		if coef > 1 then
  			v = math.floor(v * coef)
  			gift[k] = v
  		end
f60b89b1   zhouhaihai   奖励副本
336
337
338
  		if k == ItemId.Gold then
  			role:checkTaskEnter("FoodSellGold", {count = v})
  		end
2050d40d   gaofengduan   add diner expedit...
339
  	end
7bb30dca   zhouhaihai   修改发奖
340
341
  	local change
  	reward, change = role:award(gift, {log = {desc = "dinerSell"}})
3133cb76   zhouhaihai   日志
342
  
2050d40d   gaofengduan   add diner expedit...
343
  
59835765   zhouhaihai   排行榜
344
345
  	role.dinerData:popularAdd(popular)
  
2050d40d   gaofengduan   add diner expedit...
346
347
348
  	if dirty then
  		role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
  	end
53e8037e   zhouhaihai   任务
349
  	role:checkTaskEnter("FoodSellQuick")
3133cb76   zhouhaihai   日志
350
  
70fb62d1   liuzujun   服务器数据打点
351
  	role:mylog("diner_action", {desc = "sellQ", int1 = count + 1})
f22a33af   zhouhaihai   自己的日志
352
  
7bb30dca   zhouhaihai   修改发奖
353
  	SendPacket(actionCodes.Diner_expediteSellRpc, MsgPack.pack({reward = reward, change = change, popular = popular}))
2050d40d   gaofengduan   add diner expedit...
354
355
356
  	return true
  end
  
87cc3a35   zhengshouren   餐厅建筑升级逻辑
357
358
359
360
361
  function _M.levelUpRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local index = msg.index
f9c6cac9   zhengshouren   建筑升级增加 其他建筑物等级限制
362
363
  	local buildingSet = csvdb["diner_buildingCsv"][index]
  	if not buildingSet then
87cc3a35   zhengshouren   餐厅建筑升级逻辑
364
365
366
367
368
  		return
  	end
  
  	local buildL = role.dinerData:getProperty("buildL")
  	local curLevel = buildL:getv(index, 1)
f9c6cac9   zhengshouren   建筑升级增加 其他建筑物等级限制
369
  	if curLevel >= #buildingSet then
87cc3a35   zhengshouren   餐厅建筑升级逻辑
370
371
  		return
  	end
f9c6cac9   zhengshouren   建筑升级增加 其他建筑物等级限制
372
373
374
375
376
  	local buildingData = buildingSet[curLevel]
  	if not buildingData then
  		return
  	end
  	if buildingData.upLimit ~= "" then
4a969fc5   gaofengduan   fix diner levelUpRpc
377
  		local id, level = buildingData.upLimit:match("(%d+)=(%d+)")
f9c6cac9   zhengshouren   建筑升级增加 其他建筑物等级限制
378
379
380
381
  		if buildL:getv(tonumber(id), 1) < tonumber(level) then
  			return
  		end
  	end
87cc3a35   zhengshouren   餐厅建筑升级逻辑
382
  
f9c6cac9   zhengshouren   建筑升级增加 其他建筑物等级限制
383
  	local cost = buildingData.starCost:toNumMap()
87cc3a35   zhengshouren   餐厅建筑升级逻辑
384
  	if not role:checkItemEnough(cost) then
289a4927   gaofengduan   fix diner talent
385
  		return
87cc3a35   zhengshouren   餐厅建筑升级逻辑
386
387
  	end
  
3133cb76   zhouhaihai   日志
388
  	role:costItems(cost, {log = {desc = "dinerBuildUp", int1 = index}})
d96fae59   gaofengduan   fix diner levelUpRpc
389
  	role.dinerData:updateProperty({field = "buildL", value = buildL:setv(index, curLevel + 1)})
53e8037e   zhouhaihai   任务
390
  	role:checkTaskEnter("DinerLevelUp", {type = index, level = curLevel + 1})
3133cb76   zhouhaihai   日志
391
  
c59e058b   zhouhaihai   新一批日志记录
392
393
394
395
396
397
398
  	role:log("restaurant_up", {
  		restaurant_up_type = index - 1, --升级部件类型,店面:0, 接客:1, 满意度:2, 宣传:3, 广告:4, 周边:5
  		restaurant_up_gear = cost[ItemId.Gold] or 0, --消耗齿轮数量
  		restaurant_up_coin = cost[ItemId.DinerCoin] or 0, --花费美食币数量
  		restaurant_up_effectbef = curLevel, --升级前加成
  		restaurant_up_effect = curLevel + 1, --升级后加成
  	})
f22a33af   zhouhaihai   自己的日志
399
  	role:mylog("diner_action", {desc = "buildUp", int1 = index, int2 = curLevel + 1})
3133cb76   zhouhaihai   日志
400
  
87cc3a35   zhengshouren   餐厅建筑升级逻辑
401
402
403
404
  	SendPacket(actionCodes.Diner_levelUpRpc, '')
  	return true
  end
  
b67180e8   zhengshouren   餐厅天赋升级
405
406
407
  function _M.talentUpRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
b67180e8   zhengshouren   餐厅天赋升级
408
  	local dish = msg.dish
b67180e8   zhengshouren   餐厅天赋升级
409
  	local dishTree = role.dinerData:getProperty("dishTree")
289a4927   gaofengduan   fix diner talent
410
411
412
413
414
415
  
  	local talentSet = csvdb["diner_talentCsv"][dish]
  	if not talentSet then
  		return 1
  	end
  
289a4927   gaofengduan   fix diner talent
416
417
418
419
420
421
422
423
424
425
426
  	local typ = math.floor(dish/100 + 1)
  	local treeSet = csvdb["diner_treeCsv"][typ]
  	if not treeSet then
  		return 3
  	end
  
  	local treeData = treeSet[dish]
  	if not treeData then
  		return 4
  	end
  
0027e33b   chenyueqi   调理剂生产和使用逻辑优化
427
428
429
430
431
432
433
434
435
436
437
  	-- 调理剂的默认等级是1级
  	local dishLevel = dishTree:getv(dish, treeData.rarity == 2 and 1 or 0)
  	local talentData = talentSet[dishLevel]
  	if not talentData then
  		return 2
  	end
  
  	if not talentSet[dishLevel+1] then
  		return 21
  	end
  
653e7a15   zhouhaihai   talent 前置调整
438
  	local limit = talentData.pointFront:toNumMap()
289a4927   gaofengduan   fix diner talent
439
440
441
442
  	for k,v in pairs(limit) do
  		local lv = dishTree:getv(k, 0)
  		if lv < v then
  			return 5
b67180e8   zhengshouren   餐厅天赋升级
443
  		end
b67180e8   zhengshouren   餐厅天赋升级
444
  	end
289a4927   gaofengduan   fix diner talent
445
  
f02087ed   chenyueqi   调理室解锁技能点增加前置关卡条件判定
446
  	if talentData.levelFront ~= "" then
33be3111   zhouhaihai   修改hangPass 结构
447
  		if not role:checkHangPass(tonumber(talentData.levelFront)) then
f02087ed   chenyueqi   调理室解锁技能点增加前置关卡条件判定
448
449
450
451
  			return 9
  		end
  	end
  
289a4927   gaofengduan   fix diner talent
452
  	local cost = talentData.cost:toNumMap()
b67180e8   zhengshouren   餐厅天赋升级
453
  	if not role:checkItemEnough(cost) then
289a4927   gaofengduan   fix diner talent
454
455
456
  		return 6
  	end
  
dbd0ca58   gaofengduan   car  营养剂制作
457
  	-- 正在贩卖不能升级料理天赋
289a4927   gaofengduan   fix diner talent
458
459
460
461
462
463
  	local sells = json.decode(role.dinerData:getProperty("sells"))
  	for slot, _ in pairs(sells) do
  		role.dinerData:updateSell(slot)
  	end
  	sells = json.decode(role.dinerData:getProperty("sells"))
  	for _, sell in pairs(sells) do
6991df1b   gaofengduan   fix bug
464
  		if sell.dish == msg.dish and sell.count > 0 then
289a4927   gaofengduan   fix diner talent
465
466
  			return 7
  		end
b67180e8   zhengshouren   餐厅天赋升级
467
468
  	end
  
dbd0ca58   gaofengduan   car  营养剂制作
469
  	-- 正在冒险不能升级营养剂天赋
69d686f8   gaofengduan   暂时取消营养剂天赋升级限制
470
471
472
  	-- if talentData.effect:toArray(true,"=")[1] == 2 then
  	-- 	if next(role:getProperty("advTeam")) then return 8 end
  	-- end
dbd0ca58   gaofengduan   car  营养剂制作
473
  
3133cb76   zhouhaihai   日志
474
  	role:costItems(cost, {log = {desc = "talentUp", int1 = dish, int2 = dishLevel + 1}})
b67180e8   zhengshouren   餐厅天赋升级
475
  	role.dinerData:updateProperty({field = "dishTree", value = dishTree:setv(dish, dishLevel + 1)})
08bfcb88   zhouhaihai   策划要求删掉
476
477
478
479
  	-- local treePoint = talentData.tree_point:toNumMap()
  	-- if next(treePoint) then
  	-- 	role:award(treePoint)
  	-- end
b67180e8   zhengshouren   餐厅天赋升级
480
  
d763fb14   zhouhaihai   签到 九宫格
481
  	role:checkTaskEnter("DinerTalentUp", {type = talentData.effect:toArray(true,"=")[1], level = dishLevel + 1})
1e9cb217   chenyueqi   服务器记录控制引导过程
482
  	role:finishGuide(27)
c59e058b   zhouhaihai   新一批日志记录
483
484
485
486
487
488
489
  	role:log("carriage_logistics", {
  		carriage_logistics_type = typ, -- 后勤室制作类型ID,变异:0,通常:1,魔法:2
  		carriage_logistics_itemid = dish, -- 后勤室升级物品或技能ID
  		carriage_logistics_itemlv = dishLevel + 1, -- 升级后物品或技能等级
  		carriage_logistics_gear = cost[ItemId.Gold] or 0, -- 后勤室升级花费齿轮数量
  		carriage_logistics_coin = cost[ItemId.DinerCoin] or 0, -- 后勤室升级花费美食币数量
  	})
f22a33af   zhouhaihai   自己的日志
490
491
  	role:mylog("diner_action", {desc = "talentUp", int1 = dish, int2 = dishLevel + 1})
  
b67180e8   zhengshouren   餐厅天赋升级
492
493
494
495
  	SendPacket(actionCodes.Diner_talentUpRpc, '')
  	return true
  end
  
7d44dca2   zhengshouren   支援技能升级逻辑
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
  function _M.skillUpRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local skill = msg.skill
  	local skillSet = csvdb["diner_skillCsv"][skill]
  	if not skillSet then
  		return
  	end
  
  	local skillTree = role.dinerData:getProperty("skillTree")
  	local skillLevel = skillTree:getv(skill, 1)
  	local skillData = skillSet[skillLevel]
  	if not skillData then
  		return
  	end
  	if skillData.unlock ~= "" then
  		local id, level = skillData.unlock:math("(%d+)=(%d+)")
  		if skillTree:getv(tonumber(id), 1) < tonumber(level) then
  			return
  		end
  	end
  	local cost = skillData.cost:toNumMap()
  	if not role:checkItemEnough(cost) then
  		return
  	end
  
3133cb76   zhouhaihai   日志
523
  	role:costItems(cost, {log = {desc = "dinerSkillUp", int1 = skill, int2 = skillLevel + 1}})
7d44dca2   zhengshouren   支援技能升级逻辑
524
  	role.dinerData:updateProperty({field = "skillTree", value = skillTree:setv(skill, skillLevel + 1)})
f22a33af   zhouhaihai   自己的日志
525
  	role:mylog("diner_action", {desc = "skillUp", int1 = skill, int2 = skillLevel + 1})
7d44dca2   zhengshouren   支援技能升级逻辑
526
527
528
529
530
  
  	SendPacket(actionCodes.Diner_skillUpRpc, '')
  	return true
  end
  
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
531
532
533
534
535
  function _M.lockTaskRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local index = msg.index
  
550ba7e7   zhouhaihai   订单
536
537
538
  	local orders = json.decode(role.dinerData:getProperty("order"))
  
  	if math.illegalNum(index, 1, #orders) then
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
539
540
  		return 1
  	end
550ba7e7   zhouhaihai   订单
541
  	
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
542
543
544
545
  	local order = orders[index]
  	if not order then
  		return 2
  	end
fdb86cad   gaofengduan   fix diner task
546
547
548
549
  	if order.lock == 0 then
  		order.lock = 1
  	else
  		order.lock = 0
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
550
  	end
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
551
  	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
3133cb76   zhouhaihai   日志
552
  
f22a33af   zhouhaihai   自己的日志
553
554
  	role:mylog("diner_action", {desc = "lockTask", int1 = order.id})
  
fdb86cad   gaofengduan   fix diner task
555
  	SendPacket(actionCodes.Diner_lockTaskRpc, MsgPack.pack({lock = order.lock}))
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
556
557
558
  	return true
  end
  
fdb86cad   gaofengduan   fix diner task
559
  function _M.updateTaskRpc( agent, data )
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
560
561
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
562
  	local index = msg.index
550ba7e7   zhouhaihai   订单
563
  	-- 0 接受任务,1 放弃已接受任务,2 完成已接受任务
fdb86cad   gaofengduan   fix diner task
564
  	local cmd = msg.cmd
550ba7e7   zhouhaihai   订单
565
566
  	local orders = json.decode(role.dinerData:getProperty("order"))
  	if math.illegalNum(index, 1, #orders) then
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
567
568
  		return 1
  	end
550ba7e7   zhouhaihai   订单
569
  	
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
570
571
572
573
  	local order = orders[index]
  	if not order then
  		return 2
  	end
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
574
575
576
577
578
579
580
581
  	local taskSet = csvdb["diner_questCsv"][order.lv]
  	if not taskSet then
  		return 4
  	end
  	local taskData = taskSet[order.id]
  	if not taskData then
  		return 5
  	end
289a4927   gaofengduan   fix diner talent
582
  
7bb30dca   zhouhaihai   修改发奖
583
  	local reward, change
fdb86cad   gaofengduan   fix diner task
584
585
586
587
588
589
  	if cmd == 0 then
  		if order.status ~= 0 then
  			return 30
  		end
  		orders[index].status = 1
  		orders[index].lock = 1
3133cb76   zhouhaihai   日志
590
  
f22a33af   zhouhaihai   自己的日志
591
592
  		role:checkTaskEnter("GetOderTask", {rarity = taskData.rarity})
  		role:mylog("diner_action", {desc = "getTask", int1 = order.id})
fdb86cad   gaofengduan   fix diner task
593
594
595
596
597
598
  	elseif cmd == 1 then
  		if order.status ~= 1 then
  			return 31
  		end
  		orders[index].status = 0
  		orders[index].lock = 0
3133cb76   zhouhaihai   日志
599
  
f22a33af   zhouhaihai   自己的日志
600
601
  		role:mylog("diner_action", {desc = "deleteTask", int1 = order.id})
  
fdb86cad   gaofengduan   fix diner task
602
  	elseif cmd == 2 then
452d6146   gaofengduan   fix diner task
603
  		if order.status ~= 1 then
fdb86cad   gaofengduan   fix diner task
604
605
  			return 32
  		end
452d6146   gaofengduan   fix diner task
606
  		if order.n < taskData.value then
fdb86cad   gaofengduan   fix diner task
607
608
  			return 6
  		end
f22a33af   zhouhaihai   自己的日志
609
  		role:mylog("diner_action", {desc = "finishTask", int1 = order.id})
3133cb76   zhouhaihai   日志
610
  
7bb30dca   zhouhaihai   修改发奖
611
  		reward, change = role:award(taskData.reward, {log = {desc = "dinerFinishTask", int1 = order.id}})
452d6146   gaofengduan   fix diner task
612
  		table.remove(orders,index)
f22a33af   zhouhaihai   自己的日志
613
  		role:checkTaskEnter("OverOderTask", {rarity = taskData.rarity})
fdb86cad   gaofengduan   fix diner task
614
615
  	else
  		return 33
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
616
617
  	end
  
c59e058b   zhouhaihai   新一批日志记录
618
619
620
621
  
  	role:log("restaurant_order", {
  		restaurant_order_id = order.id, -- 订单任务ID
  		restaurant_order_status = cmd, -- 订单任务状态,接受:0, 拒绝:1, 完成:2
f22a33af   zhouhaihai   自己的日志
622
623
  		restaurant_order_rwd = reward or {}, -- 订单完成奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
  		restaurant_order_lv = taskData.rarity, -- 订单品质等级,普通:0, 稀有:1, 顶级:2, 豪华:3
9be3f3ea   zhouhaihai   日志需求
624
  		restaurant_order_type = 1, -- 订单任务类型,0:特殊顾客,1:特别订单
c59e058b   zhouhaihai   新一批日志记录
625
626
  	})
  
fdb86cad   gaofengduan   fix diner task
627
  	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
7bb30dca   zhouhaihai   修改发奖
628
  	SendPacket(actionCodes.Diner_updateTaskRpc, MsgPack.pack({reward = reward, change = change}))
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
629
630
631
  	return true
  end
  
fdb86cad   gaofengduan   fix diner task
632
  function _M.refreshTaskRpc( agent, data )
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
633
634
635
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
3d8050ef   liuzujun   钻石3改成虹光玉8
636
  	--local cost = {[ItemId.Jade] = 40}
8efb24c9   liuzujun   天赋系统属性加成改为百分比
637
638
639
  	--if not role:checkItemEnough(cost) then
  	--	return 1
  	--end
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
640
641
  
  	local orders = json.decode(role.dinerData:getProperty("order"))
550ba7e7   zhouhaihai   订单
642
643
  
  	local hadTask = {}
7898054a   zhouhaihai   新随机订单
644
  	local needCount = 0
550ba7e7   zhouhaihai   订单
645
  	for idx, temp in pairs(orders) do
7898054a   zhouhaihai   新随机订单
646
  		if temp.lock ~= 0 or temp.status ~= 0 then
550ba7e7   zhouhaihai   订单
647
  			hadTask[temp.id] = 1
7898054a   zhouhaihai   新随机订单
648
649
  		else
  			needCount = needCount + 1
550ba7e7   zhouhaihai   订单
650
  		end
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
651
652
  	end
  
550ba7e7   zhouhaihai   订单
653
654
  	if needCount <= 0 then return 2 end
  
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
655
656
657
658
659
  	local taskLevel = role.dinerData:getProperty("buildL"):getv(5, 1)
  	local taskData = csvdb["diner_questCsv"][taskLevel]
  	if not taskData then
  		return 3
  	end
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
660
  
550ba7e7   zhouhaihai   订单
661
  	local pool = {}
f4bbb208   zhouhaihai   餐厅任务解锁
662
663
  
  	local dishTree = role.dinerData:getProperty("dishTree")
550ba7e7   zhouhaihai   订单
664
  	for id, temp in pairs(taskData) do
f4bbb208   zhouhaihai   餐厅任务解锁
665
666
667
668
669
670
671
672
  		local unlock = true
  		for _, front in ipairs(temp.front:toArray(true, "=")) do
  			if dishTree:getv(front, 0) == 0 then
  				unlock = false
  				break
  			end
  		end
  		if not hadTask[id] and unlock then
550ba7e7   zhouhaihai   订单
673
674
675
676
677
678
679
680
681
682
683
684
685
  			table.insert(pool, temp)
  		end
  	end
  	local needCount = math.min(#pool, needCount) -- 需要的任务个数
  
  	if needCount <= 0 then return end
  
  	local cost = globalCsv.diner_task_refresh_cost:toNumMap()
  	for itemId, count in pairs(cost) do
  		cost[itemId] = count * needCount
  	end
  	if not role:checkItemEnough(cost) then return end
  
3133cb76   zhouhaihai   日志
686
  	role:costItems(cost, {log = {desc = "dinerReTask"}})
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
687
  
7898054a   zhouhaihai   新随机订单
688
689
690
  
  	for idx, order in ipairs(orders) do
  		if (order.lock == 0 and order.status == 0) then
550ba7e7   zhouhaihai   订单
691
692
693
694
695
696
697
  			if needCount > 0 then
  				local index = math.randWeight(pool, "chance")
  				local data = pool[index]
  				orders[idx] = {lv = taskLevel, id = data.id, n = 0, lock = 0, status = 0}
  				needCount = needCount - 1
  				table.remove(pool, index)
  			end
ca232abd   gaofengduan   fix diner task re...
698
699
  		end
  	end
550ba7e7   zhouhaihai   订单
700
  
1e9cb217   chenyueqi   服务器记录控制引导过程
701
  	role:finishGuide(41)
f22a33af   zhouhaihai   自己的日志
702
703
  	role:mylog("diner_action", {desc = "reTask"})
  
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
704
  	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
289a4927   gaofengduan   fix diner talent
705
706
  
  	SendPacket(actionCodes.Diner_refreshTaskRpc, '')
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
707
708
709
  	return true
  end
  
6d272f65   zhouhaihai   餐厅 食材
710
  function _M.addWantFoodRpc(agent , data)
4288160b   gaofengduan   add Diner_getGree...
711
712
713
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
6d272f65   zhouhaihai   餐厅 食材
714
715
  	local ids = msg.ids -- list
  
4288160b   gaofengduan   add Diner_getGree...
716
717
718
  	local buildType = 6
  	local level = role.dinerData:getProperty("buildL"):getv(buildType, 1)
  	local buildingData = csvdb["diner_buildingCsv"][buildType][level]
6d272f65   zhouhaihai   餐厅 食材
719
  
4288160b   gaofengduan   add Diner_getGree...
720
721
722
  	if not buildingData then
  		return 1
  	end
6d272f65   zhouhaihai   餐厅 食材
723
724
725
726
  
  	if #ids > buildingData.business then return 2 end
  
  	local had = {}
0df83fa9   liuzujun   料理解锁bug
727
728
729
730
731
732
733
734
735
736
737
738
739
740
  	-- 遍历adv_potion 
  	for potionId, potionData in pairs(csvdb["adv_potionCsv"]) do
  		local potionLv = role:getPotionLevel(potionId)
  		if potionLv > 0 then 
  			local cfg = potionData[potionLv]
  			if cfg then
  				local cost = cfg.material:toNumMap()
  				for id, _ in pairs(cost) do
  					local itemData = csvdb["itemCsv"][id]
  					local mData = csvdb["diner_materialCsv"][id]
  					if itemData.type == ItemType.Cuisine and not had[id] then
  						had[id] = true
  					end
  				end
e6845afa   liuzujun   餐厅食材供应商供应食材条件调整
741
  			end
0df83fa9   liuzujun   料理解锁bug
742
743
744
745
746
747
748
749
750
751
752
753
754
  		end
  	end
  	-- 遍历dish
  	for id, lv in pairs(role.dinerData:getProperty("dishTree"):toNumMap()) do
  		if csvdb["diner_dishCsv"][id] and csvdb["diner_dishCsv"][id][lv] then
  			local data = csvdb["diner_dishCsv"][id][lv]
  			local costs = data.material:toNumMap()
  			for id, _ in pairs(costs) do
  				local itemData = csvdb["itemCsv"][id]
  				local mData = csvdb["diner_materialCsv"][id]
  				if itemData.type == ItemType.Cuisine and not had[id] then
  					had[id] = true
  				end
6d272f65   zhouhaihai   餐厅 食材
755
756
757
  			end
  		end
  	end
0df83fa9   liuzujun   料理解锁bug
758
759
760
761
  	for _, itemId in ipairs(ids) do
  		if not had[itemId] then return 3 end 
  	end
  	
6d272f65   zhouhaihai   餐厅 食材
762
763
764
  	local gfood = {}
  	for slot, itemId in ipairs(ids) do
  		gfood[slot] = {id = itemId, st = skynet.timex()}
4288160b   gaofengduan   add Diner_getGree...
765
766
  	end
  
f699d337   chenyueqi   点击食材供应商的引导步骤改为30
767
  	role:finishGuide(30)
f22a33af   zhouhaihai   自己的日志
768
769
  	role:mylog("diner_action", {desc = "wantFood"})
  
6d272f65   zhouhaihai   餐厅 食材
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
  	role.dinerData:updateProperty({field = "gfood", value = gfood})
  
  	SendPacket(actionCodes.Diner_addWantFoodRpc, '')
  	return true
  end
  
  function _M.getGreenhouseRpc( agent, data )
  	local role = agent.role
  	-- local msg = MsgPack.unpack(data)
  
  	local buildType = 6
  	local level = role.dinerData:getProperty("buildL"):getv(buildType, 1)
  	local buildingData = csvdb["diner_buildingCsv"][buildType][level]
  	if not buildingData then
  		return 1
4288160b   gaofengduan   add Diner_getGree...
785
  	end
6d272f65   zhouhaihai   餐厅 食材
786
787
788
789
790
  
  	local reward = {}
  	local now = skynet.timex()
  	local gfood = role.dinerData:getProperty("gfood")
  	if not next(gfood) then return end
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
791
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
792
793
  	local timeAdd = role:getBnousDiner(2,globalCsv.diner_get_food_time_max)
  
6d272f65   zhouhaihai   餐厅 食材
794
795
796
  	for k , v in pairs(gfood) do
  		local itemId = v.id
  		local st = v.st
664e0e07   chenyueqi   电波塔对食材的加成计算错误
797
798
  		local speed = globalCsv.diner_get_food_speed[csvdb["itemCsv"][itemId].quality] * buildingData.speed / 100
  		speed = speed + role:getBnousDiner(1,speed)
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
799
  		local endTime = st + globalCsv.diner_get_food_time_max + timeAdd
6d272f65   zhouhaihai   餐厅 食材
800
801
802
803
804
805
806
  		local endTime2 = math.min(now, endTime)
  		reward[itemId] = math.floor((endTime2 - st) / speed)
  		if endTime2 == endTime then
  			gfood[k].st = now
  		else
  			gfood[k].st = st + speed * reward[itemId]
  		end
c59e058b   zhouhaihai   新一批日志记录
807
808
809
810
811
812
813
814
  
  		role:log("restaurant_material", {
  			item_id = itemId, -- 获取物品ID
  			restaurant_material_start = st, -- 申请获取时间
  			restaurant_material_time = endTime2 - st, -- 申请到领取耗时
  			restaurant_material_num = reward[itemId], -- 获取物品数量
  		})
  
4288160b   gaofengduan   add Diner_getGree...
815
  	end
6d272f65   zhouhaihai   餐厅 食材
816
  	role.dinerData:updateProperty({field = "gfood", value = gfood})
7bb30dca   zhouhaihai   修改发奖
817
  	local reward, change = role:award(reward, {log = {desc = "greenHourse", int1 = level}})
53e8037e   zhouhaihai   任务
818
  	role:checkTaskEnter("FoodMGet")
3133cb76   zhouhaihai   日志
819
  
f22a33af   zhouhaihai   自己的日志
820
  	role:mylog("diner_action", {desc = "greenHourse"})
3133cb76   zhouhaihai   日志
821
  
7bb30dca   zhouhaihai   修改发奖
822
  	SendPacket(actionCodes.Diner_getGreenhouseRpc, MsgPack.pack({reward = reward, change = change}))
4288160b   gaofengduan   add Diner_getGree...
823
824
  	return true
  end
4864d579   zhengshouren   领取任务,锁定任务,获得特殊任务
825
  
03a6166a   zhouhaihai   餐厅优化
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
  local function refreshTaskRpc(role, task)
  	local hadType = {}
  	if task.id and csvdb["task_specialCsv"][task.id] then
  		hadType[csvdb["task_specialCsv"][task.id].type] = 1
  	end
  	local spTask = role:getProperty("spTask")
  	local taskCount = 0
  	for id ,_ in pairs(spTask) do
  		hadType[csvdb["task_specialCsv"][id].type] = 1
  		taskCount = taskCount + 1
  	end
  	local pool = {}
  	if taskCount < globalCsv.diner_get_task_count_max then
  		local curLevel = role:getProperty("level")
  		for id, data in pairs(csvdb["task_specialCsv"]) do
  			if not hadType[data.type] then
  				local level = data.level:toArray(true, "=")
  				if curLevel >= level[1] and curLevel <= level[2] then
  					table.insert(pool, id)
  				end
  			end
  		end
  	end
  	if not next(pool) then --每次进都看看有没有任务可以领
  		task.id = nil
  		task.et = 0
  	else
  		local id = pool[math.randomInt(1, #pool)]
  		task.id = id
  		task.et = skynet.timex() + globalCsv.diner_get_task_time_max
  	end
  	return task
  end
  
  -- 进入餐厅界面调用
  function _M.initTaskRpc(agent, data)
  	local role = agent.role
  
  	local task = role.dinerData:getProperty("task")
  
  	local now = skynet.timex()
  
  	if not task.et or task.et <= now then --刷新了
  		task = refreshTaskRpc(role, task)
  		role.dinerData:updateProperty({field = "task", value = task})
  	end
  
  	SendPacket(actionCodes.Diner_initTaskRpc, '')
  	return true
  end
  
  -- 对任务进行处理调用
  function _M.handleTaskRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local cmd = msg.cmd  -- 1 领取任务  2 拒绝任务
  	
  	local task = role.dinerData:getProperty("task")
  	local now = skynet.timex()
  	if cmd == 1 then
  		if not task.id then return end
  		if task.et > now then
  			--领取任务
  			task.id = nil
  			task.et = now + globalCsv.diner_get_task_time_max
  			task.refuse = nil
  		else
  			return
  		end
  	elseif cmd == 2 then -- 拒绝任务(重新领取)
  		if not task.id then return end
  		if (task.refuse or 0) >= globalCsv.diner_get_task_refuse_max then
  			-- 等待时间
  			task.refuse = nil
  			task.id = nil
  			task.et = now + globalCsv.diner_get_task_time_max
  		else
  			task.refuse = (task.refuse or 0) + 1
  			--刷新任务
  			task = refreshTaskRpc(role, task)
  		end 
  	else
  		return
  	end
  	role.dinerData:updateProperty({field = "task", value = task})
  
  	SendPacket(actionCodes.Diner_handleTaskRpc, '')
  	return true
  end
  
59835765   zhouhaihai   排行榜
916
917
918
919
920
921
922
923
  function _M.rankRpc(agent , data)
  	local role = agent.role
  
  	local rankInfo = role.dinerData:getPopularRank()
  	SendPacket(actionCodes.Diner_rankRpc, MsgPack.pack(rankInfo))
  	return true
  end
  
ed322ed2   zhouhaihai   餐厅 顾客 系统
924
925
926
927
928
929
930
  function _M.entrustRpc(agent , data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local ctype = msg.ctype
  
  	local entrust = role.dinerData:getProperty("entrust")
3133cb76   zhouhaihai   日志
931
932
  	local entrustId = entrust[1]
  	if not entrustId then return end
ed322ed2   zhouhaihai   餐厅 顾客 系统
933
  
7bb30dca   zhouhaihai   修改发奖
934
  	local reward, change
ed322ed2   zhouhaihai   餐厅 顾客 系统
935
  	if ctype == 1 then -- 完成
3133cb76   zhouhaihai   日志
936
  		local curData = csvdb["diner_missionCsv"][entrustId]
ed322ed2   zhouhaihai   餐厅 顾客 系统
937
938
939
940
941
  		if not curData then return end
  
  		if curData.type == 1 then
  			local cost = curData.condition:toNumMap()
  			if not role:checkItemEnough(cost) then return end
3133cb76   zhouhaihai   日志
942
  			role:costItems(cost, {log = {desc = "dinerEntrus", int1 = entrustId}})
ed322ed2   zhouhaihai   餐厅 顾客 系统
943
944
945
946
947
948
  		elseif curData.type == 2 then
  			-- todo 数据校验
  		else
  			return
  		end
  
7bb30dca   zhouhaihai   修改发奖
949
  		reward, change = role:award(curData.reward, {log = {desc = "dinerEntrus", int1 = entrustId}})
4c5d72ab   zhouhaihai   高级pvp
950
  		table.remove(entrust, 1)
9be3f3ea   zhouhaihai   日志需求
951
952
953
954
955
956
957
958
  
  		role:log("restaurant_order", {
  			restaurant_order_id = entrustId, -- 订单任务ID
  			restaurant_order_status = 2, -- 订单任务状态,接受:0, 拒绝:1, 完成:2
  			restaurant_order_rwd = reward or {}, -- 订单完成奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
  			restaurant_order_lv = curData.type, -- 订单品质等级,普通:0, 稀有:1, 顶级:2, 豪华:3
  			restaurant_order_type = 0, -- 订单任务类型,0:特殊顾客,1:特别订单
  		})
ed322ed2   zhouhaihai   餐厅 顾客 系统
959
960
961
962
963
964
965
  	elseif ctype == 2 then		-- 放弃
  		table.remove(entrust, 1)
  	else
  		return 
  	end
  	role.dinerData:updateProperty({field = "entrust", value = entrust})
  
a7b824ac   chenyueqi   记录新手引导步骤的代码存在bug
966
  	role:finishGuide(26)
f22a33af   zhouhaihai   自己的日志
967
  	role:mylog("diner_action", {desc = "entrus", short1 = ctype, int1 = entrustId})
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
968
  	role:checkTaskEnter("VillageApply", {})
a7b824ac   chenyueqi   记录新手引导步骤的代码存在bug
969
  
7bb30dca   zhouhaihai   修改发奖
970
  	SendPacket(actionCodes.Diner_entrustRpc, MsgPack.pack({reward = reward, change = change}))
ed322ed2   zhouhaihai   餐厅 顾客 系统
971
972
973
974
975
976
977
978
  	return true
  end
  
  function _M.collectRpc(agent , data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local id = msg.id
a4e66eda   zhouhaihai   餐厅协议
979
980
  	local customerData = csvdb["diner_customerCsv"][id]
  	if not id or not customerData then return end
ed322ed2   zhouhaihai   餐厅 顾客 系统
981
982
983
984
985
986
987
988
989
990
  	local customer = role.dinerData:getProperty("customer")
  	if customer[id] ~= 0 then
  		return
  	end
  
  	-- 完成前更新一波 后面 加成可能不一样
  	local sells = json.decode(role.dinerData:getProperty("sells"))
  	for slot, _ in pairs(sells) do
  		role.dinerData:updateSell(slot)
  	end
7bb30dca   zhouhaihai   修改发奖
991
  	local reward, change = role:award(customerData.reward, {log = {desc = "dinerCollect", int1 = id}})
ed322ed2   zhouhaihai   餐厅 顾客 系统
992
993
  	customer[id] = 1
  	role.dinerData:updateProperty({field = "customer", value = customer}) -- 解锁了
c59e058b   zhouhaihai   新一批日志记录
994
995
996
997
998
999
1000
1001
  
  	local count = 0
  	for c_, v in pairs(customer) do
  		count = count + 1
  	end
  
  	role:log("restaurant_collect", {
  		restaurant_collect_id = id, -- 图谱收集ID
887c1843   zhouhaihai   日志新一批
1002
  		restaurant_collect_rwd = reward, -- 订单完成奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
c59e058b   zhouhaihai   新一批日志记录
1003
1004
  		restaurant_collect_plan = count, -- 收集进度,即解锁顾客,数字表示
  	})
f22a33af   zhouhaihai   自己的日志
1005
  	role:mylog("diner_action", {desc = "collect", int1 = id})
ed322ed2   zhouhaihai   餐厅 顾客 系统
1006
  
7bb30dca   zhouhaihai   修改发奖
1007
  	SendPacket(actionCodes.Diner_collectRpc, MsgPack.pack({reward = reward, change = change}))
ed322ed2   zhouhaihai   餐厅 顾客 系统
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
  	return true
  end
  
  function _M.comboRewardRpc(agent , data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local id = msg.id
  
  	local comboData = csvdb["diner_customer_comboCsv"][id]
  	if not id or not comboData then return end
  	local comboStatus = role.dinerData:getProperty("comboStatus")
  	if comboStatus[id] == -1 then return end
  
  	local customer = role.dinerData:getProperty("customer")
  
  	for _, nId in ipairs(comboData.customer:toArray(true, "=")) do
  		if customer[nId] ~= 1 then
  			return 
  		end
  	end
  
  	comboStatus[id] = 1
7bb30dca   zhouhaihai   修改发奖
1031
  	local reward, change = role:award(comboData.reward, {log = {desc = "dinerCombo", int1 = id}})
ed322ed2   zhouhaihai   餐厅 顾客 系统
1032
1033
1034
  
  	role.dinerData:updateProperty({field = "comboStatus", value = comboStatus}) -- 解锁了
  
f22a33af   zhouhaihai   自己的日志
1035
1036
  	role:mylog("diner_action", {desc = "combo", int1 = id})
  
7bb30dca   zhouhaihai   修改发奖
1037
  	SendPacket(actionCodes.Diner_comboRewardRpc, MsgPack.pack({reward = reward, change = change}))
ed322ed2   zhouhaihai   餐厅 顾客 系统
1038
1039
1040
1041
  	return true
  end
  
  
59835765   zhouhaihai   排行榜
1042
  
87cc3a35   zhengshouren   餐厅建筑升级逻辑
1043
  return _M