Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 31 additions & 60 deletions Assets/_Project/Animations/Pet/Pet_Devil.controller
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Interact_BesideDoor
m_Name: Interact_LookAround
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
Expand All @@ -85,7 +85,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Interact_Read
m_Name: Interact_DevilSleep
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
Expand All @@ -98,7 +98,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: e0f487d465d84c6c82e7e56e39cd0309, type: 2}
m_Motion: {fileID: 7400000, guid: a976212022ce4b658fa0814dfcfb1aed, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -130,40 +130,14 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-5650042031450080012
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Interact_Flower
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
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: 4f5a2cb8f6de4f8bbf3b0d0011aa1001, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-4650042031450080012
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Interact_PlayingMusic
m_Name: Interact_PlayGame
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
Expand All @@ -189,7 +163,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Interact_Write
m_Name: Interact_Draw
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
Expand Down Expand Up @@ -398,9 +372,6 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -6650042031450080012}
m_Position: {x: 450, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: -5650042031450080012}
m_Position: {x: 630, y: 30, z: 0}
- serializedVersion: 1
m_State: {fileID: -4650042031450080012}
m_Position: {x: 630, y: 110, z: 0}
Expand Down Expand Up @@ -446,32 +417,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &5662408786982249231
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle_Front
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
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: dabe4249caa546a88cbd5d97d1b95144, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8581778968068380458
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -500,3 +445,29 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0
--- !u!1102 &5662408786982249231
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle_Front
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
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: dabe4249caa546a88cbd5d97d1b95144, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Pet_Devil_Interact_BesideDoor
m_Name: Pet_Devil_Interact_左右看
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Pet_Devil_Interact_PlayingMusic
m_Name: Pet_Devil_Interact_玩掌机
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Pet_Devil_Interact_Write
m_Name: Pet_Devil_Interact_画画
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
Expand Down
99 changes: 99 additions & 0 deletions Assets/_Project/Animations/Pet/Pet_Devil_Interact_睡觉.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
%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: Pet_Devil_Interact_睡觉
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 21300000, guid: 2cc7a08223cd37d48a59d08cbb27d84d, type: 3}
- time: 0.08333333
value: {fileID: 21300000, guid: fee560669016980429b6220f4cb96036, type: 3}
- time: 0.16666667
value: {fileID: 21300000, guid: db0ae75b126aa9248a66d7f011480107, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: 46b5161c95402b546b31a22396e632f7, type: 3}
- time: 0.33333333
value: {fileID: 21300000, guid: ed265137c45dceb4bae4f08ac0c3455e, type: 3}
- time: 0.41666667
value: {fileID: 21300000, guid: a383699d71bcb4a4e9cf623692926176, type: 3}
- time: 0.5
value: {fileID: 21300000, guid: 737fe7edd84ae164da6bdc6031493503, type: 3}
- time: 0.58333333
value: {fileID: 21300000, guid: 7aaabe06485e83d40a2bd31ef9448722, type: 3}
- time: 0.66666667
value: {fileID: 21300000, guid: 48fd6435f1c90384fa7e79514cf80888, type: 3}
- time: 0.75
value: {fileID: 21300000, guid: 3bb71457e9820a2458b70f995dab641e, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
flags: 2
m_SampleRate: 12
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
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: 2cc7a08223cd37d48a59d08cbb27d84d, type: 3}
- {fileID: 21300000, guid: fee560669016980429b6220f4cb96036, type: 3}
- {fileID: 21300000, guid: db0ae75b126aa9248a66d7f011480107, type: 3}
- {fileID: 21300000, guid: 46b5161c95402b546b31a22396e632f7, type: 3}
- {fileID: 21300000, guid: ed265137c45dceb4bae4f08ac0c3455e, type: 3}
- {fileID: 21300000, guid: a383699d71bcb4a4e9cf623692926176, type: 3}
- {fileID: 21300000, guid: 737fe7edd84ae164da6bdc6031493503, type: 3}
- {fileID: 21300000, guid: 7aaabe06485e83d40a2bd31ef9448722, type: 3}
- {fileID: 21300000, guid: 48fd6435f1c90384fa7e79514cf80888, type: 3}
- {fileID: 21300000, guid: 3bb71457e9820a2458b70f995dab641e, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.83333333
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: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading