From e15d9f610ec7752cc7c3fc49ed99ba96baa3e377 Mon Sep 17 00:00:00 2001 From: Minz Date: Sun, 9 Jul 2023 16:49:21 +0200 Subject: [PATCH] Add custom cursors --- Assets/Images/UI/Cursor Talk.png | 3 + Assets/Images/UI/Cursor Talk.png.meta | 140 ++++++++++++++++++ Assets/Images/UI/Cursor.png | 3 + Assets/Images/UI/Cursor.png.meta | 140 ++++++++++++++++++ Assets/Images/UI/Eye Cursor.png | 3 + Assets/Images/UI/Eye Cursor.png.meta | 140 ++++++++++++++++++ Assets/Images/UI/Logbook Scribbles.png | 3 + Assets/Images/UI/Logbook Scribbles.png.meta | 140 ++++++++++++++++++ .../Images/UI/Logbook Transparent Pages.png | 3 + .../UI/Logbook Transparent Pages.png.meta | 140 ++++++++++++++++++ Assets/Images/UI/Mouse Lef Click.png | 3 + Assets/Images/UI/Mouse Lef Click.png.meta | 140 ++++++++++++++++++ Assets/Materials/Objects/Journal.mat | 83 +++++++++++ Assets/Materials/Objects/Journal.mat.meta | 8 + Assets/Scenes/Main.unity | 49 +++--- Assets/Scripts/AdventurerInteractable.cs | 11 +- .../DialogueSystem/DialogueController.cs | 1 + Assets/Scripts/GameManager.cs | 2 + Assets/Scripts/Journal.cs | 12 +- Assets/Scripts/UIManager.cs | 9 ++ 20 files changed, 1001 insertions(+), 32 deletions(-) create mode 100644 Assets/Images/UI/Cursor Talk.png create mode 100644 Assets/Images/UI/Cursor Talk.png.meta create mode 100644 Assets/Images/UI/Cursor.png create mode 100644 Assets/Images/UI/Cursor.png.meta create mode 100644 Assets/Images/UI/Eye Cursor.png create mode 100644 Assets/Images/UI/Eye Cursor.png.meta create mode 100644 Assets/Images/UI/Logbook Scribbles.png create mode 100644 Assets/Images/UI/Logbook Scribbles.png.meta create mode 100644 Assets/Images/UI/Logbook Transparent Pages.png create mode 100644 Assets/Images/UI/Logbook Transparent Pages.png.meta create mode 100644 Assets/Images/UI/Mouse Lef Click.png create mode 100644 Assets/Images/UI/Mouse Lef Click.png.meta create mode 100644 Assets/Materials/Objects/Journal.mat create mode 100644 Assets/Materials/Objects/Journal.mat.meta diff --git a/Assets/Images/UI/Cursor Talk.png b/Assets/Images/UI/Cursor Talk.png new file mode 100644 index 0000000..08a6409 --- /dev/null +++ b/Assets/Images/UI/Cursor Talk.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db6a02734c4c2ec27fe9392a7f6639b4c18ebda6bd787ee94451a5e2943c3724 +size 180785 diff --git a/Assets/Images/UI/Cursor Talk.png.meta b/Assets/Images/UI/Cursor Talk.png.meta new file mode 100644 index 0000000..fb8855e --- /dev/null +++ b/Assets/Images/UI/Cursor Talk.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: e200b2d1403d63840ae913a1f393bf68 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + 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: 1 + spriteTessellationDetail: -1 + textureType: 7 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/UI/Cursor.png b/Assets/Images/UI/Cursor.png new file mode 100644 index 0000000..8ec9beb --- /dev/null +++ b/Assets/Images/UI/Cursor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c58b92b4bcbfe0e396ef878b67e07ae5c69290f09047acf48c4b94ed6d1d031 +size 181942 diff --git a/Assets/Images/UI/Cursor.png.meta b/Assets/Images/UI/Cursor.png.meta new file mode 100644 index 0000000..53e2329 --- /dev/null +++ b/Assets/Images/UI/Cursor.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 24f58d55672ef4841bb47fd1498d21b9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + 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: 1 + spriteTessellationDetail: -1 + textureType: 7 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/UI/Eye Cursor.png b/Assets/Images/UI/Eye Cursor.png new file mode 100644 index 0000000..853bbfb --- /dev/null +++ b/Assets/Images/UI/Eye Cursor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0641ac82326a15565726b40e5c324a127b51886d480b798501a40d2103d1c899 +size 148782 diff --git a/Assets/Images/UI/Eye Cursor.png.meta b/Assets/Images/UI/Eye Cursor.png.meta new file mode 100644 index 0000000..1f07eae --- /dev/null +++ b/Assets/Images/UI/Eye Cursor.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 6286b94bd4388ef4bbf5eefdb04340cf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + 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: 1 + spriteTessellationDetail: -1 + textureType: 7 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/UI/Logbook Scribbles.png b/Assets/Images/UI/Logbook Scribbles.png new file mode 100644 index 0000000..4b71b46 --- /dev/null +++ b/Assets/Images/UI/Logbook Scribbles.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a2b1aa12496bd8f86bc6213cb3da8788c8170ccd4951ee1fceef2acb9211a3e +size 307268 diff --git a/Assets/Images/UI/Logbook Scribbles.png.meta b/Assets/Images/UI/Logbook Scribbles.png.meta new file mode 100644 index 0000000..a3e520d --- /dev/null +++ b/Assets/Images/UI/Logbook Scribbles.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: febde97bc50c4a74ab150f904073ac62 +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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/UI/Logbook Transparent Pages.png b/Assets/Images/UI/Logbook Transparent Pages.png new file mode 100644 index 0000000..582950b --- /dev/null +++ b/Assets/Images/UI/Logbook Transparent Pages.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40b78b7fcc8ecbf6a175a92ee7f3505ba0b6f5b832b36dd1bd398afb8285e672 +size 236595 diff --git a/Assets/Images/UI/Logbook Transparent Pages.png.meta b/Assets/Images/UI/Logbook Transparent Pages.png.meta new file mode 100644 index 0000000..2618eb9 --- /dev/null +++ b/Assets/Images/UI/Logbook Transparent Pages.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 6edc767d8be58da4a90755892ff92b84 +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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/UI/Mouse Lef Click.png b/Assets/Images/UI/Mouse Lef Click.png new file mode 100644 index 0000000..3706acc --- /dev/null +++ b/Assets/Images/UI/Mouse Lef Click.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:055225828856a314955a2c65e6f7e5bb2bb185ac3bbcd36c73ce5766c6ca4e98 +size 124258 diff --git a/Assets/Images/UI/Mouse Lef Click.png.meta b/Assets/Images/UI/Mouse Lef Click.png.meta new file mode 100644 index 0000000..1f32621 --- /dev/null +++ b/Assets/Images/UI/Mouse Lef Click.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 60418a081221eb04e9f4c9e9feee8f6d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Objects/Journal.mat b/Assets/Materials/Objects/Journal.mat new file mode 100644 index 0000000..268f033 --- /dev/null +++ b/Assets/Materials/Objects/Journal.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Journal + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: febde97bc50c4a74ab150f904073ac62, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Objects/Journal.mat.meta b/Assets/Materials/Objects/Journal.mat.meta new file mode 100644 index 0000000..d075956 --- /dev/null +++ b/Assets/Materials/Objects/Journal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07f6a177e45053d469c8e86ea9b0b597 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 31731b7..f9f50b4 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1273,7 +1273,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 07f6a177e45053d469c8e86ea9b0b597, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1310,14 +1310,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 243041992} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.61, y: 2.5003324, z: -0.7882118} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0, y: -0.9358445, z: 0.35241348, w: 0} + m_LocalPosition: {x: -0.127, y: 2.866, z: -1.103} + m_LocalScale: {x: 1.9581386, y: 0.02, z: 1.1287044} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 15 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 138.73, y: 0, z: 180} --- !u!1 &267478340 GameObject: m_ObjectHideFlags: 0 @@ -1627,9 +1627,9 @@ Light: m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 - m_Bias: 0.05 + m_Bias: 0.013 m_NormalBias: 0.4 - m_NearPlane: 0.2 + m_NearPlane: 0.1 m_CullingMatrixOverride: e00: 1 e01: 0 @@ -1656,7 +1656,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 2 + m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -2375,9 +2375,9 @@ Light: m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 - m_Bias: 0.05 + m_Bias: 0.013 m_NormalBias: 0.4 - m_NearPlane: 0.2 + m_NearPlane: 0.1 m_CullingMatrixOverride: e00: 1 e01: 0 @@ -2404,7 +2404,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 2 + m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -2574,9 +2574,9 @@ Light: m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 - m_Bias: 0.05 + m_Bias: 0.013 m_NormalBias: 0.4 - m_NearPlane: 0.2 + m_NearPlane: 0.1 m_CullingMatrixOverride: e00: 1 e01: 0 @@ -2603,7 +2603,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 2 + m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -3394,7 +3394,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 35501749b39a2f64383e8c1d43146b28, type: 3} + m_Sprite: {fileID: 21300000, guid: 60418a081221eb04e9f4c9e9feee8f6d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -4980,9 +4980,9 @@ Light: m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 - m_Bias: 0.05 + m_Bias: 0.013 m_NormalBias: 0.4 - m_NearPlane: 0.2 + m_NearPlane: 0.1 m_CullingMatrixOverride: e00: 1 e01: 0 @@ -5009,7 +5009,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 2 + m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -6300,7 +6300,7 @@ Light: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1782138140} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 10 m_Type: 1 m_Shape: 0 @@ -6315,7 +6315,7 @@ Light: m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 - m_Bias: 0.05 + m_Bias: 0.252 m_NormalBias: 0.4 m_NearPlane: 0.2 m_CullingMatrixOverride: @@ -7139,9 +7139,9 @@ Light: m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 - m_Bias: 0.05 + m_Bias: 0.013 m_NormalBias: 0.4 - m_NearPlane: 0.2 + m_NearPlane: 0.1 m_CullingMatrixOverride: e00: 1 e01: 0 @@ -7168,7 +7168,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 2 + m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -7361,6 +7361,9 @@ MonoBehaviour: fadeRect: {fileID: 582177626} dialogueController: {fileID: 363264314} uiManager: {fileID: 783056442} + m_talkCursor: {fileID: 2800000, guid: e200b2d1403d63840ae913a1f393bf68, type: 3} + m_lookCursor: {fileID: 2800000, guid: 6286b94bd4388ef4bbf5eefdb04340cf, type: 3} + m_defaultCursor: {fileID: 2800000, guid: 24f58d55672ef4841bb47fd1498d21b9, type: 3} m_fadeT: 0 m_showFade: 0 m_fadeDuration: 3 diff --git a/Assets/Scripts/AdventurerInteractable.cs b/Assets/Scripts/AdventurerInteractable.cs index ee9bef7..c50247a 100644 --- a/Assets/Scripts/AdventurerInteractable.cs +++ b/Assets/Scripts/AdventurerInteractable.cs @@ -13,10 +13,14 @@ public class AdventurerInteractable : MonoBehaviour } - // Update is called once per frame - void Update() + void OnMouseEnter() { - + GameManager.Instance.uiManager.SetCursor(GameManager.Instance.m_talkCursor); + } + + void OnMouseExit() + { + GameManager.Instance.uiManager.SetCursor(GameManager.Instance.m_defaultCursor); } private void OnMouseDown() @@ -27,6 +31,7 @@ public class AdventurerInteractable : MonoBehaviour if (GameManager.Instance.dialogueController.DialogueInProgress) return; + GameManager.Instance.uiManager.BlockInput(true); //PlayerController.Instance.cameraMovement = false; CharacterData character = CharacterManager.Instance.GetCharacterDataByName(m_name); GameManager.Instance.dialogueController.DisplayCharacterText(character); diff --git a/Assets/Scripts/DialogueSystem/DialogueController.cs b/Assets/Scripts/DialogueSystem/DialogueController.cs index 878cfc4..4d6f2b5 100644 --- a/Assets/Scripts/DialogueSystem/DialogueController.cs +++ b/Assets/Scripts/DialogueSystem/DialogueController.cs @@ -28,6 +28,7 @@ public class DialogueController : MonoBehaviour { Debug.Log($"DialogueController: Character {characterName} finished interviewing"); CharacterManager.Instance.SetInterviewed(characterName); + GameManager.Instance.uiManager.BlockInput(false); } public void Debug_NextCharacter() diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index dbebaac..de125ac 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -12,6 +12,8 @@ public class GameManager : MonoBehaviour public DialogueController dialogueController; public UIManager uiManager; + public Texture2D m_talkCursor, m_lookCursor, m_defaultCursor; + [SerializeField] private float m_fadeT; private float m_fadeTotal; [SerializeField] private bool m_showFade = false; diff --git a/Assets/Scripts/Journal.cs b/Assets/Scripts/Journal.cs index 77826e2..585c448 100644 --- a/Assets/Scripts/Journal.cs +++ b/Assets/Scripts/Journal.cs @@ -14,16 +14,16 @@ public class Journal : MonoBehaviour public Transform questPage; private int m_selectedAdventurer = 0; - // Start is called before the first frame update - void Start() + + + void OnMouseEnter() { - + GameManager.Instance.uiManager.SetCursor(GameManager.Instance.m_lookCursor); } - // Update is called once per frame - void Update() + void OnMouseExit() { - + GameManager.Instance.uiManager.SetCursor(GameManager.Instance.m_defaultCursor); } private void OnMouseDown() diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index 67af0f5..80ee0ed 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -10,6 +10,15 @@ public class UIManager : MonoBehaviour public void BlockInput(bool value) { + Cursor.SetCursor(GameManager.Instance.m_defaultCursor, Vector2.zero, CursorMode.Auto); m_blocked = value; } + + public void SetCursor(Texture2D cursor) + { + if(!m_blocked) + { + Cursor.SetCursor(cursor, Vector2.zero, CursorMode.Auto); + } + } }