diff --git a/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset b/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset index 0d312f95504a068e28a85f7fa6b7c3d85baeeca2..2b4335cd2afeed19569cf518a98a6f39f3837748 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 0000000000000000000000000000000000000000..03da352731bbb8c8045b0c921a1d50443af90aa5 --- /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 0000000000000000000000000000000000000000..3e7494ff919fc3d3dd1a4c34f2e66f1d6289468f --- /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 0000000000000000000000000000000000000000..c7655cdf0a04d0c3c98a32fddbae975854ee1095 --- /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 0000000000000000000000000000000000000000..e8132d5f199b1cb16a6016e8f5d3b0fffb8a34bb --- /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 0000000000000000000000000000000000000000..211b767f533d25c8b6a775781249a9606b38d186 --- /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 23359597b02efff7e40d65a8bddcf95d6d88f894..cf06f9eed5325ca587af4c1af4f2090639046366 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 0000000000000000000000000000000000000000..245ef0b05178ba88c0ab5147e4265d53f7254b97 --- /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