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)
|
448dee6b
gaofengduan
fix 餐车快速制作
|
12
13
|
for _,sellData in pairs(msg) do
local slot = sellData.slot
|
5a307eb6
gaofengduan
fix diner
|
14
15
16
|
local sells = json.decode(role.dinerData:getProperty("sells"))
if sells[slot] and sells[slot].count and sells[slot].count ~= 0 then
return 0
|
289a4927
gaofengduan
fix diner talent
|
17
|
end
|
448dee6b
gaofengduan
fix 餐车快速制作
|
18
19
20
21
|
if math.illegalNum(slot, 1, role.dinerData:getMaxSlots()) then
return 1
end
slot = tostring(slot)
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
22
|
|
448dee6b
gaofengduan
fix 餐车快速制作
|
23
24
25
26
27
28
29
30
31
32
33
34
35
|
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
|
36204e3c
zhengshouren
贩卖逻辑
|
36
|
|
448dee6b
gaofengduan
fix 餐车快速制作
|
37
38
39
40
41
42
43
44
45
46
|
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
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
47
|
|
448dee6b
gaofengduan
fix 餐车快速制作
|
48
|
local cost = dishData.material:toNumMap()
|
687835fc
gaofengduan
fix bug cost
|
49
50
|
for k, n in pairs(cost) do
cost[k] = n * count
|
448dee6b
gaofengduan
fix 餐车快速制作
|
51
52
53
54
|
end
if not role:checkItemEnough(cost) then
return 6
end
|
36204e3c
zhengshouren
贩卖逻辑
|
55
|
|
448dee6b
gaofengduan
fix 餐车快速制作
|
56
57
|
role:costItems(cost)
role.dinerData:updateSell(slot)
|
36204e3c
zhengshouren
贩卖逻辑
|
58
|
|
77302523
zhouhaihai
任务
|
59
60
61
62
|
-- local dirty = false
-- if dirty then
-- role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
-- end
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
63
|
|
5a307eb6
gaofengduan
fix diner
|
64
|
sells = json.decode(role.dinerData:getProperty("sells"))
|
448dee6b
gaofengduan
fix 餐车快速制作
|
65
66
|
if not sells[slot] then
sells[slot] = {
|
448dee6b
gaofengduan
fix 餐车快速制作
|
67
|
reward = "",
|
448dee6b
gaofengduan
fix 餐车快速制作
|
68
69
|
}
end
|
5a307eb6
gaofengduan
fix diner
|
70
71
72
73
|
sells[slot].dish = dish
sells[slot].level = dishLevel
sells[slot].count = count
sells[slot].time = skynet.timex() - calSell.deltaTime
|
448dee6b
gaofengduan
fix 餐车快速制作
|
74
|
role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
|
36204e3c
zhengshouren
贩卖逻辑
|
75
|
end
|
36204e3c
zhengshouren
贩卖逻辑
|
76
|
SendPacket(actionCodes.Diner_addSellRpc, "")
|
36204e3c
zhengshouren
贩卖逻辑
|
77
|
return true
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
78
79
|
end
|
1ab9458f
gaofengduan
add 下菜操作
|
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
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 下菜操作
|
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
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
|
108
|
role.dinerData:updateSell(slot)
|
1ab9458f
gaofengduan
add 下菜操作
|
109
110
111
112
113
114
115
|
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
|
116
|
sells[slot].count = 0
|
1ab9458f
gaofengduan
add 下菜操作
|
117
118
119
120
121
|
role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
SendPacket(actionCodes.Diner_removeSellRpc, MsgPack.pack({reward = reward}))
return true
end
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
122
|
function _M.getSellRewardRpc( agent, data )
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
123
|
local role = agent.role
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
124
|
local dirty = false
|
f5c07b1b
gaofengduan
fix diner
|
125
|
local reward = ""
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
126
|
local sells = json.decode(role.dinerData:getProperty("sells"))
|
32161569
gaofengduan
fix diner
|
127
|
for slot, _ in pairs(sells) do
|
0c0b161d
gaofengduan
fix getSellRewardRpc
|
128
|
role.dinerData:updateSell(slot)
|
32161569
gaofengduan
fix diner
|
129
130
131
|
end
sells = json.decode(role.dinerData:getProperty("sells"))
for slot, sell in pairs(sells) do
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
132
133
|
local rewards = sell.reward:toNumMap()
for k,v in pairs(rewards) do
|
f5c07b1b
gaofengduan
fix diner
|
134
|
reward = reward:incrv(k, v)
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
135
|
end
|
77302523
zhouhaihai
任务
|
136
|
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
137
|
if rewards[ItemId.Gold] and rewards[ItemId.Gold] > 0 then
|
da6362db
gaofengduan
fix dinerData
|
138
|
if role.dinerData:checkDinerTask(DinerTask.DishWithGold, rewards[ItemId.Gold], sell.dish, nil, true) then
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
139
140
|
dirty = true
end
|
77302523
zhouhaihai
任务
|
141
142
143
144
145
146
147
|
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
增加餐厅任务计数逻辑
|
148
|
end
|
32161569
gaofengduan
fix diner
|
149
|
sells[slot].reward = ""
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
150
|
end
|
f5c07b1b
gaofengduan
fix diner
|
151
152
|
role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
for k, v in pairs(reward:toNumMap()) do
|
0c0b161d
gaofengduan
fix getSellRewardRpc
|
153
|
role:addItem({itemId = k,count = v})
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
154
|
end
|
32161569
gaofengduan
fix diner
|
155
|
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
156
|
if dirty then
|
da6362db
gaofengduan
fix dinerData
|
157
|
role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
|
cc796aaf
zhengshouren
增加餐厅任务计数逻辑
|
158
159
|
end
|
0c0b161d
gaofengduan
fix getSellRewardRpc
|
160
|
SendPacket(actionCodes.Diner_getSellRewardRpc, MsgPack.pack({reward = reward}))
|
5d57bd79
gaofengduan
add 餐车 getSellRew...
|
161
|
return true
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
162
163
|
end
|
2050d40d
gaofengduan
add diner expedit...
|
164
165
|
function _M.expediteSellRpc( agent, data )
local role = agent.role
|
020fc7ed
gaofengduan
fix diner expedit...
|
166
167
|
local count = role.dinerData:getProperty("expedite")
local max = #globalCsv.diner_sell_quick_cost
|
2c63e6a0
gaofengduan
fix dienr
|
168
|
if count > max then
|
020fc7ed
gaofengduan
fix diner expedit...
|
169
170
|
return 1
end
|
10974097
gaofengduan
fix diner
|
171
172
173
174
175
176
177
|
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...
|
178
|
end
|
020fc7ed
gaofengduan
fix diner expedit...
|
179
|
|
2050d40d
gaofengduan
add diner expedit...
|
180
|
local dirty = false
|
020fc7ed
gaofengduan
fix diner expedit...
|
181
|
local reward,popular = "",0
|
2050d40d
gaofengduan
add diner expedit...
|
182
183
184
185
186
187
|
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...
|
188
|
local result = role.dinerData:expediteSell(slot)
|
6991df1b
gaofengduan
fix bug
|
189
190
191
192
193
194
|
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...
|
195
|
|
6991df1b
gaofengduan
fix bug
|
196
197
198
199
|
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
任务
|
200
201
202
203
204
205
206
|
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...
|
207
208
209
210
|
end
end
end
|
020fc7ed
gaofengduan
fix diner expedit...
|
211
212
213
|
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...
|
214
215
216
217
218
219
220
|
for k, v in pairs(reward:toNumMap()) do
role:addItem({itemId = k,count = v})
end
if dirty then
role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
end
|
020fc7ed
gaofengduan
fix diner expedit...
|
221
|
SendPacket(actionCodes.Diner_expediteSellRpc, MsgPack.pack({reward = reward,popular = popular}))
|
2050d40d
gaofengduan
add diner expedit...
|
222
223
224
|
return true
end
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
225
226
227
228
229
|
function _M.levelUpRpc( agent, data )
local role = agent.role
local msg = MsgPack.unpack(data)
local index = msg.index
|
f9c6cac9
zhengshouren
建筑升级增加 其他建筑物等级限制
|
230
231
|
local buildingSet = csvdb["diner_buildingCsv"][index]
if not buildingSet then
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
232
233
234
235
236
|
return
end
local buildL = role.dinerData:getProperty("buildL")
local curLevel = buildL:getv(index, 1)
|
f9c6cac9
zhengshouren
建筑升级增加 其他建筑物等级限制
|
237
|
if curLevel >= #buildingSet then
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
238
239
|
return
end
|
f9c6cac9
zhengshouren
建筑升级增加 其他建筑物等级限制
|
240
241
242
243
244
|
local buildingData = buildingSet[curLevel]
if not buildingData then
return
end
if buildingData.upLimit ~= "" then
|
4a969fc5
gaofengduan
fix diner levelUpRpc
|
245
|
local id, level = buildingData.upLimit:match("(%d+)=(%d+)")
|
f9c6cac9
zhengshouren
建筑升级增加 其他建筑物等级限制
|
246
247
248
249
|
if buildL:getv(tonumber(id), 1) < tonumber(level) then
return
end
end
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
250
|
|
f9c6cac9
zhengshouren
建筑升级增加 其他建筑物等级限制
|
251
|
local cost = buildingData.starCost:toNumMap()
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
252
|
if not role:checkItemEnough(cost) then
|
289a4927
gaofengduan
fix diner talent
|
253
|
return
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
254
255
|
end
|
36204e3c
zhengshouren
贩卖逻辑
|
256
|
role:costItems(cost)
|
d96fae59
gaofengduan
fix diner levelUpRpc
|
257
|
role.dinerData:updateProperty({field = "buildL", value = buildL:setv(index, curLevel + 1)})
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
258
259
260
261
262
|
SendPacket(actionCodes.Diner_levelUpRpc, '')
return true
end
|
b67180e8
zhengshouren
餐厅天赋升级
|
263
264
265
|
function _M.talentUpRpc( agent, data )
local role = agent.role
local msg = MsgPack.unpack(data)
|
b67180e8
zhengshouren
餐厅天赋升级
|
266
|
local dish = msg.dish
|
b67180e8
zhengshouren
餐厅天赋升级
|
267
268
|
local dishTree = role.dinerData:getProperty("dishTree")
local dishLevel = dishTree:getv(dish, 0)
|
289a4927
gaofengduan
fix diner talent
|
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
|
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 前置调整
|
295
|
local limit = talentData.pointFront:toNumMap()
|
289a4927
gaofengduan
fix diner talent
|
296
297
298
299
|
for k,v in pairs(limit) do
local lv = dishTree:getv(k, 0)
if lv < v then
return 5
|
b67180e8
zhengshouren
餐厅天赋升级
|
300
|
end
|
b67180e8
zhengshouren
餐厅天赋升级
|
301
|
end
|
289a4927
gaofengduan
fix diner talent
|
302
303
|
local cost = talentData.cost:toNumMap()
|
b67180e8
zhengshouren
餐厅天赋升级
|
304
|
if not role:checkItemEnough(cost) then
|
289a4927
gaofengduan
fix diner talent
|
305
306
307
|
return 6
end
|
dbd0ca58
gaofengduan
car 营养剂制作
|
308
|
-- 正在贩卖不能升级料理天赋
|
289a4927
gaofengduan
fix diner talent
|
309
310
311
312
313
314
|
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
|
315
|
if sell.dish == msg.dish and sell.count > 0 then
|
289a4927
gaofengduan
fix diner talent
|
316
317
|
return 7
end
|
b67180e8
zhengshouren
餐厅天赋升级
|
318
319
|
end
|
dbd0ca58
gaofengduan
car 营养剂制作
|
320
|
-- 正在冒险不能升级营养剂天赋
|
69d686f8
gaofengduan
暂时取消营养剂天赋升级限制
|
321
322
323
|
-- if talentData.effect:toArray(true,"=")[1] == 2 then
-- if next(role:getProperty("advTeam")) then return 8 end
-- end
|
dbd0ca58
gaofengduan
car 营养剂制作
|
324
|
|
b67180e8
zhengshouren
餐厅天赋升级
|
325
326
|
role:costItems(cost)
role.dinerData:updateProperty({field = "dishTree", value = dishTree:setv(dish, dishLevel + 1)})
|
289a4927
gaofengduan
fix diner talent
|
327
|
local treePoint = talentData.tree_point:toNumMap()
|
b67180e8
zhengshouren
餐厅天赋升级
|
328
329
330
331
332
333
334
335
|
if next(treePoint) then
role:award(treePoint)
end
SendPacket(actionCodes.Diner_talentUpRpc, '')
return true
end
|
7d44dca2
zhengshouren
支援技能升级逻辑
|
336
337
338
339
340
341
342
343
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
|
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
领取任务,锁定任务,获得特殊任务
|
370
371
372
373
374
|
function _M.lockTaskRpc( agent, data )
local role = agent.role
local msg = MsgPack.unpack(data)
local index = msg.index
|
550ba7e7
zhouhaihai
订单
|
375
376
377
|
local orders = json.decode(role.dinerData:getProperty("order"))
if math.illegalNum(index, 1, #orders) then
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
378
379
|
return 1
end
|
550ba7e7
zhouhaihai
订单
|
380
|
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
381
382
383
384
|
local order = orders[index]
if not order then
return 2
end
|
fdb86cad
gaofengduan
fix diner task
|
385
386
387
388
|
if order.lock == 0 then
order.lock = 1
else
order.lock = 0
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
389
|
end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
390
|
role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
|
fdb86cad
gaofengduan
fix diner task
|
391
|
SendPacket(actionCodes.Diner_lockTaskRpc, MsgPack.pack({lock = order.lock}))
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
392
393
394
|
return true
end
|
fdb86cad
gaofengduan
fix diner task
|
395
|
function _M.updateTaskRpc( agent, data )
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
396
397
|
local role = agent.role
local msg = MsgPack.unpack(data)
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
398
|
local index = msg.index
|
550ba7e7
zhouhaihai
订单
|
399
|
-- 0 接受任务,1 放弃已接受任务,2 完成已接受任务
|
fdb86cad
gaofengduan
fix diner task
|
400
|
local cmd = msg.cmd
|
550ba7e7
zhouhaihai
订单
|
401
402
|
local orders = json.decode(role.dinerData:getProperty("order"))
if math.illegalNum(index, 1, #orders) then
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
403
404
|
return 1
end
|
550ba7e7
zhouhaihai
订单
|
405
|
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
406
407
408
409
|
local order = orders[index]
if not order then
return 2
end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
410
411
412
413
414
415
416
417
|
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
|
418
|
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
419
|
|
fdb86cad
gaofengduan
fix diner task
|
420
421
422
423
424
425
426
427
428
429
430
431
432
|
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
|
433
|
if order.status ~= 1 then
|
fdb86cad
gaofengduan
fix diner task
|
434
435
|
return 32
end
|
452d6146
gaofengduan
fix diner task
|
436
|
if order.n < taskData.value then
|
fdb86cad
gaofengduan
fix diner task
|
437
438
439
440
441
|
return 6
end
for typ, count in pairs(taskData.reward:toNumMap()) do
role:addItem({itemId = typ, count = count})
end
|
452d6146
gaofengduan
fix diner task
|
442
|
table.remove(orders,index)
|
fdb86cad
gaofengduan
fix diner task
|
443
444
|
else
return 33
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
445
446
|
end
|
fdb86cad
gaofengduan
fix diner task
|
447
448
|
role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
SendPacket(actionCodes.Diner_updateTaskRpc, '')
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
449
450
451
|
return true
end
|
fdb86cad
gaofengduan
fix diner task
|
452
|
function _M.refreshTaskRpc( agent, data )
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
453
454
455
|
local role = agent.role
local msg = MsgPack.unpack(data)
|
fdb86cad
gaofengduan
fix diner task
|
456
|
local cost = {[ItemId.Diamond] = 40}
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
457
458
459
460
461
|
if not role:checkItemEnough(cost) then
return 1
end
local orders = json.decode(role.dinerData:getProperty("order"))
|
550ba7e7
zhouhaihai
订单
|
462
463
|
local hadTask = {}
|
7898054a
zhouhaihai
新随机订单
|
464
|
local needCount = 0
|
550ba7e7
zhouhaihai
订单
|
465
|
for idx, temp in pairs(orders) do
|
7898054a
zhouhaihai
新随机订单
|
466
|
if temp.lock ~= 0 or temp.status ~= 0 then
|
550ba7e7
zhouhaihai
订单
|
467
|
hadTask[temp.id] = 1
|
7898054a
zhouhaihai
新随机订单
|
468
469
|
else
needCount = needCount + 1
|
550ba7e7
zhouhaihai
订单
|
470
|
end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
471
472
|
end
|
550ba7e7
zhouhaihai
订单
|
473
474
|
if needCount <= 0 then return 2 end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
475
476
477
478
479
|
local taskLevel = role.dinerData:getProperty("buildL"):getv(5, 1)
local taskData = csvdb["diner_questCsv"][taskLevel]
if not taskData then
return 3
end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
480
|
|
550ba7e7
zhouhaihai
订单
|
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
|
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
领取任务,锁定任务,获得特殊任务
|
497
498
|
role:costItems(cost)
|
7898054a
zhouhaihai
新随机订单
|
499
500
501
|
for idx, order in ipairs(orders) do
if (order.lock == 0 and order.status == 0) then
|
550ba7e7
zhouhaihai
订单
|
502
503
504
505
506
507
508
|
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...
|
509
510
|
end
end
|
550ba7e7
zhouhaihai
订单
|
511
|
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
512
|
role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
|
289a4927
gaofengduan
fix diner talent
|
513
514
|
SendPacket(actionCodes.Diner_refreshTaskRpc, '')
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
515
516
517
|
return true
end
|
4288160b
gaofengduan
add Diner_getGree...
|
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
|
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
end
if buildingData.speed <= 0 then
return 2
end
local reward = ""
local now = skynet.timex()
local timePass = now - role.dinerData:getProperty("gTime")
role.dinerData:setProperty("gTime",now)
role.dinerData:notifyUpdateProperty("gTime",now)
local count = math.floor(timePass/buildingData.speed)
count = math.min(count,buildingData.storage)
for _=1,count do
reward = reward:incrv(string.randWeight(buildingData.gift_normal), 1)
end
for k, v in pairs(reward:toNumMap()) do
role:addItem({itemId = k,count = v})
end
SendPacket(actionCodes.Diner_getGreenhouseRpc, MsgPack.pack({reward = reward}))
return true
end
|
4864d579
zhengshouren
领取任务,锁定任务,获得特殊任务
|
548
|
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
549
|
return _M
|