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

dev_chengFeng
gaoxin 2021-07-09 17:06:01 +08:00
commit 6405a0ad4d
2 changed files with 16 additions and 3 deletions

View File

@ -667,4 +667,7 @@ function this.WarPowerChangeNotify(did)
end
end
function this.IsGongMing(_curHeroData)
return this.IsChangeColor(_curHeroData.dynamicId) or (this:IsEnvoy(_curHeroData.dynamicId) and this:HongMengTowerUpLimit() ~= 0)
end
return HarmonyManager

View File

@ -87,13 +87,19 @@ end
function RoleInfoLayout:BindEvent()
--升级
Util.AddClick(this.upLvBtn, function()
if this.isGongMing then
PopupTipPanel.ShowTip("神将正在共鸣中,无法升级!")
return
end
if Time.realtimeSinceStartup - RoleInfoLayout.timePressStarted <= 0.4 then
-- --LogGreen("upLvBtn ")
this:LvUpClick(true)
end
end)
--长按升级按下状态
this._onPointerDown = function(Pointgo, data)
if this.isGongMing then
return
end
isTriggerLongClick = false
_isClicked = true
RoleInfoLayout.timePressStarted = Time.realtimeSinceStartup
@ -101,6 +107,10 @@ function RoleInfoLayout:BindEvent()
end
--长按升级抬起状态
this._onPointerUp = function(Pointgo, data)
if this.isGongMing then
PopupTipPanel.ShowTip("神将正在共鸣中,无法升级!")
return
end
if _isLongPress and isTriggerLongClick then
--连续升级抬起请求升级
this:LongLvUpClick(oldLv)
@ -268,8 +278,8 @@ function this:UpdateHeroUpLvAndBreakMaterialShow()
end
end
local isGongMing = HarmonyManager.IsChangeColor(curHeroData.dynamicId) or (HarmonyManager:IsEnvoy(curHeroData.dynamicId) and HarmonyManager:HongMengTowerUpLimit() ~= 0)
if isGongMing then
this.isGongMing = HarmonyManager.IsGongMing(curHeroData)
if this.isGongMing then
this.gongmingText:SetActive(true)
this.upLv:SetActive(false)
-- this.upLvBtn:SetActive(false)