be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
1
2
3
4
5
6
7
8
9
10
11
|
local RolePlugin = {}
function RolePlugin.bind(Role)
function Role:log()
end
function Role:loadAll()
|
be9c9ca6
zhouahaihai
角色评论
|
12
|
self:loadDaily()
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
13
14
|
self:loadEquips()
self:loadRunes()
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
15
|
self:loadHeros()
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
16
|
self:loadDiner()
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
17
18
19
|
end
function Role:reloadWhenLogin()
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
20
21
|
end
|
be9c9ca6
zhouahaihai
角色评论
|
22
|
function Role:onCrossDay(now, notify)
|
be9c9ca6
zhouahaihai
角色评论
|
23
24
25
26
|
local ltime = self:getProperty("ltime")
if isCrossDay(ltime, now) then
local response = {}
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
27
|
|
be9c9ca6
zhouahaihai
角色评论
|
28
|
self.dailyData:refreshDailyData(notify)
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
29
|
self.dinerData:refreshDailyData(notify)
|
be9c9ca6
zhouahaihai
角色评论
|
30
31
32
33
34
35
|
if notify then
self:notifyUpdateProperties(response)
end
return true
end
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
36
|
end
|
5b28342d
zhouahaihai
离线方法
|
37
|
function Role:onOfflineEvent()
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
38
|
|
5b28342d
zhouahaihai
离线方法
|
39
|
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
40
|
|
312b9db5
zhouahaihai
背包
|
41
42
43
44
45
46
47
48
|
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()
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
49
50
|
for _,_ in pairs(items) do
if globalCsv.store_type[itemData.type] == page then
|
312b9db5
zhouahaihai
背包
|
51
|
curCount = curCount + 1
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
52
|
if curCount >= limit then
|
312b9db5
zhouahaihai
背包
|
53
54
55
56
57
58
|
count = 0
break
end
end
end
end
|
312b9db5
zhouahaihai
背包
|
59
60
|
return count
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
61
62
|
local function _award(self, itemId, count, params)
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
63
|
local pms = clone(params)
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
64
65
66
67
|
local itemData = csvdb["itemCsv"][itemId]
local curType = itemData.type
local change = {} -- 奖励被转化为了其他奖励 id = count
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
68
69
70
71
72
73
|
local itemIdAward = {
[ItemId.PlayerExp] = function()
self:addPlayExp(count)
end,
}
|
be9c9ca6
zhouahaihai
角色评论
|
74
75
|
local itemTypeAward = {
[ItemType.Hero] = function()
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
76
|
pms.type = itemId - ItemStartId.Hero
|
1a1a6375
gaofengduan
fix lua warning
|
77
|
for _= 1, count do
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
78
|
self:addHero(pms)
|
be9c9ca6
zhouahaihai
角色评论
|
79
80
|
end
end,
|
00115a7a
zhouahaihai
奖励发放
|
81
82
83
|
[ItemType.AdvItem] = function() --冒险道具不会进入 玩家仓库
count = 0
end,
|
be9c9ca6
zhouahaihai
角色评论
|
84
|
}
|
312b9db5
zhouahaihai
背包
|
85
|
-- 对数量筛查
|
1a1a6375
gaofengduan
fix lua warning
|
86
|
count = checkItemCount(self, itemId, count)
|
312b9db5
zhouahaihai
背包
|
87
|
if count ~= 0 then
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
88
89
90
|
if itemIdAward[itemId] then
itemIdAward[itemId]()
elseif itemTypeAward[curType] then
|
312b9db5
zhouahaihai
背包
|
91
92
|
itemTypeAward[curType]()
else
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
93
94
95
|
pms.itemId = itemId
pms.count = count
self:addItem(pms)
|
312b9db5
zhouahaihai
背包
|
96
|
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
97
98
99
100
101
102
103
104
|
end
return count, change -- count 刷新实际发放的奖励个数 change 物品实际奖励与当前id 不符 就发生转换 而不实际发奖
end
-- 发奖功能入口 award string id=count or {[id] = count}
function Role:award(gift, params)
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
105
|
params = params or {}
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
106
|
local tgift = {}
|
46fac6f1
zhouahaihai
酱料
|
107
|
if type(gift) == "string" then
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
108
109
110
111
112
113
114
115
116
|
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 = {}, {}
for itemId, count in pairs(tgift) do
|
8c199cec
zhengshouren
简化物品奖励接口,设置默认参数
|
117
|
local count, change = _award(self, itemId, count, params)
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
118
119
120
121
122
123
124
|
if next(change) then
local cr, cc = self:award(change, params) -- 内部转换忽略
for _id, _ct in pairs(cr) do
reward[_id] = (reward[_id] or 0) + _ct
end
table.insert(allChange, {form = {[itemId] = count}, to = cr})
else
|
312b9db5
zhouahaihai
背包
|
125
126
127
|
if count > 0 then
reward[itemId] = (reward[itemId] or 0) + count
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
128
129
130
131
132
133
|
end
end
return reward, allChange --实际获得的奖励 和 最高级奖励转化过程
end
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
134
135
136
137
138
|
function Role:addPlayExp(addExp)
local level = self:getProperty("level")
if not csvdb["player_expCsv"][level + 1] then
return
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
139
|
|
4b7c7c96
zhouahaihai
增加 清空 挂机 冒险gm 角色经验
|
140
141
142
143
144
145
146
147
148
149
150
151
152
|
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
else
newExp = csvdb["player_expCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
end
end
self:updateProperties({level = level, exp = newExp})
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
153
154
|
function Role:addItem(params)
params = params or {}
|
312b9db5
zhouahaihai
背包
|
155
156
157
158
|
if params.itemId == ItemId.Diamond then
self:gainDiamond(params)
return
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
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
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
餐厅建筑升级逻辑
|
176
177
178
|
if not next(itemCountT) then
return false, less
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
179
|
for itemId, count in pairs(itemCountT) do
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
180
181
182
183
184
185
186
187
|
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 以及 角色突破
|
188
189
190
191
192
193
|
end
end
return (not next(less)), less -- 是否足够,,缺什么缺多少
end
function Role:costItems(itemCountT, params)
|
36204e3c
zhengshouren
贩卖逻辑
|
194
|
local pms = clone(params or {})
|
312b9db5
zhouahaihai
背包
|
195
|
if itemCountT[ItemId.Diamond] then --优先扣除钻石
|
312b9db5
zhouahaihai
背包
|
196
197
198
199
200
201
|
pms.count = itemCountT[ItemId.Diamond]
if not self:costDiamond(pms) then
return
end
itemCountT[ItemId.Diamond] = nil
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
202
|
for itemId, count in pairs(itemCountT) do
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
203
204
205
206
|
pms.itemId = itemId
pms.count = - count
self:addItem(pms)
end
|
312b9db5
zhouahaihai
背包
|
207
|
return true
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
208
209
210
|
end
function Role:getItemCount(itemId)
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
211
|
if itemId == ItemId.Diamond then
|
312b9db5
zhouahaihai
背包
|
212
213
|
return self:getAllDiamond()
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
214
215
216
|
return self:getProperty("items"):getv(itemId, 0)
end
|
312b9db5
zhouahaihai
背包
|
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
|
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
self:notifyUpdateProperty("diamond", self:getAllDiamond())
return true
end
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
self:notifyUpdateProperty("diamond", self:getAllDiamond())
return true
end
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
275
276
277
|
function Role:addHero(params)
local roleId = self:getProperty("id")
local heroId = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "hero", 1))
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
278
|
local heroType = params.type
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
279
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
280
281
282
283
284
285
286
|
redisproxy:sadd(string.format(R_HEROS, roleId), heroId)
local heroInfo = {
key = string.format(R_HERO, roleId, heroId),
id = heroId,
type= heroType,
}
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
287
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
288
289
290
|
local newHero = require("models.Hero").new(heroInfo)
newHero:create()
newHero.owner = self
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
291
|
newHero:saveBattleValue()
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
292
293
294
295
296
297
298
299
|
self.heros[heroId] = newHero
if not params.notNotify then
local heroResponse = {}
table.insert(heroResponse, newHero:data())
local bin = MsgPack.pack(heroResponse)
SendPacket(actionCodes.Hero_loadInfos, bin)
end
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
300
301
|
end
|
1a1a6375
gaofengduan
fix lua warning
|
302
|
function Role:delHero(heroId)
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
303
304
305
306
307
308
309
310
311
312
313
|
local roleId = self:getProperty('id')
local hero = self.heros[heroId]
if not hero then return end
self.heros[heroId] = nil
redisproxy:pipelining(function (red)
red:del(string.format(R_HERO, roleId, heroId))
red:srem(string.format(R_HEROS, roleId), heroId)
end)
SendPacket(actionCodes.Hero_loadInfos, MsgPack.pack({{id = heroId, bDel = true}}))
end
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
314
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
|
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
角色评论
|
332
333
334
335
336
337
338
339
340
341
342
|
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
酱料
|
343
|
|
87cc3a35
zhengshouren
餐厅建筑升级逻辑
|
344
345
346
347
348
349
350
351
352
353
354
355
|
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
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
|
function Role:loadEquips()
local roleId = self:getProperty("id")
self.equipBag = {}
local keys = redisproxy:keys(string.format(R_EQUIP_ROOT, roleId))
if keys and next(keys) then
for _,v in pairs(keys) do
local equip = require("models.Equip").new({key = v})
equip:load()
local typ,lv = equip:getProperty("type"),equip:getProperty("level")
equip.owner = self
if not self.equipBag[typ] then self.equipBag[typ] = {} end
self.equipBag[typ][lv] = equip
end
end
end
function Role:addEquip(params)
if params.type and params.level and params.count then
local equipType = params.type
local equipLv = params.level
local count = params.count
-- isRefer为true时count>0为卸载操作,<0为装备操作
local isRefer = params.isRefer or false
local equip = nil
local equipSet = self.equipBag[equipType]
if equipSet then
equip = self.equipBag[equipType][equipLv]
else
self.equipBag[equipType] = {}
end
if equip then
local originCount = equip:getProperty("count")
|
24d77701
gaofengduan
fix equip
|
389
|
if isRefer then
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
390
391
392
393
394
|
if count < 0 then
if count+originCount<0 then
return
end
else
|
24d77701
gaofengduan
fix equip
|
395
|
if equip:getProperty("refer")+count<0 then
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
|
return
end
end
end
count = originCount+count
else
if isRefer then return end
local roleId = self:getProperty("id")
local data = {
key = string.format(R_EQUIP,roleId,equipType,equipLv),
type = equipType,
level = equipLv,
}
equip = require("models.Equip").new(data)
equip.owner = self
equip:create()
end
|
e5a2ae07
gaofengduan
fix equip
|
413
|
equip:updateProperty({field = "count", value = count})
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
414
|
if isRefer then
|
24d77701
gaofengduan
fix equip
|
415
|
equip:updateProperty({field = "refer", value = equip:getProperty("refer")+params.count})
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
|
end
self.equipBag[equipType][equipLv] = equip
end
end
function Role:getEquipCount(typ,lv)
local equipSet = self.equipBag[typ]
if equipSet then
local equip = equipSet[lv]
if equip then
return equip:getProperty("count")
else
return 0
end
else
return 0
end
end
function Role:loadRunes()
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
436
|
local roleId = self:getProperty("id")
|
ad484303
gaofengduan
add rune
|
437
438
439
440
441
442
443
444
445
446
447
448
|
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 数据结构
|
449
450
451
|
end
end
|
ad484303
gaofengduan
add rune
|
452
|
-- 0 为操作成功
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
453
|
function Role:addRune(params)
|
ad484303
gaofengduan
add rune
|
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
|
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
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
477
|
|
ad484303
gaofengduan
add rune
|
478
|
return 0
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
479
|
else
|
ad484303
gaofengduan
add rune
|
480
|
return 1
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
481
|
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
|
end
function Role:getRuneCount(id,lv)
local runeSet = self.runeBag[id]
if runeSet then
local rune = runeSet[lv]
if rune then
return rune:getProperty("count")
else
return 0
end
else
return 0
end
end
|
46fac6f1
zhouahaihai
酱料
|
498
|
function Role:getAdvData()
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
499
|
if not self.advData then
|
46fac6f1
zhouahaihai
酱料
|
500
|
self.advData = require("adv.Adv").new(self)
|
36c30c5c
zhouahaihai
冒险
|
501
|
self.advData:initByInfo()
|
46fac6f1
zhouahaihai
酱料
|
502
503
504
|
end
return self.advData
end
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
505
506
507
|
end
return RolePlugin
|