浏览代码

Merge remote-tracking branch 'origin/main' into mainAmel

/main
Amel 3 年前
当前提交
226ea216
共有 4 个文件被更改,包括 24 次插入2 次删除
  1. 6
      UOP1_Project/Assets/Scripts/Dialogues/DialogueDataSO.cs
  2. 6
      UOP1_Project/Assets/Scripts/Quests/ScriptableObjects/QuestSO.cs
  3. 8
      UOP1_Project/Assets/Scripts/Quests/ScriptableObjects/QuestlineSO.cs
  4. 6
      UOP1_Project/Assets/Scripts/Quests/ScriptableObjects/StepSO.cs

6
UOP1_Project/Assets/Scripts/Dialogues/DialogueDataSO.cs


}
}
/// <summary>
/// This function is only useful for the Questline Tool in Editor to remove a Questline
/// </summary>
/// <returns>The local path</returns>
#endif
}

6
UOP1_Project/Assets/Scripts/Quests/ScriptableObjects/QuestSO.cs


_idQuest = id;
}
#if UNITY_EDITOR
/// <summary>
/// This function is only useful for the Questline Tool in Editor to remove a Quest
/// </summary>
/// <returns>The local path</returns>
#endif
}

8
UOP1_Project/Assets/Scripts/Quests/ScriptableObjects/QuestlineSO.cs


{
_idQuestLine = id;
}
#if UNITY_EDITOR
/// <summary>
/// This function is only useful for the Questline Tool in Editor to remove a Questline
/// </summary>
/// <returns>The local path</returns>
return AssetDatabase.GetAssetPath(this);
return AssetDatabase.GetAssetPath(this);
#endif
}

6
UOP1_Project/Assets/Scripts/Quests/ScriptableObjects/StepSO.cs


return dialogueData;
}
#if UNITY_EDITOR
/// <summary>
/// This function is only useful for the Questline Tool in Editor to remove a Step
/// </summary>
/// <returns>The local path</returns>
#endif
正在加载...
取消
保存