Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
6405a0ad4d
|
@ -667,4 +667,7 @@ function this.WarPowerChangeNotify(did)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.IsGongMing(_curHeroData)
|
||||||
|
return this.IsChangeColor(_curHeroData.dynamicId) or (this:IsEnvoy(_curHeroData.dynamicId) and this:HongMengTowerUpLimit() ~= 0)
|
||||||
|
end
|
||||||
return HarmonyManager
|
return HarmonyManager
|
|
@ -87,13 +87,19 @@ end
|
||||||
function RoleInfoLayout:BindEvent()
|
function RoleInfoLayout:BindEvent()
|
||||||
--升级
|
--升级
|
||||||
Util.AddClick(this.upLvBtn, function()
|
Util.AddClick(this.upLvBtn, function()
|
||||||
|
if this.isGongMing then
|
||||||
|
PopupTipPanel.ShowTip("神将正在共鸣中,无法升级!")
|
||||||
|
return
|
||||||
|
end
|
||||||
if Time.realtimeSinceStartup - RoleInfoLayout.timePressStarted <= 0.4 then
|
if Time.realtimeSinceStartup - RoleInfoLayout.timePressStarted <= 0.4 then
|
||||||
-- --LogGreen("upLvBtn ")
|
|
||||||
this:LvUpClick(true)
|
this:LvUpClick(true)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
--长按升级按下状态
|
--长按升级按下状态
|
||||||
this._onPointerDown = function(Pointgo, data)
|
this._onPointerDown = function(Pointgo, data)
|
||||||
|
if this.isGongMing then
|
||||||
|
return
|
||||||
|
end
|
||||||
isTriggerLongClick = false
|
isTriggerLongClick = false
|
||||||
_isClicked = true
|
_isClicked = true
|
||||||
RoleInfoLayout.timePressStarted = Time.realtimeSinceStartup
|
RoleInfoLayout.timePressStarted = Time.realtimeSinceStartup
|
||||||
|
@ -101,6 +107,10 @@ function RoleInfoLayout:BindEvent()
|
||||||
end
|
end
|
||||||
--长按升级抬起状态
|
--长按升级抬起状态
|
||||||
this._onPointerUp = function(Pointgo, data)
|
this._onPointerUp = function(Pointgo, data)
|
||||||
|
if this.isGongMing then
|
||||||
|
PopupTipPanel.ShowTip("神将正在共鸣中,无法升级!")
|
||||||
|
return
|
||||||
|
end
|
||||||
if _isLongPress and isTriggerLongClick then
|
if _isLongPress and isTriggerLongClick then
|
||||||
--连续升级抬起请求升级
|
--连续升级抬起请求升级
|
||||||
this:LongLvUpClick(oldLv)
|
this:LongLvUpClick(oldLv)
|
||||||
|
@ -268,8 +278,8 @@ function this:UpdateHeroUpLvAndBreakMaterialShow()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local isGongMing = HarmonyManager.IsChangeColor(curHeroData.dynamicId) or (HarmonyManager:IsEnvoy(curHeroData.dynamicId) and HarmonyManager:HongMengTowerUpLimit() ~= 0)
|
this.isGongMing = HarmonyManager.IsGongMing(curHeroData)
|
||||||
if isGongMing then
|
if this.isGongMing then
|
||||||
this.gongmingText:SetActive(true)
|
this.gongmingText:SetActive(true)
|
||||||
this.upLv:SetActive(false)
|
this.upLv:SetActive(false)
|
||||||
-- this.upLvBtn:SetActive(false)
|
-- this.upLvBtn:SetActive(false)
|
||||||
|
|
Loading…
Reference in New Issue