384bb077
zhouahaihai
挂机
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
local ipairs = ipairs
local table = table
local math = math
local next = next
local string = string
local redisproxy = redisproxy
local MsgPack = MsgPack
local getRandomName = getRandomName
local mcast_util = mcast_util
local string_format = string.format
local tonumber = tonumber
local require = require
local table_insert = table.insert
local tconcat = table.concat
local table_unpack = table.unpack
local _M = {}
local function checkReward(role)
local hangInfo = role:getProperty("hangInfo")
if not hangInfo.carbonId or not hangInfo.coinTime or not hangInfo.itemTime then
return
end
local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
|
bcf5bfbb
zhouahaihai
挂机new
|
25
26
|
local nowCoinTime = math.min(skynet.timex(), hangInfo.endCoinTime or 0)
local nowItemTime = math.min(skynet.timex(), hangInfo.endItemTime or 0)
|
384bb077
zhouahaihai
挂机
|
27
|
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
28
29
30
|
-- 此次挂机,其中翻倍时长占多少
local doubleTime = role.activity:getActHangDoubleTime(hangInfo.coinTime, nowCoinTime)
local normalTime = nowCoinTime - hangInfo.coinTime - doubleTime
|
384bb077
zhouahaihai
挂机
|
31
|
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
32
33
34
35
36
37
38
39
40
41
|
local coinCount = math.max(0, math.floor((normalTime) / globalCsv.idle_money_produce_cd))
local coinDoubleCount = math.max(0, math.floor((doubleTime) / globalCsv.idle_money_produce_cd)) * 2
hangInfo.coinTime = nowCoinTime
doubleTime = role.activity:getActHangDoubleTime(hangInfo.itemTime, nowitemTime)
normalTime = nowItemTime - hangInfo.coinTime - doubleTime
local itemCount = math.max(0, math.floor((normalTime) / globalCsv.idle_item_produce_cd))
local itemDoubleCount = math.max(0, math.floor((doubleTime) / globalCsv.idle_item_produce_cd))
itemCount = itemCount + itemDoubleCount
hangInfo.itemTime = nowItemTime
|
384bb077
zhouahaihai
挂机
|
42
43
|
local items = role:getProperty("hangBag")
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
44
|
coinCount = coinCount + coinDoubleCount
|
384bb077
zhouahaihai
挂机
|
45
46
|
items[ItemId.Gold] = (items[ItemId.Gold] or 0) + coinCount * carbonData.money
items[ItemId.Exp] = (items[ItemId.Exp] or 0) + coinCount * carbonData.exp
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
47
|
items[ItemId.PlayerExp] = (items[ItemId.PlayerExp] or 0) + coinCount * carbonData.playerExp
|
384bb077
zhouahaihai
挂机
|
48
49
50
51
52
|
local pool = {}
for _, temp in pairs(carbonData.item:toArray()) do
table.insert(pool, temp:toArray(true, "="))
end
|
64e63ad0
wangyujie
完成需求:挂机栏位物品数量上限和钻...
|
53
54
55
|
local curFC = 0
local curIC = 0
for id, count in pairs(items) do
|
bcf5bfbb
zhouahaihai
挂机new
|
56
|
if id ~= ItemId.Gold and id ~= ItemId.Exp and id ~= ItemId.PlayerExp then
|
64e63ad0
wangyujie
完成需求:挂机栏位物品数量上限和钻...
|
57
58
|
curFC = curFC + math.ceil(count / globalCsv.idle_field_limit)
curIC = curIC + count
|
9962b061
zhouahaihai
补充 挂机
|
59
60
|
end
end
|
317a46a9
liuzujun
添加特权卡
|
61
62
63
64
|
-- 特权卡挂机额外栏位
local privExtraCnt = role.storeData:getHangSlotExtraCount()
local selfFC = role:getProperty("hangBagLimit") + privExtraCnt
|
64e63ad0
wangyujie
完成需求:挂机栏位物品数量上限和钻...
|
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
local selfIC = selfFC * globalCsv.idle_field_limit
local function randomItem()
if curIC >= selfIC then
return
end
local tempPool = clone(pool)
while #tempPool > 0 do
local idx = math.randWeight(tempPool, 3)
local cur = pool[idx]
if (items[cur[1]] and math.ceil((items[cur[1]] + cur[2]) / globalCsv.idle_field_limit) > math.ceil(items[cur[1]] / globalCsv.idle_field_limit))
or not items[cur[1]] then --要占用新栏位的情况
local addFC
if not items[cur[1]] then
addFC = math.ceil(cur[2] / globalCsv.idle_field_limit)
else
local frontC = items[cur[1]] % globalCsv.idle_field_limit
if frontC == 0 then
frontC = globalCsv.idle_field_limit
end
addFC = math.ceil((cur[2] - (globalCsv.idle_field_limit - frontC)) / globalCsv.idle_field_limit)
end
if curFC + addFC <= selfFC then
curFC = curFC + addFC
items[cur[1]] = (items[cur[1]] or 0) + cur[2]
break
else
--加不了,换别的东西
table.remove(tempPool, idx)
end
else
items[cur[1]] = items[cur[1]] + cur[2]
break
|
9962b061
zhouahaihai
补充 挂机
|
98
|
end
|
9962b061
zhouahaihai
补充 挂机
|
99
|
end
|
64e63ad0
wangyujie
完成需求:挂机栏位物品数量上限和钻...
|
100
101
102
103
|
curIC = curIC + 1
end
for i = 1, itemCount do
randomItem()
|
384bb077
zhouahaihai
挂机
|
104
105
106
|
end
if coinCount > 0 or itemCount > 0 then
|
5af8b4aa
zhouahaihai
挂机down
|
107
|
return true
|
384bb077
zhouahaihai
挂机
|
108
109
110
|
end
end
|
384bb077
zhouahaihai
挂机
|
111
112
113
114
115
116
|
--开始一个新的关卡
function _M.startRpc( agent, data )
local role = agent.role
local msg = MsgPack.unpack(data)
local carbonId = msg.carbonId
local carbonData = csvdb["idle_battleCsv"][carbonId]
|
f60b89b1
zhouhaihai
奖励副本
|
117
|
if not carbonData then return 1 end
|
384bb077
zhouahaihai
挂机
|
118
|
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
119
120
121
122
|
if math.floor(carbonId / 10000) ~= 1 then
if not role:isFuncUnlock(FuncUnlock.DifficultHang) then return end
end
|
5d80aca6
zhouahaihai
挂机优化
|
123
124
|
for _, preCarbonId in ipairs(carbonData.prepose:toArray(true, "=")) do
|
33be3111
zhouhaihai
修改hangPass 结构
|
125
|
if not role:checkHangPass(preCarbonId) then return 2 end
|
5d80aca6
zhouahaihai
挂机优化
|
126
|
end
|
384bb077
zhouahaihai
挂机
|
127
|
|
5af8b4aa
zhouahaihai
挂机down
|
128
129
130
|
if checkReward(role) then
role:updateProperty({field = "hangBag", value = role:getProperty("hangBag")})
end
|
384bb077
zhouahaihai
挂机
|
131
132
|
local hangInfo = role:getProperty("hangInfo")
|
5af8b4aa
zhouahaihai
挂机down
|
133
|
local isNew = not hangInfo.carbonId
|
384bb077
zhouahaihai
挂机
|
134
135
|
hangInfo.carbonId = carbonId
local nowTime = skynet.timex()
|
5af8b4aa
zhouahaihai
挂机down
|
136
|
if isNew then
|
1103490d
zhouhaihai
设置 国家时间错误
|
137
138
|
hangInfo.coinTime = nowTime
hangInfo.itemTime = nowTime
|
bcf5bfbb
zhouahaihai
挂机new
|
139
140
|
hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max
hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max
|
1103490d
zhouhaihai
设置 国家时间错误
|
141
142
143
|
else
hangInfo.coinTime = math.min(nowTime, hangInfo.endCoinTime)
hangInfo.itemTime = math.min(nowTime, hangInfo.endItemTime)
|
5af8b4aa
zhouahaihai
挂机down
|
144
|
end
|
33be3111
zhouhaihai
修改hangPass 结构
|
145
|
if not role:checkHangPass(carbonId) then
|
5af8b4aa
zhouahaihai
挂机down
|
146
147
148
|
hangInfo.bossTime = nowTime + carbonData.idle_time
else
hangInfo.bossTime = nil
|
384bb077
zhouahaihai
挂机
|
149
150
151
|
end
role:updateProperty({field = "hangInfo", value = hangInfo})
|
3133cb76
zhouhaihai
日志
|
152
153
|
role:log("hang_action", {desc = "startHang", int1 = carbonId})
|
384bb077
zhouahaihai
挂机
|
154
155
156
157
158
159
160
161
|
SendPacket(actionCodes.Hang_startRpc, '')
return true
end
-- 每隔1分钟检查一次
function _M.checkRpc(agent, data)
local role = agent.role
-- local msg = MsgPack.unpack(data)
|
5af8b4aa
zhouahaihai
挂机down
|
162
163
164
165
|
if checkReward(role) then
role:updateProperty({field = "hangBag", value = role:getProperty("hangBag")})
role:updateProperty({field = "hangInfo", value = role:getProperty("hangInfo")})
end
|
384bb077
zhouahaihai
挂机
|
166
167
168
169
|
SendPacket(actionCodes.Hang_checkRpc, MsgPack.pack({}))
return true
end
|
cc5ca7f3
zhouhaihai
缓存battleKey
|
170
|
local _BattleKey = nil
|
384bb077
zhouahaihai
挂机
|
171
172
173
|
function _M.startBattleRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
bcf5bfbb
zhouahaihai
挂机new
|
174
175
|
local carbonId = msg.carbonId
local curData = csvdb["idle_battleCsv"][carbonId]
|
a1e08c9c
zhengshouren
宝箱关战斗异常
|
176
177
178
|
if not curData then
return 1
end
|
bcf5bfbb
zhouahaihai
挂机new
|
179
|
|
384bb077
zhouahaihai
挂机
|
180
|
local hangInfo = role:getProperty("hangInfo")
|
bcf5bfbb
zhouahaihai
挂机new
|
181
|
if curData.main ~= 1 then
|
a1e08c9c
zhengshouren
宝箱关战斗异常
|
182
183
184
|
if carbonId ~= hangInfo.carbonId then
return 2
end
|
bcf5bfbb
zhouahaihai
挂机new
|
185
186
|
end
|
33be3111
zhouhaihai
修改hangPass 结构
|
187
|
if role:checkHangPass(carbonId) then
|
a1e08c9c
zhengshouren
宝箱关战斗异常
|
188
189
|
return 3
end
|
bcf5bfbb
zhouahaihai
挂机new
|
190
|
|
cc5ca7f3
zhouhaihai
缓存battleKey
|
191
192
|
_BattleKey = tostring(math.random())
|
53e8037e
zhouhaihai
任务
|
193
|
role:checkTaskEnter("HangBattle", {id = carbonId})
|
52c87300
zhouhaihai
bug
|
194
|
SendPacket(actionCodes.Hang_startBattleRpc, MsgPack.pack({key = _BattleKey}))
|
384bb077
zhouahaihai
挂机
|
195
196
197
198
199
200
201
|
return true
end
function _M.endBattleRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local hangInfo = role:getProperty("hangInfo")
|
cc5ca7f3
zhouhaihai
缓存battleKey
|
202
|
if not msg.key or msg.key ~= _BattleKey then
|
d6a66c74
zhouhaihai
校验失败也返回
|
203
204
|
SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({errorCode = 1}))
return true
|
4906ebd2
zhengshouren
宝箱关副本结算异常
|
205
|
end
|
bcf5bfbb
zhouahaihai
挂机new
|
206
207
|
local carbonId = msg.carbonId
local carbonData = csvdb["idle_battleCsv"][carbonId]
|
4906ebd2
zhengshouren
宝箱关副本结算异常
|
208
209
210
|
if not carbonData then
return 2
end
|
bcf5bfbb
zhouahaihai
挂机new
|
211
|
if carbonData.main ~= 1 then
|
4906ebd2
zhengshouren
宝箱关副本结算异常
|
212
213
214
|
if carbonId ~= hangInfo.carbonId then
return 3
end
|
bcf5bfbb
zhouahaihai
挂机new
|
215
|
end
|
33be3111
zhouhaihai
修改hangPass 结构
|
216
217
|
if role:checkHangPass(carbonId) then
|
4906ebd2
zhengshouren
宝箱关副本结算异常
|
218
219
|
return 4
end
|
7bb30dca
zhouhaihai
修改发奖
|
220
|
local reward, change
|
384bb077
zhouahaihai
挂机
|
221
|
if msg.starNum and msg.starNum > 0 then --win
|
33be3111
zhouhaihai
修改hangPass 结构
|
222
|
role:hangFinish(carbonId)
|
bcf5bfbb
zhouahaihai
挂机new
|
223
224
225
|
if carbonData.main ~= 1 then
hangInfo.bossTime = nil
end
|
384bb077
zhouahaihai
挂机
|
226
227
|
-- reward
reward = {}
|
384bb077
zhouahaihai
挂机
|
228
229
|
reward[ItemId.Gold] = carbonData.money_clear
reward[ItemId.Exp] = carbonData.exp_clear
|
00115a7a
zhouahaihai
奖励发放
|
230
|
reward[ItemId.PlayerExp] = carbonData.playerExp_clear
|
384bb077
zhouahaihai
挂机
|
231
|
for itemId, count in pairs(carbonData.item_clear:toNumMap()) do
|
384bb077
zhouahaihai
挂机
|
232
233
|
reward[itemId] = count
end
|
7bb30dca
zhouhaihai
修改发奖
|
234
|
reward, change = role:award(reward, {log = {desc = "hangBattle", int1 = carbonId}})
|
00e663bd
zhouhaihai
剧情相关
|
235
|
|
03a6166a
zhouhaihai
餐厅优化
|
236
|
role:checkTaskEnter("HangPass", {id = carbonId})
|
384bb077
zhouahaihai
挂机
|
237
|
end
|
384bb077
zhouahaihai
挂机
|
238
|
role:updateProperty({field = "hangInfo", value = hangInfo})
|
33be3111
zhouhaihai
修改hangPass 结构
|
239
240
241
|
local team = role:getProperty("pvpTC")
role:log("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), cint1 = role:getHerosCamp(team.heros)})
|
3133cb76
zhouhaihai
日志
|
242
|
|
384bb077
zhouahaihai
挂机
|
243
244
245
|
SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({
starNum = msg.starNum,
reward = reward,
|
7bb30dca
zhouhaihai
修改发奖
|
246
|
change = change,
|
384bb077
zhouahaihai
挂机
|
247
248
249
250
|
}))
return true
end
|
7efe5275
zhouhaihai
检查leader
|
251
252
253
254
255
256
257
|
local function checkLeader(heros, leader)
if not leader then return end
for slot, heroId in pairs(heros) do
if heroId == leader then return true end
end
end
|
384bb077
zhouahaihai
挂机
|
258
259
260
|
function _M.roleFormatRpc(agent , data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
384bb077
zhouahaihai
挂机
|
261
262
263
|
local hangTeam = role:getProperty("hangTeam")
for slot, heroId in pairs(msg.heros) do
if not role.heros[heroId] then
|
e6ebee44
zhouhaihai
编队bug
|
264
|
return 1
|
384bb077
zhouahaihai
挂机
|
265
266
|
end
end
|
f603a60f
zhouhaihai
支援技实装
|
267
268
269
|
local supports = {}
for slot, support in pairs(msg.supports or {}) do
|
e6ebee44
zhouhaihai
编队bug
|
270
|
if slot ~= 1 and slot ~= 2 then return 2 end
|
f603a60f
zhouhaihai
支援技实装
|
271
|
local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
|
e6ebee44
zhouhaihai
编队bug
|
272
|
if level <= 0 then return 3 end
|
f603a60f
zhouhaihai
支援技实装
|
273
274
|
supports[slot] = support
end
|
e6ebee44
zhouhaihai
编队bug
|
275
|
if not checkLeader(msg.heros, msg.leader) then return 4 end
|
f603a60f
zhouhaihai
支援技实装
|
276
|
|
384bb077
zhouahaihai
挂机
|
277
278
279
280
281
282
|
table.clear(hangTeam)
hangTeam.heros = {}
for slot, heroId in pairs(msg.heros) do
hangTeam.heros[slot] = heroId
end
hangTeam.leader = msg.leader
|
f603a60f
zhouhaihai
支援技实装
|
283
|
hangTeam.supports = supports
|
fa565e0c
zhouhaihai
优化结构
|
284
|
role:saveHangTeam(hangTeam)
|
384bb077
zhouahaihai
挂机
|
285
286
287
288
|
SendPacket(actionCodes.Hang_roleFormatRpc, '')
return true
end
|
5af8b4aa
zhouahaihai
挂机down
|
289
290
291
292
293
|
function _M.getRewardRpc(agent , data)
local role = agent.role
checkReward(role)
local items = role:getProperty("hangBag")
if not next(items) then return end
|
7bb30dca
zhouhaihai
修改发奖
|
294
|
local reward, change = role:award(items, {log = {desc = "hangReward"}})
|
5af8b4aa
zhouahaihai
挂机down
|
295
296
297
|
table.clear(items)
local hangInfo = role:getProperty("hangInfo")
local nowTime = skynet.timex()
|
bcf5bfbb
zhouahaihai
挂机new
|
298
299
|
hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max
hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max
|
5af8b4aa
zhouahaihai
挂机down
|
300
301
302
303
|
hangInfo.coinTime = nowTime
hangInfo.itemTime = nowTime
role:updateProperty({field = "hangBag", value = items})
role:updateProperty({field = "hangInfo", value = hangInfo})
|
03a6166a
zhouhaihai
餐厅优化
|
304
|
role:checkTaskEnter("HangGet")
|
53e8037e
zhouhaihai
任务
|
305
306
|
if reward[ItemId.Gold] then
role:checkTaskEnter("HangGetGold", {count = reward[ItemId.Gold]})
|
bcf5bfbb
zhouahaihai
挂机new
|
307
|
end
|
53e8037e
zhouhaihai
任务
|
308
|
SendPacket(actionCodes.Hang_getRewardRpc, MsgPack.pack({
|
7bb30dca
zhouhaihai
修改发奖
|
309
310
|
reward = reward,
change = change
|
bcf5bfbb
zhouahaihai
挂机new
|
311
312
313
314
|
}))
return true
end
|
53e8037e
zhouhaihai
任务
|
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
|
-- function _M.getRewardItemRpc(agent , data)
-- local role = agent.role
-- checkReward(role)
-- local items = role:getProperty("hangBag")
-- if not next(items) then return end
-- local notNeed = {[ItemId.Gold] = 1, [ItemId.Exp] = 1, [ItemId.PlayerExp] = 1}
-- local reward = {}
-- for itemId , count in pairs(items) do
-- if not notNeed[itemId] then
-- reward[itemId] = count
-- items[itemId] = nil
-- end
-- end
-- if not next(reward) then return end
-- local reward = role:award(reward)
-- local hangInfo = role:getProperty("hangInfo")
-- local nowTime = skynet.timex()
-- hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max
-- hangInfo.itemTime = nowTime
-- role:updateProperty({field = "hangBag", value = items})
-- role:updateProperty({field = "hangInfo", value = hangInfo})
-- SendPacket(actionCodes.Hang_getRewardItemRpc, MsgPack.pack({
-- reward = reward
-- }))
-- return true
-- end
-- function _M.getRewardCoinRpc(agent , data)
-- local role = agent.role
-- checkReward(role)
-- local items = role:getProperty("hangBag")
-- if not next(items) then return end
-- local need = {[ItemId.Gold] = 1, [ItemId.Exp] = 1, [ItemId.PlayerExp] = 1}
-- local reward = {}
-- for itemId , count in pairs(items) do
-- if need[itemId] then
-- reward[itemId] = count
-- items[itemId] = nil
-- end
-- end
-- local reward = role:award(reward)
|
bcf5bfbb
zhouahaihai
挂机new
|
360
|
|
53e8037e
zhouhaihai
任务
|
361
362
363
364
365
366
367
368
369
370
371
372
|
-- local hangInfo = role:getProperty("hangInfo")
-- local nowTime = skynet.timex()
-- hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max
-- hangInfo.coinTime = nowTime
-- role:updateProperty({field = "hangBag", value = items})
-- role:updateProperty({field = "hangInfo", value = hangInfo})
-- SendPacket(actionCodes.Hang_getRewardCoinRpc, MsgPack.pack({
-- reward = reward
-- }))
-- return true
-- end
|
9962b061
zhouahaihai
补充 挂机
|
373
374
375
376
377
378
379
380
381
382
383
384
385
|
function _M.quickRpc(agent , data)
local role = agent.role
local hangInfo = role:getProperty("hangInfo")
if not hangInfo.carbonId then return end
local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
local curCount = role.dailyData:getProperty("hangQC") + 1
local costs = globalCsv.idle_quickproduce_cost:toArray(true, "=")
if not costs[curCount] then return end
if costs[curCount] > 0 then
if not role:checkItemEnough({[ItemId.Diamond] = costs[curCount]}) then return end
|
3133cb76
zhouhaihai
日志
|
386
|
role:costItems({[ItemId.Diamond] = costs[curCount]}, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
|
9962b061
zhouahaihai
补充 挂机
|
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
|
end
role.dailyData:updateProperty({field = "hangQC", value = curCount})
local time = globalCsv.idle_quickproduce_time
local reward = {}
local coinCount = math.floor(time / globalCsv.idle_money_produce_cd)
local itemCount = math.floor(time / globalCsv.idle_item_produce_cd)
reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + coinCount * carbonData.money
reward[ItemId.Exp] = (reward[ItemId.Exp] or 0) + coinCount * carbonData.exp
local pool = {}
for _, temp in pairs(carbonData.item:toArray()) do
table.insert(pool, temp:toArray(true, "="))
end
for i = 1, itemCount do
local cur = pool[math.randWeight(pool, 3)]
reward[cur[1]] = (reward[cur[1]] or 0) + cur[2]
end
|
317a46a9
liuzujun
添加特权卡
|
407
408
409
410
411
412
413
414
415
|
-- 特权卡获取加速获得额外道具
local coef = role.storeData:getProduceItemSpeedCoef()
if coef > 1 then
for k, cnt in pairs(reward) do
reward[k] = math.floor(cnt * coef)
end
end
|
7bb30dca
zhouhaihai
修改发奖
|
416
417
|
local change
reward, change = role:award(reward, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
|
f60b89b1
zhouhaihai
奖励副本
|
418
419
420
|
if reward[ItemId.Gold] then
role:checkTaskEnter("HangGetGold", {count = reward[ItemId.Gold]})
end
|
53e8037e
zhouhaihai
任务
|
421
|
role:checkTaskEnter("HangQuick")
|
9962b061
zhouahaihai
补充 挂机
|
422
|
SendPacket(actionCodes.Hang_quickRpc, MsgPack.pack({
|
7bb30dca
zhouhaihai
修改发奖
|
423
424
|
reward = reward,
change = change
|
9962b061
zhouahaihai
补充 挂机
|
425
426
427
428
|
}))
return true
end
|
f60b89b1
zhouhaihai
奖励副本
|
429
430
431
432
433
434
435
436
437
|
function _M.bonusFormatRpc(agent , data)
local role = agent.role
local msg = MsgPack.unpack(data)
local bTeam = role:getProperty("bTeam")
for slot, heroId in pairs(msg.heros) do
if not role.heros[heroId] then
return
end
end
|
f603a60f
zhouhaihai
支援技实装
|
438
439
440
441
442
443
444
|
local supports = {}
for slot, support in pairs(msg.supports) do
if slot ~= 1 and slot ~= 2 then return end
local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
if level <= 0 then return end
supports[slot] = support
end
|
7efe5275
zhouhaihai
检查leader
|
445
446
|
if not checkLeader(msg.heros, msg.leader) then return end
|
f60b89b1
zhouhaihai
奖励副本
|
447
448
449
450
451
452
|
table.clear(bTeam)
bTeam.heros = {}
for slot, heroId in pairs(msg.heros) do
bTeam.heros[slot] = heroId
end
bTeam.leader = msg.leader
|
f603a60f
zhouhaihai
支援技实装
|
453
|
bTeam.supports = supports
|
f60b89b1
zhouhaihai
奖励副本
|
454
455
456
457
458
459
460
461
462
463
464
465
466
|
role:updateProperty({field = "bTeam", value = bTeam})
SendPacket(actionCodes.Hang_bonusFormatRpc, '')
return true
end
function _M.buyBonusCountRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local count = msg.count
local btype = msg.type
|
3133cb76
zhouhaihai
日志
|
467
|
if not TimeReset["DailyBattle" .. btype] then return end
|
f60b89b1
zhouhaihai
奖励副本
|
468
469
470
471
472
473
|
local bonusC = role.dailyData:getProperty("bonusC")
bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
local lastCount = globalCsv.bonus_daily_buy_count - bonusC[btype]["b"]
if math.illegalNum(count, 1, lastCount) then return 1 end
|
3133cb76
zhouhaihai
日志
|
474
|
if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}) then return 2 end
|
f60b89b1
zhouhaihai
奖励副本
|
475
|
|
3133cb76
zhouhaihai
日志
|
476
|
role:costItems({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}, {log = {desc = "buyBonusCount", short1 = btype, int1 = count}})
|
d481965d
zhouhaihai
购买次数bug
|
477
478
|
bonusC[btype]["b"] = bonusC[btype]["b"] + count
bonusC[btype]["c"] = bonusC[btype]["c"] - count
|
f60b89b1
zhouhaihai
奖励副本
|
479
480
481
482
483
484
485
486
487
488
489
490
|
role.dailyData:updateProperty({field = "bonusC", value = bonusC})
SendPacket(actionCodes.Hang_buyBonusCountRpc, '')
return true
end
function _M.startBonusBattleRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
491
492
|
if not role:isFuncUnlock(FuncUnlock.BonusBattle) then return end
|
f60b89b1
zhouhaihai
奖励副本
|
493
|
local bonusData = csvdb["bonus_battleCsv"][id]
|
bc902e2d
zhouhaihai
增加开放判断
|
494
495
496
|
if not role:isTimeResetOpen(TimeReset["DailyBattle" .. bonusData.type]) then return end
|
f60b89b1
zhouhaihai
奖励副本
|
497
|
if not bonusData then return 1 end
|
33be3111
zhouhaihai
修改hangPass 结构
|
498
|
if not role:checkHangPass(bonusData.unlock) then return 2 end
|
f60b89b1
zhouhaihai
奖励副本
|
499
500
501
502
503
504
|
if not next(role:getProperty("bTeam")) then return 3 end
local bonusC = role.dailyData:getProperty("bonusC")
bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 4 end
|
f60b89b1
zhouhaihai
奖励副本
|
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
|
role.__bonusBattleCache = {
key = tostring(math.random()),
id = id,
}
SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({key = role.__bonusBattleCache.key}))
return true
end
function _M.endBonusBattleRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local key = msg.key
local starNum = msg.starNum
if not role.__bonusBattleCache then return 1 end
|
d6a66c74
zhouhaihai
校验失败也返回
|
523
524
525
526
|
if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then
SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
return true
end
|
f60b89b1
zhouhaihai
奖励副本
|
527
528
|
local bonusData = csvdb["bonus_battleCsv"][id]
|
7bb30dca
zhouhaihai
修改发奖
|
529
|
local reward, change
|
f60b89b1
zhouhaihai
奖励副本
|
530
|
if starNum and starNum > 0 then
|
74a8fdc9
zhouhaihai
奖励副本 胜利扣除次数
|
531
532
533
534
535
536
537
|
-- 胜利扣除次数
local bonusC = role.dailyData:getProperty("bonusC")
bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 3 end
bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1
role.dailyData:updateProperty({field = "bonusC", value = bonusC})
|
b2747fbc
zhouhaihai
挂机
|
538
539
540
541
542
|
reward = bonusData.reward:toNumMap()
local chance = bonusData.chance:randWeight(true)
if chance[1] ~= 0 then
reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
end
|
7bb30dca
zhouhaihai
修改发奖
|
543
|
reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
|
f60b89b1
zhouhaihai
奖励副本
|
544
545
546
|
role:checkTaskEnter("BonusPass", {id = id})
end
|
3133cb76
zhouhaihai
日志
|
547
548
|
role:log("hang_action", {desc = "bonusBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
|
f60b89b1
zhouhaihai
奖励副本
|
549
550
|
SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({
starNum = starNum,
|
7bb30dca
zhouhaihai
修改发奖
|
551
552
553
|
reward = reward,
change = change
}))
|
f60b89b1
zhouhaihai
奖励副本
|
554
555
556
|
return true
end
|
a6508219
zhouhaihai
挂机奖励
|
557
558
559
560
561
562
563
564
565
566
567
|
function _M.hangGiftRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local carbonData = csvdb["idle_battleCsv"][id]
if not carbonData or carbonData.item_clear_special == "" then return 1 end
local hangGift = role:getProperty("hangGift")
if hangGift[id] then return 2 end
|
7bb30dca
zhouhaihai
修改发奖
|
568
|
local reward, change = role:award(carbonData.item_clear_special, {log = {desc = "hangGift", int1 = id}})
|
a6508219
zhouhaihai
挂机奖励
|
569
570
571
572
|
role:log("hang_action", {desc = "hangGift", int1 = id})
role:changeUpdates({{type = "hangGift", field = id, value = 1}})
|
7bb30dca
zhouhaihai
修改发奖
|
573
|
SendPacket(actionCodes.Hang_hangGiftRpc, MsgPack.pack({reward = reward, change = change}))
|
a6508219
zhouhaihai
挂机奖励
|
574
575
|
return true
end
|
f60b89b1
zhouhaihai
奖励副本
|
576
|
|
64e63ad0
wangyujie
完成需求:挂机栏位物品数量上限和钻...
|
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
|
function _M.bagFieldRpc(agent, data)
local role = agent.role
local curBL = role:getProperty("hangBagLimit")
local costD = globalCsv.idle_field_cost[curBL - globalCsv.idle_field_origin]
if not costD then
return 1
end
if costD ~= 0 and not role:checkItemEnough({[ItemId.Diamond] = costD}) then
return 2
end
role:updateProperty({field = "hangBagLimit", value = curBL + 1})
role:costItems({[ItemId.Diamond] = costD}, {log = {desc = "bagField"}})
SendPacket(actionCodes.Hang_bagFieldRpc, '')
return true
end
|
f60b89b1
zhouhaihai
奖励副本
|
592
|
|
ed20f277
zhouhaihai
chatline 奖励
|
593
594
595
|
function _M.chatLineRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
ed20f277
zhouhaihai
chatline 奖励
|
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
|
local id = msg.id
local idleData = csvdb["idle_battleCsv"][id]
if not idleData or idleData.chatline == 0 then
return
end
local chatline = role:getProperty("chatline")
if chatline[id] then return end
if not role:checkHangPass(id) then return end
chatline[id] = skynet.timex()
role:updateProperty({field = "chatline", value = chatline})
|
7bb30dca
zhouhaihai
修改发奖
|
611
|
local reward, change = role:award(idleData.chatline_reward, {log = {desc = "chatline", int1 = id}})
|
ed20f277
zhouhaihai
chatline 奖励
|
612
|
|
7bb30dca
zhouhaihai
修改发奖
|
613
|
SendPacket(actionCodes.Hang_chatLineRpc, MsgPack.pack({reward = reward, change = change}))
|
ed20f277
zhouhaihai
chatline 奖励
|
614
615
616
|
return true
end
|
384bb077
zhouahaihai
挂机
|
617
|
return _M
|