浏览代码

Added IK and new animations for BardHare

Adeed IK to the legs
Created new Sing_Sitting and Sing_Sitting2 sing variations
Created a new Listening animation starting from a talk one
/main
Ciro Continisio 3 年前
当前提交
d2ffcb9e
共有 8 个文件被更改,包括 3940 次插入383 次删除
  1. 429
      UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare.controller
  2. 867
      UOP1_Project/Assets/Prefabs/Characters/BardHare.prefab
  3. 1001
      UOP1_Project/Assets/Art/Characters/BardHare/Animation/Listening.anim
  4. 8
      UOP1_Project/Assets/Art/Characters/BardHare/Animation/Listening.anim.meta
  5. 1001
      UOP1_Project/Assets/Art/Characters/BardHare/Animation/Sing2_Sitting.anim
  6. 8
      UOP1_Project/Assets/Art/Characters/BardHare/Animation/Sing2_Sitting.anim.meta
  7. 1001
      UOP1_Project/Assets/Art/Characters/BardHare/Animation/Sing_Sitting.anim
  8. 8
      UOP1_Project/Assets/Art/Characters/BardHare/Animation/Sing_Sitting.anim.meta

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


m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-7838168866082341946
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsTalking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.96411484
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-7235358729500868221
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsTalking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2751829022450645959}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.96411484
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-5943099573550533948
AnimatorState:
serializedVersion: 6

m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 813894584215551175}
- {fileID: -4448913483520553576}
- {fileID: -3988172272790497038}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0

m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -5527705674926710305, guid: 3be8ca814edb345d2ae039487674a27a,
type: 3}
m_Motion: {fileID: 7400000, guid: fbfe2fba4e6252744b64a9c41246e86c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:

m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8469388
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-4448913483520553576
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: IsTalking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3188633216048690614}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8295455
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0

m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!1101 &-4226737146007425583
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: JumpDown
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4077334438025311903}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.96411484
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3988172272790497038
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: -2751829022450645959}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8295455
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3446933760404224606
AnimatorStateTransition:
m_ObjectHideFlags: 1

m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-3188633216048690614
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Talk
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -7235358729500868221}
- {fileID: -912920210218304402}
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: -395696784264195149, guid: 5889d34bd21a543ba8c0618029d65312,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-3165800843967007995
AnimatorStateTransition:
m_ObjectHideFlags: 1

m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!1102 &-2982860026827336943
--- !u!1102 &-2751829022450645959
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1

m_Name: TalkNoSitar
m_Name: Listening
- {fileID: 5016800082881321634}
- {fileID: 4353565650259770779}
- {fileID: 1595555466976608466}
- {fileID: -4226737146007425583}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0

m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 1720936854327583921, guid: 2b50843411b30f942b12b4eb3f5d3d88,
type: 3}
m_Motion: {fileID: 7400000, guid: 6191e9340f408b24286d55b5193cf461, type: 2}
--- !u!1109 &-2571972952110134739
AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: RandomIdle
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7467964322136481553}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!114 &-2560727757387082229
MonoBehaviour:
m_ObjectHideFlags: 1

m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-1664865702140399576
--- !u!1101 &-912920210218304402
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}

m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsTalking
- m_ConditionMode: 1
m_ConditionEvent: JumpDown
m_DstState: {fileID: 0}
m_DstState: {fileID: 4077334438025311903}
m_IsExit: 1
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0

m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!114 &-1278029081251987127
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52106b5e7fe9fd54bb1add9a00a5f911, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1107 &-564110119734294022
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Talk
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -2982860026827336943}
m_Position: {x: 400, y: -20, z: 0}
- serializedVersion: 1
m_State: {fileID: 7467964322136481553}
m_Position: {x: 400, y: 220, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions:
- {fileID: 8944268493305491835}
- {fileID: -2571972952110134739}
m_StateMachineTransitions: {}
m_StateMachineBehaviours:
- {fileID: -1278029081251987127}
m_AnyStatePosition: {x: 100, y: -20, z: 0}
m_EntryPosition: {x: -180, y: 120, z: 0}
m_ExitPosition: {x: 1100, y: 140, z: 0}
m_ParentStateMachinePosition: {x: -190, y: -40, z: 0}
m_DefaultState: {fileID: -2982860026827336943}
--- !u!1109 &-384121867820306950
AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: JumpDown
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4077334438025311903}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0

m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 5416883312827950621, guid: 43f9dfdcb3849ff4eb515515c31d5a4f,
type: 3}
m_Motion: {fileID: 7400000, guid: 8495b4d563cef1345b470fcdf1759933, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:

m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7467964322136481553}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 0

m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2982860026827336943}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 0

m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.2
m_TransitionOffset: 0
m_ExitTime: 0.96231157
m_HasExitTime: 0

m_CanTransitionToSelf: 1
--- !u!1101 &813894584215551175
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
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.8295455
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1201560230152072265
AnimatorStateTransition:
m_ObjectHideFlags: 1

m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1348238984624469047
--- !u!1101 &1595555466976608466
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}

m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: IsTalking
m_EventTreshold: 0
m_DstState: {fileID: -2982860026827336943}
m_DstState: {fileID: -3188633216048690614}
m_Solo: 0
m_Mute: 0
m_IsExit: 0

m_ExitTime: 0.9906015
m_HasExitTime: 1
m_ExitTime: 0.96411484
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1

m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionDuration: 0.2
m_TransitionOffset: 0
m_ExitTime: 0.9906015
m_HasExitTime: 0

m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &4353565650259770779
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsTalking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9603175
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &5016800082881321634
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: 7467964322136481553}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.98747915
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1109 &5363044950688599843
AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: IsTalking
m_EventTreshold: 0
m_DstStateMachine: {fileID: -564110119734294022}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!1101 &5450956186395528051
AnimatorStateTransition:
m_ObjectHideFlags: 1

m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &7467964322136481553
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Talk2
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1348238984624469047}
- {fileID: -1664865702140399576}
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: -395696784264195149, guid: 5889d34bd21a543ba8c0618029d65312,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &8113754229338220148
AnimatorStateMachine:
serializedVersion: 6

m_Position: {x: 700, y: 40, z: 0}
- serializedVersion: 1
m_State: {fileID: 4077334438025311903}
m_Position: {x: 700, y: 230, z: 0}
m_Position: {x: 700, y: 320, z: 0}
- serializedVersion: 1
m_State: {fileID: -3188633216048690614}
m_Position: {x: 700, y: 150, z: 0}
- serializedVersion: 1
m_State: {fileID: -2751829022450645959}
m_Position: {x: 950, y: 150, z: 0}
m_Position: {x: 340, y: 130, z: 0}
- serializedVersion: 1
m_StateMachine: {fileID: -564110119734294022}
m_Position: {x: 340, y: -10, z: 0}
m_Position: {x: 380, y: 140, z: 0}
m_AnyStateTransitions: []
m_EntryTransitions:
- {fileID: -4394027057195029758}

- {fileID: 5363044950688599843}
- {fileID: -384121867820306950}
- first: {fileID: -564110119734294022}
second:
- {fileID: 2600591275093179267}
m_AnyStatePosition: {x: -120, y: -50, z: 0}
m_EntryPosition: {x: 40, y: 140, z: 0}
m_ExitPosition: {x: 1050, y: 80, z: 0}
m_AnyStatePosition: {x: 80, y: 50, z: 0}
m_EntryPosition: {x: 80, y: 150, z: 0}
m_ExitPosition: {x: 80, y: 230, z: 0}
--- !u!1109 &8944268493305491835
AnimatorTransition:
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: -2982860026827336943}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1

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

1001
UOP1_Project/Assets/Art/Characters/BardHare/Animation/Listening.anim
文件差异内容过多而无法显示
查看文件

8
UOP1_Project/Assets/Art/Characters/BardHare/Animation/Listening.anim.meta


fileFormatVersion: 2
guid: 6191e9340f408b24286d55b5193cf461
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

1001
UOP1_Project/Assets/Art/Characters/BardHare/Animation/Sing2_Sitting.anim
文件差异内容过多而无法显示
查看文件

8
UOP1_Project/Assets/Art/Characters/BardHare/Animation/Sing2_Sitting.anim.meta


fileFormatVersion: 2
guid: fbfe2fba4e6252744b64a9c41246e86c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

1001
UOP1_Project/Assets/Art/Characters/BardHare/Animation/Sing_Sitting.anim
文件差异内容过多而无法显示
查看文件

8
UOP1_Project/Assets/Art/Characters/BardHare/Animation/Sing_Sitting.anim.meta


fileFormatVersion: 2
guid: 8495b4d563cef1345b470fcdf1759933
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存