From 5ce694a4283c689397b96a4b16c0b12d6afadcbc Mon Sep 17 00:00:00 2001 From: Ayumi Date: Thu, 29 Jun 2023 19:41:18 +0200 Subject: [PATCH] =?UTF-8?q?Animation=20Meowlin,=20Texte=20etwas=20=C3=BCbe?= =?UTF-8?q?rarbeitet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnimationsAndAnimators/Meowlin.meta | 8 + .../Meowlin/MeowlinAnimator.controller | 95 +++++++ .../Meowlin/MeowlinAnimator.controller.meta | 8 + .../Meowlin/MeowlinIdle.anim | 98 +++++++ .../Meowlin/MeowlinIdle.anim.meta | 8 + .../Meowlin/Gameplay/meowlin_idlet.png.meta | 254 +++++++++++++++++- Assets/AssetsFORELLE/Texts/Konflikt.txt | 2 +- Assets/AssetsFORELLE/Texts/Luna_Teil3.txt | 2 +- .../Scenes/ScenesInGame/17CreditScene.unity | 66 +---- Assets/Scenes/ScenesInGame/3MeowlinTalk.unity | 22 ++ 10 files changed, 491 insertions(+), 72 deletions(-) create mode 100644 Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin.meta create mode 100644 Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinAnimator.controller create mode 100644 Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinAnimator.controller.meta create mode 100644 Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinIdle.anim create mode 100644 Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinIdle.anim.meta diff --git a/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin.meta b/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin.meta new file mode 100644 index 0000000..c181317 --- /dev/null +++ b/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87c112928dab34c4c806c894ee285fe8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinAnimator.controller b/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinAnimator.controller new file mode 100644 index 0000000..afd7d5b --- /dev/null +++ b/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinAnimator.controller @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-1060935317408763171 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 418284721090227180} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MeowlinAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 8501241569828244255} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &418284721090227180 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MeowlinIdle + m_Speed: 0.5 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1060935317408763171} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: b5e836bf2a62a304289e1bb2b042fb50, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &8501241569828244255 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 418284721090227180} + m_Position: {x: 330, y: 210, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 418284721090227180} diff --git a/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinAnimator.controller.meta b/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinAnimator.controller.meta new file mode 100644 index 0000000..863dd4a --- /dev/null +++ b/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 270acda819b9cb04187bd29a244e6647 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinIdle.anim b/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinIdle.anim new file mode 100644 index 0000000..a4c1b6d --- /dev/null +++ b/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinIdle.anim @@ -0,0 +1,98 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MeowlinIdle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -571047253, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - time: 0.083333336 + value: {fileID: -1738635059, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - time: 0.16666667 + value: {fileID: -975194551, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - time: 0.25 + value: {fileID: -1718424309, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - time: 0.33333334 + value: {fileID: 933930049, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - time: 0.41666666 + value: {fileID: -1507756968, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - time: 0.5 + value: {fileID: 559950701, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - time: 0.5833333 + value: {fileID: -986126173, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - time: 0.6666667 + value: {fileID: 986796034, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - time: 0.75 + value: {fileID: -1161234426, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - time: 0.8333333 + value: {fileID: -2092545054, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -571047253, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - {fileID: -1738635059, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - {fileID: -975194551, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - {fileID: -1718424309, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - {fileID: 933930049, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - {fileID: -1507756968, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - {fileID: 559950701, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - {fileID: -986126173, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - {fileID: 986796034, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - {fileID: -1161234426, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + - {fileID: -2092545054, guid: a0eb8826b71ef184eb1f1436bea2f4dd, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.84999996 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinIdle.anim.meta b/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinIdle.anim.meta new file mode 100644 index 0000000..9ac8949 --- /dev/null +++ b/Assets/AssetsFORELLE/AnimationsAndAnimators/Meowlin/MeowlinIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5e836bf2a62a304289e1bb2b042fb50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Sprites/Character/Meowlin/Gameplay/meowlin_idlet.png.meta b/Assets/AssetsFORELLE/Sprites/Character/Meowlin/Gameplay/meowlin_idlet.png.meta index 3614c6b..cda905f 100644 --- a/Assets/AssetsFORELLE/Sprites/Character/Meowlin/Gameplay/meowlin_idlet.png.meta +++ b/Assets/AssetsFORELLE/Sprites/Character/Meowlin/Gameplay/meowlin_idlet.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -42,12 +42,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -103,7 +103,238 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: meowlin_idlet_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bd53abb1feab6a84999a4c57e33f2f94 + internalID: -571047253 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: meowlin_idlet_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c0b5cbe0ead9758468ca89ab15b7a1c2 + internalID: -1738635059 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: meowlin_idlet_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bc4fa57e2e53a984eb88620d2c23ea9d + internalID: -975194551 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: meowlin_idlet_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9ad173cd63ee3a14fb1d75813973fe91 + internalID: -1718424309 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: meowlin_idlet_4 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8fac1ae8a0dcb114ca6548bbf4e293a9 + internalID: 933930049 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: meowlin_idlet_5 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 663109babf7e27a4eb244689bf42ce93 + internalID: -1507756968 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: meowlin_idlet_6 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 32 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 11f209a7e2669e5488064da1ebdb20bb + internalID: 559950701 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: meowlin_idlet_7 + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 32 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 07832890997c28145ae7ca0d3dd6bf9c + internalID: -986126173 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: meowlin_idlet_8 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 32 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ea0861a91739f684abc5591efc87c4c1 + internalID: 986796034 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: meowlin_idlet_9 + rect: + serializedVersion: 2 + x: 288 + y: 0 + width: 32 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e1a82f02ad430b84882ab4392dfe643c + internalID: -1161234426 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: meowlin_idlet_10 + rect: + serializedVersion: 2 + x: 320 + y: 0 + width: 32 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c868b8d9fd2a2714c9095abfdd33ce94 + internalID: -2092545054 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -114,7 +345,18 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + meowlin_idlet_0: -571047253 + meowlin_idlet_1: -1738635059 + meowlin_idlet_10: -2092545054 + meowlin_idlet_2: -975194551 + meowlin_idlet_3: -1718424309 + meowlin_idlet_4: 933930049 + meowlin_idlet_5: -1507756968 + meowlin_idlet_6: 559950701 + meowlin_idlet_7: -986126173 + meowlin_idlet_8: 986796034 + meowlin_idlet_9: -1161234426 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/AssetsFORELLE/Texts/Konflikt.txt b/Assets/AssetsFORELLE/Texts/Konflikt.txt index d82944c..524daf1 100644 --- a/Assets/AssetsFORELLE/Texts/Konflikt.txt +++ b/Assets/AssetsFORELLE/Texts/Konflikt.txt @@ -1,6 +1,6 @@ Meowlin The Purrtastic: ***Krrch*** funktioniert das Ding wieder? Frank: Mäp! -Meowlin The Purrtastic: Ah, das ist gut. Jetzt kann ich dich auch wieder hören. +Meowlin The Purrtastic: Ah, das ist gut. Jetzt kann ich dich auch wieder hören und sehen. Frank: Mäp. Meowlin The Purrtastic: Ja, das ist gut. Ich sehe, du bist schon weitgekommen, junger Schüler. Frank: Mäp. diff --git a/Assets/AssetsFORELLE/Texts/Luna_Teil3.txt b/Assets/AssetsFORELLE/Texts/Luna_Teil3.txt index 87e23ba..bfaa7b5 100644 --- a/Assets/AssetsFORELLE/Texts/Luna_Teil3.txt +++ b/Assets/AssetsFORELLE/Texts/Luna_Teil3.txt @@ -8,7 +8,7 @@ Frank: Mäp. ???: hat! Natürlich wird unser Volk dich unterstützen und weiter passieren lassen. Frank: Mäp. ???: Okay. -Fank: Mäp? +Frank: Mäp? Luna: Ich bin Luna. Nett dich kennenzulernen, Frank. Frank: Mäp. Luna: … diff --git a/Assets/Scenes/ScenesInGame/17CreditScene.unity b/Assets/Scenes/ScenesInGame/17CreditScene.unity index 9edaf66..4990f98 100644 --- a/Assets/Scenes/ScenesInGame/17CreditScene.unity +++ b/Assets/Scenes/ScenesInGame/17CreditScene.unity @@ -132,7 +132,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} propertyPath: m_LocalPosition.x @@ -192,68 +192,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} ---- !u!1 &234930578 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 234930581} - - component: {fileID: 234930580} - - component: {fileID: 234930579} - m_Layer: 0 - m_Name: Timeline - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &234930579 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 234930578} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 07c502a8098f5ed42954b8bf2ef27fcb, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!320 &234930580 -PlayableDirector: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 234930578} - m_Enabled: 1 - serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: e970016ec73301340900115deec96ea0, type: 2} - m_InitialState: 1 - m_WrapMode: 2 - m_DirectorUpdateMode: 1 - m_InitialTime: 0 - m_SceneBindings: [] - m_ExposedReferences: - m_References: [] ---- !u!4 &234930581 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 234930578} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 62.436035, y: -2.8444552, z: 0.31509063} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &429393349 GameObject: m_ObjectHideFlags: 0 @@ -728,7 +666,7 @@ Transform: - {fileID: 1836679314} - {fileID: 926457806} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1091220109 MonoBehaviour: diff --git a/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity b/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity index 416f856..5f17935 100644 --- a/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity +++ b/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity @@ -2918,6 +2918,7 @@ GameObject: m_Component: - component: {fileID: 78485280} - component: {fileID: 78485279} + - component: {fileID: 78485281} m_Layer: 0 m_Name: Meowlin The Purrtastic m_TagString: Untagged @@ -2994,6 +2995,27 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &78485281 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 78485278} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 270acda819b9cb04187bd29a244e6647, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &85054023 GameObject: m_ObjectHideFlags: 0