浏览代码

Pushing animations, ACs and prefabs tweaked for cutscenes

/main
Amel Negra 3 年前
当前提交
cdba81f2
共有 7 个文件被更改,包括 942 次插入90 次删除
  1. 130
      UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare.controller
  2. 7
      UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_idle.fbx.meta
  3. 97
      UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_jump_down.fbx.meta
  4. 7
      UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_jump_up.fbx.meta
  5. 31
      UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/PhoenixChick.controller
  6. 38
      UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/PhoenixChick_Flap.fbx.meta
  7. 722
      UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab

130
UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare.controller


m_ExitPosition: {x: 870, y: 160, z: 0}
m_ParentStateMachinePosition: {x: 230, y: -170, z: 0}
m_DefaultState: {fileID: -5498160952533448129}
--- !u!1101 &-8554734348597689868
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: ExitTimeline
m_EventTreshold: 0
m_DstStateMachine: {fileID: -8922074601772979250}
m_DstState: {fileID: 0}
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!1101 &-8330992559062188889
AnimatorStateTransition:
m_ObjectHideFlags: 1

m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: EnterTimeline
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: ExitTimeline
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer

m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &4416550691375841523
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: EnterTimeline
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5509002280715272292}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &5450956186395528051
AnimatorStateTransition:
m_ObjectHideFlags: 1

m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &5509002280715272292
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: InTimeline
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -8554734348597689868}
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: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &6375416532858191911
AnimatorStateTransition:
m_ObjectHideFlags: 1

- serializedVersion: 1
m_State: {fileID: -2751829022450645959}
m_Position: {x: 950, y: 150, z: 0}
- serializedVersion: 1
m_State: {fileID: 5509002280715272292}
m_Position: {x: 380, y: 40, z: 0}
m_AnyStateTransitions: []
m_AnyStateTransitions:
- {fileID: 4416550691375841523}
m_EntryTransitions:
- {fileID: -4394027057195029758}
m_StateMachineTransitions:

m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 80, y: 50, z: 0}
m_AnyStatePosition: {x: 90, y: -30, z: 0}
--- !u!1101 &8595320703037287098
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: EnterTimeline
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5509002280715272292}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

7
UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_idle.fbx.meta


fileFormatVersion: 2
guid: 397ae3410a140c04091159b107d04d37
ModelImporter:
serializedVersion: 19301
serializedVersion: 20200
internalIDToNameTable:
- first:
74: -5252816984213320552

useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4

secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 8
useFileScale: 1
tangentSpace:

animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
additionalBone: 0
userData:
assetBundleName:

97
UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_jump_down.fbx.meta


fileFormatVersion: 2
guid: c1675a6d144e7d24ab4b51277613b7f3
ModelImporter:
serializedVersion: 19301
serializedVersion: 20200
internalIDToNameTable:
- first:
74: 5912030967490423836

animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: jump_down
takeName: jump_down
internalID: 0
firstFrame: 1
lastFrame: 37
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves:
- name: InTimeline
curve:
serializedVersion: 2
curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
preInfinity: 3
postInfinity: 3
rotationOrder: 4
- name: Floatino
curve:
serializedVersion: 2
curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.3411043
value: 0.5
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
preInfinity: 3
postInfinity: 3
rotationOrder: 4
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 0
meshes:
lODScreenPercentages: []

useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4

secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 8
useFileScale: 1
tangentSpace:

animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
additionalBone: 0
userData:
assetBundleName:

7
UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_jump_up.fbx.meta


fileFormatVersion: 2
guid: 54e2cf679e102204fb85f3c032c77a3c
ModelImporter:
serializedVersion: 19301
serializedVersion: 20200
internalIDToNameTable:
- first:
74: 8665571534863303832

useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4

secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 8
useFileScale: 1
tangentSpace:

animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
additionalBone: 0
userData:
assetBundleName:

31
UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/PhoenixChick.controller


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-5512372920900534967
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Bite
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: 80b4a708d66b4de46ad663557f63cf46, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-341500065490236183
AnimatorState:
serializedVersion: 6

m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer

- serializedVersion: 1
m_State: {fileID: 1585201346637545665}
m_Position: {x: 500, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: -5512372920900534967}
m_Position: {x: 564.55725, y: 64.95497, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

38
UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/PhoenixChick_Flap.fbx.meta


fileFormatVersion: 2
guid: 6ed0ab89bae96324c9194cbe6d02b713
ModelImporter:
serializedVersion: 19301
serializedVersion: 20200
internalIDToNameTable:
- first:
74: 7941950950240408837

animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: Flap
takeName: Flap
internalID: 0
firstFrame: 1
lastFrame: 24
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 0
meshes:
lODScreenPercentages: []

useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4

secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 8
useFileScale: 1
tangentSpace:

animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
additionalBone: 0
userData:
assetBundleName:

722
UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
文件差异内容过多而无法显示
查看文件

正在加载...
取消
保存