diff options
Diffstat (limited to 'Assets/Scripts')
| -rw-r--r-- | Assets/Scripts/Props.meta | 8 | ||||
| -rw-r--r-- | Assets/Scripts/Scene.meta | 8 | ||||
| -rw-r--r-- | Assets/Scripts/Unit/AnimationData.cs | 2 | ||||
| -rw-r--r-- | Assets/Scripts/Unit/Collider/ColliderData.cs | 2 |
4 files changed, 2 insertions, 18 deletions
diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta deleted file mode 100644 index bb96602e..00000000 --- a/Assets/Scripts/Props.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f299520ed9fcf4a45858ad4ef5a8d5d1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta deleted file mode 100644 index eb7a8716..00000000 --- a/Assets/Scripts/Scene.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eaee2d0f48cff9b40baf0686a8105600 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/AnimationData.cs b/Assets/Scripts/Unit/AnimationData.cs index 8717cf87..72a3db24 100644 --- a/Assets/Scripts/Unit/AnimationData.cs +++ b/Assets/Scripts/Unit/AnimationData.cs @@ -27,7 +27,7 @@ public class AnimationData : ScriptableObject return hurt + hit + thro + block + defend;
}
- public void AddBox(List<ColliderData> boxList, ColliderData box)
+ public void AddBox(ref List<ColliderData> boxList, ColliderData box)
{
if (boxList == null)
{
diff --git a/Assets/Scripts/Unit/Collider/ColliderData.cs b/Assets/Scripts/Unit/Collider/ColliderData.cs index 0b79d04a..67881abc 100644 --- a/Assets/Scripts/Unit/Collider/ColliderData.cs +++ b/Assets/Scripts/Unit/Collider/ColliderData.cs @@ -87,7 +87,7 @@ public class ColliderData frame.frame = frameIndex;
frame.active = true;
frame.position = Vector3.zero;
- frame.size = Vector3.one;
+ frame.size = new Vector3(1,1,0.5f);
frames.Add(frame);
frames.Sort((a, b) => {
if (a == null)
|