From e1e1f9d303e51c1e25de3abe8f2a214709bed092 Mon Sep 17 00:00:00 2001 From: SpoodyTheOne Date: Fri, 9 Feb 2024 12:24:42 +0100 Subject: [PATCH] CRIPstal done --- Assets/Resources/BloodChristaal.prefab | 74 +++++++++++++------------- Assets/Scripts/BloodCrystal.cs | 11 ++++ Assets/Scripts/BloodCrystal.cs.meta | 11 ++++ ProjectSettings/ProjectSettings.asset | 3 +- 4 files changed, 60 insertions(+), 39 deletions(-) create mode 100644 Assets/Scripts/BloodCrystal.cs create mode 100644 Assets/Scripts/BloodCrystal.cs.meta diff --git a/Assets/Resources/BloodChristaal.prefab b/Assets/Resources/BloodChristaal.prefab index f7b9114..5bb2ec8 100644 --- a/Assets/Resources/BloodChristaal.prefab +++ b/Assets/Resources/BloodChristaal.prefab @@ -11,9 +11,9 @@ GameObject: - component: {fileID: 1077053941215605897} - component: {fileID: 3448570681267549935} - component: {fileID: 8799638307818850525} - - component: {fileID: 5807956731245262098} - component: {fileID: 172659813753747742} - component: {fileID: 1284510814332683786} + - component: {fileID: -366506843679355488} m_Layer: 0 m_Name: BloodChristaal m_TagString: Untagged @@ -31,7 +31,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -7.134935, y: -15.29, z: -0.019925445} - m_LocalScale: {x: 2, y: 2, z: 2} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} @@ -100,41 +100,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!58 &5807956731245262098 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4381503231254675368} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.38 --- !u!114 &172659813753747742 MonoBehaviour: m_ObjectHideFlags: 0 @@ -199,3 +164,38 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!58 &-366506843679355488 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4381503231254675368} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 1.01 diff --git a/Assets/Scripts/BloodCrystal.cs b/Assets/Scripts/BloodCrystal.cs new file mode 100644 index 0000000..8db2850 --- /dev/null +++ b/Assets/Scripts/BloodCrystal.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BloodCrystal : MonoBehaviour +{ + public void Break() { + BloodComputeShader.Instance.cleanAllBlood(); + Destroy(gameObject); + } +} diff --git a/Assets/Scripts/BloodCrystal.cs.meta b/Assets/Scripts/BloodCrystal.cs.meta new file mode 100644 index 0000000..802a6d4 --- /dev/null +++ b/Assets/Scripts/BloodCrystal.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9a04027c92babe63dbeef9eae4bffcbe +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c4ff810..beb9e54 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,8 +141,7 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 0.1 Alpha - preloadedAssets: - - {fileID: 11400000, guid: de04e34f85a966e4da851d9b3d804fa1, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1