浏览代码

Updating talk state so it's independent from other states

/main
Amel Negra 4 年前
当前提交
b23afbae
共有 10 个文件被更改,包括 12 次插入13 次删除
  1. 10
      UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
  2. 4
      UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Actions/IsTalking_False_OnExit.asset
  3. 1
      UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/States/Idle.asset
  4. 1
      UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/States/ListenToProtagonist.asset
  5. 3
      UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/States/Talk.asset
  6. 3
      UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/States/TalkToProtagonist.asset
  7. 1
      UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Townsfolk/States/MoveAround.asset
  8. 2
      UOP1_Project/Assets/Scripts/Quests/StepController.cs
  9. 0
      /UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Actions/IsTalking_False_OnExit.asset.meta
  10. 0
      /UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Actions/IsTalking_False_OnExit.asset

10
UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
文件差异内容过多而无法显示
查看文件

4
UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Actions/IsTalking_False_OnExit.asset


m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: IsTalking_False_OnEnter
m_Name: IsTalking_False_OnExit
m_EditorClassIdentifier:
parameterType: 0
parameterName: IsTalking

whenToRun: 0
whenToRun: 1

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


m_EditorClassIdentifier:
_actions:
- {fileID: 11400000, guid: 098a951ce0fcb154bb9cb4900665dd9b, type: 2}
- {fileID: 11400000, guid: 0169c310b4cc2fe4091c9913e5aacf7e, type: 2}

1
UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/States/ListenToProtagonist.asset


m_EditorClassIdentifier:
_actions:
- {fileID: 11400000, guid: 098a951ce0fcb154bb9cb4900665dd9b, type: 2}
- {fileID: 11400000, guid: 0169c310b4cc2fe4091c9913e5aacf7e, type: 2}
- {fileID: 11400000, guid: e78eaf21cfb04df4bbccd2f3eda7749c, type: 2}

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


m_Name: Talk
m_EditorClassIdentifier:
_actions:
- {fileID: 11400000, guid: 4ddcdf01c7784f84fa7b869c64b7d86e, type: 2}
- {fileID: 11400000, guid: 4ddcdf01c7784f84fa7b869c64b7d86e, type: 2}
- {fileID: 11400000, guid: 0169c310b4cc2fe4091c9913e5aacf7e, type: 2}

3
UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/States/TalkToProtagonist.asset


m_Name: TalkToProtagonist
m_EditorClassIdentifier:
_actions:
- {fileID: 11400000, guid: 098a951ce0fcb154bb9cb4900665dd9b, type: 2}
- {fileID: 11400000, guid: 098a951ce0fcb154bb9cb4900665dd9b, type: 2}
- {fileID: 11400000, guid: 0169c310b4cc2fe4091c9913e5aacf7e, type: 2}

1
UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Townsfolk/States/MoveAround.asset


_actions:
- {fileID: 11400000, guid: 3d7509f7f203c9d428d47c4938f6a9d9, type: 2}
- {fileID: 11400000, guid: 1270389d3e8c8da4c837d4073bf20190, type: 2}
- {fileID: 11400000, guid: 0169c310b4cc2fe4091c9913e5aacf7e, type: 2}
- {fileID: 11400000, guid: 03153937dd23e9c4098ad347cab2eaef, type: 2}

2
UOP1_Project/Assets/Scripts/Quests/StepController.cs


{
DialogueDataSO displayDialogue = _questData.InteractWithCharacter(_actor, false, false);
Debug.Log("dialogue " + displayDialogue + "actor" + _actor);
//Debug.Log("dialogue " + displayDialogue + "actor" + _actor);
if (displayDialogue != null)
{
_currentDialogue = displayDialogue;

/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Actions/IsTalking_False_OnEnter.asset.meta → /UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Actions/IsTalking_False_OnExit.asset.meta

/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Actions/IsTalking_False_OnEnter.asset → /UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Actions/IsTalking_False_OnExit.asset

正在加载...
取消
保存