修改合并后的bug
parent
253e73f8a4
commit
b6bf5409f1
|
@ -190,7 +190,7 @@ function this:InitComponent()
|
||||||
this.btnElementDrawCard.gameObject:SetActive(false)
|
this.btnElementDrawCard.gameObject:SetActive(false)
|
||||||
this.btnSecretBox = Util.GetGameObject(this.gameObject, "scene/layer4/btnSecretBox")
|
this.btnSecretBox = Util.GetGameObject(this.gameObject, "scene/layer4/btnSecretBox")
|
||||||
this.btnYiYao = Util.GetGameObject(this.gameObject, "scene/layer4/btnYiYao")
|
this.btnYiYao = Util.GetGameObject(this.gameObject, "scene/layer4/btnYiYao")
|
||||||
this.btnPokemon = Util.GetGameObject(this.gameObject, "scene/layer4/btnPokemon")
|
this.btnPokemon = Util.GetGameObject(this.gameObject, "scene/layer6/btnPokemon")
|
||||||
-- this.btnTianFu = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianFu")
|
-- this.btnTianFu = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianFu")
|
||||||
this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi")
|
this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi")
|
||||||
this.btnWaiDi:SetActive(false)
|
this.btnWaiDi:SetActive(false)
|
||||||
|
@ -1490,7 +1490,7 @@ function this.InitFuncShow(funcType)
|
||||||
isOpen = ActTimeCtrlManager.IsQualifiled(i)
|
isOpen = ActTimeCtrlManager.IsQualifiled(i)
|
||||||
end
|
end
|
||||||
if v.lock==nil then
|
if v.lock==nil then
|
||||||
LogError(v.go.name)
|
LogError("v有nil")
|
||||||
end
|
end
|
||||||
v.lock:SetActive(not isOpen)
|
v.lock:SetActive(not isOpen)
|
||||||
Util.SetColor(v.lock, Color.New(1, 1, 1, 0.59))
|
Util.SetColor(v.lock, Color.New(1, 1, 1, 0.59))
|
||||||
|
|
|
@ -30,8 +30,8 @@ function ItemView:InitComponent()
|
||||||
Util.GetGameObject(self.gameObject, "item/heroShow/posIcon"):SetActive(false)
|
Util.GetGameObject(self.gameObject, "item/heroShow/posIcon"):SetActive(false)
|
||||||
self.name = Util.GetGameObject(self.gameObject, "name")
|
self.name = Util.GetGameObject(self.gameObject, "name")
|
||||||
self.resetLv = Util.GetGameObject(self.gameObject, "item/resetLv")
|
self.resetLv = Util.GetGameObject(self.gameObject, "item/resetLv")
|
||||||
self.upImg = Util.GetGameObject(self.gameObject, "item/upImg")
|
-- self.upImg = Util.GetGameObject(self.gameObject, "item/upImg")
|
||||||
self.upImg:SetActive(false)
|
-- self.upImg:SetActive(false)
|
||||||
self.resetLvText = self.resetLv:GetComponent("Text")
|
self.resetLvText = self.resetLv:GetComponent("Text")
|
||||||
self.rightUplv = Util.GetGameObject(self.gameObject, "item/rightUplv"):GetComponent("Text")
|
self.rightUplv = Util.GetGameObject(self.gameObject, "item/rightUplv"):GetComponent("Text")
|
||||||
self.middleDownLv = Util.GetGameObject(self.gameObject, "item/middleDownLv")
|
self.middleDownLv = Util.GetGameObject(self.gameObject, "item/middleDownLv")
|
||||||
|
@ -147,7 +147,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||||
self.time:SetActive(false)
|
self.time:SetActive(false)
|
||||||
self.homeLv.text = ""
|
self.homeLv.text = ""
|
||||||
self.homeProLv.text = ""
|
self.homeProLv.text = ""
|
||||||
self.upImg:SetActive(false)
|
-- self.upImg:SetActive(false)
|
||||||
|
|
||||||
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById( _itemData.configData.Name),4)
|
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById( _itemData.configData.Name),4)
|
||||||
|
|
||||||
|
@ -305,10 +305,10 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||||
end)
|
end)
|
||||||
elseif _itemData.configData.ItemType == ItemType.Gem then
|
elseif _itemData.configData.ItemType == ItemType.Gem then
|
||||||
if _itemData.isReplace then
|
if _itemData.isReplace then
|
||||||
self.upImg:SetActive(true)
|
-- self.upImg:SetActive(true)
|
||||||
end
|
end
|
||||||
if _itemData.backData.isReplace then
|
if _itemData.backData.isReplace then
|
||||||
self.upImg:SetActive(true)
|
-- self.upImg:SetActive(true)
|
||||||
end
|
end
|
||||||
Util.AddOnceClick(self.frameBtn, function()
|
Util.AddOnceClick(self.frameBtn, function()
|
||||||
UIManager.OpenPanel(UIName.RewardGemSingleShowPopup, _itemData.backData.itemId,3)
|
UIManager.OpenPanel(UIName.RewardGemSingleShowPopup, _itemData.backData.itemId,3)
|
||||||
|
|
Loading…
Reference in New Issue