Blame view

src/actions/RoleAction.lua 56.8 KB
314bc5df   zhengshouren   提交服务器初始代码
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
  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")
  
2ca93972   liuzujun   添加邮件表
17
18
  require "utils.MysqlUtil"
  
314bc5df   zhengshouren   提交服务器初始代码
19
  local WAVE_HERO_NUMS = 150
a0013f0b   zhouhaihai   零件分批推送
20
  local WAVE_RUNE_NUMS = 150
3d8468b2   liuzujun   火花系统
21
  local WAVE_SPARK_NUMS = 150
314bc5df   zhengshouren   提交服务器初始代码
22
23
24
25
26
27
  
  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...
28
  	local SERV = string_format(".named%d", math.random(1, 5))
314bc5df   zhengshouren   提交服务器初始代码
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
58
59
  	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
60
61
62
63
64
  	if msg.codeVersion ~= globalCsv.codeVersion then
  		response.result = "UPDATE_TIP"
  		SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  		return true
  	end
314bc5df   zhengshouren   提交服务器初始代码
65
66
67
68
69
70
71
72
73
74
75
76
77
78
  
  	-- 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
79
  		if tonumber(redisproxy:hget(string_format("role:%d", roleId), "ignoreMt")) ~= 1 then
314bc5df   zhengshouren   提交服务器初始代码
80
81
82
83
84
85
  			response.result = "MAINTAIN_TIP"
  			SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  			return true
  		end
  	end
  
e1b1f689   zhangqijia   fix: 记录用户跟设备信息, o...
86
87
88
  	-- 设备记录
  	redisproxy:sadd(string_format("device:%d", roleId), msg.device)
  
314bc5df   zhengshouren   提交服务器初始代码
89
90
91
92
  	local now = skynet.timex()
  	local role = agent.role
  	-- 2
  	if not role then
0de80321   liuzujun   创建游戏数据库,role对应mys...
93
  		local roleKey = string_format("%d", roleId)
6136eaca   liuzujun   添加好友表
94
  		if not roleExists(roleId) then
314bc5df   zhengshouren   提交服务器初始代码
95
96
97
98
99
100
101
102
  			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   增加部分日志
103
  		role:startActionUcode()
314bc5df   zhengshouren   提交服务器初始代码
104
105
106
  	else
  		role:reloadWhenLogin()
  	end
43cc5f51   gaofengduan   调整 equip 数据结构
107
  
39bcd7ca   zhouhaihai   LOG
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
  
  	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   推送
130
131
132
  	if msg.token then
  		role._pushToken = msg.token
  	end
39bcd7ca   zhouhaihai   LOG
133
  
0a07bdd9   zhouahaihai   角色升级 。gm
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
  	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
149
  
aa74d6ef   zhouhaihai   掉落反馈
150
151
  	if msg.deviceMode then
  		local deviceMode = tostring(msg.deviceMode)
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
152
153
  		if role:getProperty("dmode") ~= deviceMode then
  			role:setProperty("dmode", deviceMode)
aa74d6ef   zhouhaihai   掉落反馈
154
155
156
157
  		end
  	end
  	if msg.device then
  		local device = tostring(msg.device)
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
158
159
  		if role:getProperty("device") ~= device then
  			role:setProperty("device", device)
aa74d6ef   zhouhaihai   掉落反馈
160
161
162
  		end
  	end
  	
2ca93972   liuzujun   添加邮件表
163
  	SERV_OPEN = getDbCfgVal("server_info", "server_start", "str_value")
314bc5df   zhengshouren   提交服务器初始代码
164
  
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
165
  	role:changeStructVersion() -- 数据结构 版本更新
70cc72d7   zhouhaihai   拾荒bug
166
  	role:getAdvData(true) -- 清掉不合格的数据
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
167
  	role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
65b551a7   chenyueqi   海港贸易季初版
168
  	role:checkSeaportTrade() -- 检查海港贸易季活动
29fbbc10   zhouhaihai   夜间打工
169
170
171
  	if not next(role:getProperty("workBattle")) then
  		role:setProperty("workBattle", {round = math.floor((now - START_RESET_TIME) / 604800)})
  	end
314bc5df   zhengshouren   提交服务器初始代码
172
  
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
173
  	-- 跨天登陆事件
ea40710f   zhouhaihai   活动
174
  	local resetMode = role:updateTimeReset(now)
be4e8031   zhouhaihai   活动 拾荒
175
176
  	if not resetMode or not resetMode["CrossDay"] then -- 没有跨天
  		role.activity:checkActivityStatus(now, false, false)
2f7891b4   zhouhaihai   运营需要
177
  		role:log("onLogin")
ea40710f   zhouhaihai   活动
178
  	end
dfa9ae5e   liuzujun   战令任务活动
179
  	role:checkTaskEnter("Login", {})
ea40710f   zhouhaihai   活动
180
  
c384626d   zhouhaihai   好友
181
  	redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
be9c9ca6   zhouahaihai   角色评论
182
  
3e20f499   saicom   完善商城相关协议
183
  	for _, name in ipairs({"dailyData", "dinerData", "activity", "storeData"}) do
be9c9ca6   zhouahaihai   角色评论
184
  		response[name] = role[name]:data()
7f9f002d   liuzujun   循环周活动
185
186
  		--print("["..name.."]")
  		--dump(response[name])
be9c9ca6   zhouahaihai   角色评论
187
188
  	end
  
314bc5df   zhengshouren   提交服务器初始代码
189
190
191
  	response.role = role:data()
  	response.result = "SUCCESS"
  	response.serverTime = now
53b4b8bd   liuzujun   自动挂机下一关
192
  	--response.openTime = getServerOpenTs()
314bc5df   zhengshouren   提交服务器初始代码
193
  
0a07bdd9   zhouahaihai   角色升级 。gm
194
195
196
197
198
199
200
  	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   好感度, 皮肤
201
  	if #heroIds <= 50 then
0a07bdd9   zhouahaihai   角色升级 。gm
202
203
204
205
  		heroWave = 0
  		table_insert(modules, "heros")
  	end
  
a0013f0b   zhouhaihai   零件分批推送
206
207
208
209
210
211
212
213
214
215
  	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   liuzujun   火花系统
216
217
218
219
220
221
222
223
224
225
  	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
226
227
228
229
230
231
232
  	for _, name in ipairs(modules) do
  		response[name] = {}
  		for id, unit in pairs(role[name]) do
  			response[name][id] = unit:data()
  		end
  	end
  
3d8468b2   liuzujun   火花系统
233
  	response.wave = 1 + heroWave + runeWave + sparkWave + 1
314bc5df   zhengshouren   提交服务器初始代码
234
235
236
  
  	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  
a0013f0b   zhouhaihai   零件分批推送
237
238
  	local curWave = 1 
  
3d8468b2   liuzujun   火花系统
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
  	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   零件分批推送
256
257
258
259
260
261
262
263
264
265
266
267
268
269
  	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 数据结构
270
  	end
a0013f0b   zhouhaihai   零件分批推送
271
  	curWave = curWave + runeWave
43cc5f51   gaofengduan   调整 equip 数据结构
272
  
0a07bdd9   zhouahaihai   角色升级 。gm
273
  	local heroIndex = 1
a0013f0b   zhouhaihai   零件分批推送
274
  	for index = curWave + 1, curWave + heroWave do
0a07bdd9   zhouahaihai   角色升级 。gm
275
276
277
278
279
280
281
282
283
284
285
286
287
  		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   零件分批推送
288
  	curWave = curWave + heroWave
314bc5df   zhengshouren   提交服务器初始代码
289
  
fa565e0c   zhouhaihai   优化结构
290
  	
43cc5f51   gaofengduan   调整 equip 数据结构
291
  
314bc5df   zhengshouren   提交服务器初始代码
292
  	-- 注册全服广播
fa565e0c   zhouhaihai   优化结构
293
  	if not role._channelIdx then
06c7246e   liuzujun   按500人分线
294
295
296
          local online = datacenter.get("onlineCount") or 0
          local channel = math.floor(online / 500) + 1
  		--local channel = math.randomInt(1, 1)
fa565e0c   zhouhaihai   优化结构
297
298
299
300
301
302
303
  		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   提交服务器初始代码
304
  	end
c384626d   zhouhaihai   好友
305
306
307
  
  	-- 发下缓存的世界消息
  	local worldChatResponse = {worldChats = {}}
cd789e7c   zhouhaihai   不要聊天记录缓存
308
309
  	-- local ok, msgs = pcall(skynet.call, '.globald', "lua", "getWorldMsg", role._channelIdx)
  	local ok, msgs = true, {}
c384626d   zhouhaihai   好友
310
311
312
313
  	if not ok then 
  		msgs = {} 
  	end
  	worldChatResponse.worldChats = msgs
4cf74232   zhouhaihai   pvp
314
315
316
317
318
  	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   好友
319
320
321
322
323
  	worldChatResponse.chatWave = curWave + 1
  	curWave = curWave + 1
  
  	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(worldChatResponse))
  
fa565e0c   zhouhaihai   优化结构
324
325
326
327
328
329
330
331
  	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
332
333
334
  
  
  	-- 玩家登陆做的一些操作
f7f26c15   zhouhaihai   编队整理 增加 tactics战术
335
  	role:updateHangTeamInfo()
4cf74232   zhouhaihai   pvp
336
  	role:savePvpCTeam()
33be3111   zhouhaihai   修改hangPass 结构
337
  	role:savePvpHTeam()
fa565e0c   zhouhaihai   优化结构
338
  
33be3111   zhouhaihai   修改hangPass 结构
339
  	local hangPass = role:getProperty("hangPass")
d02f7904   zhouhaihai   遗失的log
340
  	role:mylog("login", {key1 = agent.ip:toArray(false, ":")[1], int1 = hangPass[1] or 0})
3aac1e3a   zhouhaihai   新设备
341
342
343
  	if msg.newdevice then
  		role:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
  	end
320f5b54   zhouhaihai   cb 返利
344
  
314bc5df   zhengshouren   提交服务器初始代码
345
346
347
  	return true
  end
  
dac9fbcc   liuzujun   cb1活跃回馈
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
  local function onCb1Back(newRole)
  	-- cb1活跃返利
      skynet.timeout(0, function()
  		local cbbackd = cluster.query("center", "cb1backd")
  		local uid = newRole:getProperty("uid")
  		local roleId = newRole:getProperty("id")
  		local start = uid:find("_")
  		if start then
  			uid = uid:sub(start + 1)
  		end
  		if cbbackd then
  			local status, back = pcall(cluster.call, "center", cbbackd, "getCb1Reward", {uid = uid, id = roleId})
  			if status then
  				if back then
                      if back == 0 then
  						mysqlproxy:insertEmail({roleId = roleId, emailId = MailId.CB1BackAward1, createtime = skynet.timex()})
                      elseif back == 1 then
  						mysqlproxy:insertEmail({roleId = roleId, emailId = MailId.CB1BackAward2, createtime = skynet.timex()})
                      end
  					newRole:mylog("cb1back", {key1 = uid, int2 = roleId, int1=back})
  				end
  			else
  				skynet.error("[ERROR] cb1backd cant call center uid: " .. uid .. " roleId:" .. roleId)
  			end
  		else
  			skynet.error("[ERROR] cb1backd cant call center uid: " .. uid .. " roleId:" .. roleId)
  		end
      end)
  end
  
314bc5df   zhengshouren   提交服务器初始代码
378
379
380
381
382
383
  function _M.createRpc(agent, data)
  	local msg = MsgPack.unpack(data)
  	local response = {}
  
  	-- 再次检查uid
  	local uid = tostring(msg.uid)
01be2d78   liuzujun   修改mysql链接断开重连的bug
384
385
  	--local user = redisproxy:get(string_format("uid:%s", uid))
  	local res, user = roleUidExists(uid)
314bc5df   zhengshouren   提交服务器初始代码
386
387
388
389
390
391
  	if user then
  		response.result = "SUCCESS"
  		response.roleName = user
  		SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
  		return true
  	end
f58b315e   zhouhaihai   停止注册
392
393
394
395
396
397
398
  	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   提交服务器初始代码
399
400
401
402
403
404
405
406
  
  	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   提交服务器初始代码
407
  	local newRole = require("models.Role").new({
0de80321   liuzujun   创建游戏数据库,role对应mys...
408
  		key = string_format("%d", roleId),
314bc5df   zhengshouren   提交服务器初始代码
409
410
  		id = roleId,
  		uid = tostring(msg.uid),
dc9d814f   zhouhaihai   邮件
411
  		sid = msg.subId or 0,
314bc5df   zhengshouren   提交服务器初始代码
412
413
  		name = roleName,
  		uname = msg.uname or "",
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
414
  		device = tostring(msg.device),
aa74d6ef   zhouhaihai   掉落反馈
415
  		dmode = msg.deviceMode and tostring(msg.deviceMode) or nil
314bc5df   zhengshouren   提交服务器初始代码
416
417
418
419
420
421
422
423
424
425
426
427
  	})
  
  	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
d99a4962   liuzujun   火花系统建表,新增虹光玉
428
  	--newRole:loadRoleIncre()
44c6e479   zhouhaihai   增加部分日志
429
  	newRole:startActionUcode()
39bcd7ca   zhouhaihai   LOG
430
431
432
433
434
  	newRole.sysVersion = msg.sysVersion
  	newRole.ip = agent.ip:toArray(false, ":")[1]
  	newRole.clientVersion = msg.clientVersion
  	newRole.network = msg.network
  
8b65a363   zhouhaihai   优化
435
  	newRole:award(globalCsv.birthItem, {log = {desc = "birth"}, notNotify = true})
314bc5df   zhengshouren   提交服务器初始代码
436
  	-- 欢迎邮件
70fb62d1   liuzujun   服务器数据打点
437
438
  	--mysqlproxy:insertEmail({roleId = roleId, emailId = 1})
  	newRole:sendMail(1)
314bc5df   zhengshouren   提交服务器初始代码
439
  
39bcd7ca   zhouhaihai   LOG
440
441
442
443
  	if msg.newuser then
  		newRole:log("onCreateAccount")
  	end
  	newRole:log("onCreateRole")
d02f7904   zhouhaihai   遗失的log
444
  	newRole:mylog("create", {key1 = agent.ip:toArray(false, ":")[1]})
3aac1e3a   zhouhaihai   新设备
445
446
447
  	if msg.newdevice then
  		newRole:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
  	end
ec0df561   liuzujun   创建及时保存一次
448
449
  	-- 整体保存一次
  	newRole:update()
314bc5df   zhengshouren   提交服务器初始代码
450
451
  
  	SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
320f5b54   zhouhaihai   cb 返利
452
453
454
455
456
457
458
459
460
461
462
463
  
  	-- 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 返利调整
464
  				if back and next(back) and back.reward and next(back.reward) then
320f5b54   zhouhaihai   cb 返利
465
  					local reward = ""
91019d1f   zhouhaihai   cb 返利调整
466
  					for itemId, count in pairs(back.reward) do
320f5b54   zhouhaihai   cb 返利
467
468
  						reward = reward:setv(itemId, count)
  					end
91019d1f   zhouhaihai   cb 返利调整
469
  					if back.reward[70] then
2ca93972   liuzujun   添加邮件表
470
  						mysqlproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward2, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
91019d1f   zhouhaihai   cb 返利调整
471
  					else
2ca93972   liuzujun   添加邮件表
472
  						mysqlproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
91019d1f   zhouhaihai   cb 返利调整
473
  					end
320f5b54   zhouhaihai   cb 返利
474
475
476
477
478
479
480
481
482
483
  					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)
  	
dac9fbcc   liuzujun   cb1活跃回馈
484
485
486
      -- cb1活跃回馈
      onCb1Back(newRole)
  
314bc5df   zhengshouren   提交服务器初始代码
487
488
489
  	return true
  end
  
dc9d814f   zhouhaihai   邮件
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
  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小写名字异常
519
520
  	local dbName = string.upper(newName)
  	local result = redisproxy:setnx(string_format("user:%s", dbName), roleId)
dc9d814f   zhouhaihai   邮件
521
522
523
524
525
  	if result == 0 then
  		SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 1}))
  		return true
  	end
  	redisproxy:pipelining(function (red)
af7863ef   zhouhaihai   x小写名字异常
526
527
  		red:del(string_format("user:%s", string.upper(oldName)))
  		red:set(string_format("uid:%s", role:getProperty("uid")), dbName)
dc9d814f   zhouhaihai   邮件
528
529
530
531
532
  	end)
  
  	role:updateProperties({
  		["name"] = newName,
  	})
e3c5cc5e   zhouhaihai   跨服竞技场over
533
  
1e2c5316   zhangqijia   fix: 修改昵称,餐厅/电波塔/...
534
535
536
537
  	role.dinerData:updateRankRoleName(newName)
  	role:updateTowerRankName(newName)
  	role:updateAdvRankName(newName)
  
e3c5cc5e   zhouhaihai   跨服竞技场over
538
  	role:changeCrossServerPvpSelfInfo("name")
a3bb2d5d   liuzujun   指南 改名任务
539
  	role:checkTaskEnter("Rename", {})
dc9d814f   zhouhaihai   邮件
540
541
542
543
  	SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 0}))
  	return true
  end
  
c1849aa6   chenyueqi   roleaction增加一个获取随...
544
545
546
547
548
549
  function _M.getRandomNameRpc()
  	local name = randomRoleName()
  	SendPacket(actionCodes.Role_getRandomNameRpc, MsgPack.pack({name = name}))
  	return true
  end
  
dc9d814f   zhouhaihai   邮件
550
551
552
553
554
555
556
  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...
557
  	local SERV = string_format(".chated%d", math.random(1, 5))
dc9d814f   zhouhaihai   邮件
558
559
560
561
562
  	local legal, mod = skynet.call(SERV, "lua", "check", content)
  	if not legal then
  		content = mod or ""
  	end
  
14f1591b   zhouhaihai   删除好感度相关
563
  	role:updateProperty({field = "intro", value = content})
dc9d814f   zhouhaihai   邮件
564
565
566
567
568
  	
  	SendPacket(actionCodes.Role_changeIntroRpc, '')
  	return true
  end
  
314bc5df   zhengshouren   提交服务器初始代码
569
570
571
572
573
  function _M.syncTimeRpc(agent, data)
  	SendPacket(actionCodes.Role_syncTimeRpc, MsgPack.pack({nowTime = skynet.timex()}))
  	return true
  end
  
312b9db5   zhouahaihai   背包
574
575
576
  function _M.saleItemRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
84e7c06e   zhouhaihai   回收
577
  	local backs = msg.backs
c1928949   chenyueqi   勋章兑换增加不能兑换的碎片判断
578
579
580
581
582
583
584
585
  	if not backs or not next(backs) then return 0 end
  
  	for itemId, count in pairs(backs) do
  		if math.illegalNum(count, 1, role:getItemCount(itemId)) then return 1 end
  		if globalCsv.unit_paster_ban[itemId] then return 2 end
  		local itemData = csvdb["itemCsv"][itemId]
  		if itemData.sell_effect == "" then return 3 end
  	end
84e7c06e   zhouhaihai   回收
586
587
  
  	local reward = {}
53e8037e   zhouhaihai   任务
588
  	local fragCount = 0
84e7c06e   zhouhaihai   回收
589
  	for itemId, count in pairs(backs) do
84e7c06e   zhouhaihai   回收
590
  		local itemData = csvdb["itemCsv"][itemId]
53e8037e   zhouhaihai   任务
591
592
593
  		if itemData.type == ItemType.HeroFragment or itemData.type == ItemType.HeroFCommon then
  			fragCount = fragCount + count
  		end
84e7c06e   zhouhaihai   回收
594
595
  		local sellEffect = itemData.sell_effect:toArray(true, "=")
  		reward[sellEffect[1]] = (reward[sellEffect[1]] or 0) + sellEffect[2] * count
c59e058b   zhouhaihai   新一批日志记录
596
597
598
599
600
601
602
603
604
  
  		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   回收
605
606
  	end	
  	
44c6e479   zhouhaihai   增加部分日志
607
  	role:costItems(backs, {log = {desc = "saleItem"}})
7bb30dca   zhouhaihai   修改发奖
608
  	local reward, change = role:award(reward, {log = {desc = "saleItem"}})
53e8037e   zhouhaihai   任务
609
  	role:checkTaskEnter("DecoFrag", {count = fragCount})
c59e058b   zhouhaihai   新一批日志记录
610
  	
7bb30dca   zhouhaihai   修改发奖
611
  	SendPacket(actionCodes.Role_saleItemRpc, MsgPack.pack(role:packReward(reward, change)))
312b9db5   zhouahaihai   背包
612
613
614
615
616
617
618
619
  	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
e1b1f689   zhangqijia   fix: 记录用户跟设备信息, o...
620
  	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return 1 end
312b9db5   zhouahaihai   背包
621
  	local itemData = csvdb["itemCsv"][itemId]
e1b1f689   zhangqijia   fix: 记录用户跟设备信息, o...
622
  	if itemData.use_type ~= 2 then return 2 end
312b9db5   zhouahaihai   背包
623
  	local randomData = csvdb["item_randomCsv"][tonumber(itemData.use_effect)]
e1b1f689   zhangqijia   fix: 记录用户跟设备信息, o...
624
  	if not randomData or randomData.openTime > 0 then return 3 end
312b9db5   zhouahaihai   背包
625
  
007af97e   zhouhaihai   item_random 结构更改
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
  	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   背包
642
643
644
  			end
  		end
  	end
007af97e   zhouhaihai   item_random 结构更改
645
646
  	reward[0] = nil
  
44c6e479   zhouhaihai   增加部分日志
647
  	role:costItems({[itemId] = count}, {log = {desc = "openItem"}})
7bb30dca   zhouhaihai   修改发奖
648
649
  	local change
  	reward, change = role:award(reward, {log = {desc = "openItem", int1 = itemId, int2 = count}})
43cc5f51   gaofengduan   调整 equip 数据结构
650
  
7bb30dca   zhouhaihai   修改发奖
651
  	SendPacket(actionCodes.Role_openItemRpc, MsgPack.pack(role:packReward(reward, change)))
312b9db5   zhouahaihai   背包
652
653
654
  	return true
  end
  
9b35bf6e   zhouhaihai   开启时间箱
655
656
657
  function _M.openTimeBoxRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
4d8bd32c   chenyueqi   倒计时开箱子
658
  	local oper = msg.oper  -- 操作 1 - 2
9b35bf6e   zhouhaihai   开启时间箱
659
  	local slot = msg.slot  -- 位置 1 - 6
317a46a9   liuzujun   添加特权卡
660
661
  
  	-- 特权卡时间箱额外栏位
0a093ba8   chenyueqi   重写拆解室功能
662
663
664
665
  	-- 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   开启时间箱
666
667
  
  	local boxL = role:getProperty("boxL")
0a093ba8   chenyueqi   重写拆解室功能
668
669
  	local reward, change
  	if oper == 1 then -- 构建开始(包括切换构建的id)
9b35bf6e   zhouhaihai   开启时间箱
670
  		local itemId = msg.itemId
9b35bf6e   zhouhaihai   开启时间箱
671
  		local itemData = csvdb["itemCsv"][itemId]
0a093ba8   chenyueqi   重写拆解室功能
672
673
674
675
676
677
  		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
e2e205be   zhangqijia   feat: 玩家等级奖励
678
              unitTime = unitTime + role:getBnousDismantlingImproved(unitTime)
4aadc450   chenyueqi   切换拆解术式bug,造成获得巨大数...
679
  			local doneCnt = time == 0 and 0 or math.floor((process + skynet.timex() - time) / unitTime)
0a093ba8   chenyueqi   重写拆解室功能
680
  			if doneCnt > 0 then
4aadc450   chenyueqi   切换拆解术式bug,造成获得巨大数...
681
  				reward = role:award({[oldId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
0a093ba8   chenyueqi   重写拆解室功能
682
683
684
685
686
687
  			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()}
e2e205be   zhangqijia   feat: 玩家等级奖励
688
  		role:pushMsg({type = "box", slot = slot, time = skynet.timex() + globalCsv.box_productLine_time * 3600 + role:getBnousDismantlingMaximum()})
0a093ba8   chenyueqi   重写拆解室功能
689
  	elseif oper == 2 then -- 重置运行时间(可以使用加速)
9b35bf6e   zhouhaihai   开启时间箱
690
  		local quick = msg.quick
0a093ba8   chenyueqi   重写拆解室功能
691
692
693
694
695
696
697
  		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
e2e205be   zhangqijia   feat: 玩家等级奖励
698
  		unitTime = unitTime + role:getBnousDismantlingImproved(unitTime)
0a093ba8   chenyueqi   重写拆解室功能
699
  		if quick then
cc9f29c5   chenyueqi   拆解术式,可以自主选择加速多长时间
700
  			stopTime = nowTime + quick
f8ba82b3   zhouhaihai   大小写
701
  			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
cc9f29c5   chenyueqi   拆解术式,可以自主选择加速多长时间
702
  			local costKey = math.ceil(quick / (cost_pre[1] * 60)) * cost_pre[2]
3d8050ef   liuzujun   钻石3改成虹光玉8
703
704
  			if not role:checkItemEnough({[ItemId.Jade] = costKey}) then return 5 end
  			role:costItems({[ItemId.Jade] = costKey}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
cb8d4368   chenyueqi   拆解术式充能的时候领取道具,获得个...
705
  		else
56763ca7   zhangqijia   fix: 拆解术士模块的bug,充...
706
  			stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600 +  role:getBnousDismantlingMaximum())
9b35bf6e   zhouhaihai   开启时间箱
707
  		end
e2e205be   zhangqijia   feat: 玩家等级奖励
708
  
0a093ba8   chenyueqi   重写拆解室功能
709
  		role:pushCancel({type = "box", slot = slot})
5d620aef   chenyueqi   拆解室指定某一项为必得奖励
710
  
0a093ba8   chenyueqi   重写拆解室功能
711
712
  		local doneCnt = math.floor((process + stopTime - time) / unitTime)
  		if doneCnt > 0 then
4aadc450   chenyueqi   切换拆解术式bug,造成获得巨大数...
713
  			reward = role:award({[itemId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
0a093ba8   chenyueqi   重写拆解室功能
714
715
716
717
718
719
  		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}
e2e205be   zhangqijia   feat: 玩家等级奖励
720
  		role:pushMsg({type = "box", slot = slot, time = nowTime + globalCsv.box_productLine_time * 3600 + role:getBnousDismantlingMaximum()})
0a093ba8   chenyueqi   重写拆解室功能
721
722
723
724
  	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
76f0493d   zhangqijia   feat: 铭文仓库溢出奖励时,通...
725
  
0a093ba8   chenyueqi   重写拆解室功能
726
  		local costIdData = csvdb["itemCsv"][costId]
e2e205be   zhangqijia   feat: 玩家等级奖励
727
  		local count, runeCount = 0, 0
0a093ba8   chenyueqi   重写拆解室功能
728
729
  		for itemId, num in pairs(costs) do
  			local itemIdData = csvdb["itemCsv"][itemId]
2660491b   zhangqijia   fix: 铭文仓库爆满限制bug
730
731
  			local itemRandomData =  csvdb["item_randomCsv"][itemId]
  			if not itemIdData or not itemRandomData or costIdData.quality ~= itemIdData.quality then return 7 end
e2e205be   zhangqijia   feat: 玩家等级奖励
732
  
2660491b   zhangqijia   fix: 铭文仓库爆满限制bug
733
734
735
736
              local itemRandomOccupy = role:getItemRandomOccupy(itemRandomData)
  			if next(itemRandomOccupy) then
                  runeCount = runeCount + (itemRandomOccupy[ItemOccupy.Rune] or 0) * num
  			end
0a093ba8   chenyueqi   重写拆解室功能
737
738
739
  			count = count + num
  		end
  
2660491b   zhangqijia   fix: 铭文仓库爆满限制bug
740
          if role:checkRuneFully(runeCount) then return 10 end --开箱子,如果铭文仓库已经满了则不让开铭文箱
76f0493d   zhangqijia   feat: 铭文仓库溢出奖励时,通...
741
  
0a093ba8   chenyueqi   重写拆解室功能
742
  		if role:getItemCount(costId) < count then return 8 end
c7991bb0   chenyueqi   道具开时钟箱,检查箱子够不够
743
  		if not role:checkItemEnough(costs) then return 9 end
0a093ba8   chenyueqi   重写拆解室功能
744
745
746
747
748
749
750
751
752
753
754
  
  		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
e2e205be   zhangqijia   feat: 玩家等级奖励
755
756
  					local num = randomData["num" .. tostring(i)]
  					local gift = randomData["gift" .. tostring(i)]
0a093ba8   chenyueqi   重写拆解室功能
757
758
759
760
761
762
763
764
765
766
767
768
769
770
  					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 结构更改
771
  				end
9b35bf6e   zhouhaihai   开启时间箱
772
  			end
0a093ba8   chenyueqi   重写拆解室功能
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
  			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   开启时间箱
789
  		end
4aadc450   chenyueqi   切换拆解术式bug,造成获得巨大数...
790
  		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = costId, int2 = oper}})
9b35bf6e   zhouhaihai   开启时间箱
791
792
793
794
  	else
  		return
  	end
  
0a093ba8   chenyueqi   重写拆解室功能
795
796
797
798
  	role:setProperty("boxL",boxL) --刷新
  	if slot then
  		role:changeUpdates({{type = "boxL", field = slot, value = boxL[slot], isOnlyToC = true}}) -- 通知客户端
  	end
7bb30dca   zhouhaihai   修改发奖
799
  	SendPacket(actionCodes.Role_openTimeBoxRpc, MsgPack.pack(role:packReward(reward, change)))
c8872722   zhouhaihai   返回
800
  	return true
9b35bf6e   zhouhaihai   开启时间箱
801
802
  end
  
d1c2290f   zhouhaihai   加速
803
804
805
  function _M.openSpeedUpBoxRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
8cd3770f   liuzujun   挂机关卡可以选择,经验金币根据最高...
806
  	local itemInfo = msg.itemInfo
d1c2290f   zhouhaihai   加速
807
808
  
  	local reward = {}
8cd3770f   liuzujun   挂机关卡可以选择,经验金币根据最高...
809
810
811
812
813
814
815
816
817
818
819
820
821
  	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")
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
822
823
824
  			local expData = hangInfo.expData or {}
  			--local carbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
  			reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + math.floor(time / globalCsv.idle_money_produce_cd) * (expData.money or 0) * count
8cd3770f   liuzujun   挂机关卡可以选择,经验金币根据最高...
825
826
  		elseif useType == 2 then -- 挂机经验
  			local hangInfo = role:getProperty("hangInfo")
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
827
828
829
  			local expData = hangInfo.expData or {}
  			--local carbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
  			reward[ItemId.Exp] = (reward[ItemId.Exp] or 0) + math.floor(time / globalCsv.idle_money_produce_cd) * (expData.exp or 0) * count
8cd3770f   liuzujun   挂机关卡可以选择,经验金币根据最高...
830
831
832
833
834
835
836
837
838
839
840
841
  		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   电波塔对食材的加成计算错误
842
  				speed = speed + role:getBnousDiner(1,speed)
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
843
  				reward[itemId] = (reward[itemId] or 0) + math.floor((time / speed) * count)
8cd3770f   liuzujun   挂机关卡可以选择,经验金币根据最高...
844
845
846
  			end
  		else
  			return 6
d1c2290f   zhouhaihai   加速
847
  		end
8cd3770f   liuzujun   挂机关卡可以选择,经验金币根据最高...
848
849
  
  		role:costItems({[id] = count}, {log = {desc = "speedUpBox"}})
d1c2290f   zhouhaihai   加速
850
851
  	end
  
75acc595   liuzujun   修改gm添加满级英雄指令,开启特权...
852
853
854
855
856
857
858
859
860
861
862
  	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   修改发奖
863
  	local change
8cd3770f   liuzujun   挂机关卡可以选择,经验金币根据最高...
864
  	reward, change = role:award(reward, {log = {desc = "speedUpBox"}})
d1c2290f   zhouhaihai   加速
865
  
7bb30dca   zhouhaihai   修改发奖
866
  	SendPacket(actionCodes.Role_openSpeedUpBoxRpc, MsgPack.pack(role:packReward(reward, change)))
d1c2290f   zhouhaihai   加速
867
868
869
  	return true
  end
  
00e663bd   zhouhaihai   剧情相关
870
871
872
873
874
  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   liuzujun   剧情领奖bug
875
  	if not storyBookData then return 1 end
a1d09d22   zhouhaihai   bug
876
  	local storyStatus = role:getProperty("storyB")
053978b4   zhouhaihai   剧情领奖
877
  
17ba67dd   zhouhaihai   错误的判断
878
  	local status = (storyStatus[storyId] or {}).s
053978b4   zhouhaihai   剧情领奖
879
  
6dc64b07   liuzujun   剧情领奖bug
880
  	if status == -1 then return 2 end
17ba67dd   zhouhaihai   错误的判断
881
882
  	
  	if not status or status ~= 1 then 
6dc64b07   liuzujun   剧情领奖bug
883
884
  		--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   剧情领奖
885
  		else
6dc64b07   liuzujun   剧情领奖bug
886
  			return 3
053978b4   zhouhaihai   剧情领奖
887
  		end
a1d09d22   zhouhaihai   bug
888
  	end
00e663bd   zhouhaihai   剧情相关
889
  	-- 获取奖励
5f18f4e5   zhouhaihai   story
890
  	storyStatus[storyId] = storyStatus[storyId] or {}
8a01a3ae   zhouhaihai   bug
891
  	storyStatus[storyId].s = -1
8a01a3ae   zhouhaihai   bug
892
  	role:changeUpdates({{ type = "storyB", field = storyId, value = storyStatus[storyId] }})
7bb30dca   zhouhaihai   修改发奖
893
  	local reward, change = role:award(storyBookData.gift, {log = {desc = "storybookReward", int1 = storyId}})
c59e058b   zhouhaihai   新一批日志记录
894
  
43293781   zhouhaihai   日志bug
895
  	role:log("carriage_video", {
c59e058b   zhouhaihai   新一批日志记录
896
897
  		carriage_video_type = storyBookData.type, --放映室类型,剧情CG:0, 角色CG:1, 主线剧情:2, 角色剧情:3, 活动剧情:4, 图鉴:5
  		carriage_video_id = storyId, --放映室片段ID
3d8050ef   liuzujun   钻石3改成虹光玉8
898
899
  		carriage_video_coinid = reward[ItemId.Jade] and ItemId.Jade or 0, --放映奖励货币类型,无奖励则填写0
  		carriage_video_coinnum = reward[ItemId.Jade] or 0, --放映奖励货币数量,无奖励则填写0
887c1843   zhouhaihai   日志新一批
900
  		carriage_video_item = reward, --放映奖励其他物品数量,json格式记录,{'itemid1':10,'itemid2':5,…………..},无奖励则填写0
c59e058b   zhouhaihai   新一批日志记录
901
902
  	})
  
7bb30dca   zhouhaihai   修改发奖
903
  	SendPacket(actionCodes.Role_storyBookRewardRpc, MsgPack.pack(role:packReward(reward, change)))
00e663bd   zhouhaihai   剧情相关
904
905
906
  	return true
  end
  
8a01a3ae   zhouhaihai   bug
907
  function _M.unLockStoryBookRpc(agent, data)
bd15e9bc   zhouhaihai   购买剧情
908
909
910
911
912
913
914
915
916
917
  	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   liuzujun   活动剧情解锁
918
919
920
921
922
923
  	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   购买剧情
924
925
926
927
928
929
930
931
  
  	-- 解锁
  	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
932
933
  end
  
61386225   zhangqijia   feat: 一键领取任务奖励(包括...
934
935
  local function getTaskReward(role, taskId, roleField, taskType, taskData)
  	if not taskData then return nil end
53e8037e   zhouhaihai   任务
936
937
938
939
940
  
  	local taskStatus = role:getProperty(roleField[taskType])
  	local tStatus = taskStatus["t"] or {}
  
  	if (tStatus[taskId] or 0) < taskData.condition1 then
61386225   zhangqijia   feat: 一键领取任务奖励(包括...
941
  		return nil
53e8037e   zhouhaihai   任务
942
943
  	end
  
7bb30dca   zhouhaihai   修改发奖
944
  	local reward, change = role:award(taskData.reward, {log = {desc = "finishTask", int1 = taskType, int2 = taskId}})
53e8037e   zhouhaihai   任务
945
946
  	local active = (taskStatus["a"] or 0) + taskData.active
  
ac885527   liuzujun   联动签到活动
947
948
949
  	-- 日常活动完成
  	if taskType == 1 then
  		role:checkTaskEnter("DailyTask", {pre = (taskStatus["a"] or 0), cur = active})
70fb62d1   liuzujun   服务器数据打点
950
  		role:mylog("role_action", {desc="dayTask", int1=taskId, int2=active})
dfa9ae5e   liuzujun   战令任务活动
951
952
  	else
  		role:checkTaskEnter("WeekTask", {pre = (taskStatus["a"] or 0), cur = active})
70fb62d1   liuzujun   服务器数据打点
953
  		role:mylog("role_action", {desc="weekTask", int1=taskId, int2=active})
ac885527   liuzujun   联动签到活动
954
955
  	end
  
53e8037e   zhouhaihai   任务
956
957
  	role:changeUpdates({
  		{ type = roleField[taskType], field = {"t", taskId}, value = -1 },
317a46a9   liuzujun   添加特权卡
958
  		{ type = roleField[taskType], field = "a", value = active},
53e8037e   zhouhaihai   任务
959
960
  	})
  
1a0b3c56   liuzujun   抽卡保底,切换定向卡池
961
962
  	local oldVal = role:getProperty("battlePoint") or 0
  	role:updateProperty({field = "battlePoint", value = oldVal + taskData.active})
317a46a9   liuzujun   添加特权卡
963
  
c59e058b   zhouhaihai   新一批日志记录
964
965
966
  	role:log("task_reward", {
  		task_reward_id = taskId, --任务奖励ID
  		task_reward_type = taskType, --任务奖励类型,见 任务奖励类型枚举表
887c1843   zhouhaihai   日志新一批
967
  		task_reward_detail = reward, --任务奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
c59e058b   zhouhaihai   新一批日志记录
968
  	})
61386225   zhangqijia   feat: 一键领取任务奖励(包括...
969
  	return reward, change
53e8037e   zhouhaihai   任务
970
971
  end
  
61386225   zhangqijia   feat: 一键领取任务奖励(包括...
972
  function _M.taskRpc(agent, data)
53e8037e   zhouhaihai   任务
973
974
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
d232676a   zhouhaihai   功能解锁 冒险返回
975
976
977
  
  	if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
  
61386225   zhangqijia   feat: 一键领取任务奖励(包括...
978
  	local taskType = msg.type -- 1 日常 2 周常
53e8037e   zhouhaihai   任务
979
980
  	local taskId = msg.id --任务id
  	local roleField = {"dTask", "wTask"}
61386225   zhangqijia   feat: 一键领取任务奖励(包括...
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
  	if not roleField[taskType] then return 1 end
  
  	local reward, change = {}, {}
  	if not taskId then
  
  		for id, taskData in pairs(csvdb["task_loopCsv"][taskType]) do
  			local tmpreward, tmpchange = getTaskReward(role, id, roleField, taskType, taskData)
  			if tmpreward then
  				for k, v in pairs(tmpreward) do
  					reward[k] = (reward[k] or 0) + v
  				end
  				if tmpchange then table.insert(change, tmpchange) end
  			end
  		end
  	else
  		local taskData = csvdb["task_loopCsv"][taskType][taskId]
  		if not taskData then return 2 end
  		reward, change= getTaskReward(role, taskId, roleField, taskType, taskData)
  	end
53e8037e   zhouhaihai   任务
1000
  
61386225   zhangqijia   feat: 一键领取任务奖励(包括...
1001
1002
1003
  	SendPacket(actionCodes.Role_taskRpc, MsgPack.pack(role:packReward(reward, change)))
  	return true
  end
53e8037e   zhouhaihai   任务
1004
  
61386225   zhangqijia   feat: 一键领取任务奖励(包括...
1005
1006
  
  local function getTaskActiveReward(role, taskId, roleField, taskType, taskData)
53e8037e   zhouhaihai   任务
1007
1008
1009
1010
  	local taskStatus = role:getProperty(roleField[taskType])
  	local tStatus = taskStatus["at"] or {}
  
  	if tStatus[taskId] == -1 or (taskStatus["a"] or 0) < taskData.active then
61386225   zhangqijia   feat: 一键领取任务奖励(包括...
1011
  		return nil
53e8037e   zhouhaihai   任务
1012
1013
  	end
  
29fbbc10   zhouhaihai   夜间打工
1014
1015
1016
1017
1018
1019
1020
1021
1022
  	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   任务
1023
1024
1025
  	role:changeUpdates({
  		{ type = roleField[taskType], field = {"at", taskId}, value = -1 }
  	})
61386225   zhangqijia   feat: 一键领取任务奖励(包括...
1026
  
9be3f3ea   zhouhaihai   日志需求
1027
1028
1029
1030
1031
  	role:log("task_reward", {
  		task_reward_id = taskId * 100 + taskType, --任务奖励ID
  		task_reward_type = 3, --任务奖励类型,见 任务奖励类型枚举表
  		task_reward_detail = reward, --任务奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
  	})
61386225   zhangqijia   feat: 一键领取任务奖励(包括...
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
      return reward, change
  end
  
  function _M.taskActiveRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
  
  	local taskType = msg.type -- 1 日常 2 周长
  	local taskId = msg.id --任务id
  	local roleField = {"dTask", "wTask"}
  	if not roleField[taskType] then return end
  
  	local reward, change = {}, {}
  	if not taskId then
  		for id, taskData in pairs(csvdb["task_activeCsv"][taskType]) do
  			local tmpreward, tmpchange = getTaskActiveReward(role, id, roleField, taskType, taskData)
  			if tmpreward then
  				for k, v in pairs(tmpreward) do
  					reward[k] = (reward[k] or 0) + v
  				end
  				if tmpchange then table.insert(change, tmpchange) end
  			end
  		end
  	else
  		local taskData = csvdb["task_activeCsv"][taskType][taskId]
  		if not taskData then return end
  		reward, change= getTaskActiveReward(role, taskId, roleField, taskType, taskData)
  	end
9be3f3ea   zhouhaihai   日志需求
1062
  
7bb30dca   zhouhaihai   修改发奖
1063
  	SendPacket(actionCodes.Role_taskActiveRpc, MsgPack.pack(role:packReward(reward, change)))
53e8037e   zhouhaihai   任务
1064
1065
1066
1067
1068
1069
1070
1071
  	return true
  end
  
  function _M.achiveRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local taskId = msg.id --任务id
  
d232676a   zhouhaihai   功能解锁 冒险返回
1072
  	if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
53e8037e   zhouhaihai   任务
1073
1074
  	local achiveT = role:getProperty("achiveT")
  	local achiveV = role:getProperty("achiveV")
e6e49b45   liuzujun   一键领取成就奖励
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
  	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,……….}
  					})
70fb62d1   liuzujun   服务器数据打点
1097
1098
  
  					role:mylog("role_action", {desc="finishAchieve", int1=cfg.id})
e6e49b45   liuzujun   一键领取成就奖励
1099
1100
1101
1102
1103
1104
1105
1106
  				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   任务
1107
  
e6e49b45   liuzujun   一键领取成就奖励
1108
1109
1110
1111
  		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   任务
1112
  
e6e49b45   liuzujun   一键领取成就奖励
1113
  		if achiveV[taskId] then return 2 end
53e8037e   zhouhaihai   任务
1114
  
e6e49b45   liuzujun   一键领取成就奖励
1115
1116
  		local curStatus = achiveT[achiveTask.type] or 0
  		local maxc = achiveTask.condition1
53e8037e   zhouhaihai   任务
1117
  
e6e49b45   liuzujun   一键领取成就奖励
1118
1119
1120
  		if maxc > curStatus then
  			return 3
  		end
3df73a9e   zhouhaihai   复兴奖励
1121
  
e6e49b45   liuzujun   一键领取成就奖励
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
  		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,……….}
  		})
70fb62d1   liuzujun   服务器数据打点
1133
  		role:mylog("role_action", {desc="finishAchieve", int1=taskId})
e6e49b45   liuzujun   一键领取成就奖励
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
  
  		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   复兴奖励
1150
1151
  				end
  			end
e6e49b45   liuzujun   一键领取成就奖励
1152
1153
1154
1155
1156
  			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
1d78ad52   chenyueqi   成就奖励方法中字段拼写错误
1157
  					role:mylog("role_action", {desc="fux", int1=pData.level})
e6e49b45   liuzujun   一键领取成就奖励
1158
  				end
3df73a9e   zhouhaihai   复兴奖励
1159
  			end
e6e49b45   liuzujun   一键领取成就奖励
1160
1161
1162
1163
  			if flag then
  				role:updateProperty({field = "fuxR", value = overCount, notNotify = true})
  			end
  			break
3df73a9e   zhouhaihai   复兴奖励
1164
1165
  		end
  	end
c59e058b   zhouhaihai   新一批日志记录
1166
  
53e8037e   zhouhaihai   任务
1167
1168
1169
  	return true
  end
  
c384626d   zhouhaihai   好友
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
  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
  
8583f6ee   chenyueqi   动态屏蔽字
1184
1185
1186
1187
1188
1189
1190
  	local sdkResult
  	if role:getProperty("sid") == UO_SID then
  		sdkResult = role:uoChatSDK(content)
  	else
  		sdkResult = role:biliChatSDK(content)
  	end
  
fe41ea5d   chenyueqi   动态屏蔽字设置1秒延时等待。当动态...
1191
  	if sdkResult then
8583f6ee   chenyueqi   动态屏蔽字
1192
1193
1194
1195
1196
1197
1198
  		content = sdkResult
  	else
  		local SERV = string_format(".chated%d", math.random(1, 5))
  		local legal, mod = skynet.call(SERV, "lua", "check", content)
  		if not legal then
  			content = mod or ""
  		end
c384626d   zhouhaihai   好友
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
  	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   聊天
1217
1218
1219
1220
1221
  
  	local waitTime = nil
   	local check = {
  		-- 世界聊天
  		[1] = function ()
c384626d   zhouhaihai   好友
1222
1223
  			if role:getProperty("silent") > now then  --禁言
  				result = 1
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
1224
  				--return
c384626d   zhouhaihai   好友
1225
  			end
f30a310d   liuzujun   世界聊天等级15判断
1226
1227
1228
1229
  			if role:getProperty("level") < (globalCsv.chat_level or 15) then
  				result = 3
  				return
  			end
8474ca36   zhouhaihai   聊天
1230
1231
1232
1233
1234
  
  			role._worldChatLimit = role._worldChatLimit or {start = 0, count = 0, canSayt = 0}  --第一次开始说话时间  从第一次说话次数  能说话的时间
  
  			if now < role._worldChatLimit.canSayt then
  				result = 2
fa565e0c   zhouhaihai   优化结构
1235
  				waitTime = role._worldChatLimit.canSayt - now
8474ca36   zhouhaihai   聊天
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
  				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
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
1253
1254
1255
1256
1257
1258
              if result == 1 then
                  SendPacket(actionCodes.Role_chat, MsgPack.pack(response))
                  result = 0
              else
                  mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
              end
cd789e7c   zhouhaihai   不要聊天记录缓存
1259
  			-- pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
25d8cbc6   zhouhaihai   记录聊天信息
1260
  			role:mylog("role_action", {desc = "chatWorld", text1 = content})
c384626d   zhouhaihai   好友
1261
  		end,
8474ca36   zhouhaihai   聊天
1262
1263
1264
  		-- 私聊
  		[2] = function ()
  			local objectId = msg.roleId
fa565e0c   zhouhaihai   优化结构
1265
  			response.objId = objectId
4cf74232   zhouhaihai   pvp
1266
  			local redret = redisproxy:pipelining(function(red)
4cf74232   zhouhaihai   pvp
1267
1268
1269
  				red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
  				red:sismember(FRIEND_BLACK_KEY:format(objectId), roleId)
  			end)
6136eaca   liuzujun   添加好友表
1270
  			if not roleExists(objectId) then
4cf74232   zhouhaihai   pvp
1271
1272
1273
1274
  				result = 1	
  				return
  			end
  			-- 你把对方拉黑拉黑
6136eaca   liuzujun   添加好友表
1275
  			if redret[1] == 1 then
4cf74232   zhouhaihai   pvp
1276
  				result = 2
8474ca36   zhouhaihai   聊天
1277
1278
  				return
  			end
4cf74232   zhouhaihai   pvp
1279
  			-- 对方把你拉黑
6136eaca   liuzujun   添加好友表
1280
  			local isBlock = redret[2] == 1
8474ca36   zhouhaihai   聊天
1281
  
8474ca36   zhouhaihai   聊天
1282
  			local bin = MsgPack.pack(response)
4cf74232   zhouhaihai   pvp
1283
  			if not isBlock then
440aa055   zhouhaihai   聊天
1284
1285
  				redisproxy:pipelining(function(red)
  					red:rpush(CHAT_OFFLINE:format(objectId), bin)
4cf74232   zhouhaihai   pvp
1286
  					red:ltrim(CHAT_OFFLINE:format(objectId), -200, -1)
440aa055   zhouhaihai   聊天
1287
  				end)
4cf74232   zhouhaihai   pvp
1288
1289
1290
1291
1292
  				-- 若在线,实时发送聊天信息
  				local agent = datacenter.get("agent", objectId)
  				if agent then
  					SendPacket(actionCodes.Role_chat, bin, agent.fd)
  				end
440aa055   zhouhaihai   聊天
1293
  			end
4cf74232   zhouhaihai   pvp
1294
  			SendPacket(actionCodes.Role_chat, bin)
c384626d   zhouhaihai   好友
1295
1296
1297
1298
1299
1300
1301
  		end,
  	}
  	if not check[cmd] then return end
  	
  	if not result then
  		check[cmd]()
  	end
c59e058b   zhouhaihai   新一批日志记录
1302
1303
1304
1305
  
  	role:log("communication", {
  		publish_type = cmd, --发言类型,1,世界  2私聊 
  		publish_status = 0, --发送状态,发送成功:0,发送失败:1,被屏蔽:2,其他:3
7d31daa8   zhouhaihai   调整压测
1306
  		publish_receive_roleid = msg.roleId or 0, --接收者角色ID
c59e058b   zhouhaihai   新一批日志记录
1307
1308
  		publish_text = content, --发言内容
  	})
8474ca36   zhouhaihai   聊天
1309
  	SendPacket(actionCodes.Role_chatRpc, MsgPack.pack({result = result, waitTime = waitTime}))
c384626d   zhouhaihai   好友
1310
1311
1312
  	return true
  end
  
4cf74232   zhouhaihai   pvp
1313
1314
1315
1316
1317
1318
  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   背包
1319
  
dc9d814f   zhouhaihai   邮件
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
  
  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
1336
  	role:mylog("role_action", {desc = "changeSetting", int1 = id, int2 = status})
dc9d814f   zhouhaihai   邮件
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
  	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   新一批日志记录
1365
  			local reward, change = role:award(result.gift, {log = {desc = "drawCode", int1 = giftId}})
dc9d814f   zhouhaihai   邮件
1366
  			
c59e058b   zhouhaihai   新一批日志记录
1367
1368
1369
  			role:log("get_gift", {
  				gift_id = giftId, -- 礼包ID
  				gift_key = code, -- 礼包key
887c1843   zhouhaihai   日志新一批
1370
  				gift_reward = reward, -- 礼包奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
c59e058b   zhouhaihai   新一批日志记录
1371
1372
1373
  				gift_name = "", -- 礼包名称
  				gift_reason = 0, -- 礼包发放原因,见发放原因枚举表
  			})
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
1374
  			role:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code, key2 = role:getRewardLogStr(result.gift)})
dc9d814f   zhouhaihai   邮件
1375
1376
1377
  			SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
  				result = ret,
  				reward = reward,
7bb30dca   zhouhaihai   修改发奖
1378
  				change = change,
dc9d814f   zhouhaihai   邮件
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
  			}))
  			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   头像
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
  
  	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   邮件
1414
1415
  		return
  	end
bd4fb541   zhouhaihai   增加物品过期系统
1416
  	role:changeHead(id)
44c6e479   zhouhaihai   增加部分日志
1417
  
dc9d814f   zhouhaihai   邮件
1418
1419
1420
1421
  	SendPacket(actionCodes.Role_changeHeadRpc, "")
  	return true
  end
  
71f716c4   chenyueqi   引导用到的字段
1422
1423
1424
1425
1426
1427
1428
  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   强制引导的步数记录
1429
  	if cmdType == 1 then
71f716c4   chenyueqi   引导用到的字段
1430
  		-- 新手引导
7bc0509a   zhangqijia   fix: 引导跳过逻辑修改
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
  		if msg.masters then
  			for _, master in pairs(msg.masters) do
  				role:saveGuide(master,1,true)
  			end		
  		else
  			local master = msg.master or -1
  			local slave = msg.slave or -1
  			if master < 0 or slave < 0 then return end
  			role:saveGuide(master, slave)
  		end
  		
71f716c4   chenyueqi   引导用到的字段
1442
  	elseif cmdType == 2 then
a608cccb   chenyueqi   引导服务端记录
1443
  		-- 系统引导(玩家可选择是否进行)
71f716c4   chenyueqi   引导用到的字段
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
  		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
1454
  			role:log("onGuidePoint", {guild_type = 2, guild_id = msg.funcType, guild_point = 0, guild_pass = 0})
d02f7904   zhouhaihai   遗失的log
1455
  			role:mylog("guide", {desc = "guide_weak", int1 = msg.funcType})
71f716c4   chenyueqi   引导用到的字段
1456
1457
  		end
  		role:updateProperty({field = "funcGuide", value = funcGuide})
e26989ce   chenyueqi   增加其他的引导记录
1458
  	elseif cmdType == 3 then
a608cccb   chenyueqi   引导服务端记录
1459
1460
1461
1462
1463
  		-- 系统引导(强制进行)
  		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
1464
  			role:log("onGuidePoint", {guild_type = 1, guild_id = msg.funcType, guild_point = 0, guild_pass = 0})
d02f7904   zhouhaihai   遗失的log
1465
  			role:mylog("guide", {desc = "guide_sys", int1 = msg.funcType})
a608cccb   chenyueqi   引导服务端记录
1466
1467
1468
  		end
  	elseif cmdType == 4 then
  		-- 弹出一个tips(进入功能界面也许要自动弹说明,value要区分1、2)
e26989ce   chenyueqi   增加其他的引导记录
1469
1470
1471
  		if msg.funcType then
  			local value = msg.value or 1
  			for _, funcIdx in pairs(msg.funcType:toArray(true,"=")) do
39bcd7ca   zhouhaihai   LOG
1472
  				role:log("onGuidePoint", {guild_type = 3, guild_id = funcIdx, guild_point = 0, guild_pass = 0})
d02f7904   zhouhaihai   遗失的log
1473
  				role:mylog("guide", {desc = "guide_tips", int1 = funcIdx})
e26989ce   chenyueqi   增加其他的引导记录
1474
1475
1476
1477
  				funcGuide = funcGuide:setv(funcIdx, value)
  			end
  			role:updateProperty({field = "funcGuide", value = funcGuide})
  		end
71f716c4   chenyueqi   引导用到的字段
1478
1479
1480
1481
1482
1483
1484
  	else
  		return
  	end
  
  	SendPacket(actionCodes.Role_guideRpc, "")
  	return true
  end
dc9d814f   zhouhaihai   邮件
1485
  
d51114bd   wangyujie   完成需求:每日金币购买
1486
1487
1488
  function _M.goldBuyRpc(agent, data)
  	local role = agent.role
  	local curT = role.dailyData:getProperty("goldBuyT")
e2e205be   zhangqijia   feat: 玩家等级奖励
1489
1490
1491
1492
1493
1494
1495
  
  	local costs = clone(globalCsv.idle_quickMoney_cost)
  	-- 增加今日齿轮加速次数
  	local maxIdx = #globalCsv.idle_quickMoney_cost
  	local maxCount = maxIdx + role:getBnousUpSpeedNum(UpSpeedType.GearUpSpeed)
  	if curT > maxCount then return end
  	if curT > maxIdx then
15b33dc3   zhangqijia   fix: 齿轮加速当前加速次数获取...
1496
  		for idx = maxIdx+1, curT do
e2e205be   zhangqijia   feat: 玩家等级奖励
1497
1498
1499
1500
1501
1502
  			costs[idx] = costs[maxIdx]
  		end
  	end
  
  	local costD = costs[curT]
  
d51114bd   wangyujie   完成需求:每日金币购买
1503
1504
1505
  	if not costD then
  		return 1
  	end
3b4b15b1   liguanghui   齿轮加速消耗修改为虹光玉
1506
  	if costD ~= 0 and not role:checkItemEnough({[ItemId.Jade] = costD}) then
d51114bd   wangyujie   完成需求:每日金币购买
1507
1508
  		return 2
  	end
abded725   chenyueqi   虹光玉购买金币计算bug
1509
1510
  
      --特权卡倍数
d51114bd   wangyujie   完成需求:每日金币购买
1511
  	local goldC = 0
abded725   chenyueqi   虹光玉购买金币计算bug
1512
1513
1514
1515
1516
1517
1518
      local multiple = role.storeData:getGearExchangeCoef()
  
      local hangInfo = role:getProperty("hangInfo")
      local expCarbon_Data = hangInfo.expData or globalCsv.oriCarbonData
      goldC = expCarbon_Data.money * globalCsv.idle_quickMoney_effect * multiple
  
      if goldC == 0 then
d51114bd   wangyujie   完成需求:每日金币购买
1519
1520
  		return 3
  	end
abded725   chenyueqi   虹光玉购买金币计算bug
1521
  
d51114bd   wangyujie   完成需求:每日金币购买
1522
  	role.dailyData:updateProperty({field = "goldBuyT", value = curT + 1})
3b4b15b1   liguanghui   齿轮加速消耗修改为虹光玉
1523
  	role:costItems({[ItemId.Jade] = costD}, {log = {desc = "goldBuy"}})
7f9f002d   liuzujun   循环周活动
1524
  	local reward, change = role:award({[ItemId.Gold] = math.floor(goldC)}, {log = {desc = "goldBuy"}})
7bb30dca   zhouhaihai   修改发奖
1525
  	SendPacket(actionCodes.Role_goldBuyRpc, MsgPack.pack(role:packReward(reward, change)))
d51114bd   wangyujie   完成需求:每日金币购买
1526
1527
1528
  	return true
  end
  
20651a9e   chenyueqi   钻石兑换虹光玉消息
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
  function _M.diamondConvertRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	
  	local oper = msg.oper
  	if oper ~= 1 and oper ~= 2 then return 0 end
  
  	local cost = math.ceil(msg.cost or 0)
  	if cost <= 0 then return 1 end
  	if role:getAllDiamond() < cost then return 2 end
  
  	local get = globalCsv.legal_tender_cost * cost
96ca7852   chenyueqi   钻石兑换招募券计算虹光玉数量bug
1541
  	role:costDiamond({count = cost, log = {desc = "convert", int1 = oper, int2 = get}})
20651a9e   chenyueqi   钻石兑换虹光玉消息
1542
1543
  	local reward, change
  	if oper == 1 then -- 钻石兑换成虹光玉
1ebe1c94   liuzujun   钻石转换日志打点
1544
  		reward, change = role:award({[ItemId.Jade] = get}, {log = {desc = "convert", short1=oper}})
20651a9e   chenyueqi   钻石兑换虹光玉消息
1545
  	elseif oper == 2 then -- 钻石兑换成虹光玉再兑换成招募券
96ca7852   chenyueqi   钻石兑换招募券计算虹光玉数量bug
1546
1547
1548
  		local old = role:getItemCount(ItemId.Jade)
  		get = old + get
  
20651a9e   chenyueqi   钻石兑换虹光玉消息
1549
  		local quan = math.floor(get/globalCsv.recruit_cost)
96ca7852   chenyueqi   钻石兑换招募券计算虹光玉数量bug
1550
1551
1552
1553
1554
1555
1556
  		local remain = get - quan * globalCsv.recruit_cost
  
  		local allReward = {}
  		if remain > old then
  			allReward[ItemId.Jade] = remain - old
  		elseif remain == old then
  		else
1ebe1c94   liuzujun   钻石转换日志打点
1557
  			role:costItems({[ItemId.Jade] = old - remain}, {log = {desc = "convert", short1=oper}})
20651a9e   chenyueqi   钻石兑换虹光玉消息
1558
  		end
96ca7852   chenyueqi   钻石兑换招募券计算虹光玉数量bug
1559
  
20651a9e   chenyueqi   钻石兑换虹光玉消息
1560
  		if quan > 0 then
efc1452c   chenyueqi   钻石兑换招募券消息完善,招募券增加...
1561
  			allReward[ItemId.RecruitmentCard] = quan
20651a9e   chenyueqi   钻石兑换虹光玉消息
1562
  		end
96ca7852   chenyueqi   钻石兑换招募券计算虹光玉数量bug
1563
  
efc1452c   chenyueqi   钻石兑换招募券消息完善,招募券增加...
1564
  		reward, change = role:award(allReward, {log = {desc = "convert"}})
20651a9e   chenyueqi   钻石兑换虹光玉消息
1565
1566
1567
1568
1569
1570
  	end
  
  	SendPacket(actionCodes.Role_diamondConvertRpc, MsgPack.pack(role:packReward(reward, change)))
  	return true
  end
  
9ea0c502   liuzujun   限时礼包
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
  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   liuzujun   付费签到,应用市场反馈
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
  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   liuzujun   自选箱子协议
1596
1597
1598
1599
  function _M.useSelectItemRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local itemId = msg.itemId
e52c384f   liuzujun   探索指令bug, 充值返利活动
1600
  	local subId = msg.subId
a6dc627f   liuzujun   自选箱子协议
1601
1602
1603
  	local count = msg.count
  	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
  	local itemData = csvdb["itemCsv"][itemId]
804a7eaf   liuzujun   万能贴纸
1604
  	if not (itemData.type == ItemType.SelectItemBox or itemData.type == ItemType.CommonPaster) then return end
a6dc627f   liuzujun   自选箱子协议
1605
  	local itemMap = itemData.use_effect:toNumMap()
a6dc627f   liuzujun   自选箱子协议
1606
1607
  	local reward, change = {}
  	for k, v in pairs(itemMap) do
e52c384f   liuzujun   探索指令bug, 充值返利活动
1608
  		if k == subId then
a6dc627f   liuzujun   自选箱子协议
1609
1610
1611
  			reward[k] = v * count
  			break
  		end
a6dc627f   liuzujun   自选箱子协议
1612
1613
1614
1615
1616
1617
1618
  	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   liuzujun   探索指令bug, 充值返利活动
1619
  	return true
a6dc627f   liuzujun   自选箱子协议
1620
1621
  end
  
98d32f92   liuzujun   多编队
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
  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   liuzujun   兑换活动,邮件内容修改
1646
1647
1648
1649
1650
1651
1652
1653
  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   liuzujun   举报功能
1654
  	SendPacket(actionCodes.Role_accuseRpc, "")
847f9a7b   liuzujun   兑换活动,邮件内容修改
1655
1656
1657
  	return true
  end
  
47904e51   chenyueqi   创角后的时间礼包
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
  function _M.getTimeGiftRpc(agent, data)
  	local role = agent.role
  
  	local GiftCsv = csvdb["time_giftCsv"]
  	local timeGift = role:getProperty("timeGift")
  	if timeGift >= #GiftCsv then return 0 end
  
  	local nextL = timeGift + 1
  	local gift = GiftCsv[nextL]
  	if not gift then return 1 end
  
  	local createtime = role:getProperty("ctime")
  	if skynet.timex() - createtime < gift.time then return 2 end
  
  	role:updateProperty({field = "timeGift", value = nextL})
  	local reward, change = role:award(gift.gift, {log = {desc = "giftTime", int1 = nextL}})
  	role:mylog("role_action", {desc = "giftTime", int1 = nextL})
  
f72f32b7   chenyueqi   时间礼包返回奖励
1676
  	SendPacket(actionCodes.Role_getTimeGiftRpc, MsgPack.pack(role:packReward(reward, change)))
47904e51   chenyueqi   创角后的时间礼包
1677
1678
1679
  	return true
  end
  
21774ba5   zhangqijia   feat: 金币购买铭文碎片
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
  function _M.runeBuyRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
      local count = msg.count
  
  	local glodCount = globalCsv.rune_exchange * count
  	if not role:checkItemEnough({[ItemId.Gold] = glodCount}) then return end
  	role:costItems({[ItemId.Gold] = glodCount}, {log = {desc = "glodConvertRune", int1 = count, int2 = glodCount}})
  	local reward, change = {}
  	reward[ItemId.RuneFragment] = count
  	reward, change = role:award(reward, {log = {desc = "glodConvertRune"}})
  	SendPacket(actionCodes.Role_runeBuyRpc, MsgPack.pack(role:packReward(reward, change)))
  	return true
  end
  
e9bfa7a2   liuzujun   其他玩家展示界面数据支持, 更新s...
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
  function _M.setFriendTeamRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
      local team = msg.team
      local info = {}
      info.team = role:getTeamHerosInfo(team)
      info.bInfo = role:getTeamBattleInfo(team)
      info.v = role:getTeamBattleValue(team.heros)
      role:updateProperty({field="friendTeam", value=info})
  
  	SendPacket(actionCodes.Role_setFriendTeamRpc, "")
  	return true
  end
  
  function _M.setBgRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
      role:updateProperty({field="bgId", value=msg.id})
  
  	SendPacket(actionCodes.Role_setBgRpc, "")
  	return true
  end
  
e3f6fe34   zhangqijia   feat: 月卡特权,购买魔导石会...
1718
  function _M.itemConvertSpecialRpc(agent, data)
eae157a4   zhangqijia   feat: 月卡 + 特刊的道具兑换
1719
1720
1721
      local role = agent.role
  	local msg = MsgPack.unpack(data)
      local itemId = msg.item_id
a93ce9c0   zhangqijia   fix: 特殊道具兑换, 增加活动...
1722
  	local exchangeId = tonumber(msg.exchange_id)
eae157a4   zhangqijia   feat: 月卡 + 特刊的道具兑换
1723
  
e3f6fe34   zhangqijia   feat: 月卡特权,购买魔导石会...
1724
1725
      local itemData = csvdb["itemCsv"][itemId]
      if not itemData then return 1 end
eae157a4   zhangqijia   feat: 月卡 + 特刊的道具兑换
1726
  
eae157a4   zhangqijia   feat: 月卡 + 特刊的道具兑换
1727
1728
1729
  	local rechargeData = csvdb["shop_rechargeCsv"][exchangeId]
  	if not rechargeData then
  		skynet.error("[recharge] recharge id not exist", exchangeId)
a93ce9c0   zhangqijia   fix: 特殊道具兑换, 增加活动...
1730
  		return 2
eae157a4   zhangqijia   feat: 月卡 + 特刊的道具兑换
1731
  	end
a93ce9c0   zhangqijia   fix: 特殊道具兑换, 增加活动...
1732
1733
1734
1735
  
  	if not role:checkItemEnough({[itemId] = 1}) then return 3 end
  
  	local reward = {}
71d319eb   zhangqijia   fix: 使用特殊道具也要增加对应...
1736
1737
1738
1739
1740
  
  	if not role.storeData:checkRechargeRecord(rechargeData.limit, exchangeId)then
  		return 5
  	end
  
a93ce9c0   zhangqijia   fix: 特殊道具兑换, 增加活动...
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
  	if rechargeData.type == CardType.ActBattleCommandCard then
  		if role.activity:isOpenById(rechargeData.activity_id, "ActShopGoods") then
  			local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
  			if tmpreward then
  				table.rewardMerge(reward, tmpreward)
  			end
  		else
  			skynet.error("not open id: ".. rechargeData.id .. "; actid: " .. rechargeData.activity_id)
  			SendPacket(actionCodes.Role_itemConvertSpecialRpc, MsgPack.pack({result = 4}))
              return true
  		end
  	else
  		local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
eae157a4   zhangqijia   feat: 月卡 + 特刊的道具兑换
1754
1755
  		if tmpreward then
  			table.rewardMerge(reward, tmpreward)
eae157a4   zhangqijia   feat: 月卡 + 特刊的道具兑换
1756
1757
1758
  		end
  	end
  
a93ce9c0   zhangqijia   fix: 特殊道具兑换, 增加活动...
1759
1760
1761
  	role:costItems({[itemId] = 1}, {log = {desc = "itemConvertSpecial", int1 = itemId, int2 = itemData.type}})
  
  	SendPacket(actionCodes.Role_itemConvertSpecialRpc, MsgPack.pack(role:packReward(reward)))
200652e6   zhangqijia   fix: 修正两个协议的返回值 r...
1762
      return true
eae157a4   zhangqijia   feat: 月卡 + 特刊的道具兑换
1763
1764
  end
  
95c9089b   zhangqijia   feat: 新增世界线积分功能。
1765
1766
  function _M.worldLineRoulette(agent, data)
  	local role = agent.role
95c9089b   zhangqijia   feat: 新增世界线积分功能。
1767
1768
1769
1770
1771
  
  	local worldChangePoints = role:getProperty("worldChangePoints") or {}
      local rouletteCount =  worldChangePoints[ItemWorldLine.RouletteCount] or 0
  	if rouletteCount == 0 then return 1 end
  
993bb525   zhangqijia   refactor: 世界线积分,倍...
1772
  	local worldline_gift_base_10, worldline_gift_base_1, worldline_gift_magnification_1, worldline_gift_magnification_0 = {}, {}, {}, {}
95c9089b   zhangqijia   feat: 新增世界线积分功能。
1773
1774
1775
1776
1777
1778
  	for k, v in pairs(globalCsv.worldline_gift_base_10) do
  		worldline_gift_base_10[k] = {v}
  	end
  	for k, v in pairs(globalCsv.worldline_gift_base_1) do
  		worldline_gift_base_1[k] = {v}
  	end
95c9089b   zhangqijia   feat: 新增世界线积分功能。
1779
1780
1781
  	for k, v in pairs(globalCsv.worldline_gift_magnification_1) do
  		worldline_gift_magnification_1[k] = {v}
  	end
993bb525   zhangqijia   refactor: 世界线积分,倍...
1782
1783
1784
  	for k, v in pairs(globalCsv.worldline_gift_magnification_0) do
  		worldline_gift_magnification_0[k] = {v}
  	end
95c9089b   zhangqijia   feat: 新增世界线积分功能。
1785
1786
1787
1788
  
      local gift_base_10 = (math.randWeight(worldline_gift_base_10, 1) or 0) * 10
  	local gift_base_1 = math.randWeight(worldline_gift_base_1, 1) or 0
  
95c9089b   zhangqijia   feat: 新增世界线积分功能。
1789
  	local gift_magnification_1 = math.randWeight(worldline_gift_magnification_1, 1) or 0
993bb525   zhangqijia   refactor: 世界线积分,倍...
1790
  	local gift_magnification_0 = (math.randWeight(worldline_gift_magnification_0, 1) or 0) * (0.1)
95c9089b   zhangqijia   feat: 新增世界线积分功能。
1791
  
993bb525   zhangqijia   refactor: 世界线积分,倍...
1792
  	local points = math.floor((gift_base_10 + gift_base_1) * (gift_magnification_1 + gift_magnification_0))
95c9089b   zhangqijia   feat: 新增世界线积分功能。
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
  	worldChangePoints[ItemWorldLine.RouletteCount] = worldChangePoints[ItemWorldLine.RouletteCount] - 1
  	worldChangePoints[ItemWorldLine.Points] = worldChangePoints[ItemWorldLine.Points] + points
      role:updateProperty({field = "worldChangePoints", value = worldChangePoints})
  
  	SendPacket(actionCodes.Role_worldLineRoulette, MsgPack.pack(worldChangePoints))
      return true
  end
  
  function _M.worldLineReward(agent, data)
  	local role = agent.role
      local worldLineReward = role:getProperty("worldLineReward") or {}
  	local worldChangePoints = role:getProperty("worldChangePoints") or {}
  	local points =  worldChangePoints[ItemWorldLine.Points] or 0
  
  	local reward, change = {}
  	for key, val in pairs(csvdb["worldline_rewardCsv"]) do
  		if points >= key and not worldLineReward[key] then
  			for k, v in pairs(val.award:toNumMap()) do
  				reward[k] = (reward[k] or 0) + v
  			end
  			worldLineReward[key] = 1
  		end
  	end
  
  	role:updateProperty({field = "worldLineReward", value = worldLineReward})
  
  	if next(reward) then
  		reward, change = role:award(reward,  {log = {desc = "worldLine", int1 = role:getProperty("id")}})
  	end
  	SendPacket(actionCodes.Role_worldLineReward, MsgPack.pack(role:packReward(reward, change)))
200652e6   zhangqijia   fix: 修正两个协议的返回值 r...
1823
  	return true
95c9089b   zhangqijia   feat: 新增世界线积分功能。
1824
1825
  end
  
314bc5df   zhengshouren   提交服务器初始代码
1826
  return _M