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
43
44
45
46
47
|
local calSell = role.dinerData:updateSell(slot, true) or {
deltaCount = 0,
deltaTime = 0,
lastCount = 0,
}
local count = sellData.count
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
|
|
03a6166a
zhouhaihai
餐厅优化
|
57
58
|
role:costItems(cost)
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
77
|
sells[slot].dish = dish
sells[slot].level = dishLevel
sells[slot].count = count
sells[slot].time = skynet.timex() - calSell.deltaTime
role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
|
36204e3c
zhengshouren
贩卖逻辑
|
78
|
SendPacket(actionCodes.Diner_addSellRpc, "")
|
36204e3c
zhengshouren
贩卖逻辑
|
79
|
return true
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
80
81
|
end
|
1ab9458f
gaofengduan
add 下菜操作
|
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
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 下菜操作
|
96
97
98
99
100
101
102
103
104
105
106
107
108
109
|
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
|
6991df1b
gaofengduan
fix bug
|
110
|
role.dinerData:updateSell(slot)
|
1ab9458f
gaofengduan
add 下菜操作
|
111
112
113
114
115
116
117
|
local reward = {}
local cost = dishData.material:toNumMap()
for k, n in pairs(cost) do
local sum = n*sell.count
role:addItem({itemId = k,count = sum})
reward[k] = sum
end
|
5a307eb6
gaofengduan
fix diner
|
118
|
sells[slot].count = 0
|
1ab9458f
gaofengduan
add 下菜操作
|
119
120
121
122
123
|
role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
SendPacket(actionCodes.Diner_removeSellRpc, MsgPack.pack({reward = reward}))
return true
end
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
124
|
function _M.getSellRewardRpc( agent, data )
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
125
|
local role = agent.role
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
126
|
local dirty = false
|
59835765
zhouhaihai
排行榜
|
127
|
local reward, popular = "", 0
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
128
|
local sells = json.decode(role.dinerData:getProperty("sells"))
|
32161569
gaofengduan
fix diner
|
129
|
for slot, _ in pairs(sells) do
|
0c0b161d
gaofengduan
fix getSellRewardRpc
|
130
|
role.dinerData:updateSell(slot)
|
32161569
gaofengduan
fix diner
|
131
132
133
|
end
sells = json.decode(role.dinerData:getProperty("sells"))
for slot, sell in pairs(sells) do
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
134
135
|
local rewards = sell.reward:toNumMap()
for k,v in pairs(rewards) do
|
f5c07b1b
gaofengduan
fix diner
|
136
|
reward = reward:incrv(k, v)
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
137
|
end
|
59835765
zhouhaihai
排行榜
|
138
|
popular = popular + (sell.popular or 0)
|
77302523
zhouhaihai
任务
|
139
|
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
140
|
if rewards[ItemId.Gold] and rewards[ItemId.Gold] > 0 then
|
da6362db
gaofengduan
fix dinerData
|
141
|
if role.dinerData:checkDinerTask(DinerTask.DishWithGold, rewards[ItemId.Gold], sell.dish, nil, true) then
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
142
143
|
dirty = true
end
|
77302523
zhouhaihai
任务
|
144
145
146
147
148
149
150
|
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
增加餐厅任务计数逻辑
|
151
|
end
|
32161569
gaofengduan
fix diner
|
152
|
sells[slot].reward = ""
|
59835765
zhouhaihai
排行榜
|
153
|
sells[slot].popular = 0
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
154
|
end
|
f5c07b1b
gaofengduan
fix diner
|
155
156
|
role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
for k, v in pairs(reward:toNumMap()) do
|
0c0b161d
gaofengduan
fix getSellRewardRpc
|
157
|
role:addItem({itemId = k,count = v})
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
158
|
end
|
32161569
gaofengduan
fix diner
|
159
|
|
59835765
zhouhaihai
排行榜
|
160
161
|
role.dinerData:popularAdd(popular)
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
162
|
if dirty then
|
da6362db
gaofengduan
fix dinerData
|
163
|
role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
164
165
|
end
|
0c0b161d
gaofengduan
fix getSellRewardRpc
|
166
|
SendPacket(actionCodes.Diner_getSellRewardRpc, MsgPack.pack({reward = reward}))
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
167
|
return true
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
168
169
|
end
|
2050d40d
gaofengduan
add diner expedit...
|
170
171
|
function _M.expediteSellRpc( agent, data )
local role = agent.role
|
020fc7ed
gaofengduan
fix diner expedit...
|
172
173
|
local count = role.dinerData:getProperty("expedite")
local max = #globalCsv.diner_sell_quick_cost
|
2c63e6a0
gaofengduan
fix dienr
|
174
|
if count > max then
|
020fc7ed
gaofengduan
fix diner expedit...
|
175
176
|
return 1
end
|
10974097
gaofengduan
fix diner
|
177
178
179
180
181
182
183
|
local diamond = globalCsv.diner_sell_quick_cost[count]
if diamond > 0 then
local cost = {[ItemId.Diamond] = diamond}
if not role:checkItemEnough(cost) then
return 2
end
role:costItems(cost)
|
020fc7ed
gaofengduan
fix diner expedit...
|
184
|
end
|
020fc7ed
gaofengduan
fix diner expedit...
|
185
|
|
2050d40d
gaofengduan
add diner expedit...
|
186
|
local dirty = false
|
59835765
zhouhaihai
排行榜
|
187
|
local reward,popular = "", 0
|
2050d40d
gaofengduan
add diner expedit...
|
188
189
190
191
192
193
|
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...
|
194
|
local result = role.dinerData:expediteSell(slot)
|
6991df1b
gaofengduan
fix bug
|
195
196
197
198
199
200
|
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...
|
201
|
|
6991df1b
gaofengduan
fix bug
|
202
203
204
205
|
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
任务
|
206
207
208
209
210
211
212
|
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...
|
213
214
215
216
|
end
end
end
|
020fc7ed
gaofengduan
fix diner expedit...
|
217
218
219
|
role.dinerData:notifyUpdateProperty("sells", role.dinerData:getProperty("sells"))
role.dinerData:setProperty("expedite",count+1)
role.dinerData:notifyUpdateProperty("expedite", count+1)
|
2050d40d
gaofengduan
add diner expedit...
|
220
221
222
223
|
for k, v in pairs(reward:toNumMap()) do
role:addItem({itemId = k,count = v})
end
|
59835765
zhouhaihai
排行榜
|
224
225
|
role.dinerData:popularAdd(popular)
|
2050d40d
gaofengduan
add diner expedit...
|
226
227
228
|
if dirty then
role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
end
|
020fc7ed
gaofengduan
fix diner expedit...
|
229
|
SendPacket(actionCodes.Diner_expediteSellRpc, MsgPack.pack({reward = reward,popular = popular}))
|
2050d40d
gaofengduan
add diner expedit...
|
230
231
232
|
return true
end
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
233
234
235
236
237
|
function _M.levelUpRpc( agent, data )
local role = agent.role
local msg = MsgPack.unpack(data)
local index = msg.index
|
f9c6cac9
zhengshouren
建筑升级增加 其他建筑物等级限制
|
238
239
|
local buildingSet = csvdb["diner_buildingCsv"][index]
if not buildingSet then
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
240
241
242
243
244
|
return
end
local buildL = role.dinerData:getProperty("buildL")
local curLevel = buildL:getv(index, 1)
|
f9c6cac9
zhengshouren
建筑升级增加 其他建筑物等级限制
|
245
|
if curLevel >= #buildingSet then
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
246
247
|
return
end
|
f9c6cac9
zhengshouren
建筑升级增加 其他建筑物等级限制
|
248
249
250
251
252
|
local buildingData = buildingSet[curLevel]
if not buildingData then
return
end
if buildingData.upLimit ~= "" then
|
4a969fc5
gaofengduan
fix diner levelUpRpc
|
253
|
local id, level = buildingData.upLimit:match("(%d+)=(%d+)")
|
f9c6cac9
zhengshouren
建筑升级增加 其他建筑物等级限制
|
254
255
256
257
|
if buildL:getv(tonumber(id), 1) < tonumber(level) then
return
end
end
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
258
|
|
f9c6cac9
zhengshouren
建筑升级增加 其他建筑物等级限制
|
259
|
local cost = buildingData.starCost:toNumMap()
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
260
|
if not role:checkItemEnough(cost) then
|
289a4927
gaofengduan
fix diner talent
|
261
|
return
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
262
263
|
end
|
36204e3c
zhengshouren
贩卖逻辑
|
264
|
role:costItems(cost)
|
d96fae59
gaofengduan
fix diner levelUpRpc
|
265
|
role.dinerData:updateProperty({field = "buildL", value = buildL:setv(index, curLevel + 1)})
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
266
267
268
269
270
|
SendPacket(actionCodes.Diner_levelUpRpc, '')
return true
end
|
b67180e8
zhengshouren
餐厅天赋升级
|
271
272
273
|
function _M.talentUpRpc( agent, data )
local role = agent.role
local msg = MsgPack.unpack(data)
|
b67180e8
zhengshouren
餐厅天赋升级
|
274
|
local dish = msg.dish
|
b67180e8
zhengshouren
餐厅天赋升级
|
275
276
|
local dishTree = role.dinerData:getProperty("dishTree")
local dishLevel = dishTree:getv(dish, 0)
|
289a4927
gaofengduan
fix diner talent
|
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
|
local talentSet = csvdb["diner_talentCsv"][dish]
if not talentSet then
return 1
end
local talentData = talentSet[dishLevel]
if not talentData then
return 2
end
if not talentSet[dishLevel+1] then
return 21
end
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
|
653e7a15
zhouhaihai
talent 前置调整
|
303
|
local limit = talentData.pointFront:toNumMap()
|
289a4927
gaofengduan
fix diner talent
|
304
305
306
307
|
for k,v in pairs(limit) do
local lv = dishTree:getv(k, 0)
if lv < v then
return 5
|
b67180e8
zhengshouren
餐厅天赋升级
|
308
|
end
|
b67180e8
zhengshouren
餐厅天赋升级
|
309
|
end
|
289a4927
gaofengduan
fix diner talent
|
310
311
|
local cost = talentData.cost:toNumMap()
|
b67180e8
zhengshouren
餐厅天赋升级
|
312
|
if not role:checkItemEnough(cost) then
|
289a4927
gaofengduan
fix diner talent
|
313
314
315
|
return 6
end
|
dbd0ca58
gaofengduan
car 营养剂制作
|
316
|
-- 正在贩卖不能升级料理天赋
|
289a4927
gaofengduan
fix diner talent
|
317
318
319
320
321
322
|
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
|
323
|
if sell.dish == msg.dish and sell.count > 0 then
|
289a4927
gaofengduan
fix diner talent
|
324
325
|
return 7
end
|
b67180e8
zhengshouren
餐厅天赋升级
|
326
327
|
end
|
dbd0ca58
gaofengduan
car 营养剂制作
|
328
|
-- 正在冒险不能升级营养剂天赋
|
69d686f8
gaofengduan
暂时取消营养剂天赋升级限制
|
329
330
331
|
-- if talentData.effect:toArray(true,"=")[1] == 2 then
-- if next(role:getProperty("advTeam")) then return 8 end
-- end
|
dbd0ca58
gaofengduan
car 营养剂制作
|
332
|
|
b67180e8
zhengshouren
餐厅天赋升级
|
333
334
|
role:costItems(cost)
role.dinerData:updateProperty({field = "dishTree", value = dishTree:setv(dish, dishLevel + 1)})
|
289a4927
gaofengduan
fix diner talent
|
335
|
local treePoint = talentData.tree_point:toNumMap()
|
b67180e8
zhengshouren
餐厅天赋升级
|
336
337
338
339
340
341
342
343
|
if next(treePoint) then
role:award(treePoint)
end
SendPacket(actionCodes.Diner_talentUpRpc, '')
return true
end
|
7d44dca2
zhengshouren
支援技能升级逻辑
|
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
|
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
role:costItems(cost)
role.dinerData:updateProperty({field = "skillTree", value = skillTree:setv(skill, skillLevel + 1)})
SendPacket(actionCodes.Diner_skillUpRpc, '')
return true
end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
378
379
380
381
382
|
function _M.lockTaskRpc( agent, data )
local role = agent.role
local msg = MsgPack.unpack(data)
local index = msg.index
|
550ba7e7
zhouhaihai
订单
|
383
384
385
|
local orders = json.decode(role.dinerData:getProperty("order"))
if math.illegalNum(index, 1, #orders) then
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
386
387
|
return 1
end
|
550ba7e7
zhouhaihai
订单
|
388
|
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
389
390
391
392
|
local order = orders[index]
if not order then
return 2
end
|
fdb86cad
gaofengduan
fix diner task
|
393
394
395
396
|
if order.lock == 0 then
order.lock = 1
else
order.lock = 0
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
397
|
end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
398
|
role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
|
fdb86cad
gaofengduan
fix diner task
|
399
|
SendPacket(actionCodes.Diner_lockTaskRpc, MsgPack.pack({lock = order.lock}))
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
400
401
402
|
return true
end
|
fdb86cad
gaofengduan
fix diner task
|
403
|
function _M.updateTaskRpc( agent, data )
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
404
405
|
local role = agent.role
local msg = MsgPack.unpack(data)
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
406
|
local index = msg.index
|
550ba7e7
zhouhaihai
订单
|
407
|
-- 0 接受任务,1 放弃已接受任务,2 完成已接受任务
|
fdb86cad
gaofengduan
fix diner task
|
408
|
local cmd = msg.cmd
|
550ba7e7
zhouhaihai
订单
|
409
410
|
local orders = json.decode(role.dinerData:getProperty("order"))
if math.illegalNum(index, 1, #orders) then
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
411
412
|
return 1
end
|
550ba7e7
zhouhaihai
订单
|
413
|
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
414
415
416
417
|
local order = orders[index]
if not order then
return 2
end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
418
419
420
421
422
423
424
425
|
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
|
426
|
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
427
|
|
fdb86cad
gaofengduan
fix diner task
|
428
429
430
431
432
433
434
435
436
437
438
439
440
|
if cmd == 0 then
if order.status ~= 0 then
return 30
end
orders[index].status = 1
orders[index].lock = 1
elseif cmd == 1 then
if order.status ~= 1 then
return 31
end
orders[index].status = 0
orders[index].lock = 0
elseif cmd == 2 then
|
452d6146
gaofengduan
fix diner task
|
441
|
if order.status ~= 1 then
|
fdb86cad
gaofengduan
fix diner task
|
442
443
|
return 32
end
|
452d6146
gaofengduan
fix diner task
|
444
|
if order.n < taskData.value then
|
fdb86cad
gaofengduan
fix diner task
|
445
446
447
448
449
|
return 6
end
for typ, count in pairs(taskData.reward:toNumMap()) do
role:addItem({itemId = typ, count = count})
end
|
452d6146
gaofengduan
fix diner task
|
450
|
table.remove(orders,index)
|
fdb86cad
gaofengduan
fix diner task
|
451
452
|
else
return 33
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
453
454
|
end
|
fdb86cad
gaofengduan
fix diner task
|
455
456
|
role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
SendPacket(actionCodes.Diner_updateTaskRpc, '')
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
457
458
459
|
return true
end
|
fdb86cad
gaofengduan
fix diner task
|
460
|
function _M.refreshTaskRpc( agent, data )
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
461
462
463
|
local role = agent.role
local msg = MsgPack.unpack(data)
|
fdb86cad
gaofengduan
fix diner task
|
464
|
local cost = {[ItemId.Diamond] = 40}
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
465
466
467
468
469
|
if not role:checkItemEnough(cost) then
return 1
end
local orders = json.decode(role.dinerData:getProperty("order"))
|
550ba7e7
zhouhaihai
订单
|
470
471
|
local hadTask = {}
|
7898054a
zhouhaihai
新随机订单
|
472
|
local needCount = 0
|
550ba7e7
zhouhaihai
订单
|
473
|
for idx, temp in pairs(orders) do
|
7898054a
zhouhaihai
新随机订单
|
474
|
if temp.lock ~= 0 or temp.status ~= 0 then
|
550ba7e7
zhouhaihai
订单
|
475
|
hadTask[temp.id] = 1
|
7898054a
zhouhaihai
新随机订单
|
476
477
|
else
needCount = needCount + 1
|
550ba7e7
zhouhaihai
订单
|
478
|
end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
479
480
|
end
|
550ba7e7
zhouhaihai
订单
|
481
482
|
if needCount <= 0 then return 2 end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
483
484
485
486
487
|
local taskLevel = role.dinerData:getProperty("buildL"):getv(5, 1)
local taskData = csvdb["diner_questCsv"][taskLevel]
if not taskData then
return 3
end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
488
|
|
550ba7e7
zhouhaihai
订单
|
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
|
local pool = {}
for id, temp in pairs(taskData) do
if not hadTask[id] then
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
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
505
506
|
role:costItems(cost)
|
7898054a
zhouhaihai
新随机订单
|
507
508
509
|
for idx, order in ipairs(orders) do
if (order.lock == 0 and order.status == 0) then
|
550ba7e7
zhouhaihai
订单
|
510
511
512
513
514
515
516
|
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...
|
517
518
|
end
end
|
550ba7e7
zhouhaihai
订单
|
519
|
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
520
|
role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
|
289a4927
gaofengduan
fix diner talent
|
521
522
|
SendPacket(actionCodes.Diner_refreshTaskRpc, '')
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
523
524
525
|
return true
end
|
6d272f65
zhouhaihai
餐厅 食材
|
526
|
function _M.addWantFoodRpc(agent , data)
|
4288160b
gaofengduan
add Diner_getGree...
|
527
528
529
|
local role = agent.role
local msg = MsgPack.unpack(data)
|
6d272f65
zhouhaihai
餐厅 食材
|
530
531
|
local ids = msg.ids -- list
|
4288160b
gaofengduan
add Diner_getGree...
|
532
533
534
|
local buildType = 6
local level = role.dinerData:getProperty("buildL"):getv(buildType, 1)
local buildingData = csvdb["diner_buildingCsv"][buildType][level]
|
6d272f65
zhouhaihai
餐厅 食材
|
535
|
|
4288160b
gaofengduan
add Diner_getGree...
|
536
537
538
|
if not buildingData then
return 1
end
|
6d272f65
zhouhaihai
餐厅 食材
|
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
|
if #ids > buildingData.business then return 2 end
local had = {}
for _, itemId in ipairs(ids) do
if had[itemId] then return end
had[itemId] = 1
local foodData = csvdb["diner_materialCsv"][itemId]
if not foodData then return 3 end
if foodData.unlock ~= 0 then
local hangPass = role:getProperty("hangPass")
if not hangPass[foodData.unlock] then
return 4
end
end
end
local gfood = {}
for slot, itemId in ipairs(ids) do
gfood[slot] = {id = itemId, st = skynet.timex()}
|
4288160b
gaofengduan
add Diner_getGree...
|
558
559
|
end
|
6d272f65
zhouhaihai
餐厅 食材
|
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
|
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...
|
575
|
end
|
6d272f65
zhouhaihai
餐厅 食材
|
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
|
local reward = {}
local now = skynet.timex()
local gfood = role.dinerData:getProperty("gfood")
if not next(gfood) then return end
for k , v in pairs(gfood) do
local itemId = v.id
local st = v.st
local speed = globalCsv.diner_get_food_speed[csvdb["itemCsv"][itemId].quality] * buildingData.speed / 100
local endTime = st + globalCsv.diner_get_food_time_max
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
|
4288160b
gaofengduan
add Diner_getGree...
|
593
|
end
|
6d272f65
zhouhaihai
餐厅 食材
|
594
595
596
|
role.dinerData:updateProperty({field = "gfood", value = gfood})
local reward = role:award(reward)
|
4288160b
gaofengduan
add Diner_getGree...
|
597
598
599
|
SendPacket(actionCodes.Diner_getGreenhouseRpc, MsgPack.pack({reward = reward}))
return true
end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
600
|
|
03a6166a
zhouhaihai
餐厅优化
|
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
|
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
排行榜
|
691
692
693
694
695
696
697
698
699
|
function _M.rankRpc(agent , data)
local role = agent.role
local rankInfo = role.dinerData:getPopularRank()
SendPacket(actionCodes.Diner_rankRpc, MsgPack.pack(rankInfo))
return true
end
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
700
|
return _M
|