Skip to content

Enemy warp sword, HUD, Textbox, and Dialogue Choice implementation #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JadeEmperor400 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Enemy warp sword, HUD, Textbox, and Dialogue Choice implementation #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b685ab8
Added WarpSword AI
JadeEmperor400 Oct 28, 2020
6c41fbf
HP SLider, WarpSword AI
JadeEmperor400 Oct 30, 2020
4bdc236
Dialogue Options Added
JadeEmperor400 Nov 6, 2020
45451c6
Merge branch 'master' into Enemy_WarpSword
JadeEmperor400 Nov 6, 2020
30c0528
Made Packages
JadeEmperor400 Nov 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
47 changes: 43 additions & 4 deletions GameDev-2020/Assets/Art/Matty Ice2.png.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions GameDev-2020/Assets/Editor/Editor_Dialogue_Set.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,21 @@ public override void OnInspectorGUI()
ds.Dialogues.Add(new Dialogue());
}

EditorGUILayout.Separator();
if (GUILayout.Button("Add Option"))
{
ds.LinkedSet.Add (new LinkSet());
}

foreach (LinkSet l in ds.LinkedSet) {
l.option = EditorGUILayout.TextField("Text", l.option);
l.linkedSet = (Dialogue_Set)EditorGUILayout.ObjectField("Linked Set", l.linkedSet, typeof(Dialogue_Set), false);
}

if (GUILayout.Button("Remove Option"))
{
ds.LinkedSet.RemoveAt(ds.LinkedSet.Count - 1);
}

}
}
8 changes: 8 additions & 0 deletions GameDev-2020/Assets/Prefabs/Enemies.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading