summaryrefslogtreecommitdiff
path: root/Assets/Bundle/Unit
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-09-29 19:55:57 +0800
committerchai <chaifix@163.com>2021-09-29 19:55:57 +0800
commit61d6e9bf192ffa54abc57bab69b1bd88c3b8d62b (patch)
tree47071b43d583ced63b1b6cc4a9e4c2c6100ffe3f /Assets/Bundle/Unit
parent16e4a47beaf7786b63404d4a8356e45d70a393b5 (diff)
*misc
Diffstat (limited to 'Assets/Bundle/Unit')
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset28
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_Snapshot.prefab15
2 files changed, 36 insertions, 7 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 47959894..8d453722 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
@@ -143,6 +143,20 @@ MonoBehaviour:
angle: 0
distance: 0
hideUnitInMainCamera: 1
+--- !u!114 &114300116509491778
+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: d52092c3bed6f524ead14801bb72e1c3, type: 3}
+ m_Name: EventMesh_LensEffect_Dash
+ m_EditorClassIdentifier:
+ startFrame: 16
+ lifeTime: 2
--- !u!114 &114435450776992514
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -187,6 +201,20 @@ MonoBehaviour:
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}
+--- !u!114 &114532000986298392
+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: d52092c3bed6f524ead14801bb72e1c3, type: 3}
+ m_Name: EventMesh_LensEffect_Dash
+ m_EditorClassIdentifier:
+ startFrame: 5
+ lifeTime: 2
--- !u!114 &114581710045323768
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_Snapshot.prefab b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_Snapshot.prefab
index b3787c3a..6af0e486 100644
--- a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_Snapshot.prefab
+++ b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_Snapshot.prefab
@@ -416,9 +416,9 @@ GameObject:
m_Component:
- component: {fileID: 6930345995811640846}
- component: {fileID: 7023111129766813114}
- - component: {fileID: 5696818452860696233}
+ - component: {fileID: 585978181}
m_Layer: 0
- m_Name: Erika_Robot_AfterImage
+ m_Name: Erika_Robot_Snapshot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -453,13 +453,13 @@ Animator:
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
- m_ApplyRootMotion: 1
+ m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
---- !u!114 &5696818452860696233
+--- !u!114 &585978181
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -468,12 +468,13 @@ MonoBehaviour:
m_GameObject: {fileID: 6928033330946439154}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 89864711140932040a5827c91d9e5adc, type: 3}
+ m_Script: {fileID: 11500000, guid: d63b30ef896f0a548865db54d2bdbbeb, type: 3}
m_Name:
m_EditorClassIdentifier:
+ owner: {fileID: 0}
+ animator: {fileID: 7023111129766813114}
renderers:
- {fileID: 7046772783541976850}
- animator: {fileID: 7023111129766813114}
--- !u!1 &6928056367075676882
GameObject:
m_ObjectHideFlags: 0
@@ -830,7 +831,7 @@ SkinnedMeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 8d0d71f453a88c34e8943bd60b65f0fd, type: 2}
+ - {fileID: 2100000, guid: d743391c976d45f41be9ace4cf3bc3ac, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0