Merge branch 'china/dev' into china/test
commit
2606314be5
|
@ -9,6 +9,9 @@ local this = Game
|
|||
function Game.Initialize()
|
||||
math.randomseed(os.time())
|
||||
|
||||
-- 关闭多点触控
|
||||
UnityEngine.Input.multiTouchEnabled = false
|
||||
--
|
||||
this.CurPlatform = tostring(UnityEngine.Application.platform)
|
||||
U3d.Application.runInBackground = true
|
||||
Screen.sleepTimeout = U3d.SleepTimeout.NeverSleep
|
||||
|
|
|
@ -80,12 +80,14 @@ function RewardItemSingleShowPopup:BindEvent()
|
|||
item.itemNum=compoundNum*_itemData.itemConfig.UsePerCount
|
||||
if endHeroNum > 0 then
|
||||
NetManager.HeroComposeRequest(item,function (drop)
|
||||
self:ClosePanel()
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function ()
|
||||
end,nil,nil,nil,true)
|
||||
end)
|
||||
if compoundNum<=0 then
|
||||
PopupTipPanel.ShowTip(Language[10183])
|
||||
end
|
||||
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[12157])
|
||||
end
|
||||
|
|
|
@ -30,6 +30,7 @@ local parent = {}
|
|||
local isUpZhen = false--当前英雄是否上阵
|
||||
local isHeroUpStar
|
||||
local herodatas = {}
|
||||
this.isPressed = false
|
||||
|
||||
function RoleInfoLayout:New(gameObject)
|
||||
local b = {}
|
||||
|
@ -104,6 +105,7 @@ function RoleInfoLayout:BindEvent()
|
|||
_isClicked = true
|
||||
RoleInfoLayout.timePressStarted = Time.realtimeSinceStartup
|
||||
oldLv = curHeroData.lv
|
||||
this.isPressed = true
|
||||
end
|
||||
--长按升级抬起状态
|
||||
this._onPointerUp = function(Pointgo, data)
|
||||
|
@ -117,6 +119,7 @@ function RoleInfoLayout:BindEvent()
|
|||
end
|
||||
_isClicked = false
|
||||
_isLongPress = false
|
||||
this.isPressed = false
|
||||
end
|
||||
this.upLvTrigger.onPointerDown = this.upLvTrigger.onPointerDown + this._onPointerDown
|
||||
this.upLvTrigger.onPointerUp = this.upLvTrigger.onPointerUp + this._onPointerUp
|
||||
|
|
|
@ -314,6 +314,10 @@ end
|
|||
|
||||
--右切换按钮点击
|
||||
function this:RightBtnOnClick()
|
||||
-- 英雄长按升级时不再进行切换操作
|
||||
if this.PageList[1].isPressed then
|
||||
return
|
||||
end
|
||||
if isClickLeftOrRightBtn == false then
|
||||
return
|
||||
end
|
||||
|
@ -352,6 +356,11 @@ end
|
|||
|
||||
--左切换按钮点击
|
||||
function this:LeftBtnOnClick()
|
||||
-- 英雄长按升级时不再进行切换操作
|
||||
if this.PageList[1].isPressed then
|
||||
return
|
||||
end
|
||||
|
||||
if isClickLeftOrRightBtn == false then
|
||||
return
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue