summaryrefslogtreecommitdiff
path: root/marching/Assets/Scripts
diff options
context:
space:
mode:
Diffstat (limited to 'marching/Assets/Scripts')
-rw-r--r--marching/Assets/Scripts/Animation.meta8
-rw-r--r--marching/Assets/Scripts/Animation/AnimationCurveAsset.cs7
-rw-r--r--marching/Assets/Scripts/Animation/AnimationCurveAsset.cs.meta11
-rw-r--r--marching/Assets/Scripts/AssetCollection.cs25
-rw-r--r--marching/Assets/Scripts/AssetCollection.cs.meta11
-rw-r--r--marching/Assets/Scripts/Physics/PhysicsManager.cs2
6 files changed, 63 insertions, 1 deletions
diff --git a/marching/Assets/Scripts/Animation.meta b/marching/Assets/Scripts/Animation.meta
new file mode 100644
index 0000000..01a3fee
--- /dev/null
+++ b/marching/Assets/Scripts/Animation.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6786608179d88f44a8c67db41ba38535
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/marching/Assets/Scripts/Animation/AnimationCurveAsset.cs b/marching/Assets/Scripts/Animation/AnimationCurveAsset.cs
new file mode 100644
index 0000000..50a1c6e
--- /dev/null
+++ b/marching/Assets/Scripts/Animation/AnimationCurveAsset.cs
@@ -0,0 +1,7 @@
+using UnityEngine;
+
+[CreateAssetMenu(menuName = "WK/Animation Curve Asset")]
+public class AnimationCurveAsset : ScriptableObject
+{
+ public AnimationCurve value;
+}
diff --git a/marching/Assets/Scripts/Animation/AnimationCurveAsset.cs.meta b/marching/Assets/Scripts/Animation/AnimationCurveAsset.cs.meta
new file mode 100644
index 0000000..3fb00ea
--- /dev/null
+++ b/marching/Assets/Scripts/Animation/AnimationCurveAsset.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9f666cda03edfd943861dc45bef602e0
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/marching/Assets/Scripts/AssetCollection.cs b/marching/Assets/Scripts/AssetCollection.cs
new file mode 100644
index 0000000..2942f75
--- /dev/null
+++ b/marching/Assets/Scripts/AssetCollection.cs
@@ -0,0 +1,25 @@
+using System;
+using UnityEngine;
+
+[CreateAssetMenu(menuName = "WK/AssetCollection")]
+public class AssetCollection : ScriptableObject
+{
+ public UnityEngine.Object[] assets = Array.Empty<UnityEngine.Object>();
+
+ [ContextMenu("Add selected assets.")]
+ private void AddSelectedAssets()
+ {
+ UnityEngine.Object[] additionalAssets = Array.Empty<UnityEngine.Object>();
+ AddAssets(additionalAssets);
+ }
+
+ public void AddAssets(UnityEngine.Object[] additionalAssets)
+ {
+ int num = assets.Length;
+ Array.Resize(ref assets, assets.Length + additionalAssets.Length);
+ for (int i = 0; i < additionalAssets.Length; i++)
+ {
+ assets[num + i] = additionalAssets[i];
+ }
+ }
+}
diff --git a/marching/Assets/Scripts/AssetCollection.cs.meta b/marching/Assets/Scripts/AssetCollection.cs.meta
new file mode 100644
index 0000000..46d77a1
--- /dev/null
+++ b/marching/Assets/Scripts/AssetCollection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 77c80cd82f7aa5844bcb9001b4b7c676
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/marching/Assets/Scripts/Physics/PhysicsManager.cs b/marching/Assets/Scripts/Physics/PhysicsManager.cs
index 1663410..0225443 100644
--- a/marching/Assets/Scripts/Physics/PhysicsManager.cs
+++ b/marching/Assets/Scripts/Physics/PhysicsManager.cs
@@ -8,7 +8,7 @@ public enum ColliderType
{
Collider,
Hurtbox,
- Hitbox,
+ //Hitbox,
}
public partial class PhysicsManager : Singleton<PhysicsManager>