384bb077
 
  zhouahaihai
 
挂机
 | 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24 
 | 
  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 = {}
  
  local function checkReward(role)
  	local hangInfo = role:getProperty("hangInfo")
  	if not hangInfo.carbonId or not hangInfo.coinTime or not hangInfo.itemTime then
  		return
  	end
  	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
25
26 
 | 
  	local nowCoinTime = math.min(skynet.timex(), hangInfo.endCoinTime or 0)
  	local nowItemTime = math.min(skynet.timex(), hangInfo.endItemTime or 0)
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
27 
 | 
  
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
28 
 | 
  	local coinCount = math.max(0, math.floor((nowCoinTime - hangInfo.coinTime) / globalCsv.idle_money_produce_cd))
 
 | 
9962b061
 
  zhouahaihai
 
补充 挂机
 | 
29 
 | 
  	hangInfo.coinTime = hangInfo.coinTime + coinCount * globalCsv.idle_money_produce_cd
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
30 
 | 
  
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
31 
 | 
  	local itemCount = math.max(0, math.floor((nowItemTime - hangInfo.itemTime) / globalCsv.idle_item_produce_cd))
 
 | 
9962b061
 
  zhouahaihai
 
补充 挂机
 | 
32 
 | 
  	hangInfo.itemTime = hangInfo.itemTime + itemCount * globalCsv.idle_item_produce_cd
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
33
34
35
36 
 | 
  
  	local items = role:getProperty("hangBag")
  	items[ItemId.Gold] = (items[ItemId.Gold] or 0) + coinCount * carbonData.money
  	items[ItemId.Exp] = (items[ItemId.Exp] or 0) + coinCount * carbonData.exp
 
 | 
4b7c7c96
 
  zhouahaihai
 
增加 清空 挂机 冒险gm  角色经验
 | 
37 
 | 
  	items[ItemId.PlayerExp] = (items[ItemId.PlayerExp] or 0) + coinCount * carbonData.playerExp
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
38
39
40
41
42 
 | 
  
  	local pool = {}
  	for _, temp in pairs(carbonData.item:toArray()) do
  		table.insert(pool, temp:toArray(true, "="))
  	end
 
 | 
64e63ad0
 
  wangyujie
 
完成需求:挂机栏位物品数量上限和钻...
 | 
43
44
45 
 | 
  	local curFC = 0
  	local curIC = 0
  	for id, count in pairs(items) do
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
46 
 | 
  		if id ~= ItemId.Gold and id ~= ItemId.Exp and id ~= ItemId.PlayerExp then
 
 | 
64e63ad0
 
  wangyujie
 
完成需求:挂机栏位物品数量上限和钻...
 | 
47
48 
 | 
  			curFC = curFC + math.ceil(count / globalCsv.idle_field_limit)
  			curIC = curIC + count
 
 | 
9962b061
 
  zhouahaihai
 
补充 挂机
 | 
49
50 
 | 
  		end
  	end
 
 | 
64e63ad0
 
  wangyujie
 
完成需求:挂机栏位物品数量上限和钻...
 | 
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84 
 | 
  	local selfFC = role:getProperty("hangBagLimit")	--再加上月卡的栏位 TODO
  	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)
  			local cur = pool[idx]
  			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
  			else
  				items[cur[1]] = items[cur[1]] + cur[2]
  				break
 
 | 
9962b061
 
  zhouahaihai
 
补充 挂机
 | 
85 
 | 
  			end
 
 | 
9962b061
 
  zhouahaihai
 
补充 挂机
 | 
86 
 | 
  		end
 
 | 
64e63ad0
 
  wangyujie
 
完成需求:挂机栏位物品数量上限和钻...
 | 
87
88
89
90 
 | 
  		curIC = curIC + 1
  	end
  	for i = 1, itemCount do
  		randomItem()
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
91
92
93 
 | 
  	end
  
  	if coinCount > 0 or itemCount > 0 then
 
 | 
5af8b4aa
 
  zhouahaihai
 
挂机down
 | 
94 
 | 
  		return true
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
95
96
97 
 | 
  	end
  end
  
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
98
99
100
101
102
103 
 | 
  --开始一个新的关卡
  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
 
奖励副本
 | 
104 
 | 
  	if not carbonData then return 1 end
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
105 
 | 
  
 
 | 
d232676a
 
  zhouhaihai
 
功能解锁  冒险返回
 | 
106
107
108
109 
 | 
  	if math.floor(carbonId / 10000) ~= 1 then
  		if not role:isFuncUnlock(FuncUnlock.DifficultHang) then return end
  	end
  
 
 | 
5d80aca6
 
  zhouahaihai
 
挂机优化
 | 
110
111 
 | 
  
  	for _, preCarbonId in ipairs(carbonData.prepose:toArray(true, "=")) do
 
 | 
33be3111
 
  zhouhaihai
 
修改hangPass 结构
 | 
112 
 | 
  		if not role:checkHangPass(preCarbonId) then return 2 end
 
 | 
5d80aca6
 
  zhouahaihai
 
挂机优化
 | 
113 
 | 
  	end
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
114 
 | 
  
 
 | 
5af8b4aa
 
  zhouahaihai
 
挂机down
 | 
115
116
117 
 | 
  	if checkReward(role) then
  		role:updateProperty({field = "hangBag", value = role:getProperty("hangBag")})
  	end
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
118
119 
 | 
  
  	local hangInfo = role:getProperty("hangInfo")
 
 | 
5af8b4aa
 
  zhouahaihai
 
挂机down
 | 
120 
 | 
  	local isNew = not hangInfo.carbonId
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
121
122 
 | 
  	hangInfo.carbonId = carbonId
  	local nowTime = skynet.timex()
 
 | 
5af8b4aa
 
  zhouahaihai
 
挂机down
 | 
123 
 | 
  	if isNew then
 
 | 
1103490d
 
  zhouhaihai
 
设置 国家时间错误
 | 
124
125 
 | 
  		hangInfo.coinTime = nowTime
  		hangInfo.itemTime = nowTime
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
126
127 
 | 
  		hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max
  		hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max
 
 | 
1103490d
 
  zhouhaihai
 
设置 国家时间错误
 | 
128
129
130 
 | 
  	else
  		hangInfo.coinTime = math.min(nowTime, hangInfo.endCoinTime)
  		hangInfo.itemTime = math.min(nowTime, hangInfo.endItemTime)
 
 | 
5af8b4aa
 
  zhouahaihai
 
挂机down
 | 
131 
 | 
  	end
 
 | 
33be3111
 
  zhouhaihai
 
修改hangPass 结构
 | 
132 
 | 
  	if not role:checkHangPass(carbonId) then
 
 | 
5af8b4aa
 
  zhouahaihai
 
挂机down
 | 
133
134
135 
 | 
  		hangInfo.bossTime = nowTime + carbonData.idle_time
  	else
  		hangInfo.bossTime = nil
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
136
137
138 
 | 
  	end
  	role:updateProperty({field = "hangInfo", value = hangInfo})
  
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
139
140 
 | 
  	role:log("hang_action", {desc = "startHang", int1 = carbonId})
  
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
141
142
143
144
145
146
147
148 
 | 
  	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
 | 
149
150
151
152 
 | 
  	if checkReward(role) then
  		role:updateProperty({field = "hangBag", value = role:getProperty("hangBag")})
  		role:updateProperty({field = "hangInfo", value = role:getProperty("hangInfo")})
  	end
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
153
154
155
156 
 | 
  	SendPacket(actionCodes.Hang_checkRpc, MsgPack.pack({}))
  	return true
  end
  
 
 | 
cc5ca7f3
 
  zhouhaihai
 
缓存battleKey
 | 
157 
 | 
  local _BattleKey = nil
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
158
159
160 
 | 
  function _M.startBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
161
162 
 | 
  	local carbonId = msg.carbonId
  	local curData = csvdb["idle_battleCsv"][carbonId]
 
 | 
a1e08c9c
 
  zhengshouren
 
宝箱关战斗异常
 | 
163
164
165 
 | 
  	if not curData then 
  		return 1
  	end
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
166 
 | 
  
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
167 
 | 
  	local hangInfo = role:getProperty("hangInfo")
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
168 
 | 
  	if curData.main ~= 1 then
 
 | 
a1e08c9c
 
  zhengshouren
 
宝箱关战斗异常
 | 
169
170
171 
 | 
  		if carbonId ~= hangInfo.carbonId then 
  			return 2
  		end
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
172
173 
 | 
  	end
  
 
 | 
33be3111
 
  zhouhaihai
 
修改hangPass 结构
 | 
174 
 | 
  	if role:checkHangPass(carbonId) then 
 
 | 
a1e08c9c
 
  zhengshouren
 
宝箱关战斗异常
 | 
175
176 
 | 
  		return 3
  	end
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
177 
 | 
  
 
 | 
cc5ca7f3
 
  zhouhaihai
 
缓存battleKey
 | 
178
179 
 | 
  	_BattleKey = tostring(math.random())
  
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
180 
 | 
  	role:checkTaskEnter("HangBattle", {id = carbonId})
 
 | 
52c87300
 
  zhouhaihai
 
bug
 | 
181 
 | 
  	SendPacket(actionCodes.Hang_startBattleRpc, MsgPack.pack({key = _BattleKey}))
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
182
183
184
185
186
187
188 
 | 
  	return true
  end
  
  function _M.endBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local hangInfo = role:getProperty("hangInfo")
 
 | 
cc5ca7f3
 
  zhouhaihai
 
缓存battleKey
 | 
189 
 | 
  	if not msg.key or msg.key ~= _BattleKey then 
 
 | 
4906ebd2
 
  zhengshouren
 
宝箱关副本结算异常
 | 
190
191 
 | 
  		return 1
  	end
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
192
193 
 | 
  	local carbonId = msg.carbonId
  	local carbonData = csvdb["idle_battleCsv"][carbonId]
 
 | 
4906ebd2
 
  zhengshouren
 
宝箱关副本结算异常
 | 
194
195
196 
 | 
  	if not carbonData then
  		return 2
  	end
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
197 
 | 
  	if carbonData.main ~= 1 then
 
 | 
4906ebd2
 
  zhengshouren
 
宝箱关副本结算异常
 | 
198
199
200 
 | 
  		if carbonId ~= hangInfo.carbonId then 
  			return 3
  		end
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
201 
 | 
  	end
 
 | 
33be3111
 
  zhouhaihai
 
修改hangPass 结构
 | 
202
203 
 | 
  
  	if role:checkHangPass(carbonId) then 
 
 | 
4906ebd2
 
  zhengshouren
 
宝箱关副本结算异常
 | 
204
205 
 | 
  		return 4
  	end
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
206
207 
 | 
  	local reward
  	if msg.starNum and msg.starNum > 0 then --win
 
 | 
33be3111
 
  zhouhaihai
 
修改hangPass 结构
 | 
208 
 | 
  		role:hangFinish(carbonId)
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
209
210
211 
 | 
  		if carbonData.main ~= 1 then
  			hangInfo.bossTime = nil
  		end
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
212
213 
 | 
  		-- reward
  		reward = {}
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
214
215 
 | 
  		reward[ItemId.Gold] = carbonData.money_clear
  		reward[ItemId.Exp] = carbonData.exp_clear
 
 | 
00115a7a
 
  zhouahaihai
 
奖励发放
 | 
216 
 | 
  		reward[ItemId.PlayerExp] = carbonData.playerExp_clear
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
217 
 | 
  		for itemId, count in pairs(carbonData.item_clear:toNumMap()) do
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
218
219 
 | 
  			reward[itemId] = count
  		end
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
220 
 | 
  		reward = role:award(reward, {log = {desc = "hangBattle", int1 = carbonId}})
 
 | 
00e663bd
 
  zhouhaihai
 
剧情相关
 | 
221 
 | 
  
 
 | 
03a6166a
 
  zhouhaihai
 
餐厅优化
 | 
222 
 | 
  		role:checkTaskEnter("HangPass", {id = carbonId})
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
223 
 | 
  	end
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
224 
 | 
  	role:updateProperty({field = "hangInfo", value = hangInfo})
 
 | 
33be3111
 
  zhouhaihai
 
修改hangPass 结构
 | 
225
226
227 
 | 
  	
  	local team = role:getProperty("pvpTC")
  	role:log("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), cint1 = role:getHerosCamp(team.heros)})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
228 
 | 
  
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
229
230
231
232
233
234
235 
 | 
  	SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({
  		starNum = msg.starNum, 
  		reward = reward,
  		}))
  	return true
  end
  
 
 | 
7efe5275
 
  zhouhaihai
 
检查leader
 | 
236
237
238
239
240
241
242 
 | 
  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
 
挂机
 | 
243
244
245 
 | 
  function _M.roleFormatRpc(agent , data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
246
247
248 
 | 
  	local hangTeam = role:getProperty("hangTeam")
  	for slot, heroId in pairs(msg.heros) do
  		if not role.heros[heroId] then
 
 | 
e6ebee44
 
  zhouhaihai
 
编队bug
 | 
249 
 | 
  			return 1
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
250
251 
 | 
  		end
  	end
 
 | 
f603a60f
 
  zhouhaihai
 
支援技实装
 | 
252
253
254 
 | 
  
  	local supports = {}
  	for slot, support in pairs(msg.supports or {}) do
 
 | 
e6ebee44
 
  zhouhaihai
 
编队bug
 | 
255 
 | 
  		if slot ~= 1 and slot ~= 2 then return 2 end
 
 | 
f603a60f
 
  zhouhaihai
 
支援技实装
 | 
256 
 | 
  		local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
 
 | 
e6ebee44
 
  zhouhaihai
 
编队bug
 | 
257 
 | 
  		if level <= 0 then return 3 end
 
 | 
f603a60f
 
  zhouhaihai
 
支援技实装
 | 
258
259 
 | 
  		supports[slot] = support
  	end
 
 | 
e6ebee44
 
  zhouhaihai
 
编队bug
 | 
260 
 | 
  	if not checkLeader(msg.heros, msg.leader) then return 4 end
 
 | 
f603a60f
 
  zhouhaihai
 
支援技实装
 | 
261 
 | 
  
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
262
263
264
265
266
267 
 | 
  	table.clear(hangTeam)
  	hangTeam.heros = {}
  	for slot, heroId in pairs(msg.heros) do
  		hangTeam.heros[slot] = heroId
  	end
  	hangTeam.leader = msg.leader
 
 | 
f603a60f
 
  zhouhaihai
 
支援技实装
 | 
268 
 | 
  	hangTeam.supports = supports
 
 | 
fa565e0c
 
  zhouhaihai
 
优化结构
 | 
269 
 | 
  	role:saveHangTeam(hangTeam)
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
270
271
272
273 
 | 
  	SendPacket(actionCodes.Hang_roleFormatRpc, '')
  	return true
  end
  
 
 | 
5af8b4aa
 
  zhouahaihai
 
挂机down
 | 
274
275
276
277
278 
 | 
  function _M.getRewardRpc(agent , data)
  	local role = agent.role
  	checkReward(role)
  	local items = role:getProperty("hangBag")
  	if not next(items) then return end
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
279 
 | 
  	local reward = role:award(items, {log = {desc = "hangReward"}})
 
 | 
5af8b4aa
 
  zhouahaihai
 
挂机down
 | 
280
281
282 
 | 
  	table.clear(items)
  	local hangInfo = role:getProperty("hangInfo")
  	local nowTime = skynet.timex()
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
283
284 
 | 
  	hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max
  	hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max
 
 | 
5af8b4aa
 
  zhouahaihai
 
挂机down
 | 
285
286
287
288 
 | 
  	hangInfo.coinTime = nowTime
  	hangInfo.itemTime = nowTime
  	role:updateProperty({field = "hangBag", value = items})
  	role:updateProperty({field = "hangInfo", value = hangInfo})
 
 | 
03a6166a
 
  zhouhaihai
 
餐厅优化
 | 
289 
 | 
  	role:checkTaskEnter("HangGet")
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
290
291 
 | 
  	if reward[ItemId.Gold] then
  		role:checkTaskEnter("HangGetGold", {count = reward[ItemId.Gold]})
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
292 
 | 
  	end
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
293 
 | 
  	SendPacket(actionCodes.Hang_getRewardRpc, MsgPack.pack({
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
294
295
296
297
298 
 | 
  		reward = reward
  	}))
  	return true
  end
  
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343 
 | 
  -- function _M.getRewardItemRpc(agent , data)
  -- 	local role = agent.role
  -- 	checkReward(role)
  -- 	local items = role:getProperty("hangBag")
  -- 	if not next(items) then return end
  
  -- 	local notNeed = {[ItemId.Gold] = 1, [ItemId.Exp] = 1, [ItemId.PlayerExp] = 1}
  -- 	local reward = {}
  -- 	for itemId , count in pairs(items) do
  -- 		if not notNeed[itemId] then
  -- 			reward[itemId] = count
  -- 			items[itemId] = nil
  -- 		end
  -- 	end
  -- 	if not next(reward) then return end
  -- 	local reward = role:award(reward)
  
  -- 	local hangInfo = role:getProperty("hangInfo")
  -- 	local nowTime = skynet.timex()
  -- 	hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max
  -- 	hangInfo.itemTime = nowTime
  -- 	role:updateProperty({field = "hangBag", value = items})
  -- 	role:updateProperty({field = "hangInfo", value = hangInfo})
  
  -- 	SendPacket(actionCodes.Hang_getRewardItemRpc, MsgPack.pack({
  -- 		reward = reward
  -- 	}))
  -- 	return true
  -- end
  
  -- function _M.getRewardCoinRpc(agent , data)
  -- 	local role = agent.role
  -- 	checkReward(role)
  -- 	local items = role:getProperty("hangBag")
  -- 	if not next(items) then return end
  
  -- 	local need = {[ItemId.Gold] = 1, [ItemId.Exp] = 1, [ItemId.PlayerExp] = 1}
  -- 	local reward = {}
  -- 	for itemId , count in pairs(items) do
  -- 		if need[itemId] then
  -- 			reward[itemId] = count
  -- 			items[itemId] = nil
  -- 		end
  -- 	end
  -- 	local reward = role:award(reward)
 
 | 
bcf5bfbb
 
  zhouahaihai
 
挂机new
 | 
344 
 | 
  	
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
345
346
347
348
349
350
351
352
353
354
355
356 
 | 
  -- 	local hangInfo = role:getProperty("hangInfo")
  -- 	local nowTime = skynet.timex()
  -- 	hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max
  -- 	hangInfo.coinTime = nowTime
  -- 	role:updateProperty({field = "hangBag", value = items})
  -- 	role:updateProperty({field = "hangInfo", value = hangInfo})
  
  -- 	SendPacket(actionCodes.Hang_getRewardCoinRpc, MsgPack.pack({
  -- 		reward = reward
  -- 	}))
  -- 	return true
  -- end
 
 | 
9962b061
 
  zhouahaihai
 
补充 挂机
 | 
357
358
359
360
361
362
363
364
365
366
367
368
369 
 | 
  
  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]
  
  	local curCount = role.dailyData:getProperty("hangQC") + 1
  	local costs = globalCsv.idle_quickproduce_cost:toArray(true, "=")
  	if not costs[curCount] then return end
  	if costs[curCount] > 0 then
  		if not role:checkItemEnough({[ItemId.Diamond] = costs[curCount]}) then return end
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
370 
 | 
  		role:costItems({[ItemId.Diamond] = costs[curCount]}, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
 
 | 
9962b061
 
  zhouahaihai
 
补充 挂机
 | 
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391 
 | 
  	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)
  	reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + coinCount * carbonData.money
  	reward[ItemId.Exp] = (reward[ItemId.Exp] or 0) + coinCount * carbonData.exp
  
  	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
  
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
392 
 | 
  	reward = role:award(reward, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
393
394
395 
 | 
  	if reward[ItemId.Gold] then
  		role:checkTaskEnter("HangGetGold", {count = reward[ItemId.Gold]})
  	end
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
396 
 | 
  	role:checkTaskEnter("HangQuick")
 
 | 
9962b061
 
  zhouahaihai
 
补充 挂机
 | 
397
398
399
400
401
402 
 | 
  	SendPacket(actionCodes.Hang_quickRpc, MsgPack.pack({
  		reward = reward
  	}))
  	return true
  end
  
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
403
404
405
406
407
408
409
410
411 
 | 
  function _M.bonusFormatRpc(agent , data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local bTeam = role:getProperty("bTeam")
  	for slot, heroId in pairs(msg.heros) do
  		if not role.heros[heroId] then
  			return
  		end
  	end
 
 | 
f603a60f
 
  zhouhaihai
 
支援技实装
 | 
412
413
414
415
416
417
418 
 | 
  	local supports = {}
  	for slot, support in pairs(msg.supports) do
  		if slot ~= 1 and slot ~= 2 then return end
  		local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
  		if level <= 0 then return end
  		supports[slot] = support
  	end
 
 | 
7efe5275
 
  zhouhaihai
 
检查leader
 | 
419
420 
 | 
  	if not checkLeader(msg.heros, msg.leader) then return end
  	
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
421
422
423
424
425
426 
 | 
  	table.clear(bTeam)
  	bTeam.heros = {}
  	for slot, heroId in pairs(msg.heros) do
  		bTeam.heros[slot] = heroId
  	end
  	bTeam.leader = msg.leader
 
 | 
f603a60f
 
  zhouhaihai
 
支援技实装
 | 
427 
 | 
  	bTeam.supports = supports
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
428
429
430
431
432
433
434
435
436
437
438
439
440 
 | 
  
  	role:updateProperty({field = "bTeam", value = bTeam}) 
  	SendPacket(actionCodes.Hang_bonusFormatRpc, '')
  	return true
  end
  
  function _M.buyBonusCountRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local count = msg.count
  	local btype = msg.type
  
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
441 
 | 
  	if not TimeReset["DailyBattle" .. btype] then return end
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
442
443
444
445
446
447 
 | 
  
  	local bonusC = role.dailyData:getProperty("bonusC")
  	bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
  	local lastCount = globalCsv.bonus_daily_buy_count - bonusC[btype]["b"]
  	if math.illegalNum(count, 1, lastCount)  then return 1 end
  
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
448 
 | 
  	if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}) then return 2 end
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
449 
 | 
  
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
450 
 | 
  	role:costItems({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}, {log = {desc = "buyBonusCount", short1 = btype, int1 = count}})
 
 | 
d481965d
 
  zhouhaihai
 
购买次数bug
 | 
451
452 
 | 
  	bonusC[btype]["b"] = bonusC[btype]["b"] + count
  	bonusC[btype]["c"] = bonusC[btype]["c"] - count
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
453
454
455
456
457
458
459
460
461
462
463
464 
 | 
  
  	role.dailyData:updateProperty({field = "bonusC", value = bonusC})
  
  	SendPacket(actionCodes.Hang_buyBonusCountRpc, '')
  	return true
  end
  
  function _M.startBonusBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
  
 
 | 
d232676a
 
  zhouhaihai
 
功能解锁  冒险返回
 | 
465
466 
 | 
  	if not role:isFuncUnlock(FuncUnlock.BonusBattle) then return end
  
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
467 
 | 
  	local bonusData = csvdb["bonus_battleCsv"][id]
 
 | 
bc902e2d
 
  zhouhaihai
 
增加开放判断
 | 
468
469
470 
 | 
  
  	if not role:isTimeResetOpen(TimeReset["DailyBattle" .. bonusData.type]) then return end
  
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
471 
 | 
  	if not bonusData then return 1 end
 
 | 
33be3111
 
  zhouhaihai
 
修改hangPass 结构
 | 
472 
 | 
  	if not role:checkHangPass(bonusData.unlock) then return 2 end
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
473
474
475
476
477
478 
 | 
  
  	if not next(role:getProperty("bTeam")) then return 3 end
  
  	local bonusC = role.dailyData:getProperty("bonusC")
  	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
  	if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 4 end
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501 
 | 
  
  
  	role.__bonusBattleCache = {
  		key = tostring(math.random()),
  		id = id,
  	}
  	SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({key = role.__bonusBattleCache.key}))
  	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
  
  	if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then return 2 end
  	local bonusData = csvdb["bonus_battleCsv"][id]
  
  	local reward
   	if starNum and starNum > 0 then
 
 | 
74a8fdc9
 
  zhouhaihai
 
奖励副本 胜利扣除次数
 | 
502
503
504
505
506
507
508 
 | 
   		-- 胜利扣除次数
   		local bonusC = role.dailyData:getProperty("bonusC")
  		bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
  		if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 3 end
  		bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1
  		role.dailyData:updateProperty({field = "bonusC", value = bonusC})
  
 
 | 
b2747fbc
 
  zhouhaihai
 
挂机
 | 
509
510
511
512
513
514 
 | 
  		reward = bonusData.reward:toNumMap()
  		local chance = bonusData.chance:randWeight(true)
  		if chance[1] ~= 0 then
  			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
  		end
   		reward = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
515
516
517 
 | 
   		role:checkTaskEnter("BonusPass", {id = id})
   	end
  
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
518
519 
 | 
  	role:log("hang_action", {desc = "bonusBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
  
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
520
521
522
523
524
525 
 | 
  	SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({
  		starNum = starNum, 
  		reward = reward}))
  	return true
  end
  
 
 | 
a6508219
 
  zhouhaihai
 
挂机奖励
 | 
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544 
 | 
  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
  
  	local reward = role:award(carbonData.item_clear_special, {log = {desc = "hangGift", int1 = id}})
  	role:log("hang_action", {desc = "hangGift",  int1 = id})
  
  	role:changeUpdates({{type = "hangGift", field = id, value = 1}})
  
  	SendPacket(actionCodes.Hang_hangGiftRpc, MsgPack.pack(reward))
  	return true
  end
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
545 
 | 
  
 
 | 
64e63ad0
 
  wangyujie
 
完成需求:挂机栏位物品数量上限和钻...
 | 
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560 
 | 
  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
  	if costD ~= 0 and not role:checkItemEnough({[ItemId.Diamond] = costD}) then
  		return 2
  	end
  	role:updateProperty({field = "hangBagLimit", value = curBL + 1})
  	role:costItems({[ItemId.Diamond] = costD}, {log = {desc = "bagField"}})
  	SendPacket(actionCodes.Hang_bagFieldRpc, '')
  	return true
  end
 
 | 
f60b89b1
 
  zhouhaihai
 
奖励副本
 | 
561 
 | 
  
 
 | 
ed20f277
 
  zhouhaihai
 
chatline 奖励
 | 
562
563
564 
 | 
  function _M.chatLineRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
 
 | 
ed20f277
 
  zhouhaihai
 
chatline 奖励
 | 
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585 
 | 
  	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})
  
  	local reward = role:award(idleData.chatline_reward, {log = {desc = "chatline", int1 = id}})
  	
  	SendPacket(actionCodes.Hang_chatLineRpc, MsgPack.pack(reward))
  	return true
  end
  
 
 | 
384bb077
 
  zhouahaihai
 
挂机
 | 
586 
 | 
  return _M
 
 |