From 4cb30990e19edb30fb37818322a643d0282cc052 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 2 Nov 2020 11:52:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E3=80=91=20bug=20=E9=9C=80=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Pokemon/PokemonSummonPanel.prefab | 2 +- Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua | 2 +- .../~Lua/Modules/Popup/RewardItemSingleShowPopup.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab index 6fa29f39e2..88ec7af87b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab @@ -2568,7 +2568,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua index e3ee7174e0..4e5d3306ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua @@ -523,7 +523,7 @@ end --上阵灵兽升星红点2 function this.GetSinglePokemonUpStarRedPoint(curPokemonData) if curPokemonData and curPokemonData.star < spiritAnimal[curPokemonData.id].MaxStar then - local curUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star + 1) + local curUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star) if curUpStarConfig then local upStarMaterialsData = {{curPokemonData.id,curUpStarConfig.ConsumeItemNum}} for j = 1, #curUpStarConfig.ConsumeRes do diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 661a2686de..1e6f29009c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -165,7 +165,7 @@ function RewardItemSingleShowPopup:OnShow() this.armorLanTuNum:GetComponent("Text").text = Language[11595] .. BagManager.GetItemCountById(itemSid) this.armorInfo.text = string.gsub(itemConfigData.ItemDescribe, "\\n", "") this.frameMask:SetActive(false) - if itemConfigData.ItemType == 2 then + if itemConfigData.ItemType == 2 or itemConfigData.ItemType == 22 then this.frameMask:SetActive(true) this.frameMask:GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfigData.Quantity)) local propertyName=itemConfig[itemConfigData.Id].PropertyName