From 85f119ffd9b199675970de9b77ffa3922c1bb7b1 Mon Sep 17 00:00:00 2001
From: s402520 <sven.gerlach@stud-mail.uni-wuerzburg.de>
Date: Wed, 10 May 2023 08:58:53 +0200
Subject: [PATCH] Imported Assets & Minor Restructuring of Project
---
.../Generated/ArticyEditorSettings.asset | 2 +-
Assets/DialogSystem/Assets.meta | 8 ++
Assets/DialogSystem/Assets/inner.png | 3 +
Assets/DialogSystem/Assets/inner.png.meta | 123 ++++++++++++++++++
Assets/DialogSystem/Assets/outer.png | 3 +
Assets/DialogSystem/Assets/outer.png.meta | 123 ++++++++++++++++++
Assets/DialogSystem/DialogueBox.uss | 4 +-
Assets/DialogSystem/Prefabs.meta | 8 ++
.../ScreenSpaceDialogueBox.prefab | 0
.../ScreenSpaceDialogueBox.prefab.meta | 0
.../WorldSpaceDialogueBox.prefab | 0
.../WorldSpaceDialogueBox.prefab.meta | 0
12 files changed, 271 insertions(+), 3 deletions(-)
create mode 100644 Assets/DialogSystem/Assets.meta
create mode 100644 Assets/DialogSystem/Assets/inner.png
create mode 100644 Assets/DialogSystem/Assets/inner.png.meta
create mode 100644 Assets/DialogSystem/Assets/outer.png
create mode 100644 Assets/DialogSystem/Assets/outer.png.meta
create mode 100644 Assets/DialogSystem/Prefabs.meta
rename Assets/DialogSystem/{ => Prefabs}/ScreenSpaceDialogueBox.prefab (100%)
rename Assets/DialogSystem/{ => Prefabs}/ScreenSpaceDialogueBox.prefab.meta (100%)
rename Assets/DialogSystem/{ => Prefabs}/WorldSpaceDialogueBox.prefab (100%)
rename Assets/DialogSystem/{ => Prefabs}/WorldSpaceDialogueBox.prefab.meta (100%)
diff --git a/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset b/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset
index 0d312f9..2b4335c 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: 638192129376389143
+ mLastEditorStartupTimeTicks: 638192984127926069
mNewVersionAvailable: 0
mLastSelectedCustomGvPath:
mLastAttachedFlowPlayerValue: 0
diff --git a/Assets/DialogSystem/Assets.meta b/Assets/DialogSystem/Assets.meta
new file mode 100644
index 0000000..03da352
--- /dev/null
+++ b/Assets/DialogSystem/Assets.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 421174e44bf5d0648906dcfeb5b50af3
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/DialogSystem/Assets/inner.png b/Assets/DialogSystem/Assets/inner.png
new file mode 100644
index 0000000..3e7494f
--- /dev/null
+++ b/Assets/DialogSystem/Assets/inner.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed1f2d33ca3eb2f49cf5d10801259aad1190b9495af7a2a79c18942890c29358
+size 27738
diff --git a/Assets/DialogSystem/Assets/inner.png.meta b/Assets/DialogSystem/Assets/inner.png.meta
new file mode 100644
index 0000000..c7655cd
--- /dev/null
+++ b/Assets/DialogSystem/Assets/inner.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 07b41ed5ad5872049b330f23c90bcf42
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 12
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMasterTextureLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 0
+ wrapV: 0
+ wrapW: 0
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Server
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/DialogSystem/Assets/outer.png b/Assets/DialogSystem/Assets/outer.png
new file mode 100644
index 0000000..e8132d5
--- /dev/null
+++ b/Assets/DialogSystem/Assets/outer.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1d0370c5be0ad19b9eeed8edf0acd96441ecd14390a166215f899d852869cc9
+size 6474
diff --git a/Assets/DialogSystem/Assets/outer.png.meta b/Assets/DialogSystem/Assets/outer.png.meta
new file mode 100644
index 0000000..211b767
--- /dev/null
+++ b/Assets/DialogSystem/Assets/outer.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 6b17467a67e85304d8a2de46ff2a6cf8
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 12
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMasterTextureLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 0
+ wrapV: 0
+ wrapW: 0
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Server
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/DialogSystem/DialogueBox.uss b/Assets/DialogSystem/DialogueBox.uss
index 2335959..cf06f9e 100644
--- a/Assets/DialogSystem/DialogueBox.uss
+++ b/Assets/DialogSystem/DialogueBox.uss
@@ -1,5 +1,5 @@
.outerShell {
- background-image: url("/Assets/Plugins/UI/Outer.png");
+ background-image: url("/Assets/DialogSystem/Assets/outer.png");
width: 1350px;
height: 1350px;
@@ -7,7 +7,7 @@
}
.innerShell {
- background-image: url("/Assets/Plugins/UI/Inner.png");
+ background-image: url("/Assets/DialogSystem/Assets/inner.png");
width: 1300px;
height: 1300px;
diff --git a/Assets/DialogSystem/Prefabs.meta b/Assets/DialogSystem/Prefabs.meta
new file mode 100644
index 0000000..245ef0b
--- /dev/null
+++ b/Assets/DialogSystem/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e3556a4b44f06ce41b1baaedfefac61b
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/DialogSystem/ScreenSpaceDialogueBox.prefab b/Assets/DialogSystem/Prefabs/ScreenSpaceDialogueBox.prefab
similarity index 100%
rename from Assets/DialogSystem/ScreenSpaceDialogueBox.prefab
rename to Assets/DialogSystem/Prefabs/ScreenSpaceDialogueBox.prefab
diff --git a/Assets/DialogSystem/ScreenSpaceDialogueBox.prefab.meta b/Assets/DialogSystem/Prefabs/ScreenSpaceDialogueBox.prefab.meta
similarity index 100%
rename from Assets/DialogSystem/ScreenSpaceDialogueBox.prefab.meta
rename to Assets/DialogSystem/Prefabs/ScreenSpaceDialogueBox.prefab.meta
diff --git a/Assets/DialogSystem/WorldSpaceDialogueBox.prefab b/Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab
similarity index 100%
rename from Assets/DialogSystem/WorldSpaceDialogueBox.prefab
rename to Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab
diff --git a/Assets/DialogSystem/WorldSpaceDialogueBox.prefab.meta b/Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab.meta
similarity index 100%
rename from Assets/DialogSystem/WorldSpaceDialogueBox.prefab.meta
rename to Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab.meta
--
GitLab