diff --git a/Assets/Resources/Shaders/CustomPostProcessingMaterials.asset b/Assets/Resources/Shaders/CustomPostProcessingMaterials.asset index 1e5cdb0..8a2d63b 100644 --- a/Assets/Resources/Shaders/CustomPostProcessingMaterials.asset +++ b/Assets/Resources/Shaders/CustomPostProcessingMaterials.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0517c7201b6a73841950436abd2ee35f, type: 3} m_Name: CustomPostProcessingMaterials m_EditorClassIdentifier: - customEffect: {fileID: 2100000, guid: eee0d494252ff8b49a69d3b8e1b74894, type: 2} + customEffect: {fileID: 2100000, guid: a110daba21b580f4898ccf841727c0c2, type: 2} diff --git a/Assets/Prefabs/SHADER_VOLUME.prefab b/Assets/Resources/Shaders/SHADER_VOLUME.prefab similarity index 77% rename from Assets/Prefabs/SHADER_VOLUME.prefab rename to Assets/Resources/Shaders/SHADER_VOLUME.prefab index 8595257..afb3e2f 100644 --- a/Assets/Prefabs/SHADER_VOLUME.prefab +++ b/Assets/Resources/Shaders/SHADER_VOLUME.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 8571637250638348960} - component: {fileID: 8571637250638348961} + - component: {fileID: 7921335062534809054} m_Layer: 0 m_Name: SHADER_VOLUME m_TagString: Untagged @@ -49,3 +50,15 @@ MonoBehaviour: blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: c3b45ae649e3364408bb0986304f0649, type: 2} +--- !u!114 &7921335062534809054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8571637250638348962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: caa0437e2cb72944799371bab89d8c31, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/SHADER_VOLUME.prefab.meta b/Assets/Resources/Shaders/SHADER_VOLUME.prefab.meta similarity index 100% rename from Assets/Prefabs/SHADER_VOLUME.prefab.meta rename to Assets/Resources/Shaders/SHADER_VOLUME.prefab.meta diff --git a/Assets/Scenes/MainMenu.meta b/Assets/Scenes/MainMenu.meta new file mode 100644 index 0000000..574ab81 --- /dev/null +++ b/Assets/Scenes/MainMenu.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8b76fe9fed1088440aa5bc3824166c26 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 712d77f..11ffc07 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.15896621, g: 0.51753515, b: 1.0392404, a: 1} + m_IndirectSpecularColor: {r: 0.16007265, g: 0.5168968, b: 1.04459, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,7 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: a7e458073d3b1f3498201f288cec64a2, + type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -1043,7 +1044,7 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 + m_RenderPostProcessing: 1 m_Antialiasing: 0 m_AntialiasingQuality: 2 m_StopNaN: 0 @@ -3211,6 +3212,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb27366a77e9005428c263f8639ce0d9, type: 3} +--- !u!1001 &1118246944 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalPosition.x + value: 62.8 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.4 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348960, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8571637250638348962, guid: 7febab9e1a84fa449991f0126f4eccbc, + type: 3} + propertyPath: m_Name + value: SHADER_VOLUME + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7febab9e1a84fa449991f0126f4eccbc, type: 3} --- !u!4 &1119662119 stripped Transform: m_CorrespondingSourceObject: {fileID: 1164874563174981229, guid: eb27366a77e9005428c263f8639ce0d9, diff --git a/Assets/Scenes/MainMenu/LightingData.asset b/Assets/Scenes/MainMenu/LightingData.asset new file mode 100644 index 0000000..3e7b551 Binary files /dev/null and b/Assets/Scenes/MainMenu/LightingData.asset differ diff --git a/Assets/Scenes/MainMenu/LightingData.asset.meta b/Assets/Scenes/MainMenu/LightingData.asset.meta new file mode 100644 index 0000000..e2e4757 --- /dev/null +++ b/Assets/Scenes/MainMenu/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a7e458073d3b1f3498201f288cec64a2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu/Lightmap-0_comp_dir.png b/Assets/Scenes/MainMenu/Lightmap-0_comp_dir.png new file mode 100644 index 0000000..c49a460 Binary files /dev/null and b/Assets/Scenes/MainMenu/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/MainMenu/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/MainMenu/Lightmap-0_comp_dir.png.meta new file mode 100644 index 0000000..4a1633f --- /dev/null +++ b/Assets/Scenes/MainMenu/Lightmap-0_comp_dir.png.meta @@ -0,0 +1,171 @@ +fileFormatVersion: 2 +guid: d61360c7983f70944838fcd74552f274 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 12 + 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: 2 + 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 + - serializedVersion: 3 + buildTarget: Android + 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: iPhone + 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: WebGL + 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: Windows Store Apps + 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/Scenes/MainMenu/Lightmap-0_comp_light.exr b/Assets/Scenes/MainMenu/Lightmap-0_comp_light.exr new file mode 100644 index 0000000..4a98b73 Binary files /dev/null and b/Assets/Scenes/MainMenu/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/MainMenu/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/MainMenu/Lightmap-0_comp_light.exr.meta new file mode 100644 index 0000000..556e405 --- /dev/null +++ b/Assets/Scenes/MainMenu/Lightmap-0_comp_light.exr.meta @@ -0,0 +1,171 @@ +fileFormatVersion: 2 +guid: bbbba79154cf1ed47b8948020dea1727 +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: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + 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: 2 + 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 + - serializedVersion: 3 + buildTarget: Android + 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: iPhone + 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: WebGL + 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: Windows Store Apps + 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/Scenes/MainMenu/ReflectionProbe-0.exr b/Assets/Scenes/MainMenu/ReflectionProbe-0.exr new file mode 100644 index 0000000..575aa9b Binary files /dev/null and b/Assets/Scenes/MainMenu/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/MainMenu/ReflectionProbe-0.exr.meta b/Assets/Scenes/MainMenu/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..e605219 --- /dev/null +++ b/Assets/Scenes/MainMenu/ReflectionProbe-0.exr.meta @@ -0,0 +1,171 @@ +fileFormatVersion: 2 +guid: 7e2d4ba148f7e7c48a6353edc1550691 +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: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 2 + 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: 100 + 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 + - serializedVersion: 3 + buildTarget: Android + 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: iPhone + 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: WebGL + 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: Windows Store Apps + 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/Scripts/DontDestroyOnLoad.cs b/Assets/Scripts/DontDestroyOnLoad.cs new file mode 100644 index 0000000..d6e6f03 --- /dev/null +++ b/Assets/Scripts/DontDestroyOnLoad.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +public class DontDestroyOnLoad : MonoBehaviour +{ + private void Awake() + { + DontDestroyOnLoad(this.gameObject); + } +} diff --git a/Assets/Scripts/DontDestroyOnLoad.cs.meta b/Assets/Scripts/DontDestroyOnLoad.cs.meta new file mode 100644 index 0000000..2affc69 --- /dev/null +++ b/Assets/Scripts/DontDestroyOnLoad.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: caa0437e2cb72944799371bab89d8c31 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GrappleHook.cs b/Assets/Scripts/GrappleHook.cs index ddb7e98..87a7160 100644 --- a/Assets/Scripts/GrappleHook.cs +++ b/Assets/Scripts/GrappleHook.cs @@ -91,15 +91,27 @@ public class GrappleHook : MonoBehaviour if(!hitMarkerRect.gameObject.activeSelf)hitMarkerRect.gameObject.SetActive(true); hitMarkerRect.anchoredPosition = WorldToUI(gameObject.transform.position + aimDir * maxGrappleDist); - if(Physics.Raycast(gameObject.transform.position, aimDir, out hit, maxGrappleDist, grappleableLayer)){ - hitMarkerRect.anchoredPosition = WorldToUI(hit.point); - hitMarkerRect.gameObject.GetComponent().color = Color.green; - - if(grappling){ - StartGrapple(hit); - }else{ - grappling = false; + if (Physics.Raycast(gameObject.transform.position, aimDir, out hit, maxGrappleDist, grappleableLayer)) { + if (hit.transform.gameObject.layer != 7) + { + hitMarkerRect.anchoredPosition = WorldToUI(hit.point); + hitMarkerRect.gameObject.GetComponent().color = Color.green; + + if (grappling) + { + StartGrapple(hit); + } + else + { + grappling = false; + } } + else + { + hitMarkerRect.anchoredPosition = WorldToUI(hit.point); + hitMarkerRect.gameObject.GetComponent().color = Color.red; + } + }else{ hitMarkerRect.gameObject.GetComponent().color = Color.red; } diff --git a/Assets/Scripts/UI/MainMenu.cs b/Assets/Scripts/UI/MainMenu.cs index fb598de..f595653 100644 --- a/Assets/Scripts/UI/MainMenu.cs +++ b/Assets/Scripts/UI/MainMenu.cs @@ -52,7 +52,7 @@ public class MainMenu : MonoBehaviour private void Update() { - Debug.Log(Input.GetKeyDown(KeyCode.Escape)); + //Debug.Log(Input.GetKeyDown(KeyCode.Escape)); if (isCreditScrolling && Input.GetKeyDown(KeyCode.Escape)) { isCreditScrolling = false; diff --git a/Assets/Shaders/CRTMaterialShader.mat b/Assets/Shaders/CRTMaterialShader.mat index 2fb5137..6278217 100644 --- a/Assets/Shaders/CRTMaterialShader.mat +++ b/Assets/Shaders/CRTMaterialShader.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: CRTMaterialShader - m_Shader: {fileID: 4800000, guid: d4c49b1ac4f8dd44d98d7885681c6d4d, type: 3} + m_Shader: {fileID: 4800000, guid: 7d830e9754227db4b89bacfdc753e135, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -118,24 +118,24 @@ Material: - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 - - u_bend: 4.03 + - u_bend: 4.47 - u_blue_offset_y: 0.0021 - u_green_offset_y: 0 - - u_noise_amount: 0.0154 - - u_noise_size: 417 + - u_noise_amount: 0.004 + - u_noise_size: 500 - u_red_offset_y: -0.0024 - - u_scanlin_transparence1: 0.005 - - u_scanlin_transparence2: 0.005 + - u_scanlin_transparence1: 0.001 + - u_scanlin_transparence2: 0.001 - u_scanline_amount: 0.143 - u_scanline_size_1: 277 - u_scanline_size_2: 521 - u_scanline_speed_1: 1569.4 - u_scanline_speed_2: 76.6 - - u_space_bend: 1.993 + - u_space_bend: 2.055 - u_time: 5.1 - - u_vignette_edge_round: 11.6 - - u_vignette_size: 1.95 - - u_vignette_smoothness: 0.82 + - u_vignette_edge_round: 58.5 + - u_vignette_size: 2 + - u_vignette_smoothness: 0.59 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Shaders/CRTShader.shader b/Assets/Shaders/CRTShader.shader index 791aab6..a2f7323 100644 --- a/Assets/Shaders/CRTShader.shader +++ b/Assets/Shaders/CRTShader.shader @@ -1,4 +1,4 @@ -Shader "CRTShaderFixed" +Shader "CRTShader" { Properties { diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 93f75fb..9b92f14 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,18 +8,18 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/MainMenu.unity guid: af63aef6e17277b44ade3df35992db53 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/Dev.unity guid: 739ca6d2c9f3b5b4a8885b94cf11f074 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/GameLogic.unity guid: 6c735b8f44735c84789efdc5bc7c8d2d - - enabled: 1 - path: Assets/Scenes/ThanksScene.unity - guid: b3991f64db889b744ba3668a4998424e - enabled: 1 path: Assets/Scenes/LevelDesign.unity guid: 4b213b8915c09ca49873cfadc143c61b + - enabled: 1 + path: Assets/Scenes/ThanksScene.unity + guid: b3991f64db889b744ba3668a4998424e m_configObjects: com.unity.input.settings: {fileID: 11400000, guid: 98320edbf6dc6f447809b5027a818f6e, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 31cf2c2..7c315eb 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: 32bit_jam_conjure + companyName: Conjure + productName: Castle Grab defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -136,12 +136,14 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + 5:4: 0 + 16:10: 0 + 16:9: 0 + Others: 0 bundleVersion: 0.1.0 - preloadedAssets: [] + preloadedAssets: + - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -816,7 +818,7 @@ PlayerSettings: webGLTemplate: APPLICATION:Minimal webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 - webGLCompressionFormat: 0 + webGLCompressionFormat: 1 webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0