diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index a3783fd24d..eadd846504 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -9433,8 +9433,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: 19.2} - m_SizeDelta: {x: 896.2, y: 159.9} + m_AnchoredPosition: {x: 0, y: -12} + m_SizeDelta: {x: 850, y: 187.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2665892594117541411 CanvasRenderer: @@ -9474,7 +9474,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6D88\u8017" @@ -14727,7 +14727,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &952792893445881680 RectTransform: m_ObjectHideFlags: 0 @@ -24393,7 +24393,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: -94.7} + m_AnchoredPosition: {x: 0, y: -148} m_SizeDelta: {x: 284.66, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2469198455549241004 @@ -33452,7 +33452,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: 0.000030517578, y: -73.150055} + m_AnchoredPosition: {x: 0.000061035156, y: -73.150055} m_SizeDelta: {x: 0, y: 151} m_Pivot: {x: 0, y: 0.5} --- !u!114 &3467615898781068815 @@ -34871,8 +34871,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: 170} - m_SizeDelta: {x: 896.2, y: 141.7} + m_AnchoredPosition: {x: 0, y: 160} + m_SizeDelta: {x: 850, y: 141.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1871382871495151358 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab index f016c910ba..6bb0d40915 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab @@ -3688,7 +3688,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u7CFB\u7EDF" LanguageIndex: 0 --- !u!1 &5240942908928993334 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab index ea8b20dbe0..85f1ed7093 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab @@ -55692,10 +55692,10 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 100/100 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index 5ae257ed26..68f93a494d 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -47219,7 +47219,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.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8412781053891457112 @@ -47275,9 +47275,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u5168\u90E8" LanguageIndex: 11543 --- !u!1 &1842776736655617186 @@ -56980,7 +56980,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.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2539474575079667379 @@ -57036,9 +57036,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u7075\u5B9D" LanguageIndex: 11346 --- !u!1 &2320522813040598354 @@ -130526,7 +130526,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.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9222142365797290585 @@ -130582,9 +130582,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u9B42\u5B9D" LanguageIndex: 11345 --- !u!1 &6908546977092012050 @@ -145119,7 +145119,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.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6031811929480031179 @@ -145175,9 +145175,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u6218\u9774" LanguageIndex: 11545 --- !u!1 &7293736979709754577 @@ -169245,7 +169245,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.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5799991397920675855 @@ -169301,9 +169301,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u6218\u670D" LanguageIndex: 10334 --- !u!1 &7849608610486849781 @@ -178869,7 +178869,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: 3.5149994} + m_AnchoredPosition: {x: 0, y: 8} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4343649736118813185 @@ -178925,9 +178925,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u6218\u9774" LanguageIndex: 11545 --- !u!1 &8215104791689758812 @@ -189701,7 +189701,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.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8775710720111501234 @@ -189757,9 +189757,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u6B66\u5668" LanguageIndex: 11543 --- !u!1 &8852061367680299650 @@ -196478,7 +196478,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.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6655377552230782079 @@ -196534,9 +196534,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u5934\u9970" LanguageIndex: 11544 --- !u!1 &9079202659749227066 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 075d2ac605..5d5d37b65a 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -58996,7 +58996,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &7716556866937241452 MonoBehaviour: @@ -59070,9 +59070,9 @@ RectTransform: m_Father: {fileID: 7295048416073556648} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6293738349772940894 @@ -60260,7 +60260,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &840173934772304902 RectTransform: m_ObjectHideFlags: 0 @@ -61166,9 +61166,9 @@ RectTransform: m_Father: {fileID: 4541478915873727879} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3642604312009482522 @@ -61715,9 +61715,9 @@ RectTransform: m_Father: {fileID: 8132432201149559645} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7704455903665646899 @@ -62483,9 +62483,9 @@ RectTransform: m_Father: {fileID: 7295048416073556648} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7718811026139484982 @@ -63688,8 +63688,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: 2.1, y: 2.1} - m_SizeDelta: {x: 160, y: 86.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 149.52, y: 86.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &119062700276395137 CanvasRenderer: @@ -63744,9 +63744,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u6750\u6599" LanguageIndex: 10142 --- !u!1 &1484616364751171037 @@ -64008,9 +64008,9 @@ RectTransform: m_Father: {fileID: 1380306822718338942} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6819546123054133093 @@ -65313,7 +65313,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: 122.6, y: -1.17} + m_AnchoredPosition: {x: 130.2, y: -1.17} m_SizeDelta: {x: 47.75, y: 47.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1848951108082559724 @@ -65758,9 +65758,9 @@ RectTransform: m_Father: {fileID: 8132432201149559645} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6305703403464516542 @@ -67834,9 +67834,9 @@ RectTransform: m_Father: {fileID: 3730962970155661078} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8896393016290572564 @@ -69115,7 +69115,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &8045513997360252457 MonoBehaviour: @@ -69264,9 +69264,9 @@ RectTransform: m_Father: {fileID: 3730962970155661078} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6058400795339030386 @@ -69830,9 +69830,9 @@ RectTransform: m_Father: {fileID: 8132432201149559645} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6276223281847147389 @@ -70239,9 +70239,9 @@ RectTransform: m_Father: {fileID: 1380306822718338942} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3296711350632739724 @@ -70586,7 +70586,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &6636847728002421429 MonoBehaviour: @@ -71381,9 +71381,9 @@ RectTransform: m_Father: {fileID: 4895505664369319088} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &521379369712413680 @@ -71640,9 +71640,9 @@ RectTransform: m_Father: {fileID: 7295048416073556648} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1179351883629679917 @@ -71750,9 +71750,9 @@ RectTransform: m_Father: {fileID: 3730962970155661078} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3710313158769034933 @@ -72316,7 +72316,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &7481647496055839640 MonoBehaviour: @@ -73095,9 +73095,9 @@ RectTransform: m_Father: {fileID: 4895505664369319088} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9070288074335434717 @@ -73689,9 +73689,9 @@ RectTransform: m_Father: {fileID: 4541478915873727879} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9017234893772538220 @@ -74801,9 +74801,9 @@ RectTransform: m_Father: {fileID: 4541478915873727879} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2428849437926791309 @@ -74911,9 +74911,9 @@ RectTransform: m_Father: {fileID: 4895505664369319088} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4406657073510055766 @@ -75636,9 +75636,9 @@ RectTransform: m_Father: {fileID: 4541478915873727879} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5761080816857987712 @@ -76404,7 +76404,7 @@ GameObject: - component: {fileID: 8489987792158475684} - component: {fileID: 761492748278873013} m_Layer: 5 - m_Name: Image + m_Name: Ima m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -77868,7 +77868,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &8821236652887202007 MonoBehaviour: @@ -78323,9 +78323,9 @@ RectTransform: m_Father: {fileID: 9033830650798519355} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1030, y: -216.25} m_SizeDelta: {x: 220, y: 428.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5921230247867810353 @@ -82039,9 +82039,9 @@ RectTransform: m_Father: {fileID: 9033830650798519355} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 800, y: -216.25} m_SizeDelta: {x: 220, y: 428.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7487634036415906259 @@ -82617,9 +82617,9 @@ RectTransform: m_Father: {fileID: 9033830650798519355} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 340, y: -216.25} m_SizeDelta: {x: 220, y: 428.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5176358249044919319 @@ -83973,9 +83973,9 @@ RectTransform: m_Father: {fileID: 7295048416073556648} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1661858992143867004 @@ -85340,8 +85340,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: 2.1, y: 2.1} - m_SizeDelta: {x: 160, y: 86.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 151.35, y: 86.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4101804890208213420 CanvasRenderer: @@ -85396,9 +85396,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u6750\u6599" LanguageIndex: 10142 --- !u!1 &7069187913524227865 @@ -85671,7 +85671,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &973330831370543626 MonoBehaviour: @@ -86057,9 +86057,9 @@ RectTransform: m_Father: {fileID: 8132432201149559645} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &354964664533656476 @@ -86288,9 +86288,9 @@ RectTransform: m_Father: {fileID: 9033830650798519355} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 110, y: -216.25} m_SizeDelta: {x: 220, y: 428.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9141045300091552471 @@ -87573,9 +87573,9 @@ RectTransform: m_Father: {fileID: 1380306822718338942} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5520294438615329570 @@ -88591,9 +88591,9 @@ RectTransform: m_Father: {fileID: 1380306822718338942} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2182054039994430690 @@ -89279,9 +89279,9 @@ RectTransform: m_Father: {fileID: 3730962970155661078} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1962923238070274030 @@ -90266,9 +90266,9 @@ RectTransform: m_Father: {fileID: 4895505664369319088} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6673071978378577247 @@ -90830,9 +90830,9 @@ RectTransform: m_Father: {fileID: 9033830650798519355} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 570, y: -216.25} m_SizeDelta: {x: 220, y: 428.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9198284029481265533 diff --git a/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintHandBook.prefab b/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintHandBook.prefab index a1354e1368..1c5d23194b 100644 --- a/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintHandBook.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintHandBook.prefab @@ -35,8 +35,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.5, y: 3.1} - m_SizeDelta: {x: 156.88, y: 84.91} + m_AnchoredPosition: {x: 0, y: 3.1} + m_SizeDelta: {x: 125, y: 84.91} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6578989730811352646 CanvasRenderer: @@ -91,9 +91,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u91D1" LanguageIndex: 0 --- !u!1 &670430414760944179 @@ -131,8 +131,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.5, y: 3.1} - m_SizeDelta: {x: 156.88, y: 84.91} + m_AnchoredPosition: {x: 0, y: 3.1} + m_SizeDelta: {x: 125, y: 84.91} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7729027929841444798 CanvasRenderer: @@ -187,9 +187,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u767D\u91D1" LanguageIndex: 0 --- !u!1 &679737826519922207 @@ -970,8 +970,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: 2.17, y: 0.0000088215} - m_SizeDelta: {x: 160, y: 86.6} + m_AnchoredPosition: {x: 0, y: 0.0000088215} + m_SizeDelta: {x: 125, y: 86.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6120099756975421499 CanvasRenderer: @@ -1026,9 +1026,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u7EFF" LanguageIndex: 0 --- !u!1 &3351827963699560164 @@ -1300,8 +1300,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.5, y: 3.1} - m_SizeDelta: {x: 156.88, y: 84.91} + m_AnchoredPosition: {x: 0, y: 3.1} + m_SizeDelta: {x: 125, y: 84.91} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &375768687125669232 CanvasRenderer: @@ -1356,9 +1356,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u7EA2" LanguageIndex: 0 --- !u!1 &3735724111869097884 @@ -1396,8 +1396,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.5, y: 3.1} - m_SizeDelta: {x: 156.88, y: 84.91} + m_AnchoredPosition: {x: 0, y: 3.1} + m_SizeDelta: {x: 125, y: 84.91} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5897789520709267985 CanvasRenderer: @@ -1452,9 +1452,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u7D2B" LanguageIndex: 0 --- !u!1 &4147288409904281416 @@ -6569,7 +6569,7 @@ ParticleSystem: --- !u!199 &5220329669127798686 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11698,7 +11698,7 @@ ParticleSystem: --- !u!199 &706227594672674341 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab index d6d1fa7282..82edf0c33c 100644 --- a/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab @@ -4919,7 +4919,7 @@ ParticleSystem: --- !u!199 &4324180858153338751 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9729,7 +9729,7 @@ ParticleSystem: --- !u!199 &7221542063120976112 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14724,7 +14724,7 @@ ParticleSystem: --- !u!199 &4602218995443542467 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19480,7 +19480,7 @@ ParticleSystem: --- !u!199 &6667180100871307135 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25841,7 +25841,7 @@ ParticleSystem: --- !u!199 &6150936966303437256 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26358,8 +26358,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: 6, y: -2} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 42, y: -2} + m_SizeDelta: {x: -65.5, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &733143187815832312 CanvasRenderer: @@ -26396,10 +26396,10 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u663E\u793A\u88C5\u5907\u4E2D\u7684\u9B42\u5370" @@ -31721,7 +31721,7 @@ ParticleSystem: --- !u!199 &2247791035768844462 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36631,7 +36631,7 @@ ParticleSystem: --- !u!199 &5306449312685909514 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41461,7 +41461,7 @@ ParticleSystem: --- !u!199 &7325208699826634860 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -46217,7 +46217,7 @@ ParticleSystem: --- !u!199 &3735366785995198076 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -51564,7 +51564,7 @@ ParticleSystem: --- !u!199 &1426549054624387413 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -57223,7 +57223,7 @@ ParticleSystem: --- !u!199 &8968558274744067294 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index ae8b925cd6..122c18e19a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -87,6 +87,7 @@ function RoleEquipPanel:InitComponent() this.effect = Util.GetGameObject(self.transform, "bg/effect") for i = 0, 6 do tabs[i] = Util.GetGameObject(self.transform, "Tabs/Btn" .. i) + Util.GetGameObject(tabs[i], "Text"):GetComponent("Text").fontSize = GetCurLanguage() == 0 and 48 or 40 effectList[i] = Util.GetGameObject(self.transform, "bg/equipInfo/equip" .. i .. "/effect") end this.selectBtn = Util.GetGameObject(self.gameObject, "selectBtn") @@ -726,7 +727,7 @@ function this:SetSelectBtn() this.selectBtn:GetComponent("RectTransform").anchoredPosition3D = Vector3(-12.28, 1.08, 0) --this.selectBtn.transform.localScale = Vector3.one --this.selectBtn:GetComponent("Image"):SetNativeSize() - Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = typeTab[indexBtnNum] + Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = GetCurLanguage() == 0 and typeTab[indexBtnNum] or ""..typeTab[indexBtnNum]..""--typeTab[indexBtnNum] end function this:OpenTips(nextEquipData,pos) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 73c5807ec5..dc0cd1e5fd 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -41,6 +41,7 @@ function RoleInfoLayout:InitComponent(gameObject) this.lv = Util.GetGameObject(gameObject,"pro/lv/proValue"):GetComponent("Text") this.skillGrid=Util.GetGameObject(gameObject,"skill") this.selsectSkillImage=Util.GetGameObject(gameObject,"selsectSkillImage") + this.baseAttri = Util.GetGameObject(gameObject,"Ima/Text"):GetComponent("Text") this.allProButton=Util.GetGameObject(gameObject,"allProButton") this.pinjieList={}--品阶预设容器 this.pinjieRoot=Util.GetGameObject(gameObject,"Pinjie") @@ -186,6 +187,7 @@ function this:UpdateHeroInfoData() --技能点击特殊处理 this.selsectSkillImage:SetActive(false) + this.baseAttri.alignment = GetCurLanguage() ~= 2 and "MiddleCenter" or "MiddleRight" this.UpdateHeroUpStarProUpSkillShow(this.skillGrid,curHeroData.skillIdList,curHeroData.passiveSkillList) end function this:ProShow(go,allAddProVal,HeroProType,nextallAddProVal) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 19f2b2c0c5..256fbac5ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -397,7 +397,7 @@ function this:UpdateBtnList() end local title = Util.GetGameObject(tabsList[k], "Text"):GetComponent("Text") local redpot = Util.GetGameObject(tabsList[k], "redPoint") - title.text = v.title + title.text = GetCurLanguage() == 0 and v.title or ""..v.title.."" -- 判断是否需要检测红点 redpot:SetActive(false) if k == 1 then @@ -462,7 +462,7 @@ function this:SetSelectBtn(index) this.selectBtn.transform:SetParent(tabsList[index].transform) this.selectBtn.transform.localScale = Vector3.one this.selectBtn.transform.localPosition=Vector3.zero - Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = tabs[index].title + Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = GetCurLanguage() == 0 and tabs[index].title or ""..tabs[index].title..""--tabs[index].title-- Util.GetGameObject(self.transform,"talentBtn/tipStr"):SetActive(false) if index == 2 then Util.GetGameObject(self.transform,"talentBtn/tipStr"):SetActive(true)