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 
 | 
  
 
 | 
072db127
 
  zhouhaihai
 
推送
 | 
78
79
80 
 | 
  	local needTime = sells[slot].count * dishData.sell_time + sells[slot].time - skynet.timex()
  	role:pushMsg({type = "food", slot = slot, time = needTime})
  
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
81
82
83
84
85
86
87
88 
 | 
  	-- 检查解锁的顾客
  	local had = {}
  	for _, sell in pairs(sells) do
  		if sell.dish then
  			had[sell.dish] = sell.level
  		end
  	end
  
 
 | 
ae820b73
 
  zhouhaihai
 
bug
 | 
89 
 | 
  	local customer = role.dinerData:getProperty("customer")
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109 
 | 
  	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
 
服务器记录控制引导过程
 | 
110 
 | 
  	role:finishGuide(28)
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
111 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
112
113 
 | 
  	role:mylog("diner_action", {desc = "addSell", int1 = dish, int2 = count})
  
 
 | 
03a6166a
 
  zhouhaihai
 
餐厅优化
 | 
114 
 | 
  	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
 
 | 
36204e3c
 
  zhengshouren
 
贩卖逻辑
 | 
115 
 | 
  	SendPacket(actionCodes.Diner_addSellRpc, "")
 
 | 
36204e3c
 
  zhengshouren
 
贩卖逻辑
 | 
116 
 | 
  	return true
 
 | 
87cc3a35
 
  zhengshouren
 
餐厅建筑升级逻辑
 | 
117
118 
 | 
  end
  
 
 | 
1ab9458f
 
  gaofengduan
 
add 下菜操作
 | 
119
120
121
122
123
124
125
126
127
128
129
130
131
132 
 | 
  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 下菜操作
 | 
133
134
135
136
137
138
139
140
141
142
143
144
145
146 
 | 
  	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
 | 
147
148
149
150
151 
 | 
  	local temp = role.dinerData:updateSell(slot) or {
  		deltaCount = 0,
  		deltaTime = 0,
  		lastCount = 0,
  	}
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
152 
 | 
  	local reward, change = {}
 
 | 
1ab9458f
 
  gaofengduan
 
add 下菜操作
 | 
153
154
155 
 | 
  	local cost = dishData.material:toNumMap()
  	for k, n in pairs(cost) do
  		local sum = n*sell.count
 
 | 
1ab9458f
 
  gaofengduan
 
add 下菜操作
 | 
156
157 
 | 
  		reward[k] = sum
  	end
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
158 
 | 
  	reward, change = role:award(reward, {log = {desc = "removeSell"}})
 
 | 
5a307eb6
 
  gaofengduan
 
fix diner
 | 
159 
 | 
  	sells[slot].count = 0
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
160 
 | 
  
 
 | 
072db127
 
  zhouhaihai
 
推送
 | 
161 
 | 
  	role:pushCancel({type = "food", slot = slot})
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
162
163
164
165
166
167
168
169 
 | 
  	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
 
自己的日志
 | 
170 
 | 
  	role:mylog("diner_action", {desc = "removeSell", int1 = dish})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
171 
 | 
  
 
 | 
1ab9458f
 
  gaofengduan
 
add 下菜操作
 | 
172 
 | 
  	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
173 
 | 
  	SendPacket(actionCodes.Diner_removeSellRpc, MsgPack.pack({reward = reward, change = change}))
 
 | 
1ab9458f
 
  gaofengduan
 
add 下菜操作
 | 
174
175
176 
 | 
  	return true
  end
  
 
 | 
87cc3a35
 
  zhengshouren
 
餐厅建筑升级逻辑
 | 
177 
 | 
  function _M.getSellRewardRpc( agent, data )
 
 | 
5d57bd79
 
  gaofengduan
 
add 餐车 getSellRew...
 | 
178 
 | 
  	local role = agent.role
 
 | 
cc796aaf
 
  zhengshouren
 
增加餐厅任务计数逻辑
 | 
179 
 | 
  	local dirty = false
 
 | 
59835765
 
  zhouhaihai
 
排行榜
 | 
180 
 | 
  	local reward, popular = "", 0
 
 | 
5d57bd79
 
  gaofengduan
 
add 餐车 getSellRew...
 | 
181 
 | 
  	local sells = json.decode(role.dinerData:getProperty("sells"))
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
182
183 
 | 
  
  	local deltaTimes = {}
 
 | 
32161569
 
  gaofengduan
 
fix diner
 | 
184 
 | 
  	for slot, _ in pairs(sells) do
 
 | 
b8c1be12
 
  zhouhaihai
 
一些 bug
 | 
185
186
187
188
189 
 | 
  		local temp = role.dinerData:updateSell(slot) or {
  			deltaCount = 0,
  			deltaTime = 0,
  			lastCount = 0,
  		}
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
190 
 | 
  		deltaTimes[slot] = temp.deltaTime
 
 | 
32161569
 
  gaofengduan
 
fix diner
 | 
191
192
193 
 | 
  	end
  	sells = json.decode(role.dinerData:getProperty("sells"))
  	for slot, sell in pairs(sells) do
 
 | 
cc796aaf
 
  zhengshouren
 
增加餐厅任务计数逻辑
 | 
194
195 
 | 
  		local rewards = sell.reward:toNumMap()
  		for k,v in pairs(rewards) do
 
 | 
f5c07b1b
 
  gaofengduan
 
fix diner
 | 
196 
 | 
  			reward = reward:incrv(k, v)
 
 | 
5d57bd79
 
  gaofengduan
 
add 餐车 getSellRew...
 | 
197 
 | 
  		end
 
 | 
59835765
 
  zhouhaihai
 
排行榜
 | 
198 
 | 
  		popular = popular + (sell.popular or 0)
 
 | 
77302523
 
  zhouhaihai
 
任务
 | 
199 
 | 
  		
 
 | 
cc796aaf
 
  zhengshouren
 
增加餐厅任务计数逻辑
 | 
200 
 | 
  		if rewards[ItemId.Gold] and rewards[ItemId.Gold] > 0 then
 
 | 
da6362db
 
  gaofengduan
 
fix dinerData
 | 
201 
 | 
  			if role.dinerData:checkDinerTask(DinerTask.DishWithGold, rewards[ItemId.Gold], sell.dish, nil, true) then
 
 | 
cc796aaf
 
  zhengshouren
 
增加餐厅任务计数逻辑
 | 
202
203 
 | 
  				dirty = true
  			end
 
 | 
77302523
 
  zhouhaihai
 
任务
 | 
204
205
206
207
208
209
210 
 | 
  			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
 
增加餐厅任务计数逻辑
 | 
211 
 | 
  		end
 
 | 
32161569
 
  gaofengduan
 
fix diner
 | 
212 
 | 
  		sells[slot].reward = ""
 
 | 
59835765
 
  zhouhaihai
 
排行榜
 | 
213 
 | 
  		sells[slot].popular = 0
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
214
215
216
217
218
219
220
221
222 
 | 
  
  		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...
 | 
223 
 | 
  	end
 
 | 
f5c07b1b
 
  gaofengduan
 
fix diner
 | 
224 
 | 
  	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
225
226 
 | 
  	local gift = reward:toNumMap()
  	for k, v in pairs(gift) do
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
227
228
229 
 | 
  		if k == ItemId.Gold then
  			role:checkTaskEnter("FoodSellGold", {count = v})
  		end
 
 | 
5d57bd79
 
  gaofengduan
 
add 餐车 getSellRew...
 | 
230 
 | 
  	end
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
231 
 | 
  	local reward, change = role:award(gift, {log = {desc = "dinerSell"}})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
232 
 | 
  
 
 | 
32161569
 
  gaofengduan
 
fix diner
 | 
233 
 | 
  
 
 | 
59835765
 
  zhouhaihai
 
排行榜
 | 
234
235 
 | 
  	role.dinerData:popularAdd(popular)
  
 
 | 
cc796aaf
 
  zhengshouren
 
增加餐厅任务计数逻辑
 | 
236 
 | 
  	if dirty then
 
 | 
da6362db
 
  gaofengduan
 
fix dinerData
 | 
237 
 | 
  		role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
 
 | 
cc796aaf
 
  zhengshouren
 
增加餐厅任务计数逻辑
 | 
238 
 | 
  	end
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
239 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
240 
 | 
  	role:mylog("diner_action", {desc = "sell"})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
241 
 | 
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
242 
 | 
  	SendPacket(actionCodes.Diner_getSellRewardRpc, MsgPack.pack({reward = reward, change = change}))
 
 | 
5d57bd79
 
  gaofengduan
 
add 餐车 getSellRew...
 | 
243 
 | 
  	return true
 
 | 
87cc3a35
 
  zhengshouren
 
餐厅建筑升级逻辑
 | 
244
245 
 | 
  end
  
 
 | 
2050d40d
 
  gaofengduan
 
add diner expedit...
 | 
246
247 
 | 
  function _M.expediteSellRpc( agent, data )
  	local role = agent.role
 
 | 
020fc7ed
 
  gaofengduan
 
fix diner expedit...
 | 
248
249 
 | 
  	local count = role.dinerData:getProperty("expedite")
  	local max = #globalCsv.diner_sell_quick_cost
 
 | 
2c63e6a0
 
  gaofengduan
 
fix dienr
 | 
250 
 | 
  	if count > max then
 
 | 
020fc7ed
 
  gaofengduan
 
fix diner expedit...
 | 
251
252 
 | 
  		return 1
  	end
 
 | 
10974097
 
  gaofengduan
 
fix diner
 | 
253
254
255
256
257
258 
 | 
  	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
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
259 
 | 
  		role:costItems(cost, {log = {desc = "dinerSellQ"}})
 
 | 
020fc7ed
 
  gaofengduan
 
fix diner expedit...
 | 
260 
 | 
  	end
 
 | 
020fc7ed
 
  gaofengduan
 
fix diner expedit...
 | 
261 
 | 
  
 
 | 
2050d40d
 
  gaofengduan
 
add diner expedit...
 | 
262 
 | 
  	local dirty = false
 
 | 
59835765
 
  zhouhaihai
 
排行榜
 | 
263 
 | 
  	local reward,popular = "", 0
 
 | 
2050d40d
 
  gaofengduan
 
add diner expedit...
 | 
264
265
266
267
268
269 
 | 
  	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...
 | 
270 
 | 
  		local result = role.dinerData:expediteSell(slot)
 
 | 
6991df1b
 
  gaofengduan
 
fix bug
 | 
271
272
273
274
275
276 
 | 
  		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...
 | 
277 
 | 
  
 
 | 
6991df1b
 
  gaofengduan
 
fix bug
 | 
278
279
280
281 
 | 
  			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
 
任务
 | 
282
283
284
285
286
287
288 
 | 
  				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...
 | 
289 
 | 
  			end
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
290
291
292
293
294
295
296
297
298 
 | 
  
  			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, -- 售卖获得齿轮
  			})
 
 | 
2050d40d
 
  gaofengduan
 
add diner expedit...
 | 
299
300
301 
 | 
  		end
  	end
  
 
 | 
020fc7ed
 
  gaofengduan
 
fix diner expedit...
 | 
302
303
304 
 | 
  	role.dinerData:notifyUpdateProperty("sells", role.dinerData:getProperty("sells"))
  	role.dinerData:setProperty("expedite",count+1)
  	role.dinerData:notifyUpdateProperty("expedite", count+1)
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
305 
 | 
  	local gift = reward:toNumMap()
 
 | 
317a46a9
 
  测试
 
添加特权卡
 | 
306
307
308 
 | 
  
  	-- 特权卡获取加速获得额外道具
  	local coef = role.storeData:getProduceItemSpeedCoef()
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
309 
 | 
  	for k, v in pairs(gift) do
 
 | 
317a46a9
 
  测试
 
添加特权卡
 | 
310
311
312
313 
 | 
  		if coef > 1 then
  			v = math.floor(v * coef)
  			gift[k] = v
  		end
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
314
315
316 
 | 
  		if k == ItemId.Gold then
  			role:checkTaskEnter("FoodSellGold", {count = v})
  		end
 
 | 
2050d40d
 
  gaofengduan
 
add diner expedit...
 | 
317 
 | 
  	end
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
318
319 
 | 
  	local change
  	reward, change = role:award(gift, {log = {desc = "dinerSell"}})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
320 
 | 
  
 
 | 
2050d40d
 
  gaofengduan
 
add diner expedit...
 | 
321 
 | 
  
 
 | 
59835765
 
  zhouhaihai
 
排行榜
 | 
322
323 
 | 
  	role.dinerData:popularAdd(popular)
  
 
 | 
2050d40d
 
  gaofengduan
 
add diner expedit...
 | 
324
325
326 
 | 
  	if dirty then
  		role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
  	end
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
327 
 | 
  	role:checkTaskEnter("FoodSellQuick")
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
328 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
329
330 
 | 
  	role:mylog("diner_action", {desc = "sellQ"})
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
331 
 | 
  	SendPacket(actionCodes.Diner_expediteSellRpc, MsgPack.pack({reward = reward, change = change, popular = popular}))
 
 | 
2050d40d
 
  gaofengduan
 
add diner expedit...
 | 
332
333
334 
 | 
  	return true
  end
  
 
 | 
87cc3a35
 
  zhengshouren
 
餐厅建筑升级逻辑
 | 
335
336
337
338
339 
 | 
  function _M.levelUpRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local index = msg.index
 
 | 
f9c6cac9
 
  zhengshouren
 
建筑升级增加 其他建筑物等级限制
 | 
340
341 
 | 
  	local buildingSet = csvdb["diner_buildingCsv"][index]
  	if not buildingSet then
 
 | 
87cc3a35
 
  zhengshouren
 
餐厅建筑升级逻辑
 | 
342
343
344
345
346 
 | 
  		return
  	end
  
  	local buildL = role.dinerData:getProperty("buildL")
  	local curLevel = buildL:getv(index, 1)
 
 | 
f9c6cac9
 
  zhengshouren
 
建筑升级增加 其他建筑物等级限制
 | 
347 
 | 
  	if curLevel >= #buildingSet then
 
 | 
87cc3a35
 
  zhengshouren
 
餐厅建筑升级逻辑
 | 
348
349 
 | 
  		return
  	end
 
 | 
f9c6cac9
 
  zhengshouren
 
建筑升级增加 其他建筑物等级限制
 | 
350
351
352
353
354 
 | 
  	local buildingData = buildingSet[curLevel]
  	if not buildingData then
  		return
  	end
  	if buildingData.upLimit ~= "" then
 
 | 
4a969fc5
 
  gaofengduan
 
fix diner levelUpRpc
 | 
355 
 | 
  		local id, level = buildingData.upLimit:match("(%d+)=(%d+)")
 
 | 
f9c6cac9
 
  zhengshouren
 
建筑升级增加 其他建筑物等级限制
 | 
356
357
358
359 
 | 
  		if buildL:getv(tonumber(id), 1) < tonumber(level) then
  			return
  		end
  	end
 
 | 
87cc3a35
 
  zhengshouren
 
餐厅建筑升级逻辑
 | 
360 
 | 
  
 
 | 
f9c6cac9
 
  zhengshouren
 
建筑升级增加 其他建筑物等级限制
 | 
361 
 | 
  	local cost = buildingData.starCost:toNumMap()
 
 | 
87cc3a35
 
  zhengshouren
 
餐厅建筑升级逻辑
 | 
362 
 | 
  	if not role:checkItemEnough(cost) then
 
 | 
289a4927
 
  gaofengduan
 
fix diner talent
 | 
363 
 | 
  		return
 
 | 
87cc3a35
 
  zhengshouren
 
餐厅建筑升级逻辑
 | 
364
365 
 | 
  	end
  
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
366 
 | 
  	role:costItems(cost, {log = {desc = "dinerBuildUp", int1 = index}})
 
 | 
d96fae59
 
  gaofengduan
 
fix diner levelUpRpc
 | 
367 
 | 
  	role.dinerData:updateProperty({field = "buildL", value = buildL:setv(index, curLevel + 1)})
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
368 
 | 
  	role:checkTaskEnter("DinerLevelUp", {type = index, level = curLevel + 1})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
369 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
370
371
372
373
374
375
376 
 | 
  	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
 
自己的日志
 | 
377 
 | 
  	role:mylog("diner_action", {desc = "buildUp", int1 = index, int2 = curLevel + 1})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
378 
 | 
  
 
 | 
87cc3a35
 
  zhengshouren
 
餐厅建筑升级逻辑
 | 
379
380
381
382 
 | 
  	SendPacket(actionCodes.Diner_levelUpRpc, '')
  	return true
  end
  
 
 | 
b67180e8
 
  zhengshouren
 
餐厅天赋升级
 | 
383
384
385 
 | 
  function _M.talentUpRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
 
 | 
b67180e8
 
  zhengshouren
 
餐厅天赋升级
 | 
386 
 | 
  	local dish = msg.dish
 
 | 
b67180e8
 
  zhengshouren
 
餐厅天赋升级
 | 
387
388 
 | 
  	local dishTree = role.dinerData:getProperty("dishTree")
  	local dishLevel = dishTree:getv(dish, 0)
 
 | 
289a4927
 
  gaofengduan
 
fix diner talent
 | 
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414 
 | 
  
  	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 前置调整
 | 
415 
 | 
  	local limit = talentData.pointFront:toNumMap()
 
 | 
289a4927
 
  gaofengduan
 
fix diner talent
 | 
416
417
418
419 
 | 
  	for k,v in pairs(limit) do
  		local lv = dishTree:getv(k, 0)
  		if lv < v then
  			return 5
 
 | 
b67180e8
 
  zhengshouren
 
餐厅天赋升级
 | 
420 
 | 
  		end
 
 | 
b67180e8
 
  zhengshouren
 
餐厅天赋升级
 | 
421 
 | 
  	end
 
 | 
289a4927
 
  gaofengduan
 
fix diner talent
 | 
422 
 | 
  
 
 | 
f02087ed
 
  chenyueqi
 
调理室解锁技能点增加前置关卡条件判定
 | 
423 
 | 
  	if talentData.levelFront ~= "" then
 
 | 
33be3111
 
  zhouhaihai
 
修改hangPass 结构
 | 
424 
 | 
  		if not role:checkHangPass(tonumber(talentData.levelFront)) then
 
 | 
f02087ed
 
  chenyueqi
 
调理室解锁技能点增加前置关卡条件判定
 | 
425
426
427
428 
 | 
  			return 9
  		end
  	end
  
 
 | 
289a4927
 
  gaofengduan
 
fix diner talent
 | 
429 
 | 
  	local cost = talentData.cost:toNumMap()
 
 | 
b67180e8
 
  zhengshouren
 
餐厅天赋升级
 | 
430 
 | 
  	if not role:checkItemEnough(cost) then
 
 | 
289a4927
 
  gaofengduan
 
fix diner talent
 | 
431
432
433 
 | 
  		return 6
  	end
  
 
 | 
dbd0ca58
 
  gaofengduan
 
car  营养剂制作
 | 
434 
 | 
  	-- 正在贩卖不能升级料理天赋
 
 | 
289a4927
 
  gaofengduan
 
fix diner talent
 | 
435
436
437
438
439
440 
 | 
  	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
 | 
441 
 | 
  		if sell.dish == msg.dish and sell.count > 0 then
 
 | 
289a4927
 
  gaofengduan
 
fix diner talent
 | 
442
443 
 | 
  			return 7
  		end
 
 | 
b67180e8
 
  zhengshouren
 
餐厅天赋升级
 | 
444
445 
 | 
  	end
  
 
 | 
dbd0ca58
 
  gaofengduan
 
car  营养剂制作
 | 
446 
 | 
  	-- 正在冒险不能升级营养剂天赋
 
 | 
69d686f8
 
  gaofengduan
 
暂时取消营养剂天赋升级限制
 | 
447
448
449 
 | 
  	-- if talentData.effect:toArray(true,"=")[1] == 2 then
  	-- 	if next(role:getProperty("advTeam")) then return 8 end
  	-- end
 
 | 
dbd0ca58
 
  gaofengduan
 
car  营养剂制作
 | 
450 
 | 
  
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
451 
 | 
  	role:costItems(cost, {log = {desc = "talentUp", int1 = dish, int2 = dishLevel + 1}})
 
 | 
b67180e8
 
  zhengshouren
 
餐厅天赋升级
 | 
452 
 | 
  	role.dinerData:updateProperty({field = "dishTree", value = dishTree:setv(dish, dishLevel + 1)})
 
 | 
08bfcb88
 
  zhouhaihai
 
策划要求删掉
 | 
453
454
455
456 
 | 
  	-- local treePoint = talentData.tree_point:toNumMap()
  	-- if next(treePoint) then
  	-- 	role:award(treePoint)
  	-- end
 
 | 
b67180e8
 
  zhengshouren
 
餐厅天赋升级
 | 
457 
 | 
  
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
458 
 | 
  	role:checkTaskEnter("DinerTalentUp", {type = talentData.effect:toArray(true,"=")[1], level = dishLevel + 1})
 
 | 
1e9cb217
 
  chenyueqi
 
服务器记录控制引导过程
 | 
459 
 | 
  	role:finishGuide(27)
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
460
461
462
463
464
465
466 
 | 
  	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
 
自己的日志
 | 
467
468 
 | 
  	role:mylog("diner_action", {desc = "talentUp", int1 = dish, int2 = dishLevel + 1})
  
 
 | 
b67180e8
 
  zhengshouren
 
餐厅天赋升级
 | 
469
470
471
472 
 | 
  	SendPacket(actionCodes.Diner_talentUpRpc, '')
  	return true
  end
  
 
 | 
7d44dca2
 
  zhengshouren
 
支援技能升级逻辑
 | 
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499 
 | 
  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
 
日志
 | 
500 
 | 
  	role:costItems(cost, {log = {desc = "dinerSkillUp", int1 = skill, int2 = skillLevel + 1}})
 
 | 
7d44dca2
 
  zhengshouren
 
支援技能升级逻辑
 | 
501 
 | 
  	role.dinerData:updateProperty({field = "skillTree", value = skillTree:setv(skill, skillLevel + 1)})
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
502 
 | 
  	role:mylog("diner_action", {desc = "skillUp", int1 = skill, int2 = skillLevel + 1})
 
 | 
7d44dca2
 
  zhengshouren
 
支援技能升级逻辑
 | 
503
504
505
506
507 
 | 
  
  	SendPacket(actionCodes.Diner_skillUpRpc, '')
  	return true
  end
  
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
508
509
510
511
512 
 | 
  function _M.lockTaskRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local index = msg.index
  
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
513
514
515 
 | 
  	local orders = json.decode(role.dinerData:getProperty("order"))
  
  	if math.illegalNum(index, 1, #orders) then
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
516
517 
 | 
  		return 1
  	end
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
518 
 | 
  	
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
519
520
521
522 
 | 
  	local order = orders[index]
  	if not order then
  		return 2
  	end
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
523
524
525
526 
 | 
  	if order.lock == 0 then
  		order.lock = 1
  	else
  		order.lock = 0
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
527 
 | 
  	end
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
528 
 | 
  	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
529 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
530
531 
 | 
  	role:mylog("diner_action", {desc = "lockTask", int1 = order.id})
  
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
532 
 | 
  	SendPacket(actionCodes.Diner_lockTaskRpc, MsgPack.pack({lock = order.lock}))
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
533
534
535 
 | 
  	return true
  end
  
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
536 
 | 
  function _M.updateTaskRpc( agent, data )
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
537
538 
 | 
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
539 
 | 
  	local index = msg.index
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
540 
 | 
  	-- 0 接受任务,1 放弃已接受任务,2 完成已接受任务
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
541 
 | 
  	local cmd = msg.cmd
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
542
543 
 | 
  	local orders = json.decode(role.dinerData:getProperty("order"))
  	if math.illegalNum(index, 1, #orders) then
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
544
545 
 | 
  		return 1
  	end
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
546 
 | 
  	
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
547
548
549
550 
 | 
  	local order = orders[index]
  	if not order then
  		return 2
  	end
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
551
552
553
554
555
556
557
558 
 | 
  	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
 | 
559 
 | 
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
560 
 | 
  	local reward, change
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
561
562
563
564
565
566 
 | 
  	if cmd == 0 then
  		if order.status ~= 0 then
  			return 30
  		end
  		orders[index].status = 1
  		orders[index].lock = 1
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
567 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
568
569 
 | 
  		role:checkTaskEnter("GetOderTask", {rarity = taskData.rarity})
  		role:mylog("diner_action", {desc = "getTask", int1 = order.id})
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
570
571
572
573
574
575 
 | 
  	elseif cmd == 1 then
  		if order.status ~= 1 then
  			return 31
  		end
  		orders[index].status = 0
  		orders[index].lock = 0
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
576 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
577
578 
 | 
  		role:mylog("diner_action", {desc = "deleteTask", int1 = order.id})
  
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
579 
 | 
  	elseif cmd == 2 then
 
 | 
452d6146
 
  gaofengduan
 
fix diner task
 | 
580 
 | 
  		if order.status ~= 1 then
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
581
582 
 | 
  			return 32
  		end
 
 | 
452d6146
 
  gaofengduan
 
fix diner task
 | 
583 
 | 
  		if order.n < taskData.value then
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
584
585 
 | 
  			return 6
  		end
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
586 
 | 
  		role:mylog("diner_action", {desc = "finishTask", int1 = order.id})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
587 
 | 
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
588 
 | 
  		reward, change = role:award(taskData.reward, {log = {desc = "dinerFinishTask", int1 = order.id}})
 
 | 
452d6146
 
  gaofengduan
 
fix diner task
 | 
589 
 | 
  		table.remove(orders,index)
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
590 
 | 
  		role:checkTaskEnter("OverOderTask", {rarity = taskData.rarity})
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
591
592 
 | 
  	else
  		return 33
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
593
594 
 | 
  	end
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
595
596
597
598 
 | 
  
  	role:log("restaurant_order", {
  		restaurant_order_id = order.id, -- 订单任务ID
  		restaurant_order_status = cmd, -- 订单任务状态,接受:0, 拒绝:1, 完成:2
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
599
600 
 | 
  		restaurant_order_rwd = reward or {}, -- 订单完成奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
  		restaurant_order_lv = taskData.rarity, -- 订单品质等级,普通:0, 稀有:1, 顶级:2, 豪华:3
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
601
602 
 | 
  	})
  
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
603 
 | 
  	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
604 
 | 
  	SendPacket(actionCodes.Diner_updateTaskRpc, MsgPack.pack({reward = reward, change = change}))
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
605
606
607 
 | 
  	return true
  end
  
 
 | 
fdb86cad
 
  gaofengduan
 
fix diner task
 | 
608 
 | 
  function _M.refreshTaskRpc( agent, data )
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
609
610
611 
 | 
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
 
 | 
8efb24c9
 
  测试
 
天赋系统属性加成改为百分比
 | 
612
613
614
615 
 | 
  	--local cost = {[ItemId.Diamond] = 40}
  	--if not role:checkItemEnough(cost) then
  	--	return 1
  	--end
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
616
617 
 | 
  
  	local orders = json.decode(role.dinerData:getProperty("order"))
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
618
619 
 | 
  
  	local hadTask = {}
 
 | 
7898054a
 
  zhouhaihai
 
新随机订单
 | 
620 
 | 
  	local needCount = 0
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
621 
 | 
  	for idx, temp in pairs(orders) do
 
 | 
7898054a
 
  zhouhaihai
 
新随机订单
 | 
622 
 | 
  		if temp.lock ~= 0 or temp.status ~= 0 then
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
623 
 | 
  			hadTask[temp.id] = 1
 
 | 
7898054a
 
  zhouhaihai
 
新随机订单
 | 
624
625 
 | 
  		else
  			needCount = needCount + 1
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
626 
 | 
  		end
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
627
628 
 | 
  	end
  
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
629
630 
 | 
  	if needCount <= 0 then return 2 end
  
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
631
632
633
634
635 
 | 
  	local taskLevel = role.dinerData:getProperty("buildL"):getv(5, 1)
  	local taskData = csvdb["diner_questCsv"][taskLevel]
  	if not taskData then
  		return 3
  	end
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
636 
 | 
  
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
637 
 | 
  	local pool = {}
 
 | 
f4bbb208
 
  zhouhaihai
 
餐厅任务解锁
 | 
638
639 
 | 
  
  	local dishTree = role.dinerData:getProperty("dishTree")
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
640 
 | 
  	for id, temp in pairs(taskData) do
 
 | 
f4bbb208
 
  zhouhaihai
 
餐厅任务解锁
 | 
641
642
643
644
645
646
647
648 
 | 
  		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
 
订单
 | 
649
650
651
652
653
654
655
656
657
658
659
660
661 
 | 
  			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
 
日志
 | 
662 
 | 
  	role:costItems(cost, {log = {desc = "dinerReTask"}})
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
663 
 | 
  
 
 | 
7898054a
 
  zhouhaihai
 
新随机订单
 | 
664
665
666 
 | 
  
  	for idx, order in ipairs(orders) do
  		if (order.lock == 0 and order.status == 0) then
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
667
668
669
670
671
672
673 
 | 
  			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...
 | 
674
675 
 | 
  		end
  	end
 
 | 
550ba7e7
 
  zhouhaihai
 
订单
 | 
676 
 | 
  
 
 | 
1e9cb217
 
  chenyueqi
 
服务器记录控制引导过程
 | 
677 
 | 
  	role:finishGuide(41)
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
678
679 
 | 
  	role:mylog("diner_action", {desc = "reTask"})
  
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
680 
 | 
  	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
 
 | 
289a4927
 
  gaofengduan
 
fix diner talent
 | 
681
682 
 | 
  
  	SendPacket(actionCodes.Diner_refreshTaskRpc, '')
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
683
684
685 
 | 
  	return true
  end
  
 
 | 
6d272f65
 
  zhouhaihai
 
餐厅 食材
 | 
686 
 | 
  function _M.addWantFoodRpc(agent , data)
 
 | 
4288160b
 
  gaofengduan
 
add Diner_getGree...
 | 
687
688
689 
 | 
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
 
 | 
6d272f65
 
  zhouhaihai
 
餐厅 食材
 | 
690
691 
 | 
  	local ids = msg.ids -- list
  
 
 | 
4288160b
 
  gaofengduan
 
add Diner_getGree...
 | 
692
693
694 
 | 
  	local buildType = 6
  	local level = role.dinerData:getProperty("buildL"):getv(buildType, 1)
  	local buildingData = csvdb["diner_buildingCsv"][buildType][level]
 
 | 
6d272f65
 
  zhouhaihai
 
餐厅 食材
 | 
695 
 | 
  
 
 | 
4288160b
 
  gaofengduan
 
add Diner_getGree...
 | 
696
697
698 
 | 
  	if not buildingData then
  		return 1
  	end
 
 | 
6d272f65
 
  zhouhaihai
 
餐厅 食材
 | 
699
700
701
702
703
704
705
706
707
708 
 | 
  
  	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
 
 | 
33be3111
 
  zhouhaihai
 
修改hangPass 结构
 | 
709 
 | 
  			if not role:checkHangPass(foodData.unlock) then
 
 | 
6d272f65
 
  zhouhaihai
 
餐厅 食材
 | 
710
711
712
713
714
715
716 
 | 
  				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...
 | 
717
718 
 | 
  	end
  
 
 | 
1e9cb217
 
  chenyueqi
 
服务器记录控制引导过程
 | 
719 
 | 
  	role:finishGuide(36)
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
720
721 
 | 
  	role:mylog("diner_action", {desc = "wantFood"})
  
 
 | 
6d272f65
 
  zhouhaihai
 
餐厅 食材
 | 
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736 
 | 
  	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...
 | 
737 
 | 
  	end
 
 | 
6d272f65
 
  zhouhaihai
 
餐厅 食材
 | 
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754 
 | 
  
  	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
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
755
756
757
758
759
760
761
762 
 | 
  
  		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...
 | 
763 
 | 
  	end
 
 | 
6d272f65
 
  zhouhaihai
 
餐厅 食材
 | 
764 
 | 
  	role.dinerData:updateProperty({field = "gfood", value = gfood})
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
765 
 | 
  	local reward, change = role:award(reward, {log = {desc = "greenHourse", int1 = level}})
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
766 
 | 
  	role:checkTaskEnter("FoodMGet")
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
767 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
768 
 | 
  	role:mylog("diner_action", {desc = "greenHourse"})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
769 
 | 
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
770 
 | 
  	SendPacket(actionCodes.Diner_getGreenhouseRpc, MsgPack.pack({reward = reward, change = change}))
 
 | 
4288160b
 
  gaofengduan
 
add Diner_getGree...
 | 
771
772 
 | 
  	return true
  end
 
 | 
4864d579
 
  zhengshouren
 
领取任务,锁定任务,获得特殊任务
 | 
773 
 | 
  
 
 | 
03a6166a
 
  zhouhaihai
 
餐厅优化
 | 
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
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 
 | 
  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
 
排行榜
 | 
864
865
866
867
868
869
870
871 
 | 
  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
 
餐厅 顾客 系统
 | 
872
873
874
875
876
877
878 
 | 
  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
 
日志
 | 
879
880 
 | 
  	local entrustId = entrust[1]
  	if not entrustId then return end
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
881 
 | 
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
882 
 | 
  	local reward, change
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
883 
 | 
  	if ctype == 1 then -- 完成
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
884 
 | 
  		local curData = csvdb["diner_missionCsv"][entrustId]
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
885
886
887
888
889 
 | 
  		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
 
日志
 | 
890 
 | 
  			role:costItems(cost, {log = {desc = "dinerEntrus", int1 = entrustId}})
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
891
892
893
894
895
896 
 | 
  		elseif curData.type == 2 then
  			-- todo 数据校验
  		else
  			return
  		end
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
897 
 | 
  		reward, change = role:award(curData.reward, {log = {desc = "dinerEntrus", int1 = entrustId}})
 
 | 
4c5d72ab
 
  zhouhaihai
 
高级pvp
 | 
898 
 | 
  		table.remove(entrust, 1)
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
899
900
901
902
903
904
905 
 | 
  	elseif ctype == 2 then		-- 放弃
  		table.remove(entrust, 1)
  	else
  		return 
  	end
  	role.dinerData:updateProperty({field = "entrust", value = entrust})
  
 
 | 
a7b824ac
 
  chenyueqi
 
记录新手引导步骤的代码存在bug
 | 
906 
 | 
  	role:finishGuide(26)
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
907 
 | 
  	role:mylog("diner_action", {desc = "entrus", short1 = ctype, int1 = entrustId})
 
 | 
accf94c4
 
  测试
 
活动以类型标识,修改双倍活动bug
 | 
908 
 | 
  	role:checkTaskEnter("VillageApply", {})
 
 | 
a7b824ac
 
  chenyueqi
 
记录新手引导步骤的代码存在bug
 | 
909 
 | 
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
910 
 | 
  	SendPacket(actionCodes.Diner_entrustRpc, MsgPack.pack({reward = reward, change = change}))
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
911
912
913
914
915
916
917
918 
 | 
  	return true
  end
  
  function _M.collectRpc(agent , data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local id = msg.id
 
 | 
a4e66eda
 
  zhouhaihai
 
餐厅协议
 | 
919
920 
 | 
  	local customerData = csvdb["diner_customerCsv"][id]
  	if not id or not customerData then return end
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
921
922
923
924
925
926
927
928
929
930 
 | 
  	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
 
修改发奖
 | 
931 
 | 
  	local reward, change = role:award(customerData.reward, {log = {desc = "dinerCollect", int1 = id}})
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
932
933 
 | 
  	customer[id] = 1
  	role.dinerData:updateProperty({field = "customer", value = customer}) -- 解锁了
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
934
935
936
937
938
939
940
941 
 | 
  
  	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
 
日志新一批
 | 
942 
 | 
  		restaurant_collect_rwd = reward, -- 订单完成奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
943
944 
 | 
  		restaurant_collect_plan = count, -- 收集进度,即解锁顾客,数字表示
  	})
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
945 
 | 
  	role:mylog("diner_action", {desc = "collect", int1 = id})
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
946 
 | 
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
947 
 | 
  	SendPacket(actionCodes.Diner_collectRpc, MsgPack.pack({reward = reward, change = change}))
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970 
 | 
  	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
 
修改发奖
 | 
971 
 | 
  	local reward, change = role:award(comboData.reward, {log = {desc = "dinerCombo", int1 = id}})
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
972
973
974 
 | 
  
  	role.dinerData:updateProperty({field = "comboStatus", value = comboStatus}) -- 解锁了
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
975
976 
 | 
  	role:mylog("diner_action", {desc = "combo", int1 = id})
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
977 
 | 
  	SendPacket(actionCodes.Diner_comboRewardRpc, MsgPack.pack({reward = reward, change = change}))
 
 | 
ed322ed2
 
  zhouhaihai
 
餐厅 顾客 系统
 | 
978
979
980
981 
 | 
  	return true
  end
  
  
 
 | 
59835765
 
  zhouhaihai
 
排行榜
 | 
982 
 | 
  
 
 | 
87cc3a35
 
  zhengshouren
 
餐厅建筑升级逻辑
 | 
983 
 | 
  return _M
 
 |