diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index 67d99b70a..f8a7ef9a6 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -425,47 +425,53 @@ /Applications/Unity/Hub/Editor/6000.2.2f1/Unity.app/Contents/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll + + /Applications/Unity/Hub/Editor/6000.2.2f1/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll + + + /Applications/Unity/Hub/Editor/6000.2.2f1/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll + /Applications/Unity/Hub/Editor/6000.2.2f1/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.visualscripting@6279e2b7c485/Editor/VisualScripting.Core/Dependencies/YamlDotNet/Unity.VisualScripting.YamlDotNet.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.visualscripting@6279e2b7c485/Editor/VisualScripting.Core/Dependencies/YamlDotNet/Unity.VisualScripting.YamlDotNet.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.collections@d49facba0036/Unity.Collections.LowLevel.ILSupport/Unity.Collections.LowLevel.ILSupport.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.ext.nunit@031a54704bff/net40/unity-custom/nunit.framework.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.collab-proxy@ab839cc7d2ad/Lib/Editor/Unity.Plastic.Antlr3.Runtime.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.collab-proxy@ab839cc7d2ad/Lib/Editor/Unity.Plastic.Antlr3.Runtime.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.collab-proxy@ab839cc7d2ad/Lib/Editor/Unity.Plastic.Newtonsoft.Json.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.collab-proxy@ab839cc7d2ad/Lib/Editor/Unity.Plastic.Newtonsoft.Json.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.collab-proxy@ab839cc7d2ad/Lib/Editor/log4netPlastic.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.collab-proxy@ab839cc7d2ad/Lib/Editor/log4netPlastic.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.visualscripting@6279e2b7c485/Editor/VisualScripting.Core/Dependencies/DotNetZip/Unity.VisualScripting.IonicZip.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.visualscripting@6279e2b7c485/Editor/VisualScripting.Core/Dependencies/DotNetZip/Unity.VisualScripting.IonicZip.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.collab-proxy@ab839cc7d2ad/Lib/Editor/unityplastic.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.collab-proxy@ab839cc7d2ad/Lib/Editor/unityplastic.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.collections@d49facba0036/Unity.Collections.Tests/System.IO.Hashing/System.IO.Hashing.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.visualscripting@6279e2b7c485/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/PackageCache/com.unity.visualscripting@6279e2b7c485/Editor/VisualScripting.Core/EditorAssetResources/Unity.VisualScripting.TextureAssets.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/PackageCache/com.unity.visualscripting@6279e2b7c485/Editor/VisualScripting.Core/EditorAssetResources/Unity.VisualScripting.TextureAssets.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.nuget.mono-cecil@d78732e851eb/Mono.Cecil.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 + /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 /Applications/Unity/Hub/Editor/6000.2.2f1/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll @@ -476,6 +482,12 @@ /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 @@ -855,157 +867,157 @@ /Applications/Unity/Hub/Editor/6000.2.2f1/Unity.app/Contents/UnityReferenceAssemblies/unity-4.8-api/Facades/netstandard.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/UnityEngine.TestRunner.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.RenderPipelines.Core.Editor.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.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.RenderPipelines.Core.ShaderLibrary.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.VisualScripting.SettingsProvider.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.RenderPipelines.Universal.Editor.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.AI.Navigation.Updater.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.Editor.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.Editor.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/PPv2URPConverters.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/PPv2URPConverters.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.Core.Runtime.Shared.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.RenderPipelines.Universal.2D.Runtime.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.VisualScripting.Shared.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.Searcher.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.PlasticSCM.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.Burst.Editor.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.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.Rendering.LightTransport.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.Rider.Editor.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.AI.Navigation.Editor.ConversionSystem.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.ShaderGraph.ShaderGraphLibrary.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.RenderPipelines.Core.Runtime.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.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.VisualScripting.Flow.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.VisualStudio.Editor.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.ForUI.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.ForUI.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.RenderPipelines.GPUDriven.Runtime.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.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.VisualScripting.State.Editor.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/UnityEngine.UI.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/UnityEngine.UI.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.Multiplayer.Center.Common.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Burst.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Burst.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.VisualScripting.Core.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.Multiplayer.Center.Editor.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.RenderPipelines.Universal.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.Rendering.LightTransport.Runtime.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.State.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.State.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.RenderPipelines.Universal.Config.Runtime.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.RenderPipeline.Universal.ShaderLibrary.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.Editor.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.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.ShaderGraph.Editor.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.RenderPipelines.Core.Editor.Shared.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/UnityEditor.UI.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/UnityEditor.UI.dll diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 179b45203..06f99abfc 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -47,7 +47,6 @@ - @@ -62,10 +61,13 @@ + + + @@ -92,7 +94,6 @@ - @@ -471,22 +472,22 @@ /Applications/Unity/Hub/Editor/6000.2.2f1/Unity.app/Contents/Managed/UnityEngine/UnityEditor.XRModule.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.collections@d49facba0036/Unity.Collections.LowLevel.ILSupport/Unity.Collections.LowLevel.ILSupport.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.ext.nunit@031a54704bff/net40/unity-custom/nunit.framework.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.collections@d49facba0036/Unity.Collections.Tests/System.IO.Hashing/System.IO.Hashing.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.visualscripting@6279e2b7c485/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.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.nuget.mono-cecil@d78732e851eb/Mono.Cecil.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 + /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 /Applications/Unity/Hub/Editor/6000.2.2f1/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll @@ -497,6 +498,12 @@ /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 @@ -867,151 +874,151 @@ /Applications/Unity/Hub/Editor/6000.2.2f1/Unity.app/Contents/NetStandard/compat/2.1.0/shims/netfx/mscorlib.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.RenderPipelines.Core.Editor.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.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.RenderPipelines.Core.ShaderLibrary.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.VisualScripting.SettingsProvider.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.RenderPipelines.Universal.Editor.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.AI.Navigation.Updater.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.Editor.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.AI.Navigation.Editor.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/PPv2URPConverters.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/PPv2URPConverters.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.Core.Runtime.Shared.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.RenderPipelines.Universal.2D.Runtime.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.VisualScripting.Shared.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.Searcher.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.PlasticSCM.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.Burst.Editor.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.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.Rendering.LightTransport.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.Rider.Editor.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.AI.Navigation.Editor.ConversionSystem.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.ShaderGraph.ShaderGraphLibrary.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.RenderPipelines.Core.Runtime.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.TextMeshPro.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.VisualScripting.Flow.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.VisualStudio.Editor.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.ForUI.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.ForUI.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.RenderPipelines.GPUDriven.Runtime.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Timeline.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.VisualScripting.State.Editor.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Mathematics.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/UnityEngine.UI.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/UnityEngine.UI.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.Multiplayer.Center.Common.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Burst.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Burst.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.VisualScripting.Core.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.Multiplayer.Center.Editor.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.RenderPipelines.Universal.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.Rendering.LightTransport.Runtime.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.State.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.VisualScripting.State.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.RenderPipelines.Universal.Config.Runtime.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.RenderPipeline.Universal.ShaderLibrary.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.Editor.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.Collections.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.ShaderGraph.Editor.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.RenderPipelines.Core.Editor.Shared.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/Unity.InputSystem.dll - /Users/ta9/DEV/Study/Practice_Unity/Library/ScriptAssemblies/UnityEditor.UI.dll + /Users/seankim/1.Program/7. Unity/Practice_Unity/Library/ScriptAssemblies/UnityEditor.UI.dll diff --git a/Assets/ExplosiveLLC.meta b/Assets/ExplosiveLLC.meta new file mode 100644 index 000000000..5ae7050d9 --- /dev/null +++ b/Assets/ExplosiveLLC.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 83e072501ada444a09170a3b9f741ff1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ExplosiveLLC/Warrior Pack Bundle 2 FREE.meta b/Assets/ExplosiveLLC/Warrior Pack Bundle 2 FREE.meta new file mode 100644 index 000000000..aa2145cac --- /dev/null +++ b/Assets/ExplosiveLLC/Warrior Pack Bundle 2 FREE.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f70505b047b17408e8a0f3bbfe1be508 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/VirtualButton.prefab b/Assets/Resources/Prefabs/UI/Button_Action.prefab similarity index 99% rename from Assets/Resources/Prefabs/UI/VirtualButton.prefab rename to Assets/Resources/Prefabs/UI/Button_Action.prefab index 7983c1794..ddbf80ed5 100644 --- a/Assets/Resources/Prefabs/UI/VirtualButton.prefab +++ b/Assets/Resources/Prefabs/UI/Button_Action.prefab @@ -224,7 +224,7 @@ GameObject: - component: {fileID: 8241491832551930024} - component: {fileID: 7830806832268205065} m_Layer: 5 - m_Name: VirtualButton + m_Name: Button_Action m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Prefabs/UI/VirtualButton.prefab.meta b/Assets/Resources/Prefabs/UI/Button_Action.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/VirtualButton.prefab.meta rename to Assets/Resources/Prefabs/UI/Button_Action.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Button_Menu.prefab b/Assets/Resources/Prefabs/UI/Button_Menu.prefab new file mode 100644 index 000000000..a990ace55 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Button_Menu.prefab @@ -0,0 +1,348 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &449580107594036610 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2762200673560835878} + - component: {fileID: 6266541535982698602} + - component: {fileID: 4779626573259465568} + m_Layer: 5 + m_Name: Image_Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2762200673560835878 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 449580107594036610} + 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: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 70} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &6266541535982698602 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 449580107594036610} + m_CullTransparentMesh: 1 +--- !u!114 &4779626573259465568 +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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 0.8113208, g: 0.5778747, b: 0.5778747, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1580600557021597842 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7680063181065998356} + - component: {fileID: 5882182687230408027} + - component: {fileID: 7638979819089434760} + m_Layer: 5 + m_Name: Text_Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7680063181065998356 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1580600557021597842} + 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: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &5882182687230408027 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1580600557021597842} + m_CullTransparentMesh: 1 +--- !u!114 &7638979819089434760 +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: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + 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: "\uC138\uAE00\uC790" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a1bdad51402474a74b099b436581271e, type: 2} + m_sharedMaterial: {fileID: -4168222204856964773, guid: a1bdad51402474a74b099b436581271e, 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: 20.7 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 32 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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 &4605209629826112846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6604521975151366511} + - component: {fileID: 8707263777633295420} + - component: {fileID: 3133140182864001420} + - component: {fileID: 2617631971427389026} + - component: {fileID: 3717950453875740635} + m_Layer: 5 + m_Name: Button_Menu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6604521975151366511 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4605209629826112846} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -20} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8707263777633295420 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4605209629826112846} + m_CullTransparentMesh: 1 +--- !u!114 &3133140182864001420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4605209629826112846} + 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: 0.8773585, g: 0.8773585, b: 0.8773585, 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: 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 &2617631971427389026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4605209629826112846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button + 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: 3133140182864001420} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3717950453875740635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4605209629826112846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e94b36a8b70bf4862a4cd3e7f12c1044, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Form_MenuBtn diff --git a/Assets/Resources/Prefabs/UI/VirtualJoyStick2.prefab.meta b/Assets/Resources/Prefabs/UI/Button_Menu.prefab.meta similarity index 74% rename from Assets/Resources/Prefabs/UI/VirtualJoyStick2.prefab.meta rename to Assets/Resources/Prefabs/UI/Button_Menu.prefab.meta index c0678c44d..462c2fa62 100644 --- a/Assets/Resources/Prefabs/UI/VirtualJoyStick2.prefab.meta +++ b/Assets/Resources/Prefabs/UI/Button_Menu.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8ba622274558e4d7cb94d84f80b5bb15 +guid: 1000c07897c1b4e419a00573ff6810ed PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefabs/UI/ExpBar.prefab b/Assets/Resources/Prefabs/UI/ExpBar.prefab index cc2cd4f40..2a9f7dbeb 100644 --- a/Assets/Resources/Prefabs/UI/ExpBar.prefab +++ b/Assets/Resources/Prefabs/UI/ExpBar.prefab @@ -189,8 +189,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 5, y: 20} - m_SizeDelta: {x: -50, y: 40} + m_AnchoredPosition: {x: 0, y: 40} + m_SizeDelta: {x: -80, y: 40} m_Pivot: {x: 0.5, y: 0} --- !u!222 &147216456297264600 CanvasRenderer: diff --git a/Assets/Resources/Prefabs/UI/VirtualJoyStick.prefab b/Assets/Resources/Prefabs/UI/JoyStick.prefab similarity index 99% rename from Assets/Resources/Prefabs/UI/VirtualJoyStick.prefab rename to Assets/Resources/Prefabs/UI/JoyStick.prefab index d13c3b2f8..ecdc36509 100644 --- a/Assets/Resources/Prefabs/UI/VirtualJoyStick.prefab +++ b/Assets/Resources/Prefabs/UI/JoyStick.prefab @@ -88,7 +88,7 @@ GameObject: - component: {fileID: 548843617059203401} - component: {fileID: 7600973051652199470} m_Layer: 5 - m_Name: VirtualJoyStick + m_Name: JoyStick m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Prefabs/UI/VirtualJoyStick.prefab.meta b/Assets/Resources/Prefabs/UI/JoyStick.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/VirtualJoyStick.prefab.meta rename to Assets/Resources/Prefabs/UI/JoyStick.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/VirtualJoyStick2.prefab b/Assets/Resources/Prefabs/UI/VirtualJoyStick2.prefab deleted file mode 100644 index 6cac980d9..000000000 --- a/Assets/Resources/Prefabs/UI/VirtualJoyStick2.prefab +++ /dev/null @@ -1,166 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &342622590861666234 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3202720528937609651} - - component: {fileID: 298631534663659976} - - component: {fileID: 7742733159584393064} - m_Layer: 5 - m_Name: Controller - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3202720528937609651 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 342622590861666234} - 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: 4550523097787977454} - 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: 200, y: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &298631534663659976 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 342622590861666234} - m_CullTransparentMesh: 1 ---- !u!114 &7742733159584393064 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 342622590861666234} - 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 ---- !u!1 &4359906973221476613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4550523097787977454} - - component: {fileID: 6503616047684656871} - - component: {fileID: 4927488297612981294} - - component: {fileID: 9066846757915439362} - m_Layer: 5 - m_Name: VirtualJoyStick2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4550523097787977454 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4359906973221476613} - 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: 3202720528937609651} - 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: 100, y: 100} - m_SizeDelta: {x: 300, y: 30} - m_Pivot: {x: 0, y: 0} ---- !u!222 &6503616047684656871 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4359906973221476613} - m_CullTransparentMesh: 1 ---- !u!114 &4927488297612981294 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4359906973221476613} - 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: 0, g: 0, b: 0, a: 0.47058824} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &9066846757915439362 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4359906973221476613} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c3d4380d56b824be6b89a98fbc7bb447, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::VirtualJoystick diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 25cca3697..da98caa15 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -503,6 +503,127 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: 0, y: 0, z: 0} m_TimeToStationary: 0.5 +--- !u!1 &303194425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 303194426} + - component: {fileID: 303194429} + - component: {fileID: 303194428} + - component: {fileID: 303194427} + m_Layer: 5 + m_Name: MenuButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &303194426 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 303194425} + 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: 466124658} + m_Father: {fileID: 1342294691} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -100, y: -100} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 1, y: 1} +--- !u!114 &303194427 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 303194425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button + 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: 303194428} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &303194428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 303194425} + 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: 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!222 &303194429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 303194425} + m_CullTransparentMesh: 1 --- !u!1 &330585543 GameObject: m_ObjectHideFlags: 0 @@ -829,6 +950,81 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_RenderingLayers: 1 m_ShadowRenderingLayers: 1 +--- !u!1 &466124657 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 466124658} + - component: {fileID: 466124660} + - component: {fileID: 466124659} + m_Layer: 5 + m_Name: MenuImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &466124658 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 466124657} + 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: 303194426} + 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!114 &466124659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 466124657} + 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: 0.5943396, g: 0.28315237, b: 0.28315237, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &466124660 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 466124657} + m_CullTransparentMesh: 1 --- !u!1 &753933977 GameObject: m_ObjectHideFlags: 0 @@ -957,6 +1153,82 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: 0, y: 0, z: 0} m_TimeToStationary: 0.5 +--- !u!1 &803514456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 803514457} + - component: {fileID: 803514459} + - component: {fileID: 803514458} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &803514457 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 803514456} + 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: 5195689028018022291} + m_Father: {fileID: 1342294691} + 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: 946.84766, y: 77.40253} + m_SizeDelta: {x: 140, y: 500} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &803514458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 803514456} + 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 +--- !u!222 &803514459 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 803514456} + m_CullTransparentMesh: 1 --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -1270,81 +1542,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1294677145 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1294677146} - - component: {fileID: 1294677148} - - component: {fileID: 1294677147} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1294677146 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1294677145} - 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: 1342294691} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -20, y: -20} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 1, y: 1} ---- !u!114 &1294677147 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1294677145} - 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 ---- !u!222 &1294677148 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1294677145} - m_CullTransparentMesh: 1 --- !u!1 &1316678039 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8624529855875019442, guid: 9208ffa390ccf4bd5932dd01eb70dc4b, type: 3} @@ -1427,7 +1624,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -1444,7 +1641,8 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1294677146} + - {fileID: 803514457} + - {fileID: 303194426} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1903,6 +2101,112 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: 0, y: 0, z: 0} m_TimeToStationary: 0.5 +--- !u!1001 &5195689028018022290 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 803514457} + m_Modifications: + - target: {fileID: 449580107594036610, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4605209629826112846, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_Name + value: Form_Button + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} +--- !u!224 &5195689028018022291 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} + m_PrefabInstance: {fileID: 5195689028018022290} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Controllers/CameraController.cs b/Assets/Scripts/Controllers/CameraController.cs index 15dc18ffb..1d4ae05ff 100644 --- a/Assets/Scripts/Controllers/CameraController.cs +++ b/Assets/Scripts/Controllers/CameraController.cs @@ -16,7 +16,7 @@ public class CameraController : MonoBehaviour GameObject _player = null; [SerializeField] // 카메라가 플레이어 캐릭터의 발에서 이정도 위치만큼 이동한 곳의 위치를 바라보도록 한다. - Vector3 _lookAt = new Vector3(0.0f, 1.2f, 0.0f); + Vector3 _lookAt = new Vector3(0.0f, 0.0f, 0.0f); void Start() @@ -28,12 +28,11 @@ public class CameraController : MonoBehaviour switch (_cameraMode) { case Define.CameraMode.QuarterView: + // if (_playerController.IsAttack) return; // 여기 공격 넣어서 하는거 확인하기 Vector3 lookAtPos = _player.transform.position + _lookAt; - transform.position = _player.transform.position + _position; transform.LookAt(lookAtPos); transform.Rotate(Vector3.right, _verticalFraming, Space.Self); - break; default: break; diff --git a/Assets/Scripts/Managers/InputManager.cs b/Assets/Scripts/Managers/InputManager.cs index e7ee608ad..cf935c285 100644 --- a/Assets/Scripts/Managers/InputManager.cs +++ b/Assets/Scripts/Managers/InputManager.cs @@ -12,8 +12,8 @@ public class InputManager: IManager // 조이스틱의 이동을 담당하는 액션 public Action MoveAction = null; - public VirtualJoystick JoyStick { get; set; } - public VirtualButtons Buttons { get; set; } + public Joystick JoyStick { get; set; } + public Button_Action Buttons { get; set; } private InputActions _action; diff --git a/Assets/Scripts/Scenes/GameScene.cs b/Assets/Scripts/Scenes/GameScene.cs index de9a29065..026bbf2d1 100644 --- a/Assets/Scripts/Scenes/GameScene.cs +++ b/Assets/Scripts/Scenes/GameScene.cs @@ -10,8 +10,8 @@ public class GameScene : BaseScene base.Init(); _sceneType = Define.Scene.Game; - Manager.UI.UIList = new List { "ExpBar" , "VirtualJoyStick"}; - var onList = new[] {"ExpBar", "VirtualJoyStick"}; + Manager.UI.UIList = new List { "ExpBar" , "JoyStick"}; + var onList = new[] {"ExpBar", "JoyStick"}; foreach (var list in onList) { Manager.UI.SwitchOnObject(list, true); @@ -29,7 +29,7 @@ public class GameScene : BaseScene void CreateButtons() { - VirtualButtons buttons = _canvas.AddComponent(); + Button_Action buttons = _canvas.AddComponent(); // if (buttons != null) // { diff --git a/Assets/Scripts/UI/VirtualButtons.cs b/Assets/Scripts/UI/Button_Action.cs similarity index 96% rename from Assets/Scripts/UI/VirtualButtons.cs rename to Assets/Scripts/UI/Button_Action.cs index 10bbbb9ef..d2f8431b4 100644 --- a/Assets/Scripts/UI/VirtualButtons.cs +++ b/Assets/Scripts/UI/Button_Action.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -public class VirtualButtons : MonoBehaviour +public class Button_Action : MonoBehaviour { private Button _attackButton; private Button[] _skillButtons = new Button[3]; @@ -32,7 +32,7 @@ public class VirtualButtons : MonoBehaviour void CreateAttackButtons() { - GameObject ButtonObj = Manager.Resource.Instantiate("Prefabs/UI/VirtualButton", transform); + GameObject ButtonObj = Manager.Resource.Instantiate("Prefabs/UI/Button_Action", transform); ButtonObj.name = "AttackButton"; _attackButton = ButtonObj.GetComponent