Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
48f4fb5913
|
|
@ -172,6 +172,8 @@ function Network:SendMessageWithCallBack(nMsgId, nReMsgId, sMsg, func, isHideMas
|
|||
end
|
||||
|
||||
function Network:ReceiveErrorInfo(buffer)
|
||||
|
||||
LogError("Network ReceiveErrorInfo errCode:"..msg.errCode)
|
||||
local data = buffer:DataByte()
|
||||
local msg = CommonProto_pb.ErrorResponse()
|
||||
msg:ParseFromString(data)
|
||||
|
|
@ -204,7 +206,7 @@ function Network:ReceiveErrorInfo(buffer)
|
|||
end
|
||||
|
||||
if msg.errCode == -1 then
|
||||
Log("服务器发来的错误消息:"..msg.errMsg)
|
||||
LogError("Network ReceiveErrorInfo errDes:"..msg.errMsg)
|
||||
end
|
||||
local errorCfg = ConfigManager.TryGetConfigData(ConfigName.ErrorCodeHint, msg.errCode)
|
||||
if errorCfg then
|
||||
|
|
|
|||
|
|
@ -2076,7 +2076,7 @@ local effectList = {
|
|||
isSecKill = BattleUtil.RandomAction(f3, function()
|
||||
-- 秒杀
|
||||
local isBoss=BattleUtil.CheckIsBoss(target)
|
||||
if not isBoss then
|
||||
if isBoss then
|
||||
return
|
||||
end
|
||||
BattleUtil.Seckill(skill, caster, target)
|
||||
|
|
|
|||
|
|
@ -2518,7 +2518,9 @@ local passivityList = {
|
|||
if skill.type == BattleSkillType.Special then
|
||||
local list = skill:GetDirectTargetsNoMiss()
|
||||
if list then
|
||||
|
||||
local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(pro) * f1))
|
||||
LogError(role:GetRoleData(pro).." ".. f1.." " .. tv)
|
||||
for _, r in ipairs(list) do
|
||||
local auraBuff = Buff.Create(role, BuffName.HOT, i1, 1, tv)
|
||||
auraBuff.interval = 1
|
||||
|
|
@ -2542,6 +2544,7 @@ local passivityList = {
|
|||
local list = skill:GetDirectTargetsNoMiss()
|
||||
if list then
|
||||
local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(pro) * f1))
|
||||
LogError(role:GetRoleData(pro).." ".. f1.." " .. tv)
|
||||
for _, r in ipairs(list) do
|
||||
local auraBuff = Buff.Create(role, BuffName.HOT, i1, 1, tv)
|
||||
auraBuff.interval = 1
|
||||
|
|
@ -4463,7 +4466,7 @@ local passivityList = {
|
|||
--
|
||||
local onRoleHit = function(defRole, damage, bCrit, finalDmg, damageType, skill)
|
||||
local isBoss=BattleUtil.CheckIsBoss(defRole)
|
||||
if not isBoss then
|
||||
if isBoss then
|
||||
return
|
||||
end
|
||||
if skill and not defRole:IsDead() then
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ local CurCamp = 0
|
|||
local CurSkillPos = {}
|
||||
local PosList = {}
|
||||
local curFrame
|
||||
BattleLogic.Type = 0 --1 故事副本 2 地图探索 3 竞技场 4 秘境boss 5 解锁秘境 6 公会战 7 血战 8 兽潮 9巅峰战
|
||||
BattleLogic.Type = -1 -- 0 切磋 1 故事副本 2 地图探索 3 竞技场 4 秘境boss 5 解锁秘境 6 公会战 7 血战 8 兽潮 9巅峰战
|
||||
BattleLogic.IsEnd = false
|
||||
BattleLogic.Result = -1
|
||||
BattleLogic.Event = BattleEvent.New()
|
||||
|
|
@ -310,7 +310,7 @@ function BattleLogic.Update()
|
|||
return
|
||||
end
|
||||
if CurRound > MaxRound then
|
||||
if BattleLogic.Type==9 then
|
||||
if BattleLogic.Type==9 or BattleLogic.Type== 0 then
|
||||
LogError("我方总输出"..allHeroDamage.."敌方总输出:"..allEnemyDamage)
|
||||
if allHeroDamage>allEnemyDamage then
|
||||
LogError("争霸赛我方胜")
|
||||
|
|
|
|||
|
|
@ -95,6 +95,8 @@ function BattleWinPopup:NextStep()
|
|||
m_battlePanel:ClosePanel()
|
||||
end
|
||||
self:ClosePanel()
|
||||
-- 再刷新一便关卡信息
|
||||
NetManager.InitFightPointLevelInfo()
|
||||
end, 1, true, true)
|
||||
end)
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in New Issue