Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
682d1a6b39
|
@ -11,9 +11,9 @@ local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
|||
local recType = {}
|
||||
|
||||
--活动抽卡类型(动态的数据)
|
||||
local drawtType={
|
||||
FindFairySingle=0,
|
||||
}
|
||||
-- local drawtType={
|
||||
-- FindFairySingle=0,
|
||||
-- }
|
||||
|
||||
local orginLayer
|
||||
local isLimitUpHero=false
|
||||
|
@ -47,8 +47,8 @@ function QianKunBoxBuyOnePanel:InitComponent()
|
|||
this.itemNum2=Util.GetGameObject(this.content2,"Num"):GetComponent("Text")
|
||||
|
||||
-- 关于抽卡的LotterySetting数据
|
||||
local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
|
||||
drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id
|
||||
-- local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
|
||||
-- drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
|
|
@ -60,6 +60,7 @@ function RoleInfoLayout:InitComponent()
|
|||
this.itemPre=Util.GetGameObject(self.gameObject,"upLv/itemPre")
|
||||
this.itemGrid=Util.GetGameObject(self.gameObject,"upLv/itemGrid")
|
||||
this.upLvBtn=Util.GetGameObject(self.gameObject,"upLvBtn")
|
||||
|
||||
this.upLvBtnRedPoint=Util.GetGameObject(self.gameObject,"upLvBtn/redPoint")
|
||||
this.upLvTrigger = Util.GetEventTriggerListener(this.upLvBtn)
|
||||
|
||||
|
@ -221,11 +222,13 @@ function this:UpdateHeroUpLvAndBreakMaterialShow()
|
|||
if curHeroData.lv>=HeroManager.heroLvEnd[curHeroData.heroConfig.Id] then
|
||||
this.noUpLvText:SetActive(true)
|
||||
this.upLv:SetActive(false)
|
||||
this.upLvBtn:SetActive(false)
|
||||
this.upLvBtn:GetComponent("RectTransform").anchoredPosition = Vector2.New(322.3, -90)
|
||||
else
|
||||
Util.ClearChild(this.itemGrid.transform)
|
||||
this.noUpLvText:SetActive(false)
|
||||
this.upLv:SetActive(true)
|
||||
this.upLvBtn:SetActive(true)
|
||||
this.upLvBtn:GetComponent("RectTransform").anchoredPosition = Vector2.New(322.3, -90)
|
||||
isUpLvMaterials=true
|
||||
for i = 1, #costItemList do
|
||||
|
@ -268,6 +271,7 @@ function this:UpdateHeroUpLvAndBreakMaterialShow()
|
|||
if isGongMing then
|
||||
this.gongmingText:SetActive(true)
|
||||
this.upLv:SetActive(false)
|
||||
this.upLvBtn:SetActive(false)
|
||||
this.noUpLvText:SetActive(false)
|
||||
this.upLvBtn:GetComponent("RectTransform").anchoredPosition = Vector2.New(2098, -42.00134 )
|
||||
return
|
||||
|
|
Loading…
Reference in New Issue