diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index 06f99abfc..14222e30f 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -61,7 +61,7 @@
-
+
@@ -472,22 +472,22 @@
/Applications/Unity/Hub/Editor/6000.2.2f1/Unity.app/Contents/Managed/UnityEngine/UnityEditor.XRModule.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.collections@d49facba0036/Unity.Collections.LowLevel.ILSupport/Unity.Collections.LowLevel.ILSupport.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.collections@d49facba0036/Unity.Collections.LowLevel.ILSupport/Unity.Collections.LowLevel.ILSupport.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.ext.nunit@031a54704bff/net40/unity-custom/nunit.framework.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.ext.nunit@031a54704bff/net40/unity-custom/nunit.framework.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.collections@d49facba0036/Unity.Collections.Tests/System.IO.Hashing/System.IO.Hashing.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.collections@d49facba0036/Unity.Collections.Tests/System.IO.Hashing/System.IO.Hashing.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.visualscripting@6279e2b7c485/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.visualscripting@6279e2b7c485/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.nuget.mono-cecil@d78732e851eb/Mono.Cecil.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.nuget.mono-cecil@d78732e851eb/Mono.Cecil.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.collections@d49facba0036/Unity.Collections.Tests/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.collections@d49facba0036/Unity.Collections.Tests/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.dll
/Applications/Unity/Hub/Editor/6000.2.2f1/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll
@@ -498,12 +498,6 @@
/Applications/Unity/Hub/Editor/6000.2.2f1/PlaybackEngines/iOSSupport/UnityEditor.Apple.Extensions.Common.dll
-
- /Applications/Unity/Hub/Editor/6000.2.2f1/PlaybackEngines/AndroidPlayer/Unity.Android.Types.dll
-
-
- /Applications/Unity/Hub/Editor/6000.2.2f1/PlaybackEngines/AndroidPlayer/Unity.Android.Gradle.dll
-
/Applications/Unity/Hub/Editor/6000.2.2f1/Unity.app/Contents/PlaybackEngines/MacStandaloneSupport/UnityEditor.iOS.Extensions.Xcode.dll
@@ -874,151 +868,151 @@
/Applications/Unity/Hub/Editor/6000.2.2f1/Unity.app/Contents/NetStandard/compat/2.1.0/shims/netfx/mscorlib.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Core.ShaderLibrary.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Core.ShaderLibrary.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.SettingsProvider.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.SettingsProvider.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.Updater.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.Updater.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/PPv2URPConverters.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/PPv2URPConverters.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.Shared.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.Shared.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.2D.Runtime.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.2D.Runtime.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Shared.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Shared.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Searcher.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Searcher.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Burst.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Burst.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Rendering.LightTransport.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Rendering.LightTransport.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Rider.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Rider.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.Editor.ConversionSystem.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.Editor.ConversionSystem.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Flow.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Flow.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.ForUI.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.ForUI.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.GPUDriven.Runtime.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.GPUDriven.Runtime.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.State.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.State.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/UnityEngine.UI.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/UnityEngine.UI.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Multiplayer.Center.Common.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Multiplayer.Center.Common.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Burst.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Burst.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Core.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Core.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Multiplayer.Center.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Multiplayer.Center.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Runtime.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Runtime.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Rendering.LightTransport.Runtime.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Rendering.LightTransport.Runtime.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.State.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.State.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Config.Runtime.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Config.Runtime.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipeline.Universal.ShaderLibrary.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipeline.Universal.ShaderLibrary.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.ShaderGraph.Editor.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.ShaderGraph.Editor.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.Shared.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.Shared.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.dll
- /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/UnityEditor.UI.dll
+ /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/UnityEditor.UI.dll
diff --git a/Assets/Resources/Prefabs/UI/Button_Menu.prefab b/Assets/Resources/Prefabs/UI/Button.prefab
similarity index 64%
rename from Assets/Resources/Prefabs/UI/Button_Menu.prefab
rename to Assets/Resources/Prefabs/UI/Button.prefab
index a990ace55..76c838b83 100644
--- a/Assets/Resources/Prefabs/UI/Button_Menu.prefab
+++ b/Assets/Resources/Prefabs/UI/Button.prefab
@@ -11,8 +11,9 @@ GameObject:
- component: {fileID: 2762200673560835878}
- component: {fileID: 6266541535982698602}
- component: {fileID: 4779626573259465568}
+ - component: {fileID: 1476951132948232971}
m_Layer: 5
- m_Name: Image_Button
+ m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -25,17 +26,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 449580107594036610}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 6604521975151366511}
+ m_Father: {fileID: 4763732262302757001}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 1, y: 1}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 70}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &6266541535982698602
CanvasRenderer:
@@ -75,6 +76,26 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1476951132948232971
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 449580107594036610}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.LayoutElement
+ m_IgnoreLayout: 0
+ m_MinWidth: -1
+ m_MinHeight: 0
+ m_PreferredWidth: -1
+ m_PreferredHeight: 7
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: 7
+ m_LayoutPriority: 1
--- !u!1 &1580600557021597842
GameObject:
m_ObjectHideFlags: 0
@@ -86,8 +107,9 @@ GameObject:
- component: {fileID: 7680063181065998356}
- component: {fileID: 5882182687230408027}
- component: {fileID: 7638979819089434760}
+ - component: {fileID: 9031577606755857287}
m_Layer: 5
- m_Name: Text_Button
+ m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -100,17 +122,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1580600557021597842}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 6604521975151366511}
+ m_Father: {fileID: 4763732262302757001}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 30}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &5882182687230408027
CanvasRenderer:
@@ -151,8 +173,8 @@ MonoBehaviour:
serializedVersion: 2
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
+ m_enableVertexGradient: 1
+ m_colorMode: 0
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
@@ -168,13 +190,13 @@ MonoBehaviour:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 20.7
- m_fontSizeBase: 20
+ m_fontSizeBase: 0
m_fontWeight: 400
m_enableAutoSizing: 1
- m_fontSizeMin: 18
- m_fontSizeMax: 32
+ m_fontSizeMin: 12
+ m_fontSizeMax: 36
m_fontStyle: 1
- m_HorizontalAlignment: 2
+ m_HorizontalAlignment: 16
m_VerticalAlignment: 4096
m_textAlignment: 65535
m_characterSpacing: 0
@@ -211,6 +233,26 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &9031577606755857287
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1580600557021597842}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.LayoutElement
+ m_IgnoreLayout: 0
+ m_MinWidth: -1
+ m_MinHeight: 0
+ m_PreferredWidth: -1
+ m_PreferredHeight: 3
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: 3
+ m_LayoutPriority: 1
--- !u!1 &4605209629826112846
GameObject:
m_ObjectHideFlags: 0
@@ -225,7 +267,7 @@ GameObject:
- component: {fileID: 2617631971427389026}
- component: {fileID: 3717950453875740635}
m_Layer: 5
- m_Name: Button_Menu
+ m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -243,8 +285,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 2762200673560835878}
- - {fileID: 7680063181065998356}
+ - {fileID: 2078534210891379260}
+ - {fileID: 4763732262302757001}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
@@ -346,3 +388,142 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e94b36a8b70bf4862a4cd3e7f12c1044, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Form_MenuBtn
+--- !u!1 &5911498129342653775
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4763732262302757001}
+ - component: {fileID: 9108582763878958392}
+ m_Layer: 0
+ m_Name: Stack
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4763732262302757001
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5911498129342653775}
+ 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: 2762200673560835878}
+ - {fileID: 7680063181065998356}
+ m_Father: {fileID: 6604521975151366511}
+ 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!114 &9108582763878958392
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5911498129342653775}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.VerticalLayoutGroup
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 1
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 1
+ m_ChildForceExpandHeight: 1
+ m_ChildControlWidth: 1
+ m_ChildControlHeight: 1
+ m_ChildScaleWidth: 1
+ m_ChildScaleHeight: 1
+ m_ReverseArrangement: 0
+--- !u!1 &9165887035246127589
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2078534210891379260}
+ - component: {fileID: 5499524540240977664}
+ - component: {fileID: 2405566198731825972}
+ m_Layer: 5
+ m_Name: BackGround
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2078534210891379260
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9165887035246127589}
+ 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: 6604521975151366511}
+ 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 &5499524540240977664
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9165887035246127589}
+ m_CullTransparentMesh: 1
+--- !u!114 &2405566198731825972
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9165887035246127589}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+ 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: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
diff --git a/Assets/Resources/Prefabs/UI/Button_Menu.prefab.meta b/Assets/Resources/Prefabs/UI/Button.prefab.meta
similarity index 100%
rename from Assets/Resources/Prefabs/UI/Button_Menu.prefab.meta
rename to Assets/Resources/Prefabs/UI/Button.prefab.meta
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index da98caa15..4cf364c5a 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -2113,6 +2113,26 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 70
+ objectReference: {fileID: 0}
+ - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 4605209629826112846, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
propertyPath: m_Name
value: Form_Button
@@ -2197,6 +2217,30 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 30
+ objectReference: {fileID: 0}
+ - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 50
+ objectReference: {fileID: 0}
+ - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -100
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
diff --git a/Assets/Scripts/Managers/ResourceManager.cs b/Assets/Scripts/Managers/ResourceManager.cs
index 1c7a7ced6..e6d85351b 100644
--- a/Assets/Scripts/Managers/ResourceManager.cs
+++ b/Assets/Scripts/Managers/ResourceManager.cs
@@ -11,7 +11,6 @@ public class ResourceManager: IManager
{
private Dictionary _resources = new Dictionary();
-
public T Load(string path) where T : Object
{
if (string.IsNullOrEmpty(path))
diff --git a/Assets/Scripts/Managers/UIManager.cs b/Assets/Scripts/Managers/UIManager.cs
index 7ed0d3d32..e8194fab6 100644
--- a/Assets/Scripts/Managers/UIManager.cs
+++ b/Assets/Scripts/Managers/UIManager.cs
@@ -1,5 +1,7 @@
using System.Collections.Generic;
+using JetBrains.Annotations;
using UnityEngine;
+using UnityEngine.Events;
public class UIManager : IManager
{
@@ -14,7 +16,7 @@ public class UIManager : IManager
foreach (var ui in _uiList)
{
string path = Define.MapPath(ui);
- CreateObject(path);
+ CreateObject(path, ui);
}
}
}
@@ -28,36 +30,51 @@ public class UIManager : IManager
_canvas = GameObject.Find("@Canvas").GetComponent