summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-07-10 11:58:54 +0800
committerchai <chaifix@163.com>2021-07-10 11:58:54 +0800
commitd373067ce7982c14040274f9eab8ad9a1c50c5f1 (patch)
treeb222334b140cd13a3265736c1c76efc3017a7229
parent54626116a6dd170e92e2ca68130a270de284cf87 (diff)
*misc
-rw-r--r--Assets/ActionTool/ActionToolScene.unity93
-rw-r--r--Assets/ActionTool/Editor/ActionColliderEditor.cs40
-rw-r--r--Assets/ActionTool/Editor/ActionEditorStyles.cs6
-rw-r--r--Assets/ActionTool/Editor/ActionManager.cs11
-rw-r--r--Assets/ActionTool/Editor/ActionPreviewEditor.cs33
-rw-r--r--Assets/Art/Models/Characters/Erika2.meta (renamed from Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta)2
-rw-r--r--Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta (renamed from Assets/Data/UnitData.meta)2
-rw-r--r--Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta8
-rw-r--r--Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta8
-rw-r--r--Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta8
-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/BOXOPHOBIC/Atmospheric Height Fog.meta17
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Core.meta17
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta17
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta18
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta2
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta18
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta17
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta17
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta18
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo.meta17
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta18
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta17
-rw-r--r--Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta18
-rw-r--r--Assets/BOXOPHOBIC/User.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Editor.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Editor/Constants.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Editor/StyledGUI.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Editor/StyledInspector.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Editor/StyledMono.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Resources.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Scripts.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta2
-rw-r--r--Assets/BOXOPHOBIC/Utils/Scripts/StyledMono.meta2
-rw-r--r--Assets/Data/AnimationData/Erika/Air_Attk_1.asset22
-rw-r--r--Assets/Data/AnimationData/Erika/Air_Attk_1.asset.meta8
-rw-r--r--Assets/Data/AnimationData/Erika/Air_Dash.asset48
-rw-r--r--Assets/Data/AnimationData/Erika/Air_Dash.asset.meta8
-rw-r--r--Assets/Data/AnimationData/Erika/SuperKickCombo.asset13
-rw-r--r--Assets/Data/AnimationData/Erika/Take 001.asset2
-rw-r--r--Assets/Scripts/Props.meta8
-rw-r--r--Assets/Scripts/Scene.meta8
-rw-r--r--Assets/Scripts/Unit/AnimationData.cs2
-rw-r--r--Assets/Scripts/Unit/Collider/ColliderData.cs2
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core.meta8
-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/Core/Shaders.meta (renamed from Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta)2
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo.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.meta8
-rw-r--r--Assets/ThirdParty/BOXOPHOBIC/Utils/Editor.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.meta (renamed from Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta)2
-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
78 files changed, 530 insertions, 277 deletions
diff --git a/Assets/ActionTool/ActionToolScene.unity b/Assets/ActionTool/ActionToolScene.unity
index 59524151..e5572892 100644
--- a/Assets/ActionTool/ActionToolScene.unity
+++ b/Assets/ActionTool/ActionToolScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+ m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -377,97 +377,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1944034771
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1944034775}
- - component: {fileID: 1944034774}
- - component: {fileID: 1944034773}
- - component: {fileID: 1944034772}
- m_Layer: 0
- m_Name: Plane
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!65 &1944034772
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1944034771}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &1944034773
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1944034771}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 0
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
---- !u!33 &1944034774
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1944034771}
- m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &1944034775
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1944034771}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: -0.04, z: 0}
- m_LocalScale: {x: 1, y: 0.1, z: 500}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 5
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1974325401
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ActionTool/Editor/ActionColliderEditor.cs b/Assets/ActionTool/Editor/ActionColliderEditor.cs
index 57c060fa..0c312806 100644
--- a/Assets/ActionTool/Editor/ActionColliderEditor.cs
+++ b/Assets/ActionTool/Editor/ActionColliderEditor.cs
@@ -9,18 +9,29 @@ namespace ActionTool
// 编辑collider帧
public class ActionColliderEditor : EditorWindow
{
+ EditorWindow sceneView;
private void OnEnable()
{
- titleContent = new GUIContent("Collider Editor");
- }
+ titleContent = new GUIContent("Collider Editor");
+ maxSize = new Vector2(300, 150);
+ minSize = maxSize;
- private void OnDisable()
+ if(!sceneView)
+ sceneView = EditorWindow.GetWindow<SceneView>();
+ }
+
+ private void OnDisable()
{
- ActionManager.OnSelectColliderFrame(null);
+ // sceneView = null;
+ ActionManager.OnSelectColliderFrame(null);
}
- private void OnGUI()
+ private void Update()
+ {
+ }
+
+ private void OnGUI()
{
var frame = ActionManager.editColliderFrame;
if (frame == null)
@@ -29,12 +40,11 @@ namespace ActionTool
return;
}
- Rect pos = position;
- pos.width = 300;
- pos.height = 150;
- position = pos;
+ GUI.changed = false;
- EditorGUILayout.BeginHorizontal();
+ GUILayout.Space(5);
+
+ EditorGUILayout.BeginHorizontal();
EditorGUILayout.LabelField("frame: ");
EditorGUILayout.LabelField(frame.frame.ToString());
EditorGUILayout.EndHorizontal();
@@ -59,6 +69,14 @@ namespace ActionTool
ActionManager.DeleteCurFrame();
}
GUI.color = prevColor;
+
+ if (GUI.changed)
+ {
+ if (sceneView != null)
+ sceneView.Repaint();
+ if (ActionManager.PreviewWindow != null)
+ ActionManager.PreviewWindow.Repaint();
+ }
}
}
-} \ No newline at end of file
+} \ No newline at end of file
diff --git a/Assets/ActionTool/Editor/ActionEditorStyles.cs b/Assets/ActionTool/Editor/ActionEditorStyles.cs
index 1943a74f..fd940b33 100644
--- a/Assets/ActionTool/Editor/ActionEditorStyles.cs
+++ b/Assets/ActionTool/Editor/ActionEditorStyles.cs
@@ -47,9 +47,9 @@ namespace ActionTool
InitStyle(out boxToggle, EditorStyles.miniButtonLeft, s => {
s.fontSize = 8;
s.normal.textColor = Color.white;
- //s.normal.background = null;
- s.active.textColor = Color.white;
- //s.active.background = null;
+ s.onNormal.textColor = Color.white;
+ s.active.textColor = Color.white;
+ s.onActive.textColor = Color.white;
});
InitStyle(out keyFrameButton, GUI.skin.button, s => {
s.fontSize = 8;
diff --git a/Assets/ActionTool/Editor/ActionManager.cs b/Assets/ActionTool/Editor/ActionManager.cs
index 29384821..89e04c80 100644
--- a/Assets/ActionTool/Editor/ActionManager.cs
+++ b/Assets/ActionTool/Editor/ActionManager.cs
@@ -293,7 +293,7 @@ namespace ActionTool
return;
}
ColliderData box = new ColliderData(ColliderBox.EColliderType.HurtBox, ColliderBox.Pivot.MiddleBottom);
- animationData.AddBox(animationData.hurtBoxes, box);
+ animationData.AddBox(ref animationData.hurtBoxes, box);
}
public static void NewHitBox()
@@ -304,7 +304,7 @@ namespace ActionTool
return;
}
ColliderData box = new ColliderData(ColliderBox.EColliderType.HitBox, ColliderBox.Pivot.MiddleCenter);
- animationData.AddBox(animationData.hitBoxes, box);
+ animationData.AddBox(ref animationData.hitBoxes, box);
}
public static void DeleteCurBox()
@@ -356,11 +356,12 @@ namespace ActionTool
public static void OnSelectColliderFrame(ColliderData.ColliderFrame frame)
{
s_CurEditColliderFrame = frame;
- ColliderWindow = EditorWindow.GetWindow<ActionColliderEditor>(true);
- if(frame != null)
+ if (frame != null)
{
- ActionData action = ActionManager.actionData;
+ ColliderWindow = EditorWindow.GetWindow<ActionColliderEditor>(true);
+
+ ActionData action = ActionManager.actionData;
float normaltime = frame.frame / action.totalFrame;
action.curAnimTimeNormal = normaltime;
}
diff --git a/Assets/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
index d236770e..8e620d54 100644
--- a/Assets/ActionTool/Editor/ActionPreviewEditor.cs
+++ b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
@@ -52,7 +52,6 @@ namespace ActionTool
m_UITextureNewHurtBox = (Texture)Resources.Load("hurtbox");
m_UITextureNewHitBox = (Texture)Resources.Load("hitbox");
- styles = ActionEditorStyles.Get();
}
void Update()
@@ -67,7 +66,9 @@ namespace ActionTool
private void OnGUI()
{
- if (ActionManager.CurrentAnimationName == null || ActionManager.CurrentAnimationName == "")
+ styles = ActionEditorStyles.Get();
+
+ if (ActionManager.CurrentAnimationName == null || ActionManager.CurrentAnimationName == "")
{
EditorGUILayout.HelpBox("选择动画", MessageType.Warning);
return;
@@ -338,12 +339,17 @@ namespace ActionTool
void DrawBox(int index, ColliderData box, float y, Color c)
{
ActionData action = ActionManager.actionData;
- Color prevColor = GUI.color;
- GUI.color = c;
- Rect rect = new Rect(kTimeLineViewXOffset - 18, y - 1, 17, kFrameHeight);
+
+ Color prevColor = GUI.backgroundColor;
+ GUI.backgroundColor = c;
+ Rect rect = new Rect(kTimeLineViewXOffset - 17, y - 1, 17, kFrameHeight);
bool selected = ActionManager.colliderData == box;
- bool select = GUI.Toggle(rect, selected, index.ToString(), styles.boxToggle);
- if (select)
+ bool select = GUI.Toggle(rect, selected, index.ToString(), styles.boxToggle);
+ GUI.backgroundColor = prevColor;
+
+ prevColor = GUI.color;
+ GUI.color = c;
+ if (select)
{
ActionManager.OnSelectBox(box);
@@ -403,7 +409,8 @@ namespace ActionTool
GUI.color = prevColor;
}
- void DrawBoxFrameMenuItem()
+ GenericMenu _newFrameMenu;
+ void DrawBoxFrameMenuItem()
{
Event e = Event.current;
if (e.button != 1 || !e.isMouse || e.type != EventType.MouseDown)
@@ -427,16 +434,16 @@ namespace ActionTool
param.frame = frame;
if(ActionManager.colliderData != box)
ActionManager.OnSelectBox(box);
- GenericMenu menu = new GenericMenu();
- menu.AddItem(new GUIContent("New Frame"), false, ActionManager.AddNewBoxFrame, param);
- menu.AddItem(new GUIContent("Delete"), false, ActionManager.DeleteBoxFrame, param);
- menu.ShowAsContext();
+ _newFrameMenu = new GenericMenu();
+ _newFrameMenu.AddItem(new GUIContent("New Frame"), false, ActionManager.AddNewBoxFrame, param);
+ _newFrameMenu.AddItem(new GUIContent("Delete"), false, ActionManager.DeleteBoxFrame, param);
+ _newFrameMenu.ShowAsContext();
}
else
{
Debug.LogError("[ActionTool] 错误的点击");
}
- }
+ }
void GUI_DrawSeperateLine(float x, float y, float height)
{
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Assets/Art/Models/Characters/Erika2.meta
index 41200932..fd7369d9 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
+++ b/Assets/Art/Models/Characters/Erika2.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: abff7cb61c760094f8ab9437379e0f2c
+guid: 077f81003f9fc564791cce182048c2b0
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Data/UnitData.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta
index d0809213..4627f5df 100644
--- a/Assets/Data/UnitData.meta
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 5bdb120d934aa114ab2f20e111a3c4d2
+guid: d467e546efed7054c934b1a97a116c5c
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta
new file mode 100644
index 00000000..ab214036
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 063d53dfefca4e3429f5788835b0b4ea
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta
new file mode 100644
index 00000000..ee2ffc5f
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b82ae836c84f36049bdbdb08743b98e0
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta
new file mode 100644
index 00000000..e0cb5de8
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c219c63d9953ba84b8cbe80444bdbf22
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta
new file mode 100644
index 00000000..640ede12
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..4d017390
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..0d171fe4
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 69c2852d26b47fa44a688db1349ae258
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog.meta
index 8ee2a7dd..b5693f9d 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog.meta
@@ -1,9 +1,8 @@
-fileFormatVersion: 2
-guid: dc3d52e136e3c9747be5e0b494dfc113
-folderAsset: yes
-timeCreated: 1553808001
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: d89d660f213219343aeb4f0c3d596811
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core.meta
index a204c46e..2ce4ec25 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core.meta
@@ -1,9 +1,8 @@
-fileFormatVersion: 2
-guid: f904284479944f14db58207839aaac30
-folderAsset: yes
-timeCreated: 1563965793
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: 71fc976a35787c84092559b2f9c21709
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
index 84c03a47..a1d7afe2 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
@@ -1,9 +1,8 @@
-fileFormatVersion: 2
-guid: 6b4092aee1925294286c91c8b2f0246b
-folderAsset: yes
-timeCreated: 1554706083
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: 8b364f989697ee14e942a1afe15ccb64
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta
index f801216f..2d4efe11 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta
@@ -1,10 +1,8 @@
-fileFormatVersion: 2
-guid: 7f677b222bd908a4eb6e8b6f446f0c95
-folderAsset: yes
-timeCreated: 1568793675
-licenseType: Store
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: 48889f68c6d6ca24c8ddb247c6cd0a50
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta
index 3feeaa0c..ce34d0f8 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: f65f99730f449cd42b5428ed33579276
+guid: 4f4c82780d0eded4a96850c8c7c1e08d
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta
index d482a887..33b8f10c 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta
@@ -1,10 +1,8 @@
-fileFormatVersion: 2
-guid: 0d1d19a8d9a9258489a54453cbd409bf
-folderAsset: yes
-timeCreated: 1568375167
-licenseType: Store
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: a4b790190affff74cb727562ad03cc6a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta
index 7220f15b..41d63c53 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta
@@ -1,9 +1,8 @@
-fileFormatVersion: 2
-guid: 5fa002e3b21354f4b847ab441877ecda
-folderAsset: yes
-timeCreated: 1555297530
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: 5f2613b838385724184911eab0a95ff3
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta
index 856dabf6..d19fe164 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta
@@ -1,9 +1,8 @@
-fileFormatVersion: 2
-guid: c9c840958f8546c4e9667f0757d8557a
-folderAsset: yes
-timeCreated: 1555297627
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: 0f2529ec52a5fd6468161d93bd4440c7
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta
index 00ea5412..ab39d080 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta
@@ -1,10 +1,8 @@
-fileFormatVersion: 2
-guid: 0f14f2cbed5e00a40a3fa94241cf6c27
-folderAsset: yes
-timeCreated: 1570704692
-licenseType: Store
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: 38b7dce3fd7e1af418e30778e52cfc89
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo.meta
index 4e109e1a..4c2393e4 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo.meta
@@ -1,9 +1,8 @@
-fileFormatVersion: 2
-guid: 020de442e621fc9429901706903e86f3
-folderAsset: yes
-timeCreated: 1563965805
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: c5760eeeac06ea9459834f69ca51ab32
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
index bd1cb5cb..af19c562 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
@@ -1,10 +1,8 @@
-fileFormatVersion: 2
-guid: 5e705a58e98ec1a409129eb57fa15477
-folderAsset: yes
-timeCreated: 1568297170
-licenseType: Store
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: 3231928b0b9f9ed409c298cebe7ed44f
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta
index b016caf8..670dfbf0 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta
@@ -1,9 +1,8 @@
-fileFormatVersion: 2
-guid: c77d30703ebcc5c4bbb57517b133b0f4
-folderAsset: yes
-timeCreated: 1559733098
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: 496d2b674ed8cba47930705b858c62aa
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta
index b8fda362..fbb694de 100644
--- a/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta
+++ b/Assets/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta
@@ -1,10 +1,8 @@
-fileFormatVersion: 2
-guid: 142685877fe50f64caba63abfda167a7
-folderAsset: yes
-timeCreated: 1570704711
-licenseType: Store
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: 43d668848791a024bbf14daff73a9656
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/BOXOPHOBIC/User.meta b/Assets/BOXOPHOBIC/User.meta
index 293c8b38..2f8f3126 100644
--- a/Assets/BOXOPHOBIC/User.meta
+++ b/Assets/BOXOPHOBIC/User.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: f0aa5379d96b0e14795df45a380643fb
+guid: b7d458fadeeacb34ea6fd83f18f024a4
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils.meta b/Assets/BOXOPHOBIC/Utils.meta
index b55d4991..808c1e8b 100644
--- a/Assets/BOXOPHOBIC/Utils.meta
+++ b/Assets/BOXOPHOBIC/Utils.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: a064d10b68bc06748b6e6b212239266d
+guid: 3ed8ac36c42fa8a45a6f62ff10d5b287
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Editor.meta b/Assets/BOXOPHOBIC/Utils/Editor.meta
index 457e4f2e..d307ca47 100644
--- a/Assets/BOXOPHOBIC/Utils/Editor.meta
+++ b/Assets/BOXOPHOBIC/Utils/Editor.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: ff667e671b5a70940a82c06d2b24883d
+guid: 6a27ef5e38a3d75469ae0bbc56f885b3
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Editor/Constants.meta b/Assets/BOXOPHOBIC/Utils/Editor/Constants.meta
index a5ee5a64..317a31f8 100644
--- a/Assets/BOXOPHOBIC/Utils/Editor/Constants.meta
+++ b/Assets/BOXOPHOBIC/Utils/Editor/Constants.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 4c9d2f06234e7e643b2118057d8e0673
+guid: f975f7f073569654bb9318215ba4cd73
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta b/Assets/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta
index 3fdad1c4..e9b98bba 100644
--- a/Assets/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta
+++ b/Assets/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 6fcf51a07e84ca941a62046a0b693a19
+guid: 3ddf9a50ab07a4e469766a6d18a98031
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Editor/StyledGUI.meta b/Assets/BOXOPHOBIC/Utils/Editor/StyledGUI.meta
index 94757653..9144e9d9 100644
--- a/Assets/BOXOPHOBIC/Utils/Editor/StyledGUI.meta
+++ b/Assets/BOXOPHOBIC/Utils/Editor/StyledGUI.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 28d59ef8b8ebe8d48a3a27e990a2d7e9
+guid: 4a1230a2a75d21048917b14c34140601
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Editor/StyledInspector.meta b/Assets/BOXOPHOBIC/Utils/Editor/StyledInspector.meta
index d2c0b7b4..78def35b 100644
--- a/Assets/BOXOPHOBIC/Utils/Editor/StyledInspector.meta
+++ b/Assets/BOXOPHOBIC/Utils/Editor/StyledInspector.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: edc7fbbe770e693488770a7aaeae2aa6
+guid: 05282c25086dbbf4eb12cbe3cf6f16fc
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta b/Assets/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta
index 069be515..6c2aa7ba 100644
--- a/Assets/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta
+++ b/Assets/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 8ed975ceb335a144c93320e22ae1780a
+guid: 72d0e5549e090634c9f3ff5e896c3e93
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Editor/StyledMono.meta b/Assets/BOXOPHOBIC/Utils/Editor/StyledMono.meta
index 7ea21e4b..ba24786c 100644
--- a/Assets/BOXOPHOBIC/Utils/Editor/StyledMono.meta
+++ b/Assets/BOXOPHOBIC/Utils/Editor/StyledMono.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 5a3babbb69c72f8419243020c0dfb70b
+guid: a8b42c332908fba438ec7ea14b4dded1
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Resources.meta b/Assets/BOXOPHOBIC/Utils/Resources.meta
index f2a1c8a6..338cbff7 100644
--- a/Assets/BOXOPHOBIC/Utils/Resources.meta
+++ b/Assets/BOXOPHOBIC/Utils/Resources.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: cd6738b410016744eaf6e182174c0b2b
+guid: b1b58aafa2fedeb429de4a748510a6dd
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Scripts.meta b/Assets/BOXOPHOBIC/Utils/Scripts.meta
index 098359b5..cb717a97 100644
--- a/Assets/BOXOPHOBIC/Utils/Scripts.meta
+++ b/Assets/BOXOPHOBIC/Utils/Scripts.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 7a7172af4ede829428c703b4fa106dc5
+guid: 182523467462c8843927ea3a1521f7ba
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta b/Assets/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
index 50e68eff..0388e113 100644
--- a/Assets/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
+++ b/Assets/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: f32bd65977ebf9049bd5e40e18d1556c
+guid: 5d173e32f35ece04fb0dbcecc74ba8f9
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta b/Assets/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta
index 68664862..63020842 100644
--- a/Assets/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta
+++ b/Assets/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 151a76ee3bec1ae449cd56f31d474de5
+guid: 552b22f2a2991434caae4055e7f687b8
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/BOXOPHOBIC/Utils/Scripts/StyledMono.meta b/Assets/BOXOPHOBIC/Utils/Scripts/StyledMono.meta
index aab2c856..8717be17 100644
--- a/Assets/BOXOPHOBIC/Utils/Scripts/StyledMono.meta
+++ b/Assets/BOXOPHOBIC/Utils/Scripts/StyledMono.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 3ae8613087e217249a69059295113b1c
+guid: 3c68b6da1ed7bfe45aae9f6790b168d6
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Data/AnimationData/Erika/Air_Attk_1.asset b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset
new file mode 100644
index 00000000..f9a509f4
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
+ m_Name: Air_Attk_1
+ m_EditorClassIdentifier:
+ animationName: Air_Attk_1
+ animationPath: Assets/Art/Animations/Erika/Air_Attk_1.anim
+ animationEvents: []
+ hurtBoxes: []
+ hitBoxes: []
+ throwBoxes: []
+ blockBoxes: []
+ defendBoxes: []
diff --git a/Assets/Data/AnimationData/Erika/Air_Attk_1.asset.meta b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset.meta
new file mode 100644
index 00000000..ed955b81
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 14de9b009d1b4e748bed1da6a5771d72
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Data/AnimationData/Erika/Air_Dash.asset b/Assets/Data/AnimationData/Erika/Air_Dash.asset
new file mode 100644
index 00000000..c0b73c2f
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Air_Dash.asset
@@ -0,0 +1,48 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
+ m_Name: Air_Dash
+ m_EditorClassIdentifier:
+ animationName: Air_Dash
+ animationPath: Assets/Art/Animations/Erika/Air_Dash.anim
+ animationEvents: []
+ hurtBoxes:
+ - type: 1
+ pivot: 0
+ frames:
+ - frame: 0
+ active: 1
+ position: {x: 0, y: 0, z: 0}
+ size: {x: 1, y: 1.32, z: 0.5}
+ - frame: 4
+ active: 0
+ position: {x: 0, y: 0, z: 0}
+ size: {x: 1, y: 0.61, z: 0.5}
+ - frame: 22
+ active: 0
+ position: {x: 0, y: 0, z: 0}
+ size: {x: 1, y: 0.67, z: 0.5}
+ - frame: 37
+ active: 1
+ position: {x: 0, y: 0, z: 0}
+ size: {x: 1, y: 0.59, z: 0.5}
+ - frame: 54
+ active: 1
+ position: {x: 0, y: 0, z: 0}
+ size: {x: 1, y: 1.34, z: 0.5}
+ hitBoxes:
+ - type: 0
+ pivot: 1
+ frames: []
+ throwBoxes: []
+ blockBoxes: []
+ defendBoxes: []
diff --git a/Assets/Data/AnimationData/Erika/Air_Dash.asset.meta b/Assets/Data/AnimationData/Erika/Air_Dash.asset.meta
new file mode 100644
index 00000000..77e02352
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Air_Dash.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8aa329a6d983d9d40af0c8090f0f122d
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Data/AnimationData/Erika/SuperKickCombo.asset b/Assets/Data/AnimationData/Erika/SuperKickCombo.asset
index 9931a73a..b4fea728 100644
--- a/Assets/Data/AnimationData/Erika/SuperKickCombo.asset
+++ b/Assets/Data/AnimationData/Erika/SuperKickCombo.asset
@@ -15,8 +15,17 @@ MonoBehaviour:
animationName: SuperKickCombo
animationPath: Assets/Art/Animations/Erika/SuperKickCombo.anim
animationEvents: []
- hurtBoxes: []
- hitBoxes: []
+ hurtBoxes:
+ - type: 1
+ pivot: 0
+ frames: []
+ hitBoxes:
+ - type: 0
+ pivot: 1
+ frames: []
+ - type: 0
+ pivot: 1
+ frames: []
throwBoxes: []
blockBoxes: []
defendBoxes: []
diff --git a/Assets/Data/AnimationData/Erika/Take 001.asset b/Assets/Data/AnimationData/Erika/Take 001.asset
index 16700c41..70429638 100644
--- a/Assets/Data/AnimationData/Erika/Take 001.asset
+++ b/Assets/Data/AnimationData/Erika/Take 001.asset
@@ -54,7 +54,7 @@ MonoBehaviour:
- frame: 45
active: 1
position: {x: 0, y: 0, z: 0}
- size: {x: 1, y: 0.7, z: 0.5}
+ size: {x: 1, y: 0.61, z: 0.5}
- frame: 82
active: 1
position: {x: 0, y: 0, z: 0}
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)
diff --git a/Assets/ThirdParty/BOXOPHOBIC.meta b/Assets/ThirdParty/BOXOPHOBIC.meta
new file mode 100644
index 00000000..339e3c9d
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f534dcf678111324da0fb22bd04ab0f7
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog.meta
new file mode 100644
index 00000000..9eb1912e
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dc3d52e136e3c9747be5e0b494dfc113
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core.meta
new file mode 100644
index 00000000..f5bdf48e
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f904284479944f14db58207839aaac30
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
new file mode 100644
index 00000000..fc69e121
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..16dceda0
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..3feeaa0c
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..d2cc8de3
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..60091bee
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..c50ca514
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c9c840958f8546c4e9667f0757d8557a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta
index fa9e76cd..20eca756 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: e38cb65072bb4a64cbe162792de9bec2
+guid: 0f14f2cbed5e00a40a3fa94241cf6c27
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo.meta
new file mode 100644
index 00000000..0ffb6af7
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 020de442e621fc9429901706903e86f3
+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
new file mode 100644
index 00000000..35b83bfb
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..88f9f501
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..4d33dc86
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..293c8b38
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/User.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f0aa5379d96b0e14795df45a380643fb
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils.meta
new file mode 100644
index 00000000..b55d4991
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a064d10b68bc06748b6e6b212239266d
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor.meta
new file mode 100644
index 00000000..457e4f2e
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ff667e671b5a70940a82c06d2b24883d
+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
new file mode 100644
index 00000000..a5ee5a64
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..3fdad1c4
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..94757653
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..d2c0b7b4
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..069be515
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..7ea21e4b
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..f2a1c8a6
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cd6738b410016744eaf6e182174c0b2b
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts.meta
index b76e98a5..098359b5 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 20381b3eecfbfe34a9d9222868969d29
+guid: 7a7172af4ede829428c703b4fa106dc5
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
new file mode 100644
index 00000000..50e68eff
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..68664862
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..aab2c856
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ae8613087e217249a69059295113b1c
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant: