diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index c3ebdfc4ed..6dfdf87b78 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -10746,7 +10746,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7305dd25ffb0c7a45a745288ff547cc5, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e6dd4cae84f4dd46958013a6f282fc7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12490,7 +12490,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 896bbd5f2e861c945a3ca228d7c37081, type: 3} + m_Sprite: {fileID: 21300000, guid: 100285d750e9c2043bf98b7f36b65e6d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -13365,7 +13365,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0f2cc64e40e26e645b9f4ab0e3f793b8, type: 3} + m_Sprite: {fileID: 21300000, guid: e5f390065e8d312419f17562e8250e91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -14278,7 +14278,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9f24cdeec6201014a8771ad4417a383e, type: 3} + m_Sprite: {fileID: 21300000, guid: b582673e3da23f44fbae9ec0521af1f1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -15185,7 +15185,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: cd2ca249349cd094d933065a76dd9f73, type: 3} + m_Sprite: {fileID: 21300000, guid: 29430791031a92643b0afc46b730abe5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -15570,7 +15570,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 58b67c9752798ab4fb8a76f3dbcbc9d4, type: 3} + m_Sprite: {fileID: 21300000, guid: f088797d2a26ab24abe877e97eba98bd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16429,7 +16429,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1a2ed3d281da42944b13b7a4c6a5d205, type: 3} + m_Sprite: {fileID: 21300000, guid: af35ae40293e26b41b46837f7ad59918, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -17602,7 +17602,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: cf9953dea32196b43b10303dbc7571a4, type: 3} + m_Sprite: {fileID: 21300000, guid: 49cfb04acf258724ea541716595191e7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab index d458a7324e..52bcc35975 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab @@ -452,7 +452,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 5443559753830760674} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -787,8 +787,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.8, y: -0.5} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.04, y: 0.05} + m_SizeDelta: {x: 161.67, y: 50.06} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3381836307131825562 CanvasRenderer: @@ -822,14 +822,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 + m_BestFit: 1 + m_MinSize: 30 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: "\u9886 \u53D6" LanguageIndex: 10208 @@ -941,8 +941,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: 326, y: -0.00001335144} - m_SizeDelta: {x: 228.6, y: 110} + m_AnchoredPosition: {x: 220.1499, y: -0.00001335144} + m_SizeDelta: {x: 440.3, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2520962798631207871 CanvasRenderer: @@ -1241,7 +1241,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 4198311467988704001} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -1680,7 +1680,6 @@ GameObject: m_Component: - component: {fileID: 6789510038012602847} - component: {fileID: 2365690965266835302} - - component: {fileID: 2488887390887022083} m_Layer: 5 m_Name: getAidText m_TagString: Untagged @@ -1716,41 +1715,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1579523779098236789} m_CullTransparentMesh: 0 ---- !u!114 &2488887390887022083 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1579523779098236789} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.78431374, g: 0.6784314, b: 0.5137255, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 32 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6536\u5230\u63F4\u52A9\uFF1A" - LanguageIndex: 10683 --- !u!1 &1705117109588171835 GameObject: m_ObjectHideFlags: 0 @@ -2817,7 +2781,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u516C\u4F1A\u63F4\u52A9" LanguageIndex: 10678 @@ -3275,7 +3239,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7069071979785546959 RectTransform: m_ObjectHideFlags: 0 @@ -3669,7 +3633,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 54.475, y: -0.000061035156} + m_AnchoredPosition: {x: 54.475, y: 0} m_SizeDelta: {x: 802.05, y: 508} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4872216247291729287 @@ -3811,7 +3775,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3995650248301756071 RectTransform: m_ObjectHideFlags: 0 @@ -4610,8 +4574,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: 201, y: -37} - m_SizeDelta: {x: 300.6, y: 110} + m_AnchoredPosition: {x: 175.64996, y: -37} + m_SizeDelta: {x: 351.3, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4554839803797323066 CanvasRenderer: @@ -4689,8 +4653,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: -0.5} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 3.5, y: -0.010083} + m_SizeDelta: {x: 160, y: 57.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &809211301563449807 CanvasRenderer: @@ -4724,14 +4688,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 + m_BestFit: 1 + m_MinSize: 30 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: "\u514D\u8D39\u63F4\u52A9" LanguageIndex: 10685 @@ -4992,7 +4956,6 @@ GameObject: m_Component: - component: {fileID: 3144202478147046366} - component: {fileID: 6147346905887114599} - - component: {fileID: 3121274526574386290} m_Layer: 5 m_Name: getAidText m_TagString: Untagged @@ -5028,41 +4991,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6949270368624702836} m_CullTransparentMesh: 0 ---- !u!114 &3121274526574386290 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6949270368624702836} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.78431374, g: 0.6784314, b: 0.5137255, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 32 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6536\u5230\u63F4\u52A9\uFF1A" - LanguageIndex: 10683 --- !u!1 &7005239831827212743 GameObject: m_ObjectHideFlags: 0 @@ -5174,8 +5102,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: -11.1, y: 12.86} + m_SizeDelta: {x: 296.5, y: 82.88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4164037231437486361 CanvasRenderer: @@ -5216,7 +5144,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u65E0\u63F4\u52A9\u4FE1\u606F\uFF01" LanguageIndex: 10687 @@ -6013,8 +5941,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: 125.30002, y: -4} - m_SizeDelta: {x: 300.6, y: 110} + m_AnchoredPosition: {x: 124.4, y: 0} + m_SizeDelta: {x: 710.3, y: 194.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6022015216778844675 CanvasRenderer: @@ -6054,7 +5982,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: "\u70B9\u51FB\u9009\u62E9\u60A8\u6240\u9700\u6C42\u63F4\u76845\u661F\u6B66\u5C06" @@ -6630,10 +6558,10 @@ RectTransform: m_Father: {fileID: 7069071979785546959} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -4.199997, y: -3.7299995} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 246, y: 96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6590435463322361755 CanvasRenderer: @@ -6682,8 +6610,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 52 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 52 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab index 6b6abce670..40214a704b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab @@ -5024,7 +5024,7 @@ ParticleSystem: --- !u!199 &5040103470708412571 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -6454,8 +6454,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: "\u796D \u7940" LanguageIndex: 10765 @@ -6645,8 +6645,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: 162.18} - m_SizeDelta: {x: 160, y: 58.63} + m_AnchoredPosition: {x: 3.0500002, y: 162.18} + m_SizeDelta: {x: 183.9, y: 58.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6292003480179990097 CanvasRenderer: @@ -6687,7 +6687,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7956\u9B42\u7940" LanguageIndex: 10769 @@ -11204,7 +11204,7 @@ ParticleSystem: --- !u!199 &7022009138468795937 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15916,7 +15916,7 @@ ParticleSystem: --- !u!199 &21284196286945555 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -21231,7 +21231,7 @@ ParticleSystem: --- !u!199 &7662304376647596786 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -21324,8 +21324,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 20.800003} - m_SizeDelta: {x: 165.7, y: 41.6} + m_AnchoredPosition: {x: 10.9, y: 20.800003} + m_SizeDelta: {x: 143.8, y: 41.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7385139012850324116 CanvasRenderer: @@ -21362,11 +21362,11 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 57 - 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: "\u796D\u7940\u8FDB\u5EA6" LanguageIndex: 10767 @@ -21404,8 +21404,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: 162.18} - m_SizeDelta: {x: 160, y: 58.63} + m_AnchoredPosition: {x: 2.3, y: 162.18} + m_SizeDelta: {x: 176.9, y: 58.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3214352299896469588 CanvasRenderer: @@ -21446,7 +21446,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7956\u9B42\u7940" LanguageIndex: 10769 @@ -21485,7 +21485,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 162.18} - m_SizeDelta: {x: 160, y: 58.63} + m_SizeDelta: {x: 190, y: 58.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8283345041285393190 CanvasRenderer: @@ -21526,7 +21526,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7956\u9B42\u7940" LanguageIndex: 10769 @@ -27835,7 +27835,7 @@ ParticleSystem: --- !u!199 &6866467361509154070 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33072,7 +33072,7 @@ ParticleSystem: --- !u!199 &1327544058612887100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33628,8 +33628,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 @@ -33935,8 +33935,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 @@ -38871,7 +38871,7 @@ ParticleSystem: --- !u!199 &5724314893189987714 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -43667,7 +43667,7 @@ ParticleSystem: --- !u!199 &6600377722598462734 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48524,7 +48524,7 @@ ParticleSystem: --- !u!199 &4723643438741483705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54001,7 +54001,7 @@ ParticleSystem: --- !u!199 &1522648081567467163 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54203,8 +54203,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 @@ -59378,7 +59378,7 @@ ParticleSystem: --- !u!199 &557479208284238603 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64346,7 +64346,7 @@ ParticleSystem: --- !u!199 &2718336770233971512 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69319,7 +69319,7 @@ ParticleSystem: --- !u!199 &4783855359569395394 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74327,7 +74327,7 @@ ParticleSystem: --- !u!199 &1454716228256041344 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -78958,7 +78958,7 @@ ParticleSystem: --- !u!199 &1406671002734066039 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/Guild/GuildInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab index 907dc02d1b..affc409b55 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab @@ -109,10 +109,10 @@ RectTransform: m_Father: {fileID: 808834971} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 260, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &178468802 CanvasRenderer: @@ -146,14 +146,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 42 + m_BestFit: 1 + m_MinSize: 30 + 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: "\u89E3\u6563\u516C\u4F1A" LanguageIndex: 0 @@ -567,10 +567,10 @@ RectTransform: m_Father: {fileID: 283909342} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 260, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &390011370 CanvasRenderer: @@ -604,14 +604,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 42 + m_BestFit: 1 + m_MinSize: 30 + 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: "\u53D1\u5E03\u62DB\u52DF" LanguageIndex: 0 @@ -630,7 +630,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &565426657 RectTransform: m_ObjectHideFlags: 0 @@ -1008,7 +1008,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: 252.3} + m_AnchoredPosition: {x: 0, y: 381.92} m_SizeDelta: {x: 910, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1226945207 @@ -1417,10 +1417,10 @@ RectTransform: m_Father: {fileID: 2048486876} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 260, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1457462789 CanvasRenderer: @@ -1454,14 +1454,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 42 + m_BestFit: 1 + m_MinSize: 30 + 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: "\u7F16\u8F91\u5BA3\u8A00" LanguageIndex: 0 @@ -1599,7 +1599,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1573254627 RectTransform: m_ObjectHideFlags: 0 @@ -1616,8 +1616,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: 316.1, y: -0.8} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 333.51, y: -0.8} + m_SizeDelta: {x: 242.98, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1573254629 CanvasRenderer: @@ -1716,7 +1716,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1808648954 RectTransform: m_ObjectHideFlags: 0 @@ -2284,9 +2284,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 46 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 68 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 46 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -2430,7 +2430,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: 489, y: -30} + m_AnchoredPosition: {x: 220, y: -30} m_SizeDelta: {x: 360, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7831156585591067873 @@ -2715,8 +2715,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: -230.4, y: -2.4} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: -276.6, y: 0.000051498} + m_SizeDelta: {x: 376.7, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &405942229144493551 CanvasRenderer: @@ -2757,7 +2757,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7533\u8BF7\u540D\u5355" LanguageIndex: 0 @@ -3171,8 +3171,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: 308, y: -3.3} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 337.11, y: 0.000024319} + m_SizeDelta: {x: 255.77, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7140200138202066239 CanvasRenderer: @@ -3249,10 +3249,10 @@ RectTransform: m_Father: {fileID: 6065637713557413692} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 260, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4290695128279025874 CanvasRenderer: @@ -3286,14 +3286,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 42 + m_BestFit: 1 + m_MinSize: 30 + 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: "\u516C\u4F1A\u5546\u5E97" LanguageIndex: 0 @@ -3588,10 +3588,10 @@ RectTransform: m_Father: {fileID: 1151397001692987178} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 260, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5282044022650466490 CanvasRenderer: @@ -3625,14 +3625,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 42 + m_BestFit: 1 + m_MinSize: 30 + 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: "\u516C\u4F1A\u56FE\u817E" LanguageIndex: 0 @@ -3839,8 +3839,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: 316.1, y: -0.8} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 333.51, y: -0.8} + m_SizeDelta: {x: 242.99, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2162111280470490533 CanvasRenderer: @@ -3919,8 +3919,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: 67.6, y: -3.3} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 60.499977, y: 0.000024319} + m_SizeDelta: {x: 297.5, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4297710972693034818 CanvasRenderer: @@ -3961,7 +3961,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6218\u529B" LanguageIndex: 0 @@ -4139,7 +4139,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2751512837790887003} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -4586,7 +4586,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3125594526218562913} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -5000,10 +5000,10 @@ RectTransform: m_Father: {fileID: 5091456115361377766} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 272, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1948208536818306329 CanvasRenderer: @@ -5037,9 +5037,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 44 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 64 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 44 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -5126,7 +5126,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4031944205457588657} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -5914,7 +5914,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: 296, y: -30} + m_AnchoredPosition: {x: 86, y: -30} m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1254031054342702809 @@ -6413,10 +6413,10 @@ RectTransform: m_Father: {fileID: 4897438721264413365} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 260, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8588286507265147860 CanvasRenderer: @@ -6450,14 +6450,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 42 + m_BestFit: 1 + m_MinSize: 30 + 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: "\u5165\u4F1A\u8BBE\u7F6E" LanguageIndex: 0 @@ -6626,10 +6626,10 @@ RectTransform: m_Father: {fileID: 7423080085318157143} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 260, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &254306293313823965 CanvasRenderer: @@ -6663,14 +6663,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 42 + m_BestFit: 1 + m_MinSize: 30 + 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: "\u516C\u4F1A\u65E5\u5FD7" LanguageIndex: 0 @@ -7356,7 +7356,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: 253, y: -30} + m_AnchoredPosition: {x: 43, y: -30} m_SizeDelta: {x: 46, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7440753204596349393 @@ -7546,7 +7546,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u73A9\u5BB6\u540D\u5B57\u4E03\u4E2A\u5B57\u52A0\u5165\u516C\u4F1A" LanguageIndex: 0 @@ -8028,10 +8028,10 @@ RectTransform: m_Father: {fileID: 583369416535620882} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 272, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3504323319947693080 CanvasRenderer: @@ -8065,9 +8065,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 44 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 64 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 44 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -8606,9 +8606,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 44 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 64 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 44 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -8824,7 +8824,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8449721486686117713 RectTransform: m_ObjectHideFlags: 0 @@ -9009,7 +9009,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: 396.9, y: -30} + m_AnchoredPosition: {x: 186.9, y: -30} m_SizeDelta: {x: 333.8, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &953930339862039810 @@ -9354,7 +9354,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: 230, y: -30} + m_AnchoredPosition: {x: 20, y: -30} m_SizeDelta: {x: 59, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7460730661891921754 @@ -9666,8 +9666,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: 279.9, y: -2.9} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 263.2, y: -2.9} + m_SizeDelta: {x: 273.6, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6262845534552740248 CanvasRenderer: @@ -9707,8 +9707,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: "\u4E00\u5929\u524D" LanguageIndex: 0 @@ -9865,7 +9865,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8623688680856334478} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -9982,7 +9982,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: 230, y: -30} + m_AnchoredPosition: {x: 20, y: -30} m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &928783852799262530 @@ -10155,7 +10155,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8998188223101958071} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab index 163f6ee896..95050fc3b7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab @@ -667,8 +667,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: 4.6, y: 0.00000095367} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: 0.7, y: 0.00000095367} + m_SizeDelta: {x: 209.14, y: 65.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &391564713732914746 CanvasRenderer: @@ -702,14 +702,14 @@ 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 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u626B \u8361" LanguageIndex: 0 @@ -1415,8 +1415,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: 0.00000095367} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: -1.09, y: 0.00000095367} + m_SizeDelta: {x: 208.52, y: 65.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3552291308302863934 CanvasRenderer: @@ -1450,14 +1450,14 @@ 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 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6311 \u6218" LanguageIndex: 0 @@ -4433,7 +4433,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: 324.5, y: -165.6} + m_AnchoredPosition: {x: 324.5, y: -131.9} m_SizeDelta: {x: 224.3, y: 79.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6826388305548266158 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab index 2f50aea469..b6010ad646 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab @@ -1325,8 +1325,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 \u540D" LanguageIndex: 0 @@ -1402,8 +1402,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: -23, y: -650} - m_SizeDelta: {x: 477.13, y: 41.5} + m_AnchoredPosition: {x: -1.87, y: -646.73} + m_SizeDelta: {x: 912, y: 82.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6376209506668708557 CanvasRenderer: @@ -1443,7 +1443,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: "\u6392\u884C\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E" @@ -1674,8 +1674,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\u9053\u5177" LanguageIndex: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua index eccc24718f..1ee98ff2ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua @@ -67,8 +67,7 @@ function this.SingleHelpAidDataShow(go,data) Util.GetGameObject(go, "heroPro/frame/chipImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[data.type].Quantity)) Util.GetGameObject(go, "heroPro/frame/proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(itemConfig[data.type].PropertyName)) Util.GetGameObject(go, "okAid/chipInfo"):GetComponent("Text").text = data.name - Util.GetGameObject(go, "okAid/getAidText"):GetComponent("Text").text = GetLanguageStrById(itemConfig[data.type].Name) - Util.GetGameObject(go, "okAid/getAidText/getAidNumText"):GetComponent("Text").text = "("..data.num.."/"..guildHelpConfig[1].RecourseTime[2]..")" + Util.GetGameObject(go, "okAid/getAidText/getAidNumText"):GetComponent("Text").text =GetLanguageStrById(itemConfig[data.type].Name).. "("..data.num.."/"..guildHelpConfig[1].RecourseTime[2]..")" Util.GetGameObject(go, "okAid/progressbar/progress"):GetComponent("Image").fillAmount = data.num/guildHelpConfig[1].RecourseTime[2] local getRewardBtn = Util.GetGameObject(go, "okAid/getRewardBtn") local zongNum = guildHelpConfig[1].HelpTime[1] + guildHelpConfig[1].HelpTime[2] diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua index a1273d2c0d..8ca4bb5362 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua @@ -150,7 +150,7 @@ function this.SingleHelpDataShow(go,data) Util.GetGameObject(go, "heroPro/frame/chipImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[data.type].Quantity)) Util.GetGameObject(go, "heroPro/frame/proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(itemConfig[data.type].PropertyName)) Util.GetGameObject(go, "okAid/chipInfo"):GetComponent("Text").text = GetLanguageStrById(itemConfig[data.type].Name) - Util.GetGameObject(go, "okAid/getAidText/getAidNumText"):GetComponent("Text").text = data.num.."/"..guildHelpConfig[1].RecourseTime[2] + Util.GetGameObject(go, "okAid/getAidText/getAidNumText"):GetComponent("Text").text ="收到援助:"..data.num.."/"..guildHelpConfig[1].RecourseTime[2] Util.GetGameObject(go, "okAid/getFinishText"):SetActive(data.num == data.hadtakenum and data.hadtakenum == guildHelpConfig[1].RecourseTime[2]) Util.GetGameObject(go, "okAid/progressbar/progress1"):GetComponent("Image").fillAmount = data.num/guildHelpConfig[1].RecourseTime[2] Util.GetGameObject(go, "okAid/progressbar/progress2"):GetComponent("Image").fillAmount = data.hadtakenum/guildHelpConfig[1].RecourseTime[2] diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua index fd4f3fbf82..5a8a1fe518 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua @@ -78,7 +78,11 @@ function GuildInfoPopup:InitComponent() this.logScrollRoot = Util.GetGameObject(this.logPanel, "bg/scrollpos") this.logItem = Util.GetGameObject(this.logPanel, "bg/scrollpos/log") - + this.layoutName = Util.GetGameObject(this.contentList[1], "name") + this.layoutLevel = Util.GetGameObject(this.contentList[1], "level") + this.layoutMaster = Util.GetGameObject(this.contentList[1], "master") + this.layoutMember = Util.GetGameObject(this.contentList[1], "member") + this.layoutDeclaration = Util.GetGameObject(this.contentList[1], "declaration") end --绑定事件(用于子类重写) @@ -245,10 +249,16 @@ end --界面打开时调用(用于子类重写) function GuildInfoPopup:OnOpen(...) this.RefreshShow() + LayoutRebuilder.ForceRebuildLayoutImmediate(this.layoutName.transform) + LayoutRebuilder.ForceRebuildLayoutImmediate(this.layoutLevel.transform) + LayoutRebuilder.ForceRebuildLayoutImmediate(this.layoutMaster.transform) + LayoutRebuilder.ForceRebuildLayoutImmediate(this.layoutMember.transform) + LayoutRebuilder.ForceRebuildLayoutImmediate(this.layoutDeclaration.transform) end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function GuildInfoPopup:OnShow() + end -- 我的职位变更回调