diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index eb00e58142..ccd04da6cd 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -362,6 +362,7 @@ GameEvent = { PatFaceSendFinish="PatFace.PatFaceSendFinish", PatFaceHaveGrowGift="PatFace.PatFaceHaveGrowGift", PatFaceClear="PatFace.PatFaceClear", + RefreshRightUp = "PatFace.RefreshRightUp" }, ATM_RankView={ OnRankChange="ATM_RankView.OnRankChange", diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index ef3fea7dd6..bde4196493 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -645,6 +645,7 @@ function this:AddListener() Game.GlobalEvent:AddEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow) Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip) Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerGetSuperManReward, this.GetSuperManReward) + Game.GlobalEvent:AddEvent(GameEvent.PatFace.RefreshRightUp, this.SetRightBarSize)--刷新右上伸缩条 end --移除事件监听(用于子类重写) @@ -660,6 +661,7 @@ function this:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.EightDay.FifteenDayGift, this.RefreshEightGiftPreview) Game.GlobalEvent:RemoveEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow) Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerGetSuperManReward, this.GetSuperManReward) + Game.GlobalEvent:RemoveEvent(GameEvent.PatFace.RefreshRightUp, this.SetRightBarSize)--刷新右上伸缩条 end function this.GetSuperManReward() @@ -766,6 +768,7 @@ end --设置右侧条 function this.SetRightBarSize() + LogWarn("SetRightBarSize刷新") this.RightUp2:SetActive(PlayerManager.level >= 5) local bgSize = Util.GetGameObject(this.RightUp2,"BG"):GetComponent("RectTransform") local btn = Util.GetGameObject(this.RightUp2,"BG/Button") diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 00291a4462..10bc2bc002 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -349,6 +349,7 @@ function this.FormationAdapter(teamInfo) end item.gameObject:SetActive(true) local icon = Util.GetGameObject(item,"icon"):GetComponent("Image") + icon.sprite = this.spLoader:LoadSprite(GetResourcePath(XiuXianSkillConfig[value.id].Icon)) Util.AddOnceClick(item.gameObject,function () UIManager.OpenPanel(UIName.GeneralInfoPopup,GENERALINFO_TYPE.Imprint,value.id,value.heroTId) end) diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 04364a1244..49fe2959f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -256,6 +256,9 @@ function this:OnClose() fun() fun = nil end + Timer.New(function () + Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.RefreshRightUp) + end,1):Start() end --界面销毁时调用(用于子类重写)