diff --git a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab index 1a6f6e51eb..d07ded9781 100644 --- a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab @@ -484,9 +484,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -280.3, y: -131.6} - m_SizeDelta: {x: 519.5, y: 159.6} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -131.6} + m_SizeDelta: {x: 540, y: 159.6} + m_Pivot: {x: 1, y: 0.5} --- !u!1 &396130673485725596 GameObject: m_ObjectHideFlags: 0 @@ -3467,8 +3467,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.46741, y: -1.6} - m_SizeDelta: {x: 392.77, y: 138.8} + m_AnchoredPosition: {x: 0.86, y: 1.4928} + m_SizeDelta: {x: 395.43, y: 138.58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2990390581569018762 CanvasRenderer: @@ -12650,8 +12650,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.47, y: 0.00048816} - m_SizeDelta: {x: 392.77, y: 135.6} + m_AnchoredPosition: {x: 0.85996, y: 1.4916} + m_SizeDelta: {x: 395.43, y: 138.58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7096263496067464868 CanvasRenderer: @@ -16981,7 +16981,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1094151485460785958 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua index ca912faaba..159bca5b0f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua @@ -45,8 +45,10 @@ function SettingPlayerRide:InitComponent(gameObject) this.proPre = Util.GetGameObject(gameObject, "skinProInfo/proPre") this.proGrid = Util.GetGameObject(gameObject, "skinProInfo/proGrid") + local rootHight = this.proGrid.transform.rect.height + local width = this.proGrid.transform.rect.width this.scrollViewPro=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.proGrid.transform,this.proPre, - nil,Vector2.New(458.2,159.6),1,2,Vector2.New(0,0)) + nil,Vector2.New(width,rootHight),1,2,Vector2.New(0,0)) this.scrollViewPro.gameObject:GetComponent("RectTransform").anchoredPosition= Vector2.New(0,0) this.scrollViewPro.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5) this.scrollViewPro.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5) @@ -103,7 +105,6 @@ end --显示信息 function this.ShowPanelData() local rideList = ConfigManager.GetAllConfigsDataByKey(ConfigName.PlayerHeadIcon,"Type",PlayerHeadIconType.Ride) - LogGreen("rideList:"..#rideList) --设置滚动区信息 curUserRideId = PlayerManager.GetPlayerRide() curUserRideConFig = rideList[1] @@ -165,7 +166,7 @@ function this.SingleRideClickShowInfo(data,go) this.getInfo.text = GetLanguageStrById(curPlayerHeadIconConfig.ItemDescribe) this.scrollViewPro:SetData(curPlayerHeadIconConfig.UnlockProperty,function(index,root) local propertyConfig = ConfigManager.GetConfigData(ConfigName.PropertyConfig, curPlayerHeadIconConfig.UnlockProperty[index][1]) - Util.GetGameObject(root, "proValue"):GetComponent("Text").text = GetLanguageStrById(propertyConfig.Info).." ".. GetPropertyFormatStr(propertyConfig.Style, curPlayerHeadIconConfig.UnlockProperty[index][2]) + Util.GetGameObject(root, "proValue"):GetComponent("Text").text = GetLanguageStrById(propertyConfig.Info)..GetPropertyFormatStr(propertyConfig.Style, curPlayerHeadIconConfig.UnlockProperty[index][2]) end, not false, not false) this.stateImgGo:SetActive(true) if not isGet and not isUser then