Дед стал дедом

2025-12-05 14:32:48 +03:00
1 parent 185b955125
commit d737797f11
@@ -9,7 +9,7 @@ BlendTree:
  m_Name: Blend Tree
  m_Childs:
  - serializedVersion: 2
-    m_Motion: {fileID: 1032454674216479247, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3}
+    m_Motion: {fileID: 1032454674216479247, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
    m_Threshold: 0
    m_Position: {x: 0, y: 0}
    m_TimeScale: 1
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Game/CourierOld/Assets/Resources/Models/Levels/Level1_1.fbx.meta
 guid: 502e1b73e61bd4e44aa368c5f98f4217
-========
-guid: 832c2ca81687522d1be9fd0ff1582b82
->>>>>>>> a5ce6e31653c95b7788f4a9d3967d0c270de8b30:Game/CourierOld/Assets/Resources/Models/Enemies/Grandpa/New/ded_idle_last.fbx.meta
 ModelImporter:
  serializedVersion: 24200
  internalIDToNameTable: []
@@ -45,8 +41,8 @@ ModelImporter:
    importPhysicalCameras: 1
    importVisibility: 1
    importBlendShapes: 1
-    importCameras: 1
-    importLights: 1
+    importCameras: 0
+    importLights: 0
    nodeNameCollisionStrategy: 1
    fileIdsGeneration: 2
    swapUVChannels: 0
@@ -96,7 +96,7 @@ ModelImporter:
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3}
+  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
  autoGenerateAvatarMappingIfUnspecified: 1
  animationType: 2
  humanoidOversampling: 1
@@ -125,7 +125,7 @@ ModelImporter:
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3}
+  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
  autoGenerateAvatarMappingIfUnspecified: 1
  animationType: 2
  humanoidOversampling: 1