浏览代码

Merge branch 'main' into AmelMain

/main
Amel Negra 4 年前
当前提交
fe1f23a8
共有 4 个文件被更改,包括 9 次插入10 次删除
  1. 6
      UOP1_Project/Assets/Scripts/Dialogues/DialogueDataSO.cs
  2. 10
      UOP1_Project/Assets/Scripts/Quests/Editor/QuestEditorWindow.cs
  3. 2
      UOP1_Project/Assets/Scripts/Quests/Resources/QuestEditorWindow.uss
  4. 1
      UOP1_Project/Assets/Scripts/Quests/Editor/.DS_Store

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


// Each line would also have an event associated, or another Dialogue
private void OnEnable()
{
//Only enabled when the dialogue table is changed
//Make sure the name of the SO is the same as the one used in the string table
//SetDialogueLines();
SetDialogueLines();
if (_dialogueLines == null)
_dialogueLines = new List<LocalizedString>();
_dialogueLines.Clear();
StringTableCollection collection = LocalizationEditorSettings.GetStringTableCollection("Questline Dialogue");

10
UOP1_Project/Assets/Scripts/Quests/Editor/QuestEditorWindow.cs


[MenuItem("ChopChop/QuestEditorWindow")]
public static void ShowWindow()
{
Debug.Log("Show Window");
QuestEditorWindow wnd = GetWindow<QuestEditorWindow>();
wnd.titleContent = new GUIContent("QuestEditorWindow");

QuestEditorWindow window = GetWindow<QuestEditorWindow>();
// Adds a title to the window.
Debug.Log("Show Window");
window.titleContent = new GUIContent("QuestEditorWindow");
// Sets a minimum size to the window.

}
public void CreateGUI()
{
VisualElement root = rootVisualElement;
Debug.Log("Create GUI");
VisualElement root = rootVisualElement;
// Import UXML
var visualTree = Resources.Load<VisualTreeAsset>("QuestEditorWindow");
root.Add(visualTree.CloneTree());

private void LoadAllQuestsData()
{
Debug.Log("LoadAllQuestsData");
//Load all questlines
FindAllSOByType(out QuestlineSO[] questLineSOs);
RefreshListView(out ListView allQuestlinesListView, "questlines-list", questLineSOs);

}
}
Debug.Log("AllDialogueList" + AllDialogueList.ToArray());
if (AllDialogueList != null)
AllDialogue = AllDialogueList.ToArray();

2
UOP1_Project/Assets/Scripts/Quests/Resources/QuestEditorWindow.uss


margin-right: auto;
}
.3rdColumn {
#3rd-column {
width: 40%;
background-color: rgb(185, 185, 185);
}

1
UOP1_Project/Assets/Scripts/Quests/Editor/.DS_Store
文件差异内容过多而无法显示
查看文件

正在加载...
取消
保存