summaryrefslogtreecommitdiff
path: root/Assets
diff options
context:
space:
mode:
Diffstat (limited to 'Assets')
-rw-r--r--Assets/ActionTool/Editor/ActionPreviewEditor.cs25
-rw-r--r--Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta (renamed from Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta)2
-rw-r--r--Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta (renamed from Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta)2
-rw-r--r--Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta (renamed from Assets/Bundle/Curves.meta)2
-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/Bundle/Material.meta8
-rw-r--r--Assets/Bundle/Shader.meta8
-rw-r--r--Assets/Bundle/UI.meta8
-rw-r--r--Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta8
-rw-r--r--Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta8
-rw-r--r--Assets/Bundle/Unit/NPC.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset20
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset30
-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/Curve3D.meta8
-rw-r--r--Assets/Scripts/Drone.meta8
-rw-r--r--Assets/Scripts/Projectile/Projectile.cs59
-rw-r--r--Assets/Scripts/Props.meta8
-rw-r--r--Assets/Scripts/Robot.meta8
-rw-r--r--Assets/Scripts/Scene.meta8
-rw-r--r--Assets/Scripts/Unit/Collider/ColliderAttributes.cs5
-rw-r--r--Assets/Scripts/Unit/Components/UnitState/PCState.cs31
-rw-r--r--Assets/Scripts/Unit/Controller/UnitController.cs7
-rw-r--r--Assets/Scripts/Unit/Events/EventEffect.cs2
-rw-r--r--Assets/Scripts/Unit/Events/EventProjectile.cs27
-rw-r--r--Assets/Scripts/Unit/TimelineEventProxy.cs48
-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/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
68 files changed, 389 insertions, 305 deletions
diff --git a/Assets/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
index 56e5b486..7e9ffc08 100644
--- a/Assets/ActionTool/Editor/ActionPreviewEditor.cs
+++ b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
@@ -864,12 +864,27 @@ namespace ActionTool
if (GUI.Button(rect, "", styles.boxToggle))
{
AnimationData animData = ActionManager.animationData;
- ActionInfoEditor.ShowContent("Event Info",
- "Events: " + (animData.animationEvents == null ? 0 : animData.animationEvents.Count)
- );
- }
+ Dictionary<string, int> events = new Dictionary<string, int>();
+ for (int i = 0; i < animData.animationEvents.Count; ++i)
+ {
+ var e = animData.animationEvents[i];
+ if(!events.ContainsKey(e.type.ToString()))
+ events.Add(e.type.ToString(), 0);
+ events[e.type.ToString()]++;
+ }
+ string str = "";
+ foreach(var e in events)
+ {
+ str += "\n" + e.Key.ToString() + ": " + e.Value;
+ }
+
+ ActionInfoEditor.ShowContent("Event Info",
+ "Events: " + (animData.animationEvents == null ? 0 : animData.animationEvents.Count) +
+ str
+ );
+ }
Rect lb = rect;
- lb.y += 3;
+ //lb.y += 3;
lb.x += 2;
GUI.Label(lb, "EV", styles.textBoldSmallMid);
DrawAllEvents();
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta
index b76e98a5..4627f5df 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 20381b3eecfbfe34a9d9222868969d29
+guid: d467e546efed7054c934b1a97a116c5c
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta
index 41200932..ab214036 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: abff7cb61c760094f8ab9437379e0f2c
+guid: 063d53dfefca4e3429f5788835b0b4ea
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Bundle/Curves.meta b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta
index 8270b2ee..ee2ffc5f 100644
--- a/Assets/Bundle/Curves.meta
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 89d7a483edd237c41b3a2278c2e4c80c
+guid: b82ae836c84f36049bdbdb08743b98e0
folderAsset: yes
DefaultImporter:
externalObjects: {}
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/Bundle/Material.meta b/Assets/Bundle/Material.meta
deleted file mode 100644
index 85215e86..00000000
--- a/Assets/Bundle/Material.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8641bb4d4eee8b1419a1c8316ff9aee5
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Shader.meta b/Assets/Bundle/Shader.meta
deleted file mode 100644
index 92ded933..00000000
--- a/Assets/Bundle/Shader.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5a8ba4f43d9a7b24d855cadccb986b60
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/UI.meta b/Assets/Bundle/UI.meta
deleted file mode 100644
index 0914914c..00000000
--- a/Assets/Bundle/UI.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4392471259b05a74a82a4bc72b510eb1
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta
deleted file mode 100644
index ca7266b0..00000000
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a1d7b6e0d8fb1a642a65011fb6cd7d89
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta
deleted file mode 100644
index 142f5872..00000000
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6ad7401709700f34db2b795830937d76
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/NPC.meta b/Assets/Bundle/Unit/NPC.meta
deleted file mode 100644
index eeea13e1..00000000
--- a/Assets/Bundle/Unit/NPC.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ced034d375cdfa488814663ea17a79b
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
index b17bb4ff..db86e69f 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Frank_RPG_Assassin_Combo02_1(Clone)
+ m_Name: Frank_RPG_Assassin_Combo02_1
m_EditorClassIdentifier:
animationName: Frank_RPG_Assassin_Combo02_1
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_1.anim
@@ -152,16 +152,20 @@ MonoBehaviour:
m_Name: EventProjectile
m_EditorClassIdentifier:
startFrame: 7
+ name:
+ tag:
projectilePath: Assets/Bundle/Projectile/PlasmaOceanBlue_Big_Projectile 1.prefab
attachedToBone: 0
bone:
posOffset: {x: 0, y: 1, z: 0}
rotation: {x: 0, y: 0, z: 0}
scale: {x: 1, y: 1, z: 1}
+ lifeTime: 0
+ moveType: 0
velocity: {x: 1, y: 0, z: 0}
towardDirection: 0
- hitResponse: 0
sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab
+ hitResponse: 0
--- !u!114 &114273515162279198
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -175,16 +179,20 @@ MonoBehaviour:
m_Name: EventProjectile
m_EditorClassIdentifier:
startFrame: 11
+ name:
+ tag:
projectilePath: Assets/Bundle/Projectile/PlasmaOceanBlue_Big_Projectile 1.prefab
attachedToBone: 0
bone:
posOffset: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0}
scale: {x: 1, y: 1, z: 1}
+ lifeTime: 0
+ moveType: 0
velocity: {x: 1, y: 0, z: 0}
towardDirection: 0
- hitResponse: 0
sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab
+ hitResponse: 0
--- !u!114 &114533364586825402
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -217,16 +225,20 @@ MonoBehaviour:
m_Name: EventProjectile
m_EditorClassIdentifier:
startFrame: 7
+ name:
+ tag:
projectilePath: Assets/Bundle/Projectile/PlasmaOceanBlue_Big_Projectile 1.prefab
attachedToBone: 0
bone:
posOffset: {x: 0, y: 1, z: 0}
rotation: {x: 0, y: 0, z: 0}
scale: {x: 1, y: 1, z: 1}
+ lifeTime: 0
+ moveType: 0
velocity: {x: 1, y: 0, z: 0}
towardDirection: 0
- hitResponse: 0
sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab
+ hitResponse: 0
--- !u!114 &114964882930719632
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
index 915c2d85..550ad6ee 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Take 001
+ m_Name: Take 001(Clone)
m_EditorClassIdentifier:
animationName: Take 001
animationPath: Assets/Art/Animations/Erika/Take 001.anim
@@ -26,12 +26,14 @@ MonoBehaviour:
type: 1
pivot: 0
multiHit: 0
+ hitResponse: 0
hitBack: {x: 0, y: 0, z: 0}
freezeFramesSelf: 0
freezeFramesOther: 0
sparkPath:
sparkAnchor: 0
sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 1, y: 1, z: 1}
multiSparks: 0
spark2Path:
spark2Anchor: 0
@@ -112,12 +114,14 @@ MonoBehaviour:
type: 0
pivot: 0
multiHit: 0
+ hitResponse: 0
hitBack: {x: 0, y: 0, z: 0}
freezeFramesSelf: 0
freezeFramesOther: 0
sparkPath:
sparkAnchor: 0
sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 1, y: 1, z: 1}
multiSparks: 0
spark2Path:
spark2Anchor: 0
@@ -149,12 +153,14 @@ MonoBehaviour:
type: 0
pivot: 0
multiHit: 0
+ hitResponse: 0
hitBack: {x: 0, y: 0, z: 0}
freezeFramesSelf: 0
freezeFramesOther: 0
sparkPath:
sparkAnchor: 0
sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 1, y: 1, z: 1}
multiSparks: 0
spark2Path:
spark2Anchor: 0
@@ -186,12 +192,14 @@ MonoBehaviour:
type: 0
pivot: 0
multiHit: 0
+ hitResponse: 0
hitBack: {x: 0, y: 0, z: 0}
freezeFramesSelf: 0
freezeFramesOther: 0
sparkPath:
sparkAnchor: 0
sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 1, y: 1, z: 1}
multiSparks: 0
spark2Path:
spark2Anchor: 0
@@ -223,12 +231,14 @@ MonoBehaviour:
type: 0
pivot: 0
multiHit: 0
+ hitResponse: 0
hitBack: {x: 0, y: 0, z: 0}
freezeFramesSelf: 0
freezeFramesOther: 0
sparkPath:
sparkAnchor: 0
sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 1, y: 1, z: 1}
multiSparks: 0
spark2Path:
spark2Anchor: 0
@@ -260,12 +270,14 @@ MonoBehaviour:
type: 0
pivot: 0
multiHit: 0
+ hitResponse: 0
hitBack: {x: 0, y: 0, z: 0}
freezeFramesSelf: 0
freezeFramesOther: 0
sparkPath:
sparkAnchor: 0
sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 1, y: 1, z: 1}
multiSparks: 0
spark2Path:
spark2Anchor: 0
@@ -296,6 +308,9 @@ MonoBehaviour:
throwBoxes: []
blockBoxes: []
defendBoxes: []
+ overrideRootMotion: 0
+ rootMotionOverrideData:
+ positions: []
speedCurve:
serializedVersion: 2
m_Curve:
@@ -564,13 +579,22 @@ MonoBehaviour:
m_Name: EventProjectile
m_EditorClassIdentifier:
startFrame: 28
+ name:
+ tag: Code,Robot
projectilePath:
- attached: 0
+ attachedToBone: 0
bone:
- position: {x: 0, y: 0, z: 0}
+ posOffset: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0}
scale: {x: 0, y: 0, z: 0}
+ lifeTime: 0
+ moveType: 0
velocity: {x: 0, y: 0, z: 0}
+ acceleration: {x: 0, y: -10, z: 0}
+ curvePath:
+ towardDirection: 0
+ sparkPath:
+ hitResponse: 0
--- !u!114 &114550616663341652
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta
deleted file mode 100644
index 1d22d5d2..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 8c41a6b2..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 11148d17..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Models.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 7d4b13eb..00000000
--- a/Assets/Bundle/Unit/PC/Erika/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
new file mode 100644
index 00000000..be6badd6
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
@@ -0,0 +1,8 @@
+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
deleted file mode 100644
index f5434a00..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 4ed2c938..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 43a52cd1..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 85d58a8c..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index dd867045..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index dc530723..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index b28b6f04..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index eeca0d3b..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 7f91da28..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index affd6eed..00000000
--- a/Assets/Bundle/Unit/Prop.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: dafc173db1ebeab4c80641cc3d4fa528
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Data/ActionData.meta b/Assets/Data/ActionData.meta
deleted file mode 100644
index 48dd5af5..00000000
--- a/Assets/Data/ActionData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 10bf1fb1..00000000
--- a/Assets/Data/AnimationData/Erika.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 57b03e09..00000000
--- a/Assets/Data/RootMotionData/Erika.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2c4e05f9eb0abc949a472e82070dfef1
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Data/UnitData.meta b/Assets/Data/UnitData.meta
deleted file mode 100644
index d0809213..00000000
--- a/Assets/Data/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5bdb120d934aa114ab2f20e111a3c4d2
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Curve3D.meta b/Assets/Scripts/Curve3D.meta
deleted file mode 100644
index fef1c5e7..00000000
--- a/Assets/Scripts/Curve3D.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ad8b718b6b700d8419838dad07158567
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Drone.meta b/Assets/Scripts/Drone.meta
deleted file mode 100644
index 694cff70..00000000
--- a/Assets/Scripts/Drone.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ec3412151f8a72a41b2ed21316763399
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Projectile/Projectile.cs b/Assets/Scripts/Projectile/Projectile.cs
index a6411f5f..ba325302 100644
--- a/Assets/Scripts/Projectile/Projectile.cs
+++ b/Assets/Scripts/Projectile/Projectile.cs
@@ -4,16 +4,18 @@ using UnityEngine;
public struct ProjectileInfo
{
- public UnitController owner;
+ public string name;
+ public string tag;
+ public EventProjectile.EMoveType moveType;
+ public UnitController owner;
public Vector3 position;
public Vector3 rotation;
public Vector3 scale;
- public Vector3 direction;
public Vector3 velocity;
- public bool towardDirection;
+ public Vector3 acceleration;
+ public bool towardDirection;
public float lifetime;
public bool useGravity;
- public float gravity;
public string sparkPath;
}
@@ -35,9 +37,17 @@ public class Projectile : MonoBehaviour
public Box colliderGrid;
public Vector3 slice;
- #endregion
+ #endregion
- [HideInInspector]
+ //名字,可以用来识别这个projectile
+ public new string name;
+
+ //标签,可以用来做一些标记
+ public new string tag;
+
+ public EventProjectile.EMoveType moveType;
+
+ [HideInInspector]
public UnitController owner;
[HideInInspector]
@@ -46,10 +56,10 @@ public class Projectile : MonoBehaviour
[HideInInspector]
public Vector3 velocity; // 初始速度
- [HideInInspector]
- public float gravity;
+ [HideInInspector]
+ public Vector3 acceleration; // 加速度
- [HideInInspector]
+ [HideInInspector]
public bool towardDirection; // foward朝向运动的方向
[HideInInspector]
@@ -65,12 +75,16 @@ public class Projectile : MonoBehaviour
public void Initialize(ProjectileInfo info)
{
+ this.name = info.name;
+ this.tag = info.tag;
+ this.moveType = info.moveType;
this.owner = info.owner;
this.transform.rotation = Quaternion.Euler(info.rotation);
this.transform.position = info.position;
this.transform.localScale.Scale(info.scale);
this.velocity = info.velocity;
- this.lifetime = info.lifetime;
+ this.acceleration = info.acceleration;
+ this.lifetime = info.lifetime;
this.sparkPath = info.sparkPath;
markDestroy = false;
@@ -92,15 +106,19 @@ public class Projectile : MonoBehaviour
public void Update(float deltaTime)
{
- this.transform.position += this.velocity * deltaTime;
- time += deltaTime;
- if (time > this.lifetime || markDestroy)
- {
- DestroyImmediate(this.gameObject);
- }
- }
+ if(moveType == EventProjectile.EMoveType.Kinematic)
+ {
+ this.velocity += this.acceleration * deltaTime;
+ this.transform.position += this.velocity * deltaTime;
+ }
+ time += deltaTime;
+ if (time > this.lifetime || markDestroy)
+ {
+ DestroyImmediate(this.gameObject);
+ }
+ }
- void OnDestroy()
+ void OnDestroy()
{
ColliderRegistry.Instance.RemoveProjectile(this);
}
@@ -179,4 +197,9 @@ public class Projectile : MonoBehaviour
}
}
+ public bool HasTag(string tag)
+ {
+ return this.tag != null && this.tag.Contains(tag);
+ }
+
} \ No newline at end of file
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/Robot.meta b/Assets/Scripts/Robot.meta
deleted file mode 100644
index 0b5a087e..00000000
--- a/Assets/Scripts/Robot.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7c09ca1609552d24bbe697d1516f8aa9
-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/Collider/ColliderAttributes.cs b/Assets/Scripts/Unit/Collider/ColliderAttributes.cs
index 47998b3c..27889441 100644
--- a/Assets/Scripts/Unit/Collider/ColliderAttributes.cs
+++ b/Assets/Scripts/Unit/Collider/ColliderAttributes.cs
@@ -98,13 +98,14 @@ public class AndWhenAttribute : Attribute
public class WhenNotAttribute : Attribute
{
- public WhenNotAttribute(string name, float value)
+ public WhenNotAttribute(string name, object value)
{
this.conditionName = name;
+ this.value = (int)value;
}
public string conditionName;
- public float value;
+ public int value;
}
public class CommentAttribute : Attribute
diff --git a/Assets/Scripts/Unit/Components/UnitState/PCState.cs b/Assets/Scripts/Unit/Components/UnitState/PCState.cs
index 54a48cc2..e448b6b2 100644
--- a/Assets/Scripts/Unit/Components/UnitState/PCState.cs
+++ b/Assets/Scripts/Unit/Components/UnitState/PCState.cs
@@ -44,9 +44,16 @@ public class PCState : UnitState
public override void Initialize()
{
base.Initialize();
- }
+ owner.onTimelineEvent += OnTimeLineEvent;
+ }
- PCAnimation pcAnimation { get { return m_Owner.pcAnimation; } }
+ public override void Release()
+ {
+ owner.onTimelineEvent -= OnTimeLineEvent;
+ base.Release();
+ }
+
+ PCAnimation pcAnimation { get { return m_Owner.pcAnimation; } }
#region state param
public struct IdleParam { }
@@ -451,9 +458,17 @@ public class PCState : UnitState
void OnLandingExit(EUnitState next)
{
- }
-
- #endregion
-
-}
- \ No newline at end of file
+ }
+
+ #endregion
+
+ #region timeline event handle
+
+ void OnTimeLineEvent(AnimationEventBase animEvent)
+ {
+
+ }
+
+ #endregion
+
+} \ No newline at end of file
diff --git a/Assets/Scripts/Unit/Controller/UnitController.cs b/Assets/Scripts/Unit/Controller/UnitController.cs
index 63202f29..2f43b4e4 100644
--- a/Assets/Scripts/Unit/Controller/UnitController.cs
+++ b/Assets/Scripts/Unit/Controller/UnitController.cs
@@ -41,7 +41,12 @@ public class UnitController : MonoBehaviour/*, Interactable*/
public GameObject unitObj; // 角色模型
- public bool isTowardRight
+ #region 事件监听
+ public delegate void OnTimelineEventHandle(AnimationEventBase animEvent);
+ public OnTimelineEventHandle onTimelineEvent { get; set; }
+ #endregion
+
+ public bool isTowardRight
{
get
{
diff --git a/Assets/Scripts/Unit/Events/EventEffect.cs b/Assets/Scripts/Unit/Events/EventEffect.cs
index 8820aa21..d6a3fa16 100644
--- a/Assets/Scripts/Unit/Events/EventEffect.cs
+++ b/Assets/Scripts/Unit/Events/EventEffect.cs
@@ -11,7 +11,7 @@ public class EventEffect : AnimationEventBase
[Tooltip("Is attached to a bone")]
public bool attached;
- [Tooltip("Bone path attach to")]
+ [If("attached"), Tooltip("Bone path attach to")]
public string bone;
[Tooltip("Position offset")]
diff --git a/Assets/Scripts/Unit/Events/EventProjectile.cs b/Assets/Scripts/Unit/Events/EventProjectile.cs
index 5f9a22aa..6083179b 100644
--- a/Assets/Scripts/Unit/Events/EventProjectile.cs
+++ b/Assets/Scripts/Unit/Events/EventProjectile.cs
@@ -6,21 +6,28 @@ public class EventProjectile : AnimationEventBase
{
public enum EMoveType
{
- GoStraight,
- Curve,
- }
+ Kinematic = 0,
+ Curve, // 用一个固定曲线运动
+ Procedural, // 程序控制
+ }
public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventProjectile; } }
public override string shortName { get { return "P"; } }
+ [Tooltip("名字,可以用来识别这个projectile")]
+ public string name;
+
+ [Tooltip("标签,可以用来做一些标记,逗号分隔")]
+ public string tag;
+
[Tooltip("Projectile path")]
public string projectilePath;
[Tooltip("Is attached to a bone")]
public bool attachedToBone;
- [Tooltip("Bone path attach to")]
+ [If("attachedToBone"), Tooltip("Bone path attach to")]
public string bone;
[Tooltip("Position offset")]
@@ -29,16 +36,24 @@ public class EventProjectile : AnimationEventBase
[Tooltip("Rotation in euler")]
public Vector3 rotation;
- [When("moveType", EMoveType.GoStraight), Tooltip("Scale")]
+ [Tooltip("Scale")]
public Vector3 scale = Vector3.one;
+ public float lifeTime;
+
[Comment("[ 运动方式 ]", TextAnchor.MiddleCenter)]
public EMoveType moveType;
- [When("moveType", EMoveType.GoStraight), Tooltip("初始速度")]
+ [When("moveType", EMoveType.Kinematic), Tooltip("初始速度")]
public Vector3 velocity;
+ [When("moveType", EMoveType.Kinematic), Tooltip("加速度")]
+ public Vector3 acceleration;
+
+ [When("moveType", EMoveType.Curve), Tooltip("运动曲线")]
+ public string curvePath;
+ [WhenNot("moveType", EMoveType.Procedural)]
public bool towardDirection;
[Comment("[ 击中反馈 ]", TextAnchor.MiddleCenter)]
diff --git a/Assets/Scripts/Unit/TimelineEventProxy.cs b/Assets/Scripts/Unit/TimelineEventProxy.cs
index da4185a7..2c5bf608 100644
--- a/Assets/Scripts/Unit/TimelineEventProxy.cs
+++ b/Assets/Scripts/Unit/TimelineEventProxy.cs
@@ -131,25 +131,28 @@ public partial class TimelineEventProxy
m_PrevFrame = frame;
}
- #region Event Handles
+ void ExecuteEvents(List<AnimationEventBase> events)
+ {
+ if (events == null || events.Count == 0)
+ return;
+ foreach (var e in events)
+ {
+ string name = e.type.ToString();
+ MethodInfo method = GetType().GetMethod(name, BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof(AnimationEventBase) }, null);
+ if (method != null)
+ {
+ object[] param = new object[] { e };
+ method.Invoke(this, param);
- void ExecuteEvents(List<AnimationEventBase> events)
- {
- if (events == null || events.Count == 0)
- return;
- foreach (var e in events)
- {
- string name = e.type.ToString();
- MethodInfo method = GetType().GetMethod(name, BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof(AnimationEventBase) }, null);
- if (method != null)
- {
- object[] param = new object[] { e };
- method.Invoke(this, param);
- }
- }
- }
-
- void EventEffect(AnimationEventBase animEvent)
+ if(owner != null)
+ owner.onTimelineEvent(e);
+ }
+ }
+ }
+
+ #region Event Handles
+
+ void EventEffect(AnimationEventBase animEvent)
{
EventEffect effect = animEvent as EventEffect;
if (effect == null)
@@ -204,13 +207,16 @@ public partial class TimelineEventProxy
GameObject obj = GameObject.Instantiate(prefab);
Projectile projectile = obj.GetComponent<Projectile>();
ProjectileInfo info = new ProjectileInfo();
+ info.name = e.name;
+ info.tag = e.tag;
+ info.moveType = e.moveType;
info.owner = owner;
info.position = m_Root.transform.position + e.posOffset;
info.rotation = e.rotation;
info.scale = e.scale;
- info.direction = Vector3.right;
- info.velocity = Vector3.right * 10f;
- info.lifetime = 5;
+ info.velocity = e.velocity;
+ info.acceleration = e.acceleration;
+ info.lifetime = e.lifeTime;
info.sparkPath = e.sparkPath;
projectile.Initialize(info);
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/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/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/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: