From 632291a19cd20d82422cd18bf3dbd914184b5b01 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 5 Jul 2021 15:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B3=95=E5=AE=9D=E5=BD=92=E5=85=83?= =?UTF-8?q?=E3=80=91=E9=B8=BF=E8=92=99=E9=98=B5=E4=B8=8A=E7=9A=84=E8=8B=B1?= =?UTF-8?q?=E9=9B=84=E5=BD=92=E5=85=83=E6=B3=95=E5=AE=9D=E5=BC=B9=20null?= =?UTF-8?q?=20=20and=20=20=20=20=E3=80=90=E7=81=B5=E5=85=BD=E5=B1=B1?= =?UTF-8?q?=E3=80=91=E9=95=BF=E6=8C=89=E5=8D=87=E7=BA=A7=E5=BC=B9=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E5=BC=80=E5=B0=8F=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua | 6 ++++-- .../~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) 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