|
|
@@ -673,27 +673,54 @@ function onHookQuery(human)
|
|
|
local now = os.time()
|
|
|
local outSec = now - human.db.battleOut.expTs1
|
|
|
local maxHangTime = getHangMaxTime(human)
|
|
|
- msgRet.maxTime = maxHangTime
|
|
|
- if maxHangTime >= outSec then
|
|
|
- msgRet.time = outSec
|
|
|
- else
|
|
|
- msgRet.time = maxHangTime
|
|
|
- end
|
|
|
+ local idx = 1
|
|
|
+
|
|
|
for i = 1, #items do
|
|
|
Grid.makeItem(msgRet.items[i], items[i].id, items[i].cnt)
|
|
|
end
|
|
|
-
|
|
|
local len = #items
|
|
|
if human.db.battleOut.equip then
|
|
|
for k, equipGrid in ipairs(human.db.battleOut.equip) do
|
|
|
+ if len >= 10 then
|
|
|
+ msgRet.items[0] = len
|
|
|
+ msgRet.isEnd = 0
|
|
|
+ msgRet.index = idx
|
|
|
+ msgRet.maxTime = maxHangTime
|
|
|
+ if maxHangTime >= outSec then
|
|
|
+ msgRet.time = outSec
|
|
|
+ else
|
|
|
+ msgRet.time = maxHangTime
|
|
|
+ end
|
|
|
+ local minHour = math.floor(msgRet.time / HOUR_SEC)
|
|
|
+ minHour = (minHour ~= 0) and minHour or 1
|
|
|
+ msgRet.diamond = minHour * DIAMOND_COST_PER_HOUR
|
|
|
+
|
|
|
+ msgRet.exp = nodeConfig.hangExp
|
|
|
+ msgRet.jinbi = nodeConfig.hangJinbi
|
|
|
+ msgRet.greenExp = nodeConfig.hangGreenExp
|
|
|
+ msgRet.qingbao = nodeConfig.hangQingbao or 0
|
|
|
+ Msg.send(msgRet, human.fd)
|
|
|
+ len = 0
|
|
|
+ idx = idx + 1
|
|
|
+ msgRet = Msg.gc.GC_BATTLE_HANG_QUERY
|
|
|
+ end
|
|
|
len = len + 1
|
|
|
Grid.makeItem(msgRet.items[len], equipGrid.id, 1, nil, equipGrid)
|
|
|
end
|
|
|
end
|
|
|
+ msgRet.isEnd = 1
|
|
|
+ msgRet.index = idx
|
|
|
+ msgRet.items[0] = len
|
|
|
+ msgRet.maxTime = maxHangTime
|
|
|
+ if maxHangTime >= outSec then
|
|
|
+ msgRet.time = outSec
|
|
|
+ else
|
|
|
+ msgRet.time = maxHangTime
|
|
|
+ end
|
|
|
local minHour = math.floor(msgRet.time / HOUR_SEC)
|
|
|
minHour = (minHour ~= 0) and minHour or 1
|
|
|
msgRet.diamond = minHour * DIAMOND_COST_PER_HOUR
|
|
|
- msgRet.items[0] = len
|
|
|
+
|
|
|
msgRet.exp = nodeConfig.hangExp
|
|
|
msgRet.jinbi = nodeConfig.hangJinbi
|
|
|
msgRet.greenExp = nodeConfig.hangGreenExp
|