diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index bc12a27882..0710edb9da 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -44815,7 +44815,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1044302835 RectTransform: m_ObjectHideFlags: 0 @@ -114972,7 +114972,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8884311231984071841 RectTransform: m_ObjectHideFlags: 0 @@ -121191,16 +121191,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1517028597} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero - objectReference: {fileID: 0} - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -121306,7 +121296,22 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero + objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -121331,12 +121336,7 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -121356,16 +121356,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1787096307} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero - objectReference: {fileID: 0} - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -121471,7 +121461,22 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero + objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -121496,12 +121501,7 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -121666,16 +121666,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2022055768} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero - objectReference: {fileID: 0} - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -121781,7 +121771,22 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero + objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -121806,12 +121811,7 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -121831,16 +121831,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1673863619} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero - objectReference: {fileID: 0} - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -121946,7 +121936,22 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero + objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -121971,12 +121976,7 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -121996,16 +121996,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 213509966} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero - objectReference: {fileID: 0} - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -122111,7 +122101,22 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero + objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -122136,12 +122141,7 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -122161,16 +122161,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1806694851} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero - objectReference: {fileID: 0} - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -122276,7 +122266,22 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero + objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -122301,12 +122306,7 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index 78396a3c2a..bb1e9593e6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -354,7 +354,9 @@ function this.SystemItemAdapter(node, data, isShowTime) if itemDataConFig.ItemType == ItemType.Hero then local heroConfigData=ConfigManager.GetConfigData(ConfigName.HeroConfig, itemConfig[data.itemId].HeroStar[1]) local showStarNum = string.find(data.msg, "觉醒") and heroConfigData.MaxRank or itemConfig[data.itemId].HeroStar[2] - UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,heroConfigData.Id,showStarNum) + if showStarNum == HeroManager.awakeStarIndex then--只有觉醒有点击事件 + UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,heroConfigData.Id,showStarNum) + end elseif itemDataConFig.ItemType == ItemType.Equip then UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, data.itemId) else diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua index 6a0d24d3d4..08bf038dbb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua @@ -51,7 +51,7 @@ local _PlayerHead = nil -- 星星 local _StarList = {} local _StarMaxNum = 10 - +this.Pokemons = {} --初始化组件(用于子类重写) function GuildMemberInfoPopup:InitComponent() this.btnBack = Util.GetGameObject(self.transform, "btnClose") @@ -78,6 +78,14 @@ function GuildMemberInfoPopup:InitComponent() table.insert(this.Demons, Util.GetGameObject(self.gameObject, "tipImage/panel/defendbox/Demons/heroPro (" .. i .. ")")) end + this.Pokemons = {} + for i = 1, 6 do + table.insert(this.Pokemons, Util.GetGameObject(self.gameObject, "tipImage/panel/pokemonInfo/Demons/heroPro (" .. i .. ")")) + end + this.pokemonObj=Util.GetGameObject(self.transform, "tipImage/panel/pokemonInfo").gameObject + + this.bgImg= Util.GetGameObject(self.transform, "tipImage/tipImage"):GetComponent("RectTransform") + this.boxLine = Util.GetGameObject(self.transform, "tipImage/panel/defendbox/line") this.btnBox = Util.GetGameObject(self.transform, "panel/box") this.btnList = {} @@ -308,72 +316,43 @@ function this.FormationAdapter(teamInfo) end end - -- for i, demon in ipairs(this.Demons) do - -- if(teamInfo.team[i]) then - -- demon:SetActive(true) - -- local demonId = teamInfo.team[i].heroTid - -- local starGrid=Util.GetGameObject(demon, "starGrid") - -- local proImage=Util.GetGameObject(demon, "heroShow/proIcon"):GetComponent("Image") - -- Util.GetGameObject(demon, "heroShow/posIcon"):SetActive(false) - -- -- local posImage=Util.GetGameObject(demon, "heroShow/posIcon"):GetComponent("Image") - -- -- local heroStage = Util.GetGameObject(demon, "heroShow/heroStage"):GetComponent("Image") - -- local UI_Effect_Kuang_JinSe=Util.GetGameObject(demon, "effects/UI_Effect_Kuang_JinSe") - -- local UI_Effect_Kuang_HongSe=Util.GetGameObject(demon, "effects/UI_Effect_Kuang_HongSe") - -- local roleLevel=Util.GetGameObject(demon, "lvbg/levelText"):GetComponent("Text") - -- local frameBtn=Util.GetGameObject(demon, "frame") - -- if demonId then - -- demon:SetActive(true) - -- local demonData = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) - -- Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon)) - -- local heroTData = ConfigManager.GetConfigData(ConfigName.HeroConfig,teamInfo.team[i].heroTid) - -- Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroTData.Quality)) - -- SetHeroStars(starGrid, teamInfo.team[i].star) - -- proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(demonData.PropertyName)) - -- -- posImage.sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(demonData.Profession)) - -- -- heroStage.sprite = Util.LoadSprite(HeroStageSprite[demonData.HeroStage]) - -- roleLevel.text=teamInfo.team[i].level - -- --if effectLayer > 0 then - -- -- self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Star == 5 or _itemData.configData.Star == 7) - -- -- self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Star == 6) - -- --end - -- -- 血量显示 - -- Util.SetGray(demon, false) - -- local hpSlider = Util.GetGameObject(demon, "Slider") - -- hpSlider:SetActive(false) - -- if this._ViewType == GUILD_MEM_POPUP_TYPE.ATTACK_ENEMY_DEFEND or this._ViewType == GUILD_MEM_POPUP_TYPE.ATTACK_MY_DEFEND then - -- hpSlider:SetActive(true) - -- local remainHp = teamInfo.remainHp[i] - -- remainHp = remainHp or 0 - -- Util.SetGray(demon, remainHp == 0) - -- hpSlider:GetComponent("Slider").value = remainHp/10000 - -- local txt = Util.GetGameObject(hpSlider, "Text"):GetComponent("Text") - -- txt.text = (remainHp/100).."%" - -- end - -- -- - -- Util.AddOnceClick(frameBtn, function() - -- if this._ViewType ~= GUILD_MEM_POPUP_TYPE.INFORMATION then return end - -- NetManager.ViewHeroInfoRequest(this._MemId,teamInfo.team[i].heroid,function(msg) - -- local heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects) - -- GoodFriendManager.InitEquipData(msg.equip,heroData) - -- UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true) - -- end) - -- end) - -- end - -- else - -- demon:SetActive(false) - -- end - -- end - -- 异妖 - -- for i, diffDemon in ipairs(this.DiffDemons) do - -- local demonId = teamInfo.PokemonInfos[i] - -- if demonId then - -- diffDemon:SetActive(true) - -- local resId = ConfigManager.GetConfigData(ConfigName.DifferDemonsConfig, demonId).LiveIcon - -- diffDemon:GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(resId)) - -- else - -- diffDemon:SetActive(false) - -- end - -- end + local len=#teamInfo.PokemonInfos + LogError("长度:"..len) + if len>0 then + this.bgImg.sizeDelta=Vector2.New(900,1024) + this.pokemonObj:SetActive(true) + for i, demon in ipairs(this.Pokemons) do + demon.gameObject:SetActive(false) + Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(1)) + Util.GetGameObject(demon, "hero"):SetActive(false) + Util.AddOnceClick(frameBtn, function() + end) + end + else + this.bgImg.sizeDelta=Vector2.New(900,850) + this.pokemonObj:SetActive(false) + end + + --队伍灵兽 + for i, hero in ipairs(teamInfo.PokemonInfos) do + local demonId = teamInfo.PokemonInfos[i].heroTid + this.Pokemons[i].gameObject:SetActive(true) + if demonId then + local heroGo = Util.GetGameObject(this.Pokemons[i], "hero") + heroGo:SetActive(true) + SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), hero.star) + local heroConfig = ConfigManager.GetConfigData(ConfigName.SpiritAnimal, demonId) + Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level + Util.GetGameObject(this.Pokemons[i], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(heroConfig.Quality)) + Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig.Icon)) + local frameBtn = Util.GetGameObject(this.Pokemons[i], "frame") + local heroData = {} + Util.AddOnceClick(frameBtn, function() + local pokemonData={tempId=demonId,id=demonId,star=hero.star,level=hero.level} + UIManager.OpenPanel(UIName.PokemonGetInfoPopup,true,pokemonData) + end) + end + end end -- 刷新按钮显示 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 1ccefa3e0b..743b5dfc02 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -106,7 +106,7 @@ function RewardItemSingleShowPopup:BindEvent() MsgPanel.ShowTwo(string.format("成功解锁皮肤%s,是否前往更换?",skinConfig.ReadingName),function() end,function() local herodata = HeroManager.GetHeroDataByHeroSIdAndMinSortIdAndSkinId(skinConfig.HeroId,skinConfig.Type) LogGreen("herodata.dynamicId:"..tostring(herodata.dynamicId)) - UIManager.OpenPanel(UIName.RoleInfoPanel,herodata, HeroManager.GetAllHeroDatas(),true,4) + UIManager.OpenPanel(UIName.RoleInfoPanel,herodata, HeroManager.GetAllHeroDatas(),true,5) end,"取消","确定","",false,"") else PopupTipPanel.ShowTip(string.format("成功解锁皮肤%s",skinConfig.ReadingName))