From 14371de4e620068ba849aeac7f97a01a7d3caa17 Mon Sep 17 00:00:00 2001 From: SHOUTING_PIRATE Date: Thu, 18 Jun 2026 22:06:17 +0100 Subject: [PATCH] no message --- .vscode/settings.json | 4 ++-- 3rdPersonHacknSlash.slnx | 4 ++++ Assets/Prefabs/Pickups/HealthPickup.prefab | 25 +------------------- Assets/Prefabs/Pickups/StrengthPickup.prefab | 25 +------------------- Assets/Prefabs/Pickups/StunPickup.prefab | 25 +------------------- 5 files changed, 9 insertions(+), 74 deletions(-) create mode 100644 3rdPersonHacknSlash.slnx diff --git a/.vscode/settings.json b/.vscode/settings.json index 402043c4..445a1ff3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -60,13 +60,13 @@ "*.asset": "yaml", "*.meta": "yaml", "*.prefab": "yaml", - "*.unity": "yaml", + "*.unity": "yaml" }, "explorer.fileNesting.enabled": true, "explorer.fileNesting.patterns": { "*.sln": "*.csproj", "*.slnx": "*.csproj" }, - "dotnet.defaultSolution": "TopDownHacknSlash.slnx", + "dotnet.defaultSolution": "3rdPersonHacknSlash.slnx", "dotnet.enableWorkspaceBasedDevelopment": false } \ No newline at end of file diff --git a/3rdPersonHacknSlash.slnx b/3rdPersonHacknSlash.slnx new file mode 100644 index 00000000..d629b17f --- /dev/null +++ b/3rdPersonHacknSlash.slnx @@ -0,0 +1,4 @@ + + + + diff --git a/Assets/Prefabs/Pickups/HealthPickup.prefab b/Assets/Prefabs/Pickups/HealthPickup.prefab index e25d76ed..076b862c 100644 --- a/Assets/Prefabs/Pickups/HealthPickup.prefab +++ b/Assets/Prefabs/Pickups/HealthPickup.prefab @@ -71,7 +71,7 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 @@ -88,7 +88,6 @@ GameObject: - component: {fileID: 1707643075842838956} - component: {fileID: 646750399669204607} - component: {fileID: 6272978391567809056} - - component: {fileID: 5504897159505406257} m_Layer: 0 m_Name: SM_Prop_Bottle_02 m_TagString: Untagged @@ -168,25 +167,3 @@ MeshRenderer: m_SortingOrder: 0 m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &5504897159505406257 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5262307809415931656} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -6002340788578829407, guid: 1b674d1fba126d54d8a077f983edead6, type: 2} diff --git a/Assets/Prefabs/Pickups/StrengthPickup.prefab b/Assets/Prefabs/Pickups/StrengthPickup.prefab index 1d924306..cbb95131 100644 --- a/Assets/Prefabs/Pickups/StrengthPickup.prefab +++ b/Assets/Prefabs/Pickups/StrengthPickup.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 9104328179459361125} - component: {fileID: 6431010947776315877} - component: {fileID: 7396354396724401842} - - component: {fileID: 4963525888017504559} m_Layer: 0 m_Name: SM_Prop_Bottle_01 m_TagString: Untagged @@ -91,28 +90,6 @@ MeshRenderer: m_SortingOrder: 0 m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &4963525888017504559 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2791671867130713437} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 8731300936124642731, guid: 43c0753a874f11b42884f2d3920e6454, type: 2} --- !u!1 &3333109520940848564 GameObject: m_ObjectHideFlags: 0 @@ -184,7 +161,7 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 diff --git a/Assets/Prefabs/Pickups/StunPickup.prefab b/Assets/Prefabs/Pickups/StunPickup.prefab index 88179970..ac5d95fa 100644 --- a/Assets/Prefabs/Pickups/StunPickup.prefab +++ b/Assets/Prefabs/Pickups/StunPickup.prefab @@ -71,7 +71,7 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 @@ -88,7 +88,6 @@ GameObject: - component: {fileID: 6120043770476331428} - component: {fileID: 3125830626500766457} - component: {fileID: 1930455840762618119} - - component: {fileID: 5840010976095801712} m_Layer: 0 m_Name: SM_Prop_Sack_04 m_TagString: Untagged @@ -168,25 +167,3 @@ MeshRenderer: m_SortingOrder: 0 m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &5840010976095801712 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5491090671326058207} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 851231394595207666, guid: f754d80cb95fc7d41bf92dea92c84a7e, type: 2}