diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonUpStarSuccessPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonUpStarSuccessPanel.prefab index 9b0493d5f3..8c43dcfa40 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonUpStarSuccessPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonUpStarSuccessPanel.prefab @@ -103437,7 +103437,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3019608, g: 0.54509807, b: 0.41176474, a: 1} + m_Color: {r: 0, g: 1, b: 0.023529412, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -103457,7 +103457,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.4 - m_Text: "\u7B49\u7EA7\u4E0A\u9650\u6269\u5C55\u523070\u7EA7" + m_Text: "\u5DF2\u63D0\u5347\u81F3\u6700\u9AD8\u661F\u7EA7" LanguageIndex: 11589 --- !u!1 &6520529797300406191 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua index 8ba9ccd379..3376ec41e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua @@ -211,6 +211,7 @@ function this.RefreshShow(_curPokemonData, _pokemonDatas) curPokemonData, pokemonDatas = _curPokemonData, _pokemonDatas this.OnShowData() this.OnShowRedPoint() + this.contents[curIndex].view:OnShow(this,curPokemonData) end function PokemonInfoPanel:OnSortingOrderChange() for i = 1, #this.contents do diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSkillInfoPopup.lua index 87a7d30f02..7d02db7e43 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSkillInfoPopup.lua @@ -62,7 +62,7 @@ function this.ShowPokemonSkillList() this.skillIcon.sprite = Util.LoadSprite(GetResourcePath(curSkillConFig.Icon)) this.skillLv.text = curSkillConFig.Level this.curSkillLv.text = "等级"..curSkillConFig.Level - this.curSkillInfo.text = curSkillConFig.Desc + this.curSkillInfo.text = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,pokemonSid).SkillDesc for i = 1, #pokemonSkillPreList do if pokemonSkillDataList[i] then diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua index 16303f42c3..fe3f3c918e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonUpStarSuccessPanel.lua @@ -87,10 +87,10 @@ function PokemonUpStarSuccessPanel:OnOpen(_curPokemonData) this.heroName.text = curPokeponConfig.Name --如果是最大等级 local nextUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star + 1) - if nextUpStarConfig then - this.starEndText:SetActive(false) - else + if curPokemonData.star == curPokeponConfig.MaxStar then this.starEndText:SetActive(true) + else + this.starEndText:SetActive(false) end --计算面板属性old diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua index db8784aab4..7a1a436e2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua @@ -131,7 +131,7 @@ function this.SingPokemonDataShow(_go,_itemData) local starSize = Vector2.New(50,50) SetHeroStars(Util.GetGameObject(_go.transform, "star/starGrid"), _itemData.star,1,starSize, -5,Vector2.New(0.5,0.5)) Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function() - UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonUpZhenDatas()) + UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonDatas()) end) end function this.SingPokemonChipDataShow(_go,_itemData) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua index a35263f47a..5d8ccac063 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua @@ -136,7 +136,7 @@ function this.SingleItemDataShow(_go,_itemData) end end) Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function() - UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonUpZhenDatas()) + UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonDatas()) end) end diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index 9fe79e9e8f..0793a0092e 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -321,8 +321,8 @@ LogError("掉落物品".._itemData.itemType) elseif _itemData.itemType == 6 then self.num:SetActive(false) self.name:GetComponent("Text").text = _itemData.name - self.resetLv:GetComponent("Text").text = "+" ..1 - self.resetLv:SetActive(true) + -- self.resetLv:GetComponent("Text").text = "+" ..1 + self.resetLv:SetActive(false) self.fragmentIcon:SetActive(false) Util.AddOnceClick(self.frameBtn, function() UIManager.OpenPanel(UIName.PokemonGetInfoPopup, true,_itemData.backData)