diff --git a/Assets/ManagedResources/Prefabs/UI/HomeLand/SpecailTrainingInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/HomeLand/SpecailTrainingInfoPopup.prefab index cca04168a3..96cd691245 100644 --- a/Assets/ManagedResources/Prefabs/UI/HomeLand/SpecailTrainingInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HomeLand/SpecailTrainingInfoPopup.prefab @@ -269,8 +269,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, y: -80} - m_SizeDelta: {x: 171.71, y: 50.8} + m_AnchoredPosition: {x: 0, y: -70.6} + m_SizeDelta: {x: 171.7, y: 32.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &149716123 CanvasRenderer: @@ -302,16 +302,16 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 1 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u795E\u5C06" --- !u!1 &186749907 @@ -429,8 +429,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.00000023842, y: 0} - m_SizeDelta: {x: 105, y: 106} + m_AnchoredPosition: {x: 0.95116, y: 0.000031948} + m_SizeDelta: {x: 117.87, y: 116.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &232466210 CanvasRenderer: @@ -1086,8 +1086,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: -8, y: -86} - m_SizeDelta: {x: 90.5, y: 35.6} + m_AnchoredPosition: {x: -18.8, y: -102.9} + m_SizeDelta: {x: 87.96, y: 24.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1181547186 CanvasRenderer: @@ -1124,11 +1124,11 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 100/100 --- !u!1 &1363378748 @@ -1166,7 +1166,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -20.4, y: -11.799999} + m_AnchoredPosition: {x: -22.7, y: -14.100002} m_SizeDelta: {x: 50.42, y: 31.520004} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1363378751 @@ -1243,7 +1243,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 104, y: 0} m_SizeDelta: {x: 100, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &365477818 @@ -2108,8 +2108,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, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -0.00099373, y: 0} + m_SizeDelta: {x: 119.77, y: 116.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1860570714 GameObject: @@ -2146,7 +2146,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 412.7, y: 0} m_SizeDelta: {x: 825.4, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1860570717 @@ -3285,7 +3285,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -3777,8 +3777,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, y: -80} - m_SizeDelta: {x: 171.71, y: 50.8} + m_AnchoredPosition: {x: 0, y: -71.2} + m_SizeDelta: {x: 171.7, y: 33.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3501522200221524903 CanvasRenderer: @@ -3810,16 +3810,16 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 1 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u795E\u5C06" --- !u!1 &5480243040718976108 @@ -4610,7 +4610,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6674535295989938524 RectTransform: m_ObjectHideFlags: 0 @@ -4626,9 +4626,9 @@ RectTransform: m_Father: {fileID: 6674535297821892818} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -120} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6674535296167222859 @@ -5026,7 +5026,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 462.45, y: 0} m_SizeDelta: {x: 924.9, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6674535296452004502 @@ -6184,7 +6184,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 412.7, y: 0} m_SizeDelta: {x: 825.4, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7346170022788454816 @@ -6719,10 +6719,10 @@ RectTransform: m_Father: {fileID: 6674535296229178769} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 670.3, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 535.15, y: 22} + m_SizeDelta: {x: 670.3, y: 82} m_Pivot: {x: 1, y: 1} --- !u!222 &6674535297518341898 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua index d07a2a9439..3b8d24d214 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua @@ -178,6 +178,7 @@ function this:ShowSingleHero(go,data,index) Util.GetGameObject(go, "proIcon"):SetActive(false) Util.GetGameObject(go, "name"):GetComponent("Text").text = heroData.Name Util.GetGameObject(go, "heroName"):GetComponent("Text").text= itemConfig[data].Name + Util.GetGameObject(go, "name").gameObject:SetActive(false) local starGrid = Util.GetGameObject(go, "star") -- SetHeroStars(self.spLoader,starGrid, heroData.Star) self.maskList[self.curSelect][index] = Util.GetGameObject(go, "choosed")