440aa055
zhouhaihai
聊天
|
1
2
3
4
5
|
local ipairs = ipairs
local table = table
local math = math
local redisproxy = redisproxy
local MsgPack = MsgPack
|
4cf74232
zhouhaihai
pvp
|
6
7
|
local httpc = require("http.httpc")
local remoteUrl = skynet.getenv("codeurl")
|
440aa055
zhouhaihai
聊天
|
8
9
10
|
local _M = {}
|
4cf74232
zhouhaihai
pvp
|
11
|
local _pvpBattleInfoCacheC = {} --查询列表 缓存pvp战斗相关数据缓存
|
4c5d72ab
zhouhaihai
高级pvp
|
12
13
14
15
16
17
18
19
20
21
|
local _pvpBattleInfoCacheH = {} --查询列表 缓存pvp战斗相关数据缓存
local _pvpHeroInfoCacheH = {} --查询列表 缓存pvp 英雄相关数据缓存
local _pvpStartBattleCacheC = nil -- 当前战斗缓存
local _pvpStartBattleCacheH = nil -- 当前战斗缓存
local _pvpRecordInfoCacheC = {} -- 记录缓存
local _pvpRecordInfoCacheH = {} -- 记录缓存
local _pvpRecordBattleInfoCacheC = {} -- 记录战斗数据缓存
local _pvpRecordBattleInfoCacheH = {} -- 记录战斗数据缓存
local _pvpRecordHeroInfoCacheH = {} --查询列表 缓存pvp 英雄相关数据缓存
|
f317b790
zhouhaihai
pvp 遗留
|
22
23
|
local _revengeRecord = {} -- 复仇对单人1分钟间隔
local RevengeWaitTime = 60
|
440aa055
zhouhaihai
聊天
|
24
25
26
|
function _M.formatCommonRpc(agent , data)
local role = agent.role
|
fa565e0c
zhouhaihai
优化结构
|
27
|
local roleId = role:getProperty("id")
|
440aa055
zhouhaihai
聊天
|
28
|
local msg = MsgPack.unpack(data)
|
fa565e0c
zhouhaihai
优化结构
|
29
|
local pvpTC = role:getProperty("pvpTC")
|
3dbbc9f3
zhouhaihai
加上新的任务
|
30
|
for slot, heroId in pairs(msg.heros or {}) do
|
440aa055
zhouhaihai
聊天
|
31
32
33
34
|
if not role.heros[heroId] then
return
end
end
|
3dbbc9f3
zhouhaihai
加上新的任务
|
35
|
if not msg.heros or not next(msg.heros) then
|
fa565e0c
zhouhaihai
优化结构
|
36
|
return
|
440aa055
zhouhaihai
聊天
|
37
|
end
|
f603a60f
zhouhaihai
支援技实装
|
38
39
40
41
42
43
44
|
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
|
440aa055
zhouhaihai
聊天
|
45
|
|
fa565e0c
zhouhaihai
优化结构
|
46
47
48
49
50
51
|
table.clear(pvpTC)
pvpTC.heros = {}
for slot, heroId in pairs(msg.heros) do
pvpTC.heros[slot] = heroId
end
pvpTC.leader = msg.leader
|
f603a60f
zhouhaihai
支援技实装
|
52
|
pvpTC.supports = supports
|
f7f26c15
zhouhaihai
编队整理 增加 tactics战术
|
53
54
55
|
if msg.tactics and globalCsv.tactics_skill_passive_cell[msg.tactics] then
pvpTC.tactics = msg.tactics
end
|
fa565e0c
zhouhaihai
优化结构
|
56
57
|
role:savePvpCTeam(pvpTC)
|
440aa055
zhouhaihai
聊天
|
58
59
60
61
|
SendPacket(actionCodes.Pvp_formatCommonRpc, '')
return true
end
|
4c5d72ab
zhouhaihai
高级pvp
|
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
function _M.formatHighRpc(agent , data)
local role = agent.role
local roleId = role:getProperty("id")
local msg = MsgPack.unpack(data)
local pvpTH = {}
local had = {} -- 上阵的角色
local supportHad = {}
for i = 1, 3 do
local team = msg.teams[i]
if not team then return end
if not team.heros or not next(team.heros) then
return
end
|
4cf74232
zhouhaihai
pvp
|
77
|
|
4c5d72ab
zhouhaihai
高级pvp
|
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
for slot, heroId in pairs(team.heros or {}) do
if not role.heros[heroId] or had[heroId] then
return
end
had[heroId] = 1
end
local supports = {}
for slot, support in pairs(team.supports) do
if slot ~= 1 and slot ~= 2 then return end
local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
if level <= 0 or supportHad[support] then return end
supports[slot] = support
supportHad[support] = 1
end
local curTeam = {}
curTeam.heros = team.heros
curTeam.leader = team.leader
curTeam.supports = supports
|
f7f26c15
zhouhaihai
编队整理 增加 tactics战术
|
98
99
100
|
if team.tactics and globalCsv.tactics_skill_passive_cell[team.tactics] then
curTeam.tactics = team.tactics
end
|
4c5d72ab
zhouhaihai
高级pvp
|
101
102
103
104
105
|
table.insert(pvpTH, curTeam)
end
role:savePvpHTeam(pvpTH)
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
106
|
role:changeCrossServerPvpSelfInfo("format")
|
4c5d72ab
zhouhaihai
高级pvp
|
107
108
109
110
111
|
SendPacket(actionCodes.Pvp_formatHighRpc, '')
return true
end
local function getMatchInfo(role, pvpList, battleCache, dbKey, infoFuncName, infoCache)
|
4cf74232
zhouhaihai
pvp
|
112
|
table.clear(battleCache)
|
da898074
zhouhaihai
pvp 高级领奖
|
113
|
local dbKey = role:getPvpDBKey(dbKey)
|
4cf74232
zhouhaihai
pvp
|
114
115
116
|
local redret = redisproxy:pipelining(function(red)
for _, info in ipairs(pvpList) do
if info.t == 1 then
|
4c5d72ab
zhouhaihai
高级pvp
|
117
|
red:zscore(dbKey, info.id)
|
4cf74232
zhouhaihai
pvp
|
118
119
120
121
122
123
124
125
126
127
|
end
end
end)
local matches = {}
local curIdx = 1
for idx, info in ipairs(pvpList) do
local curInfo = {idx = idx}
if info.t == 1 then --玩家
curInfo.roleId = info.id
|
3dbbc9f3
zhouhaihai
加上新的任务
|
128
|
curInfo.score = role:unpackPvpScore(redret[curIdx] or 0)
|
4cf74232
zhouhaihai
pvp
|
129
130
|
curIdx = curIdx + 1
-- name, level, headId, battleV, heros
|
4c5d72ab
zhouhaihai
高级pvp
|
131
|
local online, roleInfo = rpcRole(curInfo.roleId, infoFuncName)
|
4cf74232
zhouhaihai
pvp
|
132
133
134
135
|
for k , v in pairs(roleInfo) do
if k == "battleInfo" then
battleCache[curInfo.roleId] = v
else
|
da898074
zhouhaihai
pvp 高级领奖
|
136
137
138
|
if (k == "heros" or k == "battleV") and infoCache then
infoCache[curInfo.roleId] = infoCache[curInfo.roleId] or {}
infoCache[curInfo.roleId][k] = v
|
4c5d72ab
zhouhaihai
高级pvp
|
139
|
end
|
4cf74232
zhouhaihai
pvp
|
140
141
142
143
144
145
146
147
148
149
150
151
152
|
curInfo[k] = v
end
end
elseif info.t == 2 then -- robot
curInfo.robot = info.id
end
table.insert(matches, curInfo)
end
return matches
end
-- 获取pvp信息
function _M.infoRpc(agent, data)
|
440aa055
zhouhaihai
聊天
|
153
|
local role = agent.role
|
4cf74232
zhouhaihai
pvp
|
154
|
local roleId = role:getProperty("id")
|
440aa055
zhouhaihai
聊天
|
155
|
local msg = MsgPack.unpack(data)
|
4cf74232
zhouhaihai
pvp
|
156
|
local ptype = msg.ptype or 1
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
157
158
|
if not role:isFuncUnlock(FuncUnlock.Pvp) then return end
|
440aa055
zhouhaihai
聊天
|
159
|
|
4cf74232
zhouhaihai
pvp
|
160
161
|
local response = {}
if ptype == 1 then -- 普通pvp
|
da898074
zhouhaihai
pvp 高级领奖
|
162
|
local dbKey = role:getPvpDBKey(RANK_PVP_COMMON)
|
4cf74232
zhouhaihai
pvp
|
163
|
local redret = redisproxy:pipelining(function(red)
|
da898074
zhouhaihai
pvp 高级领奖
|
164
165
|
red:zscore(dbKey, roleId)
red:zrevrank(dbKey, roleId)
|
4cf74232
zhouhaihai
pvp
|
166
|
end)
|
aaf6a9e6
zhouhaihai
分数默认1000
|
167
|
local score = role:unpackPvpScore(redret[1])
|
4cf74232
zhouhaihai
pvp
|
168
|
local rank = tonumber(redret[2] or -2) + 1 --排名 1 - ... -1 未上榜 没打过pvp
|
aaf6a9e6
zhouhaihai
分数默认1000
|
169
|
|
4cf74232
zhouhaihai
pvp
|
170
171
172
173
174
175
176
|
local pvpMC = role:getProperty("pvpMC")
if not next(pvpMC) then --没有分配过对手
role:refreshPvpMatchC(score)
pvpMC = role:getProperty("pvpMC")
end
if not next(pvpMC) then return end
|
4cf74232
zhouhaihai
pvp
|
177
|
response.rank = rank
|
b115474f
zhouhaihai
默认积分 1000
|
178
|
response.score = score
|
4c5d72ab
zhouhaihai
高级pvp
|
179
|
response.matches = getMatchInfo(role, pvpMC, _pvpBattleInfoCacheC, RANK_PVP_COMMON, "pvpCInfo")
|
4cf74232
zhouhaihai
pvp
|
180
|
elseif ptype == 2 then -- 高级pvp
|
da898074
zhouhaihai
pvp 高级领奖
|
181
182
|
if not role:isTimeResetOpen(TimeReset.PvpHight) then return end
local dbKey = role:getPvpDBKey(RANK_PVP_HIGHT)
|
4c5d72ab
zhouhaihai
高级pvp
|
183
|
local redret = redisproxy:pipelining(function(red)
|
da898074
zhouhaihai
pvp 高级领奖
|
184
185
|
red:zscore(dbKey, roleId)
red:zrevrank(dbKey, roleId)
|
4c5d72ab
zhouhaihai
高级pvp
|
186
187
188
189
190
191
192
193
194
195
196
197
198
199
|
end)
local score = role:unpackPvpScore(redret[1])
local rank = tonumber(redret[2] or -2) + 1 --排名 1 - ... -1 未上榜 没打过pvp
local pvpMH = role:getProperty("pvpMH")
if not next(pvpMH) then --没有分配过对手
role:refreshPvpMatchH(score)
pvpMH = role:getProperty("pvpMH")
end
if not next(pvpMH) then return end
response.rank = rank
response.score = score
response.matches = getMatchInfo(role, pvpMH, _pvpBattleInfoCacheH, RANK_PVP_HIGHT, "pvpHInfo", _pvpHeroInfoCacheH)
|
4cf74232
zhouhaihai
pvp
|
200
201
202
203
|
else
return
end
SendPacket(actionCodes.Pvp_infoRpc, MsgPack.pack(response))
|
440aa055
zhouhaihai
聊天
|
204
205
206
|
return true
end
|
4cf74232
zhouhaihai
pvp
|
207
|
function _M.refreshMatchCRpc(agent, data)
|
440aa055
zhouhaihai
聊天
|
208
209
|
local role = agent.role
local msg = MsgPack.unpack(data)
|
4cf74232
zhouhaihai
pvp
|
210
211
212
|
role:refreshPvpMatchC()
local pvpMC = role:getProperty("pvpMC")
|
4c5d72ab
zhouhaihai
高级pvp
|
213
|
local matches = getMatchInfo(role, pvpMC, _pvpBattleInfoCacheC, RANK_PVP_COMMON, "pvpCInfo")
|
440aa055
zhouhaihai
聊天
|
214
|
|
4cf74232
zhouhaihai
pvp
|
215
|
SendPacket(actionCodes.Pvp_refreshMatchCRpc, MsgPack.pack({matches = matches}))
|
440aa055
zhouhaihai
聊天
|
216
217
218
|
return true
end
|
4c5d72ab
zhouhaihai
高级pvp
|
219
220
221
|
function _M.refreshMatchHRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
da898074
zhouhaihai
pvp 高级领奖
|
222
223
|
if not role:isTimeResetOpen(TimeReset.PvpHight) then return end
|
4c5d72ab
zhouhaihai
高级pvp
|
224
225
226
227
228
229
230
231
232
|
role:refreshPvpMatchH()
local pvpMH = role:getProperty("pvpMH")
local matches = getMatchInfo(role, pvpMH, _pvpBattleInfoCacheH, RANK_PVP_HIGHT, "pvpHInfo", _pvpHeroInfoCacheH)
SendPacket(actionCodes.Pvp_refreshMatchHRpc, MsgPack.pack({matches = matches}))
return true
end
|
440aa055
zhouhaihai
聊天
|
233
234
235
|
function _M.buyCountRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
4cf74232
zhouhaihai
pvp
|
236
|
local count = msg.count
|
440aa055
zhouhaihai
聊天
|
237
|
|
4cf74232
zhouhaihai
pvp
|
238
239
240
241
242
243
|
if math.illegalNum(count, 1, math.huge) then
return 1
end
local cost = {[ItemId.Diamond] = globalCsv.pvp_buy_cost * count}
if not role:checkItemEnough(cost) then return 2 end
|
3133cb76
zhouhaihai
日志
|
244
245
|
role:costItems(cost, {log = {desc = "buyPvpKey"}})
role:award({[ItemId.PvpKey] = count}, {log = {desc = "buyPvpKey"}})
|
440aa055
zhouhaihai
聊天
|
246
247
248
249
250
251
|
SendPacket(actionCodes.Pvp_buyCountRpc, '')
return true
end
function _M.startBattleRpc(agent, data)
|
4cf74232
zhouhaihai
pvp
|
252
253
|
local role = agent.role
local msg = MsgPack.unpack(data)
|
440aa055
zhouhaihai
聊天
|
254
|
|
4cf74232
zhouhaihai
pvp
|
255
256
257
|
local idx = msg.idx
local revenge = msg.revenge
|
3dbbc9f3
zhouhaihai
加上新的任务
|
258
259
260
|
local pvpTC = role:getProperty("pvpTC")
if not pvpTC.heros or not next(pvpTC.heros) then return 1 end
|
85083dba
zhouhaihai
拉黑从申请列表移除
|
261
|
local matchInfo, result, key, wait
|
3dbbc9f3
zhouhaihai
加上新的任务
|
262
|
|
85083dba
zhouhaihai
拉黑从申请列表移除
|
263
|
local now = skynet.timex()
|
4cf74232
zhouhaihai
pvp
|
264
|
if revenge then --复仇
|
4c5d72ab
zhouhaihai
高级pvp
|
265
|
local temp = _pvpRecordInfoCacheC[idx]
|
3dbbc9f3
zhouhaihai
加上新的任务
|
266
|
if not temp then return 2 end
|
85083dba
zhouhaihai
拉黑从申请列表移除
|
267
|
|
f317b790
zhouhaihai
pvp 遗留
|
268
|
if not _revengeRecord[temp.id] or now >= _revengeRecord[temp.id] then
|
85083dba
zhouhaihai
拉黑从申请列表移除
|
269
|
if temp.t == 1 then
|
4c5d72ab
zhouhaihai
高级pvp
|
270
|
matchInfo = _pvpRecordBattleInfoCacheC[temp.id]
|
85083dba
zhouhaihai
拉黑从申请列表移除
|
271
272
273
274
275
|
elseif temp.t == 2 then
matchInfo = {robot = temp.id}
end
else
result = 1
|
f317b790
zhouhaihai
pvp 遗留
|
276
|
wait = _revengeRecord[temp.id] - now
|
4cf74232
zhouhaihai
pvp
|
277
278
279
|
end
else --打正常
local pvpMC = role:getProperty("pvpMC")
|
3dbbc9f3
zhouhaihai
加上新的任务
|
280
|
if not pvpMC[idx] then return 3 end
|
4cf74232
zhouhaihai
pvp
|
281
282
283
284
285
286
287
|
if pvpMC[idx].t == 1 then
matchInfo = _pvpBattleInfoCacheC[pvpMC[idx].id]
elseif pvpMC[idx].t == 2 then
matchInfo = {robot = pvpMC[idx].id}
end
end
|
3dbbc9f3
zhouhaihai
加上新的任务
|
288
|
if not result and not matchInfo then return 4 end
|
85083dba
zhouhaihai
拉黑从申请列表移除
|
289
290
291
292
293
294
|
if not result then
-- 次数扣一波
local pvpFree = role.dailyData:getProperty("pvpFree")
if pvpFree >= globalCsv.pvp_battle_free_count then
local cost = {[ItemId.PvpKey] = 1}
|
3dbbc9f3
zhouhaihai
加上新的任务
|
295
|
if not role:checkItemEnough(cost) then return 5 end
|
887c1843
zhouhaihai
日志新一批
|
296
|
role:costItems(cost, {log = {desc = "startPvp", int1 = 1}})
|
85083dba
zhouhaihai
拉黑从申请列表移除
|
297
298
299
|
else
role.dailyData:updateProperty({field = "pvpFree", delta = 1})
end
|
4cf74232
zhouhaihai
pvp
|
300
|
|
85083dba
zhouhaihai
拉黑从申请列表移除
|
301
|
key = tostring(math.random())
|
4c5d72ab
zhouhaihai
高级pvp
|
302
|
_pvpStartBattleCacheC = {idx = idx, key = key, revenge = revenge}
|
3dbbc9f3
zhouhaihai
加上新的任务
|
303
304
|
role:checkTaskEnter("PvpBattle")
|
f22a33af
zhouhaihai
自己的日志
|
305
306
307
|
role:mylog("pvp_action", {desc = "startBattle", short1 = 1, int1 = revenge and 1 or 0})
|
4cf74232
zhouhaihai
pvp
|
308
309
|
end
|
85083dba
zhouhaihai
拉黑从申请列表移除
|
310
|
SendPacket(actionCodes.Pvp_startBattleRpc, MsgPack.pack({matchInfo = matchInfo, key = key, result = result, wait = wait}))
|
4cf74232
zhouhaihai
pvp
|
311
|
return true
|
440aa055
zhouhaihai
聊天
|
312
313
314
|
end
function _M.endBattleRpc(agent, data)
|
4cf74232
zhouhaihai
pvp
|
315
316
317
|
local role = agent.role
local roleId = role:getProperty("id")
local msg = MsgPack.unpack(data)
|
440aa055
zhouhaihai
聊天
|
318
|
|
4c5d72ab
zhouhaihai
高级pvp
|
319
|
if not msg.key or not _pvpStartBattleCacheC or msg.key ~= _pvpStartBattleCacheC.key then
|
d6a66c74
zhouhaihai
校验失败也返回
|
320
321
|
SendPacket(actionCodes.Pvp_endBattleRpc, MsgPack.pack({errorCode = 1}))
return true
|
4cf74232
zhouhaihai
pvp
|
322
|
end
|
3dbbc9f3
zhouhaihai
加上新的任务
|
323
|
|
4c5d72ab
zhouhaihai
高级pvp
|
324
|
if not msg.idx or msg.idx ~= _pvpStartBattleCacheC.idx then
|
4cf74232
zhouhaihai
pvp
|
325
326
|
return 2
end
|
440aa055
zhouhaihai
聊天
|
327
|
|
4cf74232
zhouhaihai
pvp
|
328
|
local isWin = msg.starNum and msg.starNum > 0
|
85083dba
zhouhaihai
拉黑从申请列表移除
|
329
|
local now = skynet.timex()
|
4cf74232
zhouhaihai
pvp
|
330
|
|
4c5d72ab
zhouhaihai
高级pvp
|
331
|
local revenge = _pvpStartBattleCacheC.revenge
|
4cf74232
zhouhaihai
pvp
|
332
333
|
local match
if revenge then
|
4c5d72ab
zhouhaihai
高级pvp
|
334
|
match = _pvpRecordInfoCacheC[msg.idx]
|
f317b790
zhouhaihai
pvp 遗留
|
335
|
_revengeRecord[match.id] = now + RevengeWaitTime -- 1分钟内不能再打
|
4cf74232
zhouhaihai
pvp
|
336
337
338
339
340
341
342
343
|
else
local pvpMC = role:getProperty("pvpMC")
match = pvpMC[msg.idx]
end
if not match then return end
local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpBonus, true)
|
7bb30dca
zhouhaihai
修改发奖
|
344
|
local reward, change = role:award({[temp[1]] = temp[2]}, {log = {desc = "pvpBattleC"}})
|
4cf74232
zhouhaihai
pvp
|
345
346
|
local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = role:changePvpScoreCommon(match.t == 1 and match.id or -1, isWin)
|
4cf74232
zhouhaihai
pvp
|
347
|
-- 请求上传录像
|
4cf74232
zhouhaihai
pvp
|
348
349
350
351
352
353
|
local params = {
["roleid"] = roleId,
["key"] = "zhaolugame20191016",
["time"] = now,
}
local status, body = httpc.get(remoteUrl, "/applyvideo?" .. httpGetFormatData(params), {}, {})
|
39e60fd1
zhouhaihai
支持上传 oss
|
354
|
local video, headers = nil, nil
|
4cf74232
zhouhaihai
pvp
|
355
356
357
|
if tonumber(status) == 200 then
local result = json.decode(body)
video = result.name
|
39e60fd1
zhouhaihai
支持上传 oss
|
358
|
headers = result.headers
|
4cf74232
zhouhaihai
pvp
|
359
|
else
|
77b54f12
zhouhaihai
中心服录像上传
|
360
|
skynet.error("applyvideo", "error", status, body)
|
4cf74232
zhouhaihai
pvp
|
361
362
363
364
365
366
367
368
369
370
371
372
373
|
end
-- 加入战斗记录
redisproxy:pipelining(function(red)
local dbKey = string.format(RECORD_PVP_COMMON, roleId)
red:lpush(dbKey, MsgPack.pack({
id = match.id,
t = match.t,
win = isWin,
time = now,
video = video,
sdelta = myScore - oldmyScore,
}))
|
8c20d812
zhouhaihai
pvp bUg
|
374
|
red:ltrim(dbKey, 0, 9)
|
4cf74232
zhouhaihai
pvp
|
375
376
377
378
379
380
381
382
383
384
385
|
-- 对方加入战斗记录
if match.t == 1 then
dbKey = string.format(RECORD_PVP_COMMON, match.id)
red:lpush(dbKey, MsgPack.pack({
id = roleId,
t = 1,
win = not isWin,
time = now,
video = video,
sdelta = matchScore - oldMatchScore,
}))
|
8c20d812
zhouhaihai
pvp bUg
|
386
|
red:ltrim(dbKey, 0, 9)
|
9cede2e2
zhouhaihai
主推红点 和冒险次数
|
387
388
|
rpcRole(match.id, "redPTag", RedPointTags.PvpCR, now)
|
4cf74232
zhouhaihai
pvp
|
389
390
|
end
end)
|
3dbbc9f3
zhouhaihai
加上新的任务
|
391
392
393
394
|
if isWin then
role:checkTaskEnter("PvpWin", {score = myScore})
end
|
d4e9b817
zhouhaihai
战斗 日志
|
395
396
397
398
399
400
401
402
403
404
|
role:checkBattle("pvpc", {
isWin = isWin,
info = msg.info,
robotId = match.t == 2 and match.id or nil,
enemy = match.t == 1 and _pvpBattleInfoCacheC[match.id] or nil,
score = myScore,
reward = reward,
rank = myRank,
})
|
f22a33af
zhouhaihai
自己的日志
|
405
|
role:mylog("pvp_action", {desc = "battleEnd", short1 = 1, int1 = isWin and 1 or 0, int2 = revenge and 1 or 0})
|
440aa055
zhouhaihai
聊天
|
406
|
|
d4e9b817
zhouhaihai
战斗 日志
|
407
408
409
410
411
|
_pvpBattleInfoCacheC = {} --重新发阵容了 没毛病
_pvpRecordInfoCacheC = {} -- 记录刷新了
_pvpRecordBattleInfoCacheC = {} -- 取新纪录的时候搞
_pvpStartBattleCacheC = nil
|
4cf74232
zhouhaihai
pvp
|
412
413
|
SendPacket(actionCodes.Pvp_endBattleRpc, MsgPack.pack({
reward = reward,
|
7bb30dca
zhouhaihai
修改发奖
|
414
|
change = change,
|
4cf74232
zhouhaihai
pvp
|
415
416
417
418
419
420
421
|
myScore = myScore,
matchScore = matchScore,
oldmyScore = oldmyScore,
oldMatchScore = oldMatchScore,
myRank = myRank,
oldMyRank = oldMyRank,
video = video,
|
39e60fd1
zhouhaihai
支持上传 oss
|
422
|
headers = headers,
|
4cf74232
zhouhaihai
pvp
|
423
424
425
426
|
}))
return true
end
|
4c5d72ab
zhouhaihai
高级pvp
|
427
428
429
430
431
432
433
|
function _M.startBattleHRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local idx = msg.idx
local revenge = msg.revenge
|
da898074
zhouhaihai
pvp 高级领奖
|
434
|
if not role:isTimeResetOpen(TimeReset.PvpHight) then return end
|
4c5d72ab
zhouhaihai
高级pvp
|
435
436
|
local pvpTH = role:getProperty("pvpTH")
|
da898074
zhouhaihai
pvp 高级领奖
|
437
|
if not next(pvpTH) then return 1 end
|
4c5d72ab
zhouhaihai
高级pvp
|
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
|
-- 检查并记录玩家队伍
local pvpTH = {}
local had = {} -- 上阵的角色
local supportHad = {}
for i = 1, 3 do
local team = msg.teams[i]
if not team then return end
if not team.heros or not next(team.heros) then
return
end
for slot, heroId in pairs(team.heros or {}) do
if not role.heros[heroId] or had[heroId] then
return
end
had[heroId] = 1
end
local supports = {}
for slot, support in pairs(team.supports) do
if slot ~= 1 and slot ~= 2 then return end
local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
if level <= 0 or supportHad[support] then return end
supports[slot] = support
supportHad[support] = 1
end
local curTeam = {}
curTeam.heros = team.heros
curTeam.leader = team.leader
curTeam.supports = supports
|
f7f26c15
zhouhaihai
编队整理 增加 tactics战术
|
471
472
473
474
|
if team.tactics and globalCsv.tactics_skill_passive_cell[team.tactics] then
curTeam.tactics = team.tactics
end
|
4c5d72ab
zhouhaihai
高级pvp
|
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
500
501
|
table.insert(pvpTH, curTeam)
end
local enemyTeamRecord, result, key, wait, enemyT, matchInfo
local now = skynet.timex()
if revenge then --复仇
local temp = _pvpRecordInfoCacheH[idx]
if not temp then return 2 end
if not _revengeRecord[temp.id] or now >= _revengeRecord[temp.id] then
if temp.t == 1 then
enemyTeamRecord = _pvpRecordBattleInfoCacheH[temp.id]
enemyT = _pvpRecordHeroInfoCacheH[temp.id]
elseif temp.t == 2 then
enemyTeamRecord = {robot = temp.id}
end
else
result = 1
wait = _revengeRecord[temp.id] - now
end
else --打正常
local pvpMH = role:getProperty("pvpMH")
if not pvpMH[idx] then return 3 end
if pvpMH[idx].t == 1 then
enemyTeamRecord = _pvpBattleInfoCacheH[pvpMH[idx].id]
|
da898074
zhouhaihai
pvp 高级领奖
|
502
|
enemyT = _pvpHeroInfoCacheH[pvpMH[idx].id]
|
4c5d72ab
zhouhaihai
高级pvp
|
503
504
505
506
507
508
509
510
511
512
513
514
515
|
elseif pvpMH[idx].t == 2 then
enemyTeamRecord = {robot = pvpMH[idx].id}
end
end
if not result and not enemyTeamRecord then return 4 end
if not result then
-- 次数扣一波
local pvpFreeH = role.dailyData:getProperty("pvpFreeH")
if pvpFreeH >= globalCsv.pvp_battle_free_count_high then
local cost = {[ItemId.PvpKey] = globalCsv.pvp_battle_high_cost}
if not role:checkItemEnough(cost) then return 5 end
|
887c1843
zhouhaihai
日志新一批
|
516
|
role:costItems(cost, {log = {desc = "startPvp", int1 = 2}})
|
4c5d72ab
zhouhaihai
高级pvp
|
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
|
else
role.dailyData:updateProperty({field = "pvpFreeH", delta = 1})
end
-- 只发送指定的那个敌人
if enemyTeamRecord.robot then
matchInfo = enemyTeamRecord
else
matchInfo = enemyTeamRecord[1]
end
key = tostring(math.random())
_pvpStartBattleCacheH = {
idx = idx, -- 数据索引
key = key, -- 战斗校验 key
revenge = revenge, -- 是否是复仇
result = {}, -- 战斗记录
pvpTH = pvpTH, -- 我方队伍缓存
enemyTB = enemyTeamRecord, --敌方战斗队伍缓存
enemyT = enemyT,
}
role:checkTaskEnter("PvpBattle")
|
3133cb76
zhouhaihai
日志
|
541
|
|
f22a33af
zhouhaihai
自己的日志
|
542
543
|
role:mylog("pvp_action", {desc = "startBattle", short1 = 2, int1 = revenge and 1 or 0})
|
4c5d72ab
zhouhaihai
高级pvp
|
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
|
end
SendPacket(actionCodes.Pvp_startBattleHRpc, MsgPack.pack({
matchInfo = matchInfo, --敌方队伍 信息
key = key, --战斗校验 key
round = 1, -- 战斗场数索引
result = result, -- 返回状态
wait = wait -- 等待复仇时间
}))
return true
end
function _M.endBattleHRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
local msg = MsgPack.unpack(data)
if not msg.key or not _pvpStartBattleCacheH or msg.key ~= _pvpStartBattleCacheH.key then
|
d6a66c74
zhouhaihai
校验失败也返回
|
562
563
|
SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({errorCode = 1}))
return true
|
4c5d72ab
zhouhaihai
高级pvp
|
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
|
end
if not msg.idx or msg.idx ~= _pvpStartBattleCacheH.idx then
return 2
end
local isWin = msg.starNum and msg.starNum > 0
local now = skynet.timex()
local revenge = _pvpStartBattleCacheH.revenge
local match
if revenge then
match = _pvpRecordInfoCacheH[msg.idx]
_revengeRecord[match.id] = now + RevengeWaitTime -- 1分钟内不能再打
else
local pvpMH = role:getProperty("pvpMH")
match = pvpMH[msg.idx]
end
if not match then return end
-- 请求上传录像
local params = {
["roleid"] = roleId,
["key"] = "zhaolugame20191016",
["time"] = now,
}
local status, body = httpc.get(remoteUrl, "/applyvideo?" .. httpGetFormatData(params), {}, {})
|
39e60fd1
zhouhaihai
支持上传 oss
|
592
|
local video, headers = nil, nil
|
4c5d72ab
zhouhaihai
高级pvp
|
593
594
595
|
if tonumber(status) == 200 then
local result = json.decode(body)
video = result.name
|
39e60fd1
zhouhaihai
支持上传 oss
|
596
|
headers = result.headers
|
4c5d72ab
zhouhaihai
高级pvp
|
597
|
else
|
77b54f12
zhouhaihai
中心服录像上传
|
598
|
skynet.error("applyvideo", "error", status, body)
|
4c5d72ab
zhouhaihai
高级pvp
|
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
|
end
table.insert(_pvpStartBattleCacheH.result, {
isWin = isWin,
video = video,
})
-- 检查是否结束战斗
local winCount, loseCount = 0, 0
for _, status in pairs(_pvpStartBattleCacheH.result) do
if status.isWin then
winCount = winCount + 1
else
loseCount = loseCount + 1
end
end
if winCount >= 2 then
isWin = true
elseif loseCount >= 2 then
isWin = false
else -- 没结束
-- 返回继续战斗
local key = tostring(math.random())
_pvpStartBattleCacheH.key = key
local round = #_pvpStartBattleCacheH.result + 1
local matchInfo = nil
if _pvpStartBattleCacheH.enemyTB.robot then
|
da898074
zhouhaihai
pvp 高级领奖
|
628
|
matchInfo = _pvpStartBattleCacheH.enemyTB
|
4c5d72ab
zhouhaihai
高级pvp
|
629
630
631
632
633
634
635
636
637
638
|
else
matchInfo = _pvpStartBattleCacheH.enemyTB[round]
end
-- 继续战斗
SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({
matchInfo = matchInfo, --敌方队伍 信息
key = key, --战斗校验 key
round = round, -- 战斗场数索引
video = video, -- 返回让客户端上传录像
|
39e60fd1
zhouhaihai
支持上传 oss
|
639
|
headers = headers,
|
4c5d72ab
zhouhaihai
高级pvp
|
640
641
642
643
644
|
}))
return true
end
-- 战斗结束了发奖
|
da898074
zhouhaihai
pvp 高级领奖
|
645
|
local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpgroupBonus, true)
|
7bb30dca
zhouhaihai
修改发奖
|
646
|
local reward, change = role:award({[temp[1]] = temp[2]}, {log = {desc = "pvpBattleH"}})
|
da898074
zhouhaihai
pvp 高级领奖
|
647
648
649
650
|
local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = 0, 0, 0, 0, 0, 0
if role:isTimeResetOpen(TimeReset.PvpHight) then
myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = role:changePvpScoreHigh(match.t == 1 and match.id or -1, isWin)
end
|
4c5d72ab
zhouhaihai
高级pvp
|
651
652
653
654
|
-- 加入战斗记录
local selfTeam = {}
local enemyTeam = {}
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
655
|
|
4c5d72ab
zhouhaihai
高级pvp
|
656
657
658
|
for _idx, info in ipairs(_pvpStartBattleCacheH.result) do
info.winId = info.isWin and roleId or match.id
info.isWin = nil
|
da898074
zhouhaihai
pvp 高级领奖
|
659
660
661
662
|
selfTeam[_idx] = {
heros = role:getTeamHerosInfo(_pvpStartBattleCacheH.pvpTH[_idx].heros),
battleV = role:getTeamBattleValue(_pvpStartBattleCacheH.pvpTH[_idx].heros)
}
|
4c5d72ab
zhouhaihai
高级pvp
|
663
|
if match.t == 1 and _pvpStartBattleCacheH.enemyT then
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
664
665
666
667
|
enemyTeam[_idx] = {
heros = _pvpStartBattleCacheH.enemyT["heros"][_idx],
battleV = _pvpStartBattleCacheH.enemyT["battleV"][_idx]
}
|
4c5d72ab
zhouhaihai
高级pvp
|
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
|
end
end
local recordBattle = {
result = _pvpStartBattleCacheH.result,
[roleId] = selfTeam,
[match.id] = enemyTeam
}
redisproxy:pipelining(function(red)
local dbKey = string.format(RECORD_PVP_HIGH, roleId)
red:lpush(dbKey, MsgPack.pack({
id = match.id,
t = match.t,
win = isWin,
time = now,
sdelta = myScore - oldmyScore,
-- 队伍信息
record = recordBattle,
}))
red:ltrim(dbKey, 0, 9)
-- 对方加入战斗记录
if match.t == 1 then
dbKey = string.format(RECORD_PVP_HIGH, match.id)
red:lpush(dbKey, MsgPack.pack({
id = roleId,
t = 1,
win = not isWin,
time = now,
sdelta = matchScore - oldMatchScore,
-- 队伍信息
record = recordBattle,
}))
red:ltrim(dbKey, 0, 9)
|
9cede2e2
zhouhaihai
主推红点 和冒险次数
|
701
|
rpcRole(match.id, "redPTag", RedPointTags.PvpHR, now)
|
4c5d72ab
zhouhaihai
高级pvp
|
702
703
704
|
end
end)
|
d4e9b817
zhouhaihai
战斗 日志
|
705
706
707
708
709
710
711
712
713
714
715
|
role:checkBattle("pvph", {
isWin = isWin,
info = msg.info,
robotId = match.t == 2 and match.id or nil,
enemy = match.t == 1 and (revenge and _pvpRecordBattleInfoCacheH[match.id] or _pvpBattleInfoCacheH[match.id]) or nil,
score = myScore,
reward = reward,
rank = myRank,
})
|
4c5d72ab
zhouhaihai
高级pvp
|
716
717
718
719
720
721
722
723
724
725
|
_pvpBattleInfoCacheH = {} --重新发阵容了 没毛病
_pvpRecordInfoCacheH = {} -- 记录刷新了
_pvpRecordBattleInfoCacheH = {} -- 取新纪录的时候搞
_pvpStartBattleCacheH = nil
_pvpHeroInfoCacheH = {}
_pvpRecordHeroInfoCacheH = {}
if isWin then
role:checkTaskEnter("PvpWin", {score = myScore})
end
|
f22a33af
zhouhaihai
自己的日志
|
726
727
|
role:mylog("pvp_action", {desc = "battleEnd", short1 = 2, int1 = isWin and 1 or 0, int2 = revenge and 1 or 0})
|
4c5d72ab
zhouhaihai
高级pvp
|
728
729
|
SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({
reward = reward,
|
7bb30dca
zhouhaihai
修改发奖
|
730
|
change = change,
|
4c5d72ab
zhouhaihai
高级pvp
|
731
732
733
734
735
736
737
738
739
740
741
742
743
|
myScore = myScore,
matchScore = matchScore,
oldmyScore = oldmyScore,
oldMatchScore = oldMatchScore,
myRank = myRank,
oldMyRank = oldMyRank,
video = video,
isWin = isWin,
}))
return true
end
|
4cf74232
zhouhaihai
pvp
|
744
745
746
|
function _M.rankListRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
|
f317b790
zhouhaihai
pvp 遗留
|
747
|
local msg = MsgPack.unpack(data)
|
4cf74232
zhouhaihai
pvp
|
748
749
750
751
|
local ptype = msg.ptype or 1
local response = {}
if ptype == 1 then -- 普通pvp
|
da898074
zhouhaihai
pvp 高级领奖
|
752
|
local dbKey = role:getPvpDBKey(RANK_PVP_COMMON)
|
4cf74232
zhouhaihai
pvp
|
753
|
local redret = redisproxy:pipelining(function(red)
|
da898074
zhouhaihai
pvp 高级领奖
|
754
755
756
|
red:zscore(dbKey, roleId)
red:zrevrank(dbKey, roleId)
red:zrevrange(dbKey, 0, 99, "WITHSCORES")
|
4cf74232
zhouhaihai
pvp
|
757
|
end)
|
aaf6a9e6
zhouhaihai
分数默认1000
|
758
|
local score = role:unpackPvpScore(redret[1])
|
4cf74232
zhouhaihai
pvp
|
759
|
local rank = tonumber(redret[2] or -2) + 1 --排名 1 - ... -1 未上榜 没打过pvp
|
4cf74232
zhouhaihai
pvp
|
760
761
|
local rankList = {}
for i = 1, #redret[3], 2 do
|
f317b790
zhouhaihai
pvp 遗留
|
762
763
|
local roleId = tonumber(redret[3][i])
local score = role:unpackPvpScore(redret[3][i + 1])
|
4cf74232
zhouhaihai
pvp
|
764
765
766
767
768
769
770
771
772
773
774
|
local online, curInfo = rpcRole(roleId, "friendSInfo")
curInfo.score = score
curInfo.roleId = roleId
table.insert(rankList, curInfo)
end
response.score = score
response.rank = rank
response.rankList = rankList
elseif ptype == 2 then -- 高级pvp
|
da898074
zhouhaihai
pvp 高级领奖
|
775
|
local dbKey = role:getPvpDBKey(RANK_PVP_HIGHT)
|
4c5d72ab
zhouhaihai
高级pvp
|
776
|
local redret = redisproxy:pipelining(function(red)
|
da898074
zhouhaihai
pvp 高级领奖
|
777
778
779
|
red:zscore(dbKey, roleId)
red:zrevrank(dbKey, roleId)
red:zrevrange(dbKey, 0, 99, "WITHSCORES")
|
4c5d72ab
zhouhaihai
高级pvp
|
780
781
782
783
784
785
786
|
end)
local score = role:unpackPvpScore(redret[1])
local rank = tonumber(redret[2] or -2) + 1 --排名 1 - ... -1 未上榜 没打过pvp
local rankList = {}
for i = 1, #redret[3], 2 do
local roleId = tonumber(redret[3][i])
local score = role:unpackPvpScore(redret[3][i + 1])
|
da898074
zhouhaihai
pvp 高级领奖
|
787
|
local online, curInfo = rpcRole(roleId, "pvpHRankInfo")
|
4c5d72ab
zhouhaihai
高级pvp
|
788
789
790
791
792
793
794
795
|
curInfo.score = score
curInfo.roleId = roleId
table.insert(rankList, curInfo)
end
response.score = score
response.rank = rank
response.rankList = rankList
|
4cf74232
zhouhaihai
pvp
|
796
797
798
799
800
801
802
803
804
805
|
else
return
end
SendPacket(actionCodes.Pvp_rankListRpc, MsgPack.pack(response))
return true
end
function _M.recordListRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
|
8c20d812
zhouhaihai
pvp bUg
|
806
|
local msg = MsgPack.unpack(data)
|
4cf74232
zhouhaihai
pvp
|
807
808
809
810
811
812
813
814
815
|
local ptype = msg.ptype or 1
local recordList = {}
local now = skynet.timex()
if ptype == 1 then -- 普通pvp
local rlist = redisproxy:lrange(string.format(RECORD_PVP_COMMON, roleId), 0 , 9)
local tempList = {}
for _, temp in ipairs(rlist) do
local one = MsgPack.unpack(temp)
|
85083dba
zhouhaihai
拉黑从申请列表移除
|
816
|
if now - one.time <= globalCsv.pvp_record_keep_time then -- 大于一天的弃之
|
4cf74232
zhouhaihai
pvp
|
817
818
819
|
table.insert(tempList, one)
end
end
|
4c5d72ab
zhouhaihai
高级pvp
|
820
|
_pvpRecordInfoCacheC = tempList
|
4cf74232
zhouhaihai
pvp
|
821
|
|
4c5d72ab
zhouhaihai
高级pvp
|
822
|
recordList = getMatchInfo(role, tempList, _pvpRecordBattleInfoCacheC, RANK_PVP_COMMON, "pvpCInfo")
|
4cf74232
zhouhaihai
pvp
|
823
824
825
826
827
828
829
|
for idx, info in ipairs(recordList) do
local temp = tempList[idx]
info.win = temp.win
info.time = temp.time
info.video = temp.video
info.sdelta = temp.sdelta
end
|
9cede2e2
zhouhaihai
主推红点 和冒险次数
|
830
|
role:clearRedPTag(RedPointTags.PvpCR)
|
4cf74232
zhouhaihai
pvp
|
831
|
elseif ptype == 2 then -- 高级pvp
|
4c5d72ab
zhouhaihai
高级pvp
|
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
|
local rlist = redisproxy:lrange(string.format(RECORD_PVP_HIGH, roleId), 0 , 9)
local tempList = {}
for _, temp in ipairs(rlist) do
local one = MsgPack.unpack(temp)
if now - one.time <= globalCsv.pvp_record_keep_time then -- 大于一天的弃之
table.insert(tempList, one)
end
end
_pvpRecordInfoCacheH = tempList
recordList = getMatchInfo(role, tempList, _pvpRecordBattleInfoCacheH, RANK_PVP_HIGHT, "pvpHInfo", _pvpRecordHeroInfoCacheH)
for idx, info in ipairs(recordList) do
local temp = tempList[idx]
info.win = temp.win
info.time = temp.time
info.sdelta = temp.sdelta
info.record = temp.record
end
|
9cede2e2
zhouhaihai
主推红点 和冒险次数
|
850
851
|
role:clearRedPTag(RedPointTags.PvpHR)
|
4cf74232
zhouhaihai
pvp
|
852
853
854
855
856
|
else
return
end
SendPacket(actionCodes.Pvp_recordListRpc, MsgPack.pack({list = recordList}))
return true
|
440aa055
zhouhaihai
聊天
|
857
858
|
end
|
da898074
zhouhaihai
pvp 高级领奖
|
859
860
861
862
|
function _M.highDivisionGiftRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
|
75e7709e
zhouhaihai
领取bug
|
863
|
local pvpHGTime = role:getProperty("pvpHGTime")
|
da898074
zhouhaihai
pvp 高级领奖
|
864
|
if pvpHGTime == 0 then return end
|
da898074
zhouhaihai
pvp 高级领奖
|
865
|
|
42327de8
zhouhaihai
高级竞技场红点
|
866
|
local newTime, newReward = role:calculatePvpHGift(role:getPvpHDivision())
|
da898074
zhouhaihai
pvp 高级领奖
|
867
868
|
if not next(newReward) then return end
|
75e7709e
zhouhaihai
领取bug
|
869
|
role:updateProperties({
|
da898074
zhouhaihai
pvp 高级领奖
|
870
871
872
873
|
pvpHGTime = newTime,
pvpHGift = {},
})
|
7bb30dca
zhouhaihai
修改发奖
|
874
|
local reward, change = role:award(newReward, {log = {desc = "pvpDivisionH"}})
|
f22a33af
zhouhaihai
自己的日志
|
875
|
role:mylog("pvp_action", {desc = "pvpDivisionH"})
|
da898074
zhouhaihai
pvp 高级领奖
|
876
|
|
7bb30dca
zhouhaihai
修改发奖
|
877
|
SendPacket(actionCodes.Pvp_highDivisionGiftRpc, MsgPack.pack(role:packReward(reward, change)))
|
da898074
zhouhaihai
pvp 高级领奖
|
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
|
return true
end
function _M.shopBuyRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
local msg = MsgPack.unpack(data)
local id = msg.id
local count = msg.count or 1
local csvData = csvdb["shop_pvpCsv"][id]
if not csvData then return end
local pvpShop = role:getProperty("pvpShop")
if csvData.limit > 0 then
if math.illegalNum(count, 1, csvData.limit - (pvpShop[id] or 0)) then return end
end
if not role:checkItemEnough({[ItemId.PvpCoin] = csvData.cost * count}) then return end
|
3133cb76
zhouhaihai
日志
|
899
|
role:costItems({[ItemId.PvpCoin] = csvData.cost * count}, {log = {desc = "pvpShop", int1 = id, int2 = count}})
|
da898074
zhouhaihai
pvp 高级领奖
|
900
901
902
903
904
905
906
907
|
if csvData.limit > 0 then
role:changeUpdates({{type = "pvpShop", field = id, value = (pvpShop[id] or 0) + count}})
end
local gift = csvData.gift:toNumMap()
for id, c in pairs(gift) do
gift[id] = c * count
end
|
7bb30dca
zhouhaihai
修改发奖
|
908
|
local reward, change = role:award(gift, {log = {desc = "pvpShop", int1 = id, int2 = count}})
|
da898074
zhouhaihai
pvp 高级领奖
|
909
|
|
f22a33af
zhouhaihai
自己的日志
|
910
911
|
role:mylog("pvp_action", {desc = "pvpShop", int1 = id, int2 = count})
|
7bb30dca
zhouhaihai
修改发奖
|
912
|
SendPacket(actionCodes.Pvp_shopBuyRpc, MsgPack.pack(role:packReward(reward, change)))
|
da898074
zhouhaihai
pvp 高级领奖
|
913
914
915
|
return true
end
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
|
----------------------------跨服竞技场----------------------------------
function _M.crossInfoRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
if not role:isTimeResetOpen(TimeReset.PvpCross) then return end
local result = role:getCrossServerPvpMatchInfo()
if not result then return end
SendPacket(actionCodes.Pvp_crossInfoRpc, MsgPack.pack(result))
return true
end
function _M.crossRoleInfoRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
if not role:isTimeResetOpen(TimeReset.PvpCross) then return end
local result = role:getCrossServerPvpRoleInfo()
if not result then return end
SendPacket(actionCodes.Pvp_crossRoleInfoRpc, MsgPack.pack({roleInfo = result}))
return true
end
function _M.crossRoleInfoDetailRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
if not role:isTimeResetOpen(TimeReset.PvpCross) then return end
local msg = MsgPack.unpack(data)
if not msg.ids or not next(msg.ids) then return end
local result = role:getCrossServerPvpRoleInfoDeatil(msg.ids)
if not result then return end
SendPacket(actionCodes.Pvp_crossRoleInfoDetailRpc, MsgPack.pack(result))
return true
end
function _M.crossMatchRecordRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
if not role:isTimeResetOpen(TimeReset.PvpCross) then return 1 end
local msg = MsgPack.unpack(data)
if not msg.round then return 2 end
if not msg.matchIdx then return 3 end
local result = role:getCrossServerPvpMatchRecord(msg.round, msg.matchIdx)
if not result then return 4 end
SendPacket(actionCodes.Pvp_crossMatchRecordRpc, MsgPack.pack(result))
return true
end
function _M.crossBetInfoRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
if not role:isTimeResetOpen(TimeReset.PvpCross) then return end
local result = role:getCrossServerPvpBetInfo()
if not result then return end
SendPacket(actionCodes.Pvp_crossBetInfoRpc, MsgPack.pack(result))
return true
end
function _M.crossBetRpc(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
local msg = MsgPack.unpack(data)
|
c581c6e9
zhouhaihai
pvp 优化
|
997
998
|
if not role:isTimeResetOpen(TimeReset.PvpCross) then return 1 end
if msg.idx ~= 1 and msg.idx ~= 2 then return 2 end
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
999
|
|
c581c6e9
zhouhaihai
pvp 优化
|
1000
1001
|
local result, code = role:setCrossServerPvpBet(msg.idx)
if not result then return 10 + code end
|
3133cb76
zhouhaihai
日志
|
1002
|
|
f22a33af
zhouhaihai
自己的日志
|
1003
|
role:mylog("pvp_action", {desc = "crossBet"})
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
1004
1005
1006
1007
1008
1009
1010
|
SendPacket(actionCodes.Pvp_crossBetRpc, MsgPack.pack(result))
return true
end
|
440aa055
zhouhaihai
聊天
|
1011
|
return _M
|