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
|
|
94449a78
chenyueqi
英雄升级和突破增加关卡限制
|
38
39
40
|
local level = hero:getProperty("level")
if level >= hero:getMaxLevel() then return 2 end
local curData = csvdb["unit_expCsv"][level]
|
997cbdfe
zhouahaihai
技能养成
|
41
|
local cost = {[ItemId.Exp] = curData.exp, [ItemId.Gold] = curData.gold}
|
1c35c4cf
gaofengduan
fix hero awake
|
42
|
if not role:checkItemEnough(cost) then return 3 end
|
94449a78
chenyueqi
英雄升级和突破增加关卡限制
|
43
44
45
46
47
48
49
50
|
-- 通过指定关卡后才能升级英雄等级
local pass = globalCsv.unit_exp_level_pass[level + 1]
if pass then
local hangPass = self:getProperty("hangPass")
if not hangPass[pass] then return 4 end
end
|
3133cb76
zhouhaihai
日志
|
51
|
role:costItems(cost, {log = {desc = "heroLevelUp", int1 = msg.id, int2 = hero:getProperty("type")}})
|
c59e058b
zhouhaihai
新一批日志记录
|
52
53
54
|
local oldAttr = hero:getTotalAttrs()
local oldBattleV = hero:getProperty("battleV")
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
55
|
hero:updateProperty({field = "level", delta = 1})
|
1c35c4cf
gaofengduan
fix hero awake
|
56
|
|
c59e058b
zhouhaihai
新一批日志记录
|
57
58
|
role:log("hero_upgrade", {
hero_id = hero:getProperty("type"), --英雄ID
|
887c1843
zhouhaihai
日志新一批
|
59
|
hero_upgrade_cost = cost, -- 英雄升级消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,………...}
|
c59e058b
zhouhaihai
新一批日志记录
|
60
61
62
63
64
|
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
日志
|
65
|
|
f22a33af
zhouhaihai
自己的日志
|
66
|
hero:mylog({desc = "levelUp", int1 = hero:getProperty("level")})
|
1e9cb217
chenyueqi
服务器记录控制引导过程
|
67
|
|
53e8037e
zhouhaihai
任务
|
68
|
role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
|
190e1415
liuzujun
英雄帖活动初始化
|
69
70
|
role:checkTaskEnter("HeroLvlCollect", {})
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
71
72
73
74
|
SendPacket(actionCodes.Hero_levelUpRpc, '')
return true
end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
75
76
77
78
|
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
|
79
|
if not hero then return 1 end
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
80
|
|
94449a78
chenyueqi
英雄升级和突破增加关卡限制
|
81
|
local breakL = hero:getProperty("breakL")
|
1c35c4cf
gaofengduan
fix hero awake
|
82
|
if hero:getProperty("level") < hero:getMaxLevel() then return 2 end
|
94449a78
chenyueqi
英雄升级和突破增加关卡限制
|
83
84
|
if breakL >= #csvdb["unit_breakCsv"] then return 3 end
local curData = csvdb["unit_breakCsv"][breakL]
|
702a3769
liuzujun
跑马灯gm指令, 突破时候检测星级要求
|
85
|
if hero:getProperty("wakeL") < curData["starLimit"] then return 4 end
|
997cbdfe
zhouahaihai
技能养成
|
86
|
local cost = {[ItemId.BreakCost] = curData.cost, [ItemId.Gold] = curData.gold}
|
1c35c4cf
gaofengduan
fix hero awake
|
87
|
if not role:checkItemEnough(cost) then return 4 end
|
94449a78
chenyueqi
英雄升级和突破增加关卡限制
|
88
89
90
91
92
93
94
95
|
-- 通过指定关卡后才能突破英雄
local pass = globalCsv.unit_break_level_pass[breakL + 1]
if pass then
local hangPass = self:getProperty("hangPass")
if not hangPass[pass] then return 4 end
end
|
3133cb76
zhouhaihai
日志
|
96
|
role:costItems(cost, {log = {desc = "heroBreak", int1 = msg.id, int2 = hero:getProperty("type")}})
|
c59e058b
zhouhaihai
新一批日志记录
|
97
|
local oldAttr = hero:getTotalAttrs()
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
98
|
hero:updateProperty({field = "breakL", delta = 1})
|
1c35c4cf
gaofengduan
fix hero awake
|
99
|
|
c59e058b
zhouhaihai
新一批日志记录
|
100
101
|
role:log("hero_break", {
hero_id = hero:getProperty("type"), --英雄ID
|
887c1843
zhouhaihai
日志新一批
|
102
|
hero_break_cost = cost, -- 英雄突破消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,………...}
|
c59e058b
zhouhaihai
新一批日志记录
|
103
104
105
|
hero_break_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄突破效果,可记录效果ID,或json格式记录提升效果,{攻击:20,闪避:20,……..}
hero_break_level = hero:getMaxLevel(), -- 英雄突破后等级上限
})
|
f22a33af
zhouhaihai
自己的日志
|
106
|
hero:mylog({desc = "break", int1 = hero:getProperty("breakL")})
|
3133cb76
zhouhaihai
日志
|
107
|
|
8c74292c
zhouahaihai
增加item 以及 角色突破
|
108
109
110
|
SendPacket(actionCodes.Hero_breakRpc, '')
return true
end
|
0a07bdd9
zhouahaihai
角色升级 。gm
|
111
|
|
997cbdfe
zhouahaihai
技能养成
|
112
113
114
115
|
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
|
116
117
118
119
120
|
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
修改天赋升级消耗
|
121
122
|
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
|
123
124
|
if not role:checkItemEnough(cost) then
return 4
|
997cbdfe
zhouahaihai
技能养成
|
125
|
end
|
3d8468b2
liuzujun
火花系统
|
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
local curLevel = hero:getProperty("wakeL")
local sparkInfo = hero:getProperty("spark")
-- 大于等于7的时候需要装备火花才能升
if curLevel >= 7 then
if #sparkInfo == 0 then
return 5
end
local ok = false
for _, info in ipairs(sparkInfo) do
local cfg = csvdb["sparkCsv"][info.cfg_id][info.level or 0]
if not cfg then return 6 end
if cfg.star == curLevel then
ok = true
break
end
end
if not ok then return 7 end
end
|
1c35c4cf
gaofengduan
fix hero awake
|
145
|
|
3133cb76
zhouhaihai
日志
|
146
|
role:costItems(cost, {log = {desc = "heroWake", int1 = msg.id, int2 = hero:getProperty("type")}})
|
0889982f
zhouhaihai
优化角色技能等级
|
147
|
|
c59e058b
zhouhaihai
新一批日志记录
|
148
|
local oldAttr = hero:getTotalAttrs()
|
43293781
zhouhaihai
日志bug
|
149
|
local oldBattleV = hero:getProperty("battleV")
|
997cbdfe
zhouahaihai
技能养成
|
150
151
|
hero:updateProperty({field = "wakeL", delta = 1})
|
f6a9215f
zhouhaihai
觉醒 误删了 任务
|
152
|
role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
|
bcbb0c7b
zhouhaihai
3星解锁 cg
|
153
|
if curLevel == 3 then -- 解锁cg
|
53e8037e
zhouhaihai
任务
|
154
155
|
role:checkTaskEnter("WakeCG", {heroType = typ})
end
|
f22a33af
zhouhaihai
自己的日志
|
156
|
hero:mylog({desc = "wake", int1 = hero:getProperty("wakeL")})
|
3133cb76
zhouhaihai
日志
|
157
|
|
c59e058b
zhouhaihai
新一批日志记录
|
158
159
|
role:log("hero_rise", {
hero_id = typ, --英雄ID
|
887c1843
zhouhaihai
日志新一批
|
160
|
hero_rise_cost = cost, --英雄觉醒消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,………...}
|
c59e058b
zhouhaihai
新一批日志记录
|
161
|
hero_rise_score = hero:getProperty("battleV"), --英雄觉醒后评分提升
|
43293781
zhouhaihai
日志bug
|
162
|
hero_rise_scoreget = hero:getProperty("battleV") - oldBattleV, --英雄觉醒后评分提升
|
c59e058b
zhouhaihai
新一批日志记录
|
163
164
165
|
hero_rise_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), --英雄觉醒效果,可记录效果ID,或json格式记录提升效果,{攻击:20,闪避:20,……..}
})
|
a5b98c30
chenyueqi
引导调整
|
166
167
168
169
|
if hero:getProperty("type") == 204 then
role:finishGuide(7)
end
|
997cbdfe
zhouahaihai
技能养成
|
170
|
SendPacket(actionCodes.Hero_wakeRpc, '')
|
190e1415
liuzujun
英雄帖活动初始化
|
171
172
|
role:checkTaskEnter("HeroStarCollect", {})
|
997cbdfe
zhouahaihai
技能养成
|
173
174
175
|
return true
end
|
997cbdfe
zhouahaihai
技能养成
|
176
177
178
179
180
|
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
|
181
|
if not hero then return 1 end
|
997cbdfe
zhouahaihai
技能养成
|
182
|
|
04258e10
zhouhaihai
天赋bug
|
183
|
local talent = hero:getProperty("talent")
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
184
|
local heroCfgId = hero:getProperty("type")
|
997cbdfe
zhouahaihai
技能养成
|
185
|
local curStage = talent:getv(0, 1)
|
6a2b449c
liuzujun
扭蛋机奖励不合并显示, 新增多队挂...
|
186
|
local oldStage = curStage
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
187
|
local curLevel = talent:getv(1, 1)
|
6a2b449c
liuzujun
扭蛋机奖励不合并显示, 新增多队挂...
|
188
|
local oldLevel = curLevel
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
189
190
|
local curData = csvdb["unit_talent_"..heroCfgId.."Csv"][curStage]
if not curData then return 1 end
|
c59e058b
zhouhaihai
新一批日志记录
|
191
192
|
local oldSkillLv = hero:getSkillLevel(1)
|
997cbdfe
zhouahaihai
技能养成
|
193
|
|
c59e058b
zhouhaihai
新一批日志记录
|
194
|
local cost = {}
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
195
196
197
|
if curLevel == #curData then
talent = talent:setv(0, curStage + 1)
talent = talent:setv(1, 1)
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
198
|
else
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
199
|
if curLevel > #curData then return 2 end
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
200
|
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
201
202
|
local talentData = curData[curLevel]
if not talentData then return 3 end
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
203
|
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
204
|
if talentData.lvRequire > hero:getProperty("level") then return 4 end
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
205
|
|
c59e058b
zhouhaihai
新一批日志记录
|
206
|
cost = talentData.money:toNumMap()
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
207
|
if not role:checkItemEnough(cost) then return 5 end
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
208
|
role:costItems(cost, {log = {desc = "heroTalent", int1 = msg.id, int2 = hero:getProperty("type")}})
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
209
|
talent = talent:setv(1, curLevel + 1)
|
997cbdfe
zhouahaihai
技能养成
|
210
|
end
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
211
212
|
curStage = talent:getv(0, 1)
role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = curStage})
|
53e8037e
zhouhaihai
任务
|
213
|
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
214
|
hero:updateProperty({field = "talent", value = talent})
|
53e8037e
zhouhaihai
任务
|
215
|
|
6a2b449c
liuzujun
扭蛋机奖励不合并显示, 新增多队挂...
|
216
217
218
219
220
|
role:log("hero_talent", {
hero_id = hero:getProperty("type"), --英雄ID
hero_talent_stagebef = oldStage, --英雄精进升级前停留阶段
hero_talent_stage = curStage, --英雄精进升级后停留阶段
|
8ec16c21
liuzujun
天赋升级写日志报错
|
221
|
hero_talent_cost = cost, --英雄精进升级消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,….}
|
6a2b449c
liuzujun
扭蛋机奖励不合并显示, 新增多队挂...
|
222
223
224
225
|
hero_talent_subid = curData[oldLevel].effect, --升级属性ID,生命、攻击、防御、命中、闪避分别对应(0,1,2,3,4)
hero_talent_sublevel = curData[oldLevel].level, --升级属性等级,如生命升级从1到2,则记录2
})
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
226
|
hero:mylog({desc = "talent", int1 = talent:getv(0, 1), int2 = talent:getv(1, 1)})
|
3133cb76
zhouhaihai
日志
|
227
|
|
997cbdfe
zhouahaihai
技能养成
|
228
229
230
231
|
SendPacket(actionCodes.Hero_talentRpc, '')
return true
end
|
6fc397d6
zhouhaihai
角色新突破 冒险优化点击地块
|
232
|
|
be9c9ca6
zhouahaihai
角色评论
|
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
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
|
-- 暂时没有这个功能
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
抽英雄
|
307
|
local SERV = string.format(".chated%d", math.random(1, 5))
|
be9c9ca6
zhouahaihai
角色评论
|
308
309
310
311
312
313
|
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
|
314
|
commentId = commentId,
|
be9c9ca6
zhouahaihai
角色评论
|
315
316
317
318
319
320
321
322
323
324
325
|
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
新一批日志记录
|
326
327
328
329
330
331
332
333
|
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
角色评论
|
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
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
|
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
|
397
|
return
|
be9c9ca6
zhouahaihai
角色评论
|
398
399
|
end
|
1c35c4cf
gaofengduan
fix hero awake
|
400
401
|
local result = {status = 0}
local commentIndex = heroType .. ":" .. commentId
|
be9c9ca6
zhouahaihai
角色评论
|
402
403
|
local commentRoleKey = string.format("comment:%d:like", role:getProperty("id"))
local redret = redisproxy:pipelining(function (red)
|
c59e058b
zhouhaihai
新一批日志记录
|
404
|
red:hget(commentKey.commentKey, commentId)
|
be9c9ca6
zhouahaihai
角色评论
|
405
406
407
408
409
410
411
|
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
新一批日志记录
|
412
413
|
if redret[1] then-- 查不到也返回ture
local comment = json.decode(redret[1])
|
be9c9ca6
zhouahaihai
角色评论
|
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
|
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
新一批日志记录
|
439
440
441
442
443
444
445
|
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
角色评论
|
446
447
448
449
450
451
452
|
end
end
SendPacket(actionCodes.Hero_likeCommentRpc, MsgPack.pack(result))
return true
end
|
312b9db5
zhouahaihai
背包
|
453
454
455
456
457
458
459
460
461
462
463
464
465
466
|
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
日志
|
467
468
|
role:costItems({[heroType] = cost}, {log = {desc = "createHero"}})
role:award({[heroType + ItemStartId.Hero] = 1}, {log = {desc = "createHero"}})
|
312b9db5
zhouahaihai
背包
|
469
470
471
472
473
|
SendPacket(actionCodes.Hero_createHeroRpc, "")
return true
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
474
|
-- typ 位置,level等级对应唯一装备,level为0时为移除,不为0时无则装备,有则替换
|
24d77701
gaofengduan
fix equip
|
475
|
function _M.referEquipsRpc(agent, data)
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
476
477
478
479
480
|
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
|
481
|
local isAuto = msg.isAuto
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
482
483
|
if not equips or not next(equips) then return 11 end
|
056c01a0
zhouhaihai
简化装备
|
484
485
486
487
488
|
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 数据结构
|
489
|
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
490
|
end
|
c59e058b
zhouhaihai
新一批日志记录
|
491
|
|
c59e058b
zhouhaihai
新一批日志记录
|
492
493
494
|
local oldBattleV = hero:getProperty("battleV")
local wear = {}
|
056c01a0
zhouhaihai
简化装备
|
495
496
497
498
|
local curEquip = hero:getProperty("equip")
for typ = 1, 4 do -- 4件装备
if equips[typ] then
local cur = curEquip:getv(typ, 0)
|
ee999bde
zhouhaihai
零件优化
|
499
500
|
if cur ~= equips[typ] then
if equips[typ] == 0 then
|
056c01a0
zhouhaihai
简化装备
|
501
|
curEquip = curEquip:delk(typ)
|
ee999bde
zhouhaihai
零件优化
|
502
|
else
|
3133cb76
zhouhaihai
日志
|
503
|
role:addEquip(typ, equips[typ], -1, {log = {desc = "refer"}}) -- 穿上
|
056c01a0
zhouhaihai
简化装备
|
504
|
curEquip = curEquip:setv(typ, equips[typ])
|
c59e058b
zhouhaihai
新一批日志记录
|
505
506
|
wear[typ] = {id = equips[typ], act = 0}
|
056c01a0
zhouhaihai
简化装备
|
507
|
end
|
ee999bde
zhouhaihai
零件优化
|
508
509
|
if cur ~= 0 then
|
3133cb76
zhouhaihai
日志
|
510
|
role:addEquip(typ, cur, 1, {log = {desc = "refer"}}) -- 脱掉
|
c59e058b
zhouhaihai
新一批日志记录
|
511
512
|
wear[typ] = {id = cur, act = 1}
|
ee999bde
zhouhaihai
零件优化
|
513
|
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
514
515
|
end
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
516
|
end
|
c59e058b
zhouhaihai
新一批日志记录
|
517
|
|
056c01a0
zhouhaihai
简化装备
|
518
519
520
|
-- 更新角色
hero:updateProperty({field = "equip", value = curEquip})
|
c59e058b
zhouhaihai
新一批日志记录
|
521
|
for typ, data in pairs(wear) do
|
c3a70cde
zhouhaihai
返还
|
522
|
role:log("equip_wear", {
|
c59e058b
zhouhaihai
新一批日志记录
|
523
524
525
526
|
hero_id = hero:getProperty("type"), --英雄ID
equip_id = data.id, --装备ID
equip_wear_action = data.act, --装备操作类型:装备:0,卸载:1
equip_wear_part = typ, --装备部位,记录部位ID
|
9be3f3ea
zhouhaihai
日志需求
|
527
528
|
equip_wear_scorebef = oldBattleV, --装备前英雄评分
equip_wear_score = hero:getProperty("battleV"), --装备后英雄评分
|
c59e058b
zhouhaihai
新一批日志记录
|
529
530
531
|
equip_wear_mode = isAuto and 0 or 1, --用以区分自动装备还是手动装备,自动记录为0,手动记录为1
})
end
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
532
533
534
535
|
SendPacket(actionCodes.Hero_referEquipsRpc, "")
return true
end
|
ee3ac0b5
gaofengduan
fix magic
|
536
537
|
-- typ 位置,uid对应唯一符文,uid为0时为移除,不为0时无则装备,有则替换
function _M.referRunesRpc(agent, data)
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
538
539
540
541
542
543
|
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
|
544
|
|
f52efe51
zhouhaihai
符文升级
|
545
|
local used = {}
|
ee999bde
zhouhaihai
零件优化
|
546
547
548
549
|
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
符文升级
|
550
551
552
553
554
555
556
557
558
559
560
561
562
563
|
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
|
564
|
end
|
f52efe51
zhouhaihai
符文升级
|
565
|
chero:updateProperty({field = "rune", value = hrunes})
|
ee3ac0b5
gaofengduan
fix magic
|
566
|
end
|
f52efe51
zhouhaihai
符文升级
|
567
|
|
c59e058b
zhouhaihai
新一批日志记录
|
568
569
570
|
local oldAttr = hero:getTotalAttrs()
local oldBattleV = hero:getProperty("battleV")
local wear = {}
|
ee999bde
zhouhaihai
零件优化
|
571
572
573
574
575
576
577
578
579
580
|
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
穿戴零件
|
581
|
curRune = curRune:setv(typ, runes[typ])
|
c59e058b
zhouhaihai
新一批日志记录
|
582
|
wear[runes[typ]] = typ
|
ee999bde
zhouhaihai
零件优化
|
583
|
end
|
ee3ac0b5
gaofengduan
fix magic
|
584
|
|
ee999bde
zhouhaihai
零件优化
|
585
586
587
588
589
590
|
if cur ~= 0 then
local oldR = role.runeBag[cur]
if oldR then
oldR:updateProperty({field = "refer",value = 0})
end
end
|
ee3ac0b5
gaofengduan
fix magic
|
591
|
end
|
ee3ac0b5
gaofengduan
fix magic
|
592
|
end
|
ee3ac0b5
gaofengduan
fix magic
|
593
|
end
|
c59e058b
zhouhaihai
新一批日志记录
|
594
|
|
4ea1b5ac
zhouhaihai
穿戴零件
|
595
|
hero:updateProperty({field = "rune", value = curRune})
|
c59e058b
zhouhaihai
新一批日志记录
|
596
597
598
599
|
local attrChange = getChangeAttrJson(oldAttr, hero:getTotalAttrs())
for runeId, typ in pairs(wear) do
local ownRune = role.runeBag[runeId]
|
43293781
zhouhaihai
日志bug
|
600
601
602
603
604
605
606
607
608
609
|
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
新一批日志记录
|
610
|
end
|
190e1415
liuzujun
英雄帖活动初始化
|
611
612
|
role:checkTaskEnter("RuneQualityCollect", {})
|
c59e058b
zhouhaihai
新一批日志记录
|
613
|
|
ee3ac0b5
gaofengduan
fix magic
|
614
|
SendPacket(actionCodes.Hero_referRunesRpc, "")
|
43cc5f51
gaofengduan
调整 equip 数据结构
|
615
616
617
|
return true
end
|
3b069d52
zhouhaihai
增加获取 food 后台
|
618
619
620
621
622
623
624
|
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]
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
625
|
if not cost or role:getItemCount(itemId) < cost then return 1 end
|
3b069d52
zhouhaihai
增加获取 food 后台
|
626
627
|
local randomData = csvdb["item_randomCsv"][tonumber(itemData.use_effect)]
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
628
|
if not randomData then return 2 end
|
3b069d52
zhouhaihai
增加获取 food 后台
|
629
|
|
007af97e
zhouhaihai
item_random 结构更改
|
630
|
local temp = randomData.gift1:randWeight(true)
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
631
|
if not temp or not next(temp) then return 3 end
|
7bb30dca
zhouhaihai
修改发奖
|
632
|
|
3133cb76
zhouhaihai
日志
|
633
|
role:costItems({[itemId] = cost}, {log = {desc = "createHeroRandom"}})
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
634
|
local reward, change = role:award({[temp[1]] = 1}, {log = {desc = "createHeroRandom"}})
|
7bb30dca
zhouhaihai
修改发奖
|
635
636
637
|
SendPacket(actionCodes.Hero_createHeroRandomRpc, MsgPack.pack(role:packReward(reward, change)))
|
3b069d52
zhouhaihai
增加获取 food 后台
|
638
639
640
|
return true
end
|
36482c8b
zhouhaihai
回收养成
|
641
642
643
|
function _M.getResetRewardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
36482c8b
zhouhaihai
回收养成
|
644
645
646
647
648
649
650
|
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")
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
651
|
local heroCfgId = hero:getProperty("type")
|
36482c8b
zhouhaihai
回收养成
|
652
|
|
782ee57d
liuzujun
多编队功能
|
653
|
local tmpLevel = level
|
36482c8b
zhouhaihai
回收养成
|
654
655
|
if level <= 1 and talent == "" then return end
|
fe296849
liuzujun
归还消耗指定道具或钻石
|
656
|
local pay = true
|
336fa4a6
chenyueqi
新的活动签到,新春三重奏之返还0消耗
|
657
|
if level <= 60 or role.activity:isOpen("HeroBackFree") then
|
782ee57d
liuzujun
多编队功能
|
658
659
660
|
pay = false
end
|
fe296849
liuzujun
归还消耗指定道具或钻石
|
661
662
663
664
665
666
667
668
|
if pay then
local costArr = globalCsv.unit_heroBack_cost:toArray(true, "=")
local itemCount = role:getItemCount(costArr[1])
local totalCost = {}
if itemCount >= costArr[2] then
totalCost[costArr[1]] = costArr[2]
else
local diamond = (costArr[2] - itemCount) * costArr[3]
|
3d8050ef
liuzujun
钻石3改成虹光玉8
|
669
|
if role:getItemCount(ItemId.Jade) < diamond then
|
fe296849
liuzujun
归还消耗指定道具或钻石
|
670
671
672
|
return 1
end
totalCost[costArr[1]] = itemCount
|
3d8050ef
liuzujun
钻石3改成虹光玉8
|
673
|
totalCost[ItemId.Jade] = diamond
|
fe296849
liuzujun
归还消耗指定道具或钻石
|
674
675
676
677
678
679
|
end
--if pay and not role:costDiamond({count = globalCsv.unit_heroBack_cost or 200, log = {desc = "resetHero", int1 = msg.id}}) then
-- return 1
--end
role:costItems(totalCost, {log = {desc = "resetHero", int1 = msg.id}})
|
782ee57d
liuzujun
多编队功能
|
680
681
|
end
|
36482c8b
zhouhaihai
回收养成
|
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
|
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)
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
698
699
|
local curTalentLvl = talent:getv(1, 1)
--local tlevel = {talent:getv(1, 0), talent:getv(2, 0), talent:getv(3, 0), talent:getv(4, 0)}
|
36482c8b
zhouhaihai
回收养成
|
700
|
|
36482c8b
zhouhaihai
回收养成
|
701
|
while stage > 0 do
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
702
|
local curData = csvdb["unit_talent_"..heroCfgId.."Csv"][stage]
|
0e96d6f4
zhouhaihai
返还bug
|
703
704
|
local offset = stage == talent:getv(0,1) and curTalentLvl - 1 or #curData
for lvl = 1, offset do
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
705
|
local talentData = curData[lvl]
|
36482c8b
zhouhaihai
回收养成
|
706
|
for itemId, count in pairs(talentData.money:toNumMap()) do
|
96d591f7
liuzujun
天赋升级修改,增加英雄信赖
|
707
|
reward[itemId] = (reward[itemId] or 0) + count
|
36482c8b
zhouhaihai
回收养成
|
708
709
710
|
end
end
stage = stage - 1
|
36482c8b
zhouhaihai
回收养成
|
711
712
|
end
|
c3a70cde
zhouhaihai
返还
|
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
|
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
自己的日志
|
733
|
hero:mylog({desc = "resetHero"})
|
782ee57d
liuzujun
多编队功能
|
734
|
|
fe296849
liuzujun
归还消耗指定道具或钻石
|
735
736
|
--local coef = globalCsv.unit_back_discount
--coef = (pay or tmpLevel <= 60) and 1 or coef
|
36482c8b
zhouhaihai
回收养成
|
737
|
for itemId, count in pairs(reward) do
|
fe296849
liuzujun
归还消耗指定道具或钻石
|
738
|
reward[itemId] = count
|
36482c8b
zhouhaihai
回收养成
|
739
|
end
|
7bb30dca
zhouhaihai
修改发奖
|
740
741
|
local change
reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
|
36482c8b
zhouhaihai
回收养成
|
742
|
|
c59e058b
zhouhaihai
新一批日志记录
|
743
|
role:log("hero_recycle", {
|
c3a70cde
zhouhaihai
返还
|
744
|
hero_recycle_list = {[hero:getProperty("type")] = 1}, -- 回收的英雄id列表,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"}
|
887c1843
zhouhaihai
日志新一批
|
745
|
hero_recycle_reward = reward, -- 回收后获得的奖励,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"}
|
c59e058b
zhouhaihai
新一批日志记录
|
746
747
|
hero_recycle_cnt = 1, -- 总回收英雄量
})
|
7bb30dca
zhouhaihai
修改发奖
|
748
|
SendPacket(actionCodes.Hero_getResetRewardRpc, MsgPack.pack(role:packReward(reward, change)))
|
36482c8b
zhouhaihai
回收养成
|
749
750
751
|
return true
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
752
753
754
|
function _M.drawHeroRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
|
686d4fd6
liuzujun
兑换活动支持兑换多个, 新增卡池
|
755
|
local actid = msg.actid
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
756
|
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
757
|
if not role:isFuncUnlock(FuncUnlock.GetHero) then return 1 end
|
86584add
liuzujun
新手卡池,心愿单卡池
|
758
|
local btype = msg.pool -- 1 2 3 4 5 卡池类型 4新手卡池 5心愿卡池
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
759
760
|
local subType = msg.subType or 1-- 定向卡池需要传 子类型
local drawType = msg.type -- 1 单抽 2 十连
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
761
762
|
if btype ~= 1 then
subType = 1
|
86584add
liuzujun
新手卡池,心愿单卡池
|
763
764
|
if btype == 4 and role:getProperty("newerDraw") >= 10 then
subType = 2
|
de1a55b4
liuzujun
新手卡池限制30抽
|
765
766
767
|
if(role:getProperty("newerDraw") >= 30) then
return 30
end
|
86584add
liuzujun
新手卡池,心愿单卡池
|
768
|
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
769
|
end
|
8cd3770f
liuzujun
挂机关卡可以选择,经验金币根据最高...
|
770
|
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
771
|
-- 另开活动卡池
|
686d4fd6
liuzujun
兑换活动支持兑换多个, 新增卡池
|
772
773
774
775
776
777
778
779
|
if actid then
if not role.activity:isOpenById(actid, "ActHeroPool") then return end
local cfg = csvdb["activity_ctrlCsv"][actid]
if not cfg then return end
btype = cfg.condition
end
|
8cd3770f
liuzujun
挂机关卡可以选择,经验金币根据最高...
|
780
781
|
if btype == 1 then
-- 判断定向卡池活动开启
|
f7a55da3
liuzujun
新增cb2临时限时礼包
|
782
|
if not role.activity:isOpen("RaceDraw") then
|
8cd3770f
liuzujun
挂机关卡可以选择,经验金币根据最高...
|
783
784
|
return
end
|
686d4fd6
liuzujun
兑换活动支持兑换多个, 新增卡池
|
785
786
787
788
789
790
791
792
793
794
795
796
|
elseif btype == 2 then
if role:getProperty("newerGuide") ~= "8=1" then
-- 判断普通卡池
if role.activity:isOpen("WishHeroPool") then
return
end
end
elseif btype == 5 then
-- 判断心愿单卡池
if not role.activity:isOpen("WishHeroPool") then
return
end
|
8cd3770f
liuzujun
挂机关卡可以选择,经验金币根据最高...
|
797
|
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
798
799
|
local buildTypeData = csvdb["build_typeCsv"][btype]
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
800
|
if not buildTypeData then return 2 end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
801
802
|
local drawCount = {1, 10} -- 抽取次数
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
803
|
if not drawCount[drawType] then return 3 end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
804
|
|
bb8c1d57
liuzujun
取消抽卡保底的保底次数默认值,因为...
|
805
|
local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
806
807
|
local floorHeroCount = role:getProperty("floorHero")[btype] or 0
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
808
809
|
-- 计算抽卡消耗品
local cost = {}
|
86584add
liuzujun
新手卡池,心愿单卡池
|
810
811
812
813
814
815
816
817
|
if buildTypeData["draw_coin_1"] == "" then
return 11
end
local diamondCost = buildTypeData["draw_coin_1"]:toArray(true, "=")
local isEnough = true
for _, costType in ipairs({"draw_card_"}) do
costType = costType..drawCount[drawType]
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
818
819
820
|
if buildTypeData[costType] ~= "" then
local curCost = buildTypeData[costType]:toArray(true, "=")
local hadCount = role:getItemCount(curCost[1])
|
86584add
liuzujun
新手卡池,心愿单卡池
|
821
822
|
if hadCount >= curCost[2] then
cost[curCost[1]] = curCost[2]
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
823
|
break
|
86584add
liuzujun
新手卡池,心愿单卡池
|
824
825
826
827
828
829
830
831
|
else
cost[curCost[1]] = hadCount
diamondCost[2] = (curCost[2] - hadCount) * diamondCost[2]
if not role:checkItemEnough({[diamondCost[1]]=diamondCost[2]}) then
isEnough = false
break
end
cost[diamondCost[1]] = diamondCost[2]
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
832
833
834
|
end
end
end
|
86584add
liuzujun
新手卡池,心愿单卡池
|
835
|
if isEnough == false then -- 钱不够
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
836
|
return 4
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
837
838
839
840
841
|
end
-- 抽取的池子
local poolMap = buildTypeData["pool"]:toNumMap()
local poolId = poolMap[subType]
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
842
|
if not poolId then return 5 end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
843
844
845
846
847
848
|
--判断定向卡池是否开启
if btype == 1 then
if not role:isTimeResetOpen(TimeReset["DrawType" .. subType]) then
local unlockPool = role.dailyData:getProperty("unlockPool")
if not unlockPool[subType] then
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
849
|
return 6
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
850
851
852
853
854
|
end
end
end
--TODO 活动覆盖
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
855
856
857
858
|
local actPoolId = role.activity:getActivityPool(btype, subType)
if actPoolId ~= 0 then
poolId = actPoolId
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
859
860
|
local unitPool = csvdb["build_unitCsv"][poolId]
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
861
|
if not unitPool then return 7 end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
862
863
864
|
-- 开始抽
local resultPool = {}
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
865
|
local function fillDrawPool(isFloorBack)
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
866
|
local condition = {"rare"}
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
867
868
|
local values = {}
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
869
|
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
|
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
|
4839b94d
liuzujun
增加抽卡英雄up
|
885
886
887
888
889
890
891
892
893
|
local weight = 0
local up_pool = nil
local rand_v = math.randomInt(1, 100)
if values[1] == HeroQuality.SR then
weight = unitPool["up_sr_weight"]
up_pool = unitPool["up_sr_id"]
elseif values[1] == HeroQuality.SSR then
weight = unitPool["up_ssr_weight"]
up_pool = unitPool["up_ssr_id"]
|
aa4838cb
liuzujun
心愿卡池根据心愿单英雄数量调整概率
|
894
895
896
897
|
if btype == 5 then
local wishPool = role:getProperty("wishPool") or {}
weight = weight * #wishPool
end
|
4839b94d
liuzujun
增加抽卡英雄up
|
898
899
900
901
|
end
--print(poolId, rand_v, weight, up_pool, values[1])
if rand_v < weight and up_pool then
up_pool = up_pool:toArray(true, "=")
|
86584add
liuzujun
新手卡池,心愿单卡池
|
902
903
904
|
if btype == 5 then -- 爱心卡池,使用玩家设置的备选池子
up_pool = role:getProperty("wishPool")
end
|
4839b94d
liuzujun
增加抽卡英雄up
|
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
|
for k, v in ipairs(up_pool) do
resultPool[v] = {1}
end
else
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
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
-- 保底是全随机,不用比较类型
if not isFloorBack then
for idx, field in ipairs(condition) do
if heroData[field] ~= values[idx] then ok = false break end
end
|
bb10924f
liuzujun
10连保底使用池子全随机
|
923
|
end
|
43611d57
liuzujun
抽卡up失败走全随机,随机池把up...
|
924
|
-- 随机剔除up池中的角色
|
064ca715
liuzujun
抽卡up_pool判空
|
925
926
927
928
929
930
|
if up_pool then
for k, v in ipairs(up_pool) do
if v == itemData.id then
ok = false
break
end
|
43611d57
liuzujun
抽卡up失败走全随机,随机池把up...
|
931
932
|
end
end
|
4839b94d
liuzujun
增加抽卡英雄up
|
933
934
935
936
937
|
if not ok then break end
if oneData[pool_str] > 0 then
resultPool[itemId] = {oneData[pool_str]} -- itemId, count, 概率
end
break
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
938
|
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
939
940
941
942
943
|
end
end
end
end
|
c59e058b
zhouhaihai
新一批日志记录
|
944
|
role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
945
|
|
00bf6029
liuzujun
限时礼包,抽卡ssr广播
|
946
|
local guideHero = nil
|
a5b98c30
chenyueqi
引导调整
|
947
948
|
if role:getProperty("newerGuide") == "8=1" then
guideHero = globalCsv.newdraw_hero_item_id or 503
|
16f5fa68
chenyueqi
引导招募的引导改动被回退
|
949
950
|
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
951
952
|
local ssrCount = 0
local reward = {}
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
953
|
local logReward = {}
|
7113ad0c
liuzujun
每日抽卡次数触发礼包
|
954
955
|
-- 限时礼包
local dailyDrawCnt = role.dailyData:getProperty("drawHeroCnt") or 0
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
956
|
for i = 1, drawCount[drawType] do
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
957
958
|
floorHeroCount = floorHeroCount + 1
local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
959
|
resultPool = {}
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
960
961
962
|
fillDrawPool(isFloorBack)
if not next(resultPool) then
skynet.error("random pool error, poolId:" .. poolId)
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
963
|
return 8
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
964
965
|
end
|
16f5fa68
chenyueqi
引导招募的引导改动被回退
|
966
967
968
|
local itemId = math.randWeight(resultPool, 1)
if guideHero then
itemId = guideHero
|
7125137e
chenyueqi
手抽英雄只奖励一个
|
969
|
guideHero = nil
|
16f5fa68
chenyueqi
引导招募的引导改动被回退
|
970
971
|
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
972
973
974
|
local itemData = csvdb["itemCsv"][itemId]
if itemData.quality == HeroQuality.SSR then
ssrCount = ssrCount + 1
|
00bf6029
liuzujun
限时礼包,抽卡ssr广播
|
975
|
if not guideHero then
|
4839b94d
liuzujun
增加抽卡英雄up
|
976
|
-- 广播获得ssr英雄
|
00bf6029
liuzujun
限时礼包,抽卡ssr广播
|
977
978
979
|
local ntf = {heroId = itemData.id - ItemStartId.Hero, nick = role:getProperty("name")}
mcast_util.pub_world(actionCodes.Role_broadGetSSR, MsgPack.pack(ntf))
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
980
981
|
end
|
86584add
liuzujun
新手卡池,心愿单卡池
|
982
983
984
985
986
987
988
989
|
if btype == 4 and role:getProperty("newerDraw") == 0 then -- 新手卡池
if itemData.quality == HeroQuality.SSR then
floorHeroCount = 0
end
else
if itemData.quality >= HeroQuality.SR then
floorHeroCount = 0
end
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
990
991
|
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
992
993
994
995
|
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
新一批日志记录
|
996
|
role:award({[fragId] = count}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
|
b5481708
zhouhaihai
保底日志
|
997
|
logReward[fragId] = (logReward[fragId] or 0) + count
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
998
999
|
table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
else
|
c59e058b
zhouhaihai
新一批日志记录
|
1000
|
role:award({[itemId] = 1}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
|
b5481708
zhouhaihai
保底日志
|
1001
|
logReward[itemId] = (logReward[itemId] or 0) + 1
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
1002
1003
|
table.insert(reward, {id = itemId, count = 1})
end
|
7113ad0c
liuzujun
每日抽卡次数触发礼包
|
1004
1005
1006
|
dailyDrawCnt = dailyDrawCnt + 1
role:checkTaskEnter("DrawHeroLimitPack", {count = dailyDrawCnt})
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
1007
1008
|
end
|
7113ad0c
liuzujun
每日抽卡次数触发礼包
|
1009
1010
|
role.dailyData:setProperty("drawHeroCnt", dailyDrawCnt)
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
1011
1012
1013
1014
1015
1016
|
if draw_floor_back_counts then
local floorHero = role:getProperty("floorHero")
floorHero[btype] = floorHeroCount
role:setProperty("floorHero", floorHero)
end
|
86584add
liuzujun
新手卡池,心愿单卡池
|
1017
1018
1019
1020
1021
|
if btype == 4 then
local newCount = role:getProperty("newerDraw")
role:updateProperty({field="newerDraw", value = newCount + drawCount[drawType]})
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
1022
|
role:checkTaskEnter("DrawHero", {pool = btype, count = drawCount[drawType]})
|
dfa9ae5e
liuzujun
战令任务活动
|
1023
1024
1025
|
if btype ~= 3 then
role:checkTaskEnter("DrawHeroNotFriend", {pool = btype, count = drawCount[drawType]})
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
1026
1027
1028
|
if ssrCount > 0 then
role:checkTaskEnter("DrawSSR", {count = ssrCount})
end
|
a5b98c30
chenyueqi
引导调整
|
1029
|
role:finishGuide(8)
|
b5481708
zhouhaihai
保底日志
|
1030
|
|
c59e058b
zhouhaihai
新一批日志记录
|
1031
1032
1033
1034
1035
|
role:log("gacha", {
gacha_id = poolId, -- 卡池ID
gacha_type = btype, -- 卡池类型
gacha_up = 0, -- 卡池UP角色
gacha_times = drawCount[drawType], -- 抽卡次数
|
b5481708
zhouhaihai
保底日志
|
1036
|
gacha_reward = logReward, -- 抽卡结果,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"}
|
9be3f3ea
zhouhaihai
日志需求
|
1037
|
gacha_cost = cost, -- 购买道具消耗的货币
|
b5481708
zhouhaihai
保底日志
|
1038
|
gacha_cnt = floorHeroCount,
|
c59e058b
zhouhaihai
新一批日志记录
|
1039
|
})
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
1040
|
SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
1041
|
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
1042
|
local feedbackId = buildTypeData["can_feedback"] or 0
|
6857a37f
liuzujun
世界Boss 增加行动点
|
1043
|
if feedbackId ~= 0 then
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
1044
1045
|
-- 达到一定次数,给响应奖励
local oldVal = role:getProperty("repayHero") or 0
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
1046
1047
|
if actid then
local actData = role.activity:getActData("ActHeroPool")
|
6857a37f
liuzujun
世界Boss 增加行动点
|
1048
|
oldVal = actData[btype] or 0
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
1049
|
end
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
1050
|
local newVal = oldVal + drawCount[drawType]
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
1051
|
local drawCardReward, val = role:getDrawCardExtraReward(feedbackId, oldVal, newVal)
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
1052
1053
|
-- 空字符穿代表直接给英雄 走以前repayHeroRpc
if drawCardReward == "" then
|
c8d4058c
liuzujun
保底机制修改,200次出未拥有的永雄
|
1054
1055
1056
1057
1058
1059
1060
|
local repayHeroMaxCount = role:getProperty("repayMaxC") or 0
repayHeroMaxCount = repayHeroMaxCount + 1
role:updateProperty({field = "repayMaxC", value = repayHeroMaxCount})
local even = repayHeroMaxCount % 2
local id = 0
if even == 1 then
|
c8c76cda
liuzujun
活动卡池保底出指定英雄
|
1061
|
id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
|
c8d4058c
liuzujun
保底机制修改,200次出未拥有的永雄
|
1062
1063
1064
|
else
local giftHeroSet = {}
for gid, cfg in pairs(csvdb["build_giftCsv"]) do
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
1065
|
if cfg["pool_"..feedbackId] ~= 0 and not role:isHaveHero(gid - ItemStartId.Hero) then
|
c8d4058c
liuzujun
保底机制修改,200次出未拥有的永雄
|
1066
1067
1068
1069
1070
1071
1072
1073
|
giftHeroSet[gid] = {1}
end
end
if next(giftHeroSet) then
id = math.randWeight(giftHeroSet, 1)
end
end
if id == 0 then
|
c8c76cda
liuzujun
活动卡池保底出指定英雄
|
1074
|
id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
|
c8d4058c
liuzujun
保底机制修改,200次出未拥有的永雄
|
1075
|
end
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
1076
|
|
e0290d8e
liuzujun
修改引导, 抽卡阶段奖励修改
|
1077
|
local r,change = {}
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
1078
|
local itemData = csvdb["itemCsv"][id]
|
e0290d8e
liuzujun
修改引导, 抽卡阶段奖励修改
|
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
|
--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
付费签到,抽卡阶段奖励,探索指令
|
1089
|
elseif drawCardReward and drawCardReward ~= "" then
|
ceef9d00
liuzujun
抽卡50次保底英雄转换碎片bug
|
1090
1091
1092
|
local r,change = {}
r, change = role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
1093
|
end
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
1094
1095
1096
1097
1098
1099
1100
|
if not actid then
role:updateProperty({field = "repayHero", value = val})
else
local actData = role.activity:getActData("ActHeroPool")
actData[btype] = val
role.activity:updateActData("ActHeroPool", actData)
end
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
1101
|
end
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
1102
1103
1104
|
return true
end
|
317a46a9
liuzujun
添加特权卡
|
1105
1106
|
function _M.repayHeroRpc(agent, data)
local role = agent.role
|
a35233c6
zhouhaihai
保底和回馈
|
1107
|
|
317a46a9
liuzujun
添加特权卡
|
1108
|
local repayHero = role:getProperty("repayHero")
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
1109
1110
|
local cnt = globalCsv.draw_times_to_get_ssr or 100
if repayHero < cnt then
|
317a46a9
liuzujun
添加特权卡
|
1111
1112
|
return
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
1113
|
local result = repayHero - cnt
|
a35233c6
zhouhaihai
保底和回馈
|
1114
|
|
317a46a9
liuzujun
添加特权卡
|
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
|
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
自己的日志
|
1130
|
role:mylog("hero_action", {desc = "heroRepay", int1=result})
|
317a46a9
liuzujun
添加特权卡
|
1131
1132
1133
|
SendPacket(actionCodes.Hero_repayHeroRpc, MsgPack.pack({reward = reward}))
return true
end
|
a35233c6
zhouhaihai
保底和回馈
|
1134
|
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
|
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
删除无用日志
|
1153
|
if not role:costDiamond({count = globalCsv.draw_unlock_pool_diamond or 300, log = {desc = "unlockPool", int1 = type}}) then
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
1154
1155
1156
1157
1158
1159
1160
1161
|
return
end
end
unlockPool[type] = 1
role.dailyData:updateProperty({field="unlockPool", value = unlockPool})
role.dailyData:updateProperty({field="curPool", value = type})
|
f22a33af
zhouhaihai
自己的日志
|
1162
|
role:mylog("hero_action", {desc = "unlockPool", int1=type})
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
1163
1164
1165
1166
|
SendPacket(actionCodes.Hero_unlockPoolRpc, MsgPack.pack({}))
return true
end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
1167
|
function _M.changeCrown(agent, data)
|
c59e058b
zhouhaihai
新一批日志记录
|
1168
1169
1170
1171
1172
|
local role = agent.role
local msg = MsgPack.unpack(data)
local heroType = msg.heroType
|
866852ff
chenyueqi
主城看板有可能是story cg id
|
1173
|
if heroType < 10000 and not role:isHaveHero(heroType) then return true end
|
c59e058b
zhouhaihai
新一批日志记录
|
1174
1175
1176
1177
1178
|
role:setProperty("crown", heroType)
role:log("hero_show", {
hero_id = heroType,
})
|
c59e058b
zhouhaihai
新一批日志记录
|
1179
1180
1181
|
return true
end
|
16634605
liuzujun
多队挂机,天赋道具合成
|
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
|
function _M.itemComposeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local itemId = msg.id
local count = msg.count
if not csvdb["itemCsv"][itemId] then return 1 end
local config = csvdb["item_processCsv"][itemId]
if not config then return 2 end
local cost = config.cost:toNumMap()
|
cd949029
liuzujun
合成道具数量不对bug
|
1193
1194
1195
|
for k, v in pairs(cost) do
cost[k] = v * count
end
|
16634605
liuzujun
多队挂机,天赋道具合成
|
1196
1197
1198
1199
1200
1201
1202
1203
|
if not role:checkItemEnough(cost) then return 2 end
role:costItems(cost, {log = {desc = "itemCompose", int1 = itemId, int2 = count}})
role:award({[itemId] = count}, {log = {desc = "itemCompose"}})
SendPacket(actionCodes.Hero_itemComposeRpc, "")
return true
end
|
86584add
liuzujun
新手卡池,心愿单卡池
|
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
|
function _M.setWishPoolRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local heros = msg.heros
if #heros > 3 then return 1 end
for _, heroId in pairs(heros) do
local cfg = csvdb["build_poolCsv"][heroId]
if not cfg then return 2 end
local buildTypeData = csvdb["build_typeCsv"][5]
if not buildTypeData then return 3 end
local poolMap = buildTypeData["pool"]:toNumMap()
local poolId = poolMap[1]
if not poolId then return 4 end
if cfg["pool_"..poolId] == 0 then
return 5
end
end
role:updateProperty({field="wishPool", value = heros})
SendPacket(actionCodes.Hero_setWishPoolRpc, "")
return true
end
|
3d8468b2
liuzujun
火花系统
|
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
|
function _M.changeSparkRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local idx = msg.index
local sparkId = msg.spark_id
local heroId = msg.hero_id
local hero = role.heros[heroId]
if not hero then return 1 end
local spark = role.sparkBag[sparkId]
if not spark then return 2 end
local lvl = spark:getProperty("level")
local cfgId = spark:getProperty("cfg_id")
local dataSet = csvdb["sparkCsv"][cfgId]
if not dataSet then return 3 end
local cfg = dataSet[lvl]
if not cfg then return 4 end
if hero:getProperty("wakeL") < cfg.star then return 5 end
local itemCfg = csvdb["itemCsv"][cfgId]
if not itemCfg then return 6 end
if itemCfg.quality ~= hero:getRare() then return 6 end
local sparkList = hero:getProperty("spark") or {}
local oldSparkInfo = sparkList[idx] or {}
sparkList[idx] = spark:data()
hero:updateProperty({field="spark", value=sparkList})
role:delSparks({sparkId}, {log = {desc = "changeSpark"}})
local oldId = oldSparkInfo["cfg_id"] or 0
local oldLevel = oldSparkInfo["level"] or 0
local oldSparkSet = csvdb["sparkCsv"][oldId]
|
3d8468b2
liuzujun
火花系统
|
1268
1269
1270
|
local reward = {}
if oldSparkSet then
local oldSparkCfg = oldSparkSet[oldLevel]
|
3d8468b2
liuzujun
火花系统
|
1271
1272
1273
1274
|
if oldSparkSet then
reward = oldSparkCfg.back:toNumMap()
end
end
|
3d8468b2
liuzujun
火花系统
|
1275
1276
1277
1278
1279
|
SendPacket(actionCodes.Hero_changeSparkRpc, MsgPack.pack({reward = reward}))
return true
end
|
1af7ada5
liuzujun
fix confict
|
1280
|
return _M
|