浏览代码

Talk animation re-implemented

/main
Ciro Continisio 4 年前
当前提交
12f2649c
共有 26 个文件被更改,包括 153 次插入119 次删除
  1. 14
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/Pig.controller
  2. 2
      UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
  3. 14
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
  4. 2
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Idle.asset
  5. 4
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescending.asset
  6. 3
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Talk.asset
  7. 1
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Walking.asset
  8. 20
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAirborne_False_OnExit.asset
  9. 20
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAirborne_True_OnEnter.asset
  10. 20
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsTalking_False_OnExit.asset
  11. 8
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsTalking_False_OnExit.asset.meta
  12. 20
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsTalking_True_OnEnter.asset
  13. 20
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsWalking_False_OnEnter.asset
  14. 20
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsWalking_True_OnEnter.asset
  15. 16
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsAirborne_False.asset
  16. 16
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsAirborne_True.asset
  17. 16
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsTalking_True.asset
  18. 8
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsTalking_True.asset.meta
  19. 16
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetWalking_False.asset
  20. 16
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetWalking_True.asset
  21. 16
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsTalking_False.asset
  22. 0
      /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAirborne_False_OnExit.asset.meta
  23. 0
      /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAirborne_True_OnEnter.asset.meta
  24. 0
      /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsTalking_True_OnEnter.asset.meta
  25. 0
      /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsWalking_False_OnEnter.asset.meta
  26. 0
      /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsWalking_True_OnEnter.asset.meta

14
UOP1_Project/Assets/Art/Characters/PigChef/Animation/Pig.controller


m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.7580645
m_HasExitTime: 1

m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.96575344
m_HasExitTime: 0

m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.9050633
m_HasExitTime: 1

m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0

m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.8943662
m_HasExitTime: 1

m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.8943662
m_HasExitTime: 1

m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.98747915
m_HasExitTime: 0

2
UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab


m_EditorClassIdentifier:
_transitionTableSO: {fileID: 11400000, guid: f0baa4ca2bfa24e4cb6d1efe9fa81ea3, type: 2}
_debugger:
debugTransitions: 1
debugTransitions: 0
appendConditionsInfo: 1
appendActionsInfo: 1
currentState:

14
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset


m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 872cbaa965d1f6e4e98365d74e2060df, type: 3}
m_Name: CharacterTransitionTable
m_Name: PigChef_TransitionTable
m_EditorClassIdentifier:
_transitions:
- FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}

- ExpectedResult: 1
Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
Operator: 0
- FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
ToState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
Conditions:
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: b33fba8c83df19f4ead430fbcc728687, type: 2}
Operator: 0
- FromState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
Conditions:
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: 2bfa25e0277246b4ba0ea0117c40c18b, type: 2}
Operator: 0

2
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Idle.asset


m_Name: Idle
m_EditorClassIdentifier:
_actions:
- {fileID: 11400000, guid: c0d0573a78e4c6245ab9676e7af35880, type: 2}
- {fileID: 11400000, guid: c0d0573a78e4c6245ab9676e7af35880, type: 2}

4
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescending.asset


- {fileID: 11400000, guid: 5d442cfcb78da8b418d6ae3e93e5748e, type: 2}
- {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
- {fileID: 11400000, guid: 096d532f9a47f3145892efa1c4322e72, type: 2}
_transitions:
- {fileID: 11400000, guid: 426d4a126aac5f94abff16fd4fd22450, type: 2}
- {fileID: 11400000, guid: bdbd98a2bcdc25c47bdae39b7ab3bac6, type: 2}
- {fileID: 11400000, guid: 99b804881a9d5744fb4784c30000c0b5, type: 2}

3
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Talk.asset


m_Name: Talk
m_EditorClassIdentifier:
_actions:
- {fileID: 11400000, guid: 988d4d429b1d3484e8b15f3735c804ec, type: 2}
- {fileID: 11400000, guid: 7ad91f04f328d9d42a677833fa39748d, type: 2}
- {fileID: 11400000, guid: 1cbeab9d369d57546a33afac8ca7810f, type: 2}

1
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Walking.asset


m_Name: Walking
m_EditorClassIdentifier:
_actions:
- {fileID: 11400000, guid: 99b804881a9d5744fb4784c30000c0b5, type: 2}
- {fileID: 11400000, guid: 201885673bd707f4c9b5f3a92eca204f, type: 2}
- {fileID: 11400000, guid: 6a9da1e686e8c3142bcbcc7ccb5bd5ac, type: 2}
- {fileID: 11400000, guid: bd85c54d16eb60c4c99504f1679af851, type: 2}

20
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAirborne_False_OnExit.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: IsAirborne_False_OnExit
m_EditorClassIdentifier:
_parameterType: 0
_parameterName: IsAirborne
_boolValue: 0
_intValue: 0
_floatValue: 0
_whenToRun: 1

20
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAirborne_True_OnEnter.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: IsAirborne_True_OnEnter
m_EditorClassIdentifier:
_parameterType: 0
_parameterName: IsAirborne
_boolValue: 1
_intValue: 0
_floatValue: 0
_whenToRun: 0

20
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsTalking_False_OnExit.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: IsTalking_False_OnExit
m_EditorClassIdentifier:
_parameterType: 0
_parameterName: IsTalking
_boolValue: 0
_intValue: 0
_floatValue: 0
_whenToRun: 1

8
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsTalking_False_OnExit.asset.meta


fileFormatVersion: 2
guid: 1cbeab9d369d57546a33afac8ca7810f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

20
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsTalking_True_OnEnter.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: IsTalking_True_OnEnter
m_EditorClassIdentifier:
_parameterType: 0
_parameterName: IsTalking
_boolValue: 1
_intValue: 0
_floatValue: 0
_whenToRun: 0

20
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsWalking_False_OnEnter.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: IsWalking_False_OnEnter
m_EditorClassIdentifier:
_parameterType: 0
_parameterName: IsWalking
_boolValue: 0
_intValue: 0
_floatValue: 0
_whenToRun: 0

20
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsWalking_True_OnEnter.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: IsWalking_True_OnEnter
m_EditorClassIdentifier:
_parameterType: 0
_parameterName: IsWalking
_boolValue: 1
_intValue: 0
_floatValue: 0
_whenToRun: 0

16
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsAirborne_False.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: SetIsAirborne_False
m_EditorClassIdentifier:
_parameterName: IsAirborne
_newValue: 0

16
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsAirborne_True.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: SetIsAirborne_True
m_EditorClassIdentifier:
_parameterName: IsAirborne
_newValue: 1

16
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsTalking_True.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: SetIsTalking_True
m_EditorClassIdentifier:
_parameterName: IsTalking
_newValue: 1

8
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsTalking_True.asset.meta


fileFormatVersion: 2
guid: 988d4d429b1d3484e8b15f3735c804ec
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

16
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetWalking_False.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: SetWalkingToFalse
m_EditorClassIdentifier:
_parameterName: IsWalking
_newValue: 0

16
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetWalking_True.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: SetWalkingToTrue
m_EditorClassIdentifier:
_parameterName: IsWalking
_newValue: 1

16
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsTalking_False.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: SetIsTalking_False
m_EditorClassIdentifier:
_parameterName: IsTalking
_newValue: 0

/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsAirborne_False.asset.meta → /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAirborne_False_OnExit.asset.meta

/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsAirborne_True.asset.meta → /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAirborne_True_OnEnter.asset.meta

/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetIsTalking_False.asset.meta → /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsTalking_True_OnEnter.asset.meta

/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetWalking_False.asset.meta → /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsWalking_False_OnEnter.asset.meta

/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/SetWalking_True.asset.meta → /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsWalking_True_OnEnter.asset.meta

正在加载...
取消
保存