diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab index 669f646c33..b423836aca 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab @@ -34,7 +34,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: 27, y: -348} + m_AnchoredPosition: {x: 0, y: -339} m_SizeDelta: {x: 638.1, y: 38.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2273651367590775262 @@ -373,7 +373,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -14.37, y: 8.41} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 250, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2002333161736049524 CanvasRenderer: @@ -407,14 +407,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 49 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 10 m_MaxSize: 63 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: "$99.99\u62A2\u8D2D" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab index c0010f9489..ccc07a8ad2 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab @@ -704,7 +704,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 90} + m_SizeDelta: {x: 0, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7786021606362005528 CanvasRenderer: @@ -878,8 +878,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.0000000059881, y: 4.25} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 240, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2999007160101861984 MonoBehaviour: @@ -900,8 +900,8 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 m_ChildControlHeight: 0 --- !u!114 &3173621601088727462 @@ -916,8 +916,8 @@ MonoBehaviour: m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 + m_HorizontalFit: 0 + m_VerticalFit: 0 --- !u!1 &940595904472046837 GameObject: m_ObjectHideFlags: 0 @@ -2825,7 +2825,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 75} m_Pivot: {x: 0.5000001, y: 0.49999842} --- !u!222 &6121576607586954134 CanvasRenderer: @@ -2859,14 +2859,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 46 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 50 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: "10\u6B21" LanguageIndex: 0 @@ -3145,7 +3145,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 55} + m_SizeDelta: {x: 0, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5510792303562562230 CanvasRenderer: @@ -3179,14 +3179,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 46 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 50 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: "1\u6B21" LanguageIndex: 0 @@ -6717,7 +6717,7 @@ RectTransform: m_GameObject: {fileID: 6672375858317416943} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3309473831523017427} m_RootOrder: 4 @@ -6725,7 +6725,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 444} - m_SizeDelta: {x: 202.9, y: 25.97} + m_SizeDelta: {x: 900, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4838045573456386101 CanvasRenderer: @@ -6774,14 +6774,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 2 m_MaxSize: 45 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: "\u5269\u4F5999\u6B21\u5FC5\u51FA\u7075\u517D\xB7\u51E4\u51F0" LanguageIndex: 0 @@ -7403,7 +7403,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6988585982177523256 CanvasRenderer: @@ -7437,14 +7437,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 46 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 50 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: x2000 --- !u!1 &7006916648980947394 @@ -7482,7 +7482,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 49} + m_SizeDelta: {x: 0, y: 75} m_Pivot: {x: 0.49999988, y: 0.50000006} --- !u!222 &6976152225671858650 CanvasRenderer: @@ -7516,14 +7516,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 46 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 50 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: x200 --- !u!1 &7139840138173073157 @@ -8908,8 +8908,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.0000000059881, y: 4.25} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 240, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2840759318452890967 MonoBehaviour: @@ -8931,9 +8931,9 @@ MonoBehaviour: m_ChildAlignment: 4 m_Spacing: 0 m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 + m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 - m_ChildControlHeight: 1 + m_ChildControlHeight: 0 --- !u!114 &5847940798734559720 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8946,8 +8946,8 @@ MonoBehaviour: m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 + m_HorizontalFit: 0 + m_VerticalFit: 0 --- !u!1 &8788532172737453050 GameObject: m_ObjectHideFlags: 0 @@ -9327,7 +9327,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1475731157003408614 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab index c71b0df5ca..dce4a702b8 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab @@ -3110,15 +3110,15 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 49 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 10 - m_MaxSize: 63 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 0.7 m_Text: "\u5F00\u542F\u6311\u6218" LanguageIndex: 0 --- !u!1 &9087522330427578277 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab index 6813c8944b..df29e07e9a 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab @@ -910,8 +910,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: -0.5299988, y: 2.3899994} + m_SizeDelta: {x: -40.38, y: -14.35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3167590713067564421 CanvasRenderer: @@ -945,7 +945,7 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 @@ -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: -81.3, y: -90.4} - m_SizeDelta: {x: 100, y: 50} + m_AnchoredPosition: {x: -89.24, y: -93.94993} + m_SizeDelta: {x: 115.88, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2908952196785666572 CanvasRenderer: @@ -1377,7 +1377,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -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: -81.3, y: -90.4} - m_SizeDelta: {x: 100, y: 50} + m_AnchoredPosition: {x: -89.24, y: -93.94993} + m_SizeDelta: {x: 115.88, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2492409518995464606 CanvasRenderer: @@ -2391,7 +2391,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -6133,8 +6133,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: -0.02999878, y: -0.099998474} + m_SizeDelta: {x: -43.51, y: -16.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1980232723200415787 CanvasRenderer: @@ -6168,7 +6168,7 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index 7434d7490a..fe9ba64480 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -276668,7 +276668,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4244103369128744908 RectTransform: m_ObjectHideFlags: 0 @@ -294425,6 +294425,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 9088898359959315875} m_Modifications: + - target: {fileID: 1649368952783984, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, type: 3} + propertyPath: m_Name + value: live2d_c_ywe_0078 + objectReference: {fileID: 0} - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, type: 3} propertyPath: m_LocalPosition.x @@ -294545,10 +294549,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.665 objectReference: {fileID: 0} - - target: {fileID: 1649368952783984, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, type: 3} - propertyPath: m_Name - value: live2d_c_ywe_0078 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, type: 3} --- !u!224 &739268628792506020 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab index 57759cc4b7..3d1c15c355 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab @@ -3163,8 +3163,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: 191.45, y: 100} + m_AnchoredPosition: {x: 0.42, y: 0} + m_SizeDelta: {x: 204.21, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1101611876322259088 CanvasRenderer: @@ -3213,15 +3213,15 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 52 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 2 m_MaxSize: 52 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 0.7 m_Text: "\u7CFB\u7EDF\u7CFB\u7EDF" LanguageIndex: 0 --- !u!1 &8751832165543929816 diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua index df36138fd2..5113e63d7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua @@ -34,7 +34,7 @@ local _ShopPage = { rpType = RedPointType.Shop_Page_Roam, }, [SHOP_PAGE.YUANSHEN] = { -- 元神 - default = "r_shop_yuanshen_01", lock = "r_shop_yuanshen_01", select = "r_shop_yuanshen_02", + default = "r_shop_yuanshen_01_zh", lock = "r_shop_yuanshen_01_zh", select = "r_shop_yuanshen_02_zh", }, }