diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page1.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page1.prefab index ff35242dd8..7fd62e86f9 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page1.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page1.prefab @@ -704,8 +704,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: -138, y: -30.4} - m_SizeDelta: {x: 300, y: 64.77} + m_AnchoredPosition: {x: -24.609985, y: -47.167} + m_SizeDelta: {x: 526.8, y: 98.335} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2148650145237178432 CanvasRenderer: @@ -739,13 +739,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 41 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u767B\u9646\u6709\u5229" @@ -784,8 +784,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: -7.6, y: -61.5} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: -16.7, y: -61.5} + m_SizeDelta: {x: 374.8, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6421820026406704867 CanvasRenderer: @@ -819,14 +819,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5269\u4F59\uFF1A1" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab index df29e07e9a..91eed5fe73 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab @@ -830,8 +830,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: -3.6, y: 133.6} - m_SizeDelta: {x: 100, y: 50} + m_AnchoredPosition: {x: 0.42, y: 133.6} + m_SizeDelta: {x: 311.2, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7462356718173170271 CanvasRenderer: @@ -865,14 +865,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 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: "\u6392\u884C\u524D\u4E09" LanguageIndex: 0 @@ -946,7 +946,7 @@ MonoBehaviour: m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 3 + m_MinSize: 30 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1339,8 +1339,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: -89.24, y: -93.94993} - m_SizeDelta: {x: 115.88, y: 40} + m_AnchoredPosition: {x: -40.64, y: -93.94993} + m_SizeDelta: {x: 213.08, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2908952196785666572 CanvasRenderer: @@ -1374,14 +1374,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 28 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 m_Alignment: 3 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\u79EF\u5206" LanguageIndex: 0 @@ -1767,8 +1767,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: 82.5, y: 3.8} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 73.5, y: 3.8} + m_SizeDelta: {x: 68, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3967800694420428273 CanvasRenderer: @@ -1802,14 +1802,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 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: "1\u7EA7" LanguageIndex: 0 @@ -2353,8 +2353,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: -89.24, y: -93.94993} - m_SizeDelta: {x: 115.88, y: 40} + m_AnchoredPosition: {x: -40.64, y: -93.94993} + m_SizeDelta: {x: 213.08, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2492409518995464606 CanvasRenderer: @@ -2388,14 +2388,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 28 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u516C\u4F1A\u79EF\u5206" LanguageIndex: 0 @@ -3319,8 +3319,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: 99.1, y: -89.9} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 113.99, y: -89.9} + m_SizeDelta: {x: 82.71, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4131119380283906936 CanvasRenderer: @@ -3357,11 +3357,11 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 LanguageIndex: 0 @@ -3487,8 +3487,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: 22.1, y: 25.1} - m_SizeDelta: {x: 230, y: 50} + m_AnchoredPosition: {x: 30.14, y: 25.1} + m_SizeDelta: {x: 246.08, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8350495503266655219 CanvasRenderer: @@ -3522,14 +3522,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 + m_Alignment: 3 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\u5B57\u4E03\u4E2A\u5B57" LanguageIndex: 0 @@ -4338,8 +4338,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 1.82, y: 0} + m_SizeDelta: {x: 62.12, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3014665551887631133 CanvasRenderer: @@ -4373,14 +4373,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 + m_VerticalOverflow: 0 m_LineSpacing: 0.8 m_Text: "\u70B9\u51FB\u67E5\u770B\u8BE6\u60C5" LanguageIndex: 0 @@ -5250,8 +5250,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: 22.1, y: -32.9} - m_SizeDelta: {x: 230, y: 50} + m_AnchoredPosition: {x: 30.14, y: -32.9} + m_SizeDelta: {x: 246.08, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5182326833511355191 CanvasRenderer: @@ -5285,14 +5285,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 + m_Alignment: 3 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\u5B57\u4E03\u4E2A\u5B57" LanguageIndex: 0 @@ -5330,8 +5330,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: 22.1, y: 84.1} - m_SizeDelta: {x: 230, y: 50} + m_AnchoredPosition: {x: 30.14, y: 84.1} + m_SizeDelta: {x: 246.08, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4382552347718104395 CanvasRenderer: @@ -5365,14 +5365,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 + m_Alignment: 3 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\u5B57\u4E03\u4E2A\u5B57" LanguageIndex: 0 @@ -6169,7 +6169,7 @@ MonoBehaviour: m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 3 + m_MinSize: 30 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -6329,7 +6329,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6392\u884C\u699C\u6570\u636E\u6BCF\u5206\u949F\u66F4\u65B0" LanguageIndex: 0 @@ -6888,7 +6888,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5269\u4F59\u65F6\u95F4:3\u592913\u5C0F\u65F6" LanguageIndex: 0 @@ -7459,16 +7459,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5089856891970496853} m_Modifications: - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_Name - value: UI_Effect_BaoXiang_KeKaiQi - objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} propertyPath: m_LocalPosition.x @@ -7574,6 +7564,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_Name + value: UI_Effect_BaoXiang_KeKaiQi + objectReference: {fileID: 0} + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} --- !u!224 &584538623021056455 stripped @@ -7664,11 +7664,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8386804214617420854} m_Modifications: - - target: {fileID: 7299446571120502220, guid: e1569274596ff714e8ea31571157d0ba, - type: 3} - propertyPath: m_Name - value: DynamicActivityPanel_daiji - objectReference: {fileID: 0} - target: {fileID: 7299446571120502221, guid: e1569274596ff714e8ea31571157d0ba, type: 3} propertyPath: m_LocalPosition.x @@ -7724,6 +7719,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7299446571120502220, guid: e1569274596ff714e8ea31571157d0ba, + type: 3} + propertyPath: m_Name + value: DynamicActivityPanel_daiji + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e1569274596ff714e8ea31571157d0ba, type: 3} --- !u!4 &160481524576270348 stripped