be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
1
2
3
4
5
6
|
local RolePlugin = {}
function RolePlugin.bind(Role)
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
7
|
function Role:loadAll()
|
be9c9ca6
zhouahaihai
角色评论
|
8
|
self:loadDaily()
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
9
10
|
self:loadEquips()
self:loadRunes()
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
11
|
self:loadHeros()
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
12
|
self:loadDiner()
|
9a1c54b2
zhouhaihai
活动
|
13
|
self:loadActivity()
|
c5825110
saicom
新增用户商城相关数据
|
14
|
self:loadStoreInfo()
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
15
16
17
|
end
function Role:reloadWhenLogin()
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
18
19
|
end
|
c384626d
zhouhaihai
好友
|
20
21
22
23
|
function Role:SendPacket(...)
SendPacket(...)
end
|
5b28342d
zhouahaihai
离线方法
|
24
|
function Role:onOfflineEvent()
|
c384626d
zhouhaihai
好友
|
25
26
|
-- 设置最新的登录时间
self:setProperty("ltime", skynet.timex())
|
5b28342d
zhouahaihai
离线方法
|
27
|
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
28
|
|
312b9db5
zhouahaihai
背包
|
29
30
31
32
33
34
35
36
|
local function checkItemCount(self, itemId, count)
local itemData = csvdb["itemCsv"][itemId]
-- 种类 类型数量限制
local page = globalCsv.store_type[itemData.type]
local limit = self:getProperty("bagLimit")[page]
if limit and self:getItemCount(itemId) == 0 then
local curCount = 0
local items = self:getProperty("items"):toNumMap()
|
9407543b
zhouhaihai
限定错误
|
37
38
|
for id ,_ in pairs(items) do
local tempData = csvdb["itemCsv"][id]
|
514590c2
zhouhaihai
容错
|
39
40
41
42
43
44
45
|
if tempData then
if globalCsv.store_type[tempData.type] == page then
curCount = curCount + 1
if curCount >= limit then
count = 0
break
end
|
312b9db5
zhouahaihai
背包
|
46
47
48
49
|
end
end
end
end
|
312b9db5
zhouahaihai
背包
|
50
51
|
return count
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
52
53
|
local function _award(self, itemId, count, params)
|
0719a220
zhouhaihai
数据保护
|
54
|
local count = math.floor(count)
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
55
|
local pms = clone(params)
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
56
|
local itemData = csvdb["itemCsv"][itemId]
|
056c01a0
zhouhaihai
简化装备
|
57
58
59
|
if not itemData then -- 加一层保护
return 0, {}
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
60
61
62
|
local curType = itemData.type
local change = {} -- 奖励被转化为了其他奖励 id = count
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
63
64
|
local itemIdAward = {
[ItemId.PlayerExp] = function()
|
44c6e479
zhouhaihai
增加部分日志
|
65
|
self:addPlayExp(count, pms)
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
66
67
68
|
end,
}
|
be9c9ca6
zhouahaihai
角色评论
|
69
70
|
local itemTypeAward = {
[ItemType.Hero] = function()
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
71
|
pms.type = itemId - ItemStartId.Hero
|
a7b69ec2
zhouhaihai
完善道具转换
|
72
73
74
75
76
77
78
79
|
local status = self:addHero(pms)
local gcount = 1
if not status then
gcount = 0
end
if count - gcount > 0 then
local heroData = csvdb["unitCsv"][pms.type]
change[pms.type] = (change[pms.type] or 0) + (count - gcount) * globalCsv.draw_unit_tofragment[heroData.rare]
|
be9c9ca6
zhouahaihai
角色评论
|
80
|
end
|
a7b69ec2
zhouhaihai
完善道具转换
|
81
|
count = gcount
|
be9c9ca6
zhouahaihai
角色评论
|
82
|
end,
|
1c24ba6e
gaofengduan
fix equip
|
83
84
85
|
[ItemType.EquipBase] = function()
local typ = math.floor((itemId-7000)/100)
local lv = (itemId-7000)%100
|
056c01a0
zhouhaihai
简化装备
|
86
|
self:addEquip(typ, lv, count ,pms)
|
53e8037e
zhouhaihai
任务
|
87
88
|
local equipCsv = (csvdb["equipCsv"][typ] or {})[lv]
self:checkTaskEnter("AddEquip", {equipId = itemId, rarity = equipCsv.rarity}, pms.notNotify)
|
1c24ba6e
gaofengduan
fix equip
|
89
90
|
end,
[ItemType.Rune] = function()
|
3847ba2d
zhouhaihai
修改 零件
|
91
|
local typ = math.floor((itemId-10000)/1000)
|
1c24ba6e
gaofengduan
fix equip
|
92
|
for _= 1, count do
|
44c6e479
zhouhaihai
增加部分日志
|
93
|
self:addRune({type = typ,id = itemId, notNotify = pms.notNotify, log = pms.log})
|
1c24ba6e
gaofengduan
fix equip
|
94
95
|
end
end,
|
00115a7a
zhouahaihai
奖励发放
|
96
97
98
|
[ItemType.AdvItem] = function() --冒险道具不会进入 玩家仓库
count = 0
end,
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
99
|
[ItemType.FuncOpen] = function()
|
44c6e479
zhouhaihai
增加部分日志
|
100
|
self:funcOpen(itemId, count, pms)
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
101
|
end,
|
be9c9ca6
zhouahaihai
角色评论
|
102
|
}
|
312b9db5
zhouahaihai
背包
|
103
|
-- 对数量筛查
|
1a1a6375
gaofengduan
fix lua warning
|
104
|
count = checkItemCount(self, itemId, count)
|
312b9db5
zhouahaihai
背包
|
105
|
if count ~= 0 then
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
106
107
108
|
if itemIdAward[itemId] then
itemIdAward[itemId]()
elseif itemTypeAward[curType] then
|
312b9db5
zhouahaihai
背包
|
109
110
|
itemTypeAward[curType]()
else
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
111
112
113
|
pms.itemId = itemId
pms.count = count
self:addItem(pms)
|
312b9db5
zhouahaihai
背包
|
114
|
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
115
116
|
end
|
a7b69ec2
zhouhaihai
完善道具转换
|
117
|
return count, change -- count 实际发放的奖励个数 change 物品实际奖励与当前id 不符 就发生转换 而不实际发奖
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
118
119
120
121
122
|
end
-- 发奖功能入口 award string id=count or {[id] = count}
function Role:award(gift, params)
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
123
|
params = params or {}
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
124
|
local tgift = {}
|
46fac6f1
zhouahaihai
酱料
|
125
|
if type(gift) == "string" then
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
126
127
128
129
130
131
132
133
|
for _, one in pairs(gift:toTableArray(true)) do
tgift[one[1]] = (tgift[one[1]] or 0) + one[2]
end
else
tgift = gift
end
local reward, allChange = {}, {}
|
a7b69ec2
zhouhaihai
完善道具转换
|
134
135
136
137
138
|
for itemId, rcount in pairs(tgift) do
local count, change = _award(self, itemId, rcount, params)
if count > 0 then
reward[itemId] = (reward[itemId] or 0) + count
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
139
|
if next(change) then
|
a7b69ec2
zhouhaihai
完善道具转换
|
140
141
142
143
144
145
|
local cr, _ = self:award(change, params) -- 内部转换忽略 防止死循环
if next(cr) then
for _id, _ct in pairs(cr) do
reward[_id] = (reward[_id] or 0) + _ct
end
table.insert(allChange, {form = {[itemId] = rcount - count}, to = cr})
|
312b9db5
zhouahaihai
背包
|
146
|
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
147
148
|
end
end
|
7bb30dca
zhouhaihai
修改发奖
|
149
|
if not next(allChange) then allChange = nil end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
150
151
152
|
return reward, allChange --实际获得的奖励 和 最高级奖励转化过程
end
|
7bb30dca
zhouhaihai
修改发奖
|
153
154
155
156
157
158
|
function Role:packReward(reward, change)
if not reward then return nil end
return {reward = reward, change = change}
end
|
bd4fb541
zhouhaihai
增加物品过期系统
|
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
|
function Role:awardExpireItem(expireTime, gift, params)
if expireTime <= skynet.timex() then
return
end
local reward = self:award(gift, params)
local expireItem = self:getProperty("expireItem")
for itemId, _ in pairs(reward) do
expireItem[itemId] = expireTime
end
self:setProperty("expireItem", expireItem)
end
function Role:checkExpireItem(notNotify)
local expireItem = self:getProperty("expireItem")
local now = skynet.timex()
for itemId, expireTime in pairs(expireItem) do
if expireTime <= now then
expireItem[itemId] = nil
local itemCount = self:getItemCount(itemId)
if itemCount > 0 then
-- 过期物品删掉
self:addItem({itemId = itemId, count = -itemCount, log = {desc = "expire"}, notNotify = notNotify}) --过期
local itemData = csvdb["itemCsv"][itemId]
if itemData then
if itemData.type == ItemType.Head then
-- 检查头像是不是在穿戴
if self:getProperty("headId") == itemId then
self:changeHead(globalCsv.defaultHead, notNotify)
local headData = csvdb["player_iconCsv"][itemId]
-- pvp 跨服竞技场奖励
if headData and headData.path == 2 then
redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = 19})
end
end
end
end
end
end
end
self:setProperty("expireItem", expireItem)
end
function Role:changeHead(id, notNotify)
self:updateProperty({field = "headId" ,value = id, notNotify = notNotify})
self:changeCrossServerPvpSelfInfo("headId")
|
8e524d41
zhouhaihai
优化
|
206
|
self:mylog("role_action", {desc = "changeHead", int1 = id})
|
bd4fb541
zhouhaihai
增加物品过期系统
|
207
208
|
end
|
44c6e479
zhouhaihai
增加部分日志
|
209
|
function Role:addPlayExp(addExp, params)
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
210
|
local level = self:getProperty("level")
|
39bcd7ca
zhouhaihai
LOG
|
211
|
local oldLevel = level
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
212
213
214
|
if not csvdb["player_expCsv"][level + 1] then
return
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
215
|
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
216
217
218
219
220
221
|
local exp = self:getProperty("exp")
local newExp = exp + addExp
while newExp >= csvdb["player_expCsv"][level].exp do
if csvdb["player_expCsv"][level + 1] then -- 有下一级
newExp = newExp - csvdb["player_expCsv"][level].exp
level = level + 1
|
9ea0c502
liuzujun
限时礼包
|
222
|
self:checkTaskEnter("RoleLevelUp", {level = level})
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
223
224
225
226
|
else
newExp = csvdb["player_expCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
end
end
|
39bcd7ca
zhouhaihai
LOG
|
227
|
if level > oldLevel then
|
c6f3e36c
zhouhaihai
错误的语法
|
228
229
230
231
232
|
if params.log then
local log = params.log
self:log("setLevel", {
level_before = oldLevel,
level_changemain = log.desc,
|
43293781
zhouhaihai
日志bug
|
233
|
level_changedetail = log.int1 or 0,
|
f3eb34b1
liuzujun
删除无用日志
|
234
|
level_reward = {},
|
c6f3e36c
zhouhaihai
错误的语法
|
235
236
237
238
|
})
else
print("addPlayExp no log ", debug.traceback())
end
|
f22a33af
zhouhaihai
自己的日志
|
239
240
241
|
end
if params.log then
|
7d31daa8
zhouhaihai
调整压测
|
242
|
local log = clone(params.log)
|
f22a33af
zhouhaihai
自己的日志
|
243
244
245
|
if log["cint1"] or log["cint2"] then
print("addPlayExp error log have cint1 or cint2 or cint3", debug.traceback())
end
|
c6f3e36c
zhouhaihai
错误的语法
|
246
|
|
f22a33af
zhouhaihai
自己的日志
|
247
248
249
250
251
252
253
254
|
log["cint1"] = addExp
log["cint2"] = newExp
log["cint3"] = level
self:mylog("player_exp", log)
else
print("addPlayExp no log ", debug.traceback())
|
44c6e479
zhouhaihai
增加部分日志
|
255
256
|
end
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
257
|
self:updateProperties({level = level, exp = newExp})
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
258
|
self:changeCrossServerPvpSelfInfo("level")
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
259
260
|
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
261
262
|
function Role:addItem(params)
params = params or {}
|
d02368d3
zhouhaihai
数据保护
|
263
|
params.count = math.floor(params.count or 0)
|
312b9db5
zhouahaihai
背包
|
264
265
266
267
|
if params.itemId == ItemId.Diamond then
self:gainDiamond(params)
return
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
268
269
270
271
272
273
274
275
276
|
local items = self:getProperty("items")
local origin = items:getv(params.itemId, 0)
local nums = origin+params.count
if nums <= 0 then
items = items:delk(params.itemId)
nums = 0
else
items = items:incrv(params.itemId, params.count)
end
|
44c6e479
zhouhaihai
增加部分日志
|
277
|
|
c59e058b
zhouhaihai
新一批日志记录
|
278
|
self:logItems(params.itemId, origin, nums, params.log)
|
f22a33af
zhouhaihai
自己的日志
|
279
|
if params.log then
|
7d31daa8
zhouhaihai
调整压测
|
280
|
local log = clone(params.log)
|
f22a33af
zhouhaihai
自己的日志
|
281
282
283
284
285
286
287
288
289
290
291
292
293
|
if log["cint1"] or log["cint2"] then
print("addItem error log have cint1 or cint2 ", debug.traceback())
end
log["cint1"] = params.itemId
log["cint2"] = math.abs(params.count)
if params.count <= 0 then
self:mylog("out_item", log)
else
self:mylog("in_item", log)
end
else
print("addItem no log ", debug.traceback())
end
|
44c6e479
zhouhaihai
增加部分日志
|
294
|
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
295
296
297
298
299
300
301
302
|
self:setProperty("items", items)
if not params.notNotify then
SendPacket(actionCodes.Role_updateItems, MsgPack.pack({[params.itemId] = nums}))
end
end
function Role:checkItemEnough(itemCountT)
local less = {}
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
303
|
if not next(itemCountT) then
|
7d31daa8
zhouhaihai
调整压测
|
304
|
return true, less
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
305
|
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
306
|
for itemId, count in pairs(itemCountT) do
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
307
308
309
310
311
312
313
314
|
if count <= 0 then
-- 判断物品数量值不应该小于等于0
less[itemId] = 0
else
local last = self:getItemCount(itemId) - count
if last < 0 then
less[itemId] = -last
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
315
316
317
318
319
320
|
end
end
return (not next(less)), less -- 是否足够,,缺什么缺多少
end
function Role:costItems(itemCountT, params)
|
36204e3c
zhengshouren
贩卖逻辑
|
321
|
local pms = clone(params or {})
|
312b9db5
zhouahaihai
背包
|
322
|
if itemCountT[ItemId.Diamond] then --优先扣除钻石
|
312b9db5
zhouahaihai
背包
|
323
324
325
326
327
328
|
pms.count = itemCountT[ItemId.Diamond]
if not self:costDiamond(pms) then
return
end
itemCountT[ItemId.Diamond] = nil
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
329
|
for itemId, count in pairs(itemCountT) do
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
330
331
332
333
|
pms.itemId = itemId
pms.count = - count
self:addItem(pms)
end
|
312b9db5
zhouahaihai
背包
|
334
|
return true
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
335
336
337
|
end
function Role:getItemCount(itemId)
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
338
|
if itemId == ItemId.Diamond then
|
312b9db5
zhouahaihai
背包
|
339
340
|
return self:getAllDiamond()
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
341
342
343
|
return self:getProperty("items"):getv(itemId, 0)
end
|
312b9db5
zhouahaihai
背包
|
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
|
function Role:getAllDiamond()
return self:getProperty("diamond") + self:getProperty("reDiamond")
end
function Role:gainDiamond(params)
if not params or type(params) ~= "table" then return false end
local count = tonum(params.count)
if isnan(count) then
return false
end
local origind = self:getProperty("diamond")
local originr = self:getProperty("reDiamond")
local origin = origind + originr
if params.isRecharge then
self:incrProperty("reDiamond", count)
else
self:incrProperty("diamond", count)
end
|
44c6e479
zhouhaihai
增加部分日志
|
362
|
|
c59e058b
zhouhaihai
新一批日志记录
|
363
|
self:logItems(ItemId.Diamond, origin, count, params.log)
|
f22a33af
zhouhaihai
自己的日志
|
364
|
if params.log then
|
7d31daa8
zhouhaihai
调整压测
|
365
|
local log = clone(params.log)
|
f22a33af
zhouhaihai
自己的日志
|
366
367
368
369
370
371
372
373
374
375
|
if log["cint1"] or log["cint2"] or log["cint3"] then
print("costDiamond error log have cint1 or cint2 or cint3 ", debug.traceback())
end
log["cint1"] = origin
log["cint2"] = count
self:mylog("in_diamond", log)
else
print("gainDiamond no log ", debug.traceback())
end
|
312b9db5
zhouahaihai
背包
|
376
377
378
379
|
self:notifyUpdateProperty("diamond", self:getAllDiamond())
return true
end
|
312b9db5
zhouahaihai
背包
|
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
|
function Role:costDiamond(params)
if not params or type(params) ~= "table" then return false end
local count = tonum(params.count)
if isnan(count) then
return false
end
if count <= 0 then
return false
end
local origind = self:getProperty("diamond")
local originr = self:getProperty("reDiamond")
local origin = origind + originr
if origin < 0 then
return false
end
if origin < count then
return false
end
local last = count
local costFirst = {"diamond", "reDiamond"}
if params.isRecharge then
costFirst = {"reDiamond", "diamond"}
end
last = math.max(last - self:getProperty(costFirst[1]), 0)
if last < count then
self:incrProperty(costFirst[1], last - count)
end
if last > 0 then
self:incrProperty(costFirst[2], -last)
end
|
c59e058b
zhouhaihai
新一批日志记录
|
412
413
|
self:logItems(ItemId.Diamond, origin, count, params.log)
|
f22a33af
zhouhaihai
自己的日志
|
414
|
if params.log then
|
7d31daa8
zhouhaihai
调整压测
|
415
|
local log = clone(params.log)
|
f22a33af
zhouhaihai
自己的日志
|
416
417
418
419
420
421
422
423
424
|
if log["cint1"] or log["cint2"] or log["cint3"] then
print("costDiamond error log have cint1 or cint2 or cint3 ", debug.traceback())
end
log["cint1"] = origin
log["cint2"] = count
self:mylog("out_diamond", log)
else
print("costDiamond no log ", debug.traceback())
end
|
44c6e479
zhouhaihai
增加部分日志
|
425
|
|
312b9db5
zhouahaihai
背包
|
426
427
428
429
|
self:notifyUpdateProperty("diamond", self:getAllDiamond())
return true
end
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
430
431
|
function Role:addHero(params)
local roleId = self:getProperty("id")
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
432
|
local heroType = params.type
|
056c01a0
zhouhaihai
简化装备
|
433
|
if self:isHaveHero(heroType) then return end
|
53e8037e
zhouhaihai
任务
|
434
435
|
local unitData = csvdb["unitCsv"][heroType]
if not unitData then return false end
|
056c01a0
zhouhaihai
简化装备
|
436
437
|
local heroId = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "hero", 1))
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
438
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
439
440
|
redisproxy:sadd(string.format(R_HEROS, roleId), heroId)
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
441
442
443
444
|
local heroInfo = {
key = string.format(R_HERO, roleId, heroId),
id = heroId,
type= heroType,
|
fb73effd
wangyujie
英雄初始觉醒等级从GD取
|
445
|
wakeL = globalCsv.unit_wake_initLevel[unitData.rare],
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
446
|
}
|
bcbb0c7b
zhouhaihai
3星解锁 cg
|
447
|
if heroInfo.wakeL == 3 then
|
3ed95697
zhouhaihai
成就 参数错误
|
448
|
self:checkTaskEnter("WakeCG", {heroType = heroType})
|
bcbb0c7b
zhouhaihai
3星解锁 cg
|
449
|
end
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
450
451
452
|
local newHero = require("models.Hero").new(heroInfo)
newHero:create()
newHero.owner = self
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
453
|
newHero:saveBattleValue()
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
454
|
self.heros[heroId] = newHero
|
00bf6029
liuzujun
限时礼包,抽卡ssr广播
|
455
456
457
458
459
|
local ssrCount = 0
if unitData.rare == HeroQuality.SSR then
ssrCount = self:getSSRHeroCount()
end
self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job, ssrCount = ssrCount}, params.notNotify)
|
190e1415
liuzujun
英雄帖活动初始化
|
460
|
self:checkTaskEnter("HeroQualityCollect", {})
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
461
462
463
464
465
466
|
if not params.notNotify then
local heroResponse = {}
table.insert(heroResponse, newHero:data())
local bin = MsgPack.pack(heroResponse)
SendPacket(actionCodes.Hero_loadInfos, bin)
end
|
c59e058b
zhouhaihai
新一批日志记录
|
467
468
469
|
self:logItems(heroType + ItemStartId.Hero, 0, 1, params.log)
|
f22a33af
zhouhaihai
自己的日志
|
470
|
if params.log then
|
7d31daa8
zhouhaihai
调整压测
|
471
|
local log = clone(params.log)
|
f22a33af
zhouhaihai
自己的日志
|
472
473
474
475
476
477
478
479
480
|
if log["cint1"] or log["cint2"] or log["cint3"] then
print("addHero error log have cint1 or cint2 or cint3 ", debug.traceback())
end
log["cint1"] = heroId
log["cint2"] = heroType
self:mylog("in_hero", log)
else
print("addHero no log ", debug.traceback())
end
|
c7ecb87f
zhouhaihai
添加 测试账号 方法
|
481
|
return true, newHero
|
056c01a0
zhouhaihai
简化装备
|
482
483
484
485
486
487
|
end
function Role:isHaveHero(heroType)
if not csvdb["unitCsv"][heroType] then return false end
for _, hero in pairs(self.heros) do
if hero:getProperty("type") == heroType then
|
c7ecb87f
zhouhaihai
添加 测试账号 方法
|
488
|
return hero
|
056c01a0
zhouhaihai
简化装备
|
489
490
|
end
end
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
491
492
|
end
|
00bf6029
liuzujun
限时礼包,抽卡ssr广播
|
493
494
495
496
497
498
499
500
501
502
|
function Role:getSSRHeroCount()
local count = 0
for _, hero in pairs(self.heros) do
if hero:getRare() == HeroQuality.SSR then
count = count + 1
end
end
return count
end
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
503
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
|
function Role:loadHeros()
local roleId = self:getProperty("id")
local heroIds = redisproxy:smembers(string.format(R_HEROS, roleId))
local redret = redisproxy:pipelining(function (red)
for _, heroId in ipairs(heroIds) do
red:hgetall(string.format(R_HERO, roleId, heroId))
end
end)
for index, heroId in ipairs(heroIds) do
local hero = require("models.Hero").new({key = string.format(R_HERO, roleId, heroId)})
if hero:load(table.array2Table(redret[index])) then
hero.owner = self
self.heros[tonumber(heroId)] = hero
end
end
end
|
be9c9ca6
zhouahaihai
角色评论
|
521
522
523
524
525
526
527
528
529
530
531
|
function Role:loadDaily()
local roleId = self:getProperty("id")
local dataKey = string.format(R_DAILY, roleId)
self.dailyData = require("models.Daily").new({key = dataKey})
self.dailyData.owner = self
if not redisproxy:exists(dataKey) then
self.dailyData:create()
else
self.dailyData:load()
end
end
|
46fac6f1
zhouahaihai
酱料
|
532
|
|
9a1c54b2
zhouhaihai
活动
|
533
534
535
536
537
538
539
540
541
542
543
544
|
function Role:loadActivity()
local roleId = self:getProperty("id")
local dataKey = string.format(R_ACTIVITY, roleId)
self.activity = require("models.Activity").new({key = dataKey})
self.activity.owner = self
if not redisproxy:exists(dataKey) then
self.activity:create()
else
self.activity:load()
end
end
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
545
546
547
548
549
550
551
552
553
554
555
556
|
function Role:loadDiner()
local roleId = self:getProperty("id")
local dataKey = string.format(R_DINER, roleId)
self.dinerData = require("models.Diner").new({key = dataKey})
self.dinerData.owner = self
if not redisproxy:exists(dataKey) then
self.dinerData:create()
else
self.dinerData:load()
end
end
|
440aa055
zhouhaihai
聊天
|
557
|
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
558
|
function Role:loadEquips()
|
056c01a0
zhouhaihai
简化装备
|
559
|
-- 放role 里面了
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
560
561
|
end
|
c5825110
saicom
新增用户商城相关数据
|
562
563
564
565
566
567
568
569
570
571
572
573
|
function Role:loadStoreInfo()
local roleId = self:getProperty("id")
local dataKey = string.format(R_STORE, roleId)
self.storeData = require("models.Store").new({key = dataKey})
self.storeData.owner = self
if not redisproxy:exists(dataKey) then
self.storeData:create()
else
self.storeData:load()
end
end
|
056c01a0
zhouhaihai
简化装备
|
574
575
576
577
578
579
580
|
function Role:addEquip(equipType, equipLv, count, pms)
pms = pms or {}
if count ~= count then return end
local equipCsv = (csvdb["equipCsv"][equipType] or {})[equipLv]
if not equipCsv then return end
local equips = self:getProperty("equips")
local curTypeEquips = equips[equipType] or {}
|
c59e058b
zhouhaihai
新一批日志记录
|
581
582
|
local oldCount = curTypeEquips[equipLv] or 0
local curCount = oldCount + count
|
056c01a0
zhouhaihai
简化装备
|
583
584
585
586
587
588
589
590
|
-- 是否足够上层判断
if curCount < 0 then
curCount = 0
curTypeEquips[equipLv] = nil
else
curTypeEquips[equipLv] = curCount
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
591
|
|
056c01a0
zhouhaihai
简化装备
|
592
593
594
595
596
597
598
|
if next(curTypeEquips) then
equips[equipType] = curTypeEquips
else
equips[equipType] = nil
end
self:setProperty("equips", equips)
|
44c6e479
zhouhaihai
增加部分日志
|
599
|
|
c59e058b
zhouhaihai
新一批日志记录
|
600
|
self:logItems(equipCsv.id, oldCount, curCount, pms.log)
|
f22a33af
zhouhaihai
自己的日志
|
601
|
if pms.log then
|
7d31daa8
zhouhaihai
调整压测
|
602
|
local log = clone(pms.log)
|
f22a33af
zhouhaihai
自己的日志
|
603
604
605
606
607
608
609
610
611
612
613
614
615
616
|
if log["cint1"] or log["cint2"] or log["cint3"] then
print("addEquip error log have cint1 or cint2 or cint3 ", debug.traceback())
end
log["cint1"] = equipType
log["cint2"] = equipLv
log["cint3"] = math.abs(count)
if count < 0 then
self:mylog("out_equip", log)
else
self:mylog("in_equip", log)
end
else
print("addEquip no log ", debug.traceback())
end
|
44c6e479
zhouhaihai
增加部分日志
|
617
|
|
056c01a0
zhouhaihai
简化装备
|
618
619
|
if not pms.notNotify then
self:changeUpdates({{type = "equips", field = {equipType, equipLv}, value = curCount, isOnlyToC = true}}) -- 通知客户端
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
620
621
622
623
|
end
end
function Role:getEquipCount(typ,lv)
|
056c01a0
zhouhaihai
简化装备
|
624
|
return (self:getProperty("equips")[typ] or {})[lv] or 0
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
625
626
627
|
end
function Role:loadRunes()
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
628
|
local roleId = self:getProperty("id")
|
ad484303
gaofengduan
add rune
|
629
630
631
632
633
634
635
636
637
638
639
640
|
local runeIds = redisproxy:smembers(string.format(R_RUNEIDS, roleId))
local redret = redisproxy:pipelining(function (red)
for _, runeId in ipairs(runeIds) do
red:hgetall(string.format(R_RUNE, roleId, runeId))
end
end)
for index, runeId in ipairs(runeIds) do
local rune = require("models.Rune").new({key = string.format(R_RUNE, roleId, runeId)})
if rune:load(table.array2Table(redret[index])) then
rune.owner = self
self.runeBag[tonumber(runeId)] = rune
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
641
642
643
|
end
end
|
ad484303
gaofengduan
add rune
|
644
|
-- 0 为操作成功
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
645
|
function Role:addRune(params)
|
ad484303
gaofengduan
add rune
|
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
|
if params.type and params.id then
local set = csvdb["runeCsv"][params.type]
if not set then return 2 end
local data = set[params.id]
if not data then return 3 end
local roleId = self:getProperty("id")
local runeUid = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "rune", 1))
redisproxy:sadd(string.format(R_RUNEIDS, roleId), runeUid)
local heroInfo = {
key = string.format(R_RUNE, roleId, runeUid),
uid = runeUid,
type = params.type,
id = params.id,
}
local newRune = require("models.Rune").new(heroInfo)
newRune:create()
newRune:generateAttrs()
newRune.owner = self
self.runeBag[runeUid] = newRune
|
ee999bde
zhouhaihai
零件优化
|
669
670
671
672
673
|
if not params.notNotify then
local response = {}
table.insert(response, newRune:data())
SendPacket(actionCodes.Role_loadRunes, MsgPack.pack(response))
end
|
89338c47
zhouhaihai
技能目标
|
674
|
self:checkTaskEnter("AddRune", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
|
44c6e479
zhouhaihai
增加部分日志
|
675
|
|
c59e058b
zhouhaihai
新一批日志记录
|
676
|
self:logItems(params.id, 0, 1, params.log)
|
f22a33af
zhouhaihai
自己的日志
|
677
|
if params.log then
|
7d31daa8
zhouhaihai
调整压测
|
678
|
local log = clone(params.log)
|
f22a33af
zhouhaihai
自己的日志
|
679
680
681
682
683
684
685
686
687
688
689
690
|
if log["cint1"] or log["cint2"] or log["cint3"] then
print("addRune error log have cint1 or cint2 or cint3 ", debug.traceback())
end
log["cint1"] = runeUid
log["cint2"] = params.type
log["cint3"] = params.id
self:mylog("in_rune", log)
else
print("addRune no log ", debug.traceback())
end
|
44c6e479
zhouhaihai
增加部分日志
|
691
|
|
c7ecb87f
zhouhaihai
添加 测试账号 方法
|
692
|
return 0, newRune
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
693
|
else
|
ad484303
gaofengduan
add rune
|
694
|
return 1
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
695
|
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
696
697
|
end
|
44c6e479
zhouhaihai
增加部分日志
|
698
699
|
function Role:delRunes(runeIds, params) -- 批量删除 {id, }
params = params or {}
|
497f9a67
zhouhaihai
卖零件
|
700
701
|
local roleId = self:getProperty('id')
local bDel = {}
|
2445248d
zhouhaihai
去掉热门料理
|
702
|
for _, runeId in pairs(runeIds) do
|
497f9a67
zhouhaihai
卖零件
|
703
704
|
local rune = self.runeBag[runeId]
if rune and rune:getProperty("refer") == 0 then
|
44c6e479
zhouhaihai
增加部分日志
|
705
|
|
c59e058b
zhouhaihai
新一批日志记录
|
706
|
self:logItems(rune:getProperty("id"), 1, 0, params.log)
|
f22a33af
zhouhaihai
自己的日志
|
707
|
if params.log then
|
7d31daa8
zhouhaihai
调整压测
|
708
|
local log = clone(params.log)
|
f22a33af
zhouhaihai
自己的日志
|
709
710
711
712
713
714
715
716
717
718
719
720
|
if log["cint1"] or log["cint2"] or log["cint3"] then
print("delRunes error log have cint1 or cint2 or cint3 ", debug.traceback())
end
log["cint1"] = runeId
log["cint2"] = rune:getProperty("type")
log["cint3"] = rune:getProperty("id")
self:mylog("out_rune", log)
else
print("delRunes no log ", debug.traceback())
end
|
44c6e479
zhouhaihai
增加部分日志
|
721
|
|
497f9a67
zhouhaihai
卖零件
|
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
|
self.runeBag[runeId] = nil
table.insert(bDel, runeId)
end
end
redisproxy:pipelining(function (red)
for _, runeId in pairs(bDel) do
red:del(string.format(R_RUNE, roleId, runeId))
red:srem(string.format(R_RUNEIDS, roleId), runeId)
end
end)
local response = {}
for _, runeId in pairs(bDel) do
table.insert(response, {uid = runeId, bDel = true})
end
SendPacket(actionCodes.Role_loadRunes, MsgPack.pack(response))
end
|
ee3ac0b5
gaofengduan
fix magic
|
740
741
742
743
744
|
function Role:getRuneByType(typ)
local runeSet = {}
for _,v in pairs(self.runeBag) do
if v.type == typ then
table.insert(runeSet,v)
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
745
|
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
746
|
end
|
ee3ac0b5
gaofengduan
fix magic
|
747
|
return runeSet
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
748
749
|
end
|
46fac6f1
zhouahaihai
酱料
|
750
|
function Role:getAdvData()
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
751
|
if not self.advData then
|
46fac6f1
zhouahaihai
酱料
|
752
|
self.advData = require("adv.Adv").new(self)
|
46fac6f1
zhouahaihai
酱料
|
753
754
755
|
end
return self.advData
end
|
bd15e9bc
zhouhaihai
购买剧情
|
756
757
758
759
760
761
762
763
764
765
766
767
|
function Role:getHeroMaxField(field, hType)
local max = 0
for _, hero in pairs(self.heros) do
if not hType or hero:getProperty("type") == hType then
if hero:getProperty(field) > max then
max = hero:getProperty(field)
end
end
end
return max
end
|
ece975b6
zhouhaihai
属性计算
|
768
769
770
|
function Role:warningHeartTooQuick()
-- 加速器检测
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
771
772
773
774
|
local heartWarning = self:getProperty("heartWarning")
heartWarning = heartWarning + 1
self:setProperty("heartWarning", heartWarning)
if heartWarning == 50 then
|
44c6e479
zhouhaihai
增加部分日志
|
775
|
self:setBan(30, 1) --封禁 30天
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
776
|
self:sendGmMsg("server_accountBanned_inGame_1")
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
777
778
779
780
|
return
end
if heartWarning < 50 and heartWarning % 5 == 0 then
self:sendGmMsg("server_accountBanned_warning")
|
8e524d41
zhouhaihai
优化
|
781
|
self:mylog("role_action",{desc = "heartWarning", int1 = heartWarning})
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
782
783
784
785
786
787
788
789
790
791
792
793
|
end
end
function Role:setBan(time, banType)
time = time or 0
banType = banType or 0
local now = skynet.timex()
if time == 0 then
self:setProperty("banTime", 0)
self:setProperty("banType", 0)
self:setProperty("heartWarning", 0)
|
8e524d41
zhouhaihai
优化
|
794
|
self:mylog("role_action", {desc = "ban_rm"})
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
795
796
797
|
else
self:setProperty("banTime", now + 86400 * time)
self:setProperty("banType", banType)
|
8e524d41
zhouhaihai
优化
|
798
|
self:mylog("role_action", {desc = "ban", int1 = time, int2 = banType})
|
e3c5cc5e
zhouhaihai
跨服竞技场over
|
799
800
801
802
803
|
end
end
function Role:sendGmMsg(text, isNotKey)
SendPacket(actionCodes.Sys_maintainNotice, MsgPack.pack({ body = text, iskey = not isNotKey}))
|
ece975b6
zhouhaihai
属性计算
|
804
|
end
|
a41b9076
zhouhaihai
增加羁绊方法
|
805
|
|
a8f91e83
zhouhaihai
羁绊
|
806
|
function Role:getHeroActiveRelationData(heros)
|
a41b9076
zhouhaihai
增加羁绊方法
|
807
808
809
810
|
local relations = {}
for _, id in pairs(heros or {}) do
local hero = self.heros[id]
if hero then
|
ff52882d
zhouhaihai
羁绊
|
811
812
|
local camp = csvdb["unitCsv"][hero:getProperty("type")].camp
relations[camp] = (relations[camp] or 0) + 1
|
a41b9076
zhouhaihai
增加羁绊方法
|
813
814
|
end
end
|
ff52882d
zhouhaihai
羁绊
|
815
|
local curData = csvdb["unit_relationCsv"][0]
|
18323af7
zhouhaihai
羁绊 bug
|
816
817
|
if not next(relations) then return curData end
|
ff52882d
zhouhaihai
羁绊
|
818
|
for _, data in ipairs(csvdb["unit_relationCsv"]) do
|
a8f91e83
zhouhaihai
羁绊
|
819
820
821
822
823
824
825
826
827
828
|
local had = {}
local isDone = true
for _, count in pairs(data.relation:toArray(true, "=")) do
local find = false
for camp, _count in pairs(relations) do
if count == _count and not had[camp] then
had[camp] = true
find = true
break
end
|
a41b9076
zhouhaihai
增加羁绊方法
|
829
|
end
|
a8f91e83
zhouhaihai
羁绊
|
830
831
832
|
if not find then
isDone = false
break
|
a41b9076
zhouhaihai
增加羁绊方法
|
833
834
|
end
end
|
a8f91e83
zhouhaihai
羁绊
|
835
836
|
if isDone then
curData = data
|
a8f91e83
zhouhaihai
羁绊
|
837
838
839
840
841
842
843
844
|
end
end
return curData
end
function Role:getHeroActiveRelation(heros)
local data = self:getHeroActiveRelationData(heros)
local result = {}
|
a8f91e83
zhouhaihai
羁绊
|
845
846
|
for attr, value in pairs(data.effect:toNumMap()) do
result[AttsEnumEx[attr]] = (result[AttsEnumEx[attr]] or 0) + value
|
a41b9076
zhouhaihai
增加羁绊方法
|
847
848
849
|
end
return result
end
|
b53593b5
zhouhaihai
羁绊加成
|
850
|
|
ccbafe67
zhouhaihai
冒险神器和buff
|
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
|
function Role:getHerosCamp(heros)
local had = {}
for _, id in pairs(heros or {}) do
local hero = self.heros[id]
if hero then
local camp = csvdb["unitCsv"][hero:getProperty("type")].camp
had[camp] = (had[camp] or 0) + 1
end
end
local curCamp = 0
for camp , count in pairs(had) do
if count >= 3 then
curCamp = camp
break
end
end
return curCamp
end
|
c384626d
zhouhaihai
好友
|
870
|
function Role:getRealBattleValue(heros, activeRelation) -- 获取队伍战斗力 羁绊加成
|
f317b790
zhouhaihai
pvp 遗留
|
871
|
heros = heros or {}
|
c384626d
zhouhaihai
好友
|
872
|
local activeRelation = activeRelation or self:getHeroActiveRelation(heros)
|
b53593b5
zhouhaihai
羁绊加成
|
873
874
875
876
877
878
879
880
881
|
local battleValue = 0
for _, id in pairs(heros) do
local hero = self.heros[id]
if hero then
battleValue = battleValue + hero:getBattleValue(activeRelation)
end
end
return battleValue
end
|
09be9059
zhouhaihai
冒险接口
|
882
883
|
function Role:getAdvHangLimit()
|
9cede2e2
zhouhaihai
主推红点 和冒险次数
|
884
|
return globalCsv.adv_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCount)
|
09be9059
zhouhaihai
冒险接口
|
885
|
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
886
|
|
fc316d1f
zhouhaihai
冒险体力优化
|
887
888
889
890
891
892
893
894
895
896
897
898
899
900
|
function Role:checkAdvCount(need)
local oldCount = self:getProperty("advC")
local oldTime = self:getProperty("advCT")
local newCount = oldCount
if oldCount > 0 then
local add = math.max(math.floor((skynet.timex() - oldTime) / (globalCsv.adv_daily_regain_min * 60)), 0)
newCount = math.max(oldCount - add, 0)
end
return newCount + need <= self:getAdvHangLimit()
end
--忽略上限
function Role:changeAdvCount(change)
|
60fff866
zhouhaihai
微调 结算返还
|
901
|
if change == 0 then return end
|
fc316d1f
zhouhaihai
冒险体力优化
|
902
903
904
905
906
907
908
909
910
911
|
local count = self:getProperty("advC")
local ctime = self:getProperty("advCT")
if ctime == 0 then
ctime = skynet.timex()
end
local add = math.max(math.floor((skynet.timex() - ctime) / (globalCsv.adv_daily_regain_min * 60)), 0)
local nextTime = ctime + add * (globalCsv.adv_daily_regain_min * 60)
if count > 0 then
count = math.max(count - add, 0)
end
|
fc316d1f
zhouhaihai
冒险体力优化
|
912
913
|
self:updateProperties({
advC = count + change,
|
92ef9591
zhouhaihai
冒险次数
|
914
|
advCT = nextTime,
|
fc316d1f
zhouhaihai
冒险体力优化
|
915
916
917
|
})
end
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
918
|
function Role:getAdvElLimit()
|
9cede2e2
zhouhaihai
主推红点 和冒险次数
|
919
|
return globalCsv.adv_endless_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCountEL)
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
920
921
|
end
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
922
923
924
925
926
927
|
-- 走 guide_unlock 表的 被动解锁
function Role:isFuncUnlock(func)
if not func then return true end -- 没有就是解锁了
local data = csvdb["guide_unlockCsv"][func]
if not data then return true end -- 没有就是解锁了
|
33be3111
zhouhaihai
修改hangPass 结构
|
928
|
if self:checkHangPass(data.carbonId) then
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
929
930
931
932
933
|
return true
else
return false
end
end
|
7828ffd0
zhouhaihai
冒险 连续选择点 和 地图因子
|
934
|
|
d232676a
zhouhaihai
功能解锁 冒险返回
|
935
|
-- 走 unlock 表的主动解锁
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
936
937
938
939
|
function Role:isFuncOpen(func)
return self:getProperty("funcOpen")[func] == 1
end
|
bab30666
zhouhaihai
增加通用功能等级 字段
|
940
941
|
function Role:getFuncLv(func)
return self:getProperty("funcLv")[func] or 1
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
942
943
|
end
|
ccbafe67
zhouhaihai
冒险神器和buff
|
944
945
946
947
948
949
950
951
952
|
-- 参数有level 则是检查是否可以升级
function Role:isArtifactOpen(id, isEndless, level)
local isCheckLevel = not not level
level = level or 1
local curData = (csvdb["adv_artifactCsv"][id] or {})[level]
if not curData then return false end
if curData.unlock == 1 then -- 获得解锁
return self:getProperty("advAFOpen")[id] and true or false
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
953
|
elseif curData.unlock == 2 then -- 特殊神器 不可解锁
|
ccbafe67
zhouhaihai
冒险神器和buff
|
954
|
return isCheckLevel
|
d3da3368
zhouhaihai
冒险地图被动技, buff 神器
|
955
|
elseif curData.unlock == 3 then
|
ccbafe67
zhouhaihai
冒险神器和buff
|
956
957
958
959
960
|
return isEndless
end
return true
end
|
44c6e479
zhouhaihai
增加部分日志
|
961
962
963
|
function Role:funcOpen(func, count, params)
params = params or {}
|
ad88ba14
zhouhaihai
工坊 bug
|
964
|
count = count or 1
|
44c6e479
zhouhaihai
增加部分日志
|
965
|
|
887c1843
zhouhaihai
日志新一批
|
966
|
self:logItems(func, 0, count, params.log)
|
f22a33af
zhouhaihai
自己的日志
|
967
|
if params.log then
|
7d31daa8
zhouhaihai
调整压测
|
968
|
local log = clone(params.log)
|
f22a33af
zhouhaihai
自己的日志
|
969
970
971
972
973
974
975
976
977
978
979
|
if log["cint1"] or log["cint2"] or log["cint3"] then
print("funcOpen error log have cint1 or cint2 or cint3 ", debug.traceback())
end
log["cint1"] = func
log["cint2"] = count
self:mylog("func_open", log)
else
print("funcOpen no log ", debug.traceback())
end
|
44c6e479
zhouhaihai
增加部分日志
|
980
|
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
981
|
if csvdb["itemCsv"][func] and csvdb["itemCsv"][func].type == ItemType.FuncOpen then
|
bab30666
zhouhaihai
增加通用功能等级 字段
|
982
|
local unlockData = csvdb["unlockCsv"][func]
|
db3c56ad
zhouhaihai
冒险相关
|
983
|
if unlockData.type == 4 then -- 解锁神器
|
f45d3a7b
zhouhaihai
adv_unlock
|
984
985
986
|
if self:getProperty("advAFOpen")[unlockData.value1] ~= 1 then
self:changeUpdates({{type = "advAFOpen", field = unlockData.value1, value = 1}})
end
|
4b61215f
zhouhaihai
语法错误
|
987
|
elseif TypeIsFunc[unlockData.type] then
|
bab30666
zhouhaihai
增加通用功能等级 字段
|
988
|
if unlockData.value1 == 0 or unlockData.value1 == 1 then
|
f45d3a7b
zhouhaihai
adv_unlock
|
989
990
991
|
if self:getProperty("funcOpen")[unlockData.type] ~= 1 then
self:changeUpdates({{type = "funcOpen", field = unlockData.type, value = 1}})
end
|
bab30666
zhouhaihai
增加通用功能等级 字段
|
992
993
|
else
local oldV = self:getFuncLv(unlockData.type)
|
59835765
zhouhaihai
排行榜
|
994
|
local newLv = math.min(oldV + count, unlockData.value2)
|
f45d3a7b
zhouhaihai
adv_unlock
|
995
996
997
|
if oldV ~= newLv then
self:changeUpdates({{type = "funcLv", field = unlockData.type, value = newLv}})
end
|
bab30666
zhouhaihai
增加通用功能等级 字段
|
998
999
|
end
else
|
f45d3a7b
zhouhaihai
adv_unlock
|
1000
1001
1002
|
if self:getProperty("funcOpen")[func] ~= 1 then
self:changeUpdates({{type = "funcOpen", field = func, value = 1}})
end
|
bab30666
zhouhaihai
增加通用功能等级 字段
|
1003
|
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
1004
1005
1006
|
end
end
|
e51ff6d2
zhouhaihai
冒险~
|
1007
|
function Role:advChapterIsOpen(chapterId)
|
e51ff6d2
zhouhaihai
冒险~
|
1008
|
local chapterData = csvdb["adv_chapterCsv"][chapterId]
|
33be3111
zhouhaihai
修改hangPass 结构
|
1009
|
if chapterData.prepose ~= 0 and not self:checkHangPass(chapterData.prepose) then return false end
|
e51ff6d2
zhouhaihai
冒险~
|
1010
|
return true
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
|
end
function Role:advEventOpenStatus()
local openStatus = {}
for func , data in pairs(csvdb["unlockCsv"]) do
if data.type == 5 then
openStatus[data.value1] = openStatus[data.value1] or {}
openStatus[data.value1][data.value2] = self:isFuncOpen(func)
end
end
return openStatus
end
|
8da953a7
zhouhaihai
无尽模式
|
1024
|
-- 赛季检查
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
1025
1026
1027
1028
|
function Role:advEndlessSeasonCheck(notNotify)
-- 重置一下冒险
local nowSeason = tonum(redisproxy:hget("adv_season", "idx"))
if self:getProperty("advElS") ~= nowSeason then
|
0e3ab88d
zhouhaihai
中继层
|
1029
1030
1031
1032
|
-- 胡博文让注释掉 衰减 从0开始
-- local ml = self:getProperty("advElM")
-- local nl = math.max(0, ml - (math.floor(ml / 50) + 2) * 10)
-- self:setProperty("advElM", math.floor(nl / 10) * 10)
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
1033
1034
1035
1036
1037
1038
1039
|
-- 正在无尽冒险清掉
local adv = self:getAdvData()
if adv:isRunning() and adv:isEndless() then
adv:forceOver()
end
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
1040
1041
1042
|
-- 路过的中继层重置掉
local advRelay = self:getProperty("advRelay")
advRelay[-1] = nil
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
1043
1044
1045
|
-- 清掉冒险手册
self:updateProperties({
advEAchiev = {},
|
0e3ab88d
zhouhaihai
中继层
|
1046
1047
|
advElM = 0,
advElS = nowSeason,
|
6dc482bb
zhouhaihai
中继层完成, 新增两个冒险物品使用效果
|
1048
|
advRelay = advRelay,
|
1b20cfdb
zhouhaihai
赛季更新完善 无尽冒险排行榜
|
1049
|
}, notNotify)
|
e1355da3
zhouhaihai
神器 被动
|
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
|
-- 重新设定冒险章节和冒险结束时间
self.advElChapter = tonum(redisproxy:hget("adv_season", "chapter"), globalCsv.adv_endless_default_chapter)
self.advOverTime = tonum(redisproxy:hget("adv_season", "overTime"))
if not notNotify then
SendPacket(actionCodes.Role_updateProperties, MsgPack.pack({
advElChapter = self.advElChapter,
advOverTime = self.advOverTime,
}))
end
|
8da953a7
zhouhaihai
无尽模式
|
1061
1062
|
end
end
|
59835765
zhouhaihai
排行榜
|
1063
|
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
1064
1065
1066
1067
1068
1069
1070
|
-- 获得激活的冒险效果
function Role:getAdvActiveSupportEffect()
local effect = {}
local advEAchiev = self:getProperty("advEAchiev")
for id, status in pairs(advEAchiev[self.advElChapter] or {}) do
if status == -1 then
local achvData = csvdb["adv_achievementCsv"][id]
|
1e33ae30
zhouhaihai
数据保护
|
1071
|
if achvData and achvData.support ~= 0 then
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
|
effect[achvData.support] = 1
end
end
end
return effect
end
--获取冒险支援效果免费刷新次数
function Role:getAdvSupportFreeCount()
local count = 1 --默认每天有1次
local openEffects = self:getAdvActiveSupportEffect()
for aId, _ in pairs(openEffects) do
local curData = csvdb["adv_supportCsv"][aId]
if curData.type == 2 then
for _, effect in ipairs(curData.effect:toArray()) do
local cur = effect:toArray(true, "=")
if cur[1] == 8 then
count = count + cur[2]
end
end
end
end
return count
end
-- 冒险随机新的支援效果
function Role:advRandomSupportEffect(notNotify)
local pool = {}
local openEffects = self:getAdvActiveSupportEffect()
for id, data in pairs(csvdb["adv_supportCsv"]) do
if data.type == 0 then
if openEffects[id] then
table.insert(pool, data)
end
elseif data.type == 1 then
table.insert(pool, data)
end
end
local advSup = {}
for i = 1, math.min(3, #pool) do
local idx = math.randWeight(pool, "showup")
table.insert(advSup, pool[idx].id)
table.remove(pool, idx)
end
self:updateProperty({field = "advSup", value = advSup, notNotify = notNotify})
end
|
59835765
zhouhaihai
排行榜
|
1119
|
|
cfd68b3a
zhouhaihai
时间重置 新逻辑
|
1120
|
|
59835765
zhouhaihai
排行榜
|
1121
|
function Role:getCurDinerRankKey()
|
bd4fb541
zhouhaihai
增加物品过期系统
|
1122
|
local round = self:getTimeResetRound(TimeReset.DinerRank)
|
59835765
zhouhaihai
排行榜
|
1123
|
local idx = 1
|
bd4fb541
zhouhaihai
增加物品过期系统
|
1124
|
if round % 2 == 1 then
|
59835765
zhouhaihai
排行榜
|
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
|
idx = 2
end
return RANK_DINER[idx]
end
local StdTowerRankTime = toUnixtime("2019010100")
function Role:setTowerRank(level)
local now = skynet.timex()
local ct = math.ceil((now - StdTowerRankTime) / 86400) --按天计算 365 * 27 < 10000 可以维持 27 年
local ct = 10000 - ct -- 越早的排名越靠前
local towerTeam = self:getProperty("towerF")
local battleV = self:getTeamBattleValue(towerTeam.heros)
local score = (level * 10000 + ct) * 10000000 + battleV
local curInfo = {
name = self:getProperty("name"),
headId = self:getProperty("headId"),
lv = self:getProperty("level"),
batteV = battleV,
level = level,
|
fa565e0c
zhouhaihai
优化结构
|
1145
|
format = self:getTeamHerosInfo(towerTeam.heros),
|
59835765
zhouhaihai
排行榜
|
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
|
}
local roleId = self:getProperty("id")
redisproxy:pipelining(function (red)
red:zadd(RANK_TOWER, score, roleId) --更新分数
red:hset(RANK_TOWER_INFO, roleId, MsgPack.pack(curInfo))
end)
end
function Role:getTowerRank()
local list = {}
local ids = redisproxy:zrevrange(RANK_TOWER, 0 , 99)
local redret = {}
if ids and next(ids) then
redret = redisproxy:pipelining(function (red)
for i = 1, #ids do
local roleId = ids[i]
table.insert(list, {roleId = tonumber(roleId)})
red:hget(RANK_TOWER_INFO, roleId)
end
end)
end
for i = 1, #redret do
local player = MsgPack.unpack(redret[i])
player.format = nil
list[i].player = player
end
local rank = redisproxy:ZREVRANK(RANK_TOWER, self:getProperty("id"))
if not rank then
rank = -1
else
rank = rank + 1
end
return {list = list, rank = rank}
end
function Role:getTowerRankOneInfo(roleId)
local data = redisproxy:hget(RANK_TOWER_INFO, roleId)
if data then
local player = MsgPack.unpack(data)
return player.format
end
end
|
f60b89b1
zhouhaihai
奖励副本
|
1188
|
|
6b5c9206
zhouhaihai
冒险资助升级属性奖励
|
1189
|
function Role:addAdvLvExp(exp)
|
f60b89b1
zhouhaihai
奖励副本
|
1190
|
local advL = self:getProperty("advL")
|
6b5c9206
zhouhaihai
冒险资助升级属性奖励
|
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
|
local level = advL[1]
local newExp = (advL[2] or 0) + exp
if not csvdb["adv_level_fundCsv"][level + 1] then
return
end
while newExp >= csvdb["adv_level_fundCsv"][level].exp do
if csvdb["adv_level_fundCsv"][level + 1] and self:advChapterIsOpen(100 + csvdb["adv_level_fundCsv"][level + 1].chapter) then -- 有下一级
newExp = newExp - csvdb["adv_level_fundCsv"][level].exp
level = level + 1
else
newExp = csvdb["adv_level_fundCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
|
f60b89b1
zhouhaihai
奖励副本
|
1204
1205
|
end
end
|
6b5c9206
zhouhaihai
冒险资助升级属性奖励
|
1206
1207
1208
|
if level > advL[1] then
self:checkTaskEnter("AdvLevel", {level = level})
|
f60b89b1
zhouhaihai
奖励副本
|
1209
|
end
|
6b5c9206
zhouhaihai
冒险资助升级属性奖励
|
1210
1211
|
advL[1] = level
advL[2] = newExp
|
f60b89b1
zhouhaihai
奖励副本
|
1212
1213
|
self:updateProperty({field = "advL", value = advL})
end
|
c384626d
zhouhaihai
好友
|
1214
|
|
6b5c9206
zhouhaihai
冒险资助升级属性奖励
|
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
|
function Role:getAdvWheelSurfLv(ptype)
local level = 1
for i = 0, self:getProperty("advL")[1] do
local effects = csvdb["adv_level_fundCsv"][i].effect:toArray()
for _, one in ipairs(effects) do
local effect = one:toArray(true, "=")
if effect[1] == 2 and ptype == effect[2] then
level = effect[3]
end
end
end
return level
end
|
9f956e88
zhouhaihai
资助对积分的影响
|
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
|
function Role:fixAdvScoreChange(score)
local change = 0
for i = 0, self:getProperty("advL")[1] do
local effects = csvdb["adv_level_fundCsv"][i].effect:toArray()
for _, one in ipairs(effects) do
local effect = one:toArray(true, "=")
if effect[1] == 3 then
change = change + effect[2]
end
end
end
|
bbf64622
zhouhaihai
冒险
|
1240
|
return math.floor(score * (1 + change / 100))
|
9f956e88
zhouhaihai
资助对积分的影响
|
1241
1242
|
end
|
6b5c9206
zhouhaihai
冒险资助升级属性奖励
|
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
|
function Role:getAdvLvAddAttrs()
-- 1=冒险队属性;1=点数/百分比=属性枚举=参数;属性枚举(1=生命上限/2=魔法上限/3=攻击/4=防御);点数/百分比(0=点数/1=百分比)
local attrs = {}
for i = 0, self:getProperty("advL")[1] do
local effects = csvdb["adv_level_fundCsv"][i].effect:toArray()
for _, one in ipairs(effects) do
local effect = one:toArray(true, "=")
if effect[1] == 1 then
attrs[effect[2]] = (attrs[effect[2]] or 0) + effect[3]
end
end
end
return attrs
end
|
c384626d
zhouhaihai
好友
|
1258
|
function Role:getTeamBattleInfo(team)
|
f603a60f
zhouhaihai
支援技实装
|
1259
|
local teamInfo = {heros = {}, supports = {}}
|
fa565e0c
zhouhaihai
优化结构
|
1260
|
local activeRelation = self:getHeroActiveRelation(team.heros)
|
c384626d
zhouhaihai
好友
|
1261
1262
|
for slot, id in pairs(team.heros or {}) do
|
fa565e0c
zhouhaihai
优化结构
|
1263
1264
|
local info = {}
local hero = self.heros[id]
|
c384626d
zhouhaihai
好友
|
1265
|
if not hero then
|
fa565e0c
zhouhaihai
优化结构
|
1266
1267
1268
1269
1270
|
print("error heroid " .. id)
end
local attrs = hero:getTotalAttrs({activeRelation = activeRelation})
for k, v in pairs(AttsEnumEx) do
info[v] = (attrs[v] or 0)
|
c384626d
zhouhaihai
好友
|
1271
|
end
|
c384626d
zhouhaihai
好友
|
1272
1273
|
info.type = hero:getProperty("type")
info.level = hero:getProperty("level")
|
42f465e5
suhongyang
战斗参数传传入觉醒等级
|
1274
|
info.wakeL = hero:getProperty("wakeL")
|
fa565e0c
zhouhaihai
优化结构
|
1275
1276
|
info.blockLevel = hero:getSkillLevel(4)
info.specialLevel = hero:getSkillLevel(1)
|
aad10fac
suhongyang
战斗获取被动技能等级参数
|
1277
|
info.passiveLevel = hero:getSkillLevel(3)
|
a6508219
zhouhaihai
挂机奖励
|
1278
|
info.runeSkill = hero:getRuneSkill(102)
|
fa565e0c
zhouhaihai
优化结构
|
1279
1280
|
teamInfo.heros[slot] = info
end
|
f603a60f
zhouhaihai
支援技实装
|
1281
1282
1283
|
for slot, id in pairs(team.supports or {}) do
teamInfo.supports[slot] = {id, self.dinerData:getProperty("dishTree"):getv(id, 0)}
end
|
fa565e0c
zhouhaihai
优化结构
|
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
|
return teamInfo
end
function Role:getTeamHerosInfo(heroIds)
local heros = {}
for slot, heroId in pairs(heroIds or {}) do
local hero = self.heros[heroId]
heros[slot] = {
type = hero:getProperty("type"),
level = hero:getProperty("level"),
wakeL = hero:getProperty("wakeL"),
}
|
c384626d
zhouhaihai
好友
|
1296
1297
1298
1299
|
end
return heros
end
|
fa565e0c
zhouhaihai
优化结构
|
1300
|
function Role:getTeamBattleValue(heros)
|
3dbbc9f3
zhouhaihai
加上新的任务
|
1301
1302
1303
1304
1305
1306
1307
|
-- local battleV = 0
-- for _, heroId in pairs(heros or {}) do
-- local hero = self.heros[heroId]
-- battleV = battleV + hero:getProperty("battleV")
-- end
-- return battleV
return self:getRealBattleValue(heros)
|
fa565e0c
zhouhaihai
优化结构
|
1308
1309
|
end
|
4cf74232
zhouhaihai
pvp
|
1310
|
-- 不传参数 只修改保存的阵容信息
|
fa565e0c
zhouhaihai
优化结构
|
1311
|
function Role:saveHangTeam(team)
|
4cf74232
zhouhaihai
pvp
|
1312
|
if not team then
|
3dbbc9f3
zhouhaihai
加上新的任务
|
1313
|
team = self:getProperty("hangTeam")
|
4cf74232
zhouhaihai
pvp
|
1314
1315
1316
|
else
self:updateProperty({field = "hangTeam", value = team})
end
|
fa565e0c
zhouhaihai
优化结构
|
1317
1318
1319
1320
1321
1322
1323
1324
|
self:setProperties({
hangTS = self:getTeamHerosInfo(team.heros),
hangTB = self:getTeamBattleInfo(team),
hangTBV = self:getTeamBattleValue(team.heros),
})
end
function Role:savePvpCTeam(team)
|
4cf74232
zhouhaihai
pvp
|
1325
|
if not team then
|
3dbbc9f3
zhouhaihai
加上新的任务
|
1326
|
team = self:getProperty("pvpTC")
|
4cf74232
zhouhaihai
pvp
|
1327
|
else
|
3dbbc9f3
zhouhaihai
加上新的任务
|
1328
|
self:updateProperty({field = "pvpTC", value = team})
|
4cf74232
zhouhaihai
pvp
|
1329
|
end
|
fa565e0c
zhouhaihai
优化结构
|
1330
1331
1332
1333
1334
|
self:setProperties({
pvpTSC = self:getTeamHerosInfo(team.heros),
pvpTBC = self:getTeamBattleInfo(team),
pvpTBVC = self:getTeamBattleValue(team.heros),
})
|
c384626d
zhouhaihai
好友
|
1335
|
end
|
dc9d814f
zhouhaihai
邮件
|
1336
|
|
ab9f5400
zhouhaihai
临时代码
|
1337
1338
1339
1340
1341
1342
1343
1344
1345
|
function Role:savePvpHTeam(team)
if not team then
team = self:getProperty("pvpTH")
else
self:updateProperty({field = "pvpTH", value = team})
end
local pvpTSH, pvpTBH, pvpTBVH = {}, {}, {}
for i = 1, 3 do
|
c6940d28
zhouhaihai
报错
|
1346
1347
1348
1349
1350
|
if team[i] then
pvpTSH[i] = self:getTeamHerosInfo(team[i].heros)
pvpTBH[i] = self:getTeamBattleInfo(team[i])
pvpTBVH[i] = self:getTeamBattleValue(team[i].heros)
end
|
ab9f5400
zhouhaihai
临时代码
|
1351
1352
1353
1354
1355
1356
1357
1358
1359
|
end
self:setProperties({
pvpTSH = pvpTSH,
pvpTBH = pvpTBH,
pvpTBVH = pvpTBVH,
})
end
|
dc9d814f
zhouhaihai
邮件
|
1360
1361
|
-- update
function Role:onRecoverTimer(now)
|
cfd68b3a
zhouhaihai
时间重置 新逻辑
|
1362
|
self:updateTimeReset(now, true)
|
dc9d814f
zhouhaihai
邮件
|
1363
1364
1365
|
self:checkNewEvent(now)
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
1366
|
local function breath(sec, name)
|
dc9d814f
zhouhaihai
邮件
|
1367
|
local last_breath = 0
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
1368
1369
1370
1371
1372
|
return function (now, role)
if name == "email" and role.sendMailFlag then
last_breath = now + sec
return true
end
|
dc9d814f
zhouhaihai
邮件
|
1373
1374
1375
1376
1377
1378
1379
1380
|
if now >= last_breath then
last_breath = now + sec
return true
end
return false
end
end
local breathes = {
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
1381
1382
|
["email"] = breath(120, "email"), -- email
["pvphg"] = breath(300, "pvphg"), -- 高级竞技场 奖励满的红点
|
dc9d814f
zhouhaihai
邮件
|
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
|
}
function Role:checkNewEvent(now)
if now - self:getProperty("ltime") < 5 then
return
end
local checks = {}
-- 检查全局邮件 -- 增加邮件红点
checks["email"] = function()
local mid = self:getProperty("sid")
local result = redisproxy:hmget("autoincrement_set", "email", "emailTimestamp")
local globalEmail = tonum(result[1])
local timestamp = tonum(result[2])
local emailSync = self:getProperty("emailSync")
if globalEmail > emailSync and timestamp > self:getProperty("ctime") then
local emailSync = math.max(emailSync + 1, globalEmail - EMAIL_LIMIT + 1)
local redret = redisproxy:pipelining(function (red)
for id = emailSync, globalEmail do
red:hgetall(string.format("globalEmail:%s", id))
end
end)
for _, data in ipairs(redret) do
local email = tarr2tab(data)
if tonum(email.createtime) > self:getProperty("ctime")
and ( not email.mid or tonum(email.mid) == mid )
and ( not email.endtime or tonum(email.endtime) > now )then
return true
end
end
end
local roleId = self:getProperty("id")
local email_rds = string.format(R_EMAIL, roleId)
local emailIds = redisproxy:lrange(email_rds, 0, EMAIL_LIMIT - 1) or {}
local redret = redisproxy:pipelining(function (red)
for _, id in ipairs(emailIds) do
red:hget(string.format(R_EMAIL_ITEM, roleId, id), "status")
end
end)
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
1423
1424
|
self.SendMailFlag = false
|
dc9d814f
zhouhaihai
邮件
|
1425
1426
|
for index, id in ipairs(emailIds) do
if tonumber(redret[index]) == 0 then
|
dc9d814f
zhouhaihai
邮件
|
1427
1428
1429
1430
|
return true
end
end
end
|
42327de8
zhouhaihai
高级竞技场红点
|
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
|
checks["pvphg"] = function()
if not self:isTimeResetOpen(TimeReset.PvpHight) then return end
local pvpHGTime = self:getProperty("pvpHGTime")
if pvpHGTime == 0 then return end
local division = self:getPvpHDivision()
local divisionData = csvdb["pvp_group_divisionCsv"][division]
local newTime, newReward = self:calculatePvpHGift(division)
if table.pack(next(newReward))[2] >= divisionData.limit then
return true
end
end
|
dc9d814f
zhouhaihai
邮件
|
1446
1447
1448
|
local events = {}
for name, breath in pairs(breathes) do
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
1449
|
if breath(now, self) and checks[name] then
|
dc9d814f
zhouhaihai
邮件
|
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
|
local status = checks[name]()
if status then
if status == true then
events[name] = 1
else
events[name] = status
end
end
end
end
if next(events) then
SendPacket(actionCodes.Role_notifyNewEvent, MsgPack.pack({events = events}))
end
end
|
33be3111
zhouhaihai
修改hangPass 结构
|
1466
1467
1468
1469
1470
1471
|
function Role:checkHangPass(carbonId)
local hangPass = self:getProperty("hangPass")
local diff = math.floor(carbonId / 10000)
return (hangPass[diff] or 0) >= carbonId
end
|
15e1f084
zhouhaihai
挂机gm
|
1472
|
function Role:hangFinish(carbonId)
|
33be3111
zhouhaihai
修改hangPass 结构
|
1473
1474
|
local hangPass = self:getProperty("hangPass")
local diff = math.floor(carbonId / 10000)
|
15e1f084
zhouhaihai
挂机gm
|
1475
|
if (hangPass[diff] or 0) < carbonId then
|
33be3111
zhouhaihai
修改hangPass 结构
|
1476
1477
1478
1479
1480
|
hangPass[diff] = carbonId
self:updateProperty({field = "hangPass", value = hangPass})
end
end
|
bd4fb541
zhouhaihai
增加物品过期系统
|
1481
1482
1483
1484
1485
1486
1487
1488
1489
|
function Role:getAdvRankKey()
local round = self:getProperty("advElS")
local idx = 1
if round % 2 == 1 then
idx = 2
end
return RANK_ADV[idx]
end
|
9cede2e2
zhouhaihai
主推红点 和冒险次数
|
1490
1491
1492
1493
1494
1495
1496
|
-- 消除指定tag 红点
function Role:clearRedPTag(tag)
local redp = self:getProperty("redp")
redp[tag] = nil
self:updateProperty({field = "redp", value = redp})
end
|
192b96d3
zhouhaihai
重置
|
1497
1498
|
-- 充值 --
|
b6ed652b
zhouhaihai
充值
|
1499
1500
1501
1502
1503
1504
1505
1506
|
--[[
request.order = data.out_trade_no
request.amount = data.money / 100
request.game_money = data.game_money
request.product_id = data.product_id
request.pay_time = data.pay_time
request.transactionId = data.order_no
]]
|
192b96d3
zhouhaihai
重置
|
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
|
function Role:handlePurchase(params)
local roleId = self:getProperty("id")
local partnerOrderStr = params.order
local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
local orderObject = require("models.Order").new({ key = string.format("order:%d:%d", roleId, orderId) })
if not orderObject:load() then
-- 订单不存在
skynet.error("ayncPurchaseRpc", string.format("order %s not exist", partnerOrderStr))
return
end
if orderObject:getProperty("finishTime") > 0 then
-- 订单已经处理
SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ result = "handled" }))
return
end
|
39bcd7ca
zhouhaihai
LOG
|
1524
1525
|
local rechargeId = orderObject:getProperty("rechargeId")
local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
|
192b96d3
zhouhaihai
重置
|
1526
|
if rechargeData.rmb ~= tonumber(params.amount) then
|
ec8caae5
zhouhaihai
多一点输出
|
1527
1528
|
skynet.error(string.format("fake order: %s, roleId: %d, order: %s, rmb %s, get %s",
params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
|
192b96d3
zhouhaihai
重置
|
1529
1530
1531
1532
|
))
return
end
|
c6f3e36c
zhouhaihai
错误的语法
|
1533
|
local order_type = self:getProperty("rmbC") > 0 and 0 or 1
|
39bcd7ca
zhouhaihai
LOG
|
1534
|
local status, reward = self:recharge({
|
f22a33af
zhouhaihai
自己的日志
|
1535
1536
1537
1538
|
id = rechargeId,
transactionId = params.transactionId,
pay_time = params.pay_time,
order = partnerOrderStr,
|
192b96d3
zhouhaihai
重置
|
1539
1540
1541
1542
1543
|
})
orderObject:setProperty("finishTime", skynet.time())
orderObject:setProperty("status", "finish")
redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
|
39bcd7ca
zhouhaihai
LOG
|
1544
1545
1546
1547
1548
1549
|
if not status then
status = 200
else
status = 1000 + status
end
|
f80d882b
zhouhaihai
语法错误
|
1550
|
self:log("setOrder", {
|
39bcd7ca
zhouhaihai
LOG
|
1551
1552
1553
1554
1555
1556
1557
|
order_status = status, -- "订单状态:100 - 开始下单(玩家还未开始付费行为记录)200 - 支付完成并发货(SDK通知可以发货时记录),300 - 订单被取消,1000 - 其他"
item_id = rechargeId, -- 道具id
item_type = rechargeData.type, -- 购买的道具类型,具体见"onItems"方法中道具类型枚举表
item_name = rechargeData.title, -- 购买的道具名
item_number = 1, -- 购买的道具数量
item_level = 1, -- 购买的道具等级
order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额(单位:分),如 51800即未518元,对应客户端SDK传入的'total_fee'
|
59926d8f
zhouhaihai
结算rmb
|
1558
|
order_currency = "CNY", -- 货币类型,默认为"CNY"(人民币),遵循ISO 4217规范
|
39bcd7ca
zhouhaihai
LOG
|
1559
1560
1561
1562
1563
|
order_type = order_type, -- 订单类型,首充记录为1,否则为0
order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
})
if status ~= 200 then return end
|
192b96d3
zhouhaihai
重置
|
1564
|
SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
|
3e20f499
saicom
完善商城相关协议
|
1565
|
result = "success", reward = reward}))
|
192b96d3
zhouhaihai
重置
|
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
|
return orderObject:getProperty("rechargeId")
end
function Role:recharge(params)
local id = tonumber(params.id)
local rechargeData = csvdb["shop_rechargeCsv"][id]
if not rechargeData then
skynet.error("recharge id not exist", id)
|
39bcd7ca
zhouhaihai
LOG
|
1576
|
return 1
|
192b96d3
zhouhaihai
重置
|
1577
1578
|
end
|
3e20f499
saicom
完善商城相关协议
|
1579
|
if not self.storeData:checkRechargeRecord(rechargeData.limit, id) then
|
39bcd7ca
zhouhaihai
LOG
|
1580
|
return 2
|
c5825110
saicom
新增用户商城相关数据
|
1581
1582
|
end
|
192b96d3
zhouhaihai
重置
|
1583
|
local diamondCount = 0
|
c5825110
saicom
新增用户商城相关数据
|
1584
1585
|
local reward = {}
if rechargeData.shop == 1 then -- 钻石
|
573d5ade
zhouhaihai
充值
|
1586
|
local rechargeF = self:getProperty("rechargeF")
|
192b96d3
zhouhaihai
重置
|
1587
1588
1589
1590
|
diamondCount = rechargeData.diamond + rechargeData.diamondExtra
if not rechargeF[id] then
diamondCount = diamondCount + rechargeData.diamondFirst
rechargeF[id] = 1
|
573d5ade
zhouhaihai
充值
|
1591
|
self:updateProperty({field = "rechargeF", value = rechargeF})
|
192b96d3
zhouhaihai
重置
|
1592
|
end
|
573d5ade
zhouhaihai
充值
|
1593
|
self:gainDiamond({count = diamondCount, isRecharge = true, log = {desc = "recharge", int1 = id}})
|
3e20f499
saicom
完善商城相关协议
|
1594
|
elseif rechargeData.shop == 2 then --通行证商店
|
39bcd7ca
zhouhaihai
LOG
|
1595
|
reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
1596
|
self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id)
|
3e20f499
saicom
完善商城相关协议
|
1597
|
elseif rechargeData.shop == 3 then -- 礼包商店
|
39bcd7ca
zhouhaihai
LOG
|
1598
|
reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
|
192b96d3
zhouhaihai
重置
|
1599
|
else
|
c5825110
saicom
新增用户商城相关数据
|
1600
|
skynet.error("invalid recharge shop type " .. id)
|
39bcd7ca
zhouhaihai
LOG
|
1601
|
return 3
|
192b96d3
zhouhaihai
重置
|
1602
1603
|
end
|
3e20f499
saicom
完善商城相关协议
|
1604
|
if diamondCount > 0 then
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
1605
|
reward[ItemId.Diamond] = (reward[ItemId.Diamond] or 0) + diamondCount
|
3e20f499
saicom
完善商城相关协议
|
1606
1607
|
end
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1608
1609
|
self:checkTaskEnter("Pay", {rmb = rechargeData.rmb, twd = rechargeData.twd})
|
192b96d3
zhouhaihai
重置
|
1610
1611
|
-- 累充
local rmb = rechargeData.rmb
|
573d5ade
zhouhaihai
充值
|
1612
|
self:updateProperty({field = "rmbC", delta = rmb})
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1613
1614
|
self:updateProperty({field = "twdC", delta = rechargeData.twd})
|
8e524d41
zhouhaihai
优化
|
1615
|
self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = tonum(params.pay_time, 0)})
|
192b96d3
zhouhaihai
重置
|
1616
|
|
39bcd7ca
zhouhaihai
LOG
|
1617
|
return nil, reward
|
192b96d3
zhouhaihai
重置
|
1618
1619
|
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
1620
|
--直接给玩家发送邮件,立即推送小红点
|
7f9f002d
liuzujun
循环周活动
|
1621
|
function Role:sendMail(mailId, createTime, reward, contentPms)
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
1622
1623
1624
1625
1626
1627
|
local tgift = {}
if type(reward) == "string" then
for _, one in pairs(reward:toTableArray(true)) do
tgift[one[1]] = (tgift[one[1]] or 0) + one[2]
end
else
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
1628
|
tgift = reward or {}
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
1629
1630
1631
1632
1633
|
end
local gift = ""
for k, v in pairs(tgift) do
gift = gift .. k.."="..v.." "
end
|
7f9f002d
liuzujun
循环周活动
|
1634
|
redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = mailId, createtime = createTime, attachments = gift, contentPms = contentPms})
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
1635
1636
1637
|
self.sendMailFlag = true
end
|
1e9cb217
chenyueqi
服务器记录控制引导过程
|
1638
1639
1640
1641
1642
1643
1644
1645
1646
|
-- 是否需要进行引导
function Role:checkOverGuide(guideId,slave)
local funcGuide = self:getProperty("funcGuide")
if funcGuide:getv(guideId * 1000 + (slave or 0), 0) > 0 then
return true
end
return false
end
|
a608cccb
chenyueqi
引导服务端记录
|
1647
|
-- 保存引导步骤
|
1e9cb217
chenyueqi
服务器记录控制引导过程
|
1648
|
function Role:saveGuide(master,slave,force)
|
a608cccb
chenyueqi
引导服务端记录
|
1649
1650
1651
1652
|
local newerGuide = self:getProperty("newerGuide")
local guide = newerGuide:toArray(true,"=")
local sMaster, sSlave = guide[1], guide[2]
|
1e9cb217
chenyueqi
服务器记录控制引导过程
|
1653
1654
|
if not force and master < sMaster then return end
if not force and master <= sMaster and slave < sSlave then return end
|
a608cccb
chenyueqi
引导服务端记录
|
1655
|
|
a7b824ac
chenyueqi
记录新手引导步骤的代码存在bug
|
1656
1657
1658
1659
1660
1661
1662
|
local funcGuide = self:getProperty("funcGuide")
funcGuide = funcGuide:setv(master * 1000 + slave, 1)
if funcGuide:getv(master * 1000,0) == 0 then
funcGuide = funcGuide:setv(master * 1000, 1)
end
self:updateProperty({field = "funcGuide", value = funcGuide})
self:log("onGuidePoint", {guild_type = 0, guild_id = master, guild_point = slave, guild_pass = 0})
|
f22a33af
zhouhaihai
自己的日志
|
1663
|
self:mylog("guide", {desc = "guide_new",int1 = master*1000+slave})
|
a608cccb
chenyueqi
引导服务端记录
|
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
|
newerGuide = string.format("%d=%d",master,slave)
self:updateProperty({field = "newerGuide", value = newerGuide})
end
-- 引导大步骤结束
function Role:finishGuide(master)
local newerGuide = self:getProperty("newerGuide")
local guide = newerGuide:toArray(true,"=")
if guide[1] > master then return end
local guideCsv = csvdb["guide_mainCsv"]
local lastStep = guideCsv[master][#guideCsv[master]]
if guideCsv[master + 1] then
self:updateProperty({field = "newerGuide", value = string.format("%d=%d",master + 1,1)})
else
self:updateProperty({field = "newerGuide", value = "9999=1"})
end
end
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
|
-- 抽卡阶段奖励
function Role:getDrawCardExtraReward(oldVal, newVal)
local reward = nil
local maxCount = 0
for k, v in pairs(csvdb["build_extraRewardCsv"]) do
if oldVal < k and newVal >= k then
reward = v["reward"] or ""
end
maxCount = k > maxCount and k or maxCount
end
return reward, (newVal >= maxCount and newVal - maxCount or newVal)
end
|
53b4b8bd
liuzujun
自动挂机下一关
|
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
|
-- 获取下一个挂机关卡id
function Role:getNextCarbonId(curId)
local diff = math.floor(curId / 10000)
local chapterId = math.floor((curId / 100) % 100)
local subId = curId % 100
local nextId = curId + 1
local function makeCarbonId(diff, chapterId, subId)
return diff * 10000 + chapterId * 100 + subId
end
if not csvdb["idle_battleCsv"][nextId] then
nextId = makeCarbonId(diff, chapterId + 1, 1)
if not csvdb["idle_battleCsv"][nextId] then
|
8cd3770f
liuzujun
挂机关卡可以选择,经验金币根据最高...
|
1710
1711
|
nextId = makeCarbonId(diff + 1, 1, 1)
if not csvdb["idle_battleCsv"][nextId] then
|
53b4b8bd
liuzujun
自动挂机下一关
|
1712
|
nextId = 0
|
53b4b8bd
liuzujun
自动挂机下一关
|
1713
1714
1715
1716
1717
1718
1719
|
end
end
end
return nextId
end
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1720
1721
1722
1723
|
-- 根据累计充值金额计算奖励档位
function Role:getPaybackReward(oldVal, newVal)
local maxVal, diff, extraReward = 0, 0, ""
local gift = ""
|
4709685d
liuzujun
返利邮件拼接充值档位
|
1724
|
local checkPoint = {}
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
|
for k, v in pairs(csvdb["rebateCsv"]) do
if k > maxVal then
maxVal = k
end
if v.isLoop > diff then
diff = v.isLoop
extraReward = v.reward
end
if oldVal < k and newVal > k then
gift = gift .. v.reward .. " "
|
4709685d
liuzujun
返利邮件拼接充值档位
|
1735
1736
|
table.insert(checkPoint, k)
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1737
1738
1739
1740
|
end
end
if newVal > maxVal then
local cnt = 0
|
4709685d
liuzujun
返利邮件拼接充值档位
|
1741
|
local oldCheckPoint = 0
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1742
1743
|
if oldVal < maxVal then
cnt = math.floor((newVal - maxVal) / diff)
|
4709685d
liuzujun
返利邮件拼接充值档位
|
1744
|
oldCheckPoint = maxVal
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1745
1746
|
else
cnt = math.floor((newVal - maxVal) / diff) - math.floor((oldVal - maxVal) / diff)
|
4709685d
liuzujun
返利邮件拼接充值档位
|
1747
|
oldCheckPoint = maxVal + math.floor((oldVal - maxVal) / diff) * diff
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1748
1749
1750
|
end
for i = 1, cnt do
gift = gift .. extraReward .. " "
|
4709685d
liuzujun
返利邮件拼接充值档位
|
1751
1752
|
table.insert(checkPoint, oldCheckPoint + i * diff)
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1753
1754
|
end
end
|
56d191ec
liuzujun
充值返利邮件档位排序
|
1755
1756
1757
|
table.sort(checkPoint, function(a, b)
return a < b
end)
|
4709685d
liuzujun
返利邮件拼接充值档位
|
1758
|
return gift, checkPoint
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1759
|
end
|
072db127
zhouhaihai
推送
|
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
|
--[[
"hang" : "挂机资源满",
"box" : "箱子拆解完毕",
"food" : "食物出售完毕",
"adv" : "代理拾荒完毕",
--]]
function Role:pushMsg(params)
if not self._pushToken or self._pushToken == "" then return end
if params.time <= 0 then
self:pushCancel(params)
return
end
local content = string.format("push:%d:%s:%s:%s", self:getProperty("id"), params.type, params.slot or 1, self._pushToken)
notifyClient({content = content, time = math.floor(params.time)})
end
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
1775
|
|
072db127
zhouhaihai
推送
|
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
|
function Role:pushCancel(params)
if not self._pushToken or self._pushToken == "" then return end
local content = string.format("push:%d:%s:%s:%s", self:getProperty("id"), params.type, params.slot or 1, self._pushToken)
deleteNotify({content = content})
end
function Role:pushCancelAll(ptype)
if not self._pushToken or self._pushToken == "" then return end
local pattern = string.format("push:%d:*", self:getProperty("id"))
if ptype then
pattern = string.format("push:%d:%s:*", self:getProperty("id"), ptype)
end
deleteNotify({pattern = pattern})
end
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
1790
1791
1792
|
end
return RolePlugin
|