Blame view

src/actions/RoleAction.lua 45.2 KB
314bc5df   zhengshouren   提交服务器初始代码
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
  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
  local httpc = require("http.httpc")
  
  local WAVE_HERO_NUMS = 150
a0013f0b   zhouhaihai   零件分批推送
18
  local WAVE_RUNE_NUMS = 150
3d8468b2   测试   火花系统
19
  local WAVE_SPARK_NUMS = 150
314bc5df   zhengshouren   提交服务器初始代码
20
21
22
23
24
25
  
  local function validName(name)
  	name = string.upper(name)
  	local exist = redisproxy:exists(string_format("user:%s", name))
  	if exist then return "existed" end
  
a5486ede   zhouhaihai   csvdata 修改为 share...
26
  	local SERV = string_format(".named%d", math.random(1, 5))
314bc5df   zhengshouren   提交服务器初始代码
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
  	local legal = skynet.call(SERV, "lua", "check", name)
  	return legal and "ok" or "illegal"
  end
  
  -- 随机玩家名
  local function randomRoleName()
  	-- 过滤已经存在的名字
  	local name
  	repeat
  		name = getRandomName()
  	until validName(name) == "ok"
  	return name
  end
  
  local function setRoleName(uid, roleId)
  	local result
  	local name
  	local dbName
  	repeat
  		name = randomRoleName()
  		dbName = string.upper(name)
  		result = redisproxy:setnx(string_format("user:%s", dbName), roleId)
  	until result == 1
  	redisproxy:set(string_format("uid:%s", uid), dbName)
  	return name
  end
  
  local _M = {}
  function _M.loginRpc( agent, data )
  	local msg = MsgPack.unpack(data)
  	local response = {}
e3c5cc5e   zhouhaihai   跨服竞技场over
58
59
60
61
62
  	if msg.codeVersion ~= globalCsv.codeVersion then
  		response.result = "UPDATE_TIP"
  		SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  		return true
  	end
314bc5df   zhengshouren   提交服务器初始代码
63
64
65
66
67
68
69
70
71
72
73
74
75
76
  
  	-- 1.
  	local roleId = redisproxy:get(string_format("user:%s", string.upper(msg.name)))
  	if not roleId then
  		response.result = "NOT_EXIST"
  		SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  		return true
  	end
  
  	roleId = tonumber(roleId)
  
  	--维护不能登录
  	local maintain = tonumber(redisproxy:hget("autoincrement_set", "maintain"))
  	if maintain and maintain > 0 then
0a07bdd9   zhouahaihai   角色升级 。gm
77
  		if tonumber(redisproxy:hget(string_format("role:%d", roleId), "ignoreMt")) ~= 1 then
314bc5df   zhengshouren   提交服务器初始代码
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
  			response.result = "MAINTAIN_TIP"
  			SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  			return true
  		end
  	end
  
  	local now = skynet.timex()
  	local role = agent.role
  	-- 2
  	if not role then
  		local roleKey = string_format("role:%d", roleId)
  		if not redisproxy:exists(roleKey) then
  			response.result = "DB_ERROR"
  			SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  			return true
  		end
  		-- 2a
  		role = require("models.Role").new({key = roleKey})
  		role:load()
  		role:loadAll()
44c6e479   zhouhaihai   增加部分日志
98
  		role:startActionUcode()
314bc5df   zhengshouren   提交服务器初始代码
99
100
101
  	else
  		role:reloadWhenLogin()
  	end
43cc5f51   gaofengduan   调整 equip 数据结构
102
  
39bcd7ca   zhouhaihai   LOG
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
  
  	role.sysVersion = msg.sysVersion
  	role.ip = agent.ip:toArray(false, ":")[1]
  	role.clientVersion = msg.clientVersion
  	role.network = msg.network
  
  	if msg.subId then
  		role:setProperty("sid", msg.subId)
  	end
  
  	if msg.deviceMode then
  		local deviceMode = tostring(msg.deviceMode)
  		if role:getProperty("dmode") ~= deviceMode then
  			role:setProperty("dmode", deviceMode)
  		end
  	end
  	if msg.device then
  		local device = tostring(msg.device)
  		if role:getProperty("device") ~= device then
  			role:setProperty("device", device)
  		end
  	end
072db127   zhouhaihai   推送
125
126
127
  	if msg.token then
  		role._pushToken = msg.token
  	end
39bcd7ca   zhouhaihai   LOG
128
  
0a07bdd9   zhouahaihai   角色升级 。gm
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
  	if not msg.isGMlogin then
  		local banTime = role:getProperty("banTime")
  		if banTime > now then
  			response.result = "BAN_TIP"
  			response.banTime = banTime
  			response.banType = role:getProperty("banType")
  			response.roleId = roleId
  			SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  			return true
  		end
  		if banTime ~= 0 then
  			-- 清除封号状态
  			role:setBan(0)
  		end
  	end
39bcd7ca   zhouhaihai   LOG
144
  
aa74d6ef   zhouhaihai   掉落反馈
145
146
  	if msg.deviceMode then
  		local deviceMode = tostring(msg.deviceMode)
93f6e69b   测试   拾荒选择时间,抽卡增加sr保底
147
148
  		if role:getProperty("dmode") ~= deviceMode then
  			role:setProperty("dmode", deviceMode)
aa74d6ef   zhouhaihai   掉落反馈
149
150
151
152
  		end
  	end
  	if msg.device then
  		local device = tostring(msg.device)
93f6e69b   测试   拾荒选择时间,抽卡增加sr保底
153
154
  		if role:getProperty("device") ~= device then
  			role:setProperty("device", device)
aa74d6ef   zhouhaihai   掉落反馈
155
156
157
  		end
  	end
  	
314bc5df   zhengshouren   提交服务器初始代码
158
  	SERV_OPEN = redisproxy:hget("autoincrement_set", "server_start")
314bc5df   zhengshouren   提交服务器初始代码
159
  
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
160
  	role:changeStructVersion() -- 数据结构 版本更新
70cc72d7   zhouhaihai   拾荒bug
161
  	role:getAdvData(true) -- 清掉不合格的数据
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
162
  	role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
65b551a7   chenyueqi   海港贸易季初版
163
  	role:checkSeaportTrade() -- 检查海港贸易季活动
29fbbc10   zhouhaihai   夜间打工
164
165
166
  	if not next(role:getProperty("workBattle")) then
  		role:setProperty("workBattle", {round = math.floor((now - START_RESET_TIME) / 604800)})
  	end
314bc5df   zhengshouren   提交服务器初始代码
167
  
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
168
  	-- 跨天登陆事件
ea40710f   zhouhaihai   活动
169
  	local resetMode = role:updateTimeReset(now)
be4e8031   zhouhaihai   活动 拾荒
170
171
  	if not resetMode or not resetMode["CrossDay"] then -- 没有跨天
  		role.activity:checkActivityStatus(now, false, false)
2f7891b4   zhouhaihai   运营需要
172
  		role:log("onLogin")
ba19c0e4   测试   活动任务登录天数bug修改
173
174
  
          role:checkTaskEnter("Login", {})
ea40710f   zhouhaihai   活动
175
  	end
ea40710f   zhouhaihai   活动
176
  
c384626d   zhouhaihai   好友
177
  	redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
be9c9ca6   zhouahaihai   角色评论
178
  
3e20f499   测试   完善商城相关协议
179
  	for _, name in ipairs({"dailyData", "dinerData", "activity", "storeData"}) do
be9c9ca6   zhouahaihai   角色评论
180
  		response[name] = role[name]:data()
7f9f002d   测试   循环周活动
181
182
  		--print("["..name.."]")
  		--dump(response[name])
be9c9ca6   zhouahaihai   角色评论
183
184
  	end
  
314bc5df   zhengshouren   提交服务器初始代码
185
186
187
  	response.role = role:data()
  	response.result = "SUCCESS"
  	response.serverTime = now
53b4b8bd   测试   自动挂机下一关
188
  	--response.openTime = getServerOpenTs()
314bc5df   zhengshouren   提交服务器初始代码
189
  
0a07bdd9   zhouahaihai   角色升级 。gm
190
191
192
193
194
195
196
  	local modules = {}
  
  	local heroIds = {}
  	for heroId, _ in pairs(role.heros) do
  		table.insert(heroIds, heroId)
  	end
  	local heroWave = math.ceil(#heroIds / WAVE_HERO_NUMS)
6947e382   zhouahaihai   好感度, 皮肤
197
  	if #heroIds <= 50 then
0a07bdd9   zhouahaihai   角色升级 。gm
198
199
200
201
  		heroWave = 0
  		table_insert(modules, "heros")
  	end
  
a0013f0b   zhouhaihai   零件分批推送
202
203
204
205
206
207
208
209
210
211
  	local runeIds = {}
  	for id ,_ in pairs(role.runeBag) do
  		table.insert(runeIds, id)
  	end 
  	local runeWave = math.ceil(#runeIds / WAVE_RUNE_NUMS)
  	if #runeIds <= 50 then
  		runeWave = 0
  		table_insert(modules, "runeBag")
  	end
  
3d8468b2   测试   火花系统
212
213
214
215
216
217
218
219
220
221
  	local sparkIds = {}
  	for id ,_ in pairs(role.sparkBag) do
  		table.insert(sparkIds, id)
  	end 
  	local sparkWave = math.ceil(#sparkIds / WAVE_SPARK_NUMS)
  	if #sparkIds <= 50 then
  		sparkWave = 0
  		table_insert(modules, "sparkBag")
  	end
  
0a07bdd9   zhouahaihai   角色升级 。gm
222
223
224
225
226
227
228
  	for _, name in ipairs(modules) do
  		response[name] = {}
  		for id, unit in pairs(role[name]) do
  			response[name][id] = unit:data()
  		end
  	end
  
3d8468b2   测试   火花系统
229
  	response.wave = 1 + heroWave + runeWave + sparkWave + 1
314bc5df   zhengshouren   提交服务器初始代码
230
231
232
  
  	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  
a0013f0b   zhouhaihai   零件分批推送
233
234
  	local curWave = 1 
  
3d8468b2   测试   火花系统
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
  	local sparkIndex = 1
  	for index = curWave + 1, curWave + sparkWave do
  		local sparkResponse = {sparkBag = {}}
  		for i = sparkIndex, sparkIndex + WAVE_SPARK_NUMS do
  			local sparkId = sparkIds[i]
  			if not sparkId then
  				break
  			end
  			local spark = role.sparkBag[sparkId]
  			table.insert(sparkResponse.sparkBag, spark:data())
  			sparkIndex = sparkIndex + 1
  		end
  		sparkResponse.sparkWave = index
  		SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(sparkResponse))
  	end
  	curWave = curWave + sparkWave
  
a0013f0b   zhouhaihai   零件分批推送
252
253
254
255
256
257
258
259
260
261
262
263
264
265
  	local runeIndex = 1
  	for index = curWave + 1, curWave + runeWave do
  		local runeResponse = {runeBag = {}}
  		for i = runeIndex, runeIndex + WAVE_RUNE_NUMS do
  			local runeId = runeIds[i]
  			if not runeId then
  				break
  			end
  			local rune = role.runeBag[runeId]
  			table.insert(runeResponse.runeBag, rune:data())
  			runeIndex = runeIndex + 1
  		end
  		runeResponse.runeWave = index
  		SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(runeResponse))
43cc5f51   gaofengduan   调整 equip 数据结构
266
  	end
a0013f0b   zhouhaihai   零件分批推送
267
  	curWave = curWave + runeWave
43cc5f51   gaofengduan   调整 equip 数据结构
268
  
0a07bdd9   zhouahaihai   角色升级 。gm
269
  	local heroIndex = 1
a0013f0b   zhouhaihai   零件分批推送
270
  	for index = curWave + 1, curWave + heroWave do
0a07bdd9   zhouahaihai   角色升级 。gm
271
272
273
274
275
276
277
278
279
280
281
282
283
  		local heroResponse = {heros = {}}
  		for i = heroIndex, heroIndex + WAVE_HERO_NUMS do
  			local heroId = heroIds[i]
  			if not heroId then
  				break
  			end
  			local hero = role.heros[heroId]
  			table_insert(heroResponse.heros, hero:data())
  			heroIndex = heroIndex + 1
  		end
  		heroResponse.heroWave = index
  		SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(heroResponse))
  	end
a0013f0b   zhouhaihai   零件分批推送
284
  	curWave = curWave + heroWave
314bc5df   zhengshouren   提交服务器初始代码
285
  
fa565e0c   zhouhaihai   优化结构
286
  	
43cc5f51   gaofengduan   调整 equip 数据结构
287
  
314bc5df   zhengshouren   提交服务器初始代码
288
  	-- 注册全服广播
fa565e0c   zhouhaihai   优化结构
289
290
291
292
293
294
295
296
297
  	if not role._channelIdx then
  		local channel = math.randomInt(1, 1)
  		role._channelIdx = channel
  	end
  	if not mcast_util.channel_world() then
  		local w_channel = datacenter.get( ("MC_W_CHANNEL" .. role._channelIdx) )
  		if w_channel then
  			mcast_util.sub_world(w_channel)
  		end
314bc5df   zhengshouren   提交服务器初始代码
298
  	end
c384626d   zhouhaihai   好友
299
300
301
  
  	-- 发下缓存的世界消息
  	local worldChatResponse = {worldChats = {}}
cd789e7c   zhouhaihai   不要聊天记录缓存
302
303
  	-- local ok, msgs = pcall(skynet.call, '.globald', "lua", "getWorldMsg", role._channelIdx)
  	local ok, msgs = true, {}
c384626d   zhouhaihai   好友
304
305
306
307
  	if not ok then 
  		msgs = {} 
  	end
  	worldChatResponse.worldChats = msgs
4cf74232   zhouhaihai   pvp
308
309
310
311
312
  	local redret = redisproxy:pipelining(function(red)
  		red:lrange(CHAT_OFFLINE:format(roleId), 0, -1)
  		red:del(CHAT_OFFLINE:format(roleId))
  	end)
  	worldChatResponse.p2pChats = redret[1]
c384626d   zhouhaihai   好友
313
314
315
316
317
  	worldChatResponse.chatWave = curWave + 1
  	curWave = curWave + 1
  
  	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(worldChatResponse))
  
fa565e0c   zhouhaihai   优化结构
318
319
320
321
322
323
324
325
  	datacenter.set("agent", roleId, {
  		serv = skynet.self(),
  		fd = agent.client_fd,
  		gate_serv = agent.gate_serv,
  	})
  	agent.role = role
  
  	start_agent_timer()
4cf74232   zhouhaihai   pvp
326
327
328
  
  
  	-- 玩家登陆做的一些操作
f7f26c15   zhouhaihai   编队整理 增加 tactics战术
329
  	role:updateHangTeamInfo()
4cf74232   zhouhaihai   pvp
330
  	role:savePvpCTeam()
33be3111   zhouhaihai   修改hangPass 结构
331
  	role:savePvpHTeam()
fa565e0c   zhouhaihai   优化结构
332
  
33be3111   zhouhaihai   修改hangPass 结构
333
  	local hangPass = role:getProperty("hangPass")
d02f7904   zhouhaihai   遗失的log
334
  	role:mylog("login", {key1 = agent.ip:toArray(false, ":")[1], int1 = hangPass[1] or 0})
3aac1e3a   zhouhaihai   新设备
335
336
337
  	if msg.newdevice then
  		role:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
  	end
320f5b54   zhouhaihai   cb 返利
338
  
314bc5df   zhengshouren   提交服务器初始代码
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
  	return true
  end
  
  function _M.createRpc(agent, data)
  	local msg = MsgPack.unpack(data)
  	local response = {}
  
  	-- 再次检查uid
  	local uid = tostring(msg.uid)
  	local user = redisproxy:get(string_format("uid:%s", uid))
  	if user then
  		response.result = "SUCCESS"
  		response.roleName = user
  		SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
  		return true
  	end
f58b315e   zhouhaihai   停止注册
355
356
357
358
359
360
361
  	local stopcreate = tonumber(redisproxy:hget("autoincrement_set", "stopcreate"))
  	if stopcreate and stopcreate > 0 then
  		response.result = "STOP_CREATE"
  		SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
  		return true
  	end
  
314bc5df   zhengshouren   提交服务器初始代码
362
363
364
365
366
367
368
369
  
  	local roleId = getNextRoleId()
  	if not roleId then
  		response.result = "DB_FULL"
  		SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
  		return true
  	end
  	local roleName = setRoleName(msg.uid, roleId)
314bc5df   zhengshouren   提交服务器初始代码
370
371
372
373
  	local newRole = require("models.Role").new({
  		key = string_format("role:%d", roleId),
  		id = roleId,
  		uid = tostring(msg.uid),
dc9d814f   zhouhaihai   邮件
374
  		sid = msg.subId or 0,
314bc5df   zhengshouren   提交服务器初始代码
375
376
  		name = roleName,
  		uname = msg.uname or "",
93f6e69b   测试   拾荒选择时间,抽卡增加sr保底
377
  		device = tostring(msg.device),
aa74d6ef   zhouhaihai   掉落反馈
378
  		dmode = msg.deviceMode and tostring(msg.deviceMode) or nil
314bc5df   zhengshouren   提交服务器初始代码
379
380
381
382
383
384
385
386
387
388
389
390
  	})
  
  	if newRole:create() then
  		--更新USER表
  		response.result = "SUCCESS"
  		response.roleId = roleId
  		response.roleName = string.upper(roleName)
  	else
  		response.result = "DB_ERROR"
  		SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
  		return true
  	end
44c6e479   zhouhaihai   增加部分日志
391
  	newRole:startActionUcode()
39bcd7ca   zhouhaihai   LOG
392
393
394
395
396
  	newRole.sysVersion = msg.sysVersion
  	newRole.ip = agent.ip:toArray(false, ":")[1]
  	newRole.clientVersion = msg.clientVersion
  	newRole.network = msg.network
  
8b65a363   zhouhaihai   优化
397
  	newRole:award(globalCsv.birthItem, {log = {desc = "birth"}, notNotify = true})
314bc5df   zhengshouren   提交服务器初始代码
398
  	-- 欢迎邮件
147ef2ce   zhouhaihai   邮件 Gm
399
  	redisproxy:insertEmail({roleId = roleId, emailId = 1})
314bc5df   zhengshouren   提交服务器初始代码
400
  
39bcd7ca   zhouhaihai   LOG
401
402
403
404
  	if msg.newuser then
  		newRole:log("onCreateAccount")
  	end
  	newRole:log("onCreateRole")
d02f7904   zhouhaihai   遗失的log
405
  	newRole:mylog("create", {key1 = agent.ip:toArray(false, ":")[1]})
3aac1e3a   zhouhaihai   新设备
406
407
408
  	if msg.newdevice then
  		newRole:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
  	end
314bc5df   zhengshouren   提交服务器初始代码
409
410
  
  	SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
320f5b54   zhouhaihai   cb 返利
411
412
413
414
415
416
417
418
419
420
421
422
  
  	-- cb付费返利
  	skynet.timeout(0, function()
  		local cbbackd = cluster.query("center", "cbbackd")
  		local uid = newRole:getProperty("uid")
  		local start = uid:find("_")
  		if start then
  			uid = uid:sub(start + 1)
  		end
  		if cbbackd then
  			local status, back = pcall(cluster.call, "center", cbbackd, "getCbBack", {uid = uid, id = roleId})
  			if status then
91019d1f   zhouhaihai   cb 返利调整
423
  				if back and next(back) and back.reward and next(back.reward) then
320f5b54   zhouhaihai   cb 返利
424
  					local reward = ""
91019d1f   zhouhaihai   cb 返利调整
425
  					for itemId, count in pairs(back.reward) do
320f5b54   zhouhaihai   cb 返利
426
427
  						reward = reward:setv(itemId, count)
  					end
91019d1f   zhouhaihai   cb 返利调整
428
429
430
431
432
  					if back.reward[70] then
  						redisproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward2, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
  					else
  						redisproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
  					end
320f5b54   zhouhaihai   cb 返利
433
434
435
436
437
438
439
440
441
442
  					newRole:mylog("cbback", {key1 = uid, int2 = roleId})
  				end
  			else
  				skynet.error("[ERROR] cbbackd cant call center uid: " .. uid .. " roleId:" .. roleId)
  			end
  		else
  			skynet.error("[ERROR] cbbackd cant call center uid: " .. uid .. " roleId:" .. roleId)
  		end
  	end)
  	
314bc5df   zhengshouren   提交服务器初始代码
443
444
445
  	return true
  end
  
dc9d814f   zhouhaihai   邮件
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
  function _M.changeNameRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  
  	local newName = msg.name
  	local oldName = role:getProperty("name")
  
  	if not newName or type(newName) ~= "string" then return end
  	if newName == oldName then return end
  	-- 检查name是否合法
  	local checked = validName(newName)
  	if checked ~= "ok" then
  		--[[
  			"existed" 已经存在
  			"illegal" 包含非法字符
  		]]
  		local errCodes = {
  			["existed"] = 1,
  			["illegal"] = 2
  		}
  		SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = errCodes[checked]}))
  		return true
  	end
  
  	if not roleId then 
  		SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 3}))
  		return true
  	end
af7863ef   zhouhaihai   x小写名字异常
475
476
  	local dbName = string.upper(newName)
  	local result = redisproxy:setnx(string_format("user:%s", dbName), roleId)
dc9d814f   zhouhaihai   邮件
477
478
479
480
481
  	if result == 0 then
  		SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 1}))
  		return true
  	end
  	redisproxy:pipelining(function (red)
af7863ef   zhouhaihai   x小写名字异常
482
483
  		red:del(string_format("user:%s", string.upper(oldName)))
  		red:set(string_format("uid:%s", role:getProperty("uid")), dbName)
dc9d814f   zhouhaihai   邮件
484
485
486
487
488
  	end)
  
  	role:updateProperties({
  		["name"] = newName,
  	})
e3c5cc5e   zhouhaihai   跨服竞技场over
489
490
  
  	role:changeCrossServerPvpSelfInfo("name")
dc9d814f   zhouhaihai   邮件
491
492
493
494
  	SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 0}))
  	return true
  end
  
c1849aa6   chenyueqi   roleaction增加一个获取随...
495
496
497
498
499
500
  function _M.getRandomNameRpc()
  	local name = randomRoleName()
  	SendPacket(actionCodes.Role_getRandomNameRpc, MsgPack.pack({name = name}))
  	return true
  end
  
dc9d814f   zhouhaihai   邮件
501
502
503
504
505
506
507
  function _M.changeIntroRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  	local content = msg.content
  	if not content or type(content) ~= "string" then return end
  
a5486ede   zhouhaihai   csvdata 修改为 share...
508
  	local SERV = string_format(".chated%d", math.random(1, 5))
dc9d814f   zhouhaihai   邮件
509
510
511
512
513
  	local legal, mod = skynet.call(SERV, "lua", "check", content)
  	if not legal then
  		content = mod or ""
  	end
  
14f1591b   zhouhaihai   删除好感度相关
514
  	role:updateProperty({field = "intro", value = content})
dc9d814f   zhouhaihai   邮件
515
516
517
518
519
  	
  	SendPacket(actionCodes.Role_changeIntroRpc, '')
  	return true
  end
  
314bc5df   zhengshouren   提交服务器初始代码
520
521
522
523
524
  function _M.syncTimeRpc(agent, data)
  	SendPacket(actionCodes.Role_syncTimeRpc, MsgPack.pack({nowTime = skynet.timex()}))
  	return true
  end
  
312b9db5   zhouahaihai   背包
525
526
527
  function _M.saleItemRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
84e7c06e   zhouhaihai   回收
528
529
530
531
  	local backs = msg.backs
  	if not backs then return end
  
  	local reward = {}
53e8037e   zhouhaihai   任务
532
  	local fragCount = 0
84e7c06e   zhouhaihai   回收
533
534
535
536
  	for itemId, count in pairs(backs) do
  		if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
  		local itemData = csvdb["itemCsv"][itemId]
  		if itemData.sell_effect == "" then return end
53e8037e   zhouhaihai   任务
537
538
539
  		if itemData.type == ItemType.HeroFragment or itemData.type == ItemType.HeroFCommon then
  			fragCount = fragCount + count
  		end
84e7c06e   zhouhaihai   回收
540
541
  		local sellEffect = itemData.sell_effect:toArray(true, "=")
  		reward[sellEffect[1]] = (reward[sellEffect[1]] or 0) + sellEffect[2] * count
c59e058b   zhouhaihai   新一批日志记录
542
543
544
545
546
547
548
549
550
  
  		role:log("carriage_decals", {
  			item_id = itemId, --道具id
  			item_type = itemData.type, --道具类型,具体见枚举表中道具类型枚举表
  			item_level = 0, --道具等级
  			item_number = count, --道具变化数量的绝对值
  			carriage_decals_rwdid = sellEffect[1], --拆解获得物资ID
  			carriage_decals_rwdnum = sellEffect[2] * count, --拆解获得物资数量
  		})
84e7c06e   zhouhaihai   回收
551
552
  	end	
  	
44c6e479   zhouhaihai   增加部分日志
553
  	role:costItems(backs, {log = {desc = "saleItem"}})
7bb30dca   zhouhaihai   修改发奖
554
  	local reward, change = role:award(reward, {log = {desc = "saleItem"}})
53e8037e   zhouhaihai   任务
555
  	role:checkTaskEnter("DecoFrag", {count = fragCount})
c59e058b   zhouhaihai   新一批日志记录
556
  	
7bb30dca   zhouhaihai   修改发奖
557
  	SendPacket(actionCodes.Role_saleItemRpc, MsgPack.pack(role:packReward(reward, change)))
312b9db5   zhouahaihai   背包
558
559
560
561
562
563
564
565
566
567
568
569
  	return true
  end
  
  function _M.openItemRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local itemId = msg.itemId
  	local count = msg.count
  	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
  	local itemData = csvdb["itemCsv"][itemId]
  	if itemData.use_type ~= 2 then return end
  	local randomData = csvdb["item_randomCsv"][tonumber(itemData.use_effect)]
9b35bf6e   zhouhaihai   开启时间箱
570
  	if not randomData or randomData.openTime > 0 then return end
312b9db5   zhouahaihai   背包
571
  
007af97e   zhouhaihai   item_random 结构更改
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
  	local reward = {}
  	for _i = 1, count do
  		for i = 1, 10 do
  			local num = randomData["num" .. i] 
  			local gift = randomData["gift" .. i]
  			if num and gift and num > 0 and gift ~= "" then
  				local pool = {}
  				for _, temp in ipairs(gift:toArray()) do
  					table.insert(pool, temp:toArray(true, "="))
  				end
  				local needCount = math.min(#pool, num)
  				for j = 1, needCount do
  					local idx = math.randWeight(pool, 3)
  					reward[pool[idx][1]] = (reward[pool[idx][1]] or 0) + pool[idx][2]
  					table.remove(pool, idx)
  				end
312b9db5   zhouahaihai   背包
588
589
590
  			end
  		end
  	end
007af97e   zhouhaihai   item_random 结构更改
591
592
  	reward[0] = nil
  
44c6e479   zhouhaihai   增加部分日志
593
  	role:costItems({[itemId] = count}, {log = {desc = "openItem"}})
7bb30dca   zhouhaihai   修改发奖
594
595
  	local change
  	reward, change = role:award(reward, {log = {desc = "openItem", int1 = itemId, int2 = count}})
43cc5f51   gaofengduan   调整 equip 数据结构
596
  
7bb30dca   zhouhaihai   修改发奖
597
  	SendPacket(actionCodes.Role_openItemRpc, MsgPack.pack(role:packReward(reward, change)))
312b9db5   zhouahaihai   背包
598
599
600
  	return true
  end
  
9b35bf6e   zhouhaihai   开启时间箱
601
602
603
  function _M.openTimeBoxRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
4d8bd32c   chenyueqi   倒计时开箱子
604
  	local oper = msg.oper  -- 操作 1 - 2
9b35bf6e   zhouhaihai   开启时间箱
605
  	local slot = msg.slot  -- 位置 1 - 6
317a46a9   测试   添加特权卡
606
607
  
  	-- 特权卡时间箱额外栏位
0a093ba8   chenyueqi   重写拆解室功能
608
609
610
611
  	-- local privExtraCnt = role.storeData:getTimeBoxSlotExtraCount()
  	-- if oper == 1 then
  	-- 	if math.illegalNum(slot, 1, role:getFuncLv(FuncOpenType.TimeBoxSlot) + privExtraCnt) then return end
  	-- end
9b35bf6e   zhouhaihai   开启时间箱
612
613
  
  	local boxL = role:getProperty("boxL")
0a093ba8   chenyueqi   重写拆解室功能
614
615
  	local reward, change
  	if oper == 1 then -- 构建开始(包括切换构建的id)
9b35bf6e   zhouhaihai   开启时间箱
616
  		local itemId = msg.itemId
9b35bf6e   zhouhaihai   开启时间箱
617
  		local itemData = csvdb["itemCsv"][itemId]
0a093ba8   chenyueqi   重写拆解室功能
618
619
620
621
622
623
  		if not itemData then return 1 end
  		if not boxL[slot] then
  			boxL[slot] = {}
  		else
  			local oldId, process, time = boxL[slot].id, boxL[slot].process, boxL[slot].time
  			local unitTime = globalCsv.box_key_time[oldId] * 60
4aadc450   chenyueqi   切换拆解术式bug,造成获得巨大数...
624
  			local doneCnt = time == 0 and 0 or math.floor((process + skynet.timex() - time) / unitTime)
0a093ba8   chenyueqi   重写拆解室功能
625
  			if doneCnt > 0 then
4aadc450   chenyueqi   切换拆解术式bug,造成获得巨大数...
626
  				reward = role:award({[oldId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
0a093ba8   chenyueqi   重写拆解室功能
627
628
629
630
631
632
633
634
  			end
  		end
  		local limit = globalCsv.box_key_max[itemId] or 5
  		if role:getItemCount(itemId) >= limit then return 3 end
  
  		boxL[slot] = {id = itemId, process = 0, time = skynet.timex()}
  		role:pushMsg({type = "box", slot = slot, time = skynet.timex() + globalCsv.box_productLine_time * 3600})
  	elseif oper == 2 then -- 重置运行时间(可以使用加速)
9b35bf6e   zhouhaihai   开启时间箱
635
  		local quick = msg.quick
0a093ba8   chenyueqi   重写拆解室功能
636
637
638
639
640
641
642
643
  		if not boxL[slot] then return 4 end
  
  		local itemId, process, time = boxL[slot].id, boxL[slot].process, boxL[slot].time
  		local nowTime = skynet.timex()
  		local stopTime = nowTime
  		local itemData = csvdb["itemCsv"][itemId]
  		local unitTime = globalCsv.box_key_time[itemId] * 60
  		if quick then
cc9f29c5   chenyueqi   拆解术式,可以自主选择加速多长时间
644
  			stopTime = nowTime + quick
f8ba82b3   zhouhaihai   大小写
645
  			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
cc9f29c5   chenyueqi   拆解术式,可以自主选择加速多长时间
646
  			local costKey = math.ceil(quick / (cost_pre[1] * 60)) * cost_pre[2]
0a093ba8   chenyueqi   重写拆解室功能
647
  			if not role:checkItemEnough({[ItemId.Diamond] = costKey}) then return 5 end
4aadc450   chenyueqi   切换拆解术式bug,造成获得巨大数...
648
  			role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
cb8d4368   chenyueqi   拆解术式充能的时候领取道具,获得个...
649
650
  		else
  			stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600)
9b35bf6e   zhouhaihai   开启时间箱
651
  		end
0a093ba8   chenyueqi   重写拆解室功能
652
  		role:pushCancel({type = "box", slot = slot})
5d620aef   chenyueqi   拆解室指定某一项为必得奖励
653
  
0a093ba8   chenyueqi   重写拆解室功能
654
655
  		local doneCnt = math.floor((process + stopTime - time) / unitTime)
  		if doneCnt > 0 then
4aadc450   chenyueqi   切换拆解术式bug,造成获得巨大数...
656
  			reward = role:award({[itemId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
0a093ba8   chenyueqi   重写拆解室功能
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
  		end
  		if role:getItemCount(itemId) >= globalCsv.box_key_max[itemId] then
  			nowTime = 0
  		end
  
  		boxL[slot] = {id = itemId, process = (process + stopTime - time) % unitTime, time = nowTime}
  		role:pushMsg({type = "box", slot = slot, time = nowTime + globalCsv.box_productLine_time * 3600})
  	elseif oper == 3 then -- 开箱子
  		local costId = msg.costId
  		local costs = (msg.costs or ""):toNumMap()
  		if not costId or not csvdb["itemCsv"][costId] or not next(costs) then return 6 end
  		
  		local costIdData = csvdb["itemCsv"][costId]
  		local count = 0
  		for itemId, num in pairs(costs) do
  			local itemIdData = csvdb["itemCsv"][itemId]
  			if not itemIdData or not csvdb["item_randomCsv"][itemId] or costIdData.quality ~= itemIdData.quality then return 7 end
  			count = count + num
  		end
  
  		if role:getItemCount(costId) < count then return 8 end
c7991bb0   chenyueqi   道具开时钟箱,检查箱子够不够
678
  		if not role:checkItemEnough(costs) then return 9 end
0a093ba8   chenyueqi   重写拆解室功能
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
  
  		role:costItems({[costId] = count}, {log = {desc = "openTimeBox"}})
  
  		reward = {}
  		for itemId, value in pairs(costs) do
  			local tempReward = {}
  			local randomData = csvdb["item_randomCsv"][itemId]
  			local itemData = csvdb["itemCsv"][itemId]
  			role:costItems({[itemId] = value}, {log = {desc = "openTimeBox"}})
  			for _ = 1, value do
  				for i = 1, 10 do
  					local num = randomData["num" .. i] 
  					local gift = randomData["gift" .. i]
  					if num and gift and num > 0 and gift ~= "" then
  						local pool = {}
  						for _, temp in ipairs(gift:toArray()) do
  							local set = temp:toArray(true, "=")
  							table.insert(pool, set)
  						end
  
  						local needCount = math.min(#pool, num)
  						for j = 1, needCount do
  							local idx = math.randWeight(pool, 3)
  							tempReward[pool[idx][1]] = (tempReward[pool[idx][1]] or 0) + pool[idx][2]
  							table.remove(pool, idx)
  						end
  					end
007af97e   zhouhaihai   item_random 结构更改
706
  				end
9b35bf6e   zhouhaihai   开启时间箱
707
  			end
0a093ba8   chenyueqi   重写拆解室功能
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
  			tempReward[0] = nil
  			role:checkTaskEnter("OpenBox", {id = itemId, count=value, quality=itemData.quality})
  			role:log("carriage_dismantle", {
  				item_id = itemId, -- 道具id
  				item_type = itemData.type, -- 道具类型,具体见枚举表中道具类型枚举表
  				item_level = 0, -- 道具等级
  				item_number = 1, -- 道具变化数量的绝对值
  				carriage_dismantle_type = 1, -- 拆解方式,时间到期:0,钥匙开启:1
  				carriage_dismantle_time = 0, -- 拆解耗时,填写实际耗时
  				carriage_dismantle_cost = value, -- 拆解花费钥匙数量,未使用填写0
  				carriage_dismantle_rwd = tempReward, -- 拆解获得物资,json格式记录,{'itemid1':2,'itemid2':3,…………..}
  			})
  
  			for id, num in pairs(tempReward) do
  				reward[id] = (reward[id] or 0) + num
  			end
9b35bf6e   zhouhaihai   开启时间箱
724
  		end
4aadc450   chenyueqi   切换拆解术式bug,造成获得巨大数...
725
  		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = costId, int2 = oper}})
9b35bf6e   zhouhaihai   开启时间箱
726
727
728
729
  	else
  		return
  	end
  
0a093ba8   chenyueqi   重写拆解室功能
730
731
732
733
  	role:setProperty("boxL",boxL) --刷新
  	if slot then
  		role:changeUpdates({{type = "boxL", field = slot, value = boxL[slot], isOnlyToC = true}}) -- 通知客户端
  	end
7bb30dca   zhouhaihai   修改发奖
734
  	SendPacket(actionCodes.Role_openTimeBoxRpc, MsgPack.pack(role:packReward(reward, change)))
c8872722   zhouhaihai   返回
735
  	return true
9b35bf6e   zhouhaihai   开启时间箱
736
737
  end
  
d1c2290f   zhouhaihai   加速
738
739
740
  function _M.openSpeedUpBoxRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
8cd3770f   测试   挂机关卡可以选择,经验金币根据最高...
741
  	local itemInfo = msg.itemInfo
d1c2290f   zhouhaihai   加速
742
743
  
  	local reward = {}
8cd3770f   测试   挂机关卡可以选择,经验金币根据最高...
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
779
780
  	for i = 1, #itemInfo do
  		local pair = itemInfo[i]
  		local id = pair[1]
  		local count = pair[2]
  		local itemData = csvdb["itemCsv"][id]
  		if not itemData or itemData.type ~= ItemType.SpeedBox then return end
  
  		if math.illegalNum(count, 1, role:getItemCount(id)) then return 1 end
  		local useType, hour = table.unpack(itemData.use_effect:toArray(true, "="))
  		local time = hour * 60 * 60
  
  		if useType == 1 then -- 挂机齿轮
  			local hangInfo = role:getProperty("hangInfo")
  			if not hangInfo.expCarbonId then
  				return 2
  			end
  			local carbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
  			reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + math.floor(time / globalCsv.idle_money_produce_cd) * carbonData.money * count
  		elseif useType == 2 then -- 挂机经验
  			local hangInfo = role:getProperty("hangInfo")
  			if not hangInfo.expCarbonId then
  				return 3
  			end
  			local carbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
  			reward[ItemId.Exp] = (reward[ItemId.Exp] or 0) + math.floor(time / globalCsv.idle_money_produce_cd) * carbonData.exp * count
  		elseif useType == 3 then  -- 食材商人收入
  			local buildType = 6
  			local level = role.dinerData:getProperty("buildL"):getv(buildType, 1)
  			local buildingData = csvdb["diner_buildingCsv"][buildType][level]
  			if not buildingData then
  				return 4
  			end
  			local gfood = role.dinerData:getProperty("gfood")
  			if not next(gfood) then return 5 end
  			for k , v in pairs(gfood) do
  				local itemId = v.id
  				local speed = globalCsv.diner_get_food_speed[csvdb["itemCsv"][itemId].quality] * buildingData.speed / 100
664e0e07   chenyueqi   电波塔对食材的加成计算错误
781
  				speed = speed + role:getBnousDiner(1,speed)
460afa6e   测试   付费签到改为主动领取,战斗关卡不一...
782
  				reward[itemId] = (reward[itemId] or 0) + math.floor((time / speed) * count)
8cd3770f   测试   挂机关卡可以选择,经验金币根据最高...
783
784
785
  			end
  		else
  			return 6
d1c2290f   zhouhaihai   加速
786
  		end
8cd3770f   测试   挂机关卡可以选择,经验金币根据最高...
787
788
  
  		role:costItems({[id] = count}, {log = {desc = "speedUpBox"}})
d1c2290f   zhouhaihai   加速
789
790
  	end
  
75acc595   测试   修改gm添加满级英雄指令,开启特权...
791
792
793
794
795
796
797
798
799
800
801
  	local doubleCoef = role.activity:isOpen("DoubleDrop") and 2 or 1
  	-- 特权卡获取加速获得额外道具
  	local coef = role.storeData:getProduceItemSpeedCoef()
  	if coef > 1 or doubleCoef > 1 then
  		for k, cnt in pairs(reward) do
  			if k == ItemId.Gold or k == ItemId.Exp then
  				reward[k] = math.floor(cnt * coef * doubleCoef)
  			end
  		end
  	end
  
7bb30dca   zhouhaihai   修改发奖
802
  	local change
8cd3770f   测试   挂机关卡可以选择,经验金币根据最高...
803
  	reward, change = role:award(reward, {log = {desc = "speedUpBox"}})
d1c2290f   zhouhaihai   加速
804
  
7bb30dca   zhouhaihai   修改发奖
805
  	SendPacket(actionCodes.Role_openSpeedUpBoxRpc, MsgPack.pack(role:packReward(reward, change)))
d1c2290f   zhouhaihai   加速
806
807
808
  	return true
  end
  
00e663bd   zhouhaihai   剧情相关
809
810
811
812
813
  function _M.storyBookRewardRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local storyId = msg.id
  	local storyBookData = csvdb["story_bookCsv"][storyId]
6dc64b07   测试   剧情领奖bug
814
  	if not storyBookData then return 1 end
a1d09d22   zhouhaihai   bug
815
  	local storyStatus = role:getProperty("storyB")
053978b4   zhouhaihai   剧情领奖
816
  
17ba67dd   zhouhaihai   错误的判断
817
  	local status = (storyStatus[storyId] or {}).s
053978b4   zhouhaihai   剧情领奖
818
  
6dc64b07   测试   剧情领奖bug
819
  	if status == -1 then return 2 end
17ba67dd   zhouhaihai   错误的判断
820
821
  	
  	if not status or status ~= 1 then 
6dc64b07   测试   剧情领奖bug
822
823
  		--if storyBookData.unlockType == 1 and (role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) or storyId == 1 or storyId == 2) then  -- 挂机剧情正在挂机也可以领奖
  		if storyBookData.unlockType == 1 then  -- 挂机剧情正在挂机也可以领奖
053978b4   zhouhaihai   剧情领奖
824
  		else
6dc64b07   测试   剧情领奖bug
825
  			return 3
053978b4   zhouhaihai   剧情领奖
826
  		end
a1d09d22   zhouhaihai   bug
827
  	end
00e663bd   zhouhaihai   剧情相关
828
  	-- 获取奖励
5f18f4e5   zhouhaihai   story
829
  	storyStatus[storyId] = storyStatus[storyId] or {}
8a01a3ae   zhouhaihai   bug
830
  	storyStatus[storyId].s = -1
8a01a3ae   zhouhaihai   bug
831
  	role:changeUpdates({{ type = "storyB", field = storyId, value = storyStatus[storyId] }})
7bb30dca   zhouhaihai   修改发奖
832
  	local reward, change = role:award(storyBookData.gift, {log = {desc = "storybookReward", int1 = storyId}})
c59e058b   zhouhaihai   新一批日志记录
833
  
43293781   zhouhaihai   日志bug
834
  	role:log("carriage_video", {
c59e058b   zhouhaihai   新一批日志记录
835
836
  		carriage_video_type = storyBookData.type, --放映室类型,剧情CG:0, 角色CG:1, 主线剧情:2, 角色剧情:3, 活动剧情:4, 图鉴:5
  		carriage_video_id = storyId, --放映室片段ID
fcf03f75   zhouhaihai   两个记录bug
837
838
  		carriage_video_coinid = reward[ItemId.Diamond] and ItemId.Diamond or 0, --放映奖励货币类型,无奖励则填写0
  		carriage_video_coinnum = reward[ItemId.Diamond] or 0, --放映奖励货币数量,无奖励则填写0
887c1843   zhouhaihai   日志新一批
839
  		carriage_video_item = reward, --放映奖励其他物品数量,json格式记录,{'itemid1':10,'itemid2':5,…………..},无奖励则填写0
c59e058b   zhouhaihai   新一批日志记录
840
841
  	})
  
7bb30dca   zhouhaihai   修改发奖
842
  	SendPacket(actionCodes.Role_storyBookRewardRpc, MsgPack.pack(role:packReward(reward, change)))
00e663bd   zhouhaihai   剧情相关
843
844
845
  	return true
  end
  
8a01a3ae   zhouhaihai   bug
846
  function _M.unLockStoryBookRpc(agent, data)
bd15e9bc   zhouhaihai   购买剧情
847
848
849
850
851
852
853
854
855
856
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local storyId = msg.id
  	local storyBookData = csvdb["story_bookCsv"][storyId]
  	if not storyBookData or storyBookData.lockItem == "" then return end -- 不能解锁
  
  	local storyStatus = role:getProperty("storyB")
  	if storyStatus[storyId] and storyStatus[storyId].s then return end  --不需要解锁
  
be697585   测试   活动剧情解锁
857
858
859
860
861
862
  	if storyBookData.lockItem ~= "free" then
  		local cost = storyBookData.lockItem:toNumMap()
  		if not cost or not next(cost) then return end
  		if not role:checkItemEnough(cost) then return end  -- 消耗品不足
  		role:costItems(cost, {log = {desc = "unlockStory", int1 = storyId}})
  	end
bd15e9bc   zhouhaihai   购买剧情
863
864
865
866
867
868
869
870
  
  	-- 解锁
  	storyStatus[storyId] = storyStatus[storyId] or {}
  	table.clear(storyStatus[storyId])
  	storyStatus[storyId].s = 1
  	role:changeUpdates({{ type = "storyB", field = storyId, value = storyStatus[storyId] }})
  	SendPacket(actionCodes.Role_unLockStoryBookRpc, '')
  	return true
8a01a3ae   zhouhaihai   bug
871
872
  end
  
53e8037e   zhouhaihai   任务
873
874
875
  function _M.taskRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
d232676a   zhouhaihai   功能解锁 冒险返回
876
877
878
  
  	if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
  
317a46a9   测试   添加特权卡
879
  	local taskType = msg.type -- 1 日常 2 周常
53e8037e   zhouhaihai   任务
880
881
882
883
884
885
886
887
888
889
890
891
892
893
  	local taskId = msg.id --任务id
  	local roleField = {"dTask", "wTask"}
  	if not roleField[taskType] then return 1 end
  
  	local taskData = csvdb["task_loopCsv"][taskType][taskId]
  	if not taskData then return 2 end
  
  	local taskStatus = role:getProperty(roleField[taskType])
  	local tStatus = taskStatus["t"] or {}
  
  	if (tStatus[taskId] or 0) < taskData.condition1 then
  		return 3
  	end
  
7bb30dca   zhouhaihai   修改发奖
894
  	local reward, change = role:award(taskData.reward, {log = {desc = "finishTask", int1 = taskType, int2 = taskId}})
53e8037e   zhouhaihai   任务
895
896
  	local active = (taskStatus["a"] or 0) + taskData.active
  
ac885527   测试   联动签到活动
897
898
899
  	-- 日常活动完成
  	if taskType == 1 then
  		role:checkTaskEnter("DailyTask", {pre = (taskStatus["a"] or 0), cur = active})
dfa9ae5e   测试   战令任务活动
900
901
  	else
  		role:checkTaskEnter("WeekTask", {pre = (taskStatus["a"] or 0), cur = active})
ac885527   测试   联动签到活动
902
903
  	end
  
53e8037e   zhouhaihai   任务
904
905
  	role:changeUpdates({
  		{ type = roleField[taskType], field = {"t", taskId}, value = -1 },
317a46a9   测试   添加特权卡
906
  		{ type = roleField[taskType], field = "a", value = active},
53e8037e   zhouhaihai   任务
907
908
  	})
  
1a0b3c56   测试   抽卡保底,切换定向卡池
909
910
  	local oldVal = role:getProperty("battlePoint") or 0
  	role:updateProperty({field = "battlePoint", value = oldVal + taskData.active})
317a46a9   测试   添加特权卡
911
  
c59e058b   zhouhaihai   新一批日志记录
912
913
914
  	role:log("task_reward", {
  		task_reward_id = taskId, --任务奖励ID
  		task_reward_type = taskType, --任务奖励类型,见 任务奖励类型枚举表
887c1843   zhouhaihai   日志新一批
915
  		task_reward_detail = reward, --任务奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
c59e058b   zhouhaihai   新一批日志记录
916
917
  	})
  
7bb30dca   zhouhaihai   修改发奖
918
  	SendPacket(actionCodes.Role_taskRpc, MsgPack.pack(role:packReward(reward, change)))
53e8037e   zhouhaihai   任务
919
920
921
922
923
924
  	return true
  end
  
  function _M.taskActiveRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
d232676a   zhouhaihai   功能解锁 冒险返回
925
926
927
  
  	if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
  
53e8037e   zhouhaihai   任务
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
  	local taskType = msg.type -- 1 日常 2 周长
  	local taskId = msg.id --任务id
  	local roleField = {"dTask", "wTask"}
  	if not roleField[taskType] then return end
  
  	local taskData = csvdb["task_activeCsv"][taskType][taskId]
  	if not taskData then return end
  
  	local taskStatus = role:getProperty(roleField[taskType])
  	local tStatus = taskStatus["at"] or {}
  
  	if tStatus[taskId] == -1 or (taskStatus["a"] or 0) < taskData.active then
  		return
  	end
  
29fbbc10   zhouhaihai   夜间打工
943
944
945
946
947
948
949
950
951
  	local needReward = taskData.reward:toNumMap()
  	if taskData.reward_2 ~= 0 then
  		local day = weekday(skynet.timex())
  		local workMainCsv = csvdb["work_mainCsv"][day]
  		if workMainCsv then
  			needReward[workMainCsv.ticket] = taskData.reward_2
  		end
  	end
  	local reward, change = role:award(needReward, {log = {desc = "taskActive", int1 = taskType, int2 = taskId}})
53e8037e   zhouhaihai   任务
952
953
954
955
  	role:changeUpdates({
  		{ type = roleField[taskType], field = {"at", taskId}, value = -1 }
  	})
  	
9be3f3ea   zhouhaihai   日志需求
956
957
958
959
960
961
  	role:log("task_reward", {
  		task_reward_id = taskId * 100 + taskType, --任务奖励ID
  		task_reward_type = 3, --任务奖励类型,见 任务奖励类型枚举表
  		task_reward_detail = reward, --任务奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
  	})
  
7bb30dca   zhouhaihai   修改发奖
962
  	SendPacket(actionCodes.Role_taskActiveRpc, MsgPack.pack(role:packReward(reward, change)))
53e8037e   zhouhaihai   任务
963
964
965
966
967
968
969
970
  	return true
  end
  
  function _M.achiveRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local taskId = msg.id --任务id
  
d232676a   zhouhaihai   功能解锁 冒险返回
971
  	if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
53e8037e   zhouhaihai   任务
972
973
  	local achiveT = role:getProperty("achiveT")
  	local achiveV = role:getProperty("achiveV")
e6e49b45   测试   一键领取成就奖励
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
  	local fuxRecord = role:getProperty("fuxR") or 0
  
  	local groups = {}
  
  	if not taskId then
  		local awards = {}
  		for id, cfg in pairs(csvdb["achievementCsv"]) do
  			-- 没领过
  			if not achiveV[id] then
  				if (achiveT[cfg.type] or 0) >= cfg.condition1 then
  					local award = cfg.reward:toNumMap()
  					for k, v in pairs(award) do
  						awards[k] = (awards[k] or 0) + v
  					end
  					achiveV[id] = skynet.timex()
  					groups[cfg.group] = 1
  
  					role:log("achievement", {
  						achievement_id = cfg.id, -- 成就id
  						achievement_type = cfg.type, -- 成就类型,具体枚举表中成就类型枚举表
  						achievement_reward = award, -- 达成成就奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
  					})
  				end
  			end
  		end
  		if not next(awards) then
  			return 5
  		end
  		local reward, change = role:award(awards, {log = {desc = "finishAchive", int1 = 0}})
  		role:updateProperty({field = "achiveV", value = achiveV})
53e8037e   zhouhaihai   任务
1004
  
e6e49b45   测试   一键领取成就奖励
1005
1006
1007
1008
  		SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack(role:packReward(reward, change)))
  	else
  		local achiveTask = csvdb["achievementCsv"][taskId]
  		if not achiveTask then return 1 end
53e8037e   zhouhaihai   任务
1009
  
e6e49b45   测试   一键领取成就奖励
1010
  		if achiveV[taskId] then return 2 end
53e8037e   zhouhaihai   任务
1011
  
e6e49b45   测试   一键领取成就奖励
1012
1013
  		local curStatus = achiveT[achiveTask.type] or 0
  		local maxc = achiveTask.condition1
53e8037e   zhouhaihai   任务
1014
  
e6e49b45   测试   一键领取成就奖励
1015
1016
1017
  		if maxc > curStatus then
  			return 3
  		end
3df73a9e   zhouhaihai   复兴奖励
1018
  
e6e49b45   测试   一键领取成就奖励
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
  		local reward, change = role:award(achiveTask.reward, {log = {desc = "finishAchive", int1 = taskId}})
  		role:changeUpdates({
  			{ type = "achiveV", field = taskId, value = skynet.timex() }
  		})
  		groups[achiveTask.group] = 1
  
  		role:log("achievement", {
  			achievement_id = taskId, -- 成就id
  			achievement_type = achiveTask.type, -- 成就类型,具体枚举表中成就类型枚举表
  			achievement_reward = reward, -- 达成成就奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
  		})
  
  		SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack(role:packReward(reward, change)))
  	end
  	
  	for group, _ in pairs(groups) do
  		-- 复兴奖励
  		if csvdb["achievement_groupCsv"][group].bookmark == 3 then
  			local overCount = 0
  			local preMaxCount = fuxRecord or 0
  			for tId, status in pairs(achiveV) do
  				local tData = csvdb["achievementCsv"][tId]
  				if tData then
  					local groupData = csvdb["achievement_groupCsv"][tData.group]
  					if groupData.bookmark == 3 then
  						overCount = overCount + 1
  					end
3df73a9e   zhouhaihai   复兴奖励
1046
1047
  				end
  			end
e6e49b45   测试   一键领取成就奖励
1048
1049
1050
1051
1052
1053
  			local flag = false
  			for level, pData in pairs(csvdb["achievement_rewardCsv"]) do
  				if preMaxCount < pData.request and overCount >= pData.request then
  					role:sendMail(101, skynet.timex(), pData.reward, {pData.level})
  					flag = true
  				end
3df73a9e   zhouhaihai   复兴奖励
1054
  			end
e6e49b45   测试   一键领取成就奖励
1055
1056
1057
1058
  			if flag then
  				role:updateProperty({field = "fuxR", value = overCount, notNotify = true})
  			end
  			break
3df73a9e   zhouhaihai   复兴奖励
1059
1060
  		end
  	end
c59e058b   zhouhaihai   新一批日志记录
1061
  
53e8037e   zhouhaihai   任务
1062
1063
1064
  	return true
  end
  
3df73a9e   zhouhaihai   复兴奖励
1065
1066
  
  
c384626d   zhouhaihai   好友
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
  function _M.chatRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  
  	local cmd = msg.cmd
  	local content = msg.content
  
  	if not content then return end
  
  	local now = skynet.timex()
  	-- 判断禁言
  	local result = nil
  
a5486ede   zhouhaihai   csvdata 修改为 share...
1081
  	local SERV = string_format(".chated%d", math.random(1, 5))
c384626d   zhouhaihai   好友
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
  	local legal, mod = skynet.call(SERV, "lua", "check", content)
  	if not legal then
  		content = mod or ""
  	end
  
  	if content == "" then
  		result = -1
  	end
  
  	local response = {
  		chatType = cmd,
  		player = {
  			roleId = role:getProperty("id"),
  			name = role:getProperty("name"),
  			level = role:getProperty("level"),
  			headId = role:getProperty("headId"),
  		},
  		content = content,
  		time = now,
  	}
  
8474ca36   zhouhaihai   聊天
1103
1104
1105
1106
1107
  
  	local waitTime = nil
   	local check = {
  		-- 世界聊天
  		[1] = function ()
c384626d   zhouhaihai   好友
1108
1109
1110
1111
  			if role:getProperty("silent") > now then  --禁言
  				result = 1
  				return
  			end
f30a310d   测试   世界聊天等级15判断
1112
1113
1114
1115
  			if role:getProperty("level") < (globalCsv.chat_level or 15) then
  				result = 3
  				return
  			end
8474ca36   zhouhaihai   聊天
1116
1117
1118
1119
1120
  
  			role._worldChatLimit = role._worldChatLimit or {start = 0, count = 0, canSayt = 0}  --第一次开始说话时间  从第一次说话次数  能说话的时间
  
  			if now < role._worldChatLimit.canSayt then
  				result = 2
fa565e0c   zhouhaihai   优化结构
1121
  				waitTime = role._worldChatLimit.canSayt - now
8474ca36   zhouhaihai   聊天
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
  				return
  			end
  
  			if now - role._worldChatLimit.start >= globalCsv.chat_world_limit.time then
  				role._worldChatLimit.start = now
  				role._worldChatLimit.count = 1
  			else
  				role._worldChatLimit.count = role._worldChatLimit.count + 1
  				if role._worldChatLimit.count > globalCsv.chat_world_limit.count then
  					role._worldChatLimit.count = 0
  					role._worldChatLimit.start = 0
  					role._worldChatLimit.canSayt = now + globalCsv.chat_world_limit.wait
  					result = 2
  					waitTime = globalCsv.chat_world_limit.wait
  					return
  				end
  			end
c384626d   zhouhaihai   好友
1139
  			mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
cd789e7c   zhouhaihai   不要聊天记录缓存
1140
  			-- pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
25d8cbc6   zhouhaihai   记录聊天信息
1141
  			role:mylog("role_action", {desc = "chatWorld", text1 = content})
c384626d   zhouhaihai   好友
1142
  		end,
8474ca36   zhouhaihai   聊天
1143
1144
1145
  		-- 私聊
  		[2] = function ()
  			local objectId = msg.roleId
fa565e0c   zhouhaihai   优化结构
1146
  			response.objId = objectId
4cf74232   zhouhaihai   pvp
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
  			local redret = redisproxy:pipelining(function(red)
  				red:exists(string.format("role:%d", objectId))
  				red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
  				red:sismember(FRIEND_BLACK_KEY:format(objectId), roleId)
  			end)
  			if redret[1] ~= 1 then
  				result = 1	
  				return
  			end
  			-- 你把对方拉黑拉黑
  			if redret[2] == 1 then
  				result = 2
8474ca36   zhouhaihai   聊天
1159
1160
  				return
  			end
4cf74232   zhouhaihai   pvp
1161
1162
  			-- 对方把你拉黑
  			local isBlock = redret[3] == 1
8474ca36   zhouhaihai   聊天
1163
  
8474ca36   zhouhaihai   聊天
1164
  			local bin = MsgPack.pack(response)
4cf74232   zhouhaihai   pvp
1165
  			if not isBlock then
440aa055   zhouhaihai   聊天
1166
1167
  				redisproxy:pipelining(function(red)
  					red:rpush(CHAT_OFFLINE:format(objectId), bin)
4cf74232   zhouhaihai   pvp
1168
  					red:ltrim(CHAT_OFFLINE:format(objectId), -200, -1)
440aa055   zhouhaihai   聊天
1169
  				end)
4cf74232   zhouhaihai   pvp
1170
1171
1172
1173
1174
  				-- 若在线,实时发送聊天信息
  				local agent = datacenter.get("agent", objectId)
  				if agent then
  					SendPacket(actionCodes.Role_chat, bin, agent.fd)
  				end
440aa055   zhouhaihai   聊天
1175
  			end
4cf74232   zhouhaihai   pvp
1176
  			SendPacket(actionCodes.Role_chat, bin)
c384626d   zhouhaihai   好友
1177
1178
1179
1180
1181
1182
1183
  		end,
  	}
  	if not check[cmd] then return end
  	
  	if not result then
  		check[cmd]()
  	end
c59e058b   zhouhaihai   新一批日志记录
1184
1185
1186
1187
  
  	role:log("communication", {
  		publish_type = cmd, --发言类型,1,世界  2私聊 
  		publish_status = 0, --发送状态,发送成功:0,发送失败:1,被屏蔽:2,其他:3
7d31daa8   zhouhaihai   调整压测
1188
  		publish_receive_roleid = msg.roleId or 0, --接收者角色ID
c59e058b   zhouhaihai   新一批日志记录
1189
1190
  		publish_text = content, --发言内容
  	})
8474ca36   zhouhaihai   聊天
1191
  	SendPacket(actionCodes.Role_chatRpc, MsgPack.pack({result = result, waitTime = waitTime}))
c384626d   zhouhaihai   好友
1192
1193
1194
  	return true
  end
  
4cf74232   zhouhaihai   pvp
1195
1196
1197
1198
1199
1200
  function _M.chatGet(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	redisproxy:del(CHAT_OFFLINE:format(roleId))
  	return true
  end
312b9db5   zhouahaihai   背包
1201
  
dc9d814f   zhouhaihai   邮件
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
  
  function _M.changeSettingRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local id = msg.id
  	local status = msg.status
  
  	local statusEnum = SettingStatus[id]
  	if not statusEnum then return 1 end
  
  	if not statusEnum[status] then return 2 end
  
  	local setting = role:getProperty("setting")
  	setting[id] = status
  	role:updateProperty({field = "setting", value = setting})
d02f7904   zhouhaihai   遗失的log
1218
  	role:mylog("role_action", {desc = "changeSetting", int1 = id, int2 = status})
dc9d814f   zhouhaihai   邮件
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
  	SendPacket(actionCodes.Role_changeSettingRpc,  '')
  	return true
  end
  
  function _M.drawCodeRpc(agent, data)
  	local msg = MsgPack.unpack(data)
  	local codeurl = skynet.getenv("codeurl")
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local code = msg.code
  
  	if type(code) ~= "string" then return end
  	if code:find("[^0-9a-zA-Z]") then return end
  
  	local codestr = role:getProperty("codeStr")
  	local content = {
  		["platformId"] = role:getProperty("sid"),
  		["code"] = code,
  		["itemIds"] = codestr,
  		["key"] = "zhaolugame20170831",
  	}
  	local status, body = httpc.get(codeurl, "/libaoma?" .. httpGetFormatData(content), {})
  	if status == 200 then
  		local result = json.decode(body)
  		local ret = tonum(result.ret)
  		if ret == 0 then
  			local giftId = tonumber(result.giftId)
  			role:setProperty("codeStr", codestr:setv(giftId, 1))
c59e058b   zhouhaihai   新一批日志记录
1247
  			local reward, change = role:award(result.gift, {log = {desc = "drawCode", int1 = giftId}})
dc9d814f   zhouhaihai   邮件
1248
  			
c59e058b   zhouhaihai   新一批日志记录
1249
1250
1251
  			role:log("get_gift", {
  				gift_id = giftId, -- 礼包ID
  				gift_key = code, -- 礼包key
887c1843   zhouhaihai   日志新一批
1252
  				gift_reward = reward, -- 礼包奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
c59e058b   zhouhaihai   新一批日志记录
1253
1254
1255
  				gift_name = "", -- 礼包名称
  				gift_reason = 0, -- 礼包发放原因,见发放原因枚举表
  			})
d02f7904   zhouhaihai   遗失的log
1256
  			role:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code})
dc9d814f   zhouhaihai   邮件
1257
1258
1259
  			SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
  				result = ret,
  				reward = reward,
7bb30dca   zhouhaihai   修改发奖
1260
  				change = change,
dc9d814f   zhouhaihai   邮件
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
  			}))
  			return true
  		end
          -- 1 不存在的礼包码
          -- 2 已经领取过相同类型物品
          -- 3 领取数量达到上限
          -- 4 过期了
  		SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({result = ret}))
  		return true
  	end
  	SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({result = -1}))
  	return true
  end
  
  function _M.changeHeadRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local id = msg.id
  	local icon = csvdb["player_iconCsv"][id]
  	if not icon then
  		return
  	end
15f06456   zhouhaihai   头像
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
  
  	local unlock = false
  	if role:getItemCount(id) >= 1 then
  		unlock = true
  	else
  		if icon.path == 1 then -- 获得对应英雄
  			if role:isHaveHero(icon.condition) then
  				unlock = true
  			end
  		end
  	end
  	if not unlock then 
dc9d814f   zhouhaihai   邮件
1296
1297
  		return
  	end
bd4fb541   zhouhaihai   增加物品过期系统
1298
  	role:changeHead(id)
44c6e479   zhouhaihai   增加部分日志
1299
  
dc9d814f   zhouhaihai   邮件
1300
1301
1302
1303
  	SendPacket(actionCodes.Role_changeHeadRpc, "")
  	return true
  end
  
71f716c4   chenyueqi   引导用到的字段
1304
1305
1306
1307
1308
1309
1310
  function _M.guideRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local cmdType = msg.cmdType
  
  	local funcGuide = role:getProperty("funcGuide")
aeb5da9a   chenyueqi   强制引导的步数记录
1311
  	if cmdType == 1 then
71f716c4   chenyueqi   引导用到的字段
1312
  		-- 新手引导
aeb5da9a   chenyueqi   强制引导的步数记录
1313
1314
1315
  		local master = msg.master or -1
  		local slave = msg.slave or -1
  		if master < 0 or slave < 0 then return end
a608cccb   chenyueqi   引导服务端记录
1316
1317
  
  		role:saveGuide(master, slave)
71f716c4   chenyueqi   引导用到的字段
1318
  	elseif cmdType == 2 then
a608cccb   chenyueqi   引导服务端记录
1319
  		-- 系统引导(玩家可选择是否进行)
71f716c4   chenyueqi   引导用到的字段
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
  		if not msg.skip then return end
  		local new = math.min(funcGuide:getv(0, 0), msg.skip)
  		if new < 0 then
  			funcGuide = funcGuide:setv(0, new)
  		else
  			funcGuide = funcGuide:setv(0, funcGuide:getv(0, 0) + msg.skip)
  		end
  		
  		if msg.funcType then
  			funcGuide = funcGuide:setv(msg.funcType, 1)
39bcd7ca   zhouhaihai   LOG
1330
  			role:log("onGuidePoint", {guild_type = 2, guild_id = msg.funcType, guild_point = 0, guild_pass = 0})
d02f7904   zhouhaihai   遗失的log
1331
  			role:mylog("guide", {desc = "guide_weak", int1 = msg.funcType})
71f716c4   chenyueqi   引导用到的字段
1332
1333
  		end
  		role:updateProperty({field = "funcGuide", value = funcGuide})
e26989ce   chenyueqi   增加其他的引导记录
1334
  	elseif cmdType == 3 then
a608cccb   chenyueqi   引导服务端记录
1335
1336
1337
1338
1339
  		-- 系统引导(强制进行)
  		if msg.funcType and csvdb["guide_unlockCsv"][msg.funcType] then
  			role:saveGuide(csvdb["guide_unlockCsv"][msg.funcType].guideId,1)
  			funcGuide = funcGuide:setv(msg.funcType, 1)
  			role:updateProperty({field = "funcGuide", value = funcGuide})
39bcd7ca   zhouhaihai   LOG
1340
  			role:log("onGuidePoint", {guild_type = 1, guild_id = msg.funcType, guild_point = 0, guild_pass = 0})
d02f7904   zhouhaihai   遗失的log
1341
  			role:mylog("guide", {desc = "guide_sys", int1 = msg.funcType})
a608cccb   chenyueqi   引导服务端记录
1342
1343
1344
  		end
  	elseif cmdType == 4 then
  		-- 弹出一个tips(进入功能界面也许要自动弹说明,value要区分1、2)
e26989ce   chenyueqi   增加其他的引导记录
1345
1346
1347
  		if msg.funcType then
  			local value = msg.value or 1
  			for _, funcIdx in pairs(msg.funcType:toArray(true,"=")) do
39bcd7ca   zhouhaihai   LOG
1348
  				role:log("onGuidePoint", {guild_type = 3, guild_id = funcIdx, guild_point = 0, guild_pass = 0})
d02f7904   zhouhaihai   遗失的log
1349
  				role:mylog("guide", {desc = "guide_tips", int1 = funcIdx})
e26989ce   chenyueqi   增加其他的引导记录
1350
1351
1352
1353
  				funcGuide = funcGuide:setv(funcIdx, value)
  			end
  			role:updateProperty({field = "funcGuide", value = funcGuide})
  		end
71f716c4   chenyueqi   引导用到的字段
1354
1355
1356
1357
1358
1359
1360
  	else
  		return
  	end
  
  	SendPacket(actionCodes.Role_guideRpc, "")
  	return true
  end
dc9d814f   zhouhaihai   邮件
1361
  
d51114bd   wangyujie   完成需求:每日金币购买
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
  function _M.goldBuyRpc(agent, data)
  	local role = agent.role
  	local curT = role.dailyData:getProperty("goldBuyT")
  	local costD = globalCsv.idle_quickMoney_cost[curT]
  	if not costD then
  		return 1
  	end
  	if costD ~= 0 and not role:checkItemEnough({[ItemId.Diamond] = costD}) then
  		return 2
  	end
  	local goldC = 0
  	local hangPass = role:getProperty("hangPass")
  	for i = 1, 3 do
  		if hangPass[i] then
  			local carbonData = csvdb["idle_battleCsv"][hangPass[i]]
  			goldC = math.max(goldC, carbonData.money * globalCsv.idle_quickMoney_effect)
  		end
  	end
c873abb5   wangyujie   完善金币购买
1380
1381
1382
1383
1384
  	local carbonId = role:getProperty("hangInfo").carbonId
  	if carbonId then
  		local carbonData = csvdb["idle_battleCsv"][carbonId]
  		goldC = math.max(goldC, carbonData.money * globalCsv.idle_quickMoney_effect)
  	end
d51114bd   wangyujie   完成需求:每日金币购买
1385
1386
1387
  	if goldC == 0 then
  		return 3
  	end
317a46a9   测试   添加特权卡
1388
1389
  	local coef = role.storeData:getGearExchangeCoef()
  	goldC = goldC * coef
d51114bd   wangyujie   完成需求:每日金币购买
1390
1391
  	role.dailyData:updateProperty({field = "goldBuyT", value = curT + 1})
  	role:costItems({[ItemId.Diamond] = costD}, {log = {desc = "goldBuy"}})
7f9f002d   测试   循环周活动
1392
  	local reward, change = role:award({[ItemId.Gold] = math.floor(goldC)}, {log = {desc = "goldBuy"}})
7bb30dca   zhouhaihai   修改发奖
1393
  	SendPacket(actionCodes.Role_goldBuyRpc, MsgPack.pack(role:packReward(reward, change)))
d51114bd   wangyujie   完成需求:每日金币购买
1394
1395
1396
  	return true
  end
  
9ea0c502   测试   限时礼包
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
  function _M.getDownloadCvRewardRpc(agent, data)
  	local role = agent.role
  	local flag = role:getProperty("downCvR") or 0
  	if flag ~= 0 then
  		return 1
  	end
  	local r = globalCsv.role_download_cv_reward
  	local reward, change = role:award(r, {log = {desc = "downloadCv"}})
  	role:updateProperty({field="downCvR", value=1})
  	SendPacket(actionCodes.Role_getDownloadCvRewardRpc, MsgPack.pack(role:packReward(reward, change)))
  	return true
  end
  
51d9d20b   测试   付费签到,应用市场反馈
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
  function _M.updateFeedbackInfoRpc(agent, data)
  	local role = agent.role
  	local info = role:getProperty("feedback") or {}
  	local msg = MsgPack.unpack(data)
  	info["flag"] = msg.flag
  	info["count"] = msg.count
  	info["ts"] = skynet.timex()
  	role:updateProperty({field="feedback", value=info})
  	SendPacket(actionCodes.Role_updateFeedbackInfoRpc, MsgPack.pack({}))
  	return true
  end
  
a6dc627f   测试   自选箱子协议
1422
1423
1424
1425
  function _M.useSelectItemRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local itemId = msg.itemId
e52c384f   测试   探索指令bug, 充值返利活动
1426
  	local subId = msg.subId
a6dc627f   测试   自选箱子协议
1427
1428
1429
  	local count = msg.count
  	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
  	local itemData = csvdb["itemCsv"][itemId]
804a7eaf   测试   万能贴纸
1430
  	if not (itemData.type == ItemType.SelectItemBox or itemData.type == ItemType.CommonPaster) then return end
a6dc627f   测试   自选箱子协议
1431
  	local itemMap = itemData.use_effect:toNumMap()
a6dc627f   测试   自选箱子协议
1432
1433
  	local reward, change = {}
  	for k, v in pairs(itemMap) do
e52c384f   测试   探索指令bug, 充值返利活动
1434
  		if k == subId then
a6dc627f   测试   自选箱子协议
1435
1436
1437
  			reward[k] = v * count
  			break
  		end
a6dc627f   测试   自选箱子协议
1438
1439
1440
1441
1442
1443
1444
  	end
  
  	if next(reward) then
  		reward, change = role:award(reward, {log = {desc = "openItem", int1 = itemId, int2 = count}})
  		role:costItems({[itemId] = count}, {log = {desc = "openItem"}})
  	end
  	SendPacket(actionCodes.Role_useSelectItemRpc, MsgPack.pack(role:packReward(reward, change)))
e52c384f   测试   探索指令bug, 充值返利活动
1445
  	return true
a6dc627f   测试   自选箱子协议
1446
1447
  end
  
98d32f92   测试   多编队
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
  function _M.renameTeamRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local title = msg.title
  	local index = msg.index
  	local ispve = msg.ispve
  	if ispve then
  		local teams = role:getProperty("hangTeams")
  		local team = role:getTeamFormat(index)
  		team.title = title
  		teams[index] = team
  		role:updateProperty({field = "hangTeams", value = teams, notNotify = false})
  	else
  		local teams = role:getProperty("advTeams")
  		local team = role:getAdvTeamFormat(index)
  		team.title = title
  		teams[index] = team
  		role:updateProperty({field = "advTeams", value = teams, notNotify = false})
  	end
  
  	SendPacket(actionCodes.Role_renameTeamRpc, "")
  	return true
  end
  
847f9a7b   测试   兑换活动,邮件内容修改
1472
1473
1474
1475
1476
1477
1478
1479
  function _M.accuseRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local targetId = msg.targetId
  	local atype = msg.type
  	local note = msg.note
  
  	role:mylog("role_action", {desc = "accuse", int1 = targetId, short1 = atype, text1 = note})
782c178b   测试   举报功能
1480
  	SendPacket(actionCodes.Role_accuseRpc, "")
847f9a7b   测试   兑换活动,邮件内容修改
1481
1482
1483
  	return true
  end
  
314bc5df   zhengshouren   提交服务器初始代码
1484
  return _M