【灵兽系统】 bug 需同步

dev_chengFeng
zhangqiang 2020-11-02 11:52:00 +08:00
parent c206f6487e
commit 4cb30990e1
3 changed files with 3 additions and 3 deletions

View File

@ -2568,7 +2568,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 0
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []

View File

@ -523,7 +523,7 @@ end
--上阵灵兽升星红点2 --上阵灵兽升星红点2
function this.GetSinglePokemonUpStarRedPoint(curPokemonData) function this.GetSinglePokemonUpStarRedPoint(curPokemonData)
if curPokemonData and curPokemonData.star < spiritAnimal[curPokemonData.id].MaxStar then 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 if curUpStarConfig then
local upStarMaterialsData = {{curPokemonData.id,curUpStarConfig.ConsumeItemNum}} local upStarMaterialsData = {{curPokemonData.id,curUpStarConfig.ConsumeItemNum}}
for j = 1, #curUpStarConfig.ConsumeRes do for j = 1, #curUpStarConfig.ConsumeRes do

View File

@ -165,7 +165,7 @@ function RewardItemSingleShowPopup:OnShow()
this.armorLanTuNum:GetComponent("Text").text = Language[11595] .. BagManager.GetItemCountById(itemSid) this.armorLanTuNum:GetComponent("Text").text = Language[11595] .. BagManager.GetItemCountById(itemSid)
this.armorInfo.text = string.gsub(itemConfigData.ItemDescribe, "\\n", "") this.armorInfo.text = string.gsub(itemConfigData.ItemDescribe, "\\n", "")
this.frameMask:SetActive(false) this.frameMask:SetActive(false)
if itemConfigData.ItemType == 2 then if itemConfigData.ItemType == 2 or itemConfigData.ItemType == 22 then
this.frameMask:SetActive(true) this.frameMask:SetActive(true)
this.frameMask:GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfigData.Quantity)) this.frameMask:GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfigData.Quantity))
local propertyName=itemConfig[itemConfigData.Id].PropertyName local propertyName=itemConfig[itemConfigData.Id].PropertyName