From 798c0499e4c7d33af0f45dee91e9e973ca8e507e Mon Sep 17 00:00:00 2001 From: Jay <96156114+jaydev00a@users.noreply.github.com> Date: Thu, 27 Mar 2025 16:36:51 +0900 Subject: [PATCH 1/5] =?UTF-8?q?DO-71=20[Feat]=20=EA=B2=8C=EC=9E=84=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=EB=B0=94=20=EC=88=98=EC=A0=95=20=EC=A7=84?= =?UTF-8?q?=ED=96=89=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameUIController.cs | 5 + Assets/Resources/Prefabs/Buttons.meta | 8 + .../Prefabs/Buttons/Retry Button.prefab | 269 ++++++ .../Prefabs/Buttons/Retry Button.prefab.meta | 7 + .../Prefabs/Buttons/Settings Button.prefab | 269 ++++++ .../Buttons/Settings Button.prefab.meta | 7 + .../Prefabs/Panels/Confirm Panel.prefab | 2 + .../Prefabs/Panels/InGameMenu Panel.prefab | 410 +++++++++ .../Panels/InGameMenu Panel.prefab.meta | 7 + .../Prefabs/Panels/Main Panel.prefab | 2 +- .../Resources/Prefabs/[Canvas] Game UI.prefab | 806 ++++++------------ Assets/Script/Game/GameLogic.cs | 2 +- .../PanelController/ConfirmPanelController.cs | 11 +- .../InGameMenuPanelController.cs | 36 + .../InGameMenuPanelController.cs.meta | 3 + .../Script/UI/PanelController/PanelManager.cs | 4 +- Assets/Sprites/Game UI/btn_flag_icon.png | Bin 0 -> 509 bytes Assets/Sprites/Game UI/btn_flag_icon.png.meta | 140 +++ .../Sprites/Game UI/btn_flag_icon_ivory.png | Bin 0 -> 529 bytes .../Game UI/btn_flag_icon_ivory.png.meta | 140 +++ Assets/Sprites/Game UI/btn_menu_icon.png | Bin 0 -> 370 bytes Assets/Sprites/Game UI/btn_menu_icon.png.meta | 140 +++ .../Sprites/Game UI/btn_menu_icon_ivory.png | Bin 0 -> 359 bytes .../Game UI/btn_menu_icon_ivory.png.meta | 140 +++ 24 files changed, 1863 insertions(+), 545 deletions(-) create mode 100644 Assets/Resources/Prefabs/Buttons.meta create mode 100644 Assets/Resources/Prefabs/Buttons/Retry Button.prefab create mode 100644 Assets/Resources/Prefabs/Buttons/Retry Button.prefab.meta create mode 100644 Assets/Resources/Prefabs/Buttons/Settings Button.prefab create mode 100644 Assets/Resources/Prefabs/Buttons/Settings Button.prefab.meta create mode 100644 Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab create mode 100644 Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab.meta create mode 100644 Assets/Script/UI/PanelController/InGameMenuPanelController.cs create mode 100644 Assets/Script/UI/PanelController/InGameMenuPanelController.cs.meta create mode 100644 Assets/Sprites/Game UI/btn_flag_icon.png create mode 100644 Assets/Sprites/Game UI/btn_flag_icon.png.meta create mode 100644 Assets/Sprites/Game UI/btn_flag_icon_ivory.png create mode 100644 Assets/Sprites/Game UI/btn_flag_icon_ivory.png.meta create mode 100644 Assets/Sprites/Game UI/btn_menu_icon.png create mode 100644 Assets/Sprites/Game UI/btn_menu_icon.png.meta create mode 100644 Assets/Sprites/Game UI/btn_menu_icon_ivory.png create mode 100644 Assets/Sprites/Game UI/btn_menu_icon_ivory.png.meta diff --git a/Assets/GameUIController.cs b/Assets/GameUIController.cs index 14d15b5..8a6d9b4 100644 --- a/Assets/GameUIController.cs +++ b/Assets/GameUIController.cs @@ -50,6 +50,11 @@ public class GameUIController : MonoBehaviour { GameManager.Instance.panelManager.OpenSettingsPanel(); } + + public void OnClickInGameMenuButton() + { + + } public void InitPlayersName(string playerNameA, string playerNameB) { diff --git a/Assets/Resources/Prefabs/Buttons.meta b/Assets/Resources/Prefabs/Buttons.meta new file mode 100644 index 0000000..689ca37 --- /dev/null +++ b/Assets/Resources/Prefabs/Buttons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b30cea017226f8c4493a302e79accc29 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Buttons/Retry Button.prefab b/Assets/Resources/Prefabs/Buttons/Retry Button.prefab new file mode 100644 index 0000000..dfa64cf --- /dev/null +++ b/Assets/Resources/Prefabs/Buttons/Retry Button.prefab @@ -0,0 +1,269 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6560434313800255636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 153226334152111087} + - component: {fileID: 5329691585149847957} + - component: {fileID: 8505210552585530719} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &153226334152111087 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6560434313800255636} + 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: 9138383247913991802} + 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: 9.0771} + m_SizeDelta: {x: 0, y: -18.1542} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5329691585149847957 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6560434313800255636} + m_CullTransparentMesh: 1 +--- !u!114 &8505210552585530719 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6560434313800255636} + 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: "\uC7AC\uB300\uACB0" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284115536 + m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, 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: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 0 + m_fontSizeMax: 0 + m_fontStyle: 1 + 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 &6925205169732826551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9138383247913991802} + - component: {fileID: 7071660965640871429} + - component: {fileID: 8260199571383250091} + - component: {fileID: 6714588036628504957} + m_Layer: 5 + m_Name: Retry Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9138383247913991802 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6925205169732826551} + 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: 153226334152111087} + 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: 50, y: -85} + m_SizeDelta: {x: 238, y: 150} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7071660965640871429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6925205169732826551} + m_CullTransparentMesh: 1 +--- !u!114 &8260199571383250091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6925205169732826551} + 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: 0.9607844, b: 0.8980393, 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: 05a670e614d7817429ee256ceb7efbe6, 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!114 &6714588036628504957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6925205169732826551} + 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: 1cc2af2fc6476554ca42fb2ddfd7727f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: 1cc2af2fc6476554ca42fb2ddfd7727f, type: 3} + 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: 8260199571383250091} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp + m_MethodName: OnClickRetryButton + 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 diff --git a/Assets/Resources/Prefabs/Buttons/Retry Button.prefab.meta b/Assets/Resources/Prefabs/Buttons/Retry Button.prefab.meta new file mode 100644 index 0000000..5647d74 --- /dev/null +++ b/Assets/Resources/Prefabs/Buttons/Retry Button.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Buttons/Settings Button.prefab b/Assets/Resources/Prefabs/Buttons/Settings Button.prefab new file mode 100644 index 0000000..049e7c4 --- /dev/null +++ b/Assets/Resources/Prefabs/Buttons/Settings Button.prefab @@ -0,0 +1,269 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1017925472007951542 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1758234066306536471} + - component: {fileID: 8448676630151860563} + - component: {fileID: 6637108854755649065} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1758234066306536471 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1017925472007951542} + 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: 707007925660630557} + 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: 9.0771} + m_SizeDelta: {x: 0, y: -18.1542} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8448676630151860563 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1017925472007951542} + m_CullTransparentMesh: 1 +--- !u!114 &6637108854755649065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1017925472007951542} + 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: "\uC124\uC815" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284115536 + m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, 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: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 0 + m_fontSizeMax: 0 + m_fontStyle: 1 + 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 &2580380060709780196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 707007925660630557} + - component: {fileID: 2141397101800570654} + - component: {fileID: 5959699091755543141} + - component: {fileID: 395529687980811166} + m_Layer: 5 + m_Name: Settings Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &707007925660630557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2580380060709780196} + 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: 1758234066306536471} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -50, y: -85} + m_SizeDelta: {x: 238, y: 150} + m_Pivot: {x: 1, y: 1} +--- !u!222 &2141397101800570654 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2580380060709780196} + m_CullTransparentMesh: 1 +--- !u!114 &5959699091755543141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2580380060709780196} + 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: 0.9607844, b: 0.8980393, 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: 05a670e614d7817429ee256ceb7efbe6, 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!114 &395529687980811166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2580380060709780196} + 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: 1cc2af2fc6476554ca42fb2ddfd7727f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: 1cc2af2fc6476554ca42fb2ddfd7727f, type: 3} + 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: 5959699091755543141} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp + m_MethodName: OnClickSettingsButton + 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 diff --git a/Assets/Resources/Prefabs/Buttons/Settings Button.prefab.meta b/Assets/Resources/Prefabs/Buttons/Settings Button.prefab.meta new file mode 100644 index 0000000..3c3037c --- /dev/null +++ b/Assets/Resources/Prefabs/Buttons/Settings Button.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 68c08f4284cbef249b634faff8e01ea8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Panels/Confirm Panel.prefab b/Assets/Resources/Prefabs/Panels/Confirm Panel.prefab index 80dddf3..059cbc4 100644 --- a/Assets/Resources/Prefabs/Panels/Confirm Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Confirm Panel.prefab @@ -505,6 +505,8 @@ MonoBehaviour: m_EditorClassIdentifier: panelRectTransform: {fileID: 1049729465715420315} messageText: {fileID: 773857893073654059} + closeButton: {fileID: 2317228258542092256} + confirmButton: {fileID: 8913073875457554875} --- !u!1 &8611399693750823341 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab b/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab new file mode 100644 index 0000000..52ddf6c --- /dev/null +++ b/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab @@ -0,0 +1,410 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2861881646994438329 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5967533988914735385} + - component: {fileID: 3922600747553100572} + - component: {fileID: 906477026599934311} + - component: {fileID: 5055505184920221060} + - component: {fileID: 7505759082282251323} + m_Layer: 5 + m_Name: InGameMenu Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5967533988914735385 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2861881646994438329} + 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: 3566405136616423668} + m_Father: {fileID: 0} + 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_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3922600747553100572 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2861881646994438329} + m_CullTransparentMesh: 1 +--- !u!114 &906477026599934311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2861881646994438329} + 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, g: 0, b: 0, a: 0.74509805} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + 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!225 &5055505184920221060 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2861881646994438329} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &7505759082282251323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2861881646994438329} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9342b6e913a468b888781e0c310c4c2, type: 3} + m_Name: + m_EditorClassIdentifier: + panelRectTransform: {fileID: 5967533988914735385} + drawRegisterButton: {fileID: 4952176830370869590} + settingsButton: {fileID: 2502852987797543892} +--- !u!1 &5179388986428920634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3566405136616423668} + - component: {fileID: 4400056270586266630} + - component: {fileID: 6552332180742637038} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3566405136616423668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5179388986428920634} + 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: 6516955889540823707} + - {fileID: 629230163892821805} + m_Father: {fileID: 5967533988914735385} + 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: 481.957, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4400056270586266630 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5179388986428920634} + m_CullTransparentMesh: 1 +--- !u!114 &6552332180742637038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5179388986428920634} + 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: e89f6694961e7574b98368e14934a8b1, 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!1001 &104904913203093808 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3566405136616423668} + m_Modifications: + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_SizeDelta.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_AnchoredPosition.y + value: -70 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2580380060709780196, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_Name + value: Settings Button + objectReference: {fileID: 0} + - target: {fileID: 5959699091755543141, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} +--- !u!224 &629230163892821805 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + m_PrefabInstance: {fileID: 104904913203093808} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2502852987797543892 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2580380060709780196, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + m_PrefabInstance: {fileID: 104904913203093808} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2639936214344615137 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3566405136616423668} + m_Modifications: + - target: {fileID: 6925205169732826551, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_Name + value: Draw Register Button + objectReference: {fileID: 0} + - target: {fileID: 8260199571383250091, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8505210552585530719, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_text + value: "\uBB34\uC2B9\uBD80 \uC2E0\uCCAD" + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_SizeDelta.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} +--- !u!1 &4952176830370869590 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6925205169732826551, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + m_PrefabInstance: {fileID: 2639936214344615137} + m_PrefabAsset: {fileID: 0} +--- !u!224 &6516955889540823707 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9138383247913991802, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + m_PrefabInstance: {fileID: 2639936214344615137} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab.meta b/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab.meta new file mode 100644 index 0000000..dc72716 --- /dev/null +++ b/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9eeead2104b83ab41a44c780974275ca +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Panels/Main Panel.prefab b/Assets/Resources/Prefabs/Panels/Main Panel.prefab index ca0fdef..062589c 100644 --- a/Assets/Resources/Prefabs/Panels/Main Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Main Panel.prefab @@ -1713,7 +1713,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uD654\uB791\uB098\uBE44" + m_text: "\uBC15\uD638\uB7AD" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} diff --git a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab index 1be1e23..337bf21 100644 --- a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab +++ b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab @@ -18,7 +18,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4020956126151567600 RectTransform: m_ObjectHideFlags: 0 @@ -273,273 +273,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 40} m_SizeDelta: {x: -100, y: 300} m_Pivot: {x: 0.5, y: 0} ---- !u!1 &1394508498073163753 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5364152893080087698} - - component: {fileID: 119288675057915624} - - component: {fileID: 4492764797652218402} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5364152893080087698 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1394508498073163753} - 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: 3928015243027423495} - 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: 9.0771} - m_SizeDelta: {x: 0, y: -18.1542} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &119288675057915624 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1394508498073163753} - m_CullTransparentMesh: 1 ---- !u!114 &4492764797652218402 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1394508498073163753} - 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: "\uC7AC\uB300\uACB0" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} - m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4284115536 - m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, 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: 45 - m_fontSizeBase: 45 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 0 - m_fontSizeMax: 0 - m_fontStyle: 1 - 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 &1812579611192138725 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3685916492953640732} - - component: {fileID: 2837002930647588383} - - component: {fileID: 7520396528988244836} - - component: {fileID: 4581847833490342559} - m_Layer: 5 - m_Name: Settings Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3685916492953640732 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1812579611192138725} - 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: 2490009981694473494} - m_Father: {fileID: 4044003808430543235} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -50, y: -85} - m_SizeDelta: {x: 238, y: 150} - m_Pivot: {x: 1, y: 1} ---- !u!222 &2837002930647588383 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1812579611192138725} - m_CullTransparentMesh: 1 ---- !u!114 &7520396528988244836 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1812579611192138725} - 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: 0.9607844, b: 0.8980393, 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: 05a670e614d7817429ee256ceb7efbe6, 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!114 &4581847833490342559 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1812579611192138725} - 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: 1cc2af2fc6476554ca42fb2ddfd7727f, type: 3} - m_PressedSprite: {fileID: 21300000, guid: 1cc2af2fc6476554ca42fb2ddfd7727f, type: 3} - 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: 7520396528988244836} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3933575647777291622} - m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp - m_MethodName: OnClickSettingsButton - 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 &2180157736785062510 GameObject: m_ObjectHideFlags: 0 @@ -571,9 +304,9 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4020956126151567600} - - {fileID: 3928015243027423495} - - {fileID: 3685916492953640732} - {fileID: 5290633878409985} + - {fileID: 6017735879343076712} + - {fileID: 8624964855925532225} m_Father: {fileID: 2843270827267453358} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -771,139 +504,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2903228850155334346 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3928015243027423495} - - component: {fileID: 3058652260737614200} - - component: {fileID: 4247753812167816150} - - component: {fileID: 1548693011522092544} - m_Layer: 5 - m_Name: Retry Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &3928015243027423495 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2903228850155334346} - 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: 5364152893080087698} - m_Father: {fileID: 4044003808430543235} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -85} - m_SizeDelta: {x: 238, y: 150} - m_Pivot: {x: 0, y: 1} ---- !u!222 &3058652260737614200 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2903228850155334346} - m_CullTransparentMesh: 1 ---- !u!114 &4247753812167816150 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2903228850155334346} - 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: 0.9607844, b: 0.8980393, 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: 05a670e614d7817429ee256ceb7efbe6, 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!114 &1548693011522092544 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2903228850155334346} - 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: 1cc2af2fc6476554ca42fb2ddfd7727f, type: 3} - m_PressedSprite: {fileID: 21300000, guid: 1cc2af2fc6476554ca42fb2ddfd7727f, type: 3} - 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: 4247753812167816150} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3933575647777291622} - m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp - m_MethodName: OnClickRetryButton - 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 &2964396940857713075 GameObject: m_ObjectHideFlags: 0 @@ -1248,140 +848,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3803482992194188727 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2490009981694473494} - - component: {fileID: 5753191097148567634} - - component: {fileID: 7418401814114797352} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2490009981694473494 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3803482992194188727} - 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: 3685916492953640732} - 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: 9.0771} - m_SizeDelta: {x: 0, y: -18.1542} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5753191097148567634 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3803482992194188727} - m_CullTransparentMesh: 1 ---- !u!114 &7418401814114797352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3803482992194188727} - 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: "\uC124\uC815" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} - m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4284115536 - m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, 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: 45 - m_fontSizeBase: 45 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 0 - m_fontSizeMax: 0 - m_fontStyle: 1 - 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 &3856590192762510114 GameObject: m_ObjectHideFlags: 0 @@ -2200,6 +1666,138 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7907733484671223743 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6017735879343076712} + - component: {fileID: 2463258542306401490} + - component: {fileID: 3243487618435541168} + - component: {fileID: 4236101196502357023} + m_Layer: 5 + m_Name: Menu Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6017735879343076712 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7907733484671223743} + 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: 4044003808430543235} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -80} + m_SizeDelta: {x: 62, y: 47} + m_Pivot: {x: 0, y: 1} +--- !u!222 &2463258542306401490 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7907733484671223743} + m_CullTransparentMesh: 1 +--- !u!114 &3243487618435541168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7907733484671223743} + 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: a94fd8eec74e5b04e8f0729784f7e9f5, 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 &4236101196502357023 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7907733484671223743} + 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: 1, g: 0.9607843, b: 0.8980392, 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: 21300000, guid: 4d9e5ee4cd86c5544995d2c1124cdc3c, type: 3} + 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: 3243487618435541168} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3933575647777291622} + m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp + m_MethodName: OnClickInGameMenuButton + 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 &8214827650714712775 GameObject: m_ObjectHideFlags: 0 @@ -2276,6 +1874,138 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8300296172192540436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8624964855925532225} + - component: {fileID: 1366668917766278638} + - component: {fileID: 3345593635525238093} + - component: {fileID: 4108851991140319342} + m_Layer: 5 + m_Name: Surrender Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8624964855925532225 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8300296172192540436} + 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: 4044003808430543235} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -50, y: -75} + m_SizeDelta: {x: 72, y: 72} + m_Pivot: {x: 1, y: 1} +--- !u!222 &1366668917766278638 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8300296172192540436} + m_CullTransparentMesh: 1 +--- !u!114 &3345593635525238093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8300296172192540436} + 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: 3daae32bf9c5b2c4481056acc22d40b7, 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 &4108851991140319342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8300296172192540436} + 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: 1, g: 0.9607843, b: 0.8980392, 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: 21300000, guid: 2d99eae899d7a8d46b0ccf61a66303d7, type: 3} + 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: 3345593635525238093} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3933575647777291622} + m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp + m_MethodName: OnClickSurrenderButton + 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 &8399016609069797928 GameObject: m_ObjectHideFlags: 0 @@ -2367,7 +2097,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 35a536dce57360441898a57e5d5a1335, type: 3} m_Name: m_EditorClassIdentifier: - retryButton: {fileID: 2903228850155334346} + retryButton: {fileID: 0} playerANameText: {fileID: 4888719462249568075} playerBNameText: {fileID: 5649645114775233136} indicatorA: {fileID: 822440635660578859} diff --git a/Assets/Script/Game/GameLogic.cs b/Assets/Script/Game/GameLogic.cs index 61f7e79..d83bc18 100644 --- a/Assets/Script/Game/GameLogic.cs +++ b/Assets/Script/Game/GameLogic.cs @@ -295,7 +295,7 @@ public class GameLogic : MonoBehaviour { // TODO: 컨펌 패널 OK 버튼 삭제? GameManager.Instance.panelManager.OpenConfirmPanel("상대방의 응답을 기다리는 중입니다", - () => { } ); + () => { }, false, false ); } }; } diff --git a/Assets/Script/UI/PanelController/ConfirmPanelController.cs b/Assets/Script/UI/PanelController/ConfirmPanelController.cs index cff44a7..3119812 100644 --- a/Assets/Script/UI/PanelController/ConfirmPanelController.cs +++ b/Assets/Script/UI/PanelController/ConfirmPanelController.cs @@ -2,18 +2,23 @@ using System.Collections; using System.Collections.Generic; using TMPro; using UnityEngine; +using UnityEngine.UI; public class ConfirmPanelController : PanelController { [SerializeField] private TMP_Text messageText; //자식 텍스트 변수 - + [SerializeField] private GameObject closeButton; // X 버튼 + [SerializeField] private GameObject confirmButton; + public delegate void OnConfirmButtonClick(); private OnConfirmButtonClick onConfirmButtonClick; - - public void Show(string message, OnConfirmButtonClick onConfirmButtonClick) + + public void Show(string message, OnConfirmButtonClick onConfirmButtonClick, bool isClose, bool isConfirm) { messageText.text = message; this.onConfirmButtonClick = onConfirmButtonClick; + closeButton.SetActive(isClose); + confirmButton.SetActive(isConfirm); base.Show(); } diff --git a/Assets/Script/UI/PanelController/InGameMenuPanelController.cs b/Assets/Script/UI/PanelController/InGameMenuPanelController.cs new file mode 100644 index 0000000..1e50789 --- /dev/null +++ b/Assets/Script/UI/PanelController/InGameMenuPanelController.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class InGameMenuPanelController : PanelController +{ + [SerializeField] private GameObject drawRegisterButton; // 무승부 요청 + [SerializeField] private GameObject settingsButton; // 설정 버튼 + + public delegate void OnInGameMenuButtonClick(); + private OnInGameMenuButtonClick onInGameMenuButtonClick; + + public void Show(OnInGameMenuButtonClick onInGameMenuButtonClick) + { + this.onInGameMenuButtonClick = onInGameMenuButtonClick; + base.Show(); + } + + /// + /// Confirm 버튼 클릭시 호출되는 함수 + /// + public void OnClickConfirmButton() + { + Hide(() => onInGameMenuButtonClick?.Invoke()); + } + + /// + /// X 버튼 클릭시 호출되는 함수 + /// + public void OnClickCloseButton() + { + Hide(); + } +} \ No newline at end of file diff --git a/Assets/Script/UI/PanelController/InGameMenuPanelController.cs.meta b/Assets/Script/UI/PanelController/InGameMenuPanelController.cs.meta new file mode 100644 index 0000000..0efcc1d --- /dev/null +++ b/Assets/Script/UI/PanelController/InGameMenuPanelController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f9342b6e913a468b888781e0c310c4c2 +timeCreated: 1743056144 \ No newline at end of file diff --git a/Assets/Script/UI/PanelController/PanelManager.cs b/Assets/Script/UI/PanelController/PanelManager.cs index 6aada1c..7a6dc15 100644 --- a/Assets/Script/UI/PanelController/PanelManager.cs +++ b/Assets/Script/UI/PanelController/PanelManager.cs @@ -177,13 +177,13 @@ public class PanelManager : MonoBehaviour var signupPanelObject = GetPanel("Signup Panel"); } } - public void OpenConfirmPanel(string message, ConfirmPanelController.OnConfirmButtonClick onConfirmButtonClick) + public void OpenConfirmPanel(string message, ConfirmPanelController.OnConfirmButtonClick onConfirmButtonClick, bool isClose = false, bool isConfirm = true) { if (_canvas != null) { var confirmPanelObject = GetPanel("Confirm Panel"); confirmPanelObject.GetComponent() - .Show(message, onConfirmButtonClick); + .Show(message, onConfirmButtonClick, isClose, isConfirm); } } diff --git a/Assets/Sprites/Game UI/btn_flag_icon.png b/Assets/Sprites/Game UI/btn_flag_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b0d91d8a90f0526928ae01620235d4a17b9ca027 GIT binary patch literal 509 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAifV{wqX6XVU3I`u#fXMsm#F#`j) zFbFd;%$g$s6!Z@832_C|CQg>N{w|K8o}LLo0a;N#sbOw0{w|R|);>-a?sm@MUN(Nt z&f(tnLGGq5*4EyRKxOuUZVtijX0A5Q5#CnbjzAKq_|C(9AArV5mIV0)Gq|36_WS?8 zZ}0E+eLMQ~cKnt<_dk|@e*E#)aHmTNg(j0{^opYbp98|PZvii=a5U=%vnd9Ek-S>G@&j>Pcs84ST-JtPi;g87E z%t~2ly$f2j)&gw7HiXfdESgSc1SGWvGa`IYeAmudaveh z0xNiQZ&yD3`tQ!%=8Rn#iK;)Baz&l9ZCo}bK$G|GCa2F=qa1!^-gMlw)qf$^9ED43 zY#+bx6+9N5xQA6m#EC<(MZk&UFLTN)MSF*YIY1&v(|C!lONitpMx|3cE8BC7mPl3Vvl&RQG)-E8dP>4ka|?D svv~eaYnQU?u1jvF8@B&>^?iYO_@+~y`i9G{0)v&o)78&qol`;+0AYd6zyJUM literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Game UI/btn_flag_icon.png.meta b/Assets/Sprites/Game UI/btn_flag_icon.png.meta new file mode 100644 index 0000000..9d20c15 --- /dev/null +++ b/Assets/Sprites/Game UI/btn_flag_icon.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 3daae32bf9c5b2c4481056acc22d40b7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Game UI/btn_flag_icon_ivory.png b/Assets/Sprites/Game UI/btn_flag_icon_ivory.png new file mode 100644 index 0000000000000000000000000000000000000000..9a1bbe26dd49916cd71152f8211be9b893d27ffa GIT binary patch literal 529 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAifV{wqX6XVU3I`u#fXMsm#F#`j) zFbFd;%$g$s6bujW32_C||Gz%PiY}en2NZvF>kN?m`}y&+yXWD`KEJyC{@L{}uWsME zcmyc;?#Z=d`!@ah@Zj5WomF;gSAUNCtx*=& zJ|QV1B2Rqx@1p3r%H~EB&a>vx{ z^WD#nN$P)_TgSU1m_^V!7p3;%?ywm%GwML=SqP?|?{j-49frj literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Game UI/btn_flag_icon_ivory.png.meta b/Assets/Sprites/Game UI/btn_flag_icon_ivory.png.meta new file mode 100644 index 0000000..b9d5cc3 --- /dev/null +++ b/Assets/Sprites/Game UI/btn_flag_icon_ivory.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 2d99eae899d7a8d46b0ccf61a66303d7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Game UI/btn_menu_icon.png b/Assets/Sprites/Game UI/btn_menu_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2374d54a822767ce5f87ab0f998ca57671713c17 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^c0jDp!3HFEdskKgDb50q$YKTtZeb8+WSBKa0w~B> z9OUlAu{RN#r_3l~flI{I<7Qj6Id&Z4CPKbviZj~ad1_||o%V6n{i-K+jpRP$Yx zUh;jud4JN!r&;MQ7j;4`xbZIf6r;Vi#e;Ny_CEIJ)OVoKuy1`&g&tDnm{ Hr-UW|>&la- literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Game UI/btn_menu_icon.png.meta b/Assets/Sprites/Game UI/btn_menu_icon.png.meta new file mode 100644 index 0000000..b85ca5b --- /dev/null +++ b/Assets/Sprites/Game UI/btn_menu_icon.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: a94fd8eec74e5b04e8f0729784f7e9f5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Game UI/btn_menu_icon_ivory.png b/Assets/Sprites/Game UI/btn_menu_icon_ivory.png new file mode 100644 index 0000000000000000000000000000000000000000..c9598c6342dc32c9f81bb35ec59050fedca59050 GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^c0jDp!3HFEdskKgDb50q$YKTtZeb8+WSBKa0w~B> z9OUlAudBs!Nz&FjzG(+q+wQP-gjLpnZP@!`nUQH(mR7cGg7?W2r+o z^Dcg0{JNYw_4Waa2baD3x6KV#*xj+zzyF)mQ}^6zk$n~kCXXj-rAnO zbL`(GN0noN{|cQQPF}8Q$>5pXvg@7V^IDP0cV(O2FI%-fJb%Y#{w0T2SG^7WTl42} zv9;d!3c5?vK{Rtot*#>%^b#P0KwuVTmX(92h)Z{an^LB{Ts5U Date: Thu, 27 Mar 2025 17:42:09 +0900 Subject: [PATCH 2/5] =?UTF-8?q?DO-71=20[Feat]=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=EA=B9=8C=EC=A7=80=EB=A7=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameUIController.cs | 2 +- .../UI/PanelController/InGameMenuPanelController.cs | 5 +++++ Assets/Script/UI/PanelController/PanelManager.cs | 9 ++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Assets/GameUIController.cs b/Assets/GameUIController.cs index 8a6d9b4..a95558a 100644 --- a/Assets/GameUIController.cs +++ b/Assets/GameUIController.cs @@ -53,7 +53,7 @@ public class GameUIController : MonoBehaviour public void OnClickInGameMenuButton() { - + GameManager.Instance.panelManager.OpenInGameMenuPanel(); } public void InitPlayersName(string playerNameA, string playerNameB) diff --git a/Assets/Script/UI/PanelController/InGameMenuPanelController.cs b/Assets/Script/UI/PanelController/InGameMenuPanelController.cs index 1e50789..b62de20 100644 --- a/Assets/Script/UI/PanelController/InGameMenuPanelController.cs +++ b/Assets/Script/UI/PanelController/InGameMenuPanelController.cs @@ -17,6 +17,11 @@ public class InGameMenuPanelController : PanelController this.onInGameMenuButtonClick = onInGameMenuButtonClick; base.Show(); } + + public void OnClickDrawRegisterButton() + { + // GameManager.Instance.lManager. + } /// /// Confirm 버튼 클릭시 호출되는 함수 diff --git a/Assets/Script/UI/PanelController/PanelManager.cs b/Assets/Script/UI/PanelController/PanelManager.cs index 7a6dc15..7525b99 100644 --- a/Assets/Script/UI/PanelController/PanelManager.cs +++ b/Assets/Script/UI/PanelController/PanelManager.cs @@ -308,5 +308,12 @@ public class PanelManager : MonoBehaviour })); } - + public void OpenInGameMenuPanel() + { + if (_canvas != null) + { + var replayPanelObject = GetPanel("InGameMenu Panel"); + replayPanelObject.GetComponent().Show(); + } + } } From 0fb7747a0e83117e860980e00e6846a610d9bcbb Mon Sep 17 00:00:00 2001 From: Jay <96156114+jaydev00a@users.noreply.github.com> Date: Fri, 28 Mar 2025 15:40:16 +0900 Subject: [PATCH 3/5] =?UTF-8?q?DO-71=20[Feat]=20=ED=94=84=EB=A6=AC?= =?UTF-8?q?=ED=8C=B9=20=EA=B3=B5=ED=86=B5=20=EC=88=98=EC=A0=95=20=EB=93=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameUIController.cs | 4 +- .../ScrollItem/ReplayScrollItem.prefab | 14 +- .../ScrollItem/ShopScrollItem.prefab | 14 +- .../KJM/ShopTest/MainPanelButtonController.cs | 6 +- .../Prefabs/Buttons/Close Button.prefab | 134 ++++++ .../Prefabs/Buttons/Close Button.prefab.meta | 7 + .../PanelItem/Five Rating Points.prefab | 39 +- .../PanelItem/Ten Rating Points.prefab | 59 +-- .../PanelItem/Three Rating Points.prefab | 19 +- .../Prefabs/Panels/Coins Panel.prefab | 2 +- .../Prefabs/Panels/Confirm Panel.prefab | 34 +- .../Prefabs/Panels/Draw Confirm Panel.prefab | 28 +- .../Prefabs/Panels/LeaderboardPanel.prefab | 10 +- .../Prefabs/Panels/Loading Panel.prefab | 2 +- .../Prefabs/Panels/Main Panel.prefab | 6 +- .../Prefabs/Panels/Rating Panel.prefab | 434 +++++++++--------- .../Prefabs/Panels/Replay Panel.prefab | 10 +- .../Prefabs/Panels/Setting Panel.prefab | 22 +- .../Prefabs/Panels/Shop Panel.prefab | 12 +- Assets/Resources/Prefabs/Ranking.prefab | 268 ++--------- Assets/Resources/Prefabs/Utility/Timer.prefab | 26 +- Assets/Script/Common/ScrollItem/ShopItem.cs | 2 +- Assets/Script/Main/MainPanelController.cs | 6 +- Assets/Script/Replay/ReplayCell.cs | 4 +- .../ShopItemController.cs | 6 +- .../PanelChildController/SwitchController.cs | 39 +- .../Script/UI/PanelController/PanelManager.cs | 6 +- Assets/Sprites/Panel UI/btn_close-shadow.png | Bin 0 -> 2790 bytes .../btn_close-shadow.png.meta} | 2 +- Assets/Sprites/Panel UI/btn_close.png | Bin 0 -> 1673 bytes .../btn_close.png.meta} | 4 +- Assets/Sprites/Panel UI/rating_score.png | Bin 0 -> 6462 bytes Assets/Sprites/Panel UI/rating_score.png.meta | 140 ++++++ .../Sprites/Panel UI/rating_score_for_ten.png | Bin 0 -> 6110 bytes .../Panel UI/rating_score_for_ten.png.meta | 140 ++++++ Assets/Sprites/omok-board_15x15_lightpink.png | Bin 74836 -> 0 bytes Assets/Sprites/x-marker.png | Bin 2782 -> 0 bytes 37 files changed, 857 insertions(+), 642 deletions(-) create mode 100644 Assets/Resources/Prefabs/Buttons/Close Button.prefab create mode 100644 Assets/Resources/Prefabs/Buttons/Close Button.prefab.meta create mode 100644 Assets/Sprites/Panel UI/btn_close-shadow.png rename Assets/Sprites/{omok-board_15x15_lightpink.png.meta => Panel UI/btn_close-shadow.png.meta} (98%) create mode 100644 Assets/Sprites/Panel UI/btn_close.png rename Assets/Sprites/{x-marker.png.meta => Panel UI/btn_close.png.meta} (98%) create mode 100644 Assets/Sprites/Panel UI/rating_score.png create mode 100644 Assets/Sprites/Panel UI/rating_score.png.meta create mode 100644 Assets/Sprites/Panel UI/rating_score_for_ten.png create mode 100644 Assets/Sprites/Panel UI/rating_score_for_ten.png.meta delete mode 100644 Assets/Sprites/omok-board_15x15_lightpink.png delete mode 100644 Assets/Sprites/x-marker.png diff --git a/Assets/GameUIController.cs b/Assets/GameUIController.cs index 17e0aac..f97ccd2 100644 --- a/Assets/GameUIController.cs +++ b/Assets/GameUIController.cs @@ -43,7 +43,7 @@ public class GameUIController : MonoBehaviour GameManager.Instance.panelManager.OpenConfirmPanel("항복 하시겠습니까?", () => { _multiplayManager.RequestSurrender(); - }); + }, true); } public void OnClickDrawRequestButton() @@ -53,7 +53,7 @@ public class GameUIController : MonoBehaviour GameManager.Instance.panelManager.OpenConfirmPanel("무승부 신청을 하시겠습니까?", () => { _multiplayManager.RequestDraw(); - }); + }, true); GameManager.Instance.SetRequestDrawChanceFalse(); } else diff --git a/Assets/KJM/KJMprefabs/ScrollItem/ReplayScrollItem.prefab b/Assets/KJM/KJMprefabs/ScrollItem/ReplayScrollItem.prefab index e4b3b83..ebaae14 100644 --- a/Assets/KJM/KJMprefabs/ScrollItem/ReplayScrollItem.prefab +++ b/Assets/KJM/KJMprefabs/ScrollItem/ReplayScrollItem.prefab @@ -34,7 +34,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: 182.52, y: 0} + m_AnchoredPosition: {x: 182.52, y: 5} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7439836758164359359 @@ -74,8 +74,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4282076928 - m_fontColor: {r: 0, g: 0.31132078, b: 0.23010668, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -243,7 +243,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: -30.4, y: 0} + m_AnchoredPosition: {x: -30.4, y: 5} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8644449565768019552 @@ -283,8 +283,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4282076928 - m_fontColor: {r: 0, g: 0.31132078, b: 0.23010668, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -529,7 +529,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: -205, y: 0} + m_AnchoredPosition: {x: -205, y: 5} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5549477541863909970 diff --git a/Assets/KJM/KJMprefabs/ScrollItem/ShopScrollItem.prefab b/Assets/KJM/KJMprefabs/ScrollItem/ShopScrollItem.prefab index 7768394..0daac63 100644 --- a/Assets/KJM/KJMprefabs/ScrollItem/ShopScrollItem.prefab +++ b/Assets/KJM/KJMprefabs/ScrollItem/ShopScrollItem.prefab @@ -34,7 +34,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.5, y: 0} + m_AnchoredPosition: {x: 0.5, y: 5} m_SizeDelta: {x: 250, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8644449565768019552 @@ -74,8 +74,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -168,7 +168,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: 200, y: 0} + m_AnchoredPosition: {x: 200, y: 5} m_SizeDelta: {x: 160, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7968533753814083057 @@ -208,8 +208,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -302,7 +302,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: -204, y: 0} + m_AnchoredPosition: {x: -204, y: 5} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5549477541863909970 diff --git a/Assets/KJM/ShopTest/MainPanelButtonController.cs b/Assets/KJM/ShopTest/MainPanelButtonController.cs index 2b53d62..50ce881 100644 --- a/Assets/KJM/ShopTest/MainPanelButtonController.cs +++ b/Assets/KJM/ShopTest/MainPanelButtonController.cs @@ -16,8 +16,8 @@ public class MainPanelButtonController : MonoBehaviour { ShopItem shopItem = new ShopItem { - name = "광고) 코인500개 ", - price = 0 + name = "500개", + price = "광고 보기" }; shopItems.Add(shopItem); } @@ -26,7 +26,7 @@ public class MainPanelButtonController : MonoBehaviour ShopItem shopItem = new ShopItem { name = i*1000+"개 ", - price = i * 1000 + price = $"{i * 1000}" }; shopItems.Add(shopItem); } diff --git a/Assets/Resources/Prefabs/Buttons/Close Button.prefab b/Assets/Resources/Prefabs/Buttons/Close Button.prefab new file mode 100644 index 0000000..4f81f64 --- /dev/null +++ b/Assets/Resources/Prefabs/Buttons/Close Button.prefab @@ -0,0 +1,134 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4018192833792065022 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4114816113354762386} + - component: {fileID: 8225793632172224920} + - component: {fileID: 8076553152503201907} + - component: {fileID: 2541351915772333261} + m_Layer: 5 + m_Name: Close Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4114816113354762386 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4018192833792065022} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 345, y: 757.5} + m_SizeDelta: {x: 69, y: 89} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8225793632172224920 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4018192833792065022} + m_CullTransparentMesh: 1 +--- !u!114 &8076553152503201907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4018192833792065022} + 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: 782d240c4c9774241a915418e498d4cb, 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 &2541351915772333261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4018192833792065022} + 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: 0} + m_PressedSprite: {fileID: 21300000, guid: 0f01468139bcbf7479009bb5cdd8d72d, type: 3} + 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: 8076553152503201907} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: ScrollPanelController, Assembly-CSharp + m_MethodName: OnClickCloseButton + 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 diff --git a/Assets/Resources/Prefabs/Buttons/Close Button.prefab.meta b/Assets/Resources/Prefabs/Buttons/Close Button.prefab.meta new file mode 100644 index 0000000..96551cd --- /dev/null +++ b/Assets/Resources/Prefabs/Buttons/Close Button.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 17c8e42fc8c21db44af7259d65664850 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/PanelItem/Five Rating Points.prefab b/Assets/Resources/Prefabs/PanelItem/Five Rating Points.prefab index 5d7336d..1ead277 100644 --- a/Assets/Resources/Prefabs/PanelItem/Five Rating Points.prefab +++ b/Assets/Resources/Prefabs/PanelItem/Five Rating Points.prefab @@ -137,7 +137,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -221,8 +221,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -346,7 +346,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -421,7 +421,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -505,8 +505,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -639,8 +639,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -764,7 +764,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -839,7 +839,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -923,8 +923,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1021,7 +1021,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 310, y: -100} - m_SizeDelta: {x: 620, y: 170} + m_SizeDelta: {x: 620, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &507697013810862686 MonoBehaviour: @@ -1073,6 +1073,7 @@ MonoBehaviour: - {fileID: 7520250574323770778} - {fileID: 4318436688010238814} - {fileID: 8100022143321925707} + scoreCountText: {fileID: 0} --- !u!1 &6772884622321475867 GameObject: m_ObjectHideFlags: 0 @@ -1138,7 +1139,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1213,7 +1214,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1353,7 +1354,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1428,7 +1429,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1503,7 +1504,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/Prefabs/PanelItem/Ten Rating Points.prefab b/Assets/Resources/Prefabs/PanelItem/Ten Rating Points.prefab index 4697766..802d043 100644 --- a/Assets/Resources/Prefabs/PanelItem/Ten Rating Points.prefab +++ b/Assets/Resources/Prefabs/PanelItem/Ten Rating Points.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -149,8 +149,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -274,7 +274,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -349,7 +349,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -424,7 +424,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -499,7 +499,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -574,7 +574,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -658,8 +658,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -783,7 +783,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -867,8 +867,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -992,7 +992,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1040,7 +1040,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 400, y: -100} - m_SizeDelta: {x: 800, y: 170} + m_SizeDelta: {x: 800, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5084888269297734516 MonoBehaviour: @@ -1102,6 +1102,7 @@ MonoBehaviour: - {fileID: 7179437229568222371} - {fileID: 55687372870338566} - {fileID: 1516335005355897306} + scoreCountText: {fileID: 0} --- !u!1 &4296925463420921392 GameObject: m_ObjectHideFlags: 0 @@ -1167,7 +1168,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1242,7 +1243,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1317,7 +1318,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1401,8 +1402,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1608,7 +1609,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1683,7 +1684,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1758,7 +1759,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1833,7 +1834,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1908,7 +1909,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1983,7 +1984,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2123,7 +2124,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2198,7 +2199,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2273,7 +2274,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/Prefabs/PanelItem/Three Rating Points.prefab b/Assets/Resources/Prefabs/PanelItem/Three Rating Points.prefab index 42eea7a..f667a02 100644 --- a/Assets/Resources/Prefabs/PanelItem/Three Rating Points.prefab +++ b/Assets/Resources/Prefabs/PanelItem/Three Rating Points.prefab @@ -142,8 +142,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -276,8 +276,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -485,8 +485,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -759,8 +759,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -857,7 +857,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 400, y: -100} - m_SizeDelta: {x: 800, y: 170} + m_SizeDelta: {x: 800, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8755683430853667738 MonoBehaviour: @@ -905,6 +905,7 @@ MonoBehaviour: - {fileID: 7930444639084418301} - {fileID: 8770260660780703365} - {fileID: 2559284015955389468} + scoreCountText: {fileID: 0} --- !u!1 &7842876460940630538 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Panels/Coins Panel.prefab b/Assets/Resources/Prefabs/Panels/Coins Panel.prefab index 7596238..b6c2265 100644 --- a/Assets/Resources/Prefabs/Panels/Coins Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Coins Panel.prefab @@ -87,7 +87,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: 71, y: 64} + m_SizeDelta: {x: 71, y: 71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4144968568495096558 CanvasRenderer: diff --git a/Assets/Resources/Prefabs/Panels/Confirm Panel.prefab b/Assets/Resources/Prefabs/Panels/Confirm Panel.prefab index 059cbc4..964b583 100644 --- a/Assets/Resources/Prefabs/Panels/Confirm Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Confirm Panel.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: messege text + m_text: "\uAC8C\uC784\uC744 \uC885\uB8CC\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} @@ -74,8 +74,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -104,7 +104,7 @@ MonoBehaviour: m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: 30 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -171,7 +171,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -120} - m_SizeDelta: {x: 370, y: 80} + m_SizeDelta: {x: 370, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8494676347912440962 CanvasRenderer: @@ -201,7 +201,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c06da2c324d0fee43b8b1998cf9fcd09, type: 3} + m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -301,8 +301,8 @@ 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_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 6.4423} + m_SizeDelta: {x: 0, y: -12.8845} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3931044922440075362 CanvasRenderer: @@ -341,8 +341,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -505,8 +505,8 @@ MonoBehaviour: m_EditorClassIdentifier: panelRectTransform: {fileID: 1049729465715420315} messageText: {fileID: 773857893073654059} - closeButton: {fileID: 2317228258542092256} - confirmButton: {fileID: 8913073875457554875} + closeButton: {fileID: 8913073875457554875} + confirmButton: {fileID: 2317228258542092256} --- !u!1 &8611399693750823341 GameObject: m_ObjectHideFlags: 0 @@ -620,8 +620,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: 200} - m_SizeDelta: {x: 80, y: 80} + m_AnchoredPosition: {x: 245.6, y: 207.48} + m_SizeDelta: {x: 69, y: 89} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2998236242917363859 CanvasRenderer: @@ -651,7 +651,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 18ae4aac85f6d444b9ffb2ac80f27c45, type: 3} + m_Sprite: {fileID: 21300000, guid: 782d240c4c9774241a915418e498d4cb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -680,7 +680,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + 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} @@ -691,7 +691,7 @@ MonoBehaviour: m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} + m_PressedSprite: {fileID: 21300000, guid: 0f01468139bcbf7479009bb5cdd8d72d, type: 3} m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: diff --git a/Assets/Resources/Prefabs/Panels/Draw Confirm Panel.prefab b/Assets/Resources/Prefabs/Panels/Draw Confirm Panel.prefab index e943069..6976e8f 100644 --- a/Assets/Resources/Prefabs/Panels/Draw Confirm Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Draw Confirm Panel.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: messege text + m_text: "\uBB34\uC2B9\uBD80\uB97C\n\uBC1B\uC544\uB4E4\uC774\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} @@ -74,8 +74,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -104,7 +104,7 @@ MonoBehaviour: m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: 30 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -170,8 +170,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: -100, y: -120} - m_SizeDelta: {x: 140, y: 80} + m_AnchoredPosition: {x: -120, y: -120} + m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8494676347912440962 CanvasRenderer: @@ -194,7 +194,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.9607844, b: 0.8980393, 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 @@ -341,8 +341,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -475,8 +475,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -753,8 +753,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: 100, y: -120} - m_SizeDelta: {x: 140, y: 80} + m_AnchoredPosition: {x: 120, y: -120} + m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6738990646649674804 CanvasRenderer: @@ -777,7 +777,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.9607844, b: 0.8980393, 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 diff --git a/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab b/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab index 1dff7a6..6618045 100644 --- a/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab +++ b/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab @@ -60,7 +60,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5849056, g: 0.5849056, b: 0.5849056, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -260,7 +260,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -112.84912} - m_SizeDelta: {x: 1080, y: 1694.3018} + m_SizeDelta: {x: 1080, y: 1650} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &824343901473742242 CanvasRenderer: @@ -526,7 +526,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 50 + m_Spacing: 20 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -895,8 +895,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/Resources/Prefabs/Panels/Loading Panel.prefab b/Assets/Resources/Prefabs/Panels/Loading Panel.prefab index b3e660e..1b9aaaf 100644 --- a/Assets/Resources/Prefabs/Panels/Loading Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Loading Panel.prefab @@ -92,7 +92,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 60 + m_fontSize: 50 m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 0 diff --git a/Assets/Resources/Prefabs/Panels/Main Panel.prefab b/Assets/Resources/Prefabs/Panels/Main Panel.prefab index 72c53db..834ee12 100644 --- a/Assets/Resources/Prefabs/Panels/Main Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Main Panel.prefab @@ -1457,7 +1457,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &405965270916774547 RectTransform: m_ObjectHideFlags: 0 @@ -1713,7 +1713,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: tester + m_text: "\uD638\uB7AD\uC774" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} @@ -1799,7 +1799,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8172929902404983356 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Panels/Rating Panel.prefab b/Assets/Resources/Prefabs/Panels/Rating Panel.prefab index 2e6870a..7a7ba8d 100644 --- a/Assets/Resources/Prefabs/Panels/Rating Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Rating Panel.prefab @@ -37,8 +37,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -100} - m_SizeDelta: {x: 800, y: 170} + m_AnchoredPosition: {x: 380, y: -100} + m_SizeDelta: {x: 760, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1298835069028732765 MonoBehaviour: @@ -121,8 +121,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 452.5, y: -50} - m_SizeDelta: {x: 125, y: 100} + m_AnchoredPosition: {x: 429.16666, y: -50} + m_SizeDelta: {x: 118.33333, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7977355815890466338 CanvasRenderer: @@ -194,10 +194,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 229, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2311241288947242098 CanvasRenderer: @@ -227,7 +227,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -271,8 +271,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 327.5, y: -50} - m_SizeDelta: {x: 125, y: 100} + m_AnchoredPosition: {x: 310.8333, y: -50} + m_SizeDelta: {x: 118.33333, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6301016094153351874 CanvasRenderer: @@ -346,8 +346,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 556.5, y: -50} - m_SizeDelta: {x: 57, y: 100} + m_AnchoredPosition: {x: 689.5, y: -50} + m_SizeDelta: {x: 71, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5514418564306583026 CanvasRenderer: @@ -377,7 +377,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -421,8 +421,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 271.5, y: -50} - m_SizeDelta: {x: 57, y: 100} + m_AnchoredPosition: {x: 334.5, y: -50} + m_SizeDelta: {x: 71, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1521208582179538439 CanvasRenderer: @@ -452,7 +452,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -496,8 +496,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 442.5, y: -50} - m_SizeDelta: {x: 57, y: 100} + m_AnchoredPosition: {x: 547.5, y: -50} + m_SizeDelta: {x: 71, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4709571352539782619 CanvasRenderer: @@ -527,7 +527,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -571,8 +571,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 577.5, y: -50} - m_SizeDelta: {x: 125, y: 100} + m_AnchoredPosition: {x: 547.5, y: -50} + m_SizeDelta: {x: 118.33333, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1886539646614887306 CanvasRenderer: @@ -740,7 +740,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: 0, w: 15.030701} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -820,8 +820,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -914,8 +914,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 202.5, y: -50} - m_SizeDelta: {x: 125, y: 100} + m_AnchoredPosition: {x: 192.5, y: -50} + m_SizeDelta: {x: 118.33333, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8475960274811565095 CanvasRenderer: @@ -991,8 +991,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 310, y: -20} - m_SizeDelta: {x: 600, y: 40} + m_AnchoredPosition: {x: 380, y: -25} + m_SizeDelta: {x: 740, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4712293154631814118 MonoBehaviour: @@ -1054,8 +1054,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100.5, y: -50} - m_SizeDelta: {x: 57, y: 100} + m_AnchoredPosition: {x: 121.5, y: -50} + m_SizeDelta: {x: 71, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7226511529611848164 CanvasRenderer: @@ -1085,7 +1085,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1127,9 +1127,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5796448683050343687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5531721779183282605 @@ -1169,8 +1169,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1261,10 +1261,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 153, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6361210597513350889 CanvasRenderer: @@ -1294,7 +1294,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1341,7 +1341,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 120} - m_SizeDelta: {x: 370, y: 80} + m_SizeDelta: {x: 370, y: 100} m_Pivot: {x: 0.5, y: 0} --- !u!222 &1301144455133722349 CanvasRenderer: @@ -1371,7 +1371,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c06da2c324d0fee43b8b1998cf9fcd09, type: 3} + m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1473,8 +1473,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -20} - m_SizeDelta: {x: 780, y: 40} + m_AnchoredPosition: {x: 380, y: -25} + m_SizeDelta: {x: 740, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7589988445738541794 MonoBehaviour: @@ -1534,10 +1534,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 457, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3908811810989572573 CanvasRenderer: @@ -1567,7 +1567,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1609,10 +1609,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 191, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3572997787055944256 CanvasRenderer: @@ -1642,7 +1642,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1684,10 +1684,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 533, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2472997966147577436 CanvasRenderer: @@ -1717,7 +1717,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1838,8 +1838,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 385.5, y: -50} - m_SizeDelta: {x: 57, y: 100} + m_AnchoredPosition: {x: 476.5, y: -50} + m_SizeDelta: {x: 71, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2845131487573739552 CanvasRenderer: @@ -1869,7 +1869,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1911,10 +1911,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 685, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2627303802870471009 CanvasRenderer: @@ -1944,7 +1944,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1986,10 +1986,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 495, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6753383988544108710 CanvasRenderer: @@ -2019,7 +2019,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2080,10 +2080,10 @@ RectTransform: - {fileID: 7062801385519056563} m_Father: {fileID: 5005196437681606412} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -90} - m_SizeDelta: {x: 800, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2746564917350217772 MonoBehaviour: @@ -2143,10 +2143,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 571, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4957044415776570954 CanvasRenderer: @@ -2176,7 +2176,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2223,7 +2223,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -280, y: 200} + m_SizeDelta: {x: -320, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7368135300258742483 MonoBehaviour: @@ -2285,10 +2285,10 @@ RectTransform: - {fileID: 7055028789553681920} m_Father: {fileID: 5005196437681606412} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -20} - m_SizeDelta: {x: 800, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3709340827146638613 MonoBehaviour: @@ -2350,8 +2350,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 214.5, y: -50} - m_SizeDelta: {x: 57, y: 100} + m_AnchoredPosition: {x: 263.5, y: -50} + m_SizeDelta: {x: 71, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2362361547118721082 CanvasRenderer: @@ -2381,7 +2381,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2423,10 +2423,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 419, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &463354477484058703 CanvasRenderer: @@ -2456,7 +2456,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2500,7 +2500,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 130, y: -15} + m_AnchoredPosition: {x: 123.333336, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5764155609364392127 @@ -2540,8 +2540,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2634,7 +2634,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -15} + m_AnchoredPosition: {x: 123.333336, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1511074315121186330 @@ -2674,8 +2674,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2766,10 +2766,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 381, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3023405256669732314 CanvasRenderer: @@ -2799,7 +2799,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2841,10 +2841,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4925124962761219917 CanvasRenderer: @@ -2874,7 +2874,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2921,8 +2921,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 930, y: -100} - m_SizeDelta: {x: 620, y: 170} + m_AnchoredPosition: {x: 380, y: -100} + m_SizeDelta: {x: 760, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9114047146697129881 MonoBehaviour: @@ -3009,7 +3009,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 390, y: -15} + m_AnchoredPosition: {x: 370, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7953870127220333924 @@ -3049,8 +3049,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3143,8 +3143,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 499.5, y: -50} - m_SizeDelta: {x: 57, y: 100} + m_AnchoredPosition: {x: 618.5, y: -50} + m_SizeDelta: {x: 71, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3038526323405900361 CanvasRenderer: @@ -3174,7 +3174,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3216,10 +3216,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 723, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8304064098521273095 CanvasRenderer: @@ -3249,7 +3249,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3293,8 +3293,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 702.5, y: -50} - m_SizeDelta: {x: 125, y: 100} + m_AnchoredPosition: {x: 665.8333, y: -50} + m_SizeDelta: {x: 118.33333, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8108132620148900676 CanvasRenderer: @@ -3366,10 +3366,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 609, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &38250642525452373 CanvasRenderer: @@ -3399,7 +3399,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3443,7 +3443,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500, y: -15} + m_AnchoredPosition: {x: 616.6667, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2489304366975054530 @@ -3483,8 +3483,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3575,9 +3575,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5796448683050343687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 133.33333, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3598980560550055195 @@ -3617,8 +3617,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3709,10 +3709,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5005196437681606412} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -155} - m_SizeDelta: {x: 800, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5504192916126514736 CanvasRenderer: @@ -3752,7 +3752,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3843,10 +3843,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 761, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &236167123989522431 CanvasRenderer: @@ -3876,7 +3876,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3918,10 +3918,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 343, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4723433955710229165 CanvasRenderer: @@ -3951,7 +3951,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3993,10 +3993,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 267, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5741181229934659086 CanvasRenderer: @@ -4026,7 +4026,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4068,10 +4068,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 77, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4822107155440733888 CanvasRenderer: @@ -4101,7 +4101,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4145,7 +4145,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300, y: -15} + m_AnchoredPosition: {x: 370, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3590935764819752634 @@ -4185,8 +4185,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -4279,8 +4279,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 43.5, y: -50} - m_SizeDelta: {x: 57, y: 100} + m_AnchoredPosition: {x: 50.5, y: -50} + m_SizeDelta: {x: 71, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8138689824684412702 CanvasRenderer: @@ -4310,7 +4310,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4354,8 +4354,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 328.5, y: -50} - m_SizeDelta: {x: 57, y: 100} + m_AnchoredPosition: {x: 405.5, y: -50} + m_SizeDelta: {x: 71, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3581222350794682265 CanvasRenderer: @@ -4385,7 +4385,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4429,8 +4429,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 310, y: -155} - m_SizeDelta: {x: 600, y: 30} + m_AnchoredPosition: {x: 380, y: -180} + m_SizeDelta: {x: 740, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3743980846073367380 CanvasRenderer: @@ -4470,7 +4470,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -4561,10 +4561,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 305, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1673543598988799056 CanvasRenderer: @@ -4594,7 +4594,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4638,8 +4638,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 77.5, y: -50} - m_SizeDelta: {x: 125, y: 100} + m_AnchoredPosition: {x: 74.166664, y: -50} + m_SizeDelta: {x: 118.33333, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &380273237471126270 CanvasRenderer: @@ -4713,8 +4713,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 157.5, y: -50} - m_SizeDelta: {x: 57, y: 100} + m_AnchoredPosition: {x: 192.5, y: -50} + m_SizeDelta: {x: 71, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3961998244282910901 CanvasRenderer: @@ -4744,7 +4744,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51cdedc74073a6741a6414d636c0feba, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4894,9 +4894,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5796448683050343687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 666.6666, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6950779524205521337 @@ -4936,8 +4936,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -5035,8 +5035,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -90} - m_SizeDelta: {x: 780, y: 100} + m_AnchoredPosition: {x: 380, y: -105} + m_SizeDelta: {x: 740, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6912240550662146492 MonoBehaviour: @@ -5107,8 +5107,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 310, y: -90} - m_SizeDelta: {x: 600, y: 100} + m_AnchoredPosition: {x: 380, y: -105} + m_SizeDelta: {x: 740, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6518247030165653344 MonoBehaviour: @@ -5168,10 +5168,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 115, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4800625733471548410 CanvasRenderer: @@ -5201,7 +5201,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5245,7 +5245,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 650, y: -15} + m_AnchoredPosition: {x: 616.6667, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5260096339463299906 @@ -5285,8 +5285,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -5362,7 +5362,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5005196437681606412 RectTransform: m_ObjectHideFlags: 0 @@ -5380,10 +5380,10 @@ RectTransform: - {fileID: 6720057764648462601} m_Father: {fileID: 6614054331963984893} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -100} - m_SizeDelta: {x: 800, y: 170} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &34476411273760990 MonoBehaviour: @@ -5478,10 +5478,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 647, y: -50} - m_SizeDelta: {x: 38, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1415772658403238602 CanvasRenderer: @@ -5511,7 +5511,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Sprite: {fileID: 21300000, guid: 84cba33f3f372144485dfc1c5b1d54c6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5555,8 +5555,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -155} - m_SizeDelta: {x: 780, y: 30} + m_AnchoredPosition: {x: 380, y: -180} + m_SizeDelta: {x: 740, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &627333909763446630 CanvasRenderer: @@ -5596,7 +5596,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/Resources/Prefabs/Panels/Replay Panel.prefab b/Assets/Resources/Prefabs/Panels/Replay Panel.prefab index edfbc58..93b8055 100644 --- a/Assets/Resources/Prefabs/Panels/Replay Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Replay Panel.prefab @@ -230,8 +230,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: 750} - m_SizeDelta: {x: 80, y: 80} + m_AnchoredPosition: {x: 345, y: 757.5} + m_SizeDelta: {x: 69, y: 89} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8575946642649479721 CanvasRenderer: @@ -261,7 +261,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 18ae4aac85f6d444b9ffb2ac80f27c45, type: 3} + m_Sprite: {fileID: 21300000, guid: 782d240c4c9774241a915418e498d4cb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -290,7 +290,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + 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} @@ -301,7 +301,7 @@ MonoBehaviour: m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} + m_PressedSprite: {fileID: 21300000, guid: 0f01468139bcbf7479009bb5cdd8d72d, type: 3} m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: diff --git a/Assets/Resources/Prefabs/Panels/Setting Panel.prefab b/Assets/Resources/Prefabs/Panels/Setting Panel.prefab index 54538f0..8667f52 100644 --- a/Assets/Resources/Prefabs/Panels/Setting Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Setting Panel.prefab @@ -221,8 +221,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -421,8 +421,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: 200} - m_SizeDelta: {x: 80, y: 80} + m_AnchoredPosition: {x: 245.3, y: 207.5} + m_SizeDelta: {x: 69, y: 89} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1293506759801131046 CanvasRenderer: @@ -452,7 +452,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 18ae4aac85f6d444b9ffb2ac80f27c45, type: 3} + m_Sprite: {fileID: 21300000, guid: 782d240c4c9774241a915418e498d4cb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -481,7 +481,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + 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} @@ -492,7 +492,7 @@ MonoBehaviour: m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} + m_PressedSprite: {fileID: 21300000, guid: 0f01468139bcbf7479009bb5cdd8d72d, type: 3} m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: @@ -576,7 +576,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.9607844, b: 0.8980393, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1046,8 +1046,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1164,7 +1164,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.9607844, b: 0.8980393, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Resources/Prefabs/Panels/Shop Panel.prefab b/Assets/Resources/Prefabs/Panels/Shop Panel.prefab index 0ce7bcc..cdf807e 100644 --- a/Assets/Resources/Prefabs/Panels/Shop Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Shop Panel.prefab @@ -112,8 +112,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: 750} - m_SizeDelta: {x: 80, y: 80} + m_AnchoredPosition: {x: 345.4, y: 757.5} + m_SizeDelta: {x: 69, y: 89} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7956384524120379576 CanvasRenderer: @@ -143,7 +143,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 18ae4aac85f6d444b9ffb2ac80f27c45, type: 3} + m_Sprite: {fileID: 21300000, guid: 782d240c4c9774241a915418e498d4cb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -172,7 +172,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + 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} @@ -183,7 +183,7 @@ MonoBehaviour: m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} + m_PressedSprite: {fileID: 21300000, guid: 0f01468139bcbf7479009bb5cdd8d72d, type: 3} m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: @@ -350,7 +350,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -392, y: -0.86621094} + m_AnchoredPosition: {x: -392, y: -0.0008544922} m_SizeDelta: {x: 784, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2389273839879143832 diff --git a/Assets/Resources/Prefabs/Ranking.prefab b/Assets/Resources/Prefabs/Ranking.prefab index 3da3d9d..0ca7ba1 100644 --- a/Assets/Resources/Prefabs/Ranking.prefab +++ b/Assets/Resources/Prefabs/Ranking.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 6779752557766303162} - component: {fileID: 4219079452079995545} m_Layer: 5 - m_Name: Square (1) + m_Name: NicknameText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -66,7 +66,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: "\uACE0\uC900\uC77C \uAC15\uC0AC\uB2D8" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} @@ -75,8 +75,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -93,14 +93,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 + m_fontSize: 16.6 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 0.1 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -187,193 +187,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2111751828310865828 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8443883581401202718} - - component: {fileID: 7138821558724171683} - - component: {fileID: 5554289326324402410} - - component: {fileID: 3326680571146108835} - m_Layer: 5 - m_Name: Square (6) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8443883581401202718 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2111751828310865828} - 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: 6829299122171854189} - 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: 100, y: 100} - m_Pivot: {x: 0, y: 0} ---- !u!222 &7138821558724171683 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2111751828310865828} - m_CullTransparentMesh: 1 ---- !u!114 &5554289326324402410 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2111751828310865828} - 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: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} - m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, 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} - 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: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 0.1 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - 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: 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!212 &3326680571146108835 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2111751828310865828} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: cce82a9a407f7c74a9072a81434ef74f, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.4, y: 0.44} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &2564988726451804208 GameObject: m_ObjectHideFlags: 0 @@ -387,7 +200,7 @@ GameObject: - component: {fileID: 3571892484917533220} - component: {fileID: 56027441997347173} m_Layer: 5 - m_Name: Square (3) + m_Name: WinRateText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -440,7 +253,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: 0.00 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} @@ -449,8 +262,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -467,14 +280,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 43 + m_fontSizeBase: 43 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 0.1 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -574,7 +387,7 @@ GameObject: - component: {fileID: 4991270897368175553} - component: {fileID: 4632581758096488372} m_Layer: 5 - m_Name: Square (5) + m_Name: LoseText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -627,7 +440,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: 1 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} @@ -636,8 +449,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -654,14 +467,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 43 + m_fontSizeBase: 43 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 0.1 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -761,7 +574,7 @@ GameObject: - component: {fileID: 9113974515851588728} - component: {fileID: 3771059890871084841} m_Layer: 5 - m_Name: Square (4) + m_Name: WinText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -814,7 +627,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: 0 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} @@ -823,8 +636,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -841,14 +654,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 43 + m_fontSizeBase: 43 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 0.1 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -948,7 +761,7 @@ GameObject: - component: {fileID: 7017434180017610653} - component: {fileID: 1524667321170181679} m_Layer: 5 - m_Name: Square (2) + m_Name: ScoreText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1001,7 +814,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: 1 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} @@ -1010,8 +823,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1028,14 +841,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 43 + m_fontSizeBase: 43 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 0.1 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1160,7 +973,6 @@ RectTransform: - {fileID: 6616261744481420215} - {fileID: 1587257835873025808} - {fileID: 3828550739656829781} - - {fileID: 8443883581401202718} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1184,7 +996,7 @@ MonoBehaviour: m_Left: 30 m_Right: 0 m_Top: 30 - m_Bottom: 35 + m_Bottom: 40 m_ChildAlignment: 3 m_Spacing: 0 m_ChildForceExpandWidth: 1 @@ -1222,7 +1034,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e89f6694961e7574b98368e14934a8b1, type: 3} + m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/Prefabs/Utility/Timer.prefab b/Assets/Resources/Prefabs/Utility/Timer.prefab index 5aa84ac..dd6c81b 100644 --- a/Assets/Resources/Prefabs/Utility/Timer.prefab +++ b/Assets/Resources/Prefabs/Utility/Timer.prefab @@ -58,7 +58,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.30980393, g: 0.4156863, b: 0.3529412, a: 1} + m_Color: {r: 1, g: 0.92549026, b: 0.8078432, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -133,7 +133,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.30980393, g: 0.4156863, b: 0.3529412, a: 1} + m_Color: {r: 1, g: 0.92549026, b: 0.8078432, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -224,27 +224,27 @@ MonoBehaviour: colorSettings: - targetObject: {fileID: 8836467620212376791} componentType: Image - color: {r: 1, g: 0.92549026, b: 0.8078432, a: 1} + color: {r: 0.30980393, g: 0.4156863, b: 0.3529412, a: 1} applyToChildren: 0 colorableComponent: {fileID: 4727671169278371324} - targetObject: {fileID: 3197710723148271819} componentType: Image - color: {r: 0.30980393, g: 0.4156863, b: 0.3529412, a: 1} + color: {r: 1, g: 0.92549026, b: 0.8078432, a: 1} applyToChildren: 0 colorableComponent: {fileID: 337344169386659086} - targetObject: {fileID: 6184671321993608803} componentType: TMP_Text - color: {r: 0.30980393, g: 0.4156863, b: 0.3529412, a: 1} + color: {r: 1, g: 0.92549026, b: 0.8078432, a: 1} applyToChildren: 0 colorableComponent: {fileID: 1414465240440161498} - targetObject: {fileID: 880875562942959157} componentType: Image - color: {r: 0.30980393, g: 0.4156863, b: 0.3529412, a: 1} + color: {r: 1, g: 0.92549026, b: 0.8078432, a: 1} applyToChildren: 0 colorableComponent: {fileID: 3995031286537022070} - targetObject: {fileID: 8065228685685210519} componentType: Image - color: {r: 0.30980393, g: 0.4156863, b: 0.3529412, a: 1} + color: {r: 1, g: 0.92549026, b: 0.8078432, a: 1} applyToChildren: 0 colorableComponent: {fileID: 3282082939413405386} autoDetectChildren: 1 @@ -322,8 +322,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4284115535 - m_fontColor: {r: 0.30980393, g: 0.4156863, b: 0.3529412, a: 1} + rgba: 4291751167 + m_fontColor: {r: 1, g: 0.92549026, b: 0.8078432, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -340,8 +340,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 64 - m_fontSizeBase: 64 + m_fontSize: 55 + m_fontSizeBase: 55 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -440,7 +440,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.30980393, g: 0.4156863, b: 0.3529412, a: 1} + m_Color: {r: 1, g: 0.92549026, b: 0.8078432, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -515,7 +515,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.92549026, b: 0.8078432, a: 1} + m_Color: {r: 0.30980393, g: 0.4156863, b: 0.3529412, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Script/Common/ScrollItem/ShopItem.cs b/Assets/Script/Common/ScrollItem/ShopItem.cs index e1554ff..9f54414 100644 --- a/Assets/Script/Common/ScrollItem/ShopItem.cs +++ b/Assets/Script/Common/ScrollItem/ShopItem.cs @@ -5,5 +5,5 @@ using UnityEngine; public class ShopItem { public string name; - public int price; + public string price; } diff --git a/Assets/Script/Main/MainPanelController.cs b/Assets/Script/Main/MainPanelController.cs index f4b22ad..b799776 100644 --- a/Assets/Script/Main/MainPanelController.cs +++ b/Assets/Script/Main/MainPanelController.cs @@ -99,8 +99,8 @@ public class MainPanelController : MonoBehaviour { ShopItem shopItem = new ShopItem { - name = "광고) 코인500개 ", - price = 0 + name = "500개 ", + price = "광고 보기" }; shopItems.Add(shopItem); } @@ -109,7 +109,7 @@ public class MainPanelController : MonoBehaviour ShopItem shopItem = new ShopItem { name = i*1000+"개 ", - price = i * 1000 + price = $"{i * 1000}" }; shopItems.Add(shopItem); } diff --git a/Assets/Script/Replay/ReplayCell.cs b/Assets/Script/Replay/ReplayCell.cs index 08a231e..00fdb7f 100644 --- a/Assets/Script/Replay/ReplayCell.cs +++ b/Assets/Script/Replay/ReplayCell.cs @@ -104,9 +104,9 @@ public class ReplayCell : MonoBehaviour public void OnClickReplayButton() { - GameManager.Instance.panelManager.OpenConfirmPanel($"{_opponentNickname}님 과의 대결을 다시 보시겠습니까?", + GameManager.Instance.panelManager.OpenConfirmPanel($"{_opponentNickname}님 과의\n대결을 다시 보시겠습니까?", () => { ReplayManager.Instance.SetReplayData(_storedReplayRecord); - SceneManager.LoadScene("Replay"); }); + SceneManager.LoadScene("Replay"); }, true); } } diff --git a/Assets/Script/UI/PanelChildController/ShopItemController.cs b/Assets/Script/UI/PanelChildController/ShopItemController.cs index 63437bc..af1e58f 100644 --- a/Assets/Script/UI/PanelChildController/ShopItemController.cs +++ b/Assets/Script/UI/PanelChildController/ShopItemController.cs @@ -16,14 +16,14 @@ public class ShopItemController : MonoBehaviour var itemText = GetComponentsInChildren(); itemText[0].text = this._shopItem.name; - itemText[1].text = this._shopItem.price+"원"; + itemText[1].text = _shopItem.price == "광고 보기" ? _shopItem.price : this._shopItem.price+"원"; } public void OnClickShopItem() { - if (_shopItem.price == 0) + if (_shopItem.price == "광고 보기") { //보상형 전면 광고 로드 _adManager = GetComponent(); @@ -33,7 +33,7 @@ public class ShopItemController : MonoBehaviour { NetworkManager.Instance.PurchaseCoins( - _shopItem.price, // 충전할 코인 개수 + int.Parse(_shopItem.price), // 충전할 코인 개수 _shopItem.name, // 결제 ID "GooglePay", // 결제 방식 (GooglePay, PayPal 등) (coins) => { diff --git a/Assets/Script/UI/PanelChildController/SwitchController.cs b/Assets/Script/UI/PanelChildController/SwitchController.cs index d95f4e5..aabad60 100644 --- a/Assets/Script/UI/PanelChildController/SwitchController.cs +++ b/Assets/Script/UI/PanelChildController/SwitchController.cs @@ -14,7 +14,7 @@ public class SwitchController : MonoBehaviour public delegate void OnSwitchChangedDelegate(bool isOn); public OnSwitchChangedDelegate OnSwitchChanged; - private static readonly Color32 OnColor = new Color32(242, 68, 149, 255); + private static readonly Color32 OnColor = new Color32(164, 220, 223, 255); private static readonly Color32 OffColor = new Color32(70, 93, 117, 255); private RectTransform _handleRectTransform; @@ -30,39 +30,18 @@ public class SwitchController : MonoBehaviour private void Start() { - //초기 상태는 false - _handleRectTransform.anchoredPosition = new Vector2(-14, 0); - _backgroundImage.color = OffColor; - - if (gameObject.name == "SFX Switch") - { - _isOn = UserManager.IsPlaySFX; - } - else if (gameObject.name == "BGM Switch") - { - _isOn = UserManager.IsPlayBGM; - } - } + _isOn = gameObject.name == "SFX Switch" ? UserManager.IsPlaySFX : + gameObject.name == "BGM Switch" ? UserManager.IsPlayBGM : false; - //스위치 상태 변경 함수 + _handleRectTransform.anchoredPosition = _isOn ? new Vector2(14, 0) : new Vector2(-14, 0); + _backgroundImage.color = _isOn ? OnColor : OffColor; + } + private void SetOn(bool isOn) { - - if (isOn) - { - _handleRectTransform.DOAnchorPosX(14, 0.2f); - _backgroundImage.DOBlendableColor(OnColor, 0.2f); - } - else - { - _handleRectTransform.DOAnchorPosX(-14, 0.2f); - _backgroundImage.DOBlendableColor(OffColor, 0.2f); - } - - // 효과음 재생 + _handleRectTransform.DOAnchorPosX(isOn ? 14 : -14, 0.2f); + _backgroundImage.DOColor(isOn ? OnColor : OffColor, 0.2f); // ✅ 수정된 부분 AudioManager.Instance.PlayClickSound(); - - //이벤트 호출 OnSwitchChanged?.Invoke(isOn); _isOn = isOn; } diff --git a/Assets/Script/UI/PanelController/PanelManager.cs b/Assets/Script/UI/PanelController/PanelManager.cs index 23e3c09..2f90e1d 100644 --- a/Assets/Script/UI/PanelController/PanelManager.cs +++ b/Assets/Script/UI/PanelController/PanelManager.cs @@ -288,8 +288,8 @@ public class PanelManager : MonoBehaviour { ShopItem shopItem = new ShopItem { - name = "광고) 코인500개 ", - price = 0 + name = "500개", + price = "광고 보기" }; shopItems.Add(shopItem); } @@ -298,7 +298,7 @@ public class PanelManager : MonoBehaviour ShopItem shopItem = new ShopItem { name = i*1000+"개 ", - price = i * 1000 + price = $"{i * 1000}" }; shopItems.Add(shopItem); } diff --git a/Assets/Sprites/Panel UI/btn_close-shadow.png b/Assets/Sprites/Panel UI/btn_close-shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..33ffe13f2031658dffa4345be002f01863c245c7 GIT binary patch literal 2790 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 sQE>M8HI#%B4$SWc<+IHp$?c32xQ+NBrh){ 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 WV?C_P4ESmS(tBWhzw+MG$o~UPTZ`TR literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Panel UI/rating_score.png.meta b/Assets/Sprites/Panel UI/rating_score.png.meta new file mode 100644 index 0000000..1f66da9 --- /dev/null +++ b/Assets/Sprites/Panel UI/rating_score.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 51cdedc74073a6741a6414d636c0feba +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 20, y: 25, z: 20, w: 15} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Panel UI/rating_score_for_ten.png b/Assets/Sprites/Panel UI/rating_score_for_ten.png new file mode 100644 index 0000000000000000000000000000000000000000..f774d00634c4d1f495c50cd313fddf85bc081d6a GIT binary patch literal 6110 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

5fUV)8#8X9< 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 From fae1c1bb2a106a15f9fa13a58088131d89ffece5 Mon Sep 17 00:00:00 2001 From: Jay <96156114+jaydev00a@users.noreply.github.com> Date: Fri, 28 Mar 2025 17:08:31 +0900 Subject: [PATCH 4/5] =?UTF-8?q?DO-71=20[Feat]=20=EA=B2=8C=EC=9E=84=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=83=81=ED=83=9C=20=EB=B0=94=EC=9D=B8=EB=94=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameUIController.cs | 18 + .../Prefabs/Panels/InGameMenu Panel.prefab | 2 +- .../Prefabs/Panels/Rating Panel.prefab | 212 ++++---- .../Resources/Prefabs/[Canvas] Game UI.prefab | 467 +++++++++++++++++- Assets/Script/Game/GameLogic.cs | 11 +- Assets/Script/Game/GameManager.cs | 6 + Assets/Script/Game/GameUtility/GameRoutine.cs | 2 + Assets/Sprites/Game UI/btn_game_exit 1.png | Bin 0 -> 552 bytes .../btn_game_exit 1.png.meta} | 12 +- .../Sprites/Game UI/btn_game_exit_ivory.png | Bin 0 -> 549 bytes .../btn_game_exit_ivory.png.meta} | 12 +- Assets/Sprites/Panel UI/close_button-bg.png | Bin 1105 -> 0 bytes Assets/Sprites/Panel UI/settings_icon.png | Bin 795 -> 0 bytes 13 files changed, 612 insertions(+), 130 deletions(-) create mode 100644 Assets/Sprites/Game UI/btn_game_exit 1.png rename Assets/Sprites/{Panel UI/close_button-bg.png.meta => Game UI/btn_game_exit 1.png.meta} (96%) create mode 100644 Assets/Sprites/Game UI/btn_game_exit_ivory.png rename Assets/Sprites/{Panel UI/settings_icon.png.meta => Game UI/btn_game_exit_ivory.png.meta} (96%) delete mode 100644 Assets/Sprites/Panel UI/close_button-bg.png delete mode 100644 Assets/Sprites/Panel UI/settings_icon.png diff --git a/Assets/GameUIController.cs b/Assets/GameUIController.cs index 49883f4..761fc20 100644 --- a/Assets/GameUIController.cs +++ b/Assets/GameUIController.cs @@ -17,6 +17,11 @@ public class GameUIController : MonoBehaviour [SerializeField] private Image profileImageB; [SerializeField] private Sprite[] profileImageSprites; //0. 기본 드래곤 1. 기본 호랑이 2.아이보리 드래곤 3. 아이보리 호랑이 [SerializeField] private Sprite[] indicatorSprites; //0. active 1. inactive + [SerializeField] private GameObject timerObject; + [SerializeField] private GameObject inGameMenuButtonsObject; + [SerializeField] private GameObject exitButtonObject; + [SerializeField] private GameObject revengeRetryButtonObject; + [SerializeField] private GameObject confirmButtonObject; private Sprite _originalSpriteA; private Sprite _originalSpriteB; @@ -156,4 +161,17 @@ public class GameUIController : MonoBehaviour }); } + ///

+ /// 게임 종료 시 인게임 장면 변경 + /// + /// 게임 진행이면 true + public void SetButtonsIndicator(bool gameInProgress) + { + Debug.Log("gameInProgress" + gameInProgress); + inGameMenuButtonsObject.SetActive(gameInProgress); + confirmButtonObject.SetActive(gameInProgress); + timerObject.SetActive(!gameInProgress); + exitButtonObject.SetActive(!gameInProgress); + revengeRetryButtonObject.SetActive(!gameInProgress); + } } diff --git a/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab b/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab index b3daebf..4ed12ce 100644 --- a/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab @@ -61,7 +61,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.74509805} + m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Resources/Prefabs/Panels/Rating Panel.prefab b/Assets/Resources/Prefabs/Panels/Rating Panel.prefab index 7a7ba8d..b87b2d0 100644 --- a/Assets/Resources/Prefabs/Panels/Rating Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Rating Panel.prefab @@ -194,10 +194,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 218, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2311241288947242098 CanvasRenderer: @@ -1127,9 +1127,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5796448683050343687} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 380, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5531721779183282605 @@ -1261,10 +1261,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 146, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6361210597513350889 CanvasRenderer: @@ -1534,10 +1534,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 434, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3908811810989572573 CanvasRenderer: @@ -1609,10 +1609,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 182, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3572997787055944256 CanvasRenderer: @@ -1684,10 +1684,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 506, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2472997966147577436 CanvasRenderer: @@ -1911,10 +1911,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 650, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2627303802870471009 CanvasRenderer: @@ -1986,10 +1986,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 470, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6753383988544108710 CanvasRenderer: @@ -2080,10 +2080,10 @@ RectTransform: - {fileID: 7062801385519056563} m_Father: {fileID: 5005196437681606412} 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: 0, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 380, y: -105} + m_SizeDelta: {x: 760, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2746564917350217772 MonoBehaviour: @@ -2143,10 +2143,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 542, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4957044415776570954 CanvasRenderer: @@ -2285,10 +2285,10 @@ RectTransform: - {fileID: 7055028789553681920} m_Father: {fileID: 5005196437681606412} 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: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 380, y: -25} + m_SizeDelta: {x: 760, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3709340827146638613 MonoBehaviour: @@ -2423,10 +2423,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 398, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &463354477484058703 CanvasRenderer: @@ -2766,10 +2766,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 362, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3023405256669732314 CanvasRenderer: @@ -2841,10 +2841,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 38, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4925124962761219917 CanvasRenderer: @@ -3216,10 +3216,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 686, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8304064098521273095 CanvasRenderer: @@ -3366,10 +3366,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 578, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &38250642525452373 CanvasRenderer: @@ -3575,9 +3575,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5796448683050343687} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 126.666664, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3598980560550055195 @@ -3709,10 +3709,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5005196437681606412} 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: 0, y: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 380, y: -180} + m_SizeDelta: {x: 760, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5504192916126514736 CanvasRenderer: @@ -3843,10 +3843,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 722, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &236167123989522431 CanvasRenderer: @@ -3918,10 +3918,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 326, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4723433955710229165 CanvasRenderer: @@ -3993,10 +3993,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 254, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5741181229934659086 CanvasRenderer: @@ -4068,10 +4068,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4822107155440733888 CanvasRenderer: @@ -4561,10 +4561,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 290, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1673543598988799056 CanvasRenderer: @@ -4894,9 +4894,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5796448683050343687} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 633.3333, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6950779524205521337 @@ -5168,10 +5168,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 110, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4800625733471548410 CanvasRenderer: @@ -5362,7 +5362,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5005196437681606412 RectTransform: m_ObjectHideFlags: 0 @@ -5380,10 +5380,10 @@ RectTransform: - {fileID: 6720057764648462601} m_Father: {fileID: 6614054331963984893} 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: 0, y: 200} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 380, y: -100} + m_SizeDelta: {x: 760, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &34476411273760990 MonoBehaviour: @@ -5478,10 +5478,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} 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: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 614, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1415772658403238602 CanvasRenderer: diff --git a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab index 1fa8870..e7db964 100644 --- a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab +++ b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab @@ -266,6 +266,7 @@ RectTransform: - {fileID: 8758049298581854606} - {fileID: 2785359725927864505} - {fileID: 1286412008661516750} + - {fileID: 6653720175714615235} m_Father: {fileID: 8942070830740152784} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -273,6 +274,139 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 40} m_SizeDelta: {x: -100, y: 300} m_Pivot: {x: 0.5, y: 0} +--- !u!1 &2097219097053835497 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6653720175714615235} + - component: {fileID: 9155184108605558784} + - component: {fileID: 3177637891523162420} + - component: {fileID: 534779203392079463} + m_Layer: 5 + m_Name: RevengeRetry Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6653720175714615235 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2097219097053835497} + 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: 8243510049546773539} + m_Father: {fileID: 6209444297678801107} + 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: 349, y: 296} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9155184108605558784 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2097219097053835497} + m_CullTransparentMesh: 1 +--- !u!114 &3177637891523162420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2097219097053835497} + 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: 0.9607844, b: 0.8980393, 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: 5266a12fcd3491445b1e487c9359fff0, 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 &534779203392079463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2097219097053835497} + 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: 3177637891523162420} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3933575647777291622} + m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp + m_MethodName: OnClickConfirmButton + 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 &2180157736785062510 GameObject: m_ObjectHideFlags: 0 @@ -305,8 +439,8 @@ RectTransform: m_Children: - {fileID: 4020956126151567600} - {fileID: 5290633878409985} - - {fileID: 6017735879343076712} - - {fileID: 8624964855925532225} + - {fileID: 5469898051918508443} + - {fileID: 3394360760151733370} m_Father: {fileID: 2843270827267453358} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -352,6 +486,138 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2183639868091494604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3394360760151733370} + - component: {fileID: 7251970583950155674} + - component: {fileID: 2813314589835438985} + - component: {fileID: 403017146611159122} + m_Layer: 5 + m_Name: Exit Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3394360760151733370 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2183639868091494604} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.4, y: 1.4, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4044003808430543235} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 60, y: -118} + m_SizeDelta: {x: 63, y: 63} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7251970583950155674 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2183639868091494604} + m_CullTransparentMesh: 1 +--- !u!114 &2813314589835438985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2183639868091494604} + 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: 488ca1767f0dae24195cd77590bf308f, 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 &403017146611159122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2183639868091494604} + 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: 1, g: 0.9607843, b: 0.8980392, 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: 21300000, guid: 04b20bf7cb802174db748b752be5178f, type: 3} + 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: 2813314589835438985} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3933575647777291622} + m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp + m_MethodName: OnClickInGameMenuOpenButton + 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 &2293916685100220953 GameObject: m_ObjectHideFlags: 0 @@ -1286,6 +1552,140 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 250, y: 300} m_Pivot: {x: 0, y: 0.5} +--- !u!1 &5073825591103575574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8243510049546773539} + - component: {fileID: 5022558977162242817} + - component: {fileID: 3869650863187247196} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8243510049546773539 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5073825591103575574} + 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: 6653720175714615235} + 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_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5022558977162242817 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5073825591103575574} + m_CullTransparentMesh: 1 +--- !u!114 &3869650863187247196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5073825591103575574} + 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: "\uC7AC\uB300\uACB0" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284115536 + m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, 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: 60 + m_fontSizeBase: 60 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 0 + m_fontSizeMax: 0 + m_fontStyle: 1 + 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 &5258332010899716781 GameObject: m_ObjectHideFlags: 0 @@ -1692,16 +2092,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7907733484671223743} - 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.2, y: 1.2, z: 1} + m_LocalScale: {x: 1.4, y: 1.4, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4044003808430543235} + m_Father: {fileID: 5469898051918508443} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -80} + m_AnchoredPosition: {x: 60, y: -21.2} m_SizeDelta: {x: 62, y: 47} m_Pivot: {x: 0, y: 1} --- !u!222 &2463258542306401490 @@ -1900,16 +2300,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8300296172192540436} - 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.2, y: 1.2, z: 1} + m_LocalScale: {x: 1.4, y: 1.4, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4044003808430543235} + m_Father: {fileID: 5469898051918508443} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -50, y: -75} + m_AnchoredPosition: {x: -60, y: 0} m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 1, y: 1} --- !u!222 &1366668917766278638 @@ -2112,6 +2512,11 @@ MonoBehaviour: indicatorSprites: - {fileID: 21300000, guid: 91965db86e05b144f840b523e83d3816, type: 3} - {fileID: 21300000, guid: 8379c97a1509fbc42abb3da34d2e647c, type: 3} + timerObject: {fileID: 8100393348720881591} + inGameMenuButtonsObject: {fileID: 9031393605967390458} + exitButtonObject: {fileID: 2183639868091494604} + revengeRetryButtonObject: {fileID: 2097219097053835497} + confirmButtonObject: {fileID: 3856590192762510114} --- !u!225 &5999196603484244259 CanvasGroup: m_ObjectHideFlags: 0 @@ -2161,6 +2566,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &9031393605967390458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5469898051918508443} + m_Layer: 5 + m_Name: InGameMenu Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5469898051918508443 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9031393605967390458} + 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: 6017735879343076712} + - {fileID: 8624964855925532225} + m_Father: {fileID: 4044003808430543235} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 3.5, y: 3} + m_SizeDelta: {x: 1073.8, y: 100.8} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &4056566997434591085 PrefabInstance: m_ObjectHideFlags: 0 @@ -2387,3 +2829,8 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4060305112283542636, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} m_PrefabInstance: {fileID: 4056566997434591085} m_PrefabAsset: {fileID: 0} +--- !u!1 &8100393348720881591 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5197632138137602266, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} + m_PrefabInstance: {fileID: 4056566997434591085} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Script/Game/GameLogic.cs b/Assets/Script/Game/GameLogic.cs index 3da75d0..41ba2ab 100644 --- a/Assets/Script/Game/GameLogic.cs +++ b/Assets/Script/Game/GameLogic.cs @@ -370,7 +370,8 @@ public partial class GameLogic : IDisposable { ChangeGameInProgress(true); Debug.Log("GameInProgress 변경 true"); - + GameButtonSetter(GameInProgress); // 버튼 상태 교체 + ExecuteOnMainThread(() => { // 로딩 패널 열려있으면 닫기 @@ -380,6 +381,14 @@ public partial class GameLogic : IDisposable SetState(FirstPlayerState); }); } + // 버튼 상태 교체 함수 + private void GameButtonSetter(bool gameInProgress) + { + ExecuteOnMainThread(() => + { + GameManager.Instance.SetButtonsIndicator(gameInProgress); + }); + } // 방 데이터 유효성 검사 헬퍼 함수 private bool ValidateRoomData(object roomData, string operationName) diff --git a/Assets/Script/Game/GameManager.cs b/Assets/Script/Game/GameManager.cs index 10bc6fc..9b396cd 100644 --- a/Assets/Script/Game/GameManager.cs +++ b/Assets/Script/Game/GameManager.cs @@ -119,6 +119,12 @@ public class GameManager : Singleton if (_gameUIController == null) return; _gameUIController.SetTurnIndicator(isFirstPlayer); } + + public void SetButtonsIndicator(bool gameInProgress) + { + if (_gameUIController == null) return; + _gameUIController.SetButtonsIndicator(gameInProgress); + } public bool GetRequestDrawChance() { diff --git a/Assets/Script/Game/GameUtility/GameRoutine.cs b/Assets/Script/Game/GameUtility/GameRoutine.cs index fd79021..f8f4b54 100644 --- a/Assets/Script/Game/GameUtility/GameRoutine.cs +++ b/Assets/Script/Game/GameUtility/GameRoutine.cs @@ -89,6 +89,8 @@ public partial class GameLogic //TODO: 게임 종료 후 행동 구현 ChangeGameInProgress(false); Debug.Log("GameInProgress 변경 false"); + // 인게임 버튼 표시 + GameManager.Instance.SetButtonsIndicator(false); } public void SetLastPositioned(int row, int col) diff --git a/Assets/Sprites/Game UI/btn_game_exit 1.png b/Assets/Sprites/Game UI/btn_game_exit 1.png new file mode 100644 index 0000000000000000000000000000000000000000..0bebb3449d253beac037503840c6b2d8939241df GIT binary patch literal 552 zcmeAS@N?(olHy`uVBq!ia0vp^_8`o`3?vg8AG`%pjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%t^bC&U#<2V_N|A^*%spa_ukOACifK?H$Z-_$Vw43Gi@0;>mdJ!1nQ zg8ms1K=nY{J`JP2TyD{uh0hALrZHm;br>e*WD0H-FO4+kg9$zTW=L*Y~#^WpAm} zzg^(``OaVW(g~44wOjt1Ez{og{N4Zck1x-QtlxRP{^pajuc!2CY=0v5KDx@xd^h8* z>b8`UmHT&owg3L-W5vIdZPSbXnV-wQ|GM8=vdiKBq!++gW?=Ai^>bP0l+XkKN!b5R literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Panel UI/close_button-bg.png.meta b/Assets/Sprites/Game UI/btn_game_exit 1.png.meta similarity index 96% rename from Assets/Sprites/Panel UI/close_button-bg.png.meta rename to Assets/Sprites/Game UI/btn_game_exit 1.png.meta index 2b9b648..58b7add 100644 --- a/Assets/Sprites/Panel UI/close_button-bg.png.meta +++ b/Assets/Sprites/Game UI/btn_game_exit 1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 18ae4aac85f6d444b9ffb2ac80f27c45 +guid: 488ca1767f0dae24195cd77590bf308f TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 1 mipBias: 0 wrapU: 1 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -94,7 +94,7 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Android + buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -107,11 +107,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: iPhone + buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/Game UI/btn_game_exit_ivory.png b/Assets/Sprites/Game UI/btn_game_exit_ivory.png new file mode 100644 index 0000000000000000000000000000000000000000..34fbe62eb58aee507ade21d1996238845c1ef72e GIT binary patch literal 549 zcmeAS@N?(olHy`uVBq!ia0vp^_8`o`3?vg8AG`%pjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkNMV3ah%1o(|Me;D(1!LMAiESwg8YIRO7H)F->>?3>fzO}Pai)_P&@v0=@R8FH_rkcZsh6W7*a9k?e&*jhYWZa9xS`esa5fyQDNWz?#c&^ zpPMY7H_rYV5$!AN!ur`c;%<2C^lh3PaR=@vzhkP{(=}%gf8jD!`CUK$IOcOz#+5ew z{vWqwt7t;=w?%XA&1ut76MxEj&)%(c>WLYzT;EmvyEA!j%l4}O8V>RWTiRa*g(SFr zeK4PWo0;mbDe?PCzjs|%SE+w$u&hF6dzH%eN}cT$Cg#;P=2h%@pY-lLn7iYhXuVKx zZo+q=jXWmqW$*Vs`)=Iz<@ef!cUM1Oe|GI2NxRCrcRx1Yx3~U(2QjkE_4& z`u^HxvoD_it{rT6w)1!Ys|7n2{Yv@&mL+@B^LPK(KfXLKvVQ0F`lWa7zMe8yW&0Dp z_tjNq_g~emdAb~q@<+@BhBSkxtDnm{ Hr-UW|Dqu9S literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Panel UI/settings_icon.png.meta b/Assets/Sprites/Game UI/btn_game_exit_ivory.png.meta similarity index 96% rename from Assets/Sprites/Panel UI/settings_icon.png.meta rename to Assets/Sprites/Game UI/btn_game_exit_ivory.png.meta index ceb858e..ac3594e 100644 --- a/Assets/Sprites/Panel UI/settings_icon.png.meta +++ b/Assets/Sprites/Game UI/btn_game_exit_ivory.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 17abb32a02ecec341b8b2396c7830408 +guid: 04b20bf7cb802174db748b752be5178f TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 1 mipBias: 0 wrapU: 1 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -94,7 +94,7 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Android + buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -107,11 +107,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: iPhone + buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/Panel UI/close_button-bg.png b/Assets/Sprites/Panel UI/close_button-bg.png deleted file mode 100644 index 1a60a09919561e2efffe64e12193ccc6c93975d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1105 zcmV-X1g`suP)ztEJe9orLy#PmiA@ zw!TPKWJi9Yw3u0$TT!*(cUDV-o0Uubd9J@7>+cT%kXcwMtz4~`9&)YQS`nu7K?=`%hFu0SJMT! z4%e?%s}QRf6d8M;jyIc)(OR3BKzr-;+L!o_BB7NqEE}7wi~MrA9E5lwbzsM*+3)ve zNbGjIs$WXv>Mv5mHW($hE(i3B{#%HzDG-W;XRwXJqY=I*4n0VImMaQ?mI!x^%CP}G zT8N)~2^Ta$m*(K%>UkSsMT}b`cub9O1L!3LH}DaYsgk>6Lr3XQAgT-2E+s2FFG6PY z2td9d5YK|F?CaJzZ$6(#9R?w7;v5Pb+uC(9QcGXunt&23;B{$JNLjy(?NwhZ|LU4g z8jLi+5l=Nw=eYf%9}4G~PO*MHq3$v823Ch?L4k3t{nlB&0 zyNv58Of7xp(?A)+#iz1}AiUiy?@2E>ckt~jrhE4F7QwZb_oOq<#eG*pr?N08tcGfG zAn#*sJ%J_Q7Au!7(iwMw@7PACv8xh7+H9#*P{g3*F2cK_DWmJVtj5~k@vWtz7UbL= zOEvH9gSOcldAy%)z*Yo4SS5m{04Vx_H7CGEXz&rLi?-AexzsR%$IwyTvyRMr9CL8a zx9t4(IeU^}{Q@%V0XZz0^C8;!CeQC3jXXyGGmNS(n?w)nEPfl z46vuw>ah>q5lu`?Oc*jFBLK|#$8Cb>6Su=`HhZG?1RJ@jLG8U5+WZTp$!q0pr1FW{FW_unn*`_K3d6qZa?znXU88PmT^ekfi zdi`6kqb|PlQ+C`I7i1ohk373M>r)KB$IE`#R1=w5ZvDuh52b6* zim3p&Rg6t!55<;Dt|r(G59C~Zh}i#QI*#EasKbvX32i+XJ6i*lGf>$WUSN4A(*#-r zW7$GS<#hBvNOdwOthQ0v$)qZ6F-)we2HepP=;-lwfqp}|z-`IgYl!w!HRR`^&qm_y zlI_u=Jmf_WRK}8<%U_2?#maiNaEJk8!->abCV3mNE@-zSd002ovPDHLkV1k}dbE^OV From 7a8d895fe3f71708bcce32f7aff01601ed5e8fcf Mon Sep 17 00:00:00 2001 From: Jay <96156114+jaydev00a@users.noreply.github.com> Date: Fri, 28 Mar 2025 17:09:03 +0900 Subject: [PATCH 5/5] =?UTF-8?q?DO-71=20[Feat]=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EB=B0=94=EC=9D=B8=EB=94=A9=20=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Prefabs/[Canvas] Game UI.prefab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab index e7db964..5b29c84 100644 --- a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab +++ b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab @@ -397,7 +397,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 3933575647777291622} m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp - m_MethodName: OnClickConfirmButton + m_MethodName: m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -608,7 +608,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 3933575647777291622} m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp - m_MethodName: OnClickInGameMenuOpenButton + m_MethodName: m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0}