diff options
| author | chai <chaifix@163.com> | 2021-09-11 15:27:24 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2021-09-11 15:27:24 +0800 |
| commit | c57d5bbbdd20eef57fa31c5ef921b2739b5b164e (patch) | |
| tree | 313afeb0d0cd88ae45b02cac89031d12ad4d375c /Assets/Bundle | |
| parent | 9d4cdc732f8ba8358686ba0441b62e3443c47d9c (diff) | |
| parent | 5575843d450870db566b9c275584536299ef40bf (diff) | |
Merge branch 'master' of warmcat.org:/home/git-repo/Erika
Diffstat (limited to 'Assets/Bundle')
| -rw-r--r-- | Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab | 20 | ||||
| -rw-r--r-- | Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab index 4cf8a46c..73baeb6d 100644 --- a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab +++ b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab @@ -57,15 +57,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357685695} - m_LocalRotation: {x: -0.24720925, y: -0.40268856, z: 0.18871981, w: -0.86088} - m_LocalPosition: {x: 0.1611, y: -0.1365, z: 0.21} + m_LocalRotation: {x: -0.26233202, y: -0.2770635, z: 0.24158631, w: -0.8922185} + m_LocalPosition: {x: 0.06, y: -0.161, z: 0.279} m_LocalScale: {x: 0.01006957, y: 0.014763792, z: 0.9952188} m_Children: - {fileID: 2135912540} - {fileID: 332159091} m_Father: {fileID: 6930305872343221556} m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 144.716, y: 227.31201, z: 171.132} + m_LocalEulerAnglesHint: {x: 142.988, y: 207.414, z: 159.033} --- !u!33 &1357685700 MeshFilter: m_ObjectHideFlags: 0 @@ -592,6 +592,7 @@ GameObject: m_Component: - component: {fileID: 6930345995811640846} - component: {fileID: 7023111129766813114} + - component: {fileID: 1704775273} m_Layer: 0 m_Name: Erika_Robot m_TagString: Untagged @@ -635,6 +636,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1704775273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6928033330946439154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 19d4fad3ce933bf45a32ff4d0d7e328a, type: 3} + m_Name: + m_EditorClassIdentifier: + afterImageAvatarPath: Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab --- !u!1 &6928056367075676882 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab index 0c9b4f45..508a3826 100644 --- a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab +++ b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab @@ -433,7 +433,7 @@ Transform: m_GameObject: {fileID: 6928033330946439154} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.54, y: 3.34, z: -12.52} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_Children: - {fileID: 6930312115733728132} - {fileID: 6930221487356679114} |