From 7b3ba79f4a33b6395c194f2040b3f587b5d93b9c Mon Sep 17 00:00:00 2001 From: alilas2 Date: Sun, 3 Jul 2022 22:15:56 +0200 Subject: [PATCH] Fixed displaying name on CaveEntrance map & Added pickaxe hitboxes --- Assembly-CSharp.csproj | 77 ++--- .../MainCharacter/pickaxe_down.anim | 103 +++++- .../MainCharacter/pickaxe_left.anim | 103 +++++- .../MainCharacter/pickaxe_right.anim | 103 +++++- .../Animations/MainCharacter/pickaxe_up.anim | 67 +++- Assets/BreakOre.cs | 2 +- Assets/Scenes/CaveEntrance.unity | 2 +- Assets/Scenes/SampleScene.unity | 318 ++++++++++++++++++ Assets/breakable.cs | 2 +- ProjectSettings/TagManager.asset | 1 + 10 files changed, 726 insertions(+), 52 deletions(-) diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index beb24fd7..a26ec0c4 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -2,10 +2,8 @@ latest - <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package - <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package - true - + C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts + unity_csc.bat Debug @@ -13,8 +11,7 @@ 10.0.20506 2.0 - {b0494aed-db4c-301d-622f-0ebc22443d3b} - {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {F58AF4E0-3E6D-54B1-523D-8F755DC8E665} Library Properties Assembly-CSharp @@ -30,9 +27,8 @@ DEBUG;TRACE;UNITY_2020_3_32;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER prompt 4 - + 0169 False - False pdbonly @@ -40,9 +36,8 @@ Temp\bin\Release\ prompt 4 - + 0169 False - False true @@ -63,6 +58,7 @@ + @@ -118,7 +114,6 @@ - @@ -708,94 +703,94 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/PsdPlugin.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/SCRIPTUM-2022/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Users/alicj/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/Animations/MainCharacter/pickaxe_down.anim b/Assets/Animations/MainCharacter/pickaxe_down.anim index 9a853b99..6504cf1c 100644 --- a/Assets/Animations/MainCharacter/pickaxe_down.anim +++ b/Assets/Animations/MainCharacter/pickaxe_down.anim @@ -16,7 +16,53 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: PickaxeDown + classID: 1 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -44,6 +90,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 3494875687 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -79,7 +132,53 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: PickaxeDown + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/MainCharacter/pickaxe_left.anim b/Assets/Animations/MainCharacter/pickaxe_left.anim index 16682d39..44ab408d 100644 --- a/Assets/Animations/MainCharacter/pickaxe_left.anim +++ b/Assets/Animations/MainCharacter/pickaxe_left.anim @@ -16,7 +16,53 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: PickaxeLeft + classID: 1 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -44,6 +90,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 3067602292 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -79,7 +132,53 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: PickaxeLeft + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/MainCharacter/pickaxe_right.anim b/Assets/Animations/MainCharacter/pickaxe_right.anim index 2da07f23..34e07ca5 100644 --- a/Assets/Animations/MainCharacter/pickaxe_right.anim +++ b/Assets/Animations/MainCharacter/pickaxe_right.anim @@ -16,7 +16,53 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: PickaxeRight + classID: 1 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -44,6 +90,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 2684852569 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -79,7 +132,53 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: PickaxeRight + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/MainCharacter/pickaxe_up.anim b/Assets/Animations/MainCharacter/pickaxe_up.anim index bac86e29..ed124038 100644 --- a/Assets/Animations/MainCharacter/pickaxe_up.anim +++ b/Assets/Animations/MainCharacter/pickaxe_up.anim @@ -16,7 +16,35 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: PickaxeUp + classID: 1 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -44,6 +72,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 1352548545 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -79,7 +114,35 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: PickaxeUp + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/BreakOre.cs b/Assets/BreakOre.cs index 8049dfa5..3890500a 100644 --- a/Assets/BreakOre.cs +++ b/Assets/BreakOre.cs @@ -59,7 +59,7 @@ public class BreakOre : MonoBehaviour private void OnTriggerEnter2D(Collider2D collision) { - if (collision.tag == "AttackHitbox") + if (collision.tag == "PickaxeHitbox") { var em = breakParticleSystem.emission; em.enabled = true; diff --git a/Assets/Scenes/CaveEntrance.unity b/Assets/Scenes/CaveEntrance.unity index 83bc552a..ddd1acc8 100644 --- a/Assets/Scenes/CaveEntrance.unity +++ b/Assets/Scenes/CaveEntrance.unity @@ -55116,7 +55116,7 @@ MonoBehaviour: nameOfPlayer: saveName: inputText: {fileID: 0} - loadedName: {fileID: 1549432370} + loadedName: {fileID: 1109885949} --- !u!4 &455489658 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 7f9f0129..37182d71 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1498,6 +1498,10 @@ Transform: - {fileID: 1600742819} - {fileID: 803053985} - {fileID: 1303702484} + - {fileID: 2051744380} + - {fileID: 397351928} + - {fileID: 1611429635} + - {fileID: 1901590563} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -30253,6 +30257,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 379044509} m_CullTransparentMesh: 1 +--- !u!1 &397351927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 397351928} + - component: {fileID: 397351929} + m_Layer: 0 + m_Name: PickaxeDown + m_TagString: PickaxeHitbox + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &397351928 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 397351927} + 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_Children: [] + m_Father: {fileID: 167690942} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &397351929 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 397351927} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 1.062758, y: 0.38787436} + - {x: 0.9738723, y: 0.52559924} + - {x: 0.6097745, y: 0.60087514} + - {x: 0.486533, y: 0.51597047} + - {x: 0.5807089, y: 0.45816183} + - {x: 0.7389383, y: 0.3259468} + - {x: 0.77891153, y: 0.23638868} + - {x: 0.8626446, y: 0.13122106} + - {x: 0.8966299, y: 0.08684206} + - {x: 0.9163253, y: 0.018798232} + - {x: 0.9215247, y: -0.054275513} + - {x: 0.92902327, y: -0.30257106} + - {x: 0.6464937, y: -0.64018154} + - {x: 0.34146643, y: -0.8435273} + - {x: 0.33278877, y: -0.908798} + - {x: 0.7914448, y: -0.8771572} + - {x: 0.9352148, y: -0.7474339} + - {x: 0.94091827, y: -0.74629855} + - {x: 1.0307221, y: -0.63191175} + - {x: 1.0640337, y: -0.6078546} + - {x: 1.1865534, y: -0.31914544} + - {x: 1.2028317, y: 0.07217908} + - {x: 1.1289219, y: 0.25857615} + - {x: 1.102576, y: 0.32010382} --- !u!1 &440573952 GameObject: m_ObjectHideFlags: 0 @@ -46249,6 +46333,81 @@ PolygonCollider2D: - {x: -0.1921566, y: -0.35754862} - {x: -0.09974402, y: -0.10438496} - {x: -0.29060102, y: 0.27823225} +--- !u!1 &1611429634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1611429635} + - component: {fileID: 1611429636} + m_Layer: 0 + m_Name: PickaxeRight + m_TagString: PickaxeHitbox + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1611429635 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1611429634} + 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_Children: [] + m_Father: {fileID: 167690942} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &1611429636 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1611429634} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 0.7341705, y: 0.3598926} + - {x: 0.5354036, y: 0.46713686} + - {x: 0.3473867, y: 0.4752245} + - {x: 0.24706021, y: 0.38540554} + - {x: 0.40892544, y: 0.28684285} + - {x: 0.45735782, y: 0.24493766} + - {x: 0.49369252, y: 0.18430543} + - {x: 0.6496165, y: 0.011940479} + - {x: 0.68531334, y: -0.22840166} + - {x: 0.70773786, y: -0.34352326} + - {x: 0.66850275, y: -0.5342362} + - {x: 0.32742083, y: -0.8384137} + - {x: 0.39524516, y: -0.89401615} + - {x: 0.591481, y: -0.90510297} + - {x: 0.81404597, y: -0.7417979} + - {x: 0.9123499, y: -0.54376674} + - {x: 0.9357934, y: -0.352211} + - {x: 0.9470261, y: -0.08072591} + - {x: 0.84757954, y: 0.21662706} --- !u!1 &1644923230 GameObject: m_ObjectHideFlags: 0 @@ -137876,6 +138035,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1847256925} m_CullTransparentMesh: 1 +--- !u!1 &1901590562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1901590563} + - component: {fileID: 1901590564} + m_Layer: 0 + m_Name: PickaxeLeft + m_TagString: PickaxeHitbox + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1901590563 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901590562} + 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_Children: [] + m_Father: {fileID: 167690942} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &1901590564 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901590562} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.7341705, y: 0.3598926} + - {x: -0.5354036, y: 0.46713686} + - {x: -0.3473867, y: 0.4752245} + - {x: -0.2470602, y: 0.38540554} + - {x: -0.4089254, y: 0.28684285} + - {x: -0.4573578, y: 0.24493766} + - {x: -0.4936925, y: 0.18430543} + - {x: -0.6496165, y: 0.011940479} + - {x: -0.6853133, y: -0.22840166} + - {x: -0.7077379, y: -0.34352326} + - {x: -0.6685027, y: -0.5342362} + - {x: -0.3274208, y: -0.8384137} + - {x: -0.3952452, y: -0.89401615} + - {x: -0.591481, y: -0.90510297} + - {x: -0.814046, y: -0.7417979} + - {x: -0.9123499, y: -0.54376674} + - {x: -0.9357934, y: -0.352211} + - {x: -0.9470261, y: -0.08072591} + - {x: -0.8475795, y: 0.21662706} --- !u!1 &1908329174 GameObject: m_ObjectHideFlags: 0 @@ -138276,6 +138510,90 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Panel: {fileID: 1794238133} +--- !u!1 &2051744379 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2051744380} + - component: {fileID: 2051744381} + m_Layer: 0 + m_Name: PickaxeUp + m_TagString: PickaxeHitbox + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2051744380 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051744379} + 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_Children: [] + m_Father: {fileID: 167690942} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &2051744381 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051744379} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 1.0716603, y: 0.65687466} + - {x: 0.97866195, y: 0.74806213} + - {x: 0.8463393, y: 0.92041135} + - {x: 0.63472044, y: 0.9702208} + - {x: 0.43668008, y: 0.9235122} + - {x: 0.39742506, y: 0.86420727} + - {x: 0.36936375, y: 0.7987101} + - {x: 0.5901874, y: 0.6915548} + - {x: 0.76016474, y: 0.5603459} + - {x: 0.76789683, y: 0.42097616} + - {x: 0.75814617, y: 0.30740857} + - {x: 0.7985733, y: 0.20018125} + - {x: 0.8052818, y: 0.12441945} + - {x: 0.8454323, y: 0.005834818} + - {x: 0.87217164, y: -0.18928432} + - {x: 0.878828, y: -0.27231812} + - {x: 0.7822123, y: -0.49152553} + - {x: 0.4683912, y: -0.7711847} + - {x: 0.584181, y: -0.8283696} + - {x: 0.7565096, y: -0.81202555} + - {x: 0.8934627, y: -0.777272} + - {x: 0.8855878, y: -0.7640817} + - {x: 0.938924, y: -0.7020166} + - {x: 1.0181731, y: -0.6003535} + - {x: 1.0704646, y: -0.48112082} + - {x: 1.1122776, y: -0.191046} + - {x: 1.196473, y: 0.21573138} + - {x: 1.2040371, y: 0.46017045} --- !u!1 &2060891297 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/breakable.cs b/Assets/breakable.cs index 0111a3eb..075a06c1 100644 --- a/Assets/breakable.cs +++ b/Assets/breakable.cs @@ -69,7 +69,7 @@ public class breakable : MonoBehaviour private void OnTriggerEnter2D(Collider2D collision) { - if (collision.tag == "AttackHitbox") + if (collision.tag == "PickaxeHitbox") { var em = collisionParticleSystem.emission; em.enabled = true; diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 5e3066e2..af1d3cf8 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -11,6 +11,7 @@ TagManager: - GUI - PlayerHitbox - AttackHitbox + - PickaxeHitbox layers: - Default - TransparentFX