0a07bdd9
zhouahaihai
角色升级 。gm
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
local ipairs = ipairs
local table = table
local math = math
local next = next
local string = string
local redisproxy = redisproxy
local MsgPack = MsgPack
local getRandomName = getRandomName
local mcast_util = mcast_util
local string_format = string.format
local tonumber = tonumber
local require = require
local table_insert = table.insert
local tconcat = table.concat
|
be9c9ca6
zhouahaihai
角色评论
|
15
|
local table_unpack = table.unpack
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
16
17
|
local _M = {}
|
058a0cbb
zhouhaihai
抽卡
|
18
|
|
c59e058b
zhouhaihai
新一批日志记录
|
19
20
21
22
23
24
25
26
27
|
local function getChangeAttrJson(oldAttr, newAttr)
local change = {}
for k, v in pairs(newAttr) do
change[k] = v - oldAttr[k]
change[k] = math.ceil(change[k])
if change[k] == 0 then
change[k] = nil
end
end
|
887c1843
zhouhaihai
日志新一批
|
28
|
return change
|
c59e058b
zhouhaihai
新一批日志记录
|
29
30
|
end
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
31
32
33
|
function _M.levelUpRpc( agent, data )
local role = agent.role
local msg = MsgPack.unpack(data)
|
36482c8b
zhouhaihai
回收养成
|
34
|
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
35
|
local hero = role.heros[msg.id]
|
1c35c4cf
gaofengduan
fix hero awake
|
36
|
if not hero then return 1 end
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
37
|
|
1c35c4cf
gaofengduan
fix hero awake
|
38
|
if hero:getProperty("level") >= hero:getMaxLevel() then return 2 end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
39
|
local curData = csvdb["unit_expCsv"][hero:getProperty("level")]
|
997cbdfe
zhouahaihai
技能养成
|
40
|
local cost = {[ItemId.Exp] = curData.exp, [ItemId.Gold] = curData.gold}
|
1c35c4cf
gaofengduan
fix hero awake
|
41
|
if not role:checkItemEnough(cost) then return 3 end
|
3133cb76
zhouhaihai
日志
|
42
|
role:costItems(cost, {log = {desc = "heroLevelUp", int1 = msg.id, int2 = hero:getProperty("type")}})
|
c59e058b
zhouhaihai
新一批日志记录
|
43
44
45
|
local oldAttr = hero:getTotalAttrs()
local oldBattleV = hero:getProperty("battleV")
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
46
|
hero:updateProperty({field = "level", delta = 1})
|
1c35c4cf
gaofengduan
fix hero awake
|
47
|
|
c59e058b
zhouhaihai
新一批日志记录
|
48
49
|
role:log("hero_upgrade", {
hero_id = hero:getProperty("type"), --英雄ID
|
887c1843
zhouhaihai
日志新一批
|
50
|
hero_upgrade_cost = cost, -- 英雄升级消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,………...}
|
c59e058b
zhouhaihai
新一批日志记录
|
51
52
53
54
55
|
hero_upgrade_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄升级效果,可记录效果ID,或json格式记录提升效果,{攻击:20,闪避:20,……..}
hero_upgrade_type = 0, -- 英雄升级方式,连续升级:1,单击升级:0
hero_upgrade_score = hero:getProperty("battleV"), -- 英雄升级后评分
hero_upgrade_scoreget = hero:getProperty("battleV") - oldBattleV, -- 通过英雄升级提升的评分
})
|
3133cb76
zhouhaihai
日志
|
56
|
|
1e9cb217
chenyueqi
服务器记录控制引导过程
|
57
58
59
|
if hero:getProperty("type") == 103 then
role:finishGuide(7)
end
|
f22a33af
zhouhaihai
自己的日志
|
60
|
hero:mylog({desc = "levelUp", int1 = hero:getProperty("level")})
|
1e9cb217
chenyueqi
服务器记录控制引导过程
|
61
|
|
53e8037e
zhouhaihai
任务
|
62
|
role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
63
64
65
66
|
SendPacket(actionCodes.Hero_levelUpRpc, '')
return true
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
67
68
69
70
|
function _M.breakRpc( agent, data )
local role = agent.role
local msg = MsgPack.unpack(data)
local hero = role.heros[msg.id]
|
1c35c4cf
gaofengduan
fix hero awake
|
71
|
if not hero then return 1 end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
72
|
|
1c35c4cf
gaofengduan
fix hero awake
|
73
74
|
if hero:getProperty("level") < hero:getMaxLevel() then return 2 end
if hero:getProperty("breakL") >= #csvdb["unit_breakCsv"] then return 3 end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
75
|
local curData = csvdb["unit_breakCsv"][hero:getProperty("breakL")]
|
997cbdfe
zhouahaihai
技能养成
|
76
|
local cost = {[ItemId.BreakCost] = curData.cost, [ItemId.Gold] = curData.gold}
|
1c35c4cf
gaofengduan
fix hero awake
|
77
|
if not role:checkItemEnough(cost) then return 4 end
|
3133cb76
zhouhaihai
日志
|
78
|
role:costItems(cost, {log = {desc = "heroBreak", int1 = msg.id, int2 = hero:getProperty("type")}})
|
c59e058b
zhouhaihai
新一批日志记录
|
79
|
local oldAttr = hero:getTotalAttrs()
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
80
|
hero:updateProperty({field = "breakL", delta = 1})
|
1c35c4cf
gaofengduan
fix hero awake
|
81
|
|
c59e058b
zhouhaihai
新一批日志记录
|
82
83
|
role:log("hero_break", {
hero_id = hero:getProperty("type"), --英雄ID
|
887c1843
zhouhaihai
日志新一批
|
84
|
hero_break_cost = cost, -- 英雄突破消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,………...}
|
c59e058b
zhouhaihai
新一批日志记录
|
85
86
87
|
hero_break_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄突破效果,可记录效果ID,或json格式记录提升效果,{攻击:20,闪避:20,……..}
hero_break_level = hero:getMaxLevel(), -- 英雄突破后等级上限
})
|
f22a33af
zhouhaihai
自己的日志
|
88
|
hero:mylog({desc = "break", int1 = hero:getProperty("breakL")})
|
3133cb76
zhouhaihai
日志
|
89
|
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
90
91
92
|
SendPacket(actionCodes.Hero_breakRpc, '')
return true
end
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
93
|
|
997cbdfe
zhouahaihai
技能养成
|
94
95
96
97
|
function _M.wakeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local hero = role.heros[msg.id]
|
1c35c4cf
gaofengduan
fix hero awake
|
98
99
100
101
102
|
if not hero then return 1 end
if hero:getProperty("wakeL") >= #csvdb["unit_wakeCsv"] then return 2 end
local typ = hero:getProperty("type")
local wakeData = csvdb["unit_wakeCsv"][hero:getProperty("wakeL")]
if not wakeData then return 3 end
|
15cba0bf
zhouhaihai
修改天赋升级消耗
|
103
104
|
local costMaterial = wakeData.costMaterial:toArray(true,"=")
local cost = {[typ] = wakeData.costFigment,[globalCsv.unit_wake_cost[hero:getCamp()][costMaterial[1]]] = costMaterial[2]}
|
1c35c4cf
gaofengduan
fix hero awake
|
105
106
|
if not role:checkItemEnough(cost) then
return 4
|
997cbdfe
zhouahaihai
技能养成
|
107
|
end
|
1c35c4cf
gaofengduan
fix hero awake
|
108
|
|
3133cb76
zhouhaihai
日志
|
109
|
role:costItems(cost, {log = {desc = "heroWake", int1 = msg.id, int2 = hero:getProperty("type")}})
|
0889982f
zhouhaihai
优化角色技能等级
|
110
|
|
c59e058b
zhouhaihai
新一批日志记录
|
111
|
local oldAttr = hero:getTotalAttrs()
|
43293781
zhouhaihai
日志bug
|
112
|
local oldBattleV = hero:getProperty("battleV")
|
997cbdfe
zhouahaihai
技能养成
|
113
114
|
hero:updateProperty({field = "wakeL", delta = 1})
|
53e8037e
zhouhaihai
任务
|
115
|
local curLevel = hero:getProperty("wakeL")
|
f6a9215f
zhouhaihai
觉醒 误删了 任务
|
116
|
role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
|
53e8037e
zhouhaihai
任务
|
117
118
119
|
if curLevel == 4 then -- 解锁cg
role:checkTaskEnter("WakeCG", {heroType = typ})
end
|
f22a33af
zhouhaihai
自己的日志
|
120
|
hero:mylog({desc = "wake", int1 = hero:getProperty("wakeL")})
|
3133cb76
zhouhaihai
日志
|
121
|
|
c59e058b
zhouhaihai
新一批日志记录
|
122
123
|
role:log("hero_rise", {
hero_id = typ, --英雄ID
|
887c1843
zhouhaihai
日志新一批
|
124
|
hero_rise_cost = cost, --英雄觉醒消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,………...}
|
c59e058b
zhouhaihai
新一批日志记录
|
125
|
hero_rise_score = hero:getProperty("battleV"), --英雄觉醒后评分提升
|
43293781
zhouhaihai
日志bug
|
126
|
hero_rise_scoreget = hero:getProperty("battleV") - oldBattleV, --英雄觉醒后评分提升
|
c59e058b
zhouhaihai
新一批日志记录
|
127
128
129
|
hero_rise_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), --英雄觉醒效果,可记录效果ID,或json格式记录提升效果,{攻击:20,闪避:20,……..}
})
|
997cbdfe
zhouahaihai
技能养成
|
130
131
132
133
|
SendPacket(actionCodes.Hero_wakeRpc, '')
return true
end
|
997cbdfe
zhouahaihai
技能养成
|
134
135
136
137
138
|
function _M.talentRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local hero = role.heros[msg.id]
|
b57f0bae
gaofengduan
fix hero talent
|
139
|
if not hero then return 1 end
|
997cbdfe
zhouahaihai
技能养成
|
140
141
|
local index = msg.index -- 第几个天赋
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
142
|
local need = {[0] = 1, [1] = 1, [2] = 1, [3] = 1, [4] = 1}
|
b57f0bae
gaofengduan
fix hero talent
|
143
|
if not need[index] then return 2 end
|
997cbdfe
zhouahaihai
技能养成
|
144
|
|
04258e10
zhouhaihai
天赋bug
|
145
|
local talent = hero:getProperty("talent")
|
997cbdfe
zhouahaihai
技能养成
|
146
|
local curStage = talent:getv(0, 1)
|
1c35c4cf
gaofengduan
fix hero awake
|
147
|
local curData = csvdb["unit_talentCsv"][curStage]
|
b57f0bae
gaofengduan
fix hero talent
|
148
|
if not curData then return 4 end
|
c59e058b
zhouhaihai
新一批日志记录
|
149
150
|
local oldSkillLv = hero:getSkillLevel(1)
|
997cbdfe
zhouahaihai
技能养成
|
151
|
|
c59e058b
zhouhaihai
新一批日志记录
|
152
|
local cost = {}
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
153
|
if index == 0 then
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
154
155
|
--是否进阶
local max = true
|
997cbdfe
zhouahaihai
技能养成
|
156
|
for i = 1, 4 do
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
157
158
159
160
|
if talent:getv(i, 0) < #curData then
max = false
break
end
|
997cbdfe
zhouahaihai
技能养成
|
161
|
end
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
162
163
164
165
166
167
|
if max then
talent = talent:setv(0, curStage + 1)
for i = 1, 4 do
talent = talent:setv(i, 0)
end
else
|
cbc6973f
zhouhaihai
天赋bug 日志调整
|
168
|
return 12
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
169
170
171
172
173
174
175
176
177
178
179
|
end
else
local level = talent:getv(index, 0)
if level >= #curData then return 5 end
local talentData = curData[level]
if not talentData then return end
if talentData.lvRequire > hero:getProperty("level") then return 6 end
|
c59e058b
zhouhaihai
新一批日志记录
|
180
|
cost = talentData.money:toNumMap()
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
|
local cost2 = talentData.cost:toNumMap()
for k,v in pairs(cost2) do
cost[globalCsv.unit_talent_cost[csvdb["unitCsv"][hero:getProperty("type")].camp][k]] = v
end
if not role:checkItemEnough(cost) then return 6 end
role:costItems(cost, {log = {desc = "heroTalent", int1 = msg.id, int2 = hero:getProperty("type")}})
talent = talent:incrv(index, 1)
local aheadLevel = 0
for i = 1, talent:getv(0, 1) - 1 do
aheadLevel = aheadLevel + #csvdb["unit_talentCsv"][i]
end
aheadLevel = aheadLevel + talent:getv(index, 0)
role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = aheadLevel})
|
997cbdfe
zhouahaihai
技能养成
|
197
|
end
|
53e8037e
zhouhaihai
任务
|
198
|
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
199
|
hero:updateProperty({field = "talent", value = talent})
|
53e8037e
zhouhaihai
任务
|
200
|
|
c59e058b
zhouhaihai
新一批日志记录
|
201
202
|
role:log("hero_talent", {
hero_id = hero:getProperty("type"), --英雄ID
|
43293781
zhouhaihai
日志bug
|
203
|
hero_talent_id = index, --天赋ID
|
887c1843
zhouhaihai
日志新一批
|
204
|
hero_talent_cost = cost, -- 英雄天赋升级消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,………...}
|
c59e058b
zhouhaihai
新一批日志记录
|
205
206
207
|
hero_talent_levelbef = oldSkillLv, -- 英雄技能升级前等级
hero_talent_level = hero:getSkillLevel(1), -- 英雄技能升级后等级
})
|
f22a33af
zhouhaihai
自己的日志
|
208
|
hero:mylog({desc = "talent", int1 = index, int2 = talent:getv(index, 0)})
|
3133cb76
zhouhaihai
日志
|
209
|
|
997cbdfe
zhouahaihai
技能养成
|
210
211
212
213
|
SendPacket(actionCodes.Hero_talentRpc, '')
return true
end
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
214
|
|
be9c9ca6
zhouahaihai
角色评论
|
215
216
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
275
276
277
278
279
280
281
282
283
284
285
286
287
288
|
-- 暂时没有这个功能
function _M.likeHeroRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local heroType = msg.type
local result = {status = 0}
local isLike = false
local hadLike = role:getProperty("likeHero"):toArray(true, "=")
for _, v in pairs(hadLike) do
if v == heroType then
isLike = true
break
end
end
if isLike then
result.status = 1
else
redisproxy:hincrby("hero:like", "hero:"..heroType, 1)
table.insert(hadLike, heroType)
role:setProperty("likeHero", table.concat(hadLike, "="))
end
SendPacket(actionCodes.Hero_likeHeroRpc, MsgPack.pack(result))
return true
end
local RankLikeNum = 5 --热度显示几个
local TimeLikeNum = 95 -- 时间显示几个
local function getCommentKey(heroType)
return {
commentListKey = string.format("list:%d:herocomments", heroType),
commentRankKey = string.format("rank:%d:herocomments", heroType),
commentKey = string.format("hero:%d:comments", heroType),
}
end
local function trimComment(heroType, commentId) -- 剪裁 CommentList
local commentKey = getCommentKey(heroType)
local redret = redisproxy:pipelining(function (red)
red:lpush(commentKey.commentListKey, commentId)
red:lrange(commentKey.commentListKey, TimeLikeNum,-1)
red:ltrim(commentKey.commentListKey, 0, TimeLikeNum - 1)
red:zrevrange(commentKey.commentRankKey, 0, RankLikeNum - 1)
end)
local hots = {}
for _, hot in pairs(redret[4]) do
hots[hot] = 1
end
redisproxy:pipelining(function (red)
local needDel = {}
for _, tempId in pairs(redret[2]) do
if not hots[tempId] then
table.insert(needDel, tempId)
end
end
if #needDel > 0 then
red:zrem(commentKey.commentRankKey, table_unpack(needDel))
red:hdel(commentKey.commentKey, table_unpack(needDel))
end
end)
end
function _M.commentHeroRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local heroType = msg.type
local content = msg.content
local result = {status = 0} -- status 0 成功 1 已经评论过了
local curStutus = role.dailyData:getProperty("commentHero")
if curStutus:getv(heroType, 0) ~= 0 then
result.status = 1
else
local commentKey = getCommentKey(heroType)
|
3c0ea5fb
zhouhaihai
抽英雄
|
289
|
local SERV = string.format(".chated%d", math.random(1, 5))
|
be9c9ca6
zhouahaihai
角色评论
|
290
291
292
293
294
295
|
local legal, mod = skynet.call(SERV, "lua", "check", content)
if not legal then
content = mod or ""
end
local commentId = tostring(redisproxy:hincrby("hero:comment:autoincr", "hero:" .. heroType, 1))
local comment = {
|
1c35c4cf
gaofengduan
fix hero awake
|
296
|
commentId = commentId,
|
be9c9ca6
zhouahaihai
角色评论
|
297
298
299
300
301
302
303
304
305
306
307
|
content = content,
roleId = role:getProperty("id"),
name = role:getProperty("name"),
-- time = skynet.timex()
}
redisproxy:hset(commentKey.commentKey, commentId, json.encode(comment))
trimComment(heroType, commentId)
comment.like = 0
result.comment = comment
role.dailyData:setProperty("commentHero", curStutus:setv(heroType, 1))
|
c59e058b
zhouhaihai
新一批日志记录
|
308
309
310
311
312
313
314
315
|
role:log("hero_note", {
hero_id = heroType, -- 英雄ID
hero_note_action = 0, -- 英雄评价界面操作,发布评论:0,点赞:1,反对:2
hero_note_id = commentId, -- 操作的评价ID
hero_note_text = content, -- 操作的评价内容
})
|
be9c9ca6
zhouahaihai
角色评论
|
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
|
end
SendPacket(actionCodes.Hero_commentHeroRpc, MsgPack.pack(result))
return true
end
function _M.getCommentsRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local heroType = msg.type
local list = {} -- 评论列表
local commentKey = getCommentKey(heroType)
local commentRoleKey = string.format("comment:%d:like", role:getProperty("id"))
local redret = redisproxy:pipelining(function (red)
red:lrange(commentKey.commentListKey, 0,TimeLikeNum - 1)
red:zrevrange(commentKey.commentRankKey, 0, -1, "WITHSCORES") --热门
red:hget("hero:like", "hero:"..heroType)
red:lrange(commentRoleKey, 0, 999)
end)
local likeMap = {}
local idList = {}
local liked = {}
for i = 1, #redret[2], 2 do
likeMap[redret[2][i]] = redret[2][i + 1]
if i < RankLikeNum * 2 then
table.insert(idList, redret[2][i])
end
end
for i = 1, #redret[1] do
table.insert(idList, redret[1][i])
end
for i = 1, #redret[4] do
liked[redret[4][i]] = 1
end
local commentData = redisproxy:pipelining(function (red)
for _, commentId in ipairs(idList) do
red:hget(commentKey.commentKey, commentId)
end
end)
for _, commentS in ipairs(commentData or {}) do
local comment = json.decode(commentS)
comment.like = likeMap[tostring(comment.commentId)] or 0
comment.liked = liked[heroType .. ":" .. comment.commentId] or 0
table.insert(list, comment)
end
SendPacket(actionCodes.Hero_getCommentsRpc, MsgPack.pack({list = list, like = tonumber(redret[3] or 0)}))
return true
end
function _M.likeCommentRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local actType = msg.actType -- 1 顶 2 踩
local heroType = msg.type
local commentId = msg.commentId --评论id
local commentKey = getCommentKey(heroType)
local add = 0
if actType == 1 then
add = 1
elseif actType == 2 then
add = -1
else
|
1c35c4cf
gaofengduan
fix hero awake
|
379
|
return
|
be9c9ca6
zhouahaihai
角色评论
|
380
381
|
end
|
1c35c4cf
gaofengduan
fix hero awake
|
382
383
|
local result = {status = 0}
local commentIndex = heroType .. ":" .. commentId
|
be9c9ca6
zhouahaihai
角色评论
|
384
385
|
local commentRoleKey = string.format("comment:%d:like", role:getProperty("id"))
local redret = redisproxy:pipelining(function (red)
|
c59e058b
zhouhaihai
新一批日志记录
|
386
|
red:hget(commentKey.commentKey, commentId)
|
be9c9ca6
zhouahaihai
角色评论
|
387
388
389
390
391
392
393
|
red:lrem(commentRoleKey, 1, commentIndex)
red:lpush(commentRoleKey, commentIndex)
red:ltrim(commentRoleKey, 0, 999)
end)
if (tonumber(redret[2]) or 0) > 0 then
result.status = 1
else
|
c59e058b
zhouhaihai
新一批日志记录
|
394
395
|
if redret[1] then-- 查不到也返回ture
local comment = json.decode(redret[1])
|
be9c9ca6
zhouahaihai
角色评论
|
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
|
local redret2 = redisproxy:pipelining(function (red)
red:zrevrange(commentKey.commentRankKey, 0, RankLikeNum - 1) --热门
red:zincrby(commentKey.commentRankKey, add, commentId)
red:zrevrange(commentKey.commentRankKey, 0, RankLikeNum - 1) --热门
end)
local out = {}
for _, v in pairs(redret2[1]) do
out[v] = 1
end
local new = {}
for _, v in pairs(redret2[3]) do
if out[v] then
out[v] = nil
else
new[v] = 1
end
end
for tempId, _ in pairs(out) do
trimComment(heroType, tempId)
end
redisproxy:pipelining(function (red)
for tempId, _ in pairs(new) do
red:lrem(commentKey.commentListKey, 0, tempId)
end
end)
|
c59e058b
zhouhaihai
新一批日志记录
|
421
422
423
424
425
426
427
|
role:log("hero_note", {
hero_id = heroType, -- 英雄ID
hero_note_action = add > 0 and 1 or 2, -- 英雄评价界面操作,发布评论:0,点赞:1,反对:2
hero_note_id = commentId, -- 操作的评价ID
hero_note_text = comment.content, -- 操作的评价内容
})
|
be9c9ca6
zhouahaihai
角色评论
|
428
429
430
431
432
433
434
|
end
end
SendPacket(actionCodes.Hero_likeCommentRpc, MsgPack.pack(result))
return true
end
|
312b9db5
zhouahaihai
背包
|
435
436
437
438
439
440
441
442
443
444
445
446
447
448
|
function _M.createHeroRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local heroType = msg.heroType
local unitData = csvdb["unitCsv"][heroType]
if not unitData then return end
local cost = globalCsv.unit_fragment_cost[unitData["rare"]]
if not cost then return end
if role:getItemCount(heroType) < cost then return end
for _, hero in pairs(role.heros) do
if hero:getProperty("type") == heroType then return end
end
|
3133cb76
zhouhaihai
日志
|
449
450
|
role:costItems({[heroType] = cost}, {log = {desc = "createHero"}})
role:award({[heroType + ItemStartId.Hero] = 1}, {log = {desc = "createHero"}})
|
312b9db5
zhouahaihai
背包
|
451
452
453
454
455
|
SendPacket(actionCodes.Hero_createHeroRpc, "")
return true
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
456
|
-- typ 位置,level等级对应唯一装备,level为0时为移除,不为0时无则装备,有则替换
|
24d77701
gaofengduan
fix equip
|
457
|
function _M.referEquipsRpc(agent, data)
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
458
459
460
461
462
|
local role = agent.role
local msg = MsgPack.unpack(data)
local hero = role.heros[msg.id]
if not hero then return 10 end
local equips = msg.equips
|
3efc352e
zhouhaihai
增加记录log
|
463
|
local isAuto = msg.isAuto
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
464
465
|
if not equips or not next(equips) then return 11 end
|
056c01a0
zhouhaihai
简化装备
|
466
467
468
469
470
|
for typ = 1, 4 do -- 4件装备
if equips[typ] and equips[typ] ~= 0 then
if role:getEquipCount(typ, equips[typ]) <= 0 then
return
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
471
|
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
472
|
end
|
c59e058b
zhouhaihai
新一批日志记录
|
473
474
475
476
477
|
local oldAttr = hero:getTotalAttrs()
local oldBattleV = hero:getProperty("battleV")
local wear = {}
|
056c01a0
zhouhaihai
简化装备
|
478
479
480
481
|
local curEquip = hero:getProperty("equip")
for typ = 1, 4 do -- 4件装备
if equips[typ] then
local cur = curEquip:getv(typ, 0)
|
ee999bde
zhouhaihai
零件优化
|
482
483
|
if cur ~= equips[typ] then
if equips[typ] == 0 then
|
056c01a0
zhouhaihai
简化装备
|
484
|
curEquip = curEquip:delk(typ)
|
ee999bde
zhouhaihai
零件优化
|
485
|
else
|
3133cb76
zhouhaihai
日志
|
486
|
role:addEquip(typ, equips[typ], -1, {log = {desc = "refer"}}) -- 穿上
|
056c01a0
zhouhaihai
简化装备
|
487
|
curEquip = curEquip:setv(typ, equips[typ])
|
c59e058b
zhouhaihai
新一批日志记录
|
488
489
|
wear[typ] = {id = equips[typ], act = 0}
|
056c01a0
zhouhaihai
简化装备
|
490
|
end
|
ee999bde
zhouhaihai
零件优化
|
491
492
|
if cur ~= 0 then
|
3133cb76
zhouhaihai
日志
|
493
|
role:addEquip(typ, cur, 1, {log = {desc = "refer"}}) -- 脱掉
|
c59e058b
zhouhaihai
新一批日志记录
|
494
495
|
wear[typ] = {id = cur, act = 1}
|
ee999bde
zhouhaihai
零件优化
|
496
|
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
497
498
|
end
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
499
|
end
|
c59e058b
zhouhaihai
新一批日志记录
|
500
|
|
056c01a0
zhouhaihai
简化装备
|
501
502
503
|
-- 更新角色
hero:updateProperty({field = "equip", value = curEquip})
|
1e9cb217
chenyueqi
服务器记录控制引导过程
|
504
505
|
role:finishGuide(23)
|
c59e058b
zhouhaihai
新一批日志记录
|
506
507
508
|
local curAttr = hero:getTotalAttrs()
local attrChange = getChangeAttrJson(oldAttr, curAttr)
for typ, data in pairs(wear) do
|
c3a70cde
zhouhaihai
返还
|
509
|
role:log("equip_wear", {
|
c59e058b
zhouhaihai
新一批日志记录
|
510
511
512
513
514
515
516
517
518
|
hero_id = hero:getProperty("type"), --英雄ID
equip_id = data.id, --装备ID
equip_wear_action = data.act, --装备操作类型:装备:0,卸载:1
equip_wear_part = typ, --装备部位,记录部位ID
equip_wear_result = curAttr, --装备操作后结果,记录属性变化,json格式记录,{“aa”:1234,"bb":4567}
equip_wear_change = attrChange, --装备操作变化值,记录属性变化,记录正负值,json格式记录,{“aa”:1234,"bb":-45}
equip_wear_mode = isAuto and 0 or 1, --用以区分自动装备还是手动装备,自动记录为0,手动记录为1
})
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
519
520
521
522
|
SendPacket(actionCodes.Hero_referEquipsRpc, "")
return true
end
|
ee3ac0b5
gaofengduan
fix magic
|
523
524
|
-- typ 位置,uid对应唯一符文,uid为0时为移除,不为0时无则装备,有则替换
function _M.referRunesRpc(agent, data)
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
525
526
527
528
529
530
|
local role = agent.role
local msg = MsgPack.unpack(data)
local hero = role.heros[msg.id]
if not hero then return 10 end
local runes = msg.runes
if not runes or not next(runes) then return 11 end
|
ee3ac0b5
gaofengduan
fix magic
|
531
|
|
f52efe51
zhouhaihai
符文升级
|
532
|
local used = {}
|
ee999bde
zhouhaihai
零件优化
|
533
534
535
536
|
for typ = 1, 6 do
if runes[typ] and runes[typ] ~= 0 then
local ownRune = role.runeBag[runes[typ]]
if not ownRune then return end
|
f52efe51
zhouhaihai
符文升级
|
537
538
539
540
541
542
543
544
545
546
547
548
549
550
|
if ownRune:getProperty("refer") ~= 0 then
used[ownRune:getProperty("refer")] = used[ownRune:getProperty("refer")] or {}
used[ownRune:getProperty("refer")][runes[typ]] = 1
end
end
end
for cheroId, cIds in pairs(used) do
local chero = role.heros[cheroId]
local hrunes = chero:getProperty("rune")
for slot, rId in pairs(hrunes:toNumMap()) do
if cIds[rId] then
hrunes = hrunes:delk(slot)
end
|
ee3ac0b5
gaofengduan
fix magic
|
551
|
end
|
f52efe51
zhouhaihai
符文升级
|
552
|
chero:updateProperty({field = "rune", value = hrunes})
|
ee3ac0b5
gaofengduan
fix magic
|
553
|
end
|
f52efe51
zhouhaihai
符文升级
|
554
|
|
c59e058b
zhouhaihai
新一批日志记录
|
555
556
557
|
local oldAttr = hero:getTotalAttrs()
local oldBattleV = hero:getProperty("battleV")
local wear = {}
|
ee999bde
zhouhaihai
零件优化
|
558
559
560
561
562
563
564
565
566
567
|
local curRune = hero:getProperty("rune")
for typ = 1, 6 do
if runes[typ] then
local cur = curRune:getv(typ, 0)
if cur ~= runes[typ] then
if runes[typ] == 0 then
curRune = curRune:delk(typ)
else
local newRune = role.runeBag[runes[typ]]
newRune:updateProperty({field = "refer",value = hero:getProperty("id")})
|
4ea1b5ac
zhouhaihai
穿戴零件
|
568
|
curRune = curRune:setv(typ, runes[typ])
|
c59e058b
zhouhaihai
新一批日志记录
|
569
|
wear[runes[typ]] = typ
|
ee999bde
zhouhaihai
零件优化
|
570
|
end
|
ee3ac0b5
gaofengduan
fix magic
|
571
|
|
ee999bde
zhouhaihai
零件优化
|
572
573
574
575
576
577
|
if cur ~= 0 then
local oldR = role.runeBag[cur]
if oldR then
oldR:updateProperty({field = "refer",value = 0})
end
end
|
ee3ac0b5
gaofengduan
fix magic
|
578
|
end
|
ee3ac0b5
gaofengduan
fix magic
|
579
|
end
|
ee3ac0b5
gaofengduan
fix magic
|
580
|
end
|
c59e058b
zhouhaihai
新一批日志记录
|
581
|
|
4ea1b5ac
zhouhaihai
穿戴零件
|
582
|
hero:updateProperty({field = "rune", value = curRune})
|
c59e058b
zhouhaihai
新一批日志记录
|
583
584
585
586
|
local attrChange = getChangeAttrJson(oldAttr, hero:getTotalAttrs())
for runeId, typ in pairs(wear) do
local ownRune = role.runeBag[runeId]
|
43293781
zhouhaihai
日志bug
|
587
588
589
590
591
592
593
594
595
596
|
if ownRune then
role:log("hero_jewel", {
hero_id = hero:getProperty("type"), -- 英雄ID
hero_jewel_id = ownRune:getProperty("id"), -- 铭文ID
hero_jewel_part = typ, -- 铭文装备部位
hero_jewel_score = hero:getProperty("battleV"), -- 铭文装备后的英雄分值
hero_jewel_scorebefore = oldBattleV, -- 铭文装备前的英雄分值
hero_jewel_result = attrChange, -- 铭文装备后效果,可记录效果ID,或json格式记录提升效果,{攻击:20,闪避:20,……..}
})
end
|
c59e058b
zhouhaihai
新一批日志记录
|
597
598
|
end
|
ee3ac0b5
gaofengduan
fix magic
|
599
|
SendPacket(actionCodes.Hero_referRunesRpc, "")
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
600
601
602
|
return true
end
|
3b069d52
zhouhaihai
增加获取 food 后台
|
603
604
605
606
607
608
609
610
611
612
613
614
|
function _M.createHeroRandomRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local itemId = msg.itemId
local itemData = csvdb["itemCsv"][itemId]
if not itemData or itemData.type ~= ItemType.HeroFCommon then return end
local cost = globalCsv.unit_fragment_cost[itemData.quality]
if not cost or role:getItemCount(itemId) < cost then return end
local randomData = csvdb["item_randomCsv"][tonumber(itemData.use_effect)]
if not randomData then return end
|
007af97e
zhouhaihai
item_random 结构更改
|
615
|
local temp = randomData.gift1:randWeight(true)
|
3b069d52
zhouhaihai
增加获取 food 后台
|
616
|
if not temp or not next(temp) then return end
|
7bb30dca
zhouhaihai
修改发奖
|
617
|
|
3133cb76
zhouhaihai
日志
|
618
|
role:costItems({[itemId] = cost}, {log = {desc = "createHeroRandom"}})
|
7bb30dca
zhouhaihai
修改发奖
|
619
620
621
622
|
local reward, change = role:award({[temp[1] + ItemStartId.Hero] = 1}, {log = {desc = "createHeroRandom"}})
SendPacket(actionCodes.Hero_createHeroRandomRpc, MsgPack.pack(role:packReward(reward, change)))
|
3b069d52
zhouhaihai
增加获取 food 后台
|
623
624
625
|
return true
end
|
36482c8b
zhouhaihai
回收养成
|
626
627
628
|
function _M.getResetRewardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
36482c8b
zhouhaihai
回收养成
|
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
|
local hero = role.heros[msg.id]
if not hero then return end
local level = hero:getProperty("level")
local breakL = hero:getProperty("breakL")
local talent = hero:getProperty("talent")
if level <= 1 and talent == "" then return end
local reward = {}
while level > 1 do
local curData = csvdb["unit_expCsv"][level - 1]
reward[ItemId.Exp] = (reward[ItemId.Exp] or 0) + curData.exp
reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + curData.gold
level = level - 1
end
while breakL > 0 do
local curData = csvdb["unit_breakCsv"][breakL - 1]
reward[ItemId.BreakCost] = (reward[ItemId.BreakCost] or 0) + curData.cost
reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + curData.gold
breakL = breakL - 1
end
local stage = talent:getv(0, 1)
local tlevel = {talent:getv(1, 0), talent:getv(2, 0), talent:getv(3, 0), talent:getv(4, 0)}
local talentCostIds = globalCsv.unit_talent_cost[csvdb["unitCsv"][hero:getProperty("type")].camp]
while stage > 0 do
local curData = csvdb["unit_talentCsv"][stage]
for level = math.max(table.unpack(tlevel)), 1, -1 do
local add = 0
for i = 1, 4 do
if tlevel[i] == level then
add = add + 1
tlevel[i] = tlevel[i] - 1
end
end
local talentData = curData[level - 1]
for itemId, count in pairs(talentData.money:toNumMap()) do
reward[itemId] = (reward[itemId] or 0) + count * add
end
for idx , count in pairs(talentData.cost:toNumMap()) do
reward[talentCostIds[idx]] = (reward[talentCostIds[idx]] or 0) + count * add
end
end
stage = stage - 1
curData = csvdb["unit_talentCsv"][stage]
if curData then
tlevel = {#curData, #curData, #curData, #curData}
end
end
|
c3a70cde
zhouhaihai
返还
|
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
|
local equip = hero:getProperty("equip")
for k, v in pairs(equip:toNumMap()) do
role:addEquip(k, v, 1, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
end
local rune = hero:getProperty("rune")
for _, id in pairs(rune:toNumMap()) do
local curRune = role.runeBag[id]
if curRune then
curRune:updateProperty({field = "refer", value = 0})
end
end
hero:updateProperties({
level = level,
breakL = breakL,
talent = "",
equip = "",
rune = "",
})
|
f22a33af
zhouhaihai
自己的日志
|
703
|
hero:mylog({desc = "resetHero"})
|
36482c8b
zhouhaihai
回收养成
|
704
705
706
707
|
for itemId, count in pairs(reward) do
reward[itemId] = math.floor(count * globalCsv.unit_back_discount)
end
|
7bb30dca
zhouhaihai
修改发奖
|
708
709
|
local change
reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
|
36482c8b
zhouhaihai
回收养成
|
710
|
|
c59e058b
zhouhaihai
新一批日志记录
|
711
|
role:log("hero_recycle", {
|
c3a70cde
zhouhaihai
返还
|
712
|
hero_recycle_list = {[hero:getProperty("type")] = 1}, -- 回收的英雄id列表,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"}
|
887c1843
zhouhaihai
日志新一批
|
713
|
hero_recycle_reward = reward, -- 回收后获得的奖励,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"}
|
c59e058b
zhouhaihai
新一批日志记录
|
714
715
|
hero_recycle_cnt = 1, -- 总回收英雄量
})
|
7bb30dca
zhouhaihai
修改发奖
|
716
|
SendPacket(actionCodes.Hero_getResetRewardRpc, MsgPack.pack(role:packReward(reward, change)))
|
36482c8b
zhouhaihai
回收养成
|
717
718
719
|
return true
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
720
721
722
723
724
725
726
727
|
function _M.drawHeroRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
if not role:isFuncUnlock(FuncUnlock.GetHero) then return end
local btype = msg.pool -- 1 2 3 卡池类型
local subType = msg.subType or 1-- 定向卡池需要传 子类型
local drawType = msg.type -- 1 单抽 2 十连
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
728
729
730
731
732
733
734
735
736
737
|
if btype ~= 1 then
subType = 1
end
local buildTypeData = csvdb["build_typeCsv"][btype]
if not buildTypeData then return 1 end
local drawCount = {1, 10} -- 抽取次数
if not drawCount[drawType] then return 2 end
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
738
739
740
|
local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
local floorHeroCount = role:getProperty("floorHero")[btype] or 0
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
|
-- 计算抽卡消耗品
local cost = {}
local lastCount = drawCount[drawType]
for _, costType in ipairs({"draw_card", "draw_coin"}) do
if buildTypeData[costType] ~= "" then
local curCost = buildTypeData[costType]:toArray(true, "=")
local hadCount = role:getItemCount(curCost[1])
local curCount = math.floor(hadCount / curCost[2])
if curCount >= lastCount then
cost[curCost[1]] = curCost[2] * lastCount
lastCount = 0
break
elseif curCount > 0 then
cost[curCost[1]] = curCost[2] * curCount
lastCount = lastCount - curCount
end
end
end
if lastCount > 0 then -- 钱不够
return 3
end
-- 抽取的池子
local poolMap = buildTypeData["pool"]:toNumMap()
local poolId = poolMap[subType]
if not poolId then return end
--判断定向卡池是否开启
if btype == 1 then
if not role:isTimeResetOpen(TimeReset["DrawType" .. subType]) then
local unlockPool = role.dailyData:getProperty("unlockPool")
if not unlockPool[subType] then
return 1
end
end
end
--TODO 活动覆盖
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
779
780
781
782
|
local actPoolId = role.activity:getActivityPool(btype, subType)
if actPoolId ~= 0 then
poolId = actPoolId
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
783
784
785
786
787
788
|
local unitPool = csvdb["build_unitCsv"][poolId]
if not unitPool then return 4 end
-- 开始抽
local resultPool = {}
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
789
|
local function fillDrawPool(isFloorBack)
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
790
791
792
|
local condition = {"rare", "camp"}
local values = {}
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
793
|
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
|
for idx, field in ipairs(condition) do
if not values[idx] then
local lpool = {}
local curIdx = 1
while unitPool[field .. "_" .. curIdx] do
lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
curIdx = curIdx + 1
end
if next(lpool) then
values[idx] = math.randWeight(lpool, 1)
end
end
end
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
809
810
811
|
for itemId, oneData in pairs(isFloorBack and csvdb["build_floorCsv"] or csvdb["build_poolCsv"]) do
local pool_str = "pool_" .. poolId
if oneData[pool_str] and oneData[pool_str] ~= "" then
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
812
813
814
815
816
817
|
local itemData = csvdb["itemCsv"][itemId]
while itemData do
if itemData.type ~= ItemType.Hero then break end
local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
if not heroData then break end
local ok = true
|
bb10924f
liuzujun
10连保底使用池子全随机
|
818
819
820
821
822
|
-- 保底是全随机,不用比较类型
if not isFloorBack then
for idx, field in ipairs(condition) do
if heroData[field] ~= values[idx] then ok = false break end
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
823
824
|
end
if not ok then break end
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
825
826
|
if oneData[pool_str] > 0 then
resultPool[itemId] = {oneData[pool_str]} -- itemId, count, 概率
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
827
828
829
830
831
832
833
|
end
break
end
end
end
end
|
c59e058b
zhouhaihai
新一批日志记录
|
834
|
role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
835
|
|
16f5fa68
chenyueqi
引导招募的引导改动被回退
|
836
|
local guideHero
|
ca55c763
chenyueqi
引导招募必送思露德判定出了大问题
|
837
|
if role:getProperty("newerGuide") == "11=1" then
|
16f5fa68
chenyueqi
引导招募的引导改动被回退
|
838
839
840
|
guideHero = 613
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
841
842
|
local ssrCount = 0
local reward = {}
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
843
|
local logReward = {}
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
844
|
for i = 1, drawCount[drawType] do
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
845
846
|
floorHeroCount = floorHeroCount + 1
local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
847
|
resultPool = {}
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
848
849
850
851
|
fillDrawPool(isFloorBack)
if not next(resultPool) then
skynet.error("random pool error, poolId:" .. poolId)
return
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
852
853
|
end
|
16f5fa68
chenyueqi
引导招募的引导改动被回退
|
854
855
856
857
858
859
|
local itemId = math.randWeight(resultPool, 1)
if guideHero then
itemId = guideHero
guideHero = nil
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
860
861
862
863
864
|
local itemData = csvdb["itemCsv"][itemId]
if itemData.quality == HeroQuality.SSR then
ssrCount = ssrCount + 1
end
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
865
866
867
868
|
if itemData.quality >= HeroQuality.SR then
floorHeroCount = 0
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
869
870
871
872
|
if role:isHaveHero(itemData.id - ItemStartId.Hero) then
local fragId = itemData.id - ItemStartId.Hero
local heroData = csvdb["unitCsv"][fragId]
local count = globalCsv.draw_unit_tofragment[heroData.rare]
|
c59e058b
zhouhaihai
新一批日志记录
|
873
|
role:award({[fragId] = count}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
|
b5481708
zhouhaihai
保底日志
|
874
|
logReward[fragId] = (logReward[fragId] or 0) + count
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
875
876
|
table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
else
|
c59e058b
zhouhaihai
新一批日志记录
|
877
|
role:award({[itemId] = 1}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
|
b5481708
zhouhaihai
保底日志
|
878
|
logReward[itemId] = (logReward[itemId] or 0) + 1
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
879
880
881
882
|
table.insert(reward, {id = itemId, count = 1})
end
end
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
883
884
885
886
887
888
|
if draw_floor_back_counts then
local floorHero = role:getProperty("floorHero")
floorHero[btype] = floorHeroCount
role:setProperty("floorHero", floorHero)
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
889
890
891
892
|
role:checkTaskEnter("DrawHero", {pool = btype, count = drawCount[drawType]})
if ssrCount > 0 then
role:checkTaskEnter("DrawSSR", {count = ssrCount})
end
|
c59e058b
zhouhaihai
新一批日志记录
|
893
|
role:finishGuide(11)
|
b5481708
zhouhaihai
保底日志
|
894
|
|
c59e058b
zhouhaihai
新一批日志记录
|
895
896
897
898
899
|
role:log("gacha", {
gacha_id = poolId, -- 卡池ID
gacha_type = btype, -- 卡池类型
gacha_up = 0, -- 卡池UP角色
gacha_times = drawCount[drawType], -- 抽卡次数
|
b5481708
zhouhaihai
保底日志
|
900
|
gacha_reward = logReward, -- 抽卡结果,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"}
|
887c1843
zhouhaihai
日志新一批
|
901
|
currency = cost, -- 购买道具消耗的货币
|
b5481708
zhouhaihai
保底日志
|
902
|
gacha_cnt = floorHeroCount,
|
c59e058b
zhouhaihai
新一批日志记录
|
903
|
})
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
904
|
SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
905
906
907
908
909
910
|
if btype == 1 or btype == 2 then
-- 达到一定次数,给响应奖励
local oldVal = role:getProperty("repayHero") or 0
local newVal = oldVal + drawCount[drawType]
local drawCardReward, val = role:getDrawCardExtraReward(oldVal, newVal)
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
911
912
913
914
|
-- 空字符穿代表直接给英雄 走以前repayHeroRpc
if drawCardReward == "" then
local id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
|
e0290d8e
liuzujun
修改引导, 抽卡阶段奖励修改
|
915
|
local r,change = {}
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
916
|
local itemData = csvdb["itemCsv"][id]
|
e0290d8e
liuzujun
修改引导, 抽卡阶段奖励修改
|
917
918
919
920
921
922
923
924
925
926
|
--if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
-- local fragId = itemData.id - ItemStartId.Hero
-- local heroData = csvdb["unitCsv"][fragId]
-- local count = globalCsv.draw_unit_tofragment[heroData.rare]
-- r, change = role:award({[fragId] = count}, {log = {desc = "drawHeroExtraReward"}})
-- --r = {id = fragId, count = count, from = id, fcount = 1}
--else
r, change = role:award({[id] = 1}, {log = {desc = "drawHeroExtraReward"}})
--end
SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
927
928
929
930
931
932
|
elseif drawCardReward and drawCardReward ~= "" then
role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack({reward = drawCardReward:toNumMap()}))
end
role:updateProperty({field = "repayHero", value = val})
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
933
934
935
|
return true
end
|
317a46a9
liuzujun
添加特权卡
|
936
937
|
function _M.repayHeroRpc(agent, data)
local role = agent.role
|
a35233c6
zhouhaihai
保底和回馈
|
938
|
|
317a46a9
liuzujun
添加特权卡
|
939
|
local repayHero = role:getProperty("repayHero")
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
940
941
|
local cnt = globalCsv.draw_times_to_get_ssr or 100
if repayHero < cnt then
|
317a46a9
liuzujun
添加特权卡
|
942
943
|
return
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
944
|
local result = repayHero - cnt
|
a35233c6
zhouhaihai
保底和回馈
|
945
|
|
317a46a9
liuzujun
添加特权卡
|
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
|
role:updateProperty({field = "repayHero", value = result})
local id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
local reward = {}
local itemData = csvdb["itemCsv"][id]
if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
local fragId = itemData.id - ItemStartId.Hero
local heroData = csvdb["unitCsv"][fragId]
local count = globalCsv.draw_unit_tofragment[heroData.rare]
role:award({[fragId] = count}, {log = {desc = "heroRepay"}})
reward = {id = fragId, count = count, from = id, fcount = 1}
else
role:award({[id] = 1}, {log = {desc = "heroRepay"}})
reward = {id = id, count = 1}
end
|
f22a33af
zhouhaihai
自己的日志
|
961
|
role:mylog("hero_action", {desc = "heroRepay", int1=result})
|
317a46a9
liuzujun
添加特权卡
|
962
963
964
|
SendPacket(actionCodes.Hero_repayHeroRpc, MsgPack.pack({reward = reward}))
return true
end
|
a35233c6
zhouhaihai
保底和回馈
|
965
|
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
|
function _M.unlockPoolRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
if not role:isFuncUnlock(FuncUnlock.GetHero) then return end
local type = msg.type -- 指定定向卡池需要类型 1, 2, 3
local needCost = true
--当前开启的类型不用解锁
if role:isTimeResetOpen(TimeReset["DrawType" .. type]) then
needCost = false
end
--已经解锁的不需要重复解锁
local unlockPool = role.dailyData:getProperty("unlockPool")
if unlockPool[type] then
needCost = false
end
if needCost then
|
f3eb34b1
liuzujun
删除无用日志
|
984
|
if not role:costDiamond({count = globalCsv.draw_unlock_pool_diamond or 300, log = {desc = "unlockPool", int1 = type}}) then
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
985
986
987
988
989
990
991
992
|
return
end
end
unlockPool[type] = 1
role.dailyData:updateProperty({field="unlockPool", value = unlockPool})
role.dailyData:updateProperty({field="curPool", value = type})
|
f22a33af
zhouhaihai
自己的日志
|
993
|
role:mylog("hero_action", {desc = "unlockPool", int1=type})
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
994
995
996
997
|
SendPacket(actionCodes.Hero_unlockPoolRpc, MsgPack.pack({}))
return true
end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
998
|
function _M.changeCrown(agent, data)
|
c59e058b
zhouhaihai
新一批日志记录
|
999
1000
1001
1002
1003
|
local role = agent.role
local msg = MsgPack.unpack(data)
local heroType = msg.heroType
|
4c7d396c
zhouhaihai
不回复 更改看板娘
|
1004
|
if not role:isHaveHero(heroType) then return true end
|
c59e058b
zhouhaihai
新一批日志记录
|
1005
1006
1007
1008
1009
|
role:setProperty("crown", heroType)
role:log("hero_show", {
hero_id = heroType,
})
|
c59e058b
zhouhaihai
新一批日志记录
|
1010
1011
1012
|
return true
end
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
1013
|
return _M
|