From e9a1bb06deffb7150676e41cda2889060183d05a Mon Sep 17 00:00:00 2001 From: Ino Date: Sat, 19 Jul 2025 03:30:55 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8A=B9=EC=84=B1=20=EA=B0=95=ED=99=94=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Res_Addr/MainUI/NewGameUI.prefab | 573 ++++++++---------- .../Script/UI/PC/Ability/PCAbilityLvUpUI.cs | 4 +- 2 files changed, 258 insertions(+), 319 deletions(-) diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index b5e8d4c5a..d6f9f7980 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -3492,8 +3492,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3459769461740018091} - - component: {fileID: 3555228892376577959} - - component: {fileID: 8498100158789783878} m_Layer: 5 m_Name: bg_info m_TagString: Untagged @@ -3521,47 +3519,9 @@ 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: 60.98, y: 49} - m_SizeDelta: {x: 409.2, y: 142} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3555228892376577959 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 248594853101309231} - m_CullTransparentMesh: 1 ---- !u!114 &8498100158789783878 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 248594853101309231} - 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: 0.8941177, g: 0.86274517, b: 0.7843138, 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: 65f581562538e304cbbfe8ee3beab09c, 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 &254305656721918619 GameObject: m_ObjectHideFlags: 0 @@ -14070,13 +14030,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4272297280913936798} - {fileID: 2966730375924216257} m_Father: {fileID: 1212676743021907585} 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: -133} - m_SizeDelta: {x: 100, y: 50} + m_AnchoredPosition: {x: 8.9, y: -88} + m_SizeDelta: {x: 220, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5126768908678880495 CanvasRenderer: @@ -14099,15 +14060,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.97647065, g: 0.8941177, b: 0.2509804, a: 1} + 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 77e44864c82b7a34e9407d1195f0a75a, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -17557,7 +17518,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: 51, y: 142} + m_AnchoredPosition: {x: 0, y: 142} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2475230301107324691 @@ -17598,8 +17559,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: @@ -17616,8 +17577,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -30769,8 +30730,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: -49} - m_SizeDelta: {x: 24, y: 19} + m_AnchoredPosition: {x: 34.600006, y: 22.400002} + m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5785989335848581209 CanvasRenderer: @@ -30793,14 +30754,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.015686275, g: 0, b: 0, a: 1} + 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: 152933107c1c0794fa1b3035f46b4797, type: 3} + m_Sprite: {fileID: 21300000, guid: 970da973e5e849f41af9f29bae66f0d2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -55321,6 +55282,151 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 222 +--- !u!1 &3473651858189862532 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4670998346386968437} + - component: {fileID: 7595707874063411166} + - component: {fileID: 462110189295876059} + - component: {fileID: 8275975782789489842} + - component: {fileID: 1527615500702575654} + m_Layer: 5 + m_Name: btn_x + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4670998346386968437 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3473651858189862532} + 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: 7549791926287898704} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -44.2, y: -46.4} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7595707874063411166 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3473651858189862532} + m_CullTransparentMesh: 1 +--- !u!114 &462110189295876059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3473651858189862532} + 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: 2eac964d6f23e9b48a4973568a9dad68, 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!114 &8275975782789489842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3473651858189862532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 462110189295876059} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4867133353202892117} + m_TargetAssemblyTypeName: BackKeyAdd, Assembly-CSharp + m_MethodName: OnClick_Back + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1527615500702575654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3473651858189862532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3479687770452989418 GameObject: m_ObjectHideFlags: 0 @@ -64533,7 +64639,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8440377234816627102 RectTransform: m_ObjectHideFlags: 0 @@ -64549,7 +64655,6 @@ RectTransform: - {fileID: 7827080476943083829} - {fileID: 4346660176993972464} - {fileID: 8773029152139749433} - - {fileID: 1212676743021907585} - {fileID: 6924126925575544377} m_Father: {fileID: 7404742651207184332} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -73240,141 +73345,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &4780082643631931593 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6532636619817957539} - - component: {fileID: 165962313005818384} - - component: {fileID: 3951287278990449793} - m_Layer: 5 - m_Name: t_lv - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6532636619817957539 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4780082643631931593} - 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: 1939502409548603437} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &165962313005818384 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4780082643631931593} - m_CullTransparentMesh: 1 ---- !u!114 &3951287278990449793 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4780082643631931593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 00/00 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4791435642623592046 GameObject: m_ObjectHideFlags: 0 @@ -75714,7 +75684,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -14} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2977707159235019164 @@ -75748,15 +75718,14 @@ MonoBehaviour: m_text: "\uAC15\uD654" 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: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -75773,8 +75742,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -75985,7 +75954,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4898390718142910970} - 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 @@ -75993,12 +75962,10 @@ RectTransform: - {fileID: 3145282696229018817} - {fileID: 7549791926287898704} - {fileID: 1333524578115736169} - - {fileID: 1939502409548603437} - {fileID: 9202477229111228798} - {fileID: 3459769461740018091} - {fileID: 1012019937475190595} - - {fileID: 4272297280913936798} - m_Father: {fileID: 8440377234816627102} + m_Father: {fileID: 7404742651207184332} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -76020,7 +75987,7 @@ MonoBehaviour: m_MoneyForm: {fileID: 8613023010229956555} m_abilityCard: {fileID: 6778659158318405900} texts: - - {fileID: 3951287278990449793} + - {fileID: 0} - {fileID: 7137944302350784464} - {fileID: 5214235839989597602} - {fileID: 2519913767244669662} @@ -81854,7 +81821,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: -118, y: 41} + m_AnchoredPosition: {x: -37.3, y: 80} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &208925354989758902 @@ -81895,8 +81862,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: @@ -81913,8 +81880,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -83594,82 +83561,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5429695446960097744 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1939502409548603437} - - component: {fileID: 8705740219802420249} - - component: {fileID: 1584602517989441730} - m_Layer: 5 - m_Name: lvbg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1939502409548603437 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5429695446960097744} - 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: 6532636619817957539} - m_Father: {fileID: 1212676743021907585} - 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: -219, y: 16} - m_SizeDelta: {x: 100, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8705740219802420249 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5429695446960097744} - m_CullTransparentMesh: 1 ---- !u!114 &1584602517989441730 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5429695446960097744} - 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: 0.227451, g: 0.26666668, b: 0.3137255, 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: 65f581562538e304cbbfe8ee3beab09c, 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 &5435070840648887180 GameObject: m_ObjectHideFlags: 0 @@ -92390,6 +92281,7 @@ RectTransform: - {fileID: 5925801604119827395} - {fileID: 6810771494914655753} - {fileID: 2338593281362575877} + - {fileID: 1212676743021907585} m_Father: {fileID: 6291925347982253742} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -99798,7 +99690,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 629b162a4a977ce48b2866c5a3183ebc, type: 3} + m_Sprite: {fileID: 21300000, guid: 5defee1828ce8844b9ffdb6932b6df20, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -109849,7 +109741,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: 95, y: -48} + m_AnchoredPosition: {x: 139.2, y: 23.400002} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5274382153501374327 @@ -109883,15 +109775,14 @@ MonoBehaviour: m_text: 000% 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: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -109908,8 +109799,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -131526,7 +131417,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: -100, y: -48} + m_AnchoredPosition: {x: -77.5, y: 23.4} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8408753508603466675 @@ -131560,15 +131451,14 @@ MonoBehaviour: m_text: 000% 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: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -131585,8 +131475,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -134203,13 +134093,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: 4670998346386968437} m_Father: {fileID: 1212676743021907585} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 600, y: 350} + m_AnchoredPosition: {x: -7.91, y: 2} + m_SizeDelta: {x: 655.67, y: 359.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8360760892334200878 CanvasRenderer: @@ -134232,14 +134123,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.94117653, g: 0.91372555, b: 0.87843144, a: 1} + 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: b0873b8b172601d4ca0df501dca3afa8, type: 3} + m_Sprite: {fileID: 21300000, guid: 3bbbab643ca140045be647f9a704144e, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -158504,8 +158395,16 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1212676743021907585} + m_TransformParent: {fileID: 1012019937475190595} m_Modifications: + - target: {fileID: 2913569658229331, guid: 150bed98d110cb24292c78f18534decd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 79.3 + objectReference: {fileID: 0} + - target: {fileID: 2913569658229331, guid: 150bed98d110cb24292c78f18534decd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.8 + objectReference: {fileID: 0} - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Name @@ -158514,7 +158413,42 @@ PrefabInstance: - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_text - value: + value: 00 + objectReference: {fileID: 0} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_HorizontalAlignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.x + value: 37 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.y + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -21 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.3 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -158579,27 +158513,27 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1.4 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.y - value: -63 + value: 16.7 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -158616,6 +158550,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9168172215786797966, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -163310,12 +163249,12 @@ PrefabInstance: - target: {fileID: 9085924377172010863, guid: 30b9541a08ef32644ae522c99d90b5c2, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 165 objectReference: {fileID: 0} - target: {fileID: 9085924377172010863, guid: 30b9541a08ef32644ae522c99d90b5c2, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 165 objectReference: {fileID: 0} - target: {fileID: 9085924377172010863, guid: 30b9541a08ef32644ae522c99d90b5c2, type: 3} @@ -163355,12 +163294,12 @@ PrefabInstance: - target: {fileID: 9085924377172010863, guid: 30b9541a08ef32644ae522c99d90b5c2, type: 3} propertyPath: m_AnchoredPosition.x - value: -219 + value: -220 objectReference: {fileID: 0} - target: {fileID: 9085924377172010863, guid: 30b9541a08ef32644ae522c99d90b5c2, type: 3} propertyPath: m_AnchoredPosition.y - value: 92 + value: 44.5 objectReference: {fileID: 0} - target: {fileID: 9085924377172010863, guid: 30b9541a08ef32644ae522c99d90b5c2, type: 3} diff --git a/Assets/Script/UI/PC/Ability/PCAbilityLvUpUI.cs b/Assets/Script/UI/PC/Ability/PCAbilityLvUpUI.cs index abd4f5b6e..a85a30b3e 100644 --- a/Assets/Script/UI/PC/Ability/PCAbilityLvUpUI.cs +++ b/Assets/Script/UI/PC/Ability/PCAbilityLvUpUI.cs @@ -4,7 +4,7 @@ public class PCAbilityLvUpUI : BackKeyAdd { public MoneyForm m_MoneyForm; public PCAbilityCard m_abilityCard; - public TextMeshProUGUI[] texts; // 0 레벨, 1 이름. 2 설명, 3 지금값, 4 다음값 + public TextMeshProUGUI[] texts; // 0 null, 1 이름. 2 설명, 3 지금값, 4 다음값 AbilityConfigTableData m_Data; @@ -22,7 +22,7 @@ public class PCAbilityLvUpUI : BackKeyAdd m_abilityCard.Set(m_Data); var lv = sdata.Get_AbilityLv(m_Data.n_AbilityID); - texts[0].text = $"{lv}/{m_Data.n_MaxUpgradeLevel}"; + //texts[0].text = $"{lv}/{m_Data.n_MaxUpgradeLevel}"; texts[1].text = m_Data.Get_Name(); texts[2].text = m_Data.Get_Desc(); texts[3].text = MyText.Get_StatValueText(m_Data.e_OptionType, m_Data.Get_Value(lv));