| 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
25
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 function validName(name)
  	name = string.upper(name)
  	local exist = redisproxy:exists(string_format("user:%s", name))
  	if exist then return "existed" end
  
  	local SERV = string_format("NAMED%d", math.random(1, 5))
  	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 = {}
 | 
| be83d162  zhouahaihai
 
登陆成功。 增加数据结构修正功能 | 57
58
59
60
61 |   	-- if msg.version ~= globalCsv.version 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
97
98
99 |   			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()
  	else
  		role:reloadWhenLogin()
  	end
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 100 |   
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 101
102
103
104
105
106
107
108
109
110
111
112
113
114
115 |   	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
 | 
| 314bc5df  zhengshouren
 
提交服务器初始代码 | 116 |   	SERV_OPEN = redisproxy:hget("autoincrement_set", "server_start")
 | 
| 314bc5df  zhengshouren
 
提交服务器初始代码 | 117 |   
 | 
| be83d162  zhouahaihai
 
登陆成功。 增加数据结构修正功能 | 118 |   	role:changeStructVersion() -- 数据结构 版本更新
 | 
| 314bc5df  zhengshouren
 
提交服务器初始代码 | 119 |   
 | 
| be83d162  zhouahaihai
 
登陆成功。 增加数据结构修正功能 | 120 |   	-- 跨天登陆事件
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 121 |   	role:onCrossDay(now)
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 122 |   	role:setProperty("ltime", now)
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 123 |   
 | 
| be9c9ca6  zhouahaihai
 
角色评论 | 124 |   
 | 
| 87cc3a35  zhengshouren
 
餐厅建筑升级逻辑 | 125 |   	for _, name in ipairs({"dailyData", "dinerData"}) do
 | 
| be9c9ca6  zhouahaihai
 
角色评论 | 126
127
128 |   		response[name] = role[name]:data()
  	end
  
 | 
| 314bc5df  zhengshouren
 
提交服务器初始代码 | 129
130
131
132 |   	response.role = role:data()
  	response.result = "SUCCESS"
  	response.serverTime = now
  
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 133
134
135
136
137
138
139 |   	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
 
好感度, 皮肤 | 140 |   	if #heroIds <= 50 then
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 141
142
143
144 |   		heroWave = 0
  		table_insert(modules, "heros")
  	end
  
 | 
| a0013f0b  zhouhaihai
 
零件分批推送 | 145
146
147
148
149
150
151
152
153
154 |   	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 | 155
156
157
158
159
160
161 |   	for _, name in ipairs(modules) do
  		response[name] = {}
  		for id, unit in pairs(role[name]) do
  			response[name][id] = unit:data()
  		end
  	end
  
 | 
| a0013f0b  zhouhaihai
 
零件分批推送 | 162 |   	response.wave = 1 + heroWave + runeWave
 | 
| 314bc5df  zhengshouren
 
提交服务器初始代码 | 163
164
165 |   
  	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  
 | 
| a0013f0b  zhouhaihai
 
零件分批推送 | 166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181 |   	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 数据结构 | 182 |   	end
 | 
| a0013f0b  zhouhaihai
 
零件分批推送 | 183 |   	curWave = curWave + runeWave
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 184 |   
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 185 |   	local heroIndex = 1
 | 
| a0013f0b  zhouhaihai
 
零件分批推送 | 186 |   	for index = curWave + 1, curWave + heroWave do
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 187
188
189
190
191
192
193
194
195
196
197
198
199 |   		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
 
零件分批推送 | 200 |   	curWave = curWave + heroWave
 | 
| 314bc5df  zhengshouren
 
提交服务器初始代码 | 201
202
203
204
205
206
207
208
209 |   
  	-- role:log("login", { ip = agent.ip, diamond = role:getProperty("diamond"), reDiamond = role:getProperty("reDiamond")})
  
  	datacenter.set("agent", roleId, {
  		serv = skynet.self(),
  		fd = agent.client_fd,
  		gate_serv = agent.gate_serv,
  	})
  	agent.role = role
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 210 |   
 | 
| 314bc5df  zhengshouren
 
提交服务器初始代码 | 211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241 |   	start_agent_timer()
  	-- 注册全服广播
  	local channel = math.randomInt(1, 1)
  	local w_channel = datacenter.get( ("MC_W_CHANNEL" .. channel) )
  	if w_channel then
  		mcast_util.sub_world(w_channel)
  	end
  	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
  
  	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
 
提交服务器初始代码 | 242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262 |   	local newRole = require("models.Role").new({
  		key = string_format("role:%d", roleId),
  		id = roleId,
  		uid = tostring(msg.uid),
  		subId = msg.subId or 0,
  		name = roleName,
  		uname = msg.uname or "",
  		device = tostring(msg.device)
  	})
  
  	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
  
 | 
| 314bc5df  zhengshouren
 
提交服务器初始代码 | 263
264
265
266
267
268
269
270
271
272
273
274
275
276
277 |   	-- 欢迎邮件
  	-- redisproxy:insertEmail({roleId = roleId, emailId = 1})
  	-- redisproxy:insertEmail({roleId = roleId, emailId = 2})
  
  	newRole:log("create", { ip = agent.ip, ucode = ucode})
  
  	SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
  	return true
  end
  
  function _M.syncTimeRpc(agent, data)
  	SendPacket(actionCodes.Role_syncTimeRpc, MsgPack.pack({nowTime = skynet.timex()}))
  	return true
  end
  
 | 
| 312b9db5  zhouahaihai
 
背包 | 278
279
280 |   function _M.saleItemRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
 | 
| 84e7c06e  zhouhaihai
 
回收 | 281
282
283
284
285
286
287
288
289
290
291
292
293
294 |   	local backs = msg.backs
  	if not backs then return end
  
  	local reward = {}
  	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
  		local sellEffect = itemData.sell_effect:toArray(true, "=")
  		reward[sellEffect[1]] = (reward[sellEffect[1]] or 0) + sellEffect[2] * count
  	end	
  	
  	role:costItems(backs)
  	local reward = role:award(reward)
 | 
| 312b9db5  zhouahaihai
 
背包 | 295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328 |   
  	SendPacket(actionCodes.Role_saleItemRpc, MsgPack.pack({reward = reward}))
  	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)]
  	if not randomData then return end
  
  	local reward = randomData.gift:toNumMap()
  	for _id, _count in pairs(reward) do
  		reward[_id] = _count * count
  	end
  	if randomData.random_num > 0 and randomData.random_gift ~= "" then
  		for i = 1, count do
  			local pool = {}
  			for _, temp in ipairs(randomData.random_gift:toArray()) do
  				table.insert(pool, temp:toArray(true, "="))
  			end
  			local needCount = math.min(#pool, randomData.random_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
  		end
  	end
 | 
| 36204e3c  zhengshouren
 
贩卖逻辑 | 329 |   	role:costItems({[itemId] = count})
 | 
| 8c199cec  zhengshouren
 
简化物品奖励接口,设置默认参数 | 330 |   	reward = role:award(reward)
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 331 |   
 | 
| 312b9db5  zhouahaihai
 
背包 | 332
333
334
335 |   	SendPacket(actionCodes.Role_openItemRpc, MsgPack.pack({reward = reward}))
  	return true
  end
  
 | 
| 00e663bd  zhouhaihai
 
剧情相关 | 336
337
338
339
340
341 |   function _M.storyBookRewardRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local storyId = msg.id
  	local storyBookData = csvdb["story_bookCsv"][storyId]
  	if not storyBookData then return end
 | 
| a1d09d22  zhouhaihai
 
bug | 342 |   	local storyStatus = role:getProperty("storyB")
 | 
| 8a01a3ae  zhouhaihai
 
bug | 343 |   	if not storyStatus[storyId] or not storyStatus[storyId].s or storyStatus[storyId].s ~= 1 then 
 | 
| a1d09d22  zhouhaihai
 
bug | 344
345 |   		return 
  	end
 | 
| 00e663bd  zhouhaihai
 
剧情相关 | 346 |   	-- 获取奖励
 | 
| 8a01a3ae  zhouhaihai
 
bug | 347 |   	storyStatus[storyId].s = -1
 | 
| 8a01a3ae  zhouhaihai
 
bug | 348 |   	role:changeUpdates({{ type = "storyB", field = storyId, value = storyStatus[storyId] }})
 | 
| 00e663bd  zhouhaihai
 
剧情相关 | 349
350
351
352
353 |   	local reward = role:award(storyBookData.gift)
  	SendPacket(actionCodes.Role_storyBookRewardRpc, MsgPack.pack({reward = reward}))
  	return true
  end
  
 | 
| 8a01a3ae  zhouhaihai
 
bug | 354 |   function _M.unLockStoryBookRpc(agent, data)
 | 
| bd15e9bc  zhouhaihai
 
购买剧情 | 355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377 |   	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  --不需要解锁
  
  	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)
  
  	-- 解锁
  	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 | 378
379 |   end
  
 | 
| 312b9db5  zhouahaihai
 
背包 | 380 |   
 | 
| 314bc5df  zhengshouren
 
提交服务器初始代码 | 381 |   return _M
 |