浏览代码

Merge remote-tracking branch 'treivize/bugfix/art/dying_animation_sequence' into pr-bash

/devlogs-3-input
Ciro Continisio 4 年前
当前提交
f2eeaad5
共有 2 个文件被更改,包括 7 次插入13 次删除
  1. 2
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Enemies/PlantCritter/Conditions/Timer_PlantFainting.asset
  2. 18
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Enemies/PlantCritter/PlantCritter_TransitionTable.asset

2
UOP1_Project/Assets/ScriptableObjects/StateMachine/Enemies/PlantCritter/Conditions/Timer_PlantFainting.asset


m_Name: Timer_PlantFainting
m_EditorClassIdentifier:
cacheResult: 1
timerLength: 2.3
timerLength: 2.5

18
UOP1_Project/Assets/ScriptableObjects/StateMachine/Enemies/PlantCritter/PlantCritter_TransitionTable.asset


Condition: {fileID: 11400000, guid: 5d0cf556c54f5154a9edc595f1958590, type: 2}
Operator: 0
- FromState: {fileID: 11400000, guid: 0fe9688a46e58a24d8a88cd363a8e472, type: 2}
ToState: {fileID: 11400000, guid: 05826b0374eccc245b9b1da390ab7d04, type: 2}
ToState: {fileID: 11400000, guid: 5b0e38103a74c054cb968153b3227b71, type: 2}
Condition: {fileID: 11400000, guid: 8d78c6cbad5610342b28e8f66a8a9d11, type: 2}
Condition: {fileID: 11400000, guid: 1ff6d66c9ad367543beb3f2455a1d06c, type: 2}
- FromState: {fileID: 11400000, guid: ea7a8e48b1a87c241bb721da98d1d812, type: 2}
ToState: {fileID: 11400000, guid: 628073f665cfda9468013b5ecbc7e6c3, type: 2}
- FromState: {fileID: 11400000, guid: 0fe9688a46e58a24d8a88cd363a8e472, type: 2}
ToState: {fileID: 11400000, guid: 05826b0374eccc245b9b1da390ab7d04, type: 2}
Condition: {fileID: 11400000, guid: fa8a674126a68004888ee6cef86cb5f5, type: 2}
Condition: {fileID: 11400000, guid: 8d78c6cbad5610342b28e8f66a8a9d11, type: 2}
Operator: 0
- FromState: {fileID: 11400000, guid: 628073f665cfda9468013b5ecbc7e6c3, type: 2}
ToState: {fileID: 11400000, guid: f4a07080dd036db4392317bdcd3c20b4, type: 2}

- ExpectedResult: 0
Condition: {fileID: 11400000, guid: fa8a674126a68004888ee6cef86cb5f5, type: 2}
Operator: 0
- FromState: {fileID: 11400000, guid: 0fe9688a46e58a24d8a88cd363a8e472, type: 2}
- FromState: {fileID: 11400000, guid: 5b0e38103a74c054cb968153b3227b71, type: 2}
- FromState: {fileID: 11400000, guid: 0fe9688a46e58a24d8a88cd363a8e472, type: 2}
ToState: {fileID: 11400000, guid: 5b0e38103a74c054cb968153b3227b71, type: 2}
Conditions:
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: 1ff6d66c9ad367543beb3f2455a1d06c, type: 2}
Operator: 0
正在加载...
取消
保存