diff --git a/Assets/ResWork/UIPrefabs/Collection/Essence/EssenceCard.prefab b/Assets/ResWork/UIPrefabs/Collection/Essence/EssenceCard.prefab index 6a9ca385c..f5fb05bfa 100644 --- a/Assets/ResWork/UIPrefabs/Collection/Essence/EssenceCard.prefab +++ b/Assets/ResWork/UIPrefabs/Collection/Essence/EssenceCard.prefab @@ -34,7 +34,7 @@ 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: 218.5, y: 6.1} + m_AnchoredPosition: {x: 170, y: 0} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7604325838147809075 @@ -68,8 +68,7 @@ MonoBehaviour: m_text: X000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -93,8 +92,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -135,7 +134,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3112795201144618917 +--- !u!1 &3911987445043263434 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -143,25 +142,159 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3657866903760747150} - - component: {fileID: 2858589857766456787} - - component: {fileID: 3318000938867565123} - - component: {fileID: 4957879095182494507} - - component: {fileID: 1335465462780338667} + - component: {fileID: 3569576926422565357} + - component: {fileID: 4515674426736635087} + - component: {fileID: 3674041860277106752} m_Layer: 5 - m_Name: btn_bg + m_Name: iconbg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3657866903760747150 +--- !u!224 &3569576926422565357 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3112795201144618917} + m_GameObject: {fileID: 3911987445043263434} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7926292701368339014} + m_Father: {fileID: 7069269203398939430} + 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: 42.3, y: 0} + m_SizeDelta: {x: 66, y: 66} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4515674426736635087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3911987445043263434} + m_CullTransparentMesh: 1 +--- !u!114 &3674041860277106752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3911987445043263434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5c8299abe57a3d74fbae741459ec31fe, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5007965597342539872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7069269203398939430} + - component: {fileID: 3203742043990339848} + m_Layer: 5 + m_Name: EssenceCard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7069269203398939430 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5007965597342539872} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3937055370824347175} + - {fileID: 3569576926422565357} + - {fileID: 3485520347291011146} + - {fileID: 693069033438735398} + m_Father: {fileID: 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_SizeDelta: {x: 503, y: 82} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3203742043990339848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5007965597342539872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12790b1f01e6c7d49af168d96512c4d8, type: 3} + m_Name: + m_EditorClassIdentifier: + images: + - {fileID: 3154277460960630631} + - {fileID: 5996358480086004307} + texts: + - {fileID: 4321918934058166898} + - {fileID: 141844813145387615} +--- !u!1 &6271959353678680055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3937055370824347175} + - component: {fileID: 1389282537769211891} + - component: {fileID: 5996358480086004307} + - component: {fileID: 5858219688377768593} + - component: {fileID: 6694672397154606903} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3937055370824347175 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6271959353678680055} 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} @@ -174,36 +307,36 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2858589857766456787 +--- !u!222 &1389282537769211891 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3112795201144618917} + m_GameObject: {fileID: 6271959353678680055} m_CullTransparentMesh: 1 ---- !u!114 &3318000938867565123 +--- !u!114 &5996358480086004307 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3112795201144618917} + m_GameObject: {fileID: 6271959353678680055} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7ced7255948a6b247b97ffcded590ef5, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: f5f9d6032da8cb2448f74820509af8cf, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -212,13 +345,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4957879095182494507 +--- !u!114 &5858219688377768593 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3112795201144618917} + m_GameObject: {fileID: 6271959353678680055} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -252,11 +385,11 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 3318000938867565123} + m_TargetGraphic: {fileID: 5996358480086004307} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: -4598729483143925422} + - m_Target: {fileID: 3203742043990339848} m_TargetAssemblyTypeName: EssenceCard, Assembly-CSharp m_MethodName: OnClick_Essence m_Mode: 1 @@ -268,154 +401,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &1335465462780338667 +--- !u!114 &6694672397154606903 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3112795201144618917} + m_GameObject: {fileID: 6271959353678680055} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &3500452386532213933 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 219692942407797845} - - component: {fileID: 4590259171187688850} - - component: {fileID: 4213125945001883271} - m_Layer: 5 - m_Name: select - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &219692942407797845 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3500452386532213933} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8273137768380383592} - m_Father: {fileID: 7069269203398939430} - 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: 277.4, y: 0} - m_SizeDelta: {x: 50, y: 44} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4590259171187688850 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3500452386532213933} - m_CullTransparentMesh: 1 ---- !u!114 &4213125945001883271 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3500452386532213933} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a119c09b92956e14693a4d7385e32970, 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 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5007965597342539872 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7069269203398939430} - - component: {fileID: -4598729483143925422} - m_Layer: 5 - m_Name: EssenceCard - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7069269203398939430 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5007965597342539872} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3657866903760747150} - - {fileID: 7926292701368339014} - - {fileID: 3485520347291011146} - - {fileID: 693069033438735398} - - {fileID: 219692942407797845} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 618, y: 68} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &-4598729483143925422 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5007965597342539872} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 12790b1f01e6c7d49af168d96512c4d8, type: 3} - m_Name: - m_EditorClassIdentifier: - images: - - {fileID: 3154277460960630631} - texts: - - {fileID: 4321918934058166898} - - {fileID: 141844813145387615} - gos: - - {fileID: 3500452386532213933} --- !u!1 &7688660967501693051 GameObject: m_ObjectHideFlags: 0 @@ -450,7 +447,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: 88.8, y: 3.5} + m_AnchoredPosition: {x: 69.4, y: 0} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5789074156325106796 @@ -491,8 +488,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284624941 + m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -509,8 +506,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -519,7 +516,7 @@ MonoBehaviour: m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -3 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -576,16 +573,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8047826281662686417} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7069269203398939430} + m_Father: {fileID: 3569576926422565357} 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: 103.1, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7030935088827428601 @@ -626,78 +623,3 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8180492934236779787 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8273137768380383592} - - component: {fileID: 6987737776198967685} - - component: {fileID: 8070216756021297911} - m_Layer: 5 - m_Name: select - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8273137768380383592 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8180492934236779787} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 219692942407797845} - 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: -277.39996, y: 0} - m_SizeDelta: {x: 618, y: 69} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6987737776198967685 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8180492934236779787} - m_CullTransparentMesh: 1 ---- !u!114 &8070216756021297911 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8180492934236779787} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6571ab1a674585b4fb485d6853ef1136, 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 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index e27a12f15..e88427aa8 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -575,12 +575,12 @@ RectTransform: m_Children: - {fileID: 1466777261896000297} - {fileID: 1875808063552411648} - m_Father: {fileID: 5635866332215435651} + m_Father: {fileID: 3660537402034522610} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -317.74023, y: 244} - m_SizeDelta: {x: 310, y: 110} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 90} + m_SizeDelta: {x: 220, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8428611257008625966 CanvasRenderer: @@ -610,7 +610,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 23a5ba2c8c6dbff4480a4e8596193f40, type: 3} + m_Sprite: {fileID: 21300000, guid: 77e44864c82b7a34e9407d1195f0a75a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -33209,8 +33209,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3660537402034522610} - - {fileID: 6579193462624299579} - - {fileID: 5227930284294940151} m_Father: {fileID: 6115577637892879689} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -39121,7 +39119,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6115577637892879689 RectTransform: m_ObjectHideFlags: 0 @@ -39940,18 +39938,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2537257571206545845} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6787643604425725119} - m_Father: {fileID: 5635866332215435651} + m_Father: {fileID: 3660537402034522610} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -329.5293, y: -489.6504} - m_SizeDelta: {x: 659.08, y: 439.61} + m_AnchoredPosition: {x: -301.4, y: -345.89} + m_SizeDelta: {x: 511.98, y: 567.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3665249280604150090 CanvasRenderer: @@ -39968,7 +39966,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2537257571206545845} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} m_Name: @@ -42364,6 +42362,81 @@ RectTransform: m_AnchoredPosition: {x: 413.2793, y: 10.92} m_SizeDelta: {x: 801.11, y: 526.12} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2724573614717480415 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2936935600650038076} + - component: {fileID: 2084295160897596656} + - component: {fileID: 6385382178389002022} + m_Layer: 5 + m_Name: line2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2936935600650038076 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2724573614717480415} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3525563028454311073} + 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: -151.3, y: 0} + m_SizeDelta: {x: 120, y: 14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2084295160897596656 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2724573614717480415} + m_CullTransparentMesh: 1 +--- !u!114 &6385382178389002022 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2724573614717480415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a4c7ce7d3b33b1349874f801b374a418, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2724983394832504816 GameObject: m_ObjectHideFlags: 0 @@ -49629,8 +49702,7 @@ MonoBehaviour: m_text: "\uC815\uC218 \uAD50\uD658" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -49654,8 +49726,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -51778,7 +51850,7 @@ GameObject: - component: {fileID: 8679561509137507124} - component: {fileID: 1903091408477170219} m_Layer: 5 - m_Name: New Image + m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -51797,12 +51869,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3525563028454311073} + - {fileID: 6579193462624299579} + - {fileID: 5227930284294940151} m_Father: {fileID: 5635866332215435651} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -316, y: -133} - m_SizeDelta: {x: 624, y: 3} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -331.03, y: 5.09} + m_SizeDelta: {x: 600.94, y: 771.58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8679561509137507124 CanvasRenderer: @@ -51832,8 +51906,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 60774acc26d3c2b438bec9f1bd07ace9, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 514fba7e342918441a7024c71844a09b, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -92862,7 +92936,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: -99.3, y: 45.7} + m_AnchoredPosition: {x: -51, y: 45.7} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1079074533940764786 @@ -105233,7 +105307,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 3} m_Pivot: {x: 0, y: 1} --- !u!114 &1187706956724960924 MonoBehaviour: @@ -105262,12 +105336,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 5 m_Right: 0 - m_Top: 0 + m_Top: 3 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 13.5 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -113926,6 +114000,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 296 +--- !u!1 &7696825079701030503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6246865308670311073} + - component: {fileID: 5607692872960681942} + - component: {fileID: 6500351896070065742} + m_Layer: 5 + m_Name: line2 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6246865308670311073 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7696825079701030503} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3525563028454311073} + 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: 151.3, y: 0} + m_SizeDelta: {x: 120, y: 14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5607692872960681942 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7696825079701030503} + m_CullTransparentMesh: 1 +--- !u!114 &6500351896070065742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7696825079701030503} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a4c7ce7d3b33b1349874f801b374a418, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7706044223190817156 GameObject: m_ObjectHideFlags: 0 @@ -126794,12 +126943,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2936935600650038076} + - {fileID: 6246865308670311073} m_Father: {fileID: 3660537402034522610} 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: -28.2, y: -59.6} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.0000019073486, y: -35} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4121756043125593878 @@ -126840,8 +126991,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284624941 + m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -126868,7 +127019,7 @@ MonoBehaviour: m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 2 + m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 diff --git a/Assets/Script/UI/Collection/Essence/CollectionEssenceUI_Right.cs b/Assets/Script/UI/Collection/Essence/CollectionEssenceUI_Right.cs index b7b76a339..82277a996 100644 --- a/Assets/Script/UI/Collection/Essence/CollectionEssenceUI_Right.cs +++ b/Assets/Script/UI/Collection/Essence/CollectionEssenceUI_Right.cs @@ -43,14 +43,14 @@ public class CollectionEssenceUI_Right : uScrollViewMgr public void SelectCard(EssenceCard card) { if (!DSUtil.CheckNull(m_SelectCard)) - m_SelectCard.gos[0].SetActive(false); + m_SelectCard.Set_Selected(false); if (DSUtil.CheckNull(card)) m_SelectCard = list_CardBase[0] as EssenceCard; else m_SelectCard = card; - m_SelectCard.gos[0].SetActive(true); + m_SelectCard.Set_Selected(true); Set_UI(); } diff --git a/Assets/Script/UI/Collection/Essence/EssenceCard.cs b/Assets/Script/UI/Collection/Essence/EssenceCard.cs index 8b5717159..ca6eef827 100644 --- a/Assets/Script/UI/Collection/Essence/EssenceCard.cs +++ b/Assets/Script/UI/Collection/Essence/EssenceCard.cs @@ -1,14 +1,10 @@ -using System.Collections; -using System.Collections.Generic; using TMPro; -using UnityEngine; using UnityEngine.UI; public class EssenceCard : CardBase { - public Image[] images; // 0 정수 + public Image[] images; // 0 정수, 1 bg public TextMeshProUGUI[] texts; // 0 갯수, 1 이름 - public GameObject[] gos; // 0 선택 EssenceTableData m_Data; @@ -18,7 +14,7 @@ public class EssenceCard : CardBase m_Data = _base as EssenceTableData; Set_UI(); - gos[0].SetActive(false); + Set_Selected(false); } public override void Set_UI() @@ -30,6 +26,11 @@ public class EssenceCard : CardBase texts[1].text = m_Data.Get_Name(); } + public override void Set_Selected(bool active) + { + images[1].sprite = UIAtlasMgr.Ins.Get_Sprite(active ? "slot 2" : "slot 1"); + } + public override TableDataBase Get_Data() { return m_Data; } public void OnClick_Essence()