diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index ba239e5b..cf99487d 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -47,6 +47,7 @@ + @@ -59,12 +60,15 @@ + + + @@ -73,10 +77,10 @@ + - @@ -89,6 +93,8 @@ + + diff --git a/Assets/Resources/Prefabs/UI/Popup.meta b/Assets/Resources/Prefabs/UI/Popup.meta new file mode 100644 index 00000000..b4a564ef --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Popup.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5332aff4cffc42e391052712f16c7ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/UI_Button.prefab b/Assets/Resources/Prefabs/UI/Popup/UI_Button.prefab similarity index 70% rename from Assets/Resources/Prefabs/UI/UI_Button.prefab rename to Assets/Resources/Prefabs/UI/Popup/UI_Button.prefab index 82f93166..77c72e43 100644 --- a/Assets/Resources/Prefabs/UI/UI_Button.prefab +++ b/Assets/Resources/Prefabs/UI/Popup/UI_Button.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &674762471991741976 +--- !u!1 &78949930531875600 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4052284149151321047} - - component: {fileID: 6325019583860280034} - - component: {fileID: 672814883393364380} + - component: {fileID: 4700246123710337536} + - component: {fileID: 1303652153787209091} + - component: {fileID: 396838367895134598} m_Layer: 5 m_Name: ScoreText m_TagString: Untagged @@ -18,40 +18,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4052284149151321047 +--- !u!224 &4700246123710337536 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 674762471991741976} + m_GameObject: {fileID: 78949930531875600} 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: 3769451323824981832} + m_Father: {fileID: 7456765302686930532} 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: -336, y: 163} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6325019583860280034 +--- !u!222 &1303652153787209091 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 674762471991741976} + m_GameObject: {fileID: 78949930531875600} m_CullTransparentMesh: 1 ---- !u!114 &672814883393364380 +--- !u!114 &396838367895134598 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 674762471991741976} + m_GameObject: {fileID: 78949930531875600} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -136,7 +136,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1783748317587288301 +--- !u!1 &2209439117487879149 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -144,67 +144,65 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5972707328687814934} - - component: {fileID: 2356163868981715117} - - component: {fileID: 7198302959039025284} - - component: {fileID: 2097030193274746975} + - component: {fileID: 354089615135764141} + - component: {fileID: 5917755496447864375} + - component: {fileID: 8220238413826132129} m_Layer: 5 - m_Name: PointButton + m_Name: BackGround m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5972707328687814934 +--- !u!224 &354089615135764141 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783748317587288301} + m_GameObject: {fileID: 2209439117487879149} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5907853365701265717} - m_Father: {fileID: 3769451323824981832} + m_Children: [] + m_Father: {fileID: 7456765302686930532} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2356163868981715117 +--- !u!222 &5917755496447864375 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783748317587288301} + m_GameObject: {fileID: 2209439117487879149} m_CullTransparentMesh: 1 ---- !u!114 &7198302959039025284 +--- !u!114 &8220238413826132129 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783748317587288301} + m_GameObject: {fileID: 2209439117487879149} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: - m_EditorClassIdentifier: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.25490198} 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -213,51 +211,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2097030193274746975 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783748317587288301} - 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: 7198302959039025284} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &2849477420388522791 +--- !u!1 &2858428557132539339 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -265,125 +219,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3769451323824981832} - - component: {fileID: 1028472230285735111} - - component: {fileID: 1246705963093010833} - - component: {fileID: 8471271639590562837} - - component: {fileID: 1266821968961854940} - m_Layer: 5 - m_Name: UI_Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3769451323824981832 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2849477420388522791} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5972707328687814934} - - {fileID: 4052284149151321047} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!223 &1028472230285735111 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2849477420388522791} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &1246705963093010833 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2849477420388522791} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &8471271639590562837 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2849477420388522791} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1266821968961854940 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2849477420388522791} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: abc041b7564ef4eebb9c3e4334f6f47e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &7372851838468764625 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5907853365701265717} - - component: {fileID: 6057301591724748895} - - component: {fileID: 6785106383967977823} + - component: {fileID: 9079849633160232602} + - component: {fileID: 2324172799363411686} + - component: {fileID: 4043005522759585965} m_Layer: 5 m_Name: PointText m_TagString: Untagged @@ -391,40 +229,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5907853365701265717 +--- !u!224 &9079849633160232602 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372851838468764625} + m_GameObject: {fileID: 2858428557132539339} 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: 5972707328687814934} + m_Father: {fileID: 2781386551948675817} 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 &6057301591724748895 +--- !u!222 &2324172799363411686 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372851838468764625} + m_GameObject: {fileID: 2858428557132539339} m_CullTransparentMesh: 1 ---- !u!114 &6785106383967977823 +--- !u!114 &4043005522759585965 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372851838468764625} + m_GameObject: {fileID: 2858428557132539339} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -509,3 +347,273 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3539530894510243829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7859937702717700359} + m_Layer: 0 + m_Name: TestObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7859937702717700359 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3539530894510243829} + serializedVersion: 2 + 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: 7456765302686930532} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4140392046085078881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2781386551948675817} + - component: {fileID: 4005906368228367610} + - component: {fileID: 5515945585222581362} + - component: {fileID: 9095414415076227529} + m_Layer: 5 + m_Name: PointButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2781386551948675817 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4140392046085078881} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9079849633160232602} + m_Father: {fileID: 7456765302686930532} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4005906368228367610 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4140392046085078881} + m_CullTransparentMesh: 1 +--- !u!114 &5515945585222581362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4140392046085078881} + 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: 10905, 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!114 &9095414415076227529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4140392046085078881} + 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: 5515945585222581362} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &6202759135387968287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7456765302686930532} + - component: {fileID: 8322633274733099189} + - component: {fileID: 8721510664381681934} + - component: {fileID: 1424638479575322043} + - component: {fileID: 2122694503371422182} + m_Layer: 5 + m_Name: UI_Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7456765302686930532 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6202759135387968287} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 354089615135764141} + - {fileID: 2781386551948675817} + - {fileID: 4700246123710337536} + - {fileID: 7859937702717700359} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &8322633274733099189 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6202759135387968287} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &8721510664381681934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6202759135387968287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &1424638479575322043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6202759135387968287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &2122694503371422182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6202759135387968287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: abc041b7564ef4eebb9c3e4334f6f47e, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Resources/Prefabs/UI/UI_Button.prefab.meta b/Assets/Resources/Prefabs/UI/Popup/UI_Button.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/UI_Button.prefab.meta rename to Assets/Resources/Prefabs/UI/Popup/UI_Button.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Scene.meta b/Assets/Resources/Prefabs/UI/Scene.meta new file mode 100644 index 00000000..039ab9c6 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Scene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 489bb3e689b6c4447aa3628a4ce6e630 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index abb06aa5..4dbac7d8 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -646,103 +646,6 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_RenderingLayers: 1 m_ShadowRenderingLayers: 1 ---- !u!1001 &677529435 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2849477420388522791, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_Name - value: UI_Button - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3769451323824981832, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} --- !u!1 &974943946 GameObject: m_ObjectHideFlags: 0 @@ -994,6 +897,103 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7501193224381712437, guid: b0bf65c01867c483eb12667c812faa21, type: 3} m_PrefabInstance: {fileID: 254139698} m_PrefabAsset: {fileID: 0} +--- !u!1001 &126475999013816968 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6202759135387968287, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_Name + value: UI_Button + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7456765302686930532, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 17dd0c4bd3a4d4486b8c356f40ed5fd4, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1005,4 +1005,4 @@ SceneRoots: - {fileID: 132719926} - {fileID: 1085473719} - {fileID: 86325471} - - {fileID: 677529435} + - {fileID: 126475999013816968} diff --git a/Assets/Scripts/Controllers/PlayerController.cs b/Assets/Scripts/Controllers/PlayerController.cs index 8d5cfebd..4f2b27db 100644 --- a/Assets/Scripts/Controllers/PlayerController.cs +++ b/Assets/Scripts/Controllers/PlayerController.cs @@ -8,13 +8,13 @@ public class PlayerController : MonoBehaviour private Vector3 _destPos; - public enum PlayerState { Idle, Move, Die } + PlayerState _playerState = PlayerState.Idle; void Start() @@ -24,7 +24,13 @@ public class PlayerController : MonoBehaviour Managers.Input.MouseAction -= OnMouseClicked; Managers.Input.MouseAction += OnMouseClicked; - Managers.Resource.Instantiate("UI/UI_Button"); + // Managers.Resource.Instantiate("UI/UI_Button"); + // Managers.UI.ShowPopupUI("UI_Button"); + // Managers.UI.ClosePopupUI(); + + //이게 안정 버전 + // UI_Button button = Managers.UI.ShowPopupUI("UI_Button"); + // Managers.UI.ClosePopupUI(button); } diff --git a/Assets/Scripts/Managers/InputManager.cs b/Assets/Scripts/Managers/InputManager.cs index 75b42bf2..71e9aa12 100644 --- a/Assets/Scripts/Managers/InputManager.cs +++ b/Assets/Scripts/Managers/InputManager.cs @@ -9,6 +9,7 @@ public class InputManager bool _pressed = false; + // ReSharper disable Unity.PerformanceAnalysis public void OnUpdate() { // if(Input.anyKey == false) return; diff --git a/Assets/Scripts/Managers/Managers.cs b/Assets/Scripts/Managers/Managers.cs index 90516657..487d6178 100644 --- a/Assets/Scripts/Managers/Managers.cs +++ b/Assets/Scripts/Managers/Managers.cs @@ -8,10 +8,12 @@ public class Managers : MonoBehaviour InputManager _input = new InputManager(); ResourceManager _resource = new ResourceManager(); + UIManager _ui = new UIManager(); public static InputManager Input { get { return Instance._input; } } public static ResourceManager Resource { get { return Instance._resource; } } - - + public static UIManager UI { get { return Instance._ui; } } + + static void init() { if (s_instance == null) @@ -30,7 +32,7 @@ public class Managers : MonoBehaviour // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { - // init(); + init(); } // Update is called once per frame diff --git a/Assets/Scripts/Managers/UIManager.cs b/Assets/Scripts/Managers/UIManager.cs new file mode 100644 index 00000000..adc82f84 --- /dev/null +++ b/Assets/Scripts/Managers/UIManager.cs @@ -0,0 +1,114 @@ +using System.Collections.Generic; +using UnityEngine; + +public class UIManager +{ + // UIManager 를 왜 만들어? == Canvas의 Sort Order 관리하기 위해서 만든다. + // PopUP을 위해서 관리를 하는거고 PopUP은 Stack 구조로 관리하는게 좋다. + // 그리고 소팅 안하는 씬같은 경우 오더의 수가 0으로 고정을 해놨기에 오더의 초기값을 0이 아닌 다른값으로 하는게 좋다. + // 10으로 하는건 혹시나 0~9를 앞에서 사용하게 하거나 먼저 띄우고 싶은게 있을 수 있으니 비워둔다. + int _order = 10; + + Stack _popupStack = new Stack(); + UI_Scene _sceneUI = null; + + // 그냥 Popup을 계속 띄우게 되면 이게 플레이 씬 볼때 굉장히 복잡하게 나타나는대 이걸 빈 게임 오브젝트를 만들어서 관리하게 한다. + // 약간 폴더 같은 느낌이라 보면 된다. + public GameObject Root + { + get + { + GameObject root = GameObject.Find("@UI_Root"); + if (root == null) { root = new GameObject { name = "@UI_Root" }; } + + return root; + } + } + + // 이게 위치하는 곳은 UI_Scene와 UI_Popup의 시작부분에 위치해야 한다. + public void SetCanvas(GameObject go, bool sort = true) + { + Canvas canvas = Util.GetOrAddComponent(go); + canvas.renderMode = RenderMode.ScreenSpaceOverlay; + // 캔버스 안에 캔버스가 있을때 그게 어떤 값을 가지고 있어도 내껀 내꺼다 라는 옵션이다. + canvas.overrideSorting = true; + + if (sort) + canvas.sortingOrder = _order++; + else + canvas.sortingOrder = 0; + + // UI가 이벤트를 받으려면 반드시 필요 + Util.GetOrAddComponent(go); + } + + + // name = 프리팹의 의 이름 + // 인자로 받는 T = 스크립트의 이름 + public T ShowPopupUI(string name = null) where T : UI_Popup + { + if (string.IsNullOrEmpty(name)) name = typeof(T).Name; + + // Resources/Prefabs/UI/Popup/폴더에서 name과 일치하는 프리팹을 로드한다. + GameObject go = Managers.Resource.Instantiate($"UI/Popup/{name}"); + + T popup = Util.GetOrAddComponent(go); + _popupStack.Push(popup); + // 그냥 order++ 하면 1,2,3,4,5 ... 이렇게 올라가는데 중요한건 이 방법을 통하지 않고 + // 그냥 유니티에서 바로 씬에 오브젝트를 올려 버리면 이 오더값이 꼬일 수 있다. + // 그래서 여기에서 바로 넣는게 아니라 UI_Popup에서 바로 초기화해서 확인하게 하는게 좋다. + + go.transform.SetParent(Root.transform); + + + + return popup; + } + + public void ClosePopupUI() + { + if (_popupStack.Count == 0) return; + + UI_Popup popup = _popupStack.Pop(); + Managers.Resource.Destroy(popup.gameObject); + // 삭제 했는데 접근하면 안되니까 이제 이 값을 날려서 접근자체를 막아 버리기 + popup = null; + + _order--; + } + + // 스택이라 마지막이 날아가야 하는데 혹시나 아닐 경우 체크하는 버전 + public void ClosePopupUI(UI_Popup popup) + { + if (_popupStack.Count == 0) return; + if (_popupStack.Peek() != popup) + { + Debug.Log("Close Popup Failed!"); + return; + } + + ClosePopupUI(); + } + + public void CloseAllPopupUI() + { + while (_popupStack.Count > 0) + ClosePopupUI(); + } + + + public T ShowSceneUI(string name = null) where T : UI_Scene + { + if (string.IsNullOrEmpty(name)) name = typeof(T).Name; + + GameObject go = Managers.Resource.Instantiate($"UI/Scene/{name}"); + T scene = Util.GetOrAddComponent(go); + _sceneUI = scene; + + go.transform.SetParent(Root.transform); + + + + return scene; + } +} diff --git a/Assets/Scripts/Managers/UIManager.cs.meta b/Assets/Scripts/Managers/UIManager.cs.meta new file mode 100644 index 00000000..58f3ee40 --- /dev/null +++ b/Assets/Scripts/Managers/UIManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a3eb58c4687274e1ca533b6479321dcf \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup.meta b/Assets/Scripts/UI/Popup.meta new file mode 100644 index 00000000..764219e9 --- /dev/null +++ b/Assets/Scripts/UI/Popup.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4445627f7958d41219f688eb468e779d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Popup/UI_Button.cs b/Assets/Scripts/UI/Popup/UI_Button.cs new file mode 100644 index 00000000..34f1fcd1 --- /dev/null +++ b/Assets/Scripts/UI/Popup/UI_Button.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using TMPro; +using Unity.VisualScripting; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.EventSystems; +using Object = UnityEngine.Object; + +public class UI_Button : UI_Popup +{ + enum Buttons + { + PointButton + } + enum Texts + { + PointText, + ScoreText + } + + enum GameObjects + { + TestObject, + } + + enum Images + { + ItemIcon + } + + private void Start() + { + Init(); + } + + + public override void Init() + { + // 내 부모의 Init() 호출 + base.Init(); + Bind