Tetramino/CourierOld
5
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ThomasCharester committed 2025-12-05 14:32:48 +03:00
1 parent 185b955125
commit d737797f11
6 files changed
+46 -50
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+1 -1
View File
@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: d447fc60305c17a17bf20948ab295a45 m_DefaultGroup: d447fc60305c17a17bf20948ab295a45
m_currentHash: m_currentHash:
serializedVersion: 2 serializedVersion: 2
Hash: 10f94377f4655343018246ff122ca4e9 Hash: 00000000000000000000000000000000
m_OptimizeCatalogSize: 0 m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0 m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0 m_CatalogRequestsTimeout: 0
Game/CourierOld/Assets/Resources/Models/Enemies/Grandpa/Grandpa.controller
+1 -1
View File
@@ -9,7 +9,7 @@ BlendTree:
m_Name: Blend Tree m_Name: Blend Tree
m_Childs: m_Childs:
- serializedVersion: 2 - serializedVersion: 2
m_Motion: {fileID: 1032454674216479247, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} m_Motion: {fileID: 1032454674216479247, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
m_Threshold: 0 m_Threshold: 0
m_Position: {x: 0, y: 0} m_Position: {x: 0, y: 0}
m_TimeScale: 1 m_TimeScale: 1
Game/CourierOld/Assets/Resources/Models/Enemies/Grandpa/New/ded_idle_last.fbx.meta
+2 -6
View File
@@ -1,9 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Game/CourierOld/Assets/Resources/Models/Levels/Level1_1.fbx.meta
guid: 502e1b73e61bd4e44aa368c5f98f4217 guid: 502e1b73e61bd4e44aa368c5f98f4217
========
guid: 832c2ca81687522d1be9fd0ff1582b82
>>>>>>>> a5ce6e31653c95b7788f4a9d3967d0c270de8b30:Game/CourierOld/Assets/Resources/Models/Enemies/Grandpa/New/ded_idle_last.fbx.meta
ModelImporter: ModelImporter:
serializedVersion: 24200 serializedVersion: 24200
internalIDToNameTable: [] internalIDToNameTable: []
@@ -45,8 +41,8 @@ ModelImporter:
importPhysicalCameras: 1 importPhysicalCameras: 1
importVisibility: 1 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 1 importCameras: 0
importLights: 1 importLights: 0
nodeNameCollisionStrategy: 1 nodeNameCollisionStrategy: 1
fileIdsGeneration: 2 fileIdsGeneration: 2
swapUVChannels: 0 swapUVChannels: 0
Game/CourierOld/Assets/Resources/Models/Enemies/Grandpa/New/ded_run_last.fbx.meta
+1 -1
View File
@@ -96,7 +96,7 @@ ModelImporter:
hasTranslationDoF: 0 hasTranslationDoF: 0
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 1 skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
autoGenerateAvatarMappingIfUnspecified: 1 autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1
Game/CourierOld/Assets/Resources/Models/Enemies/Grandpa/New/ded_walk_last.fbx.meta
+1 -1
View File
@@ -125,7 +125,7 @@ ModelImporter:
hasTranslationDoF: 0 hasTranslationDoF: 0
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 1 skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
autoGenerateAvatarMappingIfUnspecified: 1 autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1
Game/CourierOld/Assets/Resources_moved/Prefabs/Enemies/DrunkenGrandpa.prefab
+40 -40
View File
@@ -33,7 +33,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 196944887919870760} - {fileID: 4049583769734797397}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1117397580837637202 --- !u!114 &1117397580837637202
@@ -107,9 +107,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 936125a7ed844674b0e0586a484253ce, type: 3} m_Script: {fileID: 11500000, guid: 936125a7ed844674b0e0586a484253ce, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Enemies.Animators.EnemyAnimator m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Enemies.Animators.EnemyAnimator
animator: {fileID: 6078624202107574610} animator: {fileID: 7985777344298549807}
agent: {fileID: 3382463358723420880} agent: {fileID: 3382463358723420880}
--- !u!1001 &374090313506383043 --- !u!1001 &4591907482997604286
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
@@ -117,71 +117,71 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 8788670158067192797} m_TransformParent: {fileID: 8788670158067192797}
m_Modifications: m_Modifications:
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalScale.x propertyPath: m_LocalScale.x
value: 0.68 value: 0.68
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalScale.y propertyPath: m_LocalScale.y
value: 0.68 value: 0.68
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalScale.z propertyPath: m_LocalScale.z
value: 0.68 value: 0.68
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_ConstrainProportionsScale propertyPath: m_ConstrainProportionsScale
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: 919132149155446097, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: ded_idle_last value: ded_idle_last (1)
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5866666021909216657, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: 5866666021909216657, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: m_Controller propertyPath: m_Controller
value: value:
objectReference: {fileID: 9100000, guid: e94cc659a49a87742bee1581a36eb537, type: 2} objectReference: {fileID: 9100000, guid: e94cc659a49a87742bee1581a36eb537, type: 2}
- target: {fileID: 5927789567853857412, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - target: {fileID: 5927789567853857412, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
propertyPath: 'm_Materials.Array.data[0]' propertyPath: 'm_Materials.Array.data[0]'
value: value:
objectReference: {fileID: 2100000, guid: 3d74b98a8711ab75e813aea13cb6211e, type: 2} objectReference: {fileID: 2100000, guid: 3d74b98a8711ab75e813aea13cb6211e, type: 2}
@@ -189,27 +189,22 @@ PrefabInstance:
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
insertIndex: -1 insertIndex: -1
addedObject: {fileID: 7194333464877641314} addedObject: {fileID: 804832368614146992}
m_SourcePrefab: {fileID: 100100000, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
--- !u!4 &196944887919870760 stripped --- !u!1 &3708945565208969967 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3}
m_PrefabInstance: {fileID: 374090313506383043}
m_PrefabAsset: {fileID: 0}
--- !u!1 &716178965973916050 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
m_PrefabInstance: {fileID: 374090313506383043} m_PrefabInstance: {fileID: 4591907482997604286}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!114 &7194333464877641314 --- !u!114 &804832368614146992
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 716178965973916050} m_GameObject: {fileID: 3708945565208969967}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 91cb250df1b24fc4825ee791a12dda11, type: 3} m_Script: {fileID: 11500000, guid: 91cb250df1b24fc4825ee791a12dda11, type: 3}
@@ -217,8 +212,13 @@ MonoBehaviour:
m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Enemies.EnemyAudio m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Enemies.EnemyAudio
_audioSource: {fileID: 0} _audioSource: {fileID: 0}
stepId: 1 stepId: 1
--- !u!95 &6078624202107574610 stripped --- !u!4 &4049583769734797397 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
m_PrefabInstance: {fileID: 4591907482997604286}
m_PrefabAsset: {fileID: 0}
--- !u!95 &7985777344298549807 stripped
Animator: Animator:
m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3} m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 502e1b73e61bd4e44aa368c5f98f4217, type: 3}
m_PrefabInstance: {fileID: 374090313506383043} m_PrefabInstance: {fileID: 4591907482997604286}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}