Blame view

src/actions/HangAction.lua 35.7 KB
384bb077   zhouahaihai   挂机
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
  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
  
  local _M = {}
  
70fb62d1   liuzujun   服务器数据打点
19
20
21
22
23
24
25
26
27
28
29
  local function getHangTime(role)
  	local hangInfo = role:getProperty("hangInfo")
  	if not hangInfo.carbonId or not hangInfo.coinTime or not hangInfo.itemTime then
  		return 0
  	end
  	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
  	local nowCoinTime = math.min(skynet.timex(), hangInfo.endCoinTime or 0)
  
  	return nowCoinTime - hangInfo.coinTime
  end
  
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
30
  local function checkReward(role, isTreasure, carbonId)
384bb077   zhouahaihai   挂机
31
32
  	local hangInfo = role:getProperty("hangInfo")
  	if not hangInfo.carbonId or not hangInfo.coinTime or not hangInfo.itemTime then
024370be   liuzujun   双倍掉掉落bug
33
  		return false
384bb077   zhouahaihai   挂机
34
35
  	end
  	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
36
37
  	--local expCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
  	local expCarbonData = hangInfo.expData or {}
bcf5bfbb   zhouahaihai   挂机new
38
39
  	local nowCoinTime = math.min(skynet.timex(), hangInfo.endCoinTime or 0)
  	local nowItemTime = math.min(skynet.timex(), hangInfo.endItemTime or 0)
384bb077   zhouahaihai   挂机
40
  
00bf6029   liuzujun   限时礼包,抽卡ssr广播
41
42
  	local expCoef, itemCoef = role.storeData:getHangDropCoef()
  
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
43
44
45
  	-- 此次挂机,其中翻倍时长占多少
  	local doubleTime = role.activity:getActHangDoubleTime(hangInfo.coinTime, nowCoinTime)
  	local normalTime = nowCoinTime - hangInfo.coinTime - doubleTime
384bb077   zhouahaihai   挂机
46
  
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
47
48
49
50
  	local coinCount = math.max(0, math.floor((normalTime) / globalCsv.idle_money_produce_cd))
  	local coinDoubleCount = math.max(0, math.floor((doubleTime) / globalCsv.idle_money_produce_cd)) * 2
  	hangInfo.coinTime = nowCoinTime
  
024370be   liuzujun   双倍掉掉落bug
51
  	normalTime = nowItemTime - hangInfo.itemTime
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
52
  	local itemCount = math.max(0, math.floor((normalTime) / globalCsv.idle_item_produce_cd))
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
53
  	hangInfo.itemTime = nowItemTime
384bb077   zhouahaihai   挂机
54
55
  
  	local items = role:getProperty("hangBag")
00bf6029   liuzujun   限时礼包,抽卡ssr广播
56
  	coinCount = (coinCount + coinDoubleCount) * expCoef
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
57
58
  	items[ItemId.Gold] = math.floor((items[ItemId.Gold] or 0) + coinCount * (expCarbonData.money or 0))
  	items[ItemId.Exp] = math.floor((items[ItemId.Exp] or 0) + coinCount * (expCarbonData.exp or 0))
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
59
  	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + coinCount * (expCarbonData.playerExp or 0))
384bb077   zhouahaihai   挂机
60
61
62
63
64
  
  	local pool = {}
  	for _, temp in pairs(carbonData.item:toArray()) do
  		table.insert(pool, temp:toArray(true, "="))
  	end
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
65
66
67
  	local curFC = 0
  	local curIC = 0
  	for id, count in pairs(items) do
bcf5bfbb   zhouahaihai   挂机new
68
  		if id ~= ItemId.Gold and id ~= ItemId.Exp and id ~= ItemId.PlayerExp then
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
69
70
  			curFC = curFC + math.ceil(count / globalCsv.idle_field_limit)
  			curIC = curIC + count
9962b061   zhouahaihai   补充 挂机
71
72
  		end
  	end
317a46a9   liuzujun   添加特权卡
73
74
75
  
  	-- 特权卡挂机额外栏位
  	local privExtraCnt = role.storeData:getHangSlotExtraCount()
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
76
77
  	--local selfFC = role:getProperty("hangBagLimit") + privExtraCnt
  	local selfFC = 50
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
78
79
80
81
82
83
84
85
86
  	local selfIC = selfFC * globalCsv.idle_field_limit
  
  	local function randomItem()
  		if curIC >= selfIC then
  			return
  		end
  		local tempPool = clone(pool)
  		while #tempPool > 0 do
  			local idx = math.randWeight(tempPool, 3)
024370be   liuzujun   双倍掉掉落bug
87
  			local cur = clone(pool[idx])
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
88
  			if cur[1] ~= 0 then  -- 轮空 id
024370be   liuzujun   双倍掉掉落bug
89
90
  				if cur[1] == ItemId.BreakCost and doubleTime > 0 then
  					cur[2] = cur[2] * 2
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
91
  				end
00bf6029   liuzujun   限时礼包,抽卡ssr广播
92
  				cur[2] = cur[2] * itemCoef
024370be   liuzujun   双倍掉掉落bug
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
  				if (items[cur[1]] and math.ceil((items[cur[1]] + cur[2]) / globalCsv.idle_field_limit) > math.ceil(items[cur[1]] / globalCsv.idle_field_limit))
  						or not items[cur[1]] then	--要占用新栏位的情况
  					local addFC
  					if not items[cur[1]] then
  						addFC = math.ceil(cur[2] / globalCsv.idle_field_limit)
  					else
  						local frontC = items[cur[1]] % globalCsv.idle_field_limit
  						if frontC == 0 then
  							frontC = globalCsv.idle_field_limit
  						end
  						addFC = math.ceil((cur[2] - (globalCsv.idle_field_limit - frontC)) / globalCsv.idle_field_limit)
  					end
  					if curFC + addFC <= selfFC then
  						curFC = curFC + addFC
  						items[cur[1]] = (items[cur[1]] or 0) + cur[2]
  						break
  					else
  						--加不了,换别的东西
  						table.remove(tempPool, idx)
  					end
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
113
  				else
024370be   liuzujun   双倍掉掉落bug
114
115
  					items[cur[1]] = items[cur[1]] + cur[2]
  					break
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
116
117
  				end
  			else
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
118
  				break
9962b061   zhouahaihai   补充 挂机
119
  			end
9962b061   zhouahaihai   补充 挂机
120
  		end
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
121
122
  		curIC = curIC + 1
  	end
024370be   liuzujun   双倍掉掉落bug
123
  
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
124
125
  	for i = 1, itemCount do
  		randomItem()
384bb077   zhouahaihai   挂机
126
127
  	end
  
a85b344f   zhangqijia   feat: 挂机图鉴
128
  	--挂机得到的宝藏加入到挂机奖励
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
129
  	if isTreasure or false == true then
5dee6549   zhangqijia   fix: 挂机图鉴- 修复切换关卡...
130
  		local treasureList= role.dailyData:checkTreasureList(carbonId or hangInfo.carbonId) or {}
041ee0b2   zhangqijia   fix: 挂机图鉴的bug
131
132
  		if next(treasureList) then
  			for _, val in pairs(treasureList) do
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
133
134
  				local award  = val.award:toNumMap()
  				for k,v in pairs(award) do
e03f9e59   zhangqijia   fix: 修复挂机得到双倍宝藏奖励...
135
  					items[k] = (items[k] or 0) + v
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
136
137
  				end
  			end
a85b344f   zhangqijia   feat: 挂机图鉴
138
139
140
  		end
  	end
  
384bb077   zhouahaihai   挂机
141
  	if coinCount > 0 or itemCount > 0 then
5af8b4aa   zhouahaihai   挂机down
142
  		return true
384bb077   zhouahaihai   挂机
143
  	end
024370be   liuzujun   双倍掉掉落bug
144
145
  
  	return false
384bb077   zhouahaihai   挂机
146
147
  end
  
384bb077   zhouahaihai   挂机
148
149
150
151
152
153
  --开始一个新的关卡
  function _M.startRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local carbonId = msg.carbonId
  	local carbonData = csvdb["idle_battleCsv"][carbonId]
f60b89b1   zhouhaihai   奖励副本
154
  	if not carbonData then return 1 end
384bb077   zhouahaihai   挂机
155
  
d232676a   zhouhaihai   功能解锁 冒险返回
156
157
158
159
  	if math.floor(carbonId / 10000) ~= 1 then
  		if not role:isFuncUnlock(FuncUnlock.DifficultHang) then return end
  	end
  
5d80aca6   zhouahaihai   挂机优化
160
161
  
  	for _, preCarbonId in ipairs(carbonData.prepose:toArray(true, "=")) do
33be3111   zhouhaihai   修改hangPass 结构
162
  		if not role:checkHangPass(preCarbonId) then return 2 end
5d80aca6   zhouahaihai   挂机优化
163
  	end
384bb077   zhouahaihai   挂机
164
  
ba33bcac   liuzujun   挂机章节解锁
165
166
167
168
169
170
171
172
173
  	local carbonId = msg.carbonId	-- 解锁章节id
  	local condition = globalCsv.idle_chapter_unlock[carbonId]
  	if condition then 
  		local unlockChapter = role:getProperty("unlockChap")
  		if not unlockChapter[carbonId] then
  			return 3 
  		end
  	end
  
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
174
  	if checkReward(role, true, carbonId) then
5af8b4aa   zhouahaihai   挂机down
175
176
  		role:updateProperty({field = "hangBag", value = role:getProperty("hangBag")})
  	end
384bb077   zhouahaihai   挂机
177
178
  
  	local hangInfo = role:getProperty("hangInfo")
5af8b4aa   zhouahaihai   挂机down
179
  	local isNew = not hangInfo.carbonId
384bb077   zhouahaihai   挂机
180
  	hangInfo.carbonId = carbonId
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
181
  	--hangInfo.expCarbonId = isNew and carbonId or hangInfo.expCarbonId
384bb077   zhouahaihai   挂机
182
  	local nowTime = skynet.timex()
5af8b4aa   zhouahaihai   挂机down
183
  	if isNew then
1103490d   zhouhaihai   设置 国家时间错误
184
185
  		hangInfo.coinTime = nowTime
  		hangInfo.itemTime = nowTime
bcf5bfbb   zhouahaihai   挂机new
186
187
  		hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max
  		hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max
1103490d   zhouhaihai   设置 国家时间错误
188
189
190
  	else
  		hangInfo.coinTime = math.min(nowTime, hangInfo.endCoinTime)
  		hangInfo.itemTime = math.min(nowTime, hangInfo.endItemTime)
5af8b4aa   zhouahaihai   挂机down
191
  	end
072db127   zhouhaihai   推送
192
193
  
  	role:pushMsg({type = "hang", time = math.min(hangInfo.endCoinTime - nowTime, hangInfo.endItemTime - nowTime)})
33be3111   zhouhaihai   修改hangPass 结构
194
  	if not role:checkHangPass(carbonId) then
5af8b4aa   zhouahaihai   挂机down
195
196
197
  		hangInfo.bossTime = nowTime + carbonData.idle_time
  	else
  		hangInfo.bossTime = nil
384bb077   zhouahaihai   挂机
198
  	end
072db127   zhouhaihai   推送
199
  
384bb077   zhouahaihai   挂机
200
201
  	role:updateProperty({field = "hangInfo", value = hangInfo})
  
d02f7904   zhouhaihai   遗失的log
202
  	role:mylog("hang_action", {desc = "startHang", int1 = carbonId})
384bb077   zhouahaihai   挂机
203
204
205
206
207
208
209
210
  	SendPacket(actionCodes.Hang_startRpc, '')
  	return true
  end
  
  -- 每隔1分钟检查一次
  function _M.checkRpc(agent, data)
  	local role = agent.role
  	-- local msg = MsgPack.unpack(data)
5af8b4aa   zhouahaihai   挂机down
211
212
213
214
  	if checkReward(role) then
  		role:updateProperty({field = "hangBag", value = role:getProperty("hangBag")})
  		role:updateProperty({field = "hangInfo", value = role:getProperty("hangInfo")})
  	end
384bb077   zhouahaihai   挂机
215
216
217
218
  	SendPacket(actionCodes.Hang_checkRpc, MsgPack.pack({}))
  	return true
  end
  
cc5ca7f3   zhouhaihai   缓存battleKey
219
  local _BattleKey = nil
384bb077   zhouahaihai   挂机
220
221
222
  function _M.startBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
bcf5bfbb   zhouahaihai   挂机new
223
224
  	local carbonId = msg.carbonId
  	local curData = csvdb["idle_battleCsv"][carbonId]
a1e08c9c   zhengshouren   宝箱关战斗异常
225
226
227
  	if not curData then 
  		return 1
  	end
bcf5bfbb   zhouahaihai   挂机new
228
  
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
229
230
231
232
233
234
  	--local hangInfo = role:getProperty("hangInfo") or {}
  	--if curData.main ~= 1 then
  	--	if carbonId ~= hangInfo.carbonId then 
  	--		return 2
  	--	end
  	--end
bcf5bfbb   zhouahaihai   挂机new
235
  
33be3111   zhouhaihai   修改hangPass 结构
236
  	if role:checkHangPass(carbonId) then 
a1e08c9c   zhengshouren   宝箱关战斗异常
237
238
  		return 3
  	end
bcf5bfbb   zhouahaihai   挂机new
239
  
cc5ca7f3   zhouhaihai   缓存battleKey
240
  	_BattleKey = tostring(math.random())
70fb62d1   liuzujun   服务器数据打点
241
  	role._StartBattleTs = skynet.timex()
cc5ca7f3   zhouhaihai   缓存battleKey
242
  
53e8037e   zhouhaihai   任务
243
  	role:checkTaskEnter("HangBattle", {id = carbonId})
52c87300   zhouhaihai   bug
244
  	SendPacket(actionCodes.Hang_startBattleRpc, MsgPack.pack({key = _BattleKey}))
384bb077   zhouahaihai   挂机
245
246
247
248
249
250
  	return true
  end
  
  function _M.endBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
8cd3770f   liuzujun   挂机关卡可以选择,经验金币根据最高...
251
  	local hangInfo = role:getProperty("hangInfo") or {}
cc5ca7f3   zhouhaihai   缓存battleKey
252
  	if not msg.key or msg.key ~= _BattleKey then 
d6a66c74   zhouhaihai   校验失败也返回
253
254
  		SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({errorCode = 1}))
  		return true
4906ebd2   zhengshouren   宝箱关副本结算异常
255
  	end
bcf5bfbb   zhouahaihai   挂机new
256
  	local carbonId = msg.carbonId
d4e9b817   zhouhaihai   战斗 日志
257
  	local isWin = msg.starNum and msg.starNum > 0
bcf5bfbb   zhouahaihai   挂机new
258
  	local carbonData = csvdb["idle_battleCsv"][carbonId]
4906ebd2   zhengshouren   宝箱关副本结算异常
259
260
261
  	if not carbonData then
  		return 2
  	end
8cd3770f   liuzujun   挂机关卡可以选择,经验金币根据最高...
262
  
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
263
264
265
266
267
  	--if carbonData.main ~= 1 then
  	--	if carbonId ~= hangInfo.carbonId then 
  	--		return 3
  	--	end
  	--end
33be3111   zhouhaihai   修改hangPass 结构
268
  
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
269
  	if role:checkHangPass(carbonId) then
4906ebd2   zhengshouren   宝箱关副本结算异常
270
271
  		return 4
  	end
d4e9b817   zhouhaihai   战斗 日志
272
  
edf2ee12   zhouhaihai   防作弊
273
274
275
276
277
278
279
280
281
282
  	-- 防作弊
  	if not role:checkBattleCheat("hang", {
  		id = carbonId,
  		isWin = isWin,
  		info = msg.info
  	}) then
  		SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({errorCode = 1}))
  		return true
  	end
  
7bb30dca   zhouhaihai   修改发奖
283
  	local reward, change
d4e9b817   zhouhaihai   战斗 日志
284
  	if isWin then --win
33be3111   zhouhaihai   修改hangPass 结构
285
  		role:hangFinish(carbonId)
bcf5bfbb   zhouahaihai   挂机new
286
287
288
  		if carbonData.main ~= 1 then
  			hangInfo.bossTime = nil
  		end
384bb077   zhouahaihai   挂机
289
290
  		-- reward
  		reward = {}
384bb077   zhouahaihai   挂机
291
292
  		reward[ItemId.Gold] = carbonData.money_clear
  		reward[ItemId.Exp] = carbonData.exp_clear
00115a7a   zhouahaihai   奖励发放
293
  		reward[ItemId.PlayerExp] = carbonData.playerExp_clear
384bb077   zhouahaihai   挂机
294
  		for itemId, count in pairs(carbonData.item_clear:toNumMap()) do
384bb077   zhouahaihai   挂机
295
296
  			reward[itemId] = count
  		end
7bb30dca   zhouhaihai   修改发奖
297
  		reward, change = role:award(reward, {log = {desc = "hangBattle", int1 = carbonId}})
00e663bd   zhouhaihai   剧情相关
298
  
03a6166a   zhouhaihai   餐厅优化
299
  		role:checkTaskEnter("HangPass", {id = carbonId})
286c980a   chenyueqi   挂机战斗胜利才触发对应的引导
300
301
302
  		
  		-- 引导
  		if carbonId == 10101 then
a5b98c30   chenyueqi   引导调整
303
  			role:finishGuide(6)
be0c7a19   chenyueqi   挂机打完困难20101才设定完成引导22
304
  		elseif carbonId == 20101 then
286c980a   chenyueqi   挂机战斗胜利才触发对应的引导
305
306
307
308
309
310
311
312
  			role:finishGuide(22)
  		end
  		for _, guideData in pairs(csvdb["guide_unlockCsv"]) do
  			if guideData.type == 3 and guideData.carbonId == carbonId then
  				role:saveGuide(guideData.guideId,1,true)
  				break
  			end
  		end
384bb077   zhouahaihai   挂机
313
  	end
53b4b8bd   liuzujun   自动挂机下一关
314
315
  	local nextCarbonId = role:getNextCarbonId(carbonId)
  	-- 设置挂机关卡
87c65a8d   liuzujun   挂机经验关卡改为最终通关关卡
316
  	if isWin then --and (hangInfo.carbonId or 0) < nextCarbonId then
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
317
318
319
320
321
322
323
  		local newCarbonData = csvdb["idle_battleCsv"][carbonId]
  		if newCarbonData then
  			local expData = hangInfo.expData or {}
  			expData.exp = (expData.exp or 0) + newCarbonData.exp
  			expData.money = (expData.money or 0) + newCarbonData.money
  			expData.playerExp = (expData.playerExp or 0) + newCarbonData.playerExp
  			hangInfo.expData = expData
98d32f92   liuzujun   多编队
324
  		end
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
325
326
327
328
329
330
331
332
333
334
335
  
  		--if not hangInfo.expCarbonId then
  		--	hangInfo.expCarbonId = carbonId
  		--else
  		--	local oldCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
  		--	local newCarbonData = csvdb["idle_battleCsv"][carbonId]
  		--	if oldCarbonData.money < newCarbonData.money then
  		--		hangInfo.expCarbonId = carbonId
  		--	end
  		--end
  
87c65a8d   liuzujun   挂机经验关卡改为最终通关关卡
336
337
338
339
  		--local cfg = csvdb["idle_battleCsv"][nextCarbonId]
  		--if cfg then
  		--	hangInfo.bossTime = skynet.timex() + cfg.idle_time
  		--end
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
340
  	end
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
341
342
343
344
345
346
  
  	--刷新宝藏图鉴
  	if isWin and globalCsv.idle_treasure_point and globalCsv.idle_treasure_point == carbonId then
  		role.dailyData:getTreasrueList()
  	end
  
384bb077   zhouahaihai   挂机
347
  	role:updateProperty({field = "hangInfo", value = hangInfo})
33be3111   zhouhaihai   修改hangPass 结构
348
  	
d4e9b817   zhouhaihai   战斗 日志
349
350
351
352
353
354
  	role:checkBattle("hang", {
  		id = carbonId,
  		isWin = isWin,
  		info = msg.info,
  		reward = reward,
  	})
1e9cb217   chenyueqi   服务器记录控制引导过程
355
  
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
356
357
  	--local team = role:getProperty("pvpTC")
      local team = role:getTeamFormatByType(TeamSystemType.Hang)
70fb62d1   liuzujun   服务器数据打点
358
359
  
  	local battleTime = skynet.timex() - role._StartBattleTs
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
360
361
  	role:mylog("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), 
      cint1 = role:getHerosCamp(team.heros), cint2 = battleTime, key1 = role:getHerosLogStr(team.heros), key2 = role:getRewardLogStr(reward)})
d02f7904   zhouhaihai   遗失的log
362
  
384bb077   zhouahaihai   挂机
363
364
365
  	SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({
  		starNum = msg.starNum, 
  		reward = reward,
7bb30dca   zhouhaihai   修改发奖
366
  		change = change,
384bb077   zhouahaihai   挂机
367
368
369
370
  		}))
  	return true
  end
  
7efe5275   zhouhaihai   检查leader
371
372
373
374
375
376
377
  local function checkLeader(heros, leader)
  	if not leader then return end
  	for slot, heroId in pairs(heros) do
  		if heroId == leader then return true end
  	end
  end
  
384bb077   zhouahaihai   挂机
378
379
380
  function _M.roleFormatRpc(agent , data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
98d32f92   liuzujun   多编队
381
382
  	local index = msg.index	-- 阵容索引
  	local title = msg.title -- 阵容名称
7d662b85   liuzujun   编队增加战术字段
383
  	local tactics = msg.tactics	-- 战术
761b3ea8   chenyueqi   再改一波电波塔整容相关信息
384
  	local tower = msg.tower
98d32f92   liuzujun   多编队
385
  	local team = {}
384bb077   zhouahaihai   挂机
386
387
  	for slot, heroId in pairs(msg.heros) do
  		if not role.heros[heroId] then
e6ebee44   zhouhaihai   编队bug
388
  			return 1
384bb077   zhouahaihai   挂机
389
390
  		end
  	end
f603a60f   zhouhaihai   支援技实装
391
392
393
  
  	local supports = {}
  	for slot, support in pairs(msg.supports or {}) do
e6ebee44   zhouhaihai   编队bug
394
  		if slot ~= 1 and slot ~= 2 then return 2 end
f603a60f   zhouhaihai   支援技实装
395
  		local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
e6ebee44   zhouhaihai   编队bug
396
  		if level <= 0 then return 3 end
f603a60f   zhouhaihai   支援技实装
397
398
  		supports[slot] = support
  	end
e6ebee44   zhouhaihai   编队bug
399
  	if not checkLeader(msg.heros, msg.leader) then return 4 end
f603a60f   zhouhaihai   支援技实装
400
  
98d32f92   liuzujun   多编队
401
402
403
404
405
406
407
408
409
  	if index > 10 then
  		return 5
  	end
  
  	if #title > 100 then
  		return 6
  	end
  
  	team.heros = {}
384bb077   zhouahaihai   挂机
410
  	for slot, heroId in pairs(msg.heros) do
98d32f92   liuzujun   多编队
411
412
413
414
415
  		team.heros[slot] = heroId
  	end
  	team.leader = msg.leader
  	team.supports = supports
  	team.title = title
f7f26c15   zhouhaihai   编队整理 增加 tactics战术
416
417
418
  	if msg.tactics and globalCsv.tactics_skill_passive_cell[msg.tactics] then
  		team.tactics = msg.tactics
  	end
98d32f92   liuzujun   多编队
419
  
761b3ea8   chenyueqi   再改一波电波塔整容相关信息
420
421
422
423
424
  	if tower then
  		role:setTowerTeamFormat(index, team)
  	else
  		role:setTeamFormat(index, team)
  	end
98d32f92   liuzujun   多编队
425
  
384bb077   zhouahaihai   挂机
426
427
428
429
  	SendPacket(actionCodes.Hang_roleFormatRpc, '')
  	return true
  end
  
5af8b4aa   zhouahaihai   挂机down
430
431
  function _M.getRewardRpc(agent , data)
  	local role = agent.role
70fb62d1   liuzujun   服务器数据打点
432
  	local hangTime = getHangTime(role)
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
433
  	checkReward(role, true)
5af8b4aa   zhouahaihai   挂机down
434
435
  	local items = role:getProperty("hangBag")
  	if not next(items) then return end
7bb30dca   zhouhaihai   修改发奖
436
  	local reward, change = role:award(items, {log = {desc = "hangReward"}})
5af8b4aa   zhouahaihai   挂机down
437
438
439
  	table.clear(items)
  	local hangInfo = role:getProperty("hangInfo")
  	local nowTime = skynet.timex()
a42130ee   chenyueqi   电波塔加成错误
440
441
442
  	local timeAdd = role:getBnousHangTime()
  	hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max + timeAdd
  	hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max + timeAdd
5af8b4aa   zhouahaihai   挂机down
443
444
445
446
  	hangInfo.coinTime = nowTime
  	hangInfo.itemTime = nowTime
  	role:updateProperty({field = "hangBag", value = items})
  	role:updateProperty({field = "hangInfo", value = hangInfo})
072db127   zhouhaihai   推送
447
448
  	role:pushMsg({type = "hang", time = globalCsv.idle_producetime_max})
  	
190e1415   liuzujun   英雄帖活动初始化
449
  	role:checkTaskEnter("HangGet", {reward = reward})
53e8037e   zhouhaihai   任务
450
451
  	if reward[ItemId.Gold] then
  		role:checkTaskEnter("HangGetGold", {count = reward[ItemId.Gold]})
bcf5bfbb   zhouahaihai   挂机new
452
  	end
d43246b0   zhouhaihai   log 增加
453
454
455
456
457
458
459
460
461
462
  
  	role:log("residence_reward", {
  		mission_threadid = math.floor(hangInfo.carbonId / 10000), --大关卡ID
  		mission_id = hangInfo.carbonId, --关卡ID
  		mission_type = 100, --关卡类型,见关卡类型枚举表
  		residence_reward_type = 0, --领取奖励方式,快速(超前领取)记录为1,正常领取记录为0
  		residence_time = 0, --挂机或排名时长
  		residence_reward = reward, --获得奖励,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"}
  	})
  	
a33ade6c   liuzujun   rmb礼包改钻石礼包
463
  	role:mylog("hang_action", {desc = "hangReward", int1 = hangInfo.carbonId, int2=hangTime})
d43246b0   zhouhaihai   log 增加
464
  
53e8037e   zhouhaihai   任务
465
  	SendPacket(actionCodes.Hang_getRewardRpc, MsgPack.pack({
7bb30dca   zhouhaihai   修改发奖
466
467
  		reward = reward,
  		change = change
bcf5bfbb   zhouahaihai   挂机new
468
469
470
471
  	}))
  	return true
  end
  
9962b061   zhouahaihai   补充 挂机
472
473
474
475
476
477
  function _M.quickRpc(agent , data)
  	local role = agent.role
  
  	local hangInfo = role:getProperty("hangInfo")
  	if not hangInfo.carbonId then return end
  	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
478
479
  	--local expCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
  	local expCarbonData = hangInfo.expData or {}
9962b061   zhouahaihai   补充 挂机
480
481
482
  
  	local curCount = role.dailyData:getProperty("hangQC") + 1
  	local costs = globalCsv.idle_quickproduce_cost:toArray(true, "=")
e2e205be   zhangqijia   feat: 玩家等级奖励
483
484
485
486
487
488
489
490
491
492
493
494
  
      -- 增加今日探索加速次数
  	local maxIdx = #costs
  	local maxCount = maxIdx + role:getBnousUpSpeedNum(UpSpeedType.ExplorationUpSpeed)
  	if curCount > maxCount then return end
  
  	if curCount > maxIdx then
  		for idx = maxIdx+1, curCount do
  			costs[idx] = costs[maxIdx]
  		end
  	end
  
9962b061   zhouahaihai   补充 挂机
495
496
  	if not costs[curCount] then return end
  	if costs[curCount] > 0 then
3d8050ef   liuzujun   钻石3改成虹光玉8
497
498
  		if not role:checkItemEnough({[ItemId.Jade] = costs[curCount]}) then return end
  		role:costItems({[ItemId.Jade] = costs[curCount]}, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
9962b061   zhouahaihai   补充 挂机
499
500
501
502
503
504
505
506
507
  	end
  
  	role.dailyData:updateProperty({field = "hangQC", value = curCount})
  
  	local time = globalCsv.idle_quickproduce_time
  	local reward = {}
  
  	local coinCount = math.floor(time / globalCsv.idle_money_produce_cd)
  	local itemCount = math.floor(time / globalCsv.idle_item_produce_cd)
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
508
509
510
  	reward[ItemId.Gold] = math.floor((reward[ItemId.Gold] or 0) + coinCount * (expCarbonData.money or 0))
  	reward[ItemId.Exp] = math.floor((reward[ItemId.Exp] or 0) + coinCount * (expCarbonData.exp or 0))
  	reward[ItemId.PlayerExp] = math.floor((reward[ItemId.PlayerExp] or 0) + coinCount * (expCarbonData.playerExp or 0))
9962b061   zhouahaihai   补充 挂机
511
512
513
514
515
516
517
518
519
  
  	local pool = {}
  	for _, temp in pairs(carbonData.item:toArray()) do
  		table.insert(pool, temp:toArray(true, "="))
  	end
  	for i = 1, itemCount do
  		local cur = pool[math.randWeight(pool, 3)]
  		reward[cur[1]] = (reward[cur[1]] or 0) + cur[2]
  	end
317a46a9   liuzujun   添加特权卡
520
  
9e1a93c2   liuzujun   快速挂机掉落浮点数取整
521
  	local doubleCoef = role.activity:isOpen("DoubleDrop") and 2 or 1
317a46a9   liuzujun   添加特权卡
522
523
  	-- 特权卡获取加速获得额外道具
  	local coef = role.storeData:getProduceItemSpeedCoef()
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
524
  	if coef > 1 or doubleCoef > 1 then
317a46a9   liuzujun   添加特权卡
525
  		for k, cnt in pairs(reward) do
9e1a93c2   liuzujun   快速挂机掉落浮点数取整
526
  			reward[k] = math.floor(cnt * coef * doubleCoef)
317a46a9   liuzujun   添加特权卡
527
528
529
  		end
  	end
  
c0c49098   zhangqijia   feat: 竞技场门票购买限制;挂...
530
531
532
533
534
535
  	--宝藏加速
  	local treasureList= role.dailyData:quickTreasureList(hangInfo.carbonId, time) or {}
  	if next(treasureList) then
  		for id, val in pairs(treasureList) do
  			local award  = val.award:toNumMap()
  			for k,v in pairs(award) do
e03f9e59   zhangqijia   fix: 修复挂机得到双倍宝藏奖励...
536
  				reward[k] = (reward[k] or 0) + v
c0c49098   zhangqijia   feat: 竞技场门票购买限制;挂...
537
538
539
540
  			end
  		end
  	end
  
7bb30dca   zhouhaihai   修改发奖
541
542
  	local change
  	reward, change = role:award(reward, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
f60b89b1   zhouhaihai   奖励副本
543
544
545
  	if reward[ItemId.Gold] then
  		role:checkTaskEnter("HangGetGold", {count = reward[ItemId.Gold]})
  	end
53e8037e   zhouhaihai   任务
546
  	role:checkTaskEnter("HangQuick")
d43246b0   zhouhaihai   log 增加
547
548
549
550
551
552
553
554
555
  
  	role:log("residence_reward", {
  		mission_threadid = math.floor(hangInfo.carbonId / 10000), --大关卡ID
  		mission_id = hangInfo.carbonId, --关卡ID
  		mission_type = 100, --关卡类型,见关卡类型枚举表
  		residence_reward_type = 1, --领取奖励方式,快速(超前领取)记录为1,正常领取记录为0
  		residence_time = time, --挂机或排名时长
  		residence_reward = reward, --获得奖励,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"}
  	})
a33ade6c   liuzujun   rmb礼包改钻石礼包
556
  	role:mylog("hang_action", {desc = "quick", int1 = hangInfo.carbonId, short1 = curCount})
70fb62d1   liuzujun   服务器数据打点
557
  
9962b061   zhouahaihai   补充 挂机
558
  	SendPacket(actionCodes.Hang_quickRpc, MsgPack.pack({
7bb30dca   zhouhaihai   修改发奖
559
560
  		reward = reward,
  		change = change
9962b061   zhouahaihai   补充 挂机
561
562
563
564
  	}))
  	return true
  end
  
f60b89b1   zhouhaihai   奖励副本
565
566
567
568
569
570
571
572
  
  function _M.buyBonusCountRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local count = msg.count
  	local btype = msg.type
  
3133cb76   zhouhaihai   日志
573
  	if not TimeReset["DailyBattle" .. btype] then return end
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
574
575
  	local open, actId = role.activity:isOpen("BonusDouble")
  	local actData = csvdb["activity_ctrlCsv"][actId]
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
576
  
a526f9ef   liuzujun   奖励关卡活动未开启导致Bug
577
578
579
580
  	local coef = 1
  	if open and actData then
  		coef= tonumber(actData.condition2)
  	end
f60b89b1   zhouhaihai   奖励副本
581
582
  
  	local bonusC = role.dailyData:getProperty("bonusC")
00bf6029   liuzujun   限时礼包,抽卡ssr广播
583
  	local extraCnt = role.storeData:getBonusExtraFightCount()
f60b89b1   zhouhaihai   奖励副本
584
  	bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
e82cb5dc   zhangqijia   fix: level_additi...
585
  	local lastCount = (globalCsv.bonus_daily_buy_count + role:getBnousChangeBuyCount()) * coef + extraCnt - bonusC[btype]["b"]
f60b89b1   zhouhaihai   奖励副本
586
587
  	if math.illegalNum(count, 1, lastCount)  then return 1 end
  
3d8050ef   liuzujun   钻石3改成虹光玉8
588
  	if not role:checkItemEnough({[ItemId.Jade] = globalCsv.bonus_buy_cost * count}) then return 2 end
f60b89b1   zhouhaihai   奖励副本
589
  
3d8050ef   liuzujun   钻石3改成虹光玉8
590
  	role:costItems({[ItemId.Jade] = globalCsv.bonus_buy_cost * count}, {log = {desc = "buyBonusCount", int1 = btype, int2 = count}})
d481965d   zhouhaihai   购买次数bug
591
592
  	bonusC[btype]["b"] = bonusC[btype]["b"] + count
  	bonusC[btype]["c"] = bonusC[btype]["c"] - count
f60b89b1   zhouhaihai   奖励副本
593
594
595
596
597
598
599
  
  	role.dailyData:updateProperty({field = "bonusC", value = bonusC})
  
  	SendPacket(actionCodes.Hang_buyBonusCountRpc, '')
  	return true
  end
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
600
  local function bonusWinReward(role, bonusData, rewardType, count, sweep)
be24b6ad   zhouhaihai   传递 count
601
  	count = count or 1
3c51e6d4   zhouhaihai   奖励副本 完成
602
  
55c7c172   zhouhaihai   奖励副本 新机制
603
604
605
606
  	local reward, change = {}
  	if rewardType == 1 or rewardType == 4 then
  		for k, v in pairs(bonusData.clear_reward:toNumMap()) do
  			reward[k] = (reward[k] or 0) + v
be24b6ad   zhouhaihai   传递 count
607
608
609
  		end
  	end
  
55c7c172   zhouhaihai   奖励副本 新机制
610
  	if rewardType == 2 or rewardType == 4 then
e4a17692   zhouhaihai   奖励关卡 满星奖励
611
612
613
614
  		for k, v in pairs(bonusData.perfect_reward:toNumMap()) do
  			reward[k] = (reward[k] or 0) + v
  		end
  	end
55c7c172   zhouhaihai   奖励副本 新机制
615
616
617
  
  	if rewardType == 3 then
  		local open, actId = role.activity:isOpen("BonusDouble")
1ce3adac   zhouhaihai   充值
618
619
620
621
  		local actData
  		if open then
  			actData = csvdb["activity_ctrlCsv"][actId]
  		end
55c7c172   zhouhaihai   奖励副本 新机制
622
623
624
625
626
627
628
629
630
631
632
  
  		reward = bonusData.reward:toNumMap()
  		for itemId, c in pairs(reward) do
  			reward[itemId] = c * count
  		end
  		for i = 1, count do
  			local chance = bonusData.chance:randWeight(true)
  			if chance[1] ~= 0 then
  				reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
  			end
  		end
1ce3adac   zhouhaihai   充值
633
634
635
636
  		if open and actData then
  			for k, v  in pairs(reward) do
  				reward[k] = v * (actData.condition > 1 and actData.condition or 1)
  			end
55c7c172   zhouhaihai   奖励副本 新机制
637
638
639
  		end
  	end
  	
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
640
641
642
643
644
645
646
  	if sweep then
  		local bnousReward = role:getBnousSweep()
  		for key, value in pairs(bnousReward) do
  			reward[key] = (reward[key] or 0) + value * count
  		end
  	end
  
55c7c172   zhouhaihai   奖励副本 新机制
647
648
649
  	reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = bonusData.id}})
  	role:checkTaskEnter("BonusPass", {id = bonusData.id, count = count})
  	return reward, change
3c51e6d4   zhouhaihai   奖励副本 完成
650
651
  end
  
f60b89b1   zhouhaihai   奖励副本
652
653
654
655
  function _M.startBonusBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
be24b6ad   zhouhaihai   传递 count
656
  	local count = msg.count or 1
f60b89b1   zhouhaihai   奖励副本
657
  
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
658
659
660
  	local open, actId = role.activity:isOpen("BonusDouble")
  
  	if not role:isFuncUnlock(FuncUnlock.BonusBattle) then return 1 end
d232676a   zhouhaihai   功能解锁 冒险返回
661
  
f60b89b1   zhouhaihai   奖励副本
662
  	local bonusData = csvdb["bonus_battleCsv"][id]
bc902e2d   zhouhaihai   增加开放判断
663
  
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
664
665
666
  	if not open then
  		if not role:isTimeResetOpen(TimeReset["DailyBattle" .. bonusData.type]) then return 2 end
  	end
bc902e2d   zhouhaihai   增加开放判断
667
  
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
668
  	if not bonusData then return 3 end
c5e11ffc   zhouhaihai   解锁条件修改
669
  	local bonusStar = role:getProperty("bonusStar")
f60b89b1   zhouhaihai   奖励副本
670
  
4591e219   zhouhaihai   bug
671
  	if bonusData.unlock ~= 0 and (not bonusStar[bonusData.unlock] or bonusStar[bonusData.unlock] == 0) then return 4 end
f60b89b1   zhouhaihai   奖励副本
672
  
3c51e6d4   zhouhaihai   奖励副本 完成
673
  	if bonusStar[id] and bonusStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then 
55c7c172   zhouhaihai   奖励副本 新机制
674
675
676
677
678
679
680
681
682
  			local bonusC = role.dailyData:getProperty("bonusC")
  			bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
  
  			local actData = csvdb["activity_ctrlCsv"][actId]
  			local extraCnt = role.storeData:getBonusExtraFightCount()
  			local coef = 1
  			if open and actData then
  				coef = tonumber(actData.condition2)
  			end
e2e205be   zhangqijia   feat: 玩家等级奖励
683
  			if math.illegalNum(count, 1, (globalCsv.bonus_daily_count + role:getBnousChangeBaseCount()) * coef + extraCnt - bonusC[bonusData.type]["c"]) then return 7 end
55c7c172   zhouhaihai   奖励副本 新机制
684
685
686
687
  
  			bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + count
  			role.dailyData:updateProperty({field = "bonusC", value = bonusC})
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
688
  		local reward, change = bonusWinReward(role, bonusData, 3, count, true)
3c51e6d4   zhouhaihai   奖励副本 完成
689
  		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({reward = reward, change = change}))
f76d63e1   liuzujun   联动任务活动
690
691
  
  		role:checkTaskEnter("BonusQuick", {count = count})
3c51e6d4   zhouhaihai   奖励副本 完成
692
693
694
695
696
697
698
699
700
  	else
  		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
  		if not next(bTeam) then return 5 end
  		role.__bonusBattleCache = {
  			key = tostring(math.random()),
  			id = id,
  		}
  		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({key = role.__bonusBattleCache.key}))
  	end
f60b89b1   zhouhaihai   奖励副本
701
  
f60b89b1   zhouhaihai   奖励副本
702
703
704
705
706
707
708
709
710
711
  	return true
  end
  
  function _M.endBonusBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
  	local key = msg.key
  	local starNum = msg.starNum
  	if not role.__bonusBattleCache then return 1 end
3c51e6d4   zhouhaihai   奖励副本 完成
712
  	
f60b89b1   zhouhaihai   奖励副本
713
  
d6a66c74   zhouhaihai   校验失败也返回
714
715
716
717
  	if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then 
  		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
  		return true
  	end
edf2ee12   zhouhaihai   防作弊
718
719
720
721
722
723
724
725
726
727
728
729
  	role.__bonusBattleCache = nil
  
  	-- 防作弊
  	if not role:checkBattleCheat("bonus", {
  		id = id,
  		isWin = starNum and starNum > 0,
  		info = msg.info
  	}) then
  		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
  		return true
  	end
  
f60b89b1   zhouhaihai   奖励副本
730
731
  	local bonusData = csvdb["bonus_battleCsv"][id]
  
1ce3adac   zhouhaihai   充值
732
  	local reward, change = {}
3c51e6d4   zhouhaihai   奖励副本 完成
733
734
  
  	local bonusStar = role:getProperty("bonusStar")
55c7c172   zhouhaihai   奖励副本 新机制
735
  	local oldStar = bonusStar[id] or 0
3c51e6d4   zhouhaihai   奖励副本 完成
736
  	local curStar = 0
f60b89b1   zhouhaihai   奖励副本
737
   	if starNum and starNum > 0 then
74a8fdc9   zhouhaihai   奖励副本 胜利扣除次数
738
   		-- 胜利扣除次数
3c51e6d4   zhouhaihai   奖励副本 完成
739
   		
ce950b6e   zhouhaihai   bug
740
   		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
821e2704   zhouhaihai   heros 增加 supports
741
   		local herosInfo = role:getTeamHerosInfo(bTeam).heros
3c51e6d4   zhouhaihai   奖励副本 完成
742
743
744
745
746
747
748
749
750
  
   		local check = {}
   		-- 1 通关
  		check[1] = function(_)
  			return true
  		end
  		-- 2 阵亡人数 <= N
  		check[2] = function(_, cond)
  			return msg.info.dead and msg.info.dead <= cond
b2747fbc   zhouhaihai   挂机
751
  		end
3c51e6d4   zhouhaihai   奖励副本 完成
752
753
754
  		-- 3 全员存活
  		check[3] = function(_)
  			return msg.info.dead and msg.info.dead == 0
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
755
  		end
3c51e6d4   zhouhaihai   奖励副本 完成
756
757
758
759
  		-- 4 指定种族 >= N
  		check[4] = function(_, cond)
  			local count = 0
  			for _, one in pairs(herosInfo) do
66fe093a   liuzujun   元旦关卡活动
760
  				local heroData = csvdb["unitCsv"][one.type]
3c51e6d4   zhouhaihai   奖励副本 完成
761
762
763
764
765
766
767
768
769
770
  				if heroData.camp == cond then
  					count = count + 1
  				end
  			end
  			return count >= cond
  		end
  		-- 5 指定职业 >= N
  		check[5] = function(_, cond)
  			local count = 0
  			for _, one in pairs(herosInfo) do
66fe093a   liuzujun   元旦关卡活动
771
  				local heroData = csvdb["unitCsv"][one.type]
3c51e6d4   zhouhaihai   奖励副本 完成
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
  				if heroData.job == cond then
  					count = count + 1
  				end
  			end
  			return count >= cond
  		end
  		-- 6 含有指定角色 
  		check[6] = function(_, cond)
  			for _, one in pairs(herosInfo) do
  				if one.type == cond then
  					return true
  				end
  			end
  			return false
  		end
  		-- 7 通关耗时 <= X 秒  msg.info.atime
  		check[7] = function(_, cond)
  			return msg.info.atime and msg.info.atime <= cond
  		end
  		curStar = 0
e4a17692   zhouhaihai   奖励关卡 满星奖励
792
793
  		local sweepConds = bonusData.sweep_condition:toTableArray(true)
   		for i, cond in ipairs(sweepConds) do
3c51e6d4   zhouhaihai   奖励副本 完成
794
795
796
797
   			if check[cond[1]] and check[cond[1]](table.unpack(cond)) then
   				curStar = curStar + (1 << (i - 1))
   			end
   		end
e4a17692   zhouhaihai   奖励关卡 满星奖励
798
   		local status
55c7c172   zhouhaihai   奖励副本 新机制
799
800
801
802
803
804
805
806
807
808
809
810
811
   		local rewardType = 0
   		if curStar >= (1 << #sweepConds) - 1 then -- 满星
   			rewardType = 2
   			if oldStar == 0 then  --通关
   				rewardType = 4
   			end
   		elseif oldStar == 0 then --通关
   			rewardType = 1
   		end
  
   		if rewardType ~= 0 then
  	 		reward, change = bonusWinReward(role, bonusData, rewardType)
  	 	end
3c51e6d4   zhouhaihai   奖励副本 完成
812
   	else
55c7c172   zhouhaihai   奖励副本 新机制
813
   		curStar = oldStar
3c51e6d4   zhouhaihai   奖励副本 完成
814
   	end
55c7c172   zhouhaihai   奖励副本 新机制
815
   	if curStar ~= oldStar then
3c51e6d4   zhouhaihai   奖励副本 完成
816
817
   		bonusStar[id] = curStar
   		role:updateProperty({field = "bonusStar", value = bonusStar})
f60b89b1   zhouhaihai   奖励副本
818
819
   	end
  
d4e9b817   zhouhaihai   战斗 日志
820
821
822
823
824
825
   	role:checkBattle("bonus", {
  		id = id,
  		isWin = starNum and starNum > 0,
  		info = msg.info,
  		reward = reward,
  	})
d02f7904   zhouhaihai   遗失的log
826
827
  	role:mylog("hang_action", {desc = "bonusBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
  
f60b89b1   zhouhaihai   奖励副本
828
829
  	SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({
  		starNum = starNum, 
7bb30dca   zhouhaihai   修改发奖
830
831
832
  		reward = reward,
  		change = change
  	}))
f60b89b1   zhouhaihai   奖励副本
833
834
835
  	return true
  end
  
29fbbc10   zhouhaihai   夜间打工
836
837
838
839
840
  
  
  local function workWinReward(role, bonusData, rewardType, count, sweep)
  	count = count or 1
  	local reward, change = {}
7a4c9ac8   liguanghui   bug修复:扫荡会多给一次奖励
841
842
843
844
845
846
  	
  
  	reward = bonusData.reward:toNumMap()
  	for itemId, c in pairs(reward) do
  		reward[itemId] = c * count
  	end
29fbbc10   zhouhaihai   夜间打工
847
848
849
850
851
  	if rewardType == 2 or rewardType == 4 then
  		for k, v in pairs(bonusData.perfect_reward:toNumMap()) do
  			reward[k] = (reward[k] or 0) + v
  		end
  	end
5de5479e   liguanghui   工作日玩法奖励结算bug修复
852
853
  	for i = 1, count do
  		local chance = bonusData.chance:randWeight(true)
5de5479e   liguanghui   工作日玩法奖励结算bug修复
854
855
  		if chance[1] ~= 0 then
  			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
29fbbc10   zhouhaihai   夜间打工
856
857
  		end
  	end
29fbbc10   zhouhaihai   夜间打工
858
  	reward, change = role:award(reward, {log = {desc = "workBattle", int1 = bonusData.id}})
29fbbc10   zhouhaihai   夜间打工
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
  	return reward, change
  end
  
  function _M.workBattleInfoRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local workMainCsv = csvdb["work_mainCsv"][msg.type]
  	if not workMainCsv then return 1 end
  	if not role:isTimeResetOpen(TimeReset["WorkBattle" .. msg.type]) then return 2 end
  	SendPacket(actionCodes.Hang_workBattleInfoRpc, MsgPack.pack({count = tonum(redisproxy:hget(WORK_BATTLE_COUNT, role:getTimeResetRound(TimeReset["WorkBattle" .. msg.type]) * 10 + msg.type))}))
  	return true
  end
  
  
  function _M.getWorkRewardRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local workMainCsv = csvdb["work_mainCsv"][msg.type]
  	if not workMainCsv then return 1 end
  	if not role:isTimeResetOpen(TimeReset["WorkBattle" .. msg.type]) then return 2 end
  	local count = tonum(redisproxy:hget(WORK_BATTLE_COUNT,  role:getTimeResetRound(TimeReset["WorkBattle" .. msg.type]) * 10 + msg.type))
  	if count < workMainCsv.target_num then return 3 end
  	local workBattle = role:getProperty("workBattle")
  	if workBattle[msg.type] ~= 1 then
  		return 4
  	end
  	workBattle[msg.type] = -1
  	role:updateProperty({field = "workBattle", value = workBattle})
  	local reward, change = role:award(workMainCsv.phase_award, {log = {desc = "workReward"}})
  	SendPacket(actionCodes.Hang_getWorkRewardRpc, MsgPack.pack({reward = reward, change = change}))
  	return true
  end
  
  function _M.startWorkBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
  	local count = msg.count or 1
  
  	if not role:isFuncUnlock(FuncUnlock.BonusBattle) then return 1 end
  
  	local bonusData = csvdb["work_battleCsv"][id]
  
  	if not bonusData then return 3 end
  
  	if not role:isTimeResetOpen(TimeReset["WorkBattle" .. bonusData.type]) then return 2 end
  
  	local ticketId = csvdb["work_mainCsv"][bonusData.type].ticket
  	local workStar = role:getProperty("workStar")
  
  	if bonusData.unlock ~= 0 and (not workStar[bonusData.unlock] or workStar[bonusData.unlock] == 0) then return 4 end
  	local workBattle = role:getProperty("workBattle")
  	workBattle[bonusData.type] = workBattle[bonusData.type] or 0
  	local needCount = count - (workBattle[bonusData.type] == 0 and 1 or 0)
  	if needCount ~= 0 and not role:checkItemEnough({[ticketId] = needCount}) then return 11 end
  
  	if workStar[id] and workStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then 
  		if workBattle[bonusData.type] == 0 then
  			workBattle[bonusData.type] = 1
  			role:updateProperty({field = "workBattle", value = workBattle})
  		end
  		if needCount > 0 then
  			role:costItems({[ticketId] = needCount}, {log = {desc = "workBattle", int1 = id}})
  		end
007e3c41   zhouhaihai   增加的分数不同
923
  		redisproxy:hincrby(WORK_BATTLE_COUNT,  role:getTimeResetRound(TimeReset["WorkBattle" .. bonusData.type]) * 10 + bonusData.type, count * bonusData.target_add)
29fbbc10   zhouhaihai   夜间打工
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
  		local reward, change = workWinReward(role, bonusData, 3, count, true)
  		SendPacket(actionCodes.Hang_startWorkBattleRpc, MsgPack.pack({reward = reward, change = change}))
  	else
  		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
  		if not next(bTeam) then return 5 end
  		role.__bonusBattleCache = {
  			key = tostring(math.random()),
  			id = id,
  		}
  		SendPacket(actionCodes.Hang_startWorkBattleRpc, MsgPack.pack({key = role.__bonusBattleCache.key}))
  	end
  
  	return true
  end
  
  function _M.endWorkBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
  	local key = msg.key
  	local starNum = msg.starNum
  	if not role.__bonusBattleCache then return 1 end
  	
  
  	if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then 
  		SendPacket(actionCodes.Hang_endWorkBattleRpc, MsgPack.pack({errorCode = 1}))
  		return true
  	end
  	role.__bonusBattleCache = nil
  
  	-- 防作弊
  	if not role:checkBattleCheat("work", {
  		id = id,
  		isWin = starNum and starNum > 0,
  		info = msg.info
  	}) then
  		SendPacket(actionCodes.Hang_endWorkBattleRpc, MsgPack.pack({errorCode = 1}))
  		return true
  	end
  
  	local bonusData = csvdb["work_battleCsv"][id]
  	local ticketId = csvdb["work_mainCsv"][bonusData.type].ticket
  	local reward, change = {}
  
  	local workStar = role:getProperty("workStar")
  	local oldStar = workStar[id] or 0
  	local curStar = 0
   	if starNum and starNum > 0 then
   		-- 胜利扣除次数
   		
   		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
   		local herosInfo = role:getTeamHerosInfo(bTeam).heros
  
   		local check = {}
   		-- 1 通关
  		check[1] = function(_)
  			return true
  		end
  		-- 2 阵亡人数 <= N
  		check[2] = function(_, cond)
  			return msg.info.dead and msg.info.dead <= cond
  		end
  		-- 3 全员存活
  		check[3] = function(_)
  			return msg.info.dead and msg.info.dead == 0
  		end
  		-- 4 指定种族 >= N
  		check[4] = function(_, cond)
  			local count = 0
  			for _, one in pairs(herosInfo) do
  				local heroData = csvdb["unitCsv"][one.type]
  				if heroData.camp == cond then
  					count = count + 1
  				end
  			end
  			return count >= cond
  		end
  		-- 5 指定职业 >= N
  		check[5] = function(_, cond)
  			local count = 0
  			for _, one in pairs(herosInfo) do
  				local heroData = csvdb["unitCsv"][one.type]
  				if heroData.job == cond then
  					count = count + 1
  				end
  			end
  			return count >= cond
  		end
  		-- 6 含有指定角色 
  		check[6] = function(_, cond)
  			for _, one in pairs(herosInfo) do
  				if one.type == cond then
  					return true
  				end
  			end
  			return false
  		end
  		-- 7 通关耗时 <= X 秒  msg.info.atime
  		check[7] = function(_, cond)
  			return msg.info.atime and msg.info.atime <= cond
  		end
  		curStar = 0
  		local sweepConds = bonusData.sweep_condition:toTableArray(true)
   		for i, cond in ipairs(sweepConds) do
   			if check[cond[1]] and check[cond[1]](table.unpack(cond)) then
   				curStar = curStar + (1 << (i - 1))
   			end
   		end
   		local status
   		local rewardType = 0
   		if curStar >= (1 << #sweepConds) - 1 then -- 满星
   			rewardType = 2
   			if oldStar == 0 then  --通关
   				rewardType = 4
   			end
   		elseif oldStar == 0 then --通关
   			rewardType = 1
   		end
  
   		if rewardType ~= 0 then
   			local workBattle = role:getProperty("workBattle")
  			workBattle[bonusData.type] = workBattle[bonusData.type] or 0
  			local needCount = 1 - (workBattle[bonusData.type] == 0 and 1 or 0)
ffb897e9   zhouhaihai   免费次数记录错误
1047
1048
  			if workBattle[bonusData.type] == 0 then
  				workBattle[bonusData.type] = 1
29fbbc10   zhouhaihai   夜间打工
1049
1050
1051
1052
1053
  				role:updateProperty({field = "workBattle", value = workBattle})
  			end
  			if needCount > 0 then
  				role:costItems({[ticketId] = needCount}, {log = {desc = "workBattle", int1 = id}})
  			end
007e3c41   zhouhaihai   增加的分数不同
1054
  			redisproxy:hincrby(WORK_BATTLE_COUNT,  role:getTimeResetRound(TimeReset["WorkBattle" .. bonusData.type]) * 10 + bonusData.type, bonusData.target_add)
29fbbc10   zhouhaihai   夜间打工
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
  	 		reward, change = workWinReward(role, bonusData, rewardType)
  	 	end
   	else
   		curStar = oldStar
   	end
   	if curStar ~= oldStar then
   		workStar[id] = curStar
   		role:updateProperty({field = "workStar", value = workStar})
   	end
  
   	role:checkBattle("work", {
  		id = id,
  		isWin = starNum and starNum > 0,
  		info = msg.info,
  		reward = reward,
  	})
  	role:mylog("hang_action", {desc = "workBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
  
  	SendPacket(actionCodes.Hang_endWorkBattleRpc, MsgPack.pack({
  		starNum = starNum, 
  		reward = reward,
  		change = change
  	}))
  	return true
  end
  
a6508219   zhouhaihai   挂机奖励
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
  function _M.hangGiftRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local id = msg.id
  	local carbonData = csvdb["idle_battleCsv"][id]
  	if not carbonData or carbonData.item_clear_special == "" then return 1 end
  
  	local hangGift = role:getProperty("hangGift")
  	if hangGift[id] then return 2 end
  
7bb30dca   zhouhaihai   修改发奖
1092
  	local reward, change = role:award(carbonData.item_clear_special, {log = {desc = "hangGift", int1 = id}})
a6508219   zhouhaihai   挂机奖励
1093
1094
  
  	role:changeUpdates({{type = "hangGift", field = id, value = 1}})
d02f7904   zhouhaihai   遗失的log
1095
  	role:mylog("hang_action", {desc = "hangGift",  int1 = id})
a6508219   zhouhaihai   挂机奖励
1096
  
7bb30dca   zhouhaihai   修改发奖
1097
  	SendPacket(actionCodes.Hang_hangGiftRpc, MsgPack.pack({reward = reward, change = change}))
a6508219   zhouhaihai   挂机奖励
1098
1099
  	return true
  end
f60b89b1   zhouhaihai   奖励副本
1100
  
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
1101
1102
1103
1104
1105
1106
1107
  function _M.bagFieldRpc(agent, data)
  	local role = agent.role
  	local curBL = role:getProperty("hangBagLimit")
  	local costD = globalCsv.idle_field_cost[curBL - globalCsv.idle_field_origin]
  	if not costD then
  		return 1
  	end
3d8050ef   liuzujun   钻石3改成虹光玉8
1108
  	if costD ~= 0 and not role:checkItemEnough({[ItemId.Jade] = costD}) then
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
1109
1110
1111
  		return 2
  	end
  	role:updateProperty({field = "hangBagLimit", value = curBL + 1})
3d8050ef   liuzujun   钻石3改成虹光玉8
1112
  	role:costItems({[ItemId.Jade] = costD}, {log = {desc = "bagField"}})
64e63ad0   wangyujie   完成需求:挂机栏位物品数量上限和钻...
1113
1114
1115
  	SendPacket(actionCodes.Hang_bagFieldRpc, '')
  	return true
  end
f60b89b1   zhouhaihai   奖励副本
1116
  
ed20f277   zhouhaihai   chatline 奖励
1117
1118
1119
  function _M.chatLineRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
ed20f277   zhouhaihai   chatline 奖励
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
  	local id = msg.id
  
  	local idleData = csvdb["idle_battleCsv"][id]
  	if not idleData or idleData.chatline == 0 then
  		return
  	end
  
  	local chatline = role:getProperty("chatline")
  	if chatline[id] then return end
  
  	if not role:checkHangPass(id) then return end
  
  	chatline[id] = skynet.timex()
  	role:updateProperty({field = "chatline", value = chatline})
  
7bb30dca   zhouhaihai   修改发奖
1135
  	local reward, change = role:award(idleData.chatline_reward, {log = {desc = "chatline", int1 = id}})
ed20f277   zhouhaihai   chatline 奖励
1136
  	
7bb30dca   zhouhaihai   修改发奖
1137
  	SendPacket(actionCodes.Hang_chatLineRpc, MsgPack.pack({reward = reward, change = change}))
ed20f277   zhouhaihai   chatline 奖励
1138
1139
1140
  	return true
  end
  
98d32f92   liuzujun   多编队
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
  function _M.selectTeamRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local index = msg.index	-- 阵容索引
  	local type = msg.type	-- 系统类型
  
  	if index > 10 then
  		return 1
  	end
  	local team = role:getTeamFormat(index)
  	if not next(team) then return 2 end
  
  	local teamIndex = role:getProperty("teamIndex") or {}
  	teamIndex[type] = index
  	role:updateProperty({field = "teamIndex", value = teamIndex})
  
782ee57d   liuzujun   多编队功能
1157
1158
1159
1160
1161
  	if type == TeamSystemType.Hang then
  		role:finishGuide(5)
  		role:updateHangTeamInfo()
  	end
  
98d32f92   liuzujun   多编队
1162
1163
1164
1165
  	SendPacket(actionCodes.Hang_selectTeamRpc, '')
  	return true
  end
  
ba33bcac   liuzujun   挂机章节解锁
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
  function _M.unlockChapterRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local carbonId = msg.carbonId	-- 解锁章节id
  	local condition = globalCsv.idle_chapter_unlock[carbonId]
  	if not condition then return 1 end
  	local conditionMap = condition:toArray(true, "=")
  	local count, level = conditionMap[1],conditionMap[2]
  	local cnt = 0
  	for _, hero in pairs(role.heros) do
  		if hero:getProperty("level") >= level then
  			cnt = cnt + 1
  		end
  	end
  	if cnt < count then return 2 end
  
  	local unlockChapter = role:getProperty("unlockChap")
  	unlockChapter[carbonId] = 1
  	role:updateProperty({field="unlockChap", value = unlockChapter})
  
  	SendPacket(actionCodes.Hang_unlockChapterRpc, '')
  	return true
  end
  
42dcb7da   liuzujun   merge code
1190
  return _M