From 3bac56766cd40adc3c07d06ddf4dd59466370a9e Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Thu, 27 Feb 2025 00:12:19 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=ED=8F=B0=ED=8A=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Gameton/Fonts/warm leaf cat Font.asset | 4 +- .../Prefabs/Common Button/RetryButton.prefab | 10 +- .../UI/Prefabs/UI.CharaterCreateUI.prefab | 190 ++++++++-- .../Resources/UI/Prefabs/UI.GameWinUI.prefab | 329 +++++++++++++----- .../Resources/UI/Prefabs/UI.LobbyUI.prefab | 255 ++++++++++++-- .../Resources/UI/Prefabs/UI.PauseUI.prefab | 94 ++++- .../Resources/UI/Prefabs/UI.TitleUI.prefab | 163 ++++++++- .../Assets/Gameton/Scripts/UI/GameWinUI.cs | 4 +- 8 files changed, 868 insertions(+), 181 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Fonts/warm leaf cat Font.asset b/Gameton-06/Assets/Gameton/Fonts/warm leaf cat Font.asset index c2da6153..7222de19 100644 --- a/Gameton-06/Assets/Gameton/Fonts/warm leaf cat Font.asset +++ b/Gameton-06/Assets/Gameton/Fonts/warm leaf cat Font.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d4807bce65fb97840aeaf741777a3f816ba1b684d031156586d893f24caaa3c -size 580700 +oid sha256:937763c47eb7da969c434bee25a5930e49084c362084d4879af8e5692542474d +size 622066 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Common Button/RetryButton.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Common Button/RetryButton.prefab index 2f2cf29b..54f5405b 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Common Button/RetryButton.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Common Button/RetryButton.prefab @@ -140,10 +140,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Retry + m_text: "\uB2E4\uC2DC\uD558\uAE30" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -455,8 +455,8 @@ MonoBehaviour: m_Calls: [] m_text: -1 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} - m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_fontAsset: {fileID: 0} + m_sharedMaterial: {fileID: 0} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterCreateUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterCreateUI.prefab index ec43a2eb..485c06f6 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterCreateUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterCreateUI.prefab @@ -760,6 +760,7 @@ RectTransform: m_Children: - {fileID: 2309384270892831383} - {fileID: 343473093874196633} + - {fileID: 8541677435525144708} - {fileID: 5026944312385753598} - {fileID: 628829308568776943} m_Father: {fileID: 898800120090628923} @@ -767,7 +768,7 @@ RectTransform: 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: 700, y: 400} + m_SizeDelta: {x: 700, y: 460} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1715392846877420704 CanvasRenderer: @@ -1089,7 +1090,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: 0} + m_AnchoredPosition: {x: 0, y: 15} m_SizeDelta: {x: 400, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5603856270549775250 @@ -1295,8 +1296,8 @@ MonoBehaviour: m_Calls: [] m_text: cancel m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1320,13 +1321,148 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 17 + m_fontStyle: 32 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + 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 &5577918587925631607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8541677435525144708} + - component: {fileID: 4244979283802085290} + - component: {fileID: 6220890634190874460} + m_Layer: 0 + m_Name: Name Condition + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8541677435525144708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5577918587925631607} + 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: 6450518831246390029} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -35} + m_SizeDelta: {x: -100, y: 50} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4244979283802085290 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5577918587925631607} + m_CullTransparentMesh: 1 +--- !u!114 &6220890634190874460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5577918587925631607} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uCE90\uB9AD\uD130 \uC774\uB984\uC740 12\uC790 \uC774\uB0B4 \uC601\uBB38\uC73C\uB85C\uB9CC + \uC0DD\uC131 \uAC00\uB2A5\uD569\uB2C8\uB2E4" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, 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: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -1504,8 +1640,8 @@ MonoBehaviour: m_Calls: [] m_text: create m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1529,8 +1665,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1713,8 +1849,8 @@ MonoBehaviour: m_Calls: [] m_text: ok m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1738,13 +1874,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 17 + m_fontStyle: 32 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -1814,7 +1950,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -80} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: -100, y: 50} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2182271564314626071 @@ -1845,10 +1981,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: create name + m_text: "\uCE90\uB9AD\uD130 \uC774\uB984" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1872,13 +2008,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 56 + m_fontSizeBase: 56 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 17 + m_fontStyle: 16 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -2330,8 +2466,8 @@ MonoBehaviour: m_Calls: [] m_text: create charater m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2355,8 +2491,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 72 + m_fontSizeBase: 72 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab index 8e10de18..1ec71686 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab @@ -349,81 +349,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1402180789370107876 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6255881810736996346} - - component: {fileID: 8814088337764190289} - - component: {fileID: 8130900813079944912} - m_Layer: 0 - m_Name: Experience Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6255881810736996346 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1402180789370107876} - 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: 8309246643985150052} - 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: -135} - m_SizeDelta: {x: 300, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8814088337764190289 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1402180789370107876} - m_CullTransparentMesh: 1 ---- !u!114 &8130900813079944912 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1402180789370107876} - 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.6650944, g: 1, b: 0.7040872, 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: 0} - 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 &1408594358780237178 GameObject: m_ObjectHideFlags: 0 @@ -557,7 +482,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -574,6 +499,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3532453868400819117 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3899781163382848786} + - component: {fileID: 9100508704596327748} + - component: {fileID: 359345890198639502} + m_Layer: 5 + m_Name: Ad count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3899781163382848786 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3532453868400819117} + 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: 3424995613435958743} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -0.000030517578, y: 1} + m_SizeDelta: {x: -80, y: 25} + m_Pivot: {x: 1, y: 0} +--- !u!222 &9100508704596327748 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3532453868400819117} + m_CullTransparentMesh: 1 +--- !u!114 &359345890198639502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3532453868400819117} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uAD11\uACE0 \uBCF4\uC0C1 (5/5)" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281545523 + m_fontColor: {r: 0.1981132, g: 0.1981132, b: 0.1981132, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + 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 &4183783038133039772 GameObject: m_ObjectHideFlags: 0 @@ -607,7 +666,6 @@ RectTransform: - {fileID: 8257674828839800248} - {fileID: 5658636051620795267} - {fileID: 3240000635064004838} - - {fileID: 6255881810736996346} - {fileID: 7654468693448300772} m_Father: {fileID: 1781236700806201943} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -682,8 +740,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4338466696590177047} - {fileID: 2652771142115649015} + - {fileID: 4338466696590177047} - {fileID: 5022449908586909277} m_Father: {fileID: 8309246643985150052} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -958,9 +1016,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -80, y: 50} - m_Pivot: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -0.000030517578, y: 0} + m_SizeDelta: {x: -80, y: 25} + m_Pivot: {x: 1, y: 1} --- !u!222 &8936891670283436626 CanvasRenderer: m_ObjectHideFlags: 0 @@ -989,9 +1047,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'double - - gold' + m_text: "\uACE8\uB4DC & \uACBD\uD5D8\uCE58 2\uBC30" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} @@ -1000,8 +1056,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4281545523 + m_fontColor: {r: 0.1981132, g: 0.1981132, b: 0.1981132, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1086,7 +1142,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_text - value: Home + value: "\uD648" + objectReference: {fileID: 0} + - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 objectReference: {fileID: 0} - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_Transition @@ -1238,6 +1306,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -100 objectReference: {fileID: 0} + - target: {fileID: 1194212059389526510, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 1194212059389526510, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} - target: {fileID: 1632260334339437034, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1254,6 +1330,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -100 objectReference: {fileID: 0} + - target: {fileID: 2014817396651137805, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 2014817396651137805, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 2439009261392671061, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 2439009261392671061, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 3126860217420620659, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 3126860217420620659, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} - target: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1342,6 +1442,22 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5402616116801220212, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 5402616116801220212, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 5607894149688796868, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 5607894149688796868, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} - target: {fileID: 6005301849909924835, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1358,6 +1474,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -100 objectReference: {fileID: 0} + - target: {fileID: 7681041094976077926, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 7681041094976077926, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1391,7 +1515,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchorMax.y @@ -1399,7 +1523,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchorMin.y @@ -1443,7 +1567,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchoredPosition.x - value: 100 + value: -400 objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchoredPosition.y @@ -1461,6 +1585,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4901173909646211372, guid: 0e07e566979a34647848af731786bffa, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 4901173909646211372, guid: 0e07e566979a34647848af731786bffa, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - target: {fileID: 6080823142196262866, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -1553,11 +1685,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145976964309320401, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 5435386149513972983, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_Pivot.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_Pivot.y @@ -1565,7 +1701,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchorMax.y @@ -1573,7 +1709,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchorMin.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchorMin.y @@ -1617,7 +1753,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchoredPosition.x - value: -300 + value: 200 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchoredPosition.y @@ -1641,6 +1777,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5145976964309320401, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} insertIndex: -1 addedObject: {fileID: 7380919440161512014} + - targetCorrespondingSourceObject: {fileID: 5145976964309320401, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + insertIndex: -1 + addedObject: {fileID: 3899781163382848786} - targetCorrespondingSourceObject: {fileID: 5145976964309320401, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} insertIndex: -1 addedObject: {fileID: 1210120942033475722} diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab index 84302599..fa35c3b6 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab @@ -91,6 +91,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7709300239384407793} + - component: {fileID: 8152809092320780520} + - component: {fileID: 7850172756058034615} m_Layer: 5 m_Name: Monster Icon m_TagString: Untagged @@ -114,9 +116,47 @@ 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: 100, y: 0} + m_AnchoredPosition: {x: 80, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0, y: 0.5} +--- !u!222 &8152809092320780520 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158235937129113790} + m_CullTransparentMesh: 1 +--- !u!114 &7850172756058034615 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158235937129113790} + 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: a01d7b02d73117f40984d969f8336d0b, 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 &178172248203438763 GameObject: m_ObjectHideFlags: 0 @@ -182,7 +222,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'clear time :' + m_text: "\uD074\uB9AC\uC5B4 \uD0C0\uC784" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} @@ -209,8 +249,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 42 - m_fontSizeBase: 42 + m_fontSize: 34 + m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -676,8 +716,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1448,11 +1488,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 2448940093655542050} 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_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 50} m_SizeDelta: {x: 530, y: 180} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &2139395093886418119 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1481,7 +1521,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e2afc659a6ca2fd489b53572802a9fff, type: 3} + m_Sprite: {fileID: 21300000, guid: 1d157953f95c80a4d9b66e08a2c4bbc2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1520,10 +1560,10 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: e2afc659a6ca2fd489b53572802a9fff, type: 3} - m_PressedSprite: {fileID: 21300000, guid: 9d26634aa9a787046bfe9cc554478b39, type: 3} - m_SelectedSprite: {fileID: 21300000, guid: e2afc659a6ca2fd489b53572802a9fff, type: 3} - m_DisabledSprite: {fileID: 21300000, guid: e2afc659a6ca2fd489b53572802a9fff, type: 3} + m_HighlightedSprite: {fileID: 21300000, guid: 1d157953f95c80a4d9b66e08a2c4bbc2, type: 3} + m_PressedSprite: {fileID: 21300000, guid: 8f105ebb81f87f94191f8b496e2103be, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: 1d157953f95c80a4d9b66e08a2c4bbc2, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 1d157953f95c80a4d9b66e08a2c4bbc2, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted @@ -1704,14 +1744,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7291998235483755997} - {fileID: 2139395093886417979} - {fileID: 5948703318863632628} m_Father: {fileID: 8856578722473345802} 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_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -150} - m_SizeDelta: {x: 530, y: 180} + m_SizeDelta: {x: 530, y: -300} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2872165708578147635 GameObject: @@ -1956,8 +1997,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -100, y: -50} - m_SizeDelta: {x: 660, y: -300} + m_AnchoredPosition: {x: -100, y: -30} + m_SizeDelta: {x: 660, y: -260} m_Pivot: {x: 1, y: 0.5} --- !u!1 &3204152513616998047 GameObject: @@ -2371,7 +2412,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'mm : ss' + m_text: "\uAE30\uB85D \uC5C6\uC74C" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} @@ -2833,7 +2874,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Record :' + m_text: "\uCD5C\uACE0 \uB3C4\uB2EC \uC6E8\uC774\uBE0C" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} @@ -2860,8 +2901,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 42 - m_fontSizeBase: 42 + m_fontSize: 34 + m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2902,6 +2943,138 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4546099448272573556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7291998235483755997} + - component: {fileID: 4052151719516962946} + - component: {fileID: 9189115689239451672} + - component: {fileID: 5793647505141328171} + m_Layer: 5 + m_Name: Ranking Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7291998235483755997 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4546099448272573556} + 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: 2448940093655542050} + 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: 150} + m_SizeDelta: {x: 530, y: 180} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4052151719516962946 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4546099448272573556} + m_CullTransparentMesh: 0 +--- !u!114 &9189115689239451672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4546099448272573556} + 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: 060b5f2a38fe2dc4e826ec7e0cf6f207, 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 &5793647505141328171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4546099448272573556} + 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: 2 + 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: 21300000, guid: 060b5f2a38fe2dc4e826ec7e0cf6f207, type: 3} + m_PressedSprite: {fileID: 21300000, guid: c9b68b7fe732b69469f8034f946dcee7, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: 060b5f2a38fe2dc4e826ec7e0cf6f207, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 060b5f2a38fe2dc4e826ec7e0cf6f207, type: 3} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 9189115689239451672} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1707601040220393083} + m_TargetAssemblyTypeName: TON.LobbyUI, Assembly-CSharp + m_MethodName: OnClickStagePlayButton + 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!1 &4995537144516970256 GameObject: m_ObjectHideFlags: 0 @@ -2915,7 +3088,7 @@ GameObject: - component: {fileID: 1252712799053612167} - component: {fileID: 4020183437506060859} m_Layer: 5 - m_Name: Rank Button + m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2968,7 +3141,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 060b5f2a38fe2dc4e826ec7e0cf6f207, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3007,10 +3180,10 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: 060b5f2a38fe2dc4e826ec7e0cf6f207, type: 3} - m_PressedSprite: {fileID: 21300000, guid: c9b68b7fe732b69469f8034f946dcee7, type: 3} - m_SelectedSprite: {fileID: 21300000, guid: 060b5f2a38fe2dc4e826ec7e0cf6f207, type: 3} - m_DisabledSprite: {fileID: 21300000, guid: 060b5f2a38fe2dc4e826ec7e0cf6f207, type: 3} + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted @@ -3132,8 +3305,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -100, y: 0} - m_SizeDelta: {x: 300, y: 150} + m_AnchoredPosition: {x: -70, y: 0} + m_SizeDelta: {x: 330, y: 150} m_Pivot: {x: 1, y: 0.5} --- !u!1 &5179214324631122276 GameObject: @@ -4803,7 +4976,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0 wave + m_text: "\uAE30\uB85D \uC5C6\uC74C" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} @@ -5714,6 +5887,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5497518096438283056} m_Modifications: + - target: {fileID: 162875682269977762, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 162875682269977762, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} - target: {fileID: 379111498896210418, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5918,6 +6099,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8352075515778809451, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 8352075515778809451, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab index f05b6ae0..e448359b 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab @@ -535,7 +535,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_text - value: Home + value: "\uD648" + objectReference: {fileID: 0} + - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 objectReference: {fileID: 0} - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_Transition @@ -747,6 +759,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4901173909646211372, guid: 0e07e566979a34647848af731786bffa, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 4901173909646211372, guid: 0e07e566979a34647848af731786bffa, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - target: {fileID: 6080823142196262866, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_Transition value: 2 @@ -809,6 +829,22 @@ PrefabInstance: propertyPath: m_Color.r value: 1 objectReference: {fileID: 0} + - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_text + value: "\uC774\uC5B4\uD558\uAE30" + objectReference: {fileID: 0} + - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_Transition value: 2 @@ -951,6 +987,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -100 objectReference: {fileID: 0} + - target: {fileID: 1194212059389526510, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 1194212059389526510, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} - target: {fileID: 1632260334339437034, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -967,6 +1011,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -100 objectReference: {fileID: 0} + - target: {fileID: 2014817396651137805, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 2014817396651137805, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 2439009261392671061, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 2439009261392671061, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 3126860217420620659, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 3126860217420620659, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} - target: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1055,6 +1123,22 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5402616116801220212, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 5402616116801220212, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 5607894149688796868, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 5607894149688796868, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} - target: {fileID: 6005301849909924835, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1071,6 +1155,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -100 objectReference: {fileID: 0} + - target: {fileID: 7681041094976077926, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 0} + - target: {fileID: 7681041094976077926, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab index 2fde0bba..6ca1fe66 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab @@ -258,8 +258,8 @@ MonoBehaviour: m_Calls: [] m_text: press to start! m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -283,8 +283,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -403,6 +403,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2066853826154585915} + - {fileID: 2289668262598961504} - {fileID: 360608318618800707} m_Father: {fileID: 7114312418154409345} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -539,7 +540,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: 0, y: -60} + m_AnchoredPosition: {x: 0, y: -90.999985} m_SizeDelta: {x: 420, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2325389175260783976 @@ -570,19 +571,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Play - -' + m_text: "\u2667 \uC774\uACE0\uBAA8\uC784 \u2667" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, 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} + rgba: 4294049277 + m_fontColor: {r: 0.9921569, g: 0.9921569, b: 0.9450981, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -599,13 +598,147 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 48 - m_fontSizeBase: 48 + m_fontSize: 72 + m_fontSizeBase: 72 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 0 m_fontSizeMax: 0 - m_fontStyle: 17 + m_fontStyle: 16 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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: 0 + 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 &8668483872243187384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2289668262598961504} + - component: {fileID: 5206885119222284771} + - component: {fileID: 1596289420843592200} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2289668262598961504 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8668483872243187384} + 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: 3757522227616513290} + 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: 0, y: -154} + m_SizeDelta: {x: 420, y: 100} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5206885119222284771 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8668483872243187384} + m_CullTransparentMesh: 1 +--- !u!114 &1596289420843592200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8668483872243187384} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC774\uAC70 \uACE0\uC591\uC774 \uBAA8\uD5D8\uC784" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, 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: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 0 + m_fontSizeMax: 0 + m_fontStyle: 16 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs index d6162244..b3e0eba3 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs @@ -14,11 +14,9 @@ namespace TON { rechargeModal.SetActive(false); - // 해당 UI 노출과 함께 게임 클리어 정보 저장장 + // 해당 UI 노출과 함께 게임 클리어 정보 저장 StageManager.Singleton.StageClear(); - // TODO: 획득한 아이템 리스트 출력 로직 구현 - // TODO: 획득한 아이템 정보 저장 로직 구현