summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Assets/ActionTool/Editor/ActionColliderEditor.cs35
-rw-r--r--Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta8
-rw-r--r--Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta8
-rw-r--r--Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta8
-rw-r--r--Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta (renamed from Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta)2
-rw-r--r--Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta (renamed from Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta)2
-rw-r--r--Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta (renamed from Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta)2
-rw-r--r--Assets/Bundle/Material.meta (renamed from Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta)2
-rw-r--r--Assets/Bundle/Projectile.meta (renamed from Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta)2
-rw-r--r--Assets/Bundle/Shader.meta8
-rw-r--r--Assets/Bundle/UI.meta8
-rw-r--r--Assets/Bundle/Unit/Monster.meta8
-rw-r--r--Assets/Bundle/Unit/NPC.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Models.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/UnitData.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta8
-rw-r--r--Assets/Bundle/Unit/Prop.meta8
-rw-r--r--Assets/Data/ActionData.meta8
-rw-r--r--Assets/Data/AnimationData/Erika.meta8
-rw-r--r--Assets/Data/RootMotionData/Erika.meta8
-rw-r--r--Assets/Data/UnitData.meta8
-rw-r--r--Assets/Scripts/Props.meta8
-rw-r--r--Assets/Scripts/Scene.meta8
-rw-r--r--Assets/Scripts/Unit/Collider/ColliderAttributes.cs7
-rw-r--r--Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs9
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/User.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta8
56 files changed, 230 insertions, 215 deletions
diff --git a/Assets/ActionTool/Editor/ActionColliderEditor.cs b/Assets/ActionTool/Editor/ActionColliderEditor.cs
index a446b61d..69f6a372 100644
--- a/Assets/ActionTool/Editor/ActionColliderEditor.cs
+++ b/Assets/ActionTool/Editor/ActionColliderEditor.cs
@@ -97,12 +97,23 @@ namespace ActionTool
bool skip = false;
foreach (var attr in field.GetCustomAttributes())
{
- if(attr.GetType() == typeof(ColliderTypeAttribute))
+ if (attr.GetType() == typeof(ColliderTypeAttribute))
{
ColliderTypeAttribute t = attr as ColliderTypeAttribute;
collliderType = (int)t.type;
}
- else if (attr.GetType() == typeof(WhenAttribute))
+ }
+ if (collliderType != -1 && collliderType != (int)collider.type)
+ {
+ skip = true;
+ }
+ if (skip)
+ {
+ continue;
+ }
+ foreach (var attr in field.GetCustomAttributes())
+ {
+ if (attr.GetType() == typeof(WhenAttribute))
{
WhenAttribute when = attr as WhenAttribute;
string conditionName = when.conditionName;
@@ -158,10 +169,15 @@ namespace ActionTool
indent = 13;
}
}
- }
- if (collliderType != -1 && collliderType != (int)collider.type)
- {
- skip = true;
+ else if (attr.GetType() == typeof(CommentAttribute))
+ {
+ CommentAttribute comment = attr as CommentAttribute;
+ GUIStyle style = GUI.skin.GetStyle("Label");
+ TextAnchor preanchor = style.alignment;
+ style.alignment = comment.alignment;
+ GUI_Label(new GUIContent(comment.comment), style);
+ style.alignment = preanchor;
+ }
}
if(foldout != null && (++foldoutElementCount) <= foldout.count)
{
@@ -198,12 +214,7 @@ namespace ActionTool
SpaceAttribute space = attr as SpaceAttribute;
GUILayout.Space(space.height);
}
- else if (attr.GetType() == typeof(CommentAttribute))
- {
- CommentAttribute comment = attr as CommentAttribute;
- EditorGUILayout.LabelField(comment.comment);
- }
- }
+ }
GUI_Label(new GUIContent(name, tooltip), styles.textBold);
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta
deleted file mode 100644
index 640ede12..00000000
--- a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 32ad36f78e7f23f46a0ce64fce991723
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta b/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta
deleted file mode 100644
index 4d017390..00000000
--- a/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 93031cff7ea5a314ca110920f817635f
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta
deleted file mode 100644
index 0d171fe4..00000000
--- a/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 69c2852d26b47fa44a688db1349ae258
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
index 4627f5df..b76e98a5 100644
--- a/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta
+++ b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: d467e546efed7054c934b1a97a116c5c
+guid: 20381b3eecfbfe34a9d9222868969d29
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
index ab214036..41200932 100644
--- a/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta
+++ b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 063d53dfefca4e3429f5788835b0b4ea
+guid: abff7cb61c760094f8ab9437379e0f2c
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
index 20eca756..fa9e76cd 100644
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta
+++ b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 0f14f2cbed5e00a40a3fa94241cf6c27
+guid: e38cb65072bb4a64cbe162792de9bec2
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta b/Assets/Bundle/Material.meta
index ee2ffc5f..85215e86 100644
--- a/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta
+++ b/Assets/Bundle/Material.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: b82ae836c84f36049bdbdb08743b98e0
+guid: 8641bb4d4eee8b1419a1c8316ff9aee5
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta b/Assets/Bundle/Projectile.meta
index e0cb5de8..b01252f1 100644
--- a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta
+++ b/Assets/Bundle/Projectile.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: c219c63d9953ba84b8cbe80444bdbf22
+guid: 370f39b2edf043241a00acd3f6844aa6
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Bundle/Shader.meta b/Assets/Bundle/Shader.meta
new file mode 100644
index 00000000..92ded933
--- /dev/null
+++ b/Assets/Bundle/Shader.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5a8ba4f43d9a7b24d855cadccb986b60
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/UI.meta b/Assets/Bundle/UI.meta
new file mode 100644
index 00000000..0914914c
--- /dev/null
+++ b/Assets/Bundle/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4392471259b05a74a82a4bc72b510eb1
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/Monster.meta b/Assets/Bundle/Unit/Monster.meta
new file mode 100644
index 00000000..51d19a1d
--- /dev/null
+++ b/Assets/Bundle/Unit/Monster.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 98c6b7d15b8909e4b911c42ea72b9930
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/NPC.meta b/Assets/Bundle/Unit/NPC.meta
new file mode 100644
index 00000000..eeea13e1
--- /dev/null
+++ b/Assets/Bundle/Unit/NPC.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8ced034d375cdfa488814663ea17a79b
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta
new file mode 100644
index 00000000..1d22d5d2
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e777b7b5be18d4e4092e116011158c68
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
new file mode 100644
index 00000000..8c41a6b2
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5dc1b71affc68b54594096a1b96a5c00
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/Erika/Models.meta b/Assets/Bundle/Unit/PC/Erika/Models.meta
new file mode 100644
index 00000000..11148d17
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/Models.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0d712421d808a43438a43d8a5d34effe
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Assets/Bundle/Unit/PC/Erika/UnitData.meta
new file mode 100644
index 00000000..7d4b13eb
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/UnitData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 922befa8a94692845b88500a23229d7f
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
deleted file mode 100644
index be6badd6..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2c46a5a23283c7d428ae8bb13663ab6a
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
new file mode 100644
index 00000000..f5434a00
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 07c3b2bf6cb8cc2498422bbb105cbad8
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
new file mode 100644
index 00000000..4ed2c938
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 827d77abe87680a47ae2d71a9e953a18
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
new file mode 100644
index 00000000..43a52cd1
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7a2b72fbb41383047ac45e6c22ea9663
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
new file mode 100644
index 00000000..85d58a8c
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b2b0838fb0603964e99904eefe81ad7f
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
new file mode 100644
index 00000000..dd867045
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1c8a678ea9e801f439a1003d04f33cf5
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
new file mode 100644
index 00000000..dc530723
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ebf636c7cf7b1934b885298ce1f5f42e
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
new file mode 100644
index 00000000..b28b6f04
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2022e8298d3a8624992143eb57c0f8ac
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
new file mode 100644
index 00000000..eeca0d3b
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f6aa859c834c51f498ef0b3c3b83a0f5
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
new file mode 100644
index 00000000..7f91da28
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df69962f5b01e444a8bea87e31c7d0a4
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/Prop.meta b/Assets/Bundle/Unit/Prop.meta
new file mode 100644
index 00000000..affd6eed
--- /dev/null
+++ b/Assets/Bundle/Unit/Prop.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dafc173db1ebeab4c80641cc3d4fa528
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Data/ActionData.meta b/Assets/Data/ActionData.meta
new file mode 100644
index 00000000..48dd5af5
--- /dev/null
+++ b/Assets/Data/ActionData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4e712aac7b9add047ab7a8691dd1a17a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Data/AnimationData/Erika.meta b/Assets/Data/AnimationData/Erika.meta
new file mode 100644
index 00000000..10bf1fb1
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 02289cc4b0fe1c34988c293ff6dbca02
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Data/RootMotionData/Erika.meta b/Assets/Data/RootMotionData/Erika.meta
new file mode 100644
index 00000000..57b03e09
--- /dev/null
+++ b/Assets/Data/RootMotionData/Erika.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c4e05f9eb0abc949a472e82070dfef1
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Data/UnitData.meta b/Assets/Data/UnitData.meta
new file mode 100644
index 00000000..d0809213
--- /dev/null
+++ b/Assets/Data/UnitData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5bdb120d934aa114ab2f20e111a3c4d2
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta
new file mode 100644
index 00000000..bb96602e
--- /dev/null
+++ b/Assets/Scripts/Props.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f299520ed9fcf4a45858ad4ef5a8d5d1
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta
new file mode 100644
index 00000000..eb7a8716
--- /dev/null
+++ b/Assets/Scripts/Scene.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eaee2d0f48cff9b40baf0686a8105600
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Unit/Collider/ColliderAttributes.cs b/Assets/Scripts/Unit/Collider/ColliderAttributes.cs
index 30a1bfaa..a39b6961 100644
--- a/Assets/Scripts/Unit/Collider/ColliderAttributes.cs
+++ b/Assets/Scripts/Unit/Collider/ColliderAttributes.cs
@@ -63,12 +63,13 @@ public class WhenNotAttribute : Attribute
public class CommentAttribute : Attribute
{
- public CommentAttribute(string comment)
+ public CommentAttribute(string comment, TextAnchor alignment = TextAnchor.MiddleLeft)
{
this.comment = comment;
- }
+ this.alignment = alignment;
+ }
public string comment;
-
+ public TextAnchor alignment;
}
public class FoldoutAttribute : Attribute
diff --git a/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs b/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs
index ea95a0ed..83dec0bb 100644
--- a/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs
+++ b/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs
@@ -38,13 +38,16 @@ public partial class ColliderBox
}
[ColliderType(EColliderType.HitBox)]
-
- [Tooltip("击退距离")]
- public Vector3 hitBack;
[Tooltip("允许多次击中")]
public bool multiHit;
+ [Tooltip("击退距离")]
+ public Vector3 hitBack;
+
+ [Comment("[ 击中效果 ]", TextAnchor.MiddleCenter)]
+
+ [Foldout("顿帧", 2)]
[Tooltip("自身顿帧")]
public float freezeFramesSelf;
[Tooltip("对方顿帧")]
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
deleted file mode 100644
index fc69e121..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6b4092aee1925294286c91c8b2f0246b
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta
deleted file mode 100644
index 16dceda0..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7f677b222bd908a4eb6e8b6f446f0c95
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta
deleted file mode 100644
index 3feeaa0c..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f65f99730f449cd42b5428ed33579276
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta
deleted file mode 100644
index d2cc8de3..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0d1d19a8d9a9258489a54453cbd409bf
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta
deleted file mode 100644
index 60091bee..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5fa002e3b21354f4b847ab441877ecda
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta
deleted file mode 100644
index c50ca514..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c9c840958f8546c4e9667f0757d8557a
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
deleted file mode 100644
index 35b83bfb..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5e705a58e98ec1a409129eb57fa15477
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta
deleted file mode 100644
index 88f9f501..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c77d30703ebcc5c4bbb57517b133b0f4
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta
deleted file mode 100644
index 4d33dc86..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 142685877fe50f64caba63abfda167a7
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/User.meta b/Assets/ThirdParty/BOXOPHOBIC/User.meta
deleted file mode 100644
index 293c8b38..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/User.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f0aa5379d96b0e14795df45a380643fb
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta
deleted file mode 100644
index a5ee5a64..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4c9d2f06234e7e643b2118057d8e0673
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta
deleted file mode 100644
index 3fdad1c4..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6fcf51a07e84ca941a62046a0b693a19
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta
deleted file mode 100644
index 94757653..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 28d59ef8b8ebe8d48a3a27e990a2d7e9
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta
deleted file mode 100644
index d2c0b7b4..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: edc7fbbe770e693488770a7aaeae2aa6
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta
deleted file mode 100644
index 069be515..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ed975ceb335a144c93320e22ae1780a
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta
deleted file mode 100644
index 7ea21e4b..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5a3babbb69c72f8419243020c0dfb70b
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta
deleted file mode 100644
index f2a1c8a6..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cd6738b410016744eaf6e182174c0b2b
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
deleted file mode 100644
index 50e68eff..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f32bd65977ebf9049bd5e40e18d1556c
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta
deleted file mode 100644
index 68664862..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 151a76ee3bec1ae449cd56f31d474de5
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta
deleted file mode 100644
index aab2c856..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3ae8613087e217249a69059295113b1c
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant: