diff --git a/config/develop.lua b/config/develop.lua index e852296..e9dc86e 100644 --- a/config/develop.lua +++ b/config/develop.lua @@ -2,7 +2,7 @@ include("basic.lua") logd = 0 -- 是否开启日志 thread = 4 -codeurl = "106.13.60.20:9090" +codeurl = "192.168.8.223:9090" servId = 1 max_client = 64 diff --git a/src/actions/AdvAction.lua b/src/actions/AdvAction.lua index 9954d1e..2aa6450 100644 --- a/src/actions/AdvAction.lua +++ b/src/actions/AdvAction.lua @@ -187,23 +187,23 @@ function _M.startHangRpc(agent, data) local format = msg.format --编队 local chapterData = csvdb["adv_chapterCsv"][chapterId] - if not chapterData then return end - if chapterData.idleReward == "" then return end --没有奖励 没有挂机 + if not chapterData then return 1 end + if chapterData.idleReward == "" then return 2 end --没有奖励 没有挂机 local advHang = role:getProperty("advHang") - if advHang[chapterId] then return end --正在挂机 + if advHang[chapterId] then return 3 end --正在挂机 - if role:getAdvData():isRunning() and role:getAdvData().chapterId == chapterId then return end + if role:getAdvData():isRunning() and role:getAdvData().chapterId == chapterId then return 4 end - if AdvCommon.isEndless(chapterId) then return end -- 无尽没有代理 + if AdvCommon.isEndless(chapterId) then return 5 end -- 无尽没有代理 local advRelay = role:getProperty("advRelay") - if not next(advRelay[chapterId] or {}) then return end -- 没有开放 + if not next(advRelay[chapterId] or {}) then return 6 end -- 没有开放 - if not role:checkAdvCount(chapterData.limitlevel) then return end -- 是否有体力 + if not role:checkAdvCount(chapterData.limitlevel) then return 7 end -- 是否有体力 - if not checkFormat(role, format, role:getAdvData():isRunning()) then return end --编队是否正确 + if not checkFormat(role, format, role:getAdvData():isRunning()) then return 8 end --编队是否正确 local player = {} local attrs = role:getTeamBattleInfo(format).heros @@ -220,7 +220,7 @@ function _M.startHangRpc(agent, data) + 0.226 * player["hit"] + 0.26 * player["miss"] - if battleV < chapterData.idleValue then return end -- 战斗力是否满足 + if battleV < chapterData.idleValue then return 9 end -- 战斗力是否满足 local info = {} info.format = {} diff --git a/src/actions/PvpAction.lua b/src/actions/PvpAction.lua index 90bfec6..ca1586a 100644 --- a/src/actions/PvpAction.lua +++ b/src/actions/PvpAction.lua @@ -349,10 +349,11 @@ function _M.endBattleRpc(agent, data) ["time"] = now, } local status, body = httpc.get(remoteUrl, "/applyvideo?" .. httpGetFormatData(params), {}, {}) - local video = nil + local video, headers = nil, nil if tonumber(status) == 200 then local result = json.decode(body) video = result.name + headers = result.headers else skynet.error("applyvideo", "error", status, body, content) end @@ -401,6 +402,7 @@ function _M.endBattleRpc(agent, data) myRank = myRank, oldMyRank = oldMyRank, video = video, + headers = headers, })) return true end @@ -565,10 +567,11 @@ function _M.endBattleHRpc(agent, data) ["time"] = now, } local status, body = httpc.get(remoteUrl, "/applyvideo?" .. httpGetFormatData(params), {}, {}) - local video = nil + local video, headers = nil, nil if tonumber(status) == 200 then local result = json.decode(body) video = result.name + headers = result.headers else skynet.error("applyvideo", "error", status, body, content) end @@ -611,6 +614,7 @@ function _M.endBattleHRpc(agent, data) key = key, --战斗校验 key round = round, -- 战斗场数索引 video = video, -- 返回让客户端上传录像 + headers = headers, })) return true end -- libgit2 0.21.2