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