diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua index 695a15d08f..0c06979d11 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua @@ -67,7 +67,7 @@ function this:BindEvent() end) --长按升级按下状态 this._onPointerDown = function(Pointgo, data) - -- isTriggerLongClick = false + isTriggerLongClick = false _isClicked = true this.timePressStarted = Time.realtimeSinceStartup oldLv = curPokemonData.lv @@ -76,7 +76,7 @@ end --长按升级抬起状态 this._onPointerUp = function(Pointgo, data) LogPink("连续升级抬起请求升级 "..tostring(_isLongPress)) - if _isLongPress then--and isTriggerLongClick + if _isLongPress and isTriggerLongClick then --连续升级抬起请求升级 LogPink("连续升级抬起请求升级 ") this.LongLvUpClick(oldLv) @@ -232,6 +232,7 @@ function this.LvUpClick(isSingleLvUp) this.LongLvUpClick(oldLv) _isClicked = false _isLongPress = false + isTriggerLongClick = true end return end @@ -249,6 +250,7 @@ function this.LvUpClick(isSingleLvUp) FormationManager.CheckHeroIdExist() end) else + isTriggerLongClick = true --前端先扣除材料 for i = 1, #curUpLvConsume do BagManager.HeroLvUpUpdateItemsNum(curUpLvConsume[i][1],curUpLvConsume[i][2]) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua index 236e22d927..6f5d5dbbff 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua @@ -91,6 +91,10 @@ function RoleTalismanPanelV2:BindEvent() end) --进阶按钮 Util.AddClick(this.RecallBtn, function() + if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then + PopupTipPanel.ShowTip(Language[12184]) + return + end if curHeroData.talismanList and curHeroData.talismanList <= 1 then PopupTipPanel.ShowTip(Language[12265]) return