diff --git a/Assets/UI Toolkit.meta b/Assets/UI Toolkit.meta new file mode 100644 index 0000000000000000000000000000000000000000..2d405fae85eac5c342b71c2923db65568370c000 --- /dev/null +++ b/Assets/UI Toolkit.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89009ce0a5328454481813dbb30d220e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI Toolkit/PanelSettings.asset b/Assets/UI Toolkit/PanelSettings.asset new file mode 100644 index 0000000000000000000000000000000000000000..1edbf82a624bc9feb9d492233873f8c146647991 --- /dev/null +++ b/Assets/UI Toolkit/PanelSettings.asset @@ -0,0 +1,37 @@ +%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: 19101, guid: 0000000000000000e000000000000000, type: 0} + m_Name: PanelSettings + m_EditorClassIdentifier: + themeUss: {fileID: -4733365628477956816, guid: 953907950bc22bc459d08103f7aff981, type: 3} + m_TargetTexture: {fileID: 0} + m_ScaleMode: 2 + m_Scale: 1 + m_ReferenceDpi: 96 + m_FallbackDpi: 96 + m_ReferenceResolution: {x: 1200, y: 800} + m_ScreenMatchMode: 0 + m_Match: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 + m_ClearDepthStencil: 1 + m_ClearColor: 0 + m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0} + m_DynamicAtlasSettings: + m_MinAtlasSize: 64 + m_MaxAtlasSize: 4096 + m_MaxSubTextureSize: 64 + m_ActiveFilters: 31 + m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} + m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0} + m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0} + textSettings: {fileID: 0} diff --git a/Assets/UI Toolkit/PanelSettings.asset.meta b/Assets/UI Toolkit/PanelSettings.asset.meta new file mode 100644 index 0000000000000000000000000000000000000000..8f23d8c5058ec81b3ac7409ee4caf98b21f5ff09 --- /dev/null +++ b/Assets/UI Toolkit/PanelSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd07337020fac9f4d817f2d168694173 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI Toolkit/UnityThemes.meta b/Assets/UI Toolkit/UnityThemes.meta new file mode 100644 index 0000000000000000000000000000000000000000..5452d8036e96123cef659985b1ed239004aa603b --- /dev/null +++ b/Assets/UI Toolkit/UnityThemes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 72f842d2cb6340c4f83ccbcf0562cc92 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss b/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss new file mode 100644 index 0000000000000000000000000000000000000000..1056e07ed4f47c0353c25119d72f3d4e3493d578 --- /dev/null +++ b/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss @@ -0,0 +1 @@ +@import url("unity-theme://default"); \ No newline at end of file diff --git a/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta b/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta new file mode 100644 index 0000000000000000000000000000000000000000..62c81fc8cd6401d8c0d8e7ab7f49e71cbf230b7b --- /dev/null +++ b/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 953907950bc22bc459d08103f7aff981 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12388, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 0 diff --git a/Assets/UI/Dialogue Box/Dialogue Box.cs b/Assets/UI/Dialogue Box/Dialogue Box.cs deleted file mode 100644 index 9dd34b702e438bb90bb8e17dd3ad4dcbe01a6f4e..0000000000000000000000000000000000000000 --- a/Assets/UI/Dialogue Box/Dialogue Box.cs +++ /dev/null @@ -1,81 +0,0 @@ -using UnityEditor; -using UnityEngine; -using UnityEngine.UIElements; - -public class PlaymodeControls : EditorWindow { - [MenuItem("Window/DialogueBox")] - public static void ShowExample() { - PlaymodeControls wnd = GetWindow<PlaymodeControls>(); - wnd.titleContent = new GUIContent("DialogueBox"); - } - - private int ButtonCount = 0; - - public void OnEnable() { - VisualElement root = rootVisualElement; - var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/UI/Dialogue Box/Dialogue Box.uxml"); - var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Assets/UI/Dialogue Box/Dialogue Box.uss"); - VisualElement tree = visualTree.CloneTree(); - tree.styleSheets.Add(styleSheet); - root.Add(tree); - - ButtonCount = 0; - root.Q<TextElement>("Dialogue").text = "Test Test Test"; - - root.Q<Button>("Button1").visible = false; - root.Q<Button>("Button2").visible = false; - root.Q<Button>("Button3").visible = false; - root.Q<Button>("Button4").visible = false; - - root.Q<Image>("PlayIcon").image = EditorGUIUtility.IconContent("PlayButton").image; - root.Q<Image>("PlusIcon").image = EditorGUIUtility.IconContent("Toolbar Plus").image; - root.Q<Image>("MinusIcon").image = EditorGUIUtility.IconContent("Toolbar Minus").image; - - root.Q<Button>("PlayButton").RegisterCallback<MouseUpEvent>((e) => { - root.Q<TextElement>("Dialogue").text = "Text hat sich verändert!";; - }); - - root.Q<Button>("Button1").RegisterCallback<MouseUpEvent>((e) => { - root.Q<TextElement>("Dialogue").text = "Text hat sich nochmal verändert!";; - }); - - root.Q<Button>("Button2").RegisterCallback<MouseUpEvent>((e) => { - root.Q<TextElement>("Dialogue").text = "Text hat sich wieder verändert!";; - }); - - root.Q<Button>("Button3").RegisterCallback<MouseUpEvent>((e) => { - root.Q<TextElement>("Dialogue").text = "Text hat sich nicht verändert!";; - }); - - root.Q<Button>("Button4").RegisterCallback<MouseUpEvent>((e) => { - root.Q<TextElement>("Dialogue").text = "Test Test Test";; - }); - - root.Q<Button>("MoreButtons").RegisterCallback<MouseUpEvent>((e) => { - if (ButtonCount<4){ButtonCount++;}; - - switch(ButtonCount) { - case 1: root.Q<Button>("Button4").visible = true; break; - case 2: root.Q<Button>("Button3").visible = true; break; - case 3: root.Q<Button>("Button2").visible = true; break; - case 4: root.Q<Button>("Button1").visible = true; break; - } - }); - - root.Q<Button>("LessButtons").RegisterCallback<MouseUpEvent>((e) => { - if (ButtonCount>0){ButtonCount--;}; - - switch(ButtonCount) { - case 0: root.Q<Button>("Button4").visible = false; break; - case 1: root.Q<Button>("Button3").visible = false; break; - case 2: root.Q<Button>("Button2").visible = false; break; - case 3: root.Q<Button>("Button1").visible = false; break; - } - }); -; - - } -} - - - diff --git a/Assets/UI/Dialogue Box/Dialogue Box.uss b/Assets/UI/Dialogue Box/Dialogue Box.uss deleted file mode 100644 index ade8bc50813a90231c19f6e121afcf3f4c5e48a5..0000000000000000000000000000000000000000 --- a/Assets/UI/Dialogue Box/Dialogue Box.uss +++ /dev/null @@ -1,23 +0,0 @@ -Label { - font-size: 15px; - -unity-font-style:bold; - color: rgb(255, 255, 255); -} - -TextElement { - font-size: 12px; - -unity-font-style:normal; - color: rgb(255,255,255); -} - -Button { - width: 25px; - height: 25px; - margin-left: 1px; - margin-right: 1px; -} - -.row{ - flex-direction: row; - padding-top: 10px; -} \ No newline at end of file diff --git a/Assets/UI/Dialogue Box.meta b/Assets/UI/DialogueBox.meta similarity index 100% rename from Assets/UI/Dialogue Box.meta rename to Assets/UI/DialogueBox.meta diff --git a/Assets/UI/DialogueBox/DialogueBox.cs b/Assets/UI/DialogueBox/DialogueBox.cs new file mode 100644 index 0000000000000000000000000000000000000000..4caa0a844de5d15833800a734ac0dab2f93c7671 --- /dev/null +++ b/Assets/UI/DialogueBox/DialogueBox.cs @@ -0,0 +1,65 @@ +using UnityEditor; +using UnityEngine; +using UnityEngine.UIElements; + +public class DialogueBox : MonoBehaviour { + + string ActorName = "ActorName"; + string DialogueText = "DialogueText"; + + public void OnEnable() { + var uiDocument = GetComponent<UIDocument>(); + VisualElement root = uiDocument.rootVisualElement; + var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/UI/DialogueBox/DialogueBox.uxml"); + var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Assets/UI/DialogueBox/DialogueBox.uss"); + VisualElement tree = visualTree.CloneTree(); + tree.styleSheets.Add(styleSheet); + root.Add(tree); + + setActor(ActorName); + setText(DialogueText); + + root.Q<Button>("Button1").visible = false; + root.Q<Button>("Button2").visible = false; + root.Q<Button>("Button3").visible = false; + root.Q<Button>("Button4").visible = false; + + root.Q<Image>("PlayIcon").image = EditorGUIUtility.IconContent("PlayButton").image; + root.Q<Image>("PlusIcon").image = EditorGUIUtility.IconContent("Toolbar Plus").image; + root.Q<Image>("MinusIcon").image = EditorGUIUtility.IconContent("Toolbar Minus").image; + + root.Q<Button>("PlayButton").RegisterCallback<MouseUpEvent>((e) => { + GetComponent<StateMachine>().nextNote(0); + if (GetComponent<StateMachine>().currentNote.Transitions == null) { + root.Q<Button>("PlayButton").visible = false;} + else { + root.Q<Button>("PlayButton").visible = true;} + }); + + root.Q<Button>("Button1").RegisterCallback<MouseUpEvent>((e) => { + GetComponent<StateMachine>().nextNote(1); + if (GetComponent<StateMachine>().currentNote.Transitions == null) { + root.Q<Button>("Button1").visible = false;} + else { + root.Q<Button>("Button1").visible = true;} + }); + + } + + public void setActor(string actor) { + GetComponent<UIDocument>().rootVisualElement.Q<Label>("Actor").text = actor; + } + + public void setText(string text) { + GetComponent<UIDocument>().rootVisualElement.Q<TextElement>("Dialogue").text = text; + } + + public void setScene(string Actor, string Dialogue) { + setActor(Actor); + setText(Dialogue); + } + +} + + + diff --git a/Assets/UI/Dialogue Box/Dialogue Box.cs.meta b/Assets/UI/DialogueBox/DialogueBox.cs.meta similarity index 100% rename from Assets/UI/Dialogue Box/Dialogue Box.cs.meta rename to Assets/UI/DialogueBox/DialogueBox.cs.meta diff --git a/Assets/UI/DialogueBox/DialogueBox.uss b/Assets/UI/DialogueBox/DialogueBox.uss new file mode 100644 index 0000000000000000000000000000000000000000..803337c47c1bf96f3c546159b8dbfdc245164b16 --- /dev/null +++ b/Assets/UI/DialogueBox/DialogueBox.uss @@ -0,0 +1,29 @@ +Label { + font-size: 25px; + -unity-font-style:bold; + color: rgb(255, 255, 255); + margin-top: 10px; + margin-left: 15px; +} + +TextElement { + font-size: 20px; + -unity-font-style:normal; + color: rgb(255,255,255); +} + +Button { + font-size: 20px; + -unity-font-style:normal; + color: rgb(255,255,255); + width: 50px; + height: 50px; + margin-left: 2px; + margin-right: 2px; +} + +.row{ + flex-direction: row; + padding-top: 20px; + margin-left: 15px; +} \ No newline at end of file diff --git a/Assets/UI/Dialogue Box/Dialogue Box.uss.meta b/Assets/UI/DialogueBox/DialogueBox.uss.meta similarity index 100% rename from Assets/UI/Dialogue Box/Dialogue Box.uss.meta rename to Assets/UI/DialogueBox/DialogueBox.uss.meta diff --git a/Assets/UI/Dialogue Box/Dialogue Box.uxml b/Assets/UI/DialogueBox/DialogueBox.uxml similarity index 87% rename from Assets/UI/Dialogue Box/Dialogue Box.uxml rename to Assets/UI/DialogueBox/DialogueBox.uxml index c3e0a7ff7c705b02a0dc92fb2c23a94ce035332f..84e25d4630d2ef0c3370a90265b32552cdaff503 100644 --- a/Assets/UI/Dialogue Box/Dialogue Box.uxml +++ b/Assets/UI/DialogueBox/DialogueBox.uxml @@ -1,9 +1,9 @@ <UXML xmlns="UnityEngine.UIElements"> - <Label text="Speaker Name" /> + + <Label name="Actor"/> <VisualElement class="row"> - <TextElement name="Dialogue"> - </TextElement> + <TextElement name="Dialogue"/> </VisualElement> <VisualElement class="row"> diff --git a/Assets/UI/Dialogue Box/Dialogue Box.uxml.meta b/Assets/UI/DialogueBox/DialogueBox.uxml.meta similarity index 100% rename from Assets/UI/Dialogue Box/Dialogue Box.uxml.meta rename to Assets/UI/DialogueBox/DialogueBox.uxml.meta diff --git a/Assets/UI/DialogueBox/StateMachine.cs b/Assets/UI/DialogueBox/StateMachine.cs new file mode 100644 index 0000000000000000000000000000000000000000..154992d2ed06df2de8bd0af77335241dc4094cc3 --- /dev/null +++ b/Assets/UI/DialogueBox/StateMachine.cs @@ -0,0 +1,74 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEditor; + +public class StateMachine : MonoBehaviour +{ + public Note currentNote; + + public void nextNote(int count) { + currentNote = currentNote.Transitions[count].Target; + setNote(); + } + + public void setNote() { + var dialogueBox = GetComponent<DialogueBox>(); + dialogueBox.setActor(currentNote.ActorName); + dialogueBox.setText(currentNote.DialogueText); + } + + + //Test + public void Start() { + + Transition[] GHI = new Transition[2]; + Note TestNote = new Note("Actor 3","Testing Text 3",GHI); + + Transition TestingTransition = new Transition("Talk", TestNote); + Transition[] ABC = new Transition[1]; + ABC[0] = TestingTransition; + Note TestNote2 = new Note("Actor 2","Testing Text 2", ABC); + + Transition TestingTransition1 = new Transition("Speak", TestNote2); + Transition[] DEF = new Transition[1]; + DEF[0] = TestingTransition1; + Note TestNote3 = new Note("Actor 1","Testing Text 1", DEF); + + Transition TestingTransition2 = new Transition("Speak", TestNote3); + GHI[0] = TestingTransition1; + GHI[1] = TestingTransition2; + + currentNote = TestNote3; + setNote(); + } + + public class Note { + public string ActorName; + public string DialogueText; + public Transition[] Transitions; + + public Note(string actor,string dialogue) { + ActorName = actor; + DialogueText = dialogue; + } + + public Note(string actor,string dialogue,Transition[] noteTransitions) { + ActorName = actor; + DialogueText = dialogue; + Transitions = noteTransitions; + } + } + + + public class Transition { + public string TransitionName; + public Note Target; + + public Transition(string name,Note target){ + TransitionName = name; + Target = target; + } + + } +} \ No newline at end of file diff --git a/Assets/UI/DialogueBox/StateMachine.cs.meta b/Assets/UI/DialogueBox/StateMachine.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..cced93aab23c334765c268f2df2db0841791ff7d --- /dev/null +++ b/Assets/UI/DialogueBox/StateMachine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5ba11467abf042d4f8e33891cdac93bf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 6329fd3c24ce966b13bfdedd03f5b5a1c45ce03b..6c20c4b9e194496caac2527a70b182ceac570853 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -59,7 +59,8 @@ GraphicsSettings: m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 - m_LightsUseColorTemperature: 0 + m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_SRPDefaultSettings: {} + m_SRPDefaultSettings: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 9ac4bbd1dab43254799ca2e9d10c0013, type: 2} diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 7b7658d6ebf4a0302c34bf5cc1e9d30813705a9e..b38e404e4ae4b06c45ab86bc4d56634eaaa47955 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -18,7 +18,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 1 + skinWeights: 1 textureQuality: 1 anisotropicTextures: 0 antiAliasing: 0 @@ -40,6 +40,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Low @@ -53,7 +54,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -75,6 +76,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Medium @@ -88,7 +90,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 @@ -110,6 +112,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: High @@ -123,7 +126,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 @@ -145,6 +148,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Very High @@ -158,7 +162,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 + skinWeights: 4 textureQuality: 0 anisotropicTextures: 2 antiAliasing: 2 @@ -180,6 +184,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Ultra @@ -193,10 +198,10 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 + skinWeights: 4 textureQuality: 0 anisotropicTextures: 2 - antiAliasing: 2 + antiAliasing: 0 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 @@ -215,6 +220,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 2