From 0cd5ffca9df3f5ca0368575ab7f1ef13f6c5da41 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 3 Aug 2020 16:11:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AD=82=E5=8D=B0=E7=89=B9=E6=95=88=E5=85=B3?= =?UTF-8?q?=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/functions.lua | 21 +++++++++++-------- .../~Lua/Modules/Operating/QianKunBox.lua | 4 ++-- .../ManagedResources/~Lua/View/ItemView.lua | 18 ++++++++++------ 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 24d4b0e0aa..40eaa19d82 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1457,15 +1457,18 @@ function SetSoulEffect(quality,root) local effect = Util.GetGameObject(root,"UI_Effect_Kuang_JinSe") local effect1 = Util.GetGameObject(root,"UI_Effect_jinkuang_Fang") local effect2 = Util.GetGameObject(root,"UI_Effect_jinkuang_Yuan") - if quality >= 7 then - effect1.gameObject:SetActive(true) - effect2.gameObject:SetActive(true) - effect.gameObject:SetActive(false) - else - effect1.gameObject:SetActive(false) - effect2.gameObject:SetActive(false) - effect.gameObject:SetActive(true) - end + -- if quality >= 7 then + -- effect1.gameObject:SetActive(true) + -- effect2.gameObject:SetActive(true) + -- effect.gameObject:SetActive(false) + -- else + -- effect1.gameObject:SetActive(false) + -- effect2.gameObject:SetActive(false) + -- effect.gameObject:SetActive(true) + -- end + effect1.gameObject:SetActive(false) + effect2.gameObject:SetActive(false) + effect.gameObject:SetActive(true) end --- 本方法适用滚动条中 生成item的使用 (主要适用每条滚动条item数量不定的滚动条中) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua index e15a6bbac4..6b4b28893c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua @@ -92,8 +92,8 @@ end function QianKunBox:OnShow(sortingOrder) - Util.AddParticleSortLayer(self.effect, sortingOrder - orginLayer) - orginLayer = sortingOrder + -- Util.AddParticleSortLayer(self.effect, sortingOrder - orginLayer) + -- orginLayer = sortingOrder self.gameObject:SetActive(true) self:refreshMagicNum() diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index 0a8c9e2539..8a0113aecf 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -228,9 +228,12 @@ function ItemView:GetRewardShow(_itemData, effectLayer) --魂印 elseif _itemData.configData.ItemType == ItemType.HunYin then if effectLayer > 0 then - self.UI_Effect_jinkuang_Fang:SetActive(_itemData.configData.Quantity == 7) - self.UI_Effect_jinkuang_Yuan:SetActive(_itemData.configData.Quantity == 7) - self.UI_Effect_Kuang_JinSe:SetActive(not (_itemData.configData.Quantity == 7)) + -- self.UI_Effect_jinkuang_Fang:SetActive(_itemData.configData.Quantity == 7) + -- self.UI_Effect_jinkuang_Yuan:SetActive(_itemData.configData.Quantity == 7) + -- self.UI_Effect_Kuang_JinSe:SetActive(not (_itemData.configData.Quantity == 7)) + self.UI_Effect_jinkuang_Fang:SetActive(false) + self.UI_Effect_jinkuang_Yuan:SetActive(false) + self.UI_Effect_Kuang_JinSe:SetActive(true) end self.iconGo:SetActive(false) self.circleFrameBg:SetActive(true) @@ -485,9 +488,12 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0) end) elseif itemDataConFig.ItemType == ItemType.HunYin then - self.UI_Effect_jinkuang_Fang:SetActive(itemConfig[itemSId].Quantity>=7) - self.UI_Effect_jinkuang_Yuan:SetActive(itemConfig[itemSId].Quantity>=7) - self.UI_Effect_Kuang_JinSe:SetActive(not (itemConfig[itemSId].Quantity>=7)) + -- self.UI_Effect_jinkuang_Fang:SetActive(itemConfig[itemSId].Quantity>=7) + -- self.UI_Effect_jinkuang_Yuan:SetActive(itemConfig[itemSId].Quantity>=7) + -- self.UI_Effect_Kuang_JinSe:SetActive(not (itemConfig[itemSId].Quantity>=7)) + self.UI_Effect_jinkuang_Fang:SetActive(false) + self.UI_Effect_jinkuang_Yuan:SetActive(false) + self.UI_Effect_Kuang_JinSe:SetActive(true) self.num:SetActive(true) self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) self.iconGo:SetActive(false)