Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
b33bd02c7f
|
|
@ -57,6 +57,10 @@ function this.PracticeGuideFun()
|
|||
end
|
||||
|
||||
function this.OnLevelChange()
|
||||
-- 提审服不再出发相关引导
|
||||
if SERVER_VERSION == 1 then
|
||||
return
|
||||
end
|
||||
-- 首充引导特殊处理到十级开放
|
||||
if PlayerManager.level == 10 then
|
||||
table.insert(_FuncGuideList, 100200)
|
||||
|
|
|
|||
|
|
@ -950,7 +950,7 @@ end
|
|||
local ySet = {[1] = 361 ,[2] = 512,[3] = 663,[4] = 814,[5] = 965 }
|
||||
--设置右侧条
|
||||
function this.SetRightBarSize()
|
||||
this.RightUp2:SetActive(PlayerManager.level >= 5)
|
||||
this.RightUp2:SetActive(PlayerManager.level >= 5 and SERVER_VERSION == 0)
|
||||
local str = PlayerPrefs.GetInt(PlayerManager.uid.."MainRightBarSetting")
|
||||
if not str or str == 0 then
|
||||
this.RightUp2bgSize.sizeDelta = Vector3.New(180,320,0)
|
||||
|
|
|
|||
|
|
@ -79,19 +79,16 @@ function RewardGemSingleShowPopup:BindEvent()
|
|||
end)
|
||||
Util.AddClick(this.btnJump, function()--合成
|
||||
if this.openType == 2 then--命格界面中
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GemCompound,itemSid,this.position,function ()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GemCompound,itemSid,this.position)
|
||||
self:ClosePanel()
|
||||
elseif this.openType == 1 then--背包中
|
||||
local num = BagManager.GetTotalItemNum(itemSid)
|
||||
if num/gemConfig[itemSid].UpgradeNum >= 2 then
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.GemMoreCom,itemSid,num,function ()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.GemMoreCom,itemSid,num)
|
||||
self:ClosePanel()
|
||||
else
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GemCompound,itemSid,nil,function ()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GemCompound,itemSid,nil)
|
||||
self:ClosePanel()
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
|
|
|||
Loading…
Reference in New Issue