summaryrefslogtreecommitdiff
path: root/Assets/Bundle/Unit/PC
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Bundle/Unit/PC')
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset57
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset119
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Materials/Effect/unit_effect_blur.mat1
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta (renamed from Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta)2
-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/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
15 files changed, 256 insertions, 11 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset
index 333f59bc..2e6c13c6 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset
@@ -18,6 +18,7 @@ MonoBehaviour:
animationEvents:
- {fileID: 114581710045323768}
- {fileID: 114435450776992514}
+ - {fileID: 114721479198979772}
hurtBoxes: []
hitBoxes:
- collider:
@@ -139,8 +140,10 @@ MonoBehaviour:
startFrame: 12
effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab
attached: 1
- attachNode: 0
- bone:
+ parentNode: 0
+ bonePath:
+ bone: 0
+ referencePoint: 0
position: {x: 0, y: 0.8, z: 0}
rotation: {x: -24.814, y: 33.032, z: -30.331}
scale: {x: 0.7, y: 0.7, z: 0.7}
@@ -159,8 +162,10 @@ MonoBehaviour:
startFrame: 9
effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab
attached: 0
- attachNode: 0
- bone:
+ parentNode: 0
+ bonePath:
+ bone: 0
+ referencePoint: 0
position: {x: 0, y: 1.3, z: 0}
rotation: {x: -24.814, y: 33.032, z: -30.331}
scale: {x: 0.4, y: 0.4, z: 0.4}
@@ -179,11 +184,45 @@ MonoBehaviour:
startFrame: 7
effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9 small.prefab
attached: 1
- attachNode: 0
- bone:
+ parentNode: 0
+ bonePath:
+ bone: 0
+ referencePoint: 0
position: {x: 0, y: 1, z: 0}
rotation: {x: -24.814, y: 33.032, z: -30.331}
scale: {x: 0.4, y: 0.4, z: 0.4}
+--- !u!114 &114721479198979772
+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: 9101593d2baa73a42bb4bd8ecec714c6, type: 3}
+ m_Name: EventMesh_MotionBlur
+ m_EditorClassIdentifier:
+ startFrame: 7
+ lifeTime: 0.3
+ angle: 0
+ amount: 0
+--- !u!114 &114932985571805638
+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: 9101593d2baa73a42bb4bd8ecec714c6, type: 3}
+ m_Name: EventMesh_MotionBlur
+ m_EditorClassIdentifier:
+ startFrame: 2
+ lifeTime: 0.3
+ angle: 0
+ amount: 0
--- !u!114 &114949443759766766
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -199,8 +238,10 @@ MonoBehaviour:
startFrame: 9
effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab
attached: 0
- attachNode: 0
- bone:
+ parentNode: 0
+ bonePath:
+ bone: 0
+ referencePoint: 0
position: {x: 0, y: 1, z: 0}
rotation: {x: -24.814, y: 33.032, z: -30.331}
scale: {x: 0.6, y: 0.6, z: 0.6}
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset
index 21c6882a..965fe6ab 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset
@@ -10,11 +10,18 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Air_Dash
+ m_Name: Air_Dash(Clone)(Clone)
m_EditorClassIdentifier:
animationName: Air_Dash
animationPath: Assets/Art/Animations/Erika/Air_Dash.anim
- animationEvents: []
+ note:
+ animationEvents:
+ - {fileID: 114365720091602376}
+ - {fileID: 114701209950120328}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 114895186165284124}
+ - {fileID: 114163276615738028}
hurtBoxes:
- collider:
type: 0
@@ -161,3 +168,111 @@ MonoBehaviour:
properties:
m_keys:
m_values: []
+--- !u!114 &114163276615738028
+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: a75401f0015aa1e4f856979c8aa1dae2, type: 3}
+ m_Name: EventMesh_ImageEffect_MotionBlur
+ m_EditorClassIdentifier:
+ startFrame: 14
+ lifeTime: 0.1
+ angle: 0
+ amount: 0
+--- !u!114 &114365720091602376
+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: a4957372b8a4fd946b86016c20f83750, type: 3}
+ m_Name: EventMesh_VisibilityInMainCamera
+ m_EditorClassIdentifier:
+ startFrame: 4
+ isVisible: 0
+--- !u!114 &114393851134311434
+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: 9101593d2baa73a42bb4bd8ecec714c6, type: 3}
+ m_Name: EventMesh_MotionBlur
+ m_EditorClassIdentifier:
+ startFrame: 13
+ lifeTime: 0.05
+ angle: 0
+ amount: 0
+--- !u!114 &114434948509151598
+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: 9101593d2baa73a42bb4bd8ecec714c6, type: 3}
+ m_Name: EventMesh_MotionBlur
+ m_EditorClassIdentifier:
+ startFrame: 16
+ lifeTime: 0.3
+ angle: 0
+ amount: 0
+--- !u!114 &114677701672343994
+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: 9101593d2baa73a42bb4bd8ecec714c6, type: 3}
+ m_Name: EventMesh_MotionBlur
+ m_EditorClassIdentifier:
+ startFrame: 4
+ lifeTime: 0.05
+ angle: 0
+ amount: 0
+--- !u!114 &114701209950120328
+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: a4957372b8a4fd946b86016c20f83750, type: 3}
+ m_Name: EventMesh_VisibilityInMainCamera
+ m_EditorClassIdentifier:
+ startFrame: 16
+ isVisible: 1
+--- !u!114 &114895186165284124
+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: a75401f0015aa1e4f856979c8aa1dae2, type: 3}
+ m_Name: EventMesh_ImageEffect_MotionBlur
+ m_EditorClassIdentifier:
+ startFrame: 4
+ lifeTime: 0.1
+ angle: 0
+ amount: 0
diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Effect/unit_effect_blur.mat b/Assets/Bundle/Unit/PC/Erika/Materials/Effect/unit_effect_blur.mat
index 0caa6c1a..56f408b5 100644
--- a/Assets/Bundle/Unit/PC/Erika/Materials/Effect/unit_effect_blur.mat
+++ b/Assets/Bundle/Unit/PC/Erika/Materials/Effect/unit_effect_blur.mat
@@ -60,6 +60,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
+ - _Angle: 14.9
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
diff --git a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
index be6badd6..8c41a6b2 100644
--- a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
+++ b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 2c46a5a23283c7d428ae8bb13663ab6a
+guid: 5dc1b71affc68b54594096a1b96a5c00
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Bundle/Unit/PC/Erika/Models.meta b/Assets/Bundle/Unit/PC/Erika/Models.meta
new file mode 100644
index 00000000..11148d17
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/Models.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0d712421d808a43438a43d8a5d34effe
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Assets/Bundle/Unit/PC/Erika/UnitData.meta
new file mode 100644
index 00000000..7d4b13eb
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/UnitData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 922befa8a94692845b88500a23229d7f
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
new file mode 100644
index 00000000..f5434a00
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 07c3b2bf6cb8cc2498422bbb105cbad8
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
new file mode 100644
index 00000000..4ed2c938
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 827d77abe87680a47ae2d71a9e953a18
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
new file mode 100644
index 00000000..43a52cd1
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7a2b72fbb41383047ac45e6c22ea9663
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
new file mode 100644
index 00000000..85d58a8c
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b2b0838fb0603964e99904eefe81ad7f
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
new file mode 100644
index 00000000..dd867045
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1c8a678ea9e801f439a1003d04f33cf5
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
new file mode 100644
index 00000000..dc530723
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ebf636c7cf7b1934b885298ce1f5f42e
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
new file mode 100644
index 00000000..b28b6f04
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2022e8298d3a8624992143eb57c0f8ac
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
new file mode 100644
index 00000000..eeca0d3b
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f6aa859c834c51f498ef0b3c3b83a0f5
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
new file mode 100644
index 00000000..7f91da28
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df69962f5b01e444a8bea87e31c7d0a4
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant: