diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon_dengfengzaoji_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon_dengfengzaoji_zh.png index b7854004b3..73d01f52e1 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon_dengfengzaoji_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon_dengfengzaoji_zh.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardRideShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardRideShowPopup.prefab index 6c3d49c1b8..01cd8ed209 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardRideShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardRideShowPopup.prefab @@ -20418,7 +20418,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: 25} + m_AnchoredPosition: {x: 76, y: 25} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8398031213055335365 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 784606505b..57cf8858ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -476,12 +476,23 @@ function this.FormationAdapter(teamInfo) if (index == 1 and teamInfo.sealShow and #teamInfo.sealShow > 0) or--神印 (index == 2 and teamInfo.transformationCardInfo and #teamInfo.transformationCardInfo > 0) or--身外化身 (index == 3 and teamInfo.sixiangxinfaInfo and #teamInfo.sixiangxinfaInfo > 0) or--四象心法 - (index == 4 and teamInfo.lifeGridInfo and #teamInfo.lifeGridInfo > 0) or--命石 (index == 5 and teamInfo.userMountInfo and #teamInfo.userMountInfo > 0) then--坐骑 item.gameObject:SetActive(true) if this.infoIndex == 0 then this.infoIndex = index end + elseif (index == 4 and teamInfo.lifeGridInfo and #teamInfo.lifeGridInfo > 0) then--命石 + local num = 0 + for i = 1, #teamInfo.lifeGridInfo do + local data = teamInfo.lifeGridInfo[i] + if data.itemId and data.itemId > 0 then + num = num + 1 + end + end + item.gameObject:SetActive(num > 0) + if this.infoIndex == 0 then + this.infoIndex = index + end else item.gameObject:SetActive(false) end @@ -515,7 +526,6 @@ function this.ShowInfos(teamInfo) Util.GetGameObject(this.InfoContent,InfoBtns[index].gridName):SetActive(false) end - local MainContent = Util.GetGameObject(this.InfoContent,InfoBtns[this.infoIndex].gridName) local Grid = Util.GetGameObject(MainContent,"Grid") MainContent:SetActive(true) @@ -628,6 +638,13 @@ function this.RideInfoShow(teamInfo,Grid) item:OnOpen(false, {value.mountId,0}, 1,true,false,false,this.sortingOrder) item.gameObject:SetActive(true) end + if #teamInfo.userMountInfo > 4 then + Grid:GetComponent("HorizontalLayoutGroup").paddingLeft = 30 + Grid:GetComponent("RectTransform").pivot = Vector2.New(0, 0.5) + else + Grid:GetComponent("HorizontalLayoutGroup").paddingLeft = -30 + Grid:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5) + end end --============================底部按钮显示===========================