diff options
-rw-r--r-- | Documents/要素.xlsx | bin | 0 -> 8841 bytes | |||
-rw-r--r-- | Documents/设定/神器.xlsx | bin | 0 -> 10410 bytes | |||
-rw-r--r-- | marching/Assets/Bundle/images/items.meta | 8 | ||||
-rw-r--r-- | marching/Assets/Bundle/images/items/0_hellbell.meta | 8 | ||||
-rw-r--r-- | marching/Assets/Bundle/images/items/1_sandglass.meta | 8 | ||||
-rw-r--r-- | marching/Assets/Bundle/items.meta | 8 | ||||
-rw-r--r-- | marching/Assets/Scripts/Animation.meta | 8 | ||||
-rw-r--r-- | marching/Assets/Scripts/Animation/AnimationCurveAsset.cs | 7 | ||||
-rw-r--r-- | marching/Assets/Scripts/Animation/AnimationCurveAsset.cs.meta | 11 | ||||
-rw-r--r-- | marching/Assets/Scripts/AssetCollection.cs | 25 | ||||
-rw-r--r-- | marching/Assets/Scripts/AssetCollection.cs.meta | 11 | ||||
-rw-r--r-- | marching/Assets/Scripts/Physics/PhysicsManager.cs | 2 | ||||
-rw-r--r-- | marching/Assets/ThirdParty.meta | 8 |
13 files changed, 103 insertions, 1 deletions
diff --git a/Documents/要素.xlsx b/Documents/要素.xlsx Binary files differnew file mode 100644 index 0000000..9e4539d --- /dev/null +++ b/Documents/要素.xlsx diff --git a/Documents/设定/神器.xlsx b/Documents/设定/神器.xlsx Binary files differnew file mode 100644 index 0000000..0213434 --- /dev/null +++ b/Documents/设定/神器.xlsx diff --git a/marching/Assets/Bundle/images/items.meta b/marching/Assets/Bundle/images/items.meta new file mode 100644 index 0000000..c602905 --- /dev/null +++ b/marching/Assets/Bundle/images/items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1743fb7ebd1def418159e90490cbd1e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Bundle/images/items/0_hellbell.meta b/marching/Assets/Bundle/images/items/0_hellbell.meta new file mode 100644 index 0000000..c891278 --- /dev/null +++ b/marching/Assets/Bundle/images/items/0_hellbell.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2089538e8754dc64faaf7dd54dd6f5e1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Bundle/images/items/1_sandglass.meta b/marching/Assets/Bundle/images/items/1_sandglass.meta new file mode 100644 index 0000000..463e1c4 --- /dev/null +++ b/marching/Assets/Bundle/images/items/1_sandglass.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9ee9712fe6634c419d0fd7552e1de48 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Bundle/items.meta b/marching/Assets/Bundle/items.meta new file mode 100644 index 0000000..fc6a3eb --- /dev/null +++ b/marching/Assets/Bundle/items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46b1b2ee9e4f72f4fbcff247eec9880a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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> diff --git a/marching/Assets/ThirdParty.meta b/marching/Assets/ThirdParty.meta new file mode 100644 index 0000000..d6be994 --- /dev/null +++ b/marching/Assets/ThirdParty.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46ddeb55cc063ae4a8dc97431056661f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: |