diff --git a/ProjectNLD/Assets/Art/Character/Models/Enemy/E00039/E00039.FBX b/ProjectNLD/Assets/Art/Character/Models/Enemy/E00039/E00039.FBX index 262e5106706..5e1fb773c44 100644 --- a/ProjectNLD/Assets/Art/Character/Models/Enemy/E00039/E00039.FBX +++ b/ProjectNLD/Assets/Art/Character/Models/Enemy/E00039/E00039.FBX @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0df225e775cb455acd499d11c9bf5d589984f12b0b2874c39453ce7505a3118 -size 149936 +oid sha256:bcf09a3abe9ff9bb692428408461540db3e82a6fff2c157d57e4bc2745e993cb +size 250272 diff --git a/ProjectNLD/Assets/Art/Character/Models/Enemy/E00039/E00039.FBX.meta b/ProjectNLD/Assets/Art/Character/Models/Enemy/E00039/E00039.FBX.meta index f48f8b5d62e..57fd36b6d0f 100644 --- a/ProjectNLD/Assets/Art/Character/Models/Enemy/E00039/E00039.FBX.meta +++ b/ProjectNLD/Assets/Art/Character/Models/Enemy/E00039/E00039.FBX.meta @@ -109,7 +109,7 @@ ModelImporter: autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00039.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00039.prefab index 7420f7500d7..d5237c10a36 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00039.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00039.prefab @@ -97,7 +97,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8765025302421469380, guid: 353869feb505276478d28777e1aa0ced, + type: 3} + insertIndex: -1 + addedObject: {fileID: 761218771690685387} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 353869feb505276478d28777e1aa0ced, type: 3} --- !u!4 &135711231658844576 stripped @@ -106,3 +110,83 @@ Transform: type: 3} m_PrefabInstance: {fileID: 461792513208026699} m_PrefabAsset: {fileID: 0} +--- !u!4 &9208521804565937807 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8765025302421469380, guid: 353869feb505276478d28777e1aa0ced, + type: 3} + m_PrefabInstance: {fileID: 461792513208026699} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &944310123755922464 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9208521804565937807} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.9295651 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.099745475 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000012804468 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923144 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924124 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &761218771690685387 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 944310123755922464} + m_PrefabAsset: {fileID: 0} diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy_S/P_S_E00039.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy_S/P_S_E00039.prefab index 85ce84d5a19..96aa3c3c346 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy_S/P_S_E00039.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy_S/P_S_E00039.prefab @@ -32,6 +32,80 @@ Transform: - {fileID: 2163446668304153235} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &306320552379602855 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6930760722273822140} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.9295651 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.099745475 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000012804468 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923144 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924124 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &273309548654211148 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 306320552379602855} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1841024697084943736 PrefabInstance: m_ObjectHideFlags: 0 @@ -97,7 +171,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8765025302421469380, guid: 353869feb505276478d28777e1aa0ced, + type: 3} + insertIndex: -1 + addedObject: {fileID: 273309548654211148} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 353869feb505276478d28777e1aa0ced, type: 3} --- !u!4 &2163446668304153235 stripped @@ -106,3 +184,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1841024697084943736} m_PrefabAsset: {fileID: 0} +--- !u!4 &6930760722273822140 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8765025302421469380, guid: 353869feb505276478d28777e1aa0ced, + type: 3} + m_PrefabInstance: {fileID: 1841024697084943736} + m_PrefabAsset: {fileID: 0}