Blame view

src/actions/AdvAction.lua 30.9 KB
23d89d13   zhouahaihai   冒险 结构
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 table_unpack = table.unpack
  
8da953a7   zhouhaihai   无尽模式
17
18
  local AdvCommon = require "adv.AdvCommon"
  
23d89d13   zhouahaihai   冒险 结构
19
20
  local _M = {}
  
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
  -- 无尽模式是否开放
  local function isOpenEndless(role)
  	if role.advOverTime ~= 0 and skynet.timex() >= role.advOverTime then
  		return false
  	end
  	return true
  end
  -- 冒险内的操作是否可以继续
  local function isCanContinue(role)
  	local adv = role:getAdvData()
  	if not adv:isRunning() then return false end
  	if adv:isEndless() then
  		if not isOpenEndless(role) then return false end
  	end
  	return true
  end
  
09be9059   zhouhaihai   冒险接口
38
  
c3d5fe54   zhouhaihai   无战斗状态挂机清掉战斗队伍
39
  local function checkFormat(role, format, checkAdvTeam)
09be9059   zhouhaihai   冒险接口
40
41
42
43
44
45
46
47
48
49
  	local advHang = role:getProperty("advHang")
  	local hadHero = {}
  	for chapterId, info in pairs(advHang) do
  		if info.format then
  			for _, heroId in pairs(info.format.heros) do
  				hadHero[heroId] = true
  			end
  		end
  	end
  
98d32f92   liuzujun   多编队
50
51
52
53
  	if not format then
  		format = role:getProperty("advTeam")
  	end
  
c3d5fe54   zhouhaihai   无战斗状态挂机清掉战斗队伍
54
  	if checkAdvTeam then
09be9059   zhouhaihai   冒险接口
55
56
57
58
59
  		for _, heroId in pairs(role:getProperty("advTeam").heros or {}) do
  			hadHero[heroId] = true
  		end
  	end
  
a1d80fd6   liuzujun   多队挂机 电台任务英雄也不能重用
60
61
62
63
64
65
66
67
68
  	-- 多队挂机 电台任务英雄也不能重用
  	local radioTask = role:getProperty("radioTask")
  	for id, taskInfo in pairs(radioTask) do
  		local heros = taskInfo["heros"] or {}
  		for _, heroId in ipairs(heros) do
  			hadHero[heroId] = true
  		end
  	end
  
09be9059   zhouhaihai   冒险接口
69
  	if not format.leader then return end
bfd33de5   zhouhaihai   队长技
70
  	if format.leader2 == format.leader then return end
09be9059   zhouhaihai   冒险接口
71
  	local hadLeader = false
bfd33de5   zhouhaihai   队长技
72
73
  	local hadLeader2 = false
  	local heroCount = 0
09be9059   zhouhaihai   冒险接口
74
75
76
77
78
79
80
  	for slot, heroId in pairs(format.heros) do
  		if not role.heros[heroId] or hadHero[heroId] then
  			return
  		end
  		if heroId == format.leader then
  			hadLeader = true
  		end
bfd33de5   zhouhaihai   队长技
81
82
83
84
85
86
87
  		if heroId == format.leader2 then
  			hadLeader2 = true
  		end
  		heroCount = heroCount + 1
  	end
  	if not hadLeader2 and heroCount >= 2 then
  		return
09be9059   zhouhaihai   冒险接口
88
89
90
91
92
  	end
  	if not hadLeader then return end
  	return true
  end
  
46fac6f1   zhouahaihai   酱料
93
  --开始一个新的关卡
23d89d13   zhouahaihai   冒险 结构
94
95
96
  function _M.startAdvRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
09be9059   zhouhaihai   冒险接口
97
98
  	local chapterId = msg.chapterId --关卡id
  	local layer = msg.layer or 1	--选择层数
98d32f92   liuzujun   多编队
99
  	--local format = msg.format 		--编队
9ced5432   zhouhaihai   冒险支援效果 保底事件
100
  	local supportIdx = msg.supportIdx --选择的支援效果
d232676a   zhouhaihai   功能解锁 冒险返回
101
102
  	if not role:isFuncUnlock(FuncUnlock.Adv) then return end
  	
8da953a7   zhouhaihai   无尽模式
103
  	--上一个关卡结束才可以开始新的关卡
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
104
  	if role:getAdvData():isRunning() then return 8 end
a7c0f779   zhouhaihai   挂机加成
105
  	local advHang = role:getProperty("advHang")
533db86a   liuzujun   代理拾荒bug
106
  	-- if advHang[chapterId] then return 9 end --正在挂机
a7c0f779   zhouhaihai   挂机加成
107
  
8da953a7   zhouhaihai   无尽模式
108
  
09be9059   zhouhaihai   冒险接口
109
  	local chapterData = csvdb["adv_chapterCsv"][chapterId]
8da953a7   zhouhaihai   无尽模式
110
  	if not chapterData or layer < 1 then return  1 end
09be9059   zhouhaihai   冒险接口
111
  
47d5d769   zhouhaihai   中继判断 随机任务
112
  	local advPass = role:getProperty("advPass")
0e3ab88d   zhouhaihai   中继层
113
  
3bbb90ba   zhouhaihai   冒险次数
114
115
  	if not checkFormat(role) then return 7 end
  
0e3ab88d   zhouhaihai   中继层
116
117
  	if AdvCommon.isEndless(chapterId) then -- 无尽模式判断
  
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
118
119
  		if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节
  		if not isOpenEndless(role) then return end
0e3ab88d   zhouhaihai   中继层
120
  
e38b9c49   zhouhaihai   无尽次数
121
  		if role.dailyData:getProperty("advElC") >= role:getAdvElLimit() then return 2 end -- 是否有体力
0e3ab88d   zhouhaihai   中继层
122
123
124
  		if not role:isFuncOpen(FuncOpenType.AdvEndless) then return 11 end -- 无尽模式 才可以玩儿无尽模式
  
  		local advElM = role:getProperty("advElM")  --最高通关的层数
e51ff6d2   zhouhaihai   冒险~
125
  		if not role:advChapterIsOpen(chapterId) then return 13 end
e38b9c49   zhouhaihai   无尽次数
126
  
e51ff6d2   zhouhaihai   冒险~
127
  		if layer ~= 1 then
0e3ab88d   zhouhaihai   中继层
128
  			local relayData = role:getAdvData():isHaveRelay(layer, chapterId) 
e51ff6d2   zhouhaihai   冒险~
129
130
  			if not relayData then return 14 end  -- 不是中继层
  			if advElM < relayData.unlockfloor then return 15 end --未解锁
9ced5432   zhouhaihai   冒险支援效果 保底事件
131
  		end 
3bbb90ba   zhouhaihai   冒险次数
132
133
  
  		role.dailyData:updateProperty({field = "advElC", delta = 1})
0e3ab88d   zhouhaihai   中继层
134
  	else   -- 普通模式判断
e51ff6d2   zhouhaihai   冒险~
135
  		if layer >= chapterData.limitlevel  then return 4 end
e51ff6d2   zhouhaihai   冒险~
136
  
1ef9a7e3   zhouhaihai   错误的
137
  		local relayData = role:getAdvData():isHaveRelay(layer, chapterId, true) 
3bbb90ba   zhouhaihai   冒险次数
138
  		if not relayData then return 6 end  -- 不是中继层
e51ff6d2   zhouhaihai   冒险~
139
  		if layer ~= 1 then
f2648427   zhouhaihai   修改中继营地解锁条件
140
141
  			local advRelay = role:getProperty("advRelay") 
  			if not (advRelay[chapterId] or {})[layer] then return 21 end -- 没有开放
e51ff6d2   zhouhaihai   冒险~
142
  		end
3bbb90ba   zhouhaihai   冒险次数
143
144
145
  		if not role:checkAdvCount(relayData.supply) then return 2 end -- 是否有体力
  		-- 关卡开放判断
  		if not role:advChapterIsOpen(chapterId) then return 5 end
98d32f92   liuzujun   多编队
146
  
3bbb90ba   zhouhaihai   冒险次数
147
  		role:changeAdvCount(relayData.supply)
e38b9c49   zhouhaihai   无尽次数
148
  	end
3bbb90ba   zhouhaihai   冒险次数
149
  	
9ced5432   zhouhaihai   冒险支援效果 保底事件
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
  	local support = {}  -- 支援效果
  	if AdvCommon.isEndless(chapterId) then
  		-- 选择的支援效果
  		local advSup = role:getProperty("advSup")
  		if supportIdx then
  			if advSup[supportIdx] then
  				table.insert(support, advSup[supportIdx])
  			end
  			role:advRandomSupportEffect() -- 选完就重新随机
  		end
  		-- 增加 默认增加的支援效果
  		local active = role:getAdvActiveSupportEffect()
  		for aId, _ in pairs(active) do
  			local curData = csvdb["adv_supportCsv"][aId]
  			if curData.type == 2 then
  				table.insert(support, aId)
  			end
  		end
  	end
3bbb90ba   zhouhaihai   冒险次数
169
  
35e2e3c4   zhouhaihai   优化 gm advt 增加感知b...
170
171
172
173
174
175
176
  	role:getAdvData():initByChapter({
  		chapterId = chapterId, 
  		level = layer, 
  		isRelay = layer ~= 1, 
  		isEnter = true, 
  		support = support,
  	})
3bbb90ba   zhouhaihai   冒险次数
177
  	
53e8037e   zhouhaihai   任务
178
  	role:checkTaskEnter("AdvStart", {id = chapterId})
f60b89b1   zhouhaihai   奖励副本
179
  	role:checkTaskEnter("AdvStartSelf", {id = chapterId})
ecf464a3   zhouhaihai   冒险开始bug
180
  	role:getAdvData():popBackEvents() -- 清一下事件
f22a33af   zhouhaihai   自己的日志
181
  	role:getAdvData():mylog({desc = "start", int1 = supportIdx})
3133cb76   zhouhaihai   日志
182
  
23d89d13   zhouahaihai   冒险 结构
183
184
185
  	SendPacket(actionCodes.Adv_startAdvRpc, '')
  	return true
  end
09be9059   zhouhaihai   冒险接口
186
187
  
  function _M.startHangRpc(agent, data)
46fac6f1   zhouahaihai   酱料
188
189
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
09be9059   zhouhaihai   冒险接口
190
  	local chapterId = msg.chapterId --关卡id
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
191
  	local campId = msg.campId or 2 --营地id
09be9059   zhouhaihai   冒险接口
192
  	local format = msg.format --编队
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
193
  	local index = msg.index or 1--时间索引id
09be9059   zhouhaihai   冒险接口
194
  
f2648427   zhouhaihai   修改中继营地解锁条件
195
  	local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId] 
39e60fd1   zhouhaihai   支持上传 oss
196
  	if not chapterData then return 1 end
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
197
198
199
200
201
202
203
204
205
206
  	local campSiteData = chapterData[campId]
  	if not campSiteData then return 1 end
  	if campSiteData.idleReward_1 == "" and campSiteData.idleReward_2 == "" then return 2 end --没有奖励 没有挂机
  
  	local adv_idle_time = globalCsv.adv_idle_time[index]
  	local adv_idle_energy = globalCsv.adv_idle_energy[index]
  	local adv_idle_reward_coef = globalCsv.adv_idle_reward[index]
  	if not adv_idle_time or not adv_idle_energy or not adv_idle_reward_coef then
  		return 2
  	end
533db86a   liuzujun   代理拾荒bug
207
  	adv_idle_time = adv_idle_time * 60
09be9059   zhouhaihai   冒险接口
208
209
  
  	local advHang = role:getProperty("advHang")
39e60fd1   zhouhaihai   支持上传 oss
210
  	if advHang[chapterId] then return 3 end --正在挂机
09be9059   zhouhaihai   冒险接口
211
  
533db86a   liuzujun   代理拾荒bug
212
  	-- if role:getAdvData():isRunning() and role:getAdvData().chapterId == chapterId then return 4 end
73da9b9d   zhouhaihai   冒险队伍优化
213
  
39e60fd1   zhouhaihai   支持上传 oss
214
  	if AdvCommon.isEndless(chapterId) then return 5 end -- 无尽没有代理
a7c0f779   zhouhaihai   挂机加成
215
  
be4e8031   zhouhaihai   活动 拾荒
216
  	local advRelay = role:getProperty("advRelay") 
f2648427   zhouhaihai   修改中继营地解锁条件
217
  	if not (advRelay[chapterId] or {})[campSiteData.floor] then return 6 end -- 没有开放
a7c0f779   zhouhaihai   挂机加成
218
  
09be9059   zhouhaihai   冒险接口
219
  
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
220
  	if not role:checkAdvCount(adv_idle_energy) then return 7 end -- 是否有体力
09be9059   zhouhaihai   冒险接口
221
  
39e60fd1   zhouhaihai   支持上传 oss
222
  	if not checkFormat(role, format, role:getAdvData():isRunning()) then return 8 end --编队是否正确
09be9059   zhouhaihai   冒险接口
223
  
a7c0f779   zhouhaihai   挂机加成
224
225
226
227
228
229
230
  	local player = {}
  	local attrs = role:getTeamBattleInfo(format).heros
  	for attrName, _ in pairs(AdvAttsEnum) do
  		for _, hero in pairs(attrs) do
  			player[attrName] = (player[attrName] or 0) + hero[attrName]
  		end
  		player[attrName] = player[attrName] * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
09be9059   zhouhaihai   冒险接口
231
  	end
a7c0f779   zhouhaihai   挂机加成
232
233
234
235
236
237
238
  
  	local battleV = 1 * player["hp"]
  		+ 2 * player["atk"]
  		+ 1.25 * player["def"]
  		+ 0.226 * player["hit"]
  		+ 0.26 * player["miss"]
  
63190722   liuzujun   计算英雄战斗力,天赋,信赖
239
240
  	--print(math.ceil(battleV), campSiteData.idleValue)
  	if math.ceil(battleV) < campSiteData.idleValue then return 9 end -- 战斗力是否满足
09be9059   zhouhaihai   冒险接口
241
242
243
244
  
  	local info = {}
  	info.format = {}
  	info.format.leader = format.leader
bfd33de5   zhouhaihai   队长技
245
  	info.format.leader2 = format.leader2
09be9059   zhouhaihai   冒险接口
246
247
248
249
  	info.format.heros  = {}
  	for slot, heroId in pairs(format.heros) do
  		info.format.heros[slot] = heroId
  	end
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
250
  	info.time = skynet.timex() + adv_idle_time --挂机时间
50bcef87   liuzujun   代理拾荒开始不移除拾荒队伍阵容
251
  	info.duration = adv_idle_time
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
252
253
  	info.campId = campId
  	info.index = index
09be9059   zhouhaihai   冒险接口
254
  
c3d5fe54   zhouhaihai   无战斗状态挂机清掉战斗队伍
255
  	-- 没有在战斗  用team来挂机了  把team清掉
50bcef87   liuzujun   代理拾荒开始不移除拾荒队伍阵容
256
257
258
  	--if not role:getAdvData():isRunning() then
  	--	role:updateProperty({field = "advTeam", value = {}})
  	--end
072db127   zhouhaihai   推送
259
  	role:pushMsg({type = "adv", slot = chapterId, time = adv_idle_time})
09be9059   zhouhaihai   冒险接口
260
261
  	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
  
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
262
  	role:changeAdvCount(adv_idle_energy)
53e8037e   zhouhaihai   任务
263
  	role:checkTaskEnter("AdvStart", {id = chapterId})
f22a33af   zhouhaihai   自己的日志
264
  	role:mylog("adv_action", {desc = "startHang", int1 = chapterId})
3133cb76   zhouhaihai   日志
265
  
09be9059   zhouhaihai   冒险接口
266
267
268
269
  	SendPacket(actionCodes.Adv_startHangRpc, '')
  	return true
  end
  
96d591f7   liuzujun   天赋升级修改,增加英雄信赖
270
271
272
273
274
275
276
277
278
279
  local function addHeroFaith(role, heroId, exp)
  	local hero = role.heros[heroId]
  	if not hero then
  		return
  	end
  
  	hero:addHeroFaith(exp)
  	return hero:getProperty("faith")
  end
  
5404ee7d   zhouhaihai   冒险挂机加速
280
281
282
283
284
285
286
287
288
289
  function _M.quickHangRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local chapterId = msg.chapterId --关卡id
  	
  	local advHang = role:getProperty("advHang")
  	local info = advHang[chapterId]
  	if not info then return end 
  
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
290
291
  	local index = info.index
  	local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId]
5404ee7d   zhouhaihai   冒险挂机加速
292
  	if not chapterData then return end
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
293
294
295
296
297
298
299
300
301
  
  	local campSiteData = chapterData[info.campId]
  	if not campSiteData then return 1 end
  	if campSiteData.idleReward_1 == "" and campSiteData.idleReward_2 == "" then return 2 end --没有奖励 没有挂机
  
  	local adv_idle_time = globalCsv.adv_idle_time[index]
  	if not adv_idle_time then
  		return 2
  	end
533db86a   liuzujun   代理拾荒bug
302
  	adv_idle_time = adv_idle_time * 60
5404ee7d   zhouhaihai   冒险挂机加速
303
304
305
306
  	
  	local reward, isFull
  	if skynet.timex() >= info.time then return end  -- 已经完成了
  
533db86a   liuzujun   代理拾荒bug
307
  	local cost = math.ceil((info.time - skynet.timex()) / 3600 * globalCsv.adv_idle_quicken)
5404ee7d   zhouhaihai   冒险挂机加速
308
309
  
  	if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return end
33be3111   zhouhaihai   修改hangPass 结构
310
  	role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "advQuickHang", int1 = chapterId}})
5404ee7d   zhouhaihai   冒险挂机加速
311
312
313
  	info.time = 0
  	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
  
072db127   zhouhaihai   推送
314
  	role:pushCancel({type = "adv", slot = chapterId})
f22a33af   zhouhaihai   自己的日志
315
316
  	role:mylog("adv_action", {desc = "advQuickHang", int1 = chapterId})
  
5404ee7d   zhouhaihai   冒险挂机加速
317
318
319
320
  	SendPacket(actionCodes.Adv_quickHangRpc, '')
  	return true
  end
  
09be9059   zhouhaihai   冒险接口
321
322
323
324
325
326
327
328
329
330
331
  function _M.endHangRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local chapterId = msg.chapterId --关卡id
  	local cancel = msg.cancel  --是否是取消
  	
  	local advHang = role:getProperty("advHang")
  	local info = advHang[chapterId]
  	if not info then return end 
  
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
332
333
  	local index = info.index or 1
  	local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId]
09be9059   zhouhaihai   冒险接口
334
  	if not chapterData then return end
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
335
336
337
338
339
340
341
342
343
344
  	local campSiteData = chapterData[info.campId or 2]
  	if not campSiteData then return 1 end
  	if campSiteData.idleReward_1 == "" and campSiteData.idleReward_2 == "" then return 2 end --没有奖励 没有挂机
  
  	local adv_idle_time = globalCsv.adv_idle_time[index]
  	local adv_idle_energy = globalCsv.adv_idle_energy[index]
  	local adv_idle_reward_coef = globalCsv.adv_idle_reward[index]
  	if not adv_idle_time or not adv_idle_energy or not adv_idle_reward_coef then
  		return 2
  	end
533db86a   liuzujun   代理拾荒bug
345
  	adv_idle_time = adv_idle_time * 60
09be9059   zhouhaihai   冒险接口
346
  	
96d591f7   liuzujun   天赋升级修改,增加英雄信赖
347
  	local reward, isFull, change, heroFaithMap
09be9059   zhouhaihai   冒险接口
348
  	if skynet.timex() >= info.time then
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
349
350
  		-- 最新需求加成取消
  		--[[
a7c0f779   zhouhaihai   挂机加成
351
352
353
  		-- 英雄加成
  		local idleUnit = chapterData.idleUnit:toNumMap()
  		local upUnit = 0
be4e8031   zhouhaihai   活动 拾荒
354
355
356
357
358
359
  		for slot, heroId in pairs((info.format or {}).heros or {}) do
  			local hero = role.heros[heroId]
  			if hero then
  				if idleUnit[hero:getProperty("type")] then
  					upUnit = upUnit + idleUnit[hero:getProperty("type")]
  				end
a7c0f779   zhouhaihai   挂机加成
360
361
362
363
364
365
366
367
368
  			end
  		end
  		-- 中继加成
  		local advPass = role:getProperty("advPass")
  		local maxCampsite = nil
  		local campsiteCsv = csvdb["adv_chapter_campsiteCsv"][chapterId]
  		for _, campsite in ipairs(campsiteCsv) do
  			if campsite.floor <= advPass[chapterId] then
  				maxCampsite = campsite
be4e8031   zhouhaihai   活动 拾荒
369
370
  			else
  				break
a7c0f779   zhouhaihai   挂机加成
371
372
373
374
  			end
  		end
  
  		if not maxCampsite then return end
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
375
  		]]
96d591f7   liuzujun   天赋升级修改,增加英雄信赖
376
377
378
379
380
381
382
383
  		-- 增加英雄信赖
  		local exp = info.duration / 60
  		heroFaithMap = {}
  		for _, heroId in pairs(info.format.heros) do
  			local curFaith = addHeroFaith(role, heroId, exp)
  			heroFaithMap[heroId] = curFaith
  		end
  
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
384
  		local totalReward = campSiteData.idleReward_1 .. " " .. campSiteData.idleReward_2
a7c0f779   zhouhaihai   挂机加成
385
  
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
386
  		local idleReward = totalReward:toNumMap()
a7c0f779   zhouhaihai   挂机加成
387
  		for itemId, count in pairs(idleReward) do
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
388
  			idleReward[itemId] = count * adv_idle_reward_coef
a7c0f779   zhouhaihai   挂机加成
389
  		end
7bb30dca   zhouhaihai   修改发奖
390
  		reward, change = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
09be9059   zhouhaihai   冒险接口
391
392
  	else
  		if cancel then
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
393
  			--role:changeAdvCount(-chapterData.limitlevel)
fc316d1f   zhouhaihai   冒险体力优化
394
395
396
397
398
  			-- if role:getProperty("advC") <= 0 then 
  			-- 	isFull = true
  			-- else
  			-- 	role:updateProperty({field = "advC", delta = -chapterData.limitlevel})
  			-- end
072db127   zhouhaihai   推送
399
  			role:pushCancel({type = "adv", slot = chapterId})
09be9059   zhouhaihai   冒险接口
400
  		else
46fac6f1   zhouahaihai   酱料
401
402
403
  			return
  		end
  	end
09be9059   zhouhaihai   冒险接口
404
405
406
  	
  	role:changeUpdates({{type = "advHang", field = chapterId, value = nil}})
  
f22a33af   zhouhaihai   自己的日志
407
408
  	role:mylog("adv_action", {desc = "endHang", int1 = chapterId, short1 = cancel and 1 or 0})
  
e0ad10e9   liuzujun   英雄帖任务简单类型测试
409
410
  	role:checkTaskEnter("AdvHang", {})
  
96d591f7   liuzujun   天赋升级修改,增加英雄信赖
411
  	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull, heroFaith = heroFaithMap}))
09be9059   zhouhaihai   冒险接口
412
413
414
415
416
417
418
419
  	return true
  end
  
  function _M.buyAdvCountRpc(agent , data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	
  	local count = msg.count --购买次数
e38b9c49   zhouhaihai   无尽次数
420
421
422
  	local isEl = msg.isEl -- 是否是无尽模式
  	local cost
  	if isEl then
0e3ab88d   zhouhaihai   中继层
423
  		if math.illegalNum(count, 1, globalCsv.adv_endless_daily_buy_count - role.dailyData:getProperty("advElBC")) then return end
e38b9c49   zhouhaihai   无尽次数
424
425
  		cost = {[ItemId.Diamond] = count * globalCsv.adv_endless_daily_buy_cost}
  	else
0e3ab88d   zhouhaihai   中继层
426
  		if math.illegalNum(count, 1, globalCsv.adv_daily_buy_count - role.dailyData:getProperty("advBC")) then return end
e38b9c49   zhouhaihai   无尽次数
427
428
429
430
  		cost = {[ItemId.Diamond] = count * globalCsv.adv_daily_buy_cost}
  	end
  	
  	
09be9059   zhouhaihai   冒险接口
431
  	if not role:checkItemEnough(cost) then return end
887c1843   zhouhaihai   日志新一批
432
  	role:costItems(cost, {log = {desc = "buyAdvCount", int1 = isEl and 1 or 0, int2 = count}})
e38b9c49   zhouhaihai   无尽次数
433
434
435
436
  	if isEl then
  		role.dailyData:updateProperty({field = "advElC", delta = -count})
  		role.dailyData:updateProperty({field = "advElBC", delta = count})
  	else
fc316d1f   zhouhaihai   冒险体力优化
437
  		role:changeAdvCount(-count * globalCsv.adv_daily_buy_num)
e38b9c49   zhouhaihai   无尽次数
438
439
  		role.dailyData:updateProperty({field = "advBC", delta = count})
  	end
f22a33af   zhouhaihai   自己的日志
440
  	role:mylog("adv_action", {desc = "buyAdvCount", short1 = isEl and 1 or 0, int1 = count})
09be9059   zhouhaihai   冒险接口
441
442
  	
  	SendPacket(actionCodes.Adv_buyAdvCountRpc, '')
46fac6f1   zhouahaihai   酱料
443
444
445
  	return true
  end
  
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
446
447
448
449
  function _M.finishTaskRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
450
  	if not isCanContinue(role) then return end
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
451
452
  	local adv = role:getAdvData()
  	local taskId = msg.taskId  -- -1 则是主线任务
7bb30dca   zhouhaihai   修改发奖
453
  	local status, reward, change
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
454
  	if taskId == -1 then
7bb30dca   zhouhaihai   修改发奖
455
  		status, reward, change = adv:finishMTask()
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
456
457
  	else
  		status, reward = adv:finishTask(taskId)
b176d7d3   zhouhaihai   冒险成就
458
459
  		adv:checkAchievement(adv.AchievType.TaskLayer, 1, taskId)
  		adv:updateAchievement()
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
460
  	end
f99f48df   zhouhaihai   冒险任务
461
  	adv:updateTask()
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
462
  	if not status then return end
53e8037e   zhouhaihai   任务
463
  	role:checkTaskEnter("AdvOverTask", {id = taskId})
3133cb76   zhouhaihai   日志
464
  
f22a33af   zhouhaihai   自己的日志
465
  	adv:mylog({desc = "finishTask", int1 = taskId})
97807511   zhouhaihai   增加日志
466
467
468
469
470
471
472
473
474
475
  	
  	role:log("mission_pick_achiev", {
  		mission_threadid = adv.chapterId, -- 大地图ID
  		mission_threadname = (csvdb["adv_chapterCsv"][adv.chapterId] or {})["chapter"] or "auto", -- 大地图名称
  		mission_id = adv.level, -- 关卡ID
  		mission_sequenceid = adv.logid, -- 本次拾荒ID,用于关联一次拾荒产生多条不同类型的日志
  		mission_pick_achiev_id = taskId, -- 任务ID
  		mission_pick_achiev_reward = reward, -- 任务奖励,[{"id":101,"num":10},{"id":102,"num":20},{"id":103,"num":30}]
  	})
  
f22a33af   zhouhaihai   自己的日志
476
  
7bb30dca   zhouhaihai   修改发奖
477
  	SendPacket(actionCodes.Adv_finishTaskRpc, MsgPack.pack(role:packReward(reward, change)))
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
478
479
480
  	return true
  end
  
46fac6f1   zhouahaihai   酱料
481
482
483
484
485
  -- 点击地块(解锁)(触发事件)
  function _M.clickBlockRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
6fc397d6   zhouhaihai   角色新突破 冒险优化点击地块
486
487
488
489
490
491
492
493
  	local function returnFail(status)
  		SendPacket(actionCodes.Adv_clickBlockRpc, MsgPack.pack({events = {}}))
  		return true or status -- 调试使用 status
  	end
  
  	if not isCanContinue(role) then
  		return returnFail()
  	end
46fac6f1   zhouahaihai   酱料
494
  	local adv = role:getAdvData()
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
495
  
6fc397d6   zhouhaihai   角色新突破 冒险优化点击地块
496
  	if adv:isWaitChooseArtifact() then return returnFail() end
3133cb76   zhouhaihai   日志
497
  
f22a33af   zhouhaihai   自己的日志
498
499
  	adv:mylog({desc = "clickBlock", int1 = msg.roomId, int2 = msg.blockId})
  
8c4a6f4c   zhouhaihai   冒险增加错误返回
500
  	local status, errorCode = adv:clickBlock(msg.roomId, msg.blockId, msg)
6fc397d6   zhouhaihai   角色新突破 冒险优化点击地块
501
  	if not status then return returnFail(errorCode) end
3133cb76   zhouhaihai   日志
502
  
46fac6f1   zhouahaihai   酱料
503
504
505
506
507
508
509
510
511
  	SendPacket(actionCodes.Adv_clickBlockRpc, MsgPack.pack({events = adv:popBackEvents()}))
  	return true
  end
  
  --use item 使用背包道具
  function _M.useItemRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
25a376de   zhouhaihai   冒险使用道具
512
513
514
515
516
517
518
  	local itemId = msg.itemId -- 道具Id
  	local count = msg.count or 1 --数量
  	local target = msg.target -- {roomId = 1, blockId = 1} 选择的目标
  
  	local itemData = csvdb["adv_itemCsv"][itemId] 
  	if not itemData then return end
  
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
519
  	if not isCanContinue(role) then return end
46fac6f1   zhouahaihai   酱料
520
  	local adv = role:getAdvData()
ccbafe67   zhouhaihai   冒险神器和buff
521
  	if adv:isWaitChooseArtifact() then return end
25a376de   zhouhaihai   冒险使用道具
522
523
524
525
  	--重置数量 
  	if itemData["function"] == 0 or itemData["function"] == 2 then count = 1 end
  	if not adv:cost({[itemId] = count}, {}, true) then return true end
  
25a376de   zhouhaihai   冒险使用道具
526
527
  	--消耗
  	if itemData["function"] == 0 or itemData["function"] == 1 then 
498f0eb2   zhouhaihai   冒险 action
528
  		adv:cost({[itemId] = count}, {log = {desc = "useItem", int1 = itemId, int2 = count}})
85ded242   zhouhaihai   丰富返回事件
529
  		adv:backUse({[itemId] = count})
25a376de   zhouhaihai   冒险使用道具
530
  	end
8955225b   zhouhaihai   快速拾取。快速使用
531
532
  	
  	adv:useItem(itemId, count, target)
6dc482bb   zhouhaihai   中继层完成, 新增两个冒险物品使用效果
533
  	
25a376de   zhouhaihai   冒险使用道具
534
535
536
  	adv:afterRound()
  	adv:saveDB()
  
46fac6f1   zhouahaihai   酱料
537
538
539
540
  	SendPacket(actionCodes.Adv_useItemRpc, MsgPack.pack({events = adv:popBackEvents()}))
  	return true
  end
  
42f2d1d3   suhongyang   战斗内技能序列逻辑
541
  --使用营养技能
d27ad5e0   suhongyang   使用营养技
542
  function _M.usePotionRpc(agent, data)
46fac6f1   zhouahaihai   酱料
543
544
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
4f0a5fae   zhouhaihai   营养剂
545
546
547
548
549
550
551
552
553
554
555
556
557
558
  	local potionId = msg.potionId -- 营养剂Id
  	local target = msg.target -- {roomId = 1, blockId = 1} 选择的目标
  	local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 0)
  	if potionLv == 0 then return 1 end
  
  	local potionSet = csvdb["adv_potionCsv"][potionId]
  	if not potionSet then return 2 end
  
  	local potionData = potionSet[potionLv]
  	if not potionData then return 3 end
  
  	local potionBag = role:getProperty("potionBag")
  	local own = potionBag[potionId] or 0
  	if own <= 0 then return 4 end
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
559
560
  
  	if not isCanContinue(role) then return end
46fac6f1   zhouahaihai   酱料
561
  	local adv = role:getAdvData()
ccbafe67   zhouhaihai   冒险神器和buff
562
563
  	if adv:isWaitChooseArtifact() then return end
  
f22a33af   zhouhaihai   自己的日志
564
  	adv:mylog({desc = "usePotion", int1 = potionId})
3133cb76   zhouhaihai   日志
565
  
4f0a5fae   zhouhaihai   营养剂
566
  	local status = adv:doActive(potionData.effect, target) -- target
46fac6f1   zhouahaihai   酱料
567
  	if not status then return end
4f0a5fae   zhouhaihai   营养剂
568
569
570
  
  	potionBag[potionId] = own - 1
  	role:updateProperty({field = "potionBag", value = potionBag})
85ded242   zhouhaihai   丰富返回事件
571
  	adv:pushBackEvent(AdvBackEventType.Potion, {id = potionId})
4f0a5fae   zhouhaihai   营养剂
572
573
574
575
  	adv:afterRound()
  	adv:saveDB()
  	role:checkTaskEnter("AdvUsePotion")
  
1e9cb217   chenyueqi   服务器记录控制引导过程
576
577
  	role:finishGuide(61)
  
d27ad5e0   suhongyang   使用营养技
578
  	SendPacket(actionCodes.Adv_usePotionRpc, MsgPack.pack({events = adv:popBackEvents()}))
46fac6f1   zhouahaihai   酱料
579
580
  	return true
  end
23d89d13   zhouahaihai   冒险 结构
581
  
ccbafe67   zhouhaihai   冒险神器和buff
582
583
584
585
  -- 选择神器
  function _M.chooseArtifactRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
ccbafe67   zhouhaihai   冒险神器和buff
586
  
41e118a5   zhouhaihai   增加输出
587
  	if not isCanContinue(role) then return 1 end
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
588
589
  
  	local adv = role:getAdvData()
41e118a5   zhouhaihai   增加输出
590
591
  	if not msg.idx then return 2 end
  	if not adv:isWaitChooseArtifact() then return 3 end
ccbafe67   zhouhaihai   冒险神器和buff
592
  	local status = adv:chooseArtifact(msg.idx)
41e118a5   zhouhaihai   增加输出
593
  	if not status then return 4 end
ccbafe67   zhouhaihai   冒险神器和buff
594
  	adv:saveDB()
3133cb76   zhouhaihai   日志
595
  	
ccbafe67   zhouhaihai   冒险神器和buff
596
597
598
599
600
601
602
603
604
605
606
  	SendPacket(actionCodes.Adv_chooseArtifactRpc, '')
  	return true
  end
  
  -- 穿戴神器
  function _M.wearArtifactRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local slot = msg.slot
  	local id = msg.id
  
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
607
608
  	if not isCanContinue(role) then return end
  
ccbafe67   zhouhaihai   冒险神器和buff
609
610
  	local adv = role:getAdvData()
  
d3da3368   zhouhaihai   冒险地图被动技, buff 神器
611
  	if math.illegalNum(slot, 1, 5) then return 1 end
c992c911   zhouhaihai   中继
612
  	if adv:isWaitChooseArtifact() then return 2 end
ccbafe67   zhouhaihai   冒险神器和buff
613
614
  
  	local status = adv:wearArtifact(slot, id)
c992c911   zhouhaihai   中继
615
  	if not status then return 3 end
97807511   zhouhaihai   增加日志
616
  
ccbafe67   zhouhaihai   冒险神器和buff
617
618
  	adv:saveDB()
  
1e9cb217   chenyueqi   服务器记录控制引导过程
619
620
  	role:finishGuide(55)
  
ccbafe67   zhouhaihai   冒险神器和buff
621
622
623
624
625
626
627
628
629
630
  	SendPacket(actionCodes.Adv_wearArtifactRpc, '')
  	return true
  end
  
  -- 升级神器
  function _M.upArtifactRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
  
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
631
632
  	if not isCanContinue(role) then return end
  
ccbafe67   zhouhaihai   冒险神器和buff
633
  	local adv = role:getAdvData()
d3da3368   zhouhaihai   冒险地图被动技, buff 神器
634
  	if adv:isWaitChooseArtifact() then return 1 end
ccbafe67   zhouhaihai   冒险神器和buff
635
  	local curLevel = adv:isHaveArtifact(id)
d3da3368   zhouhaihai   冒险地图被动技, buff 神器
636
637
638
639
  	if not curLevel then return 2 end
  	if not role:isArtifactOpen(id, adv:isEndless(), curLevel + 1) then return 3 end
  	local cost = csvdb["adv_artifactCsv"][id][curLevel].exp:toNumMap()
  	if not adv:cost(cost, {}, true) then return 4 end
ccbafe67   zhouhaihai   冒险神器和buff
640
641
  
  	local status = adv:artifactLevelUp(id)
97807511   zhouhaihai   增加日志
642
643
644
645
646
647
648
649
650
651
652
653
654
655
  	if not status then 
  		return 5 
  	else
  		role:log("mission_pick_reform", {
  			mission_threadid = adv.chapterId, -- 大地图ID
  			mission_threadname = (csvdb["adv_chapterCsv"][adv.chapterId] or {})["chapter"] or "auto", -- 大地图名称
  			mission_id = adv.level, -- 关卡ID
  			mission_pick_equip_id = id, -- 神器ID
  			mission_pick_reform_beflv = curLevel, -- 神器原等级
  			mission_pick_reform_aftlv = curLevel + 1, -- 神器现等级
  			mission_pick_reform_cost = cost[ItemId.AdvPoint], -- 消耗探险点数
  			mission_sequenceid = adv.logid, -- 本次拾荒ID,用于关联一次拾荒产生多条不同类型的日志
  		})
  	end
498f0eb2   zhouhaihai   冒险 action
656
  	adv:cost(cost, {log = {desc = "upArtifact", int1 = id}})
85ded242   zhouhaihai   丰富返回事件
657
  	adv:backCost(cost)
ccbafe67   zhouhaihai   冒险神器和buff
658
659
  	if status == 1 then -- 现在穿着呢。更新下
  		adv:saveDB()
284482c6   zhouhaihai   冒险成就
660
661
  	else
  		adv:updateAchievement()
ccbafe67   zhouhaihai   冒险神器和buff
662
  	end
1e9cb217   chenyueqi   服务器记录控制引导过程
663
  
ccbafe67   zhouhaihai   冒险神器和buff
664
665
666
667
  	SendPacket(actionCodes.Adv_upArtifactRpc, '')
  	return true
  end
  
ec87b4a5   zhouahaihai   冒险 完善
668
669
670
671
  --退出
  function _M.exitAdvRpc(agent, data)
  	local role = agent.role
  	-- local msg = MsgPack.unpack(data)
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
672
  	if not isCanContinue(role) then return end
0c90a4f4   chenyueqi   拾荒引导结束要设定引导步骤为成就引导
673
  	-- 冒险中途退出的时候要把引导步骤设定到成就引导
1e9cb217   chenyueqi   服务器记录控制引导过程
674
675
676
  	if not role:checkOverGuide(57) then
  		role:saveGuide(57,1,true)
  	end
ec87b4a5   zhouahaihai   冒险 完善
677
  	local adv = role:getAdvData()
f22a33af   zhouhaihai   自己的日志
678
  	adv:mylog({desc = "exit"})
ec87b4a5   zhouahaihai   冒险 完善
679
680
681
682
683
  	local status = adv:exit() -- target {roomId = 1, blockId = 1} 选择的目标
  	SendPacket(actionCodes.Adv_exitAdvRpc, MsgPack.pack({events = adv:popBackEvents()}))
  	return true
  end 
  
12f7b52c   zhouhaihai   冒险战斗
684
685
686
687
688
689
690
691
692
693
694
  --开始战斗
  function _M.startBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	-- 校验一下信息
  	local roomId = msg.roomId
  	local blockId = msg.blockId
  	local monsterId = msg.monsterId
  	local enemyId = msg.enemyId
  	if not enemyId then return end
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
695
  	if not isCanContinue(role) then return end
12f7b52c   zhouhaihai   冒险战斗
696
697
  
  	local adv = role:getAdvData()
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
698
  
ccbafe67   zhouhaihai   冒险神器和buff
699
  	if adv:isWaitChooseArtifact() then return end
12f7b52c   zhouhaihai   冒险战斗
700
701
  	local enemy = adv.battle:getEnemyById(enemyId)
  
5aecad36   zhouhaihai   安全判定
702
  	if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end
12f7b52c   zhouhaihai   冒险战斗
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
  
  	local key = tostring(math.random())
  	adv.__battleCache = {
  		enemyId = enemyId,
  		key = key
  	}
  	SendPacket(actionCodes.Adv_startBattleRpc, MsgPack.pack({key = key}))
  	return true
  end
  
  -- 结束战斗
  function _M.endBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local roomId = msg.roomId
  	local blockId = msg.blockId
  	local monsterId = msg.monsterId
  	local enemyId = msg.enemyId
  	local key =  msg.key
  	local player = msg.player
d3da3368   zhouhaihai   冒险地图被动技, buff 神器
723
  	local bySkill = msg.bySkill --死于 技能
12f7b52c   zhouhaihai   冒险战斗
724
725
  
  	if not player or not player.hp or not player.sp or not enemyId or not key then return end
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
726
727
  	if not isCanContinue(role) then return end
  	
12f7b52c   zhouhaihai   冒险战斗
728
  	local adv = role:getAdvData()
ccbafe67   zhouhaihai   冒险神器和buff
729
  	if adv:isWaitChooseArtifact() then return end
12f7b52c   zhouhaihai   冒险战斗
730
731
732
733
  	-- 校验
  	if not adv.__battleCache then return end
  	if adv.__battleCache.enemyId ~= enemyId then return end
  	local enemy = adv.battle:getEnemyById(enemyId)
5aecad36   zhouhaihai   安全判定
734
  	if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end
12f7b52c   zhouhaihai   冒险战斗
735
736
  	adv.__battleCache = nil
  
1e9cb217   chenyueqi   服务器记录控制引导过程
737
738
739
740
741
742
743
744
745
746
747
748
  	-- 打完野猪怪
  	role:finishGuide(52)
  	-- 调理剂使用引导(生命药剂)
  	if not role:checkOverGuide(61) then
  		local potionBag = role:getProperty("potionBag")
  		local own = potionBag[10] or 0
  		if own > 0 then
  			-- 造假
  			player.hp = player.hp * 0.8
  			role:saveGuide(61,1,true)
  		end
  	end
f22a33af   zhouhaihai   自己的日志
749
  	adv:mylog({desc = "endBattle"})
8cfb25d7   zhouhaihai   传递 敌人信息
750
  	local status = adv:clickBlock(roomId, blockId, {player = player, enemy = msg.enemy, bySkill = bySkill})
3133cb76   zhouhaihai   日志
751
  
12f7b52c   zhouhaihai   冒险战斗
752
753
754
755
756
  	if not status then return end
  	SendPacket(actionCodes.Adv_endBattleRpc, MsgPack.pack({events = adv:popBackEvents()}))
  	return true
  end
  
007af97e   zhouhaihai   item_random 结构更改
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
  -- function _M.workshopRpc(agent, data)
  -- 	local role = agent.role
  -- 	local msg = MsgPack.unpack(data)
  
  -- 	local id = msg.id 
  -- 	local count = msg.count or 1
  -- 	local mergeData = csvdb["adv_mergeCsv"][id]
  -- 	if not mergeData then return 1 end
  
  -- 	if not role:isFuncOpen(FuncOpenType.AdvWS) or role:getFuncLv(FuncOpenType.AdvWS) < mergeData.unlock then return 2 end
  
  -- 	local advWs = role.dailyData:getProperty("advWs")
  -- 	if math.illegalNum(count, 1, mergeData.limit - (advWs[id] or 0)) then return 3 end
  
  -- 	local cost = mergeData.formula:toNumMap()
  -- 	for k, v in pairs(cost) do
  -- 		cost[k] = v * count
  -- 	end
  -- 	if not role:checkItemEnough(cost) then return 4 end
  
  -- 	role:costItems(cost)
  -- 	advWs[id] = (advWs[id] or 0) + count
  -- 	role.dailyData:updateProperty({field = "advWs", value = advWs})
  -- 	local reward = role:award({[id] = count})
  -- 	SendPacket(actionCodes.Adv_workshopRpc, MsgPack.pack({reward = reward}))
  -- 	return true
  -- end
12f7b52c   zhouhaihai   冒险战斗
784
  
f4c65591   zhouhaihai   抽奖
785
786
  function _M.wheelSurfRpc(agent, data)
  	local role = agent.role
81032a9c   zhouhaihai   抽奖
787
  	-- if not role:isFuncOpen(FuncOpenType.AdvWheelSurf) then return end -- 默认解锁
b176d7d3   zhouhaihai   冒险成就
788
  
81032a9c   zhouhaihai   抽奖
789
  	local msg = MsgPack.unpack(data)
f4c65591   zhouhaihai   抽奖
790
  
81032a9c   zhouhaihai   抽奖
791
792
  	local ptype = msg.ptype  -- 池子类型 1, 2
  	local ctype = msg.ctype  -- 抽取次数  1 1次,2 10次
f4c65591   zhouhaihai   抽奖
793
  
81032a9c   zhouhaihai   抽奖
794
795
796
797
798
  	local countPool = {
  		[1] = 1,
  		[2] = 10
  	}
  	local count = countPool[ctype]
8f5218e6   zhouhaihai   犯回错误区分
799
  	if not count then return 1 end
f4c65591   zhouhaihai   抽奖
800
  
6b5c9206   zhouhaihai   冒险资助升级属性奖励
801
  	if ptype == 2 and not role:isFuncOpen(FuncOpenType.AdvEndless) then
8f5218e6   zhouhaihai   犯回错误区分
802
  		return 2
6b5c9206   zhouhaihai   冒险资助升级属性奖励
803
  	end
f4c65591   zhouhaihai   抽奖
804
  
81032a9c   zhouhaihai   抽奖
805
  	local drawTypeData = csvdb["adv_wheelsurfCsv"][ptype]
8f5218e6   zhouhaihai   犯回错误区分
806
  	if not drawTypeData then return 3 end
6b5c9206   zhouhaihai   冒险资助升级属性奖励
807
  	local drawData = drawTypeData[role:getAdvWheelSurfLv(ptype)]
8f5218e6   zhouhaihai   犯回错误区分
808
  	if not drawData then return 4 end
f4c65591   zhouhaihai   抽奖
809
  
7474dd12   zhouhaihai   资助抽奖bug
810
811
812
813
  	local cost = drawData.cost:toArray(true, "=")
  	local costs = {[ItemId.OldCoin] = cost[ctype]}
  	if not next(costs) then return 6 end
  
f4c65591   zhouhaihai   抽奖
814
  
8f5218e6   zhouhaihai   犯回错误区分
815
  	if not role:checkItemEnough(costs) then return 5 end
3133cb76   zhouhaihai   日志
816
  	role:costItems(costs, {log = {desc = "advWheelSurf", int1 = ptype}})
97807511   zhouhaihai   增加日志
817
  	local oldLv, lv = role:addAdvLvExp(costs[ItemId.OldCoin] or 0)
764e5296   zhouhaihai   冒险抽奖保底
818
819
820
  	local advDrawB = role:getProperty("advDrawB")
  	advDrawB[ptype] = (advDrawB[ptype] or 0) + count
  	role:updateProperty({field = "advDrawB", value = advDrawB})
81032a9c   zhouhaihai   抽奖
821
  	-- 随机池子
81032a9c   zhouhaihai   抽奖
822
823
824
  	local reward = {}
  	local backReward = {}
  	for i = 1, count do
7474dd12   zhouhaihai   资助抽奖bug
825
  		local pool = drawData.weight:randWeight()
81032a9c   zhouhaihai   抽奖
826
827
828
829
  		local gift = drawData["pool" .. pool]:randWeight(true)
  		reward[gift[1]] = (reward[gift[1]] or 0) + gift[2]
  		table.insert(backReward, gift)
  	end
3133cb76   zhouhaihai   日志
830
  	role:award(reward, {log = {desc = "advWheelSurf", int1 = ptype}})
1e9cb217   chenyueqi   服务器记录控制引导过程
831
  	role:finishGuide(58)
f22a33af   zhouhaihai   自己的日志
832
  
9912e064   zhouhaihai   新增3个每日任务类型
833
  	role:checkTaskEnter("AdvDraw", {count = count, ptype = ptype})
f22a33af   zhouhaihai   自己的日志
834
  	role:mylog("adv_action", {desc = "advWheelSurf", int1 = ptype, int2 = count})
3133cb76   zhouhaihai   日志
835
  
97807511   zhouhaihai   增加日志
836
837
838
839
840
841
842
843
844
845
  	role:log("mission_pick_fund", {
  		item_id = ItemId.OldCoin, -- 资助花费道具ID
  		mission_pick_fund_amount = costs[ItemId.OldCoin], -- 资助花费道具数量
  		mission_pick_fund_cnt = count, -- 资助花费道具次数,1或者10
  		mission_pick_fund_reward = reward, -- 资助获得奖励,[{"id":100,"num":10},{"id":101,"num":20},{"id":102,"num":30}]
  		mission_pick_fund_stagereward = {}, -- 资助阶段奖励
  		mission_pick_fund_beflv = oldLv, -- 资助前资助等级
  		mission_pick_fund_aftlv = lv, -- 资助后资助等级
  	})
  
81032a9c   zhouhaihai   抽奖
846
  	SendPacket(actionCodes.Adv_wheelSurfRpc, MsgPack.pack({reward = backReward}))
f4c65591   zhouhaihai   抽奖
847
848
  	return true
  end
764e5296   zhouhaihai   冒险抽奖保底
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
  function _M.repayWheelSurfRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local ptype = msg.ptype
  
  	if ptype == 2 and not role:isFuncOpen(FuncOpenType.AdvEndless) then
  		return
  	end
  
  	local drawTypeData = csvdb["adv_wheelsurfCsv"][ptype]
  	if not drawTypeData then return end
  	local drawData = drawTypeData[role:getAdvWheelSurfLv(ptype)]
  	if not drawData then return end
  
  	local advDrawB = role:getProperty("advDrawB")
  	if (advDrawB[ptype] or 0) < globalCsv.adv_draw_back_cond then
  		return
  	end
  	advDrawB[ptype] = advDrawB[ptype] - globalCsv.adv_draw_back_cond
  	role:updateProperty({field = "advDrawB", value = advDrawB})
  	local gift = drawData["pool3"]:randWeight(true)
7bb30dca   zhouhaihai   修改发奖
871
872
  	local reward, change = {[gift[1]] = gift[2]}
  	reward, change = role:award(reward, {log = {desc = "advRepayWheelSurf", int1 = ptype}})
f22a33af   zhouhaihai   自己的日志
873
  	role:mylog("adv_action", {desc = "advRepayWheelSurf", int1 = ptype})
764e5296   zhouhaihai   冒险抽奖保底
874
  
7bb30dca   zhouhaihai   修改发奖
875
  	SendPacket(actionCodes.Adv_repayWheelSurfRpc, MsgPack.pack(role:packReward(reward, change)))
764e5296   zhouhaihai   冒险抽奖保底
876
877
  	return true
  end
f4c65591   zhouhaihai   抽奖
878
  
b176d7d3   zhouhaihai   冒险成就
879
880
881
  function _M.finishAchievRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
9ced5432   zhouhaihai   冒险支援效果 保底事件
882
  	local ctype = msg.ctype or 2 -- 领取类型 1 成就  2 pt累计奖励
b176d7d3   zhouhaihai   冒险成就
883
884
885
886
  	local chapterId = msg.chapterId --章节id
  	local taskId = msg.taskId  -- 领取id
  
  	local adv = role:getAdvData()
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
887
  
7bb30dca   zhouhaihai   修改发奖
888
  	local status, reward, change
9ced5432   zhouhaihai   冒险支援效果 保底事件
889
  	if ctype == 1 then
7bb30dca   zhouhaihai   修改发奖
890
  		status, reward, change = adv:finishAchievement(chapterId, taskId)
9ced5432   zhouhaihai   冒险支援效果 保底事件
891
  	elseif ctype == 2 then
7bb30dca   zhouhaihai   修改发奖
892
  		status, reward, change = adv:getAchievementReward(chapterId, taskId)
9ced5432   zhouhaihai   冒险支援效果 保底事件
893
  	end
b176d7d3   zhouhaihai   冒险成就
894
895
  	if not status then return end
  	adv:updateAchievement()
1e9cb217   chenyueqi   服务器记录控制引导过程
896
  	role:finishGuide(57)
f22a33af   zhouhaihai   自己的日志
897
898
  	role:mylog("adv_action", {desc = "finishAchiev", short1 = ctype, int1 = chapterId, int2 = taskId})
  
7bb30dca   zhouhaihai   修改发奖
899
  	SendPacket(actionCodes.Adv_finishAchievRpc, MsgPack.pack(role:packReward(reward, change)))
b176d7d3   zhouhaihai   冒险成就
900
901
902
  	return true
  end
  
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
903
904
905
906
  function _M.rankRpc(agent, data)
  	local role = agent.role
  
  	local list = {}
b2e41074   zhouhaihai   冒险 排行榜拆分
907
  	local ids = redisproxy:zrevrange(role:getAdvRankKey(), 0 , 99, "WITHSCORES")
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
908
909
910
  	local redret = {}
  	if ids and next(ids) then
  		redret = redisproxy:pipelining(function (red)
1313eac0   zhouhaihai   冒险的一些bug
911
  			for i = 1, #ids, 2 do
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
912
  				local roleId = ids[i]
1313eac0   zhouhaihai   冒险的一些bug
913
914
  				local score = tonum(ids[i + 1])
  				table.insert(list, {roleId = tonumber(roleId), score = score})
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
915
916
917
918
919
920
921
922
923
924
  				red:hget(RANK_ADV_INFO, roleId)
  			end
  		end)
  	end
  	for i = 1, #redret do
  		local player = MsgPack.unpack(redret[i])
  		player.format = nil
  		list[i].player = player
  	end
  	local redret = redisproxy:pipelining(function(red)
b2e41074   zhouhaihai   冒险 排行榜拆分
925
926
  		red:ZREVRANK(role:getAdvRankKey(), role:getProperty("id"))
  		red:zscore(role:getAdvRankKey(), role:getProperty("id"))
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
927
928
929
930
931
932
933
934
935
936
937
938
  	end)
  	local rank = redret[1]
  	if not rank then
  		rank = -1
  	else
  		rank = redret[1] + 1
  	end
  	local score = tonum(redret[2], 0)
  
  	SendPacket(actionCodes.Adv_rankRpc, MsgPack.pack({list = list, rank = rank, score = score}))
  	return true
  end
ae20365b   suhongyang   Revert "修改冒险战斗逻辑"
939
  
9ced5432   zhouhaihai   冒险支援效果 保底事件
940
941
942
943
944
945
946
  function _M.refreshSupportRpc(agent, data)
  	local role = agent.role
  
  	local cr = role.dailyData:getProperty("advSupRe")	
  	local al = role:getAdvSupportFreeCount()
  
  	if cr < al then  --免费
1a04c06c   zhouhaihai   冒险 被动调整
947
  		role.dailyData:updateProperty({field = "advSupRe", delta = 1})
9ced5432   zhouhaihai   冒险支援效果 保底事件
948
949
  	else -- 付费
  		if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.adv_support_refresh_cost}) then return end
3133cb76   zhouhaihai   日志
950
  		role:costItems({[ItemId.Diamond] = globalCsv.adv_support_refresh_cost}, {log = {desc = "advReSupport"}})
9ced5432   zhouhaihai   冒险支援效果 保底事件
951
952
953
  	end
  
  	role:advRandomSupportEffect()
f22a33af   zhouhaihai   自己的日志
954
  	role:mylog("adv_action", {desc = "advSupRe", short1 = cr < al and 0 or 1})
9ced5432   zhouhaihai   冒险支援效果 保底事件
955
956
957
958
959
  
  	SendPacket(actionCodes.Adv_refreshSupportRpc, '')
  	return true
  end
  
98d32f92   liuzujun   多编队
960
961
962
963
964
965
  function _M.roleFormatRpc(agent , data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local index = msg.index	-- 阵容索引
  	local title = msg.title -- 阵容名称
  	local team = {}
67b46a6b   zhouhaihai   修复存在的冒险进不去的玩家
966
967
968
  
  	if role:getAdvData():isRunning() then return 3 end
  
98d32f92   liuzujun   多编队
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
  	for slot, heroId in pairs(msg.heros) do
  		if not role.heros[heroId] then
  			return 1
  		end
  	end
  
  	if index > 10 then
  		return 2
  	end
  
  	team.heros = {}
  	for slot, heroId in pairs(msg.heros) do
  		team.heros[slot] = heroId
  	end
  	team.leader = msg.leader
  	team.leader2 = msg.leader2
  	team.title = title
  	role:setAdvTeamFormat(index, team)
  
  	local advTeam = role:getProperty("advTeam")
782ee57d   liuzujun   多编队功能
989
990
991
  	local curIndex = advTeam.index
  	if curIndex == index then
  		table.clear(advTeam)
98d32f92   liuzujun   多编队
992
  
782ee57d   liuzujun   多编队功能
993
994
995
996
997
998
999
1000
  		advTeam.heros = {}
  		for slot, heroId in pairs(msg.heros) do
  			advTeam.heros[slot] = heroId
  		end
  		advTeam.leader = msg.leader
  		advTeam.leader2 = msg.leader2
  		advTeam.index = index
  		role:updateProperty({field = "advTeam", value = advTeam})
98d32f92   liuzujun   多编队
1001
  	end
98d32f92   liuzujun   多编队
1002
1003
1004
1005
1006
1007
1008
1009
1010
  
  	SendPacket(actionCodes.Adv_roleFormatRpc, '')
  	return true
  end
  
  function _M.selectTeamRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local index = msg.index	-- 阵容索引
67b46a6b   zhouhaihai   修复存在的冒险进不去的玩家
1011
1012
1013
  
  	if role:getAdvData():isRunning() then return 1 end
  
98d32f92   liuzujun   多编队
1014
1015
  	local team = role:getAdvTeamFormat(index)
  	if not next(team) then return end
782ee57d   liuzujun   多编队功能
1016
  	team["index"] = index
98d32f92   liuzujun   多编队
1017
1018
1019
1020
1021
1022
  	role:updateProperty({field = "advTeam", value = team})
  
  	SendPacket(actionCodes.Adv_selectTeamRpc, '')
  	return true
  end
  
23d89d13   zhouahaihai   冒险 结构
1023
  return _M