Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-11-22 16:52:29 +08:00
commit 9fe1e610ca
5 changed files with 24 additions and 19 deletions

View File

@ -116,13 +116,13 @@ function BagResolveAnCompoundPanel:BindEvent()
this.ShowCompoundNumData(compoundNum)
end
else
if endHeroNum > 0 then
if compoundNum > 0 then
if compoundNum<compoundMaxNum then
compoundNum=compoundNum+1
this.ShowCompoundNumData(compoundNum)
end
else
PopupTipPanel.ShowTip(Language[12157])
PopupTipPanel.ShowTip("已达上限")
end
end
end)
@ -329,7 +329,7 @@ function this.OnShowLayout3Data()
compoundNum= compoundNum>=compoundMaxNum and compoundMaxNum or compoundNum
if compoundMaxNum > 0 then
this.Slider:GetComponent("Slider").value=1
this.Slider:GetComponent("Slider").minValue=0
this.Slider:GetComponent("Slider").minValue=1
else
this.Slider:GetComponent("Slider").value=0
this.Slider:GetComponent("Slider").minValue=0

View File

@ -8695,6 +8695,9 @@ local passivityList = {
if time==num then
return
end
if skill.owner.camp~=role.camp then
return
end
if skill.owner.element~=camp then
return
end

View File

@ -998,7 +998,11 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i
end
-- 计算克制伤害系数
local MieKangFactor = 1 + atkRole:GetRoleData(BattleMieProp[defRole.element]) - defRole:GetRoleData(BattleKangProp[atkRole.element])
local MieKangFactor = 1
if atkRole.type == BattleUnitType.Role and defRole.type == BattleUnitType.Role then
MieKangFactor=MieKangFactor + atkRole:GetRoleData(BattleMieProp[defRole.element]) - defRole:GetRoleData(BattleKangProp[atkRole.element])
end
-- 公式伤害 = 基础伤害 * 基础伤害系数 * 增伤系数 * 爆伤系数 * 克制伤害系数
local fixDamage = floor(BattleUtil.FP_Mul(baseDamage, baseFactor, addDamageFactor, critDamageFactor, MieKangFactor))

View File

@ -62,7 +62,7 @@ function this:GetSkipState()
if AppConst.isOpenGM then
return SKIP_STATE.UNLOCK
end
LogError("fightType "..fightType)
-- LogError("fightType "..fightType)
if UpdateBtnGMFunc[fightType] then
return UpdateBtnGMFunc[fightType]()
else
@ -518,11 +518,13 @@ function this.ShowBattleResult(result, msg)
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.DEATH_POS then-- 十绝阵结算界面特殊显示
this.ShowBattleResultByDeathPos()
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.BACK or BattleManager.GetLastBattleType() == BATTLE_TYPE.ARENA then
this:ClosePanel()
this:ClosePanel()
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.TASUILINGXIAO then
this.ShowBattleResultByTaSuiLingXiao()
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.JumpServerhightLadder then
this.ShowBattleResultByJumpServerHightLadder(result)
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.LINGMAIMIJING then
this:ClosePanel()
else
if result == 0 then -- 失败
local haveRecord = BattleRecordManager.isHaveRecord()

View File

@ -40,29 +40,25 @@ function BattleUnit:DelayFunc(time, func)
end
local timer
timer = Timer.New(function ()
if func then func() func = nil end
if self._DelayFuncList[timer] then
self._DelayFuncList[timer]()
end
self:ClearDelayFunc(timer)
end, time)
timer:Start()
table.insert(self._DelayFuncList, timer)
--
self._DelayFuncList[timer] = func
end
function BattleUnit:ClearDelayFunc(t)
if not self._DelayFuncList then return end
if t then
local rIndex
for index, timer in ipairs(self._DelayFuncList) do
if timer == t then
rIndex = index
break
end
end
if rIndex then
self._DelayFuncList[rIndex]:Stop()
table.remove(self._DelayFuncList, rIndex)
if self._DelayFuncList[t] then
t:Stop()
self._DelayFuncList[t] = nil
end
else
for _, timer in ipairs(self._DelayFuncList) do
for timer, func in pairs(self._DelayFuncList) do
timer:Stop()
end
self._DelayFuncList = {}