浏览代码

Revert "Fix Input is cached when not immediately consumed by a State for jump and attack"

This reverts commit 7e41a5097458eeb6ce0908ef69eebc92587e4217.
/devlogs-3-input
alex 4 年前
当前提交
e354a52a
共有 10 个文件被更改,包括 14 次插入97 次删除
  1. 54
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
  2. 4
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Attack.asset
  3. 2
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Attack.asset.meta
  4. 1
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Idle.asset
  5. 1
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescending.asset
  6. 1
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Walking.asset
  7. 17
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/PreventAction_Attack.asset
  8. 8
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/PreventAction_Attack.asset.meta
  9. 15
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/PreventAction_Descending.asset
  10. 8
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/PreventAction_Descending.asset.meta

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


- ExpectedResult: 0
Condition: {fileID: 11400000, guid: 0222b854529fb8f418abda000d3b9b32, type: 2}
Operator: 0
- FromState: {fileID: 11400000, guid: 856d49f6d9474464cb77059057f969a5, type: 2}
ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
- FromState: {fileID: 11400000, guid: bda8bfafdf35e3e4092bb96279d4894c, type: 2}
ToState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
- ExpectedResult: 1
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: 373ff606aeb23834eb964bdf9a6f6e3c, type: 2}
Operator: 0
- ExpectedResult: 0
ToState: {fileID: 11400000, guid: 856d49f6d9474464cb77059057f969a5, type: 2}
ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
Operator: 1
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: b33fba8c83df19f4ead430fbcc728687, type: 2}
Operator: 1
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: 9c4a0f8b97247c643aef1b1284f21ebc, type: 2}
Operator: 1
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
- ExpectedResult: 1
Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
Operator: 0
- FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
ToState: {fileID: 11400000, guid: 78675b2bf031c3f4a9c28dda969298e2, type: 2}

- ExpectedResult: 0
Condition: {fileID: 11400000, guid: b5cf328bcf17e41469fda079c80b3c84, type: 2}
Operator: 0
- FromState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
ToState: {fileID: 11400000, guid: 390bddf5271c3024b8a375a0a62d0990, type: 2}
Conditions:
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
Operator: 1
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: b33fba8c83df19f4ead430fbcc728687, type: 2}
Operator: 1
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: 9c4a0f8b97247c643aef1b1284f21ebc, type: 2}
Operator: 1
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
Operator: 1
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
Operator: 0
- FromState: {fileID: 11400000, guid: 390bddf5271c3024b8a375a0a62d0990, type: 2}
ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
Conditions:
- ExpectedResult: 1
Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
Operator: 0
- FromState: {fileID: 11400000, guid: 856d49f6d9474464cb77059057f969a5, type: 2}
ToState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
Conditions:
- ExpectedResult: 0
Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
Operator: 0

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


m_Script: {fileID: 11500000, guid: 35432205b9a6a374bbbfe6b7cac92179, type: 3}
m_Name: Attack
m_EditorClassIdentifier:
_actions: []
_actions:
- {fileID: 11400000, guid: 5cb6e4529b034ff4dbc7a7aa863ce969, type: 2}
- {fileID: 11400000, guid: 0b38abb4ef196264188f86997cf47770, type: 2}

2
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Attack.asset.meta


fileFormatVersion: 2
guid: 856d49f6d9474464cb77059057f969a5
guid: bda8bfafdf35e3e4092bb96279d4894c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0

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


- {fileID: 11400000, guid: bcf4edc006209d54da9cd4c18329bb43, type: 2}
- {fileID: 11400000, guid: bd85c54d16eb60c4c99504f1679af851, type: 2}
- {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
- {fileID: 11400000, guid: 49dad5a4b1fa43844ab26a848b9bcc18, type: 2}

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


- {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
- {fileID: 11400000, guid: 096d532f9a47f3145892efa1c4322e72, type: 2}
- {fileID: 11400000, guid: 99b804881a9d5744fb4784c30000c0b5, type: 2}
- {fileID: 11400000, guid: 49dad5a4b1fa43844ab26a848b9bcc18, type: 2}

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


- {fileID: 11400000, guid: fa0ce5b895dcf17499819f0d6f2dce96, type: 2}
- {fileID: 11400000, guid: 5aac41c53e47f1040a52303b2000ceb5, type: 2}
- {fileID: 11400000, guid: 74800142628360a42bb516b1e5c630e1, type: 2}
- {fileID: 11400000, guid: 49dad5a4b1fa43844ab26a848b9bcc18, type: 2}

17
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/PreventAction_Attack.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: 35432205b9a6a374bbbfe6b7cac92179, type: 3}
m_Name: PreventAction_Attack
m_EditorClassIdentifier:
_actions:
- {fileID: 11400000, guid: 5cb6e4529b034ff4dbc7a7aa863ce969, type: 2}
- {fileID: 11400000, guid: 0b38abb4ef196264188f86997cf47770, type: 2}

8
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/PreventAction_Attack.asset.meta


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

15
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/PreventAction_Descending.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: 35432205b9a6a374bbbfe6b7cac92179, type: 3}
m_Name: PreventAction_Descending
m_EditorClassIdentifier:
_actions: []

8
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/PreventAction_Descending.asset.meta


fileFormatVersion: 2
guid: 390bddf5271c3024b8a375a0a62d0990
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存