From 9d1600410a672d833aa4175dd16d63e658f032fb Mon Sep 17 00:00:00 2001
From: s402520 <sven.gerlach@stud-mail.uni-wuerzburg.de>
Date: Wed, 31 May 2023 14:38:36 +0200
Subject: [PATCH] WorldSpaceDialogueBox working with XR Interactions
---
.../Generated/ArticyEditorSettings.asset | 2 +-
Assets/DialogSystem/DialogueBox.uss | 11 ++-
.../Prefabs/WorldSpaceDialogueBox.prefab | 4 +-
Assets/DialogSystem/WorldSpaceDialogueBox.cs | 2 +-
Assets/Scenes/SampleScene.unity | 80 ++++++++++++++++---
ProjectSettings/ProjectSettings.asset | 8 ++
6 files changed, 87 insertions(+), 20 deletions(-)
diff --git a/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset b/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset
index 1d4d35f..6630273 100644
--- a/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset
+++ b/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset
@@ -20,7 +20,7 @@ MonoBehaviour:
mLastUsedPackagesHash: 1187110788
mLastUsedPackagesCount: 1
mLastBuildCode: 1
- mLastEditorStartupTimeTicks: 638206915770394296
+ mLastEditorStartupTimeTicks: 638211129909430257
mNewVersionAvailable: 0
mLastSelectedCustomGvPath:
mLastAttachedFlowPlayerValue: 0
diff --git a/Assets/DialogSystem/DialogueBox.uss b/Assets/DialogSystem/DialogueBox.uss
index f75729c..e8f9c69 100644
--- a/Assets/DialogSystem/DialogueBox.uss
+++ b/Assets/DialogSystem/DialogueBox.uss
@@ -18,10 +18,11 @@
Label {
-unity-font-definition: url("/Assets/DialogSystem/Assets/Fonts/DMSans-Bold.ttf");
+ font-size: 90px;
color: rgb(255, 255, 255);
background-color: rgba(0,0,0,0.075);
- width: 1150px;
+ width: 1550px;
margin-top: 70px;
margin-left: 90px;
margin-right: 90px;
@@ -35,7 +36,7 @@ TextElement {
background-color: rgba(0,0,0,0.075);
- width: 1150px;
+ width: 1550px;
height: auto;
overflow: hidden;
@@ -61,7 +62,7 @@ Button {
flex-direction: column;
- width: 1150px;
+ width: 1550px;
height: 125px;
min-height: 125px;
margin-bottom: 15px;
@@ -71,6 +72,10 @@ Button {
align-self: center;
}
+Button:hover {
+ background-color: grey;
+}
+
.container {
min-height: 125px;
height: auto;
diff --git a/Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab b/Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab
index 7c24672..6044a76 100644
--- a/Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab
+++ b/Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab
@@ -50,7 +50,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fbbce919b93a804449b8e74c7b1eec1b, type: 3}
m_Name:
m_EditorClassIdentifier:
- _panelWidth: 1350
+ _panelWidth: 1750
_panelHeight: 2750
_panelScale: 1
_pixelsPerUnit: 1350
@@ -170,4 +170,4 @@ MonoBehaviour:
farActorSize: 150
nearTextSize: 70
farTextSize: 110
- mindistance: 2
+ mindistance: 3
diff --git a/Assets/DialogSystem/WorldSpaceDialogueBox.cs b/Assets/DialogSystem/WorldSpaceDialogueBox.cs
index 972244d..596e647 100644
--- a/Assets/DialogSystem/WorldSpaceDialogueBox.cs
+++ b/Assets/DialogSystem/WorldSpaceDialogueBox.cs
@@ -36,7 +36,7 @@ private void setUIDocument() {
for (var i = 0; i < buttons.Length; i++) {
var index = i;
- buttons[i].RegisterCallback<MouseUpEvent>(_ => GetComponent<WorldSpaceArticyStoryline>().ApplyTransition(index));
+ buttons[i].RegisterCallback<ClickEvent>(_ => GetComponent<WorldSpaceArticyStoryline>().ApplyTransition(index));
}
}
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index c222e9b..7abf55e 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -123,6 +123,25 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &477529167 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3092203387818711293, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ m_PrefabInstance: {fileID: 1235272401}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &477529173
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 477529167}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9ee8dd1042c84fa4fa2411e8c4ebcc01, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ gradientTime: 5
+ fadeColor: {r: 0, g: 0, b: 0, a: 1}
--- !u!1 &649525595
GameObject:
m_ObjectHideFlags: 0
@@ -154,16 +173,16 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
- m_ClickSpeed: 0.1
+ m_ClickSpeed: 0.3
m_MoveDeadzone: 0.6
m_RepeatDelay: 0.5
m_RepeatRate: 0.1
m_TrackedDeviceDragThresholdMultiplier: 2
m_MaxTrackedDeviceRaycastDistance: 1000
m_EnableXRInput: 1
- m_EnableMouseInput: 1
- m_EnableTouchInput: 1
- usePenPointerIdBase: 0
+ m_EnableMouseInput: 0
+ m_EnableTouchInput: 0
+ usePenPointerIdBase: 1
--- !u!114 &649525597
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -186,14 +205,36 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 649525595}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.8125458, y: -0.20923173, z: 1.4384191}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_Father: {fileID: 992521912}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &757869210 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3092203389408023662, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ m_PrefabInstance: {fileID: 1235272401}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &757869216
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 757869210}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fb62641662b746c4ba1436abd6f193eb, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!4 &992521912 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ m_PrefabInstance: {fileID: 1235272401}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1019091453
GameObject:
m_ObjectHideFlags: 0
@@ -316,6 +357,14 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 3092203388343880111, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_CameraYOffset
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388343880115, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 3092203388780154408, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
propertyPath: m_Name
value: XrRig
@@ -364,20 +413,24 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4461700857348234092, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: screenFade
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
---- !u!1 &1871036619 stripped
+--- !u!1 &1649787812 stripped
GameObject:
- m_CorrespondingSourceObject: {fileID: 8170552307152042535, guid: 8cfe3f32eae0d304285287fececf058b, type: 3}
- m_PrefabInstance: {fileID: 2094756388}
+ m_CorrespondingSourceObject: {fileID: 3092203388013782062, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ m_PrefabInstance: {fileID: 1235272401}
m_PrefabAsset: {fileID: 0}
---- !u!114 &1871036628
+--- !u!114 &1649787818
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1871036619}
+ m_GameObject: {fileID: 1649787812}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fb62641662b746c4ba1436abd6f193eb, type: 3}
@@ -442,5 +495,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- m_RemovedComponents: []
+ m_RemovedComponents:
+ - {fileID: 8170552307152042527, guid: 8cfe3f32eae0d304285287fececf058b, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 8cfe3f32eae0d304285287fececf058b, type: 3}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index b7c4fcb..07e756b 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -137,6 +137,14 @@ PlayerSettings:
bundleVersion: 0.1
preloadedAssets:
- {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
--
GitLab