diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab index 3e4369e86a..cba711b0dc 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab @@ -47,6 +47,7 @@ GameObject: - component: {fileID: 187203423} - component: {fileID: 187203425} - component: {fileID: 2576399887653071426} + - component: {fileID: 2448278866441982307} m_Layer: 5 m_Name: pos m_TagString: Untagged @@ -94,7 +95,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.48235294, g: 0.28235295, b: 0.13333334, a: 1} + m_Color: {r: 1, g: 0.94291973, b: 0, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -116,6 +117,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6210\u5458" LanguageIndex: 0 +--- !u!114 &2448278866441982307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187203422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &283909341 GameObject: m_ObjectHideFlags: 0 @@ -151,10 +167,10 @@ RectTransform: m_Father: {fileID: 7741549075230148776} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 431, y: -123} - m_SizeDelta: {x: 184, y: 66} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &283909345 CanvasRenderer: @@ -489,10 +505,10 @@ RectTransform: m_Father: {fileID: 7741549075230148776} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 92, y: -219} - m_SizeDelta: {x: 184, y: 66} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &808834974 CanvasRenderer: @@ -607,7 +623,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1137014341 RectTransform: m_ObjectHideFlags: 0 @@ -669,10 +685,10 @@ RectTransform: m_Father: {fileID: 8657892590747757568} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 92, y: -116.5} - m_SizeDelta: {x: 184, y: 66} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1226945211 CanvasRenderer: @@ -945,13 +961,14 @@ GameObject: - component: {fileID: 1573254627} - component: {fileID: 1573254629} - component: {fileID: 6236322033463293277} + - component: {fileID: 2633337838401263894} m_Layer: 5 m_Name: online m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1573254627 RectTransform: m_ObjectHideFlags: 0 @@ -992,7 +1009,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5882353, g: 0.45490196, b: 0.15294118, a: 1} + m_Color: {r: 0, g: 1, b: 0.96201396, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1014,6 +1031,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5728\u7EBF" LanguageIndex: 0 +--- !u!114 &2633337838401263894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573254626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1792311728 GameObject: m_ObjectHideFlags: 0 @@ -1068,7 +1100,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1808648954 RectTransform: m_ObjectHideFlags: 0 @@ -1876,7 +1908,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: 448174c4a3a50234abe6c9af5b7365da, type: 3} + m_Sprite: {fileID: 21300000, guid: dae020383bdcc984181454272ae9010e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1961,7 +1993,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: -58} + m_AnchoredPosition: {x: 0, y: -55.8} m_SizeDelta: {x: 109.6, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8479049656766049372 @@ -1985,7 +2017,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.38679248, g: 0.2462313, b: 0.09669812, a: 1} + m_Color: {r: 1, g: 0.74407625, b: 0.07075471, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2160,7 +2192,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.7338808, b: 0.08018869, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2406,7 +2438,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -2551,7 +2583,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6651626502583840722} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2579,7 +2611,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5882353, g: 0.45490196, b: 0.15294118, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2635,7 +2667,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: -58} + m_AnchoredPosition: {x: 0, y: -55.800003} m_SizeDelta: {x: 109.6, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5136645287029634456 @@ -2659,7 +2691,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.38679248, g: 0.2462313, b: 0.09669812, a: 1} + m_Color: {r: 1, g: 0.74407625, b: 0.07075471, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2879,7 +2911,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6651626502583840722} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2965,7 +2997,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 201, y: -30} - m_SizeDelta: {x: 44, y: 60} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &774910961661989352 CanvasRenderer: @@ -3502,10 +3534,10 @@ RectTransform: m_Father: {fileID: 8657892590747757568} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 92, y: -33} - m_SizeDelta: {x: 184, y: 66} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8169934903760481632 CanvasRenderer: @@ -3761,7 +3793,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 198.9, y: -25.845} - m_SizeDelta: {x: 55, y: 51.69} + m_SizeDelta: {x: 0, y: 51.69} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8948627112095531115 CanvasRenderer: @@ -4348,6 +4380,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 8779832109360882242} - {fileID: 6047616247222652067} - {fileID: 4024429027422079866} m_Father: {fileID: 648066623} @@ -4629,6 +4662,80 @@ RectTransform: m_AnchoredPosition: {x: -310, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4437075239376038948 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8779832109360882242} + - component: {fileID: 1366284594198764399} + - component: {fileID: 4861680591041398434} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8779832109360882242 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4437075239376038948} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6651626502583840722} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 189.95, y: 0} + m_SizeDelta: {x: 251.7, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1366284594198764399 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4437075239376038948} + m_CullTransparentMesh: 0 +--- !u!114 &4861680591041398434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4437075239376038948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 9c6bacbc48673e9459b596dc5c71b9d4, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4458973143562135512 GameObject: m_ObjectHideFlags: 0 @@ -4894,10 +5001,10 @@ RectTransform: m_Father: {fileID: 8122152628200072507} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 263.01498, y: -77.75} - m_SizeDelta: {x: 266, y: 80} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8107862036053243988 CanvasRenderer: @@ -5276,7 +5383,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: 448174c4a3a50234abe6c9af5b7365da, type: 3} + m_Sprite: {fileID: 21300000, guid: dae020383bdcc984181454272ae9010e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5880,10 +5987,10 @@ RectTransform: m_Father: {fileID: 8122152628200072507} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 624.285, y: -77.75} - m_SizeDelta: {x: 266, y: 80} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6491873845766468881 CanvasRenderer: @@ -6581,7 +6688,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.73333335, b: 0.078431375, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6632,10 +6739,10 @@ RectTransform: m_Father: {fileID: 8657892590747757568} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 436, y: -33} - m_SizeDelta: {x: 184, y: 66} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1175380572632674789 CanvasRenderer: @@ -7357,7 +7464,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -24.014994} - m_SizeDelta: {x: 160, y: 48.03} + m_SizeDelta: {x: 0, y: 48.03} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7874788501943550310 CanvasRenderer: @@ -7760,8 +7867,8 @@ 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: 5eb7fbeffdba3c448a555d0a7da444cf, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: f07897500f47f8c4c844f10f3cbf3ee5, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7869,7 +7976,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.48235294, g: 0.28235295, b: 0.13333334, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -8162,7 +8269,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: 55.1, y: -1.6} + m_AnchoredPosition: {x: 50.5, y: -7.7} m_SizeDelta: {x: 67.25, y: 34.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7874788503829689226 @@ -8186,7 +8293,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4901961, g: 0.34901962, b: 0.24705884, a: 1} + m_Color: {r: 1, g: 0.75686437, b: 0.0141509175, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -8467,7 +8574,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -30} - m_SizeDelta: {x: 160, y: 60} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8272467148021790971 CanvasRenderer: @@ -8561,10 +8668,10 @@ RectTransform: m_Father: {fileID: 7741549075230148776} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 92, y: -123} - m_SizeDelta: {x: 184, y: 66} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7227010213304830592 CanvasRenderer: @@ -8809,8 +8916,8 @@ 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: 5eb7fbeffdba3c448a555d0a7da444cf, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: f07897500f47f8c4c844f10f3cbf3ee5, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4