diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab index 544fb4a77f..8c3f5c1e7c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab @@ -69,14 +69,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u540D\u6B21" LanguageIndex: 0 @@ -263,14 +263,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5386\u53F2\u6700\u9AD8" LanguageIndex: 0 @@ -308,8 +308,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: 16.800007, y: -492.60004} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 15.5, y: -493.04} + m_SizeDelta: {x: 283.2, y: 69.925} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &179227800 CanvasRenderer: @@ -343,14 +343,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 44 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 44 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6211\u7684\u8BB0\u5F55" LanguageIndex: 0 @@ -1081,14 +1081,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 36 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5386\u53F2\u6700\u9AD8" LanguageIndex: 0 @@ -1161,14 +1161,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 36 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u901A\u5173\u65F6\u95F4" LanguageIndex: 0 @@ -1321,14 +1321,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 36 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u540D\u6B21" LanguageIndex: 0 @@ -1665,14 +1665,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u73A9\u5BB6\u540D" LanguageIndex: 0 @@ -2209,14 +2209,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 36 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u73A9\u5BB6\u540D" LanguageIndex: 0 @@ -2450,7 +2450,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u8BD5\u70BC\u6392\u884C" LanguageIndex: 0 @@ -19297,8 +19297,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: -6.5, y: 15.299999} - m_SizeDelta: {x: 309.2, y: 64.4} + m_AnchoredPosition: {x: -6.5, y: 8} + m_SizeDelta: {x: 309.2, y: 92.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1908296639935576890 CanvasRenderer: @@ -22049,8 +22049,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: 17.2, y: -535.2} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 17.4, y: -538.05005} + m_SizeDelta: {x: 283.2, y: 58.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &102056685354282988 CanvasRenderer: @@ -22084,14 +22084,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 44 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 44 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6211\u7684\u8BB0\u5F55" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab index 2a74137898..b93170972d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab @@ -5014,7 +5014,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: -86.8, y: -41.899994} + m_AnchoredPosition: {x: -364.5, y: -41.899994} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5014086303867341461 @@ -31020,7 +31020,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: -46.300003, y: -53.899994} + m_AnchoredPosition: {x: -364.5, y: -53.899994} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6978111207548757775 @@ -31174,7 +31174,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: -106.5, y: -119.7} + m_AnchoredPosition: {x: -364.5, y: -119.7} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &66220840080032785 @@ -31248,7 +31248,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: -30.100006, y: -42.699997} + m_AnchoredPosition: {x: -364.5, y: -42.699997} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3261406090063144802 diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab index 0f5ff55c95..665bf0d6a9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 2447711847399843584} - component: {fileID: 3875427960609354538} - component: {fileID: 369363021691577928} + - component: {fileID: 8916109910521852112} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -30,13 +31,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: [] - m_Father: {fileID: 1396680106514277842} + m_Father: {fileID: 9042132379393637595} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 625, y: -0.0000019073486} - m_SizeDelta: {x: 188.78, y: 55.696} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 483, y: 0} + m_SizeDelta: {x: 0, y: 55.696} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2447711847399843584 CanvasRenderer: @@ -93,6 +94,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _textSpacing: -13.7 +--- !u!114 &8916109910521852112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 97596972452835380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!114 &1973990260219612672 MonoBehaviour: m_ObjectHideFlags: 0 @@ -722,8 +737,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: 245.8, y: -102.100006} - m_SizeDelta: {x: 491.6, y: 148} + m_AnchoredPosition: {x: 241.6, y: -102.100006} + m_SizeDelta: {x: 530.8, y: 148} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4472731735553598297 CanvasRenderer: @@ -763,7 +778,7 @@ MonoBehaviour: m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1.3 m_Text: "\u5996\u7CFB\u795E\u5C06\u989D\u5916\u9020\u621050%\u4F24\u5BB3\n\u975E\u5996\u7CFB\u795E\u5C06\u964D\u4F4E50%\u653B\u51FB\u529B" @@ -801,9 +816,9 @@ RectTransform: m_Father: {fileID: 7783633391680431993} 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: 161.5, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -27.18} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1351034079552654768 @@ -850,7 +865,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 34 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -909,6 +924,7 @@ GameObject: - component: {fileID: 7272929000759852830} - component: {fileID: 4824700586369134579} - component: {fileID: 337366203520016687} + - component: {fileID: 680427361686215443} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -927,13 +943,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1396680106514277842} + m_Father: {fileID: 9042132379393637595} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 18.71, y: -1.6000004} - m_SizeDelta: {x: 200, y: 44} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 104, y: 0} + m_SizeDelta: {x: 0, y: 44} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4824700586369134579 CanvasRenderer: @@ -970,7 +986,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 77 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -978,6 +994,20 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5996\u7075\u5B9D\u955C" LanguageIndex: 0 +--- !u!114 &680427361686215443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2173761496803764308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!114 &2846165365478567735 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1022,8 +1052,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7783633391680431993} - - component: {fileID: 1971654865613040459} - - component: {fileID: 1816741294174336008} m_Layer: 5 m_Name: tip m_TagString: Untagged @@ -1049,46 +1077,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: 0, y: -833.7} - m_SizeDelta: {x: 0, y: 100} + m_AnchoredPosition: {x: 0, y: -806.6} + m_SizeDelta: {x: 0, y: 45.8} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1971654865613040459 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3036910481905191934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 0 ---- !u!114 &1816741294174336008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3036910481905191934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &3083248293155326010 GameObject: m_ObjectHideFlags: 0 @@ -1579,10 +1570,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7272929000759852830} - - {fileID: 7560832022658320341} - - {fileID: 8025991153130901924} - - {fileID: 1888815952675900269} + - {fileID: 9042132379393637595} m_Father: {fileID: 4779751217131831776} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1877,6 +1865,84 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4900593651224196356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9042132379393637595} + - component: {fileID: 3655315689235718534} + - component: {fileID: 1764129071686858243} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9042132379393637595 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4900593651224196356} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7272929000759852830} + - {fileID: 7560832022658320341} + - {fileID: 8025991153130901924} + - {fileID: 1888815952675900269} + m_Father: {fileID: 1396680106514277842} + m_RootOrder: 0 + 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.00004386902} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3655315689235718534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4900593651224196356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 104 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &1764129071686858243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4900593651224196356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!114 &19634085267633365 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2109,6 +2175,7 @@ GameObject: - component: {fileID: 1570570105998041136} - component: {fileID: 4460700109990862524} - component: {fileID: 6466592148970004557} + - component: {fileID: 4001672892371501674} m_Layer: 5 m_Name: power m_TagString: Untagged @@ -2127,13 +2194,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1396680106514277842} + m_Father: {fileID: 9042132379393637595} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 355, y: -0.000032424927} - m_SizeDelta: {x: 268.49, y: 44} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 340, y: 0} + m_SizeDelta: {x: 0, y: 44} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1570570105998041136 CanvasRenderer: @@ -2183,7 +2250,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 70 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -2191,6 +2258,20 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u63A8\u8350\u6218\u529B: " LanguageIndex: 0 +--- !u!114 &4001672892371501674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7087097223578777534} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!114 &8156769099396907821 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2477,14 +2558,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 38 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 49 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 38 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6311\u6218" LanguageIndex: 0 @@ -2523,9 +2604,9 @@ RectTransform: m_Father: {fileID: 7783633391680431993} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 510, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -66.9} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2009070379428583229 @@ -2572,7 +2653,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 34 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -2596,6 +2677,7 @@ GameObject: - component: {fileID: 7560832022658320341} - component: {fileID: 5476576972710045244} - component: {fileID: 2934892372584398358} + - component: {fileID: 7441253853083905584} m_Layer: 5 m_Name: difficult m_TagString: Untagged @@ -2614,13 +2696,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1396680106514277842} + m_Father: {fileID: 9042132379393637595} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 231.5, y: -0.000015258789} - m_SizeDelta: {x: 122.48, y: 44} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 258, y: 0} + m_SizeDelta: {x: 0, y: 44} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5476576972710045244 CanvasRenderer: @@ -2665,6 +2747,20 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7B80\u5355" LanguageIndex: 0 +--- !u!114 &7441253853083905584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8897551634498579059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &8915895560713539060 GameObject: m_ObjectHideFlags: 0 @@ -2856,10 +2952,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView (3) - objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -2980,6 +3072,10 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView (3) + objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3001,12 +3097,6 @@ PrefabInstance: - {fileID: 2959208787913861109, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - {fileID: 808865815505829488, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} ---- !u!224 &34096667903366304 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 245312915230788118} - m_PrefabAsset: {fileID: 0} --- !u!1 &244077828304158224 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, @@ -3019,6 +3109,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 245312915230788118} m_PrefabAsset: {fileID: 0} +--- !u!224 &34096667903366304 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 245312915230788118} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1347193298197866759 PrefabInstance: m_ObjectHideFlags: 0 @@ -3026,10 +3122,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView - objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3150,6 +3242,10 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView + objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3163,18 +3259,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1347193298197866759} m_PrefabAsset: {fileID: 0} ---- !u!1 &5231576254009261769 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 1347193298197866759} - m_PrefabAsset: {fileID: 0} --- !u!1 &1348428538602413313 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} m_PrefabInstance: {fileID: 1347193298197866759} m_PrefabAsset: {fileID: 0} +--- !u!1 &5231576254009261769 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 1347193298197866759} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1988041395764277848 PrefabInstance: m_ObjectHideFlags: 0 @@ -3182,10 +3278,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView (5) - objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3306,6 +3398,10 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView (5) + objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3338,10 +3434,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView (4) - objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3462,6 +3554,10 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView (4) + objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3469,9 +3565,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} ---- !u!1 &7185564165013109507 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, +--- !u!224 &4219484961250095739 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} m_PrefabInstance: {fileID: 4147880410307112141} m_PrefabAsset: {fileID: 0} @@ -3481,9 +3577,9 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4147880410307112141} m_PrefabAsset: {fileID: 0} ---- !u!224 &4219484961250095739 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, +--- !u!1 &7185564165013109507 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} m_PrefabInstance: {fileID: 4147880410307112141} m_PrefabAsset: {fileID: 0} @@ -3494,10 +3590,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3395763085718138868} m_Modifications: - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView - objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3603,6 +3695,10 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView + objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3635,10 +3731,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView (2) - objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3759,6 +3851,10 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView (2) + objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3766,6 +3862,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} +--- !u!1 &6302678250006641242 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 6301443867518586460} + m_PrefabAsset: {fileID: 0} --- !u!1 &962435546071406994 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, @@ -3778,12 +3880,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 6301443867518586460} m_PrefabAsset: {fileID: 0} ---- !u!1 &6302678250006641242 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 6301443867518586460} - m_PrefabAsset: {fileID: 0} --- !u!1001 &9161919986690841266 PrefabInstance: m_ObjectHideFlags: 0 @@ -3791,10 +3887,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView (1) - objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3915,6 +4007,10 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView (1) + objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3922,6 +4018,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} +--- !u!224 &8951759513183077380 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 9161919986690841266} + m_PrefabAsset: {fileID: 0} --- !u!1 &9160612023568559796 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, @@ -3934,9 +4036,3 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 9161919986690841266} m_PrefabAsset: {fileID: 0} ---- !u!224 &8951759513183077380 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 9161919986690841266} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRankPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRankPopup.prefab index 784191cb54..ef6e2daec4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRankPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRankPopup.prefab @@ -180,8 +180,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.79999995, y: 15.299999} - m_SizeDelta: {x: 229.5, y: 64.4} + m_AnchoredPosition: {x: -3.5, y: 11.7} + m_SizeDelta: {x: 298.3, y: 85.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1579508475040973518 CanvasRenderer: @@ -397,8 +397,8 @@ MonoBehaviour: 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: "\u6392 \u884C" LanguageIndex: 0 @@ -2480,8 +2480,8 @@ MonoBehaviour: 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: "\u73A9\u5BB6\u540D\u79F0" LanguageIndex: 0 @@ -2798,11 +2798,11 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6392\u540D" LanguageIndex: 0 @@ -2955,8 +2955,8 @@ MonoBehaviour: 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: 10 --- !u!1 &8175137801625236023 diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRewardSortPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRewardSortPopup.prefab index 30584c87bf..76b92dc16f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRewardSortPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRewardSortPopup.prefab @@ -76,7 +76,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6392\u884C\u5956\u52B1" LanguageIndex: 0 @@ -1107,8 +1107,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: 205, y: 524.7} - m_SizeDelta: {x: 186.7, y: 62.4} + m_AnchoredPosition: {x: 90.031006, y: 529.97} + m_SizeDelta: {x: 678.34, y: 72.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5842510417692443359 CanvasRenderer: @@ -1142,8 +1142,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1187,8 +1187,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 106.399994, y: 523.2} - m_SizeDelta: {x: 147.31, y: 81.56} + m_AnchoredPosition: {x: 90.025024, y: 530.2} + m_SizeDelta: {x: 180.1, y: 72.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521297214468645196 CanvasRenderer: @@ -1222,8 +1222,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab index ac9c96e263..8ee98bdc62 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab @@ -2853,10 +2853,10 @@ RectTransform: m_Father: {fileID: 1976731466600552807} m_RootOrder: 0 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 182.71, y: 65.07} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7278988207928414515 CanvasRenderer: @@ -2890,14 +2890,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 42 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 + m_VerticalOverflow: 0 m_LineSpacing: 0.8 m_Text: "\u4E00\u952E\u9009\u62E9" LanguageIndex: 0 @@ -3663,10 +3663,10 @@ RectTransform: m_Father: {fileID: 224775871540694246} m_RootOrder: 0 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 157.13, y: 65.07} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7776582982027181046 CanvasRenderer: @@ -3700,14 +3700,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 42 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 + m_VerticalOverflow: 0 m_LineSpacing: 0.8 m_Text: "\u9009 \u5B9A" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab index 5c6eebbe77..91de3290b1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab @@ -115834,8 +115834,8 @@ MonoBehaviour: 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: "\u8BD5\u70BC\u7CBE\u6C14\n" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab index 56534d5016..ff49ec911b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab @@ -670,7 +670,7 @@ MonoBehaviour: m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 3 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1440,8 +1440,8 @@ MonoBehaviour: 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: "\u8BE6 \u60C5" LanguageIndex: 0 @@ -2043,8 +2043,8 @@ MonoBehaviour: 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: "\u8BF7\u9009\u62E9\u8FDB\u884C\u6311\u6218\u7684\u795E\u5C06" LanguageIndex: 0 @@ -2353,7 +2353,7 @@ MonoBehaviour: m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 3 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index b5255eac41..ec7c594352 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -3160,8 +3160,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.00000047684, y: 0.00000095367} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: -3.1, y: 0.00000095367} + m_SizeDelta: {x: 187.7, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1940069288986714099 CanvasRenderer: @@ -3195,9 +3195,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -5552,8 +5552,8 @@ MonoBehaviour: 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: "\u6B21\u5143\u70B8\u5F39" LanguageIndex: 11270 @@ -7333,7 +7333,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4E0A\u6B21\u8FDB\u5165\u68EE\u7F57\u5E7B\u5883\u672A\u7A81\u7834\u5386\u53F2\u8BB0\u5F55\uFF0C\u672C\u6B21\u4F1A\u76F4\u63A5\u83B7\u5F97\u5982\u4E0B\u589E\u76CA\u6548\u679C\uFF1A" LanguageIndex: 11276 @@ -8288,8 +8288,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u653B\u51FB\u52A0\u6210\uFF1A5%\u653B\u51FB\u52A0\u6210\uFF1A5%" LanguageIndex: 11278 @@ -9803,7 +9803,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5269\u4F59\u6B21\u6570\uFF1A15" LanguageIndex: 11273 @@ -10147,9 +10147,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -10758,9 +10758,9 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u8BF7\u9009\u62E9\u76EE\u6807\u795E\u5C06\uFF1A" + m_Text: "\u672C\u8F6E\u53EF\u4F7F\u7528\u6B21\u6570\uFF1A" LanguageIndex: 11271 --- !u!1 &2506933807992207923 GameObject: @@ -11891,8 +11891,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 89.75, y: -30} - m_SizeDelta: {x: 179.5, y: 47.4} + m_AnchoredPosition: {x: 75, y: -30} + m_SizeDelta: {x: 150, y: 47.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3212642386950615541 CanvasRenderer: @@ -16514,7 +16514,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u672C\u8F6E\u53EF\u4F7F\u7528\u6B21\u6570\uFF1A5" LanguageIndex: 11273 @@ -17374,8 +17374,8 @@ MonoBehaviour: 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: "\u56DE\u6625\u6563" LanguageIndex: 11270 @@ -18832,8 +18832,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u672C\u8F6E\u53EF\u4F7F\u7528\u6B21\u6570\uFF1A" LanguageIndex: 11272 @@ -20768,8 +20768,8 @@ MonoBehaviour: 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: "\u589E\u76CA\u6548\u679C" LanguageIndex: 11275 @@ -21921,9 +21921,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -23552,8 +23552,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u8BF7\u9009\u62E9\u76EE\u6807\u795E\u5C06\uFF1A" LanguageIndex: 11271 @@ -25164,7 +25164,7 @@ 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: -18} + m_AnchoredPosition: {x: 113.76, y: -18} m_SizeDelta: {x: 810.6, y: 341} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7828317210716256545 @@ -25948,8 +25948,8 @@ MonoBehaviour: 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: "\u4EC5\u9650\u5728\u6B64\u73A9\u6CD5\u4E2D\u751F\u6548" LanguageIndex: 11277 @@ -27218,8 +27218,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.00000047684, y: 0.00000095367} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: -2.1, y: 0.00000095367} + m_SizeDelta: {x: 189.8, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6003067201446405713 CanvasRenderer: @@ -27253,9 +27253,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -27795,7 +27795,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: 204.5, y: -30} + m_AnchoredPosition: {x: 175, y: -30} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5219305532786946576 @@ -29945,9 +29945,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -30204,7 +30204,7 @@ 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: -2.0001, y: -183.1} + m_AnchoredPosition: {x: -2.0000916, y: -183.1} m_SizeDelta: {x: 632.8, y: 146.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6559398893788723828 @@ -31022,7 +31022,7 @@ 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: 17, y: -33} + m_AnchoredPosition: {x: 17, y: -46.62} m_SizeDelta: {x: 844.6, y: 133.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6159975372584172476 @@ -31055,7 +31055,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 40 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -31064,7 +31064,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1.1 m_Text: "\u4F7F\u7528\u540E\uFF0C\u6D88\u706D\u68EE\u7F57\u5E7B\u5883\u5F53\u524D\u5C42\u6240\u6709\u602A\u7269\uFF0C\u5E76\u53EC\u5524\u672C\u5C42BOSS" LanguageIndex: 0 @@ -34562,7 +34562,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -50, y: -56} - m_SizeDelta: {x: 229.5, y: 60} + m_SizeDelta: {x: 200, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6465969098069954744 MonoBehaviour: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab index 2df019e5f1..58d009deca 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab @@ -143,8 +143,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 42 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -223,8 +223,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 42 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -589,8 +589,8 @@ MonoBehaviour: 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: "\u5956 \u52B1" LanguageIndex: 10693 @@ -714,8 +714,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 42 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1092,8 +1092,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 42 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -2260,14 +2260,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 49 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u524D\u5F80" LanguageIndex: 10003 @@ -3574,14 +3574,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 49 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u9886\u53D6" LanguageIndex: 10002 @@ -3660,8 +3660,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u51FB\u8D255\u540D\u654C\u4EBA\uFF080/5\uFF09" LanguageIndex: 11378 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua index 5077216a6c..1142757dbd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua @@ -178,8 +178,13 @@ this.UpdateCarbonContent = function(...) local go = Util.GetGameObject(this.AnimRoot, v.gameObject) go:GetComponent("Image").sprite = Util.LoadSprite(v.bg) local textParnet = Util.GetGameObject(go, "titileBg") - Util.GetGameObject(textParnet, "Text"):GetComponent("Text").text =v.name - SetTextVerTial(Util.GetGameObject(textParnet, "Text"),Vector3.New(78.31,-10.17,0),"MiddleLeft") + local textName = Util.GetGameObject(textParnet, "Text"):GetComponent("Text") + textName.text =v.name + SetTextVerTial(Util.GetGameObject(textParnet, "Text"),Vector3.New(295.93,-10.17,0),"MiddleRight") + if GetCurLanguage() == 2 then + textName.fontSize = 36 + end + local state = XuanYuanMirrorManager.GetMirrorState(k) == 1 LogGreen(k.." 宝镜state:"..XuanYuanMirrorManager.GetMirrorState(k)) if not state or state == 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index 3f7431557a..7fe7b64189 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua @@ -312,11 +312,16 @@ function this:SetLevelData(go, data) end end end - Util.GetGameObject(go, "Bg/BgQuality/title"):GetComponent("Text").text = mirrors[data.type].id - Util.GetGameObject(go, "Bg/BgQuality/difficult"):GetComponent("Text").text = difficult.text[data.difficulity] + Util.GetGameObject(go, "Bg/BgQuality/grid/title"):GetComponent("Text").text = mirrors[data.type].id + Util.GetGameObject(go, "Bg/BgQuality/grid/difficult"):GetComponent("Text").text = difficult.text[data.difficulity] Util.GetGameObject(go, "Bg/BgQuality"):GetComponent("Image").sprite = Util.LoadSprite(difficult.sprite[data.difficulity]) - Util.GetGameObject(go, "Bg/BgQuality/Text"):GetComponent("Text").text = data.power + Util.GetGameObject(go, "Bg/BgQuality/grid/Text"):GetComponent("Text").text = data.power + if GetCurLanguage() == 2 then + Util.GetGameObject(go,"Bg/BgQuality/grid/title"):GetComponent("Text").fontSize = 28 + Util.GetGameObject(go,"Bg/BgQuality/grid/difficult"):GetComponent("Text").fontSize = 28 + Util.GetGameObject(go,"Bg/BgQuality/grid/power"):GetComponent("Text").fontSize = 28 + end end --界面打开时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua index b8765f18fd..2e24ad3ee2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua @@ -85,7 +85,7 @@ function this.RefreshPanel(type) val = val / 100 express2 = "%" end - tip.text=string.format("%s:%s",propertyConfig[v.id].Info,(express1..val..express2)) + tip.text=string.format("%s:%s",GetLanguageStrById(propertyConfig[v.id].Info) ,(express1..val..express2)) if propertyConfig[v.id].BuffShow then local lastStr = ""