diff --git a/Assets/GrassFlowers/Post-Processing For GrassFlowers.asset b/Assets/GrassFlowers/Post-Processing For GrassFlowers.asset deleted file mode 100644 index 6a0798a..0000000 --- a/Assets/GrassFlowers/Post-Processing For GrassFlowers.asset +++ /dev/null @@ -1,375 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a3bdb2cd68f901469e7cc149151eb49, type: 3} - m_Name: Post-Processing For GrassFlowers - m_EditorClassIdentifier: - debugViews: - m_Enabled: 1 - m_Settings: - mode: 0 - depth: - scale: 1 - motionVectors: - sourceOpacity: 1 - motionImageOpacity: 0 - motionImageAmplitude: 16 - motionVectorsOpacity: 1 - motionVectorsResolution: 24 - motionVectorsAmplitude: 64 - fog: - m_Enabled: 1 - m_Settings: - excludeSkybox: 1 - antialiasing: - m_Enabled: 1 - m_Settings: - method: 0 - fxaaSettings: - preset: 1 - taaSettings: - jitterSpread: 0.75 - sharpen: 0.3 - stationaryBlending: 0.95 - motionBlending: 0.85 - ambientOcclusion: - m_Enabled: 1 - m_Settings: - intensity: 1.6 - radius: 0.3 - sampleCount: 16 - downsampling: 1 - forceForwardCompatibility: 0 - ambientOnly: 0 - highPrecision: 1 - screenSpaceReflection: - m_Enabled: 0 - m_Settings: - reflection: - blendType: 0 - reflectionQuality: 2 - maxDistance: 100 - iterationCount: 256 - stepSize: 3 - widthModifier: 0.5 - reflectionBlur: 1 - reflectBackfaces: 0 - intensity: - reflectionMultiplier: 1 - fadeDistance: 100 - fresnelFade: 1 - fresnelFadePower: 1 - screenEdgeMask: - intensity: 0.03 - depthOfField: - m_Enabled: 0 - m_Settings: - focusDistance: 10 - aperture: 5.6 - focalLength: 50 - useCameraFov: 0 - kernelSize: 1 - motionBlur: - m_Enabled: 0 - m_Settings: - shutterAngle: 270 - sampleCount: 10 - frameBlending: 0 - eyeAdaptation: - m_Enabled: 0 - m_Settings: - lowPercent: 45 - highPercent: 95 - minLuminance: -5 - maxLuminance: 1 - keyValue: 0.25 - dynamicKeyValue: 1 - adaptationType: 0 - speedUp: 2 - speedDown: 1 - logMin: -8 - logMax: 4 - bloom: - m_Enabled: 1 - m_Settings: - bloom: - intensity: 5.31 - threshold: 1.25 - softKnee: 0.678 - radius: 2.29 - antiFlicker: 0 - lensDirt: - texture: {fileID: 0} - intensity: 3 - colorGrading: - m_Enabled: 1 - m_Settings: - tonemapping: - tonemapper: 1 - neutralBlackIn: 0.02 - neutralWhiteIn: 10 - neutralBlackOut: 0 - neutralWhiteOut: 10 - neutralWhiteLevel: 5.3 - neutralWhiteClip: 10 - basic: - postExposure: 1.23 - temperature: 0 - tint: 0 - hueShift: 0 - saturation: 0.92 - contrast: 1 - channelMixer: - red: {x: 1, y: 0, z: 0} - green: {x: 0, y: 1, z: 0} - blue: {x: 0, y: 0, z: 1} - currentEditingChannel: 0 - colorWheels: - mode: 1 - log: - slope: - r: 1 - g: 1 - b: 1 - a: 0 - power: - r: 1 - g: 1 - b: 1 - a: 0 - offset: - r: 1 - g: 1 - b: 1 - a: 0 - linear: - lift: - r: 0 - g: 0 - b: 0 - a: 0 - gamma: - r: 0 - g: 0 - b: 0 - a: 0 - gain: - r: 0 - g: 0 - b: 0 - a: 0 - curves: - master: - curve: - m_Curve: - - time: 0 - value: 0 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 0 - m_Loop: 0 - m_ZeroValue: 0 - m_Range: 1 - m_InternalLoopingCurve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - red: - curve: - m_Curve: - - time: 0 - value: 0 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Loop: 0 - m_ZeroValue: 0 - m_Range: 1 - m_InternalLoopingCurve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - green: - curve: - m_Curve: - - time: 0 - value: 0 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Loop: 0 - m_ZeroValue: 0 - m_Range: 1 - m_InternalLoopingCurve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - blue: - curve: - m_Curve: - - time: 0 - value: 0 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - - time: 1 - value: 1 - inSlope: 1 - outSlope: 1 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Loop: 0 - m_ZeroValue: 0 - m_Range: 1 - m_InternalLoopingCurve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - hueVShue: - curve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Loop: 1 - m_ZeroValue: 0.5 - m_Range: 1 - m_InternalLoopingCurve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - hueVSsat: - curve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Loop: 1 - m_ZeroValue: 0.5 - m_Range: 1 - m_InternalLoopingCurve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - satVSsat: - curve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Loop: 0 - m_ZeroValue: 0.5 - m_Range: 1 - m_InternalLoopingCurve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - lumVSsat: - curve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Loop: 0 - m_ZeroValue: 0.5 - m_Range: 1 - m_InternalLoopingCurve: - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - e_CurrentEditingCurve: 0 - e_CurveY: 1 - e_CurveR: 0 - e_CurveG: 0 - e_CurveB: 0 - k__BackingField: 0 - k__BackingField: {fileID: 0} - userLut: - m_Enabled: 0 - m_Settings: - lut: {fileID: 0} - contribution: 1 - chromaticAberration: - m_Enabled: 1 - m_Settings: - spectralTexture: {fileID: 0} - intensity: 0.1 - grain: - m_Enabled: 0 - m_Settings: - colored: 1 - intensity: 0.5 - size: 1 - luminanceContribution: 0.8 - vignette: - m_Enabled: 0 - m_Settings: - mode: 0 - color: - r: 0 - g: 0 - b: 0 - a: 1 - center: {x: 0.5, y: 0.5} - intensity: 0.45 - smoothness: 0.2 - roundness: 1 - mask: {fileID: 0} - opacity: 1 - rounded: 0 - dithering: - m_Enabled: 0 - m_Settings: {} - monitors: - currentMonitorID: 0 - refreshOnPlay: 0 - histogramMode: 3 - waveformExposure: 0.12 - waveformY: 0 - waveformR: 1 - waveformG: 1 - waveformB: 1 - paradeExposure: 0.12 - vectorscopeExposure: 0.12 - vectorscopeShowBackground: 1 diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grass01.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grass01.tga deleted file mode 100644 index 9322661..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grass01.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grass01.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grass01.tga.meta deleted file mode 100644 index 18a2e08..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grass01.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: 91a1945982e98be4d9fe3e3d12fdebd8 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grass02.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grass02.tga deleted file mode 100644 index 8588e36..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grass02.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grass02.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grass02.tga.meta deleted file mode 100644 index 69aa431..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grass02.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: cf3069941001b5c46b1f13d4551d0fd9 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower01.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower01.tga deleted file mode 100644 index d67a84c..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower01.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower01.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower01.tga.meta deleted file mode 100644 index 5aa5ebe..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower01.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: 5733619f617fd954cac22d3d11fd1b93 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower02.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower02.tga deleted file mode 100644 index 3443b5e..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower02.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower02.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower02.tga.meta deleted file mode 100644 index c6e1a29..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower02.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: b0601839c4520064bb61d58d088810bc -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower03.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower03.tga deleted file mode 100644 index 1ecf288..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower03.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower03.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower03.tga.meta deleted file mode 100644 index d335559..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower03.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: c6bde8cacfa93444fa98152cb9e36815 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower04.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower04.tga deleted file mode 100644 index 7800e42..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower04.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower04.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower04.tga.meta deleted file mode 100644 index a0566c0..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower04.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: 5c744e80ad52c884c9ac4c9139b3aaae -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower05.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower05.tga deleted file mode 100644 index 8b6c832..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower05.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower05.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower05.tga.meta deleted file mode 100644 index d88a715..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower05.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: e3b33de953074bc4a88d9487f19c1202 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower06.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower06.tga deleted file mode 100644 index 0817e12..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower06.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower06.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower06.tga.meta deleted file mode 100644 index 958df76..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower06.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: b3d0250e4b7a1ac4abe98a38d34d2048 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower07.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower07.tga deleted file mode 100644 index 5ba16c6..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower07.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower07.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower07.tga.meta deleted file mode 100644 index 3308963..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower07.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: 5afd653e4d79b7a4c9523dd543c0bead -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower08.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower08.tga deleted file mode 100644 index 3e43cb8..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower08.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower08.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower08.tga.meta deleted file mode 100644 index 4efd198..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower08.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: 8900a35e436818940b97df26c3a8a1aa -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower09.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower09.tga deleted file mode 100644 index 1cabd3e..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower09.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower09.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower09.tga.meta deleted file mode 100644 index 3789d73..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower09.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: d238efbd27bc5ae4ead9839995f74830 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower10.tga b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower10.tga deleted file mode 100644 index aa61e3f..0000000 Binary files a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower10.tga and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower10.tga.meta b/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower10.tga.meta deleted file mode 100644 index 7370989..0000000 --- a/Assets/GrassFlowers/Textures/GrassFlowers/grassFlower10.tga.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: dcefc591c195a9f468e9157baa03eb4f -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers/Textures/Ground/Grass01_BigUV.png b/Assets/GrassFlowers/Textures/Ground/Grass01_BigUV.png deleted file mode 100644 index 3a04bf1..0000000 Binary files a/Assets/GrassFlowers/Textures/Ground/Grass01_BigUV.png and /dev/null differ diff --git a/Assets/GrassFlowers/Textures/Ground/Grass01_BigUV.png.meta b/Assets/GrassFlowers/Textures/Ground/Grass01_BigUV.png.meta deleted file mode 100644 index 059f5ad..0000000 --- a/Assets/GrassFlowers/Textures/Ground/Grass01_BigUV.png.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: 38bb15d6b378aff46b461e248592d1da -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GrassFlowers.meta b/Assets/HUD.meta similarity index 77% rename from Assets/GrassFlowers.meta rename to Assets/HUD.meta index 25d7220..49ee877 100644 --- a/Assets/GrassFlowers.meta +++ b/Assets/HUD.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fddee4183741fbc49afa9c9aede8575e +guid: 5caaada627970db48bb75861ba0838b8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GrassFlowers/Textures/GrassFlowers.meta b/Assets/HUD/Minimap.meta similarity index 77% rename from Assets/GrassFlowers/Textures/GrassFlowers.meta rename to Assets/HUD/Minimap.meta index 83e2058..735e219 100644 --- a/Assets/GrassFlowers/Textures/GrassFlowers.meta +++ b/Assets/HUD/Minimap.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6c0cbfdcc9b9ae64f9ddd77c2003e193 +guid: 209358740247fa649b9ebac7cb58acb3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/HUD/Minimap/Minimap.cs b/Assets/HUD/Minimap/Minimap.cs new file mode 100644 index 0000000..ac029d7 --- /dev/null +++ b/Assets/HUD/Minimap/Minimap.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Minimap : MonoBehaviour +{ + [SerializeField] private Transform player; + + private void LateUpdate() + { + Vector3 newPosition = player.position; + newPosition.y = transform.position.y; + transform.position = newPosition; + + transform.rotation = Quaternion.Euler(90f, player.eulerAngles.y, 0f); + } +} diff --git a/Assets/Scripts/EventLog.cs.meta b/Assets/HUD/Minimap/Minimap.cs.meta similarity index 83% rename from Assets/Scripts/EventLog.cs.meta rename to Assets/HUD/Minimap/Minimap.cs.meta index 881c62f..ef0e45a 100644 --- a/Assets/Scripts/EventLog.cs.meta +++ b/Assets/HUD/Minimap/Minimap.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 41974f676d374a946813f4863f75f978 +guid: cae4d204e179a7d4d87a943ab285ac92 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/HUD/Minimap/MinimapPanel.prefab b/Assets/HUD/Minimap/MinimapPanel.prefab new file mode 100644 index 0000000..1ecf122 --- /dev/null +++ b/Assets/HUD/Minimap/MinimapPanel.prefab @@ -0,0 +1,406 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1423165382543144181 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1423165382543144178} + - component: {fileID: 1423165382543144177} + - component: {fileID: 1423165382543144176} + - component: {fileID: 1423165382543144179} + m_Layer: 5 + m_Name: Minimap BorderMask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1423165382543144178 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165382543144181} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1423165384009951513} + m_Father: {fileID: 1423165382800070128} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1423165382543144177 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165382543144181} + m_CullTransparentMesh: 1 +--- !u!114 &1423165382543144176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165382543144181} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a66b22992cd93ab42a8322c679eaa976, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1423165382543144179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165382543144181} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!1 &1423165382800070131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1423165382800070128} + - component: {fileID: 1423165382800070094} + - component: {fileID: 1423165382800070129} + m_Layer: 5 + m_Name: MinimapPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1423165382800070128 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165382800070131} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1423165382543144178} + - {fileID: 1423165384424724344} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 107.9, y: -116.5} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1423165382800070094 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165382800070131} + m_CullTransparentMesh: 1 +--- !u!114 &1423165382800070129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165382800070131} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1423165384009951512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1423165384009951513} + - component: {fileID: 1423165384009951511} + - component: {fileID: 1423165384009951510} + m_Layer: 5 + m_Name: Minimap Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1423165384009951513 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165384009951512} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1423165382543144178} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1423165384009951511 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165384009951512} + m_CullTransparentMesh: 1 +--- !u!114 &1423165384009951510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165384009951512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1423165384048134169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1423165384048134166} + - component: {fileID: 1423165384048134164} + - component: {fileID: 1423165384048134167} + m_Layer: 5 + m_Name: MinimapImg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1423165384048134166 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165384048134169} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1423165384424724344} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 260, y: 260} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1423165384048134164 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165384048134169} + m_CullTransparentMesh: 1 +--- !u!114 &1423165384048134167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165384048134169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: 2528b91a6c8f85e44b612cc07ebb36ae, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!1 &1423165384424724347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1423165384424724344} + - component: {fileID: 1423165384424724343} + - component: {fileID: 1423165384424724342} + - component: {fileID: 1423165384424724345} + m_Layer: 5 + m_Name: MinimapMask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1423165384424724344 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165384424724347} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1423165384048134166} + m_Father: {fileID: 1423165382800070128} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 195, y: 195} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1423165384424724343 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165384424724347} + m_CullTransparentMesh: 1 +--- !u!114 &1423165384424724342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165384424724347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a66b22992cd93ab42a8322c679eaa976, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1423165384424724345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423165384424724347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 diff --git a/Assets/GrassFlowers/Textures.meta b/Assets/HUD/Minimap/MinimapPanel.prefab.meta similarity index 57% rename from Assets/GrassFlowers/Textures.meta rename to Assets/HUD/Minimap/MinimapPanel.prefab.meta index ccd1fbe..b5f182c 100644 --- a/Assets/GrassFlowers/Textures.meta +++ b/Assets/HUD/Minimap/MinimapPanel.prefab.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 46c1725cb7280074493bd8d9d2ab7468 -folderAsset: yes -DefaultImporter: +guid: bd3bb4da578ca0e4b9aef66f5bd76750 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/HUD/Minimap/MinimapTexture.renderTexture b/Assets/HUD/Minimap/MinimapTexture.renderTexture new file mode 100644 index 0000000..55b47d0 --- /dev/null +++ b/Assets/HUD/Minimap/MinimapTexture.renderTexture @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MinimapTexture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 200 + m_Height: 200 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 0 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/GrassFlowers/Post-Processing For GrassFlowers.asset.meta b/Assets/HUD/Minimap/MinimapTexture.renderTexture.meta similarity index 64% rename from Assets/GrassFlowers/Post-Processing For GrassFlowers.asset.meta rename to Assets/HUD/Minimap/MinimapTexture.renderTexture.meta index ba19916..bad2175 100644 --- a/Assets/GrassFlowers/Post-Processing For GrassFlowers.asset.meta +++ b/Assets/HUD/Minimap/MinimapTexture.renderTexture.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 150fbd13cfcddb34ebc82b228a769165 +guid: 2528b91a6c8f85e44b612cc07ebb36ae NativeFormatImporter: externalObjects: {} - mainObjectFileID: 0 + mainObjectFileID: 8400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/HUD/Minimap/cirlce_mask.png b/Assets/HUD/Minimap/cirlce_mask.png new file mode 100644 index 0000000..3a6f88a Binary files /dev/null and b/Assets/HUD/Minimap/cirlce_mask.png differ diff --git a/Assets/HUD/Minimap/cirlce_mask.png.meta b/Assets/HUD/Minimap/cirlce_mask.png.meta new file mode 100644 index 0000000..a5cc3bd --- /dev/null +++ b/Assets/HUD/Minimap/cirlce_mask.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: a66b22992cd93ab42a8322c679eaa976 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + 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 + 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: 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 + - 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NoFriction.physicMaterial b/Assets/NoFriction.physicMaterial new file mode 100644 index 0000000..7f2c685 --- /dev/null +++ b/Assets/NoFriction.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NoFriction + dynamicFriction: 0 + staticFriction: 0 + bounciness: 0 + frictionCombine: 0 + bounceCombine: 0 diff --git a/Assets/NoFriction.physicMaterial.meta b/Assets/NoFriction.physicMaterial.meta new file mode 100644 index 0000000..943e13f --- /dev/null +++ b/Assets/NoFriction.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa15d3dbf2db3504eab6d81839f8c74b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 13400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Cube1.obj b/Assets/Objects/Cube1.obj deleted file mode 100644 index 43b341e..0000000 --- a/Assets/Objects/Cube1.obj +++ /dev/null @@ -1,1173 +0,0 @@ -# Blender v2.93.4 OBJ File: 'Cube1.blend' -# www.blender.org -mtllib Cube1.mtl -o Cube -v 0.982000 0.982000 -1.000000 -v 0.982000 1.000000 -0.982000 -v 1.000000 0.982000 -0.982000 -v 0.982000 0.988888 -0.998630 -v 0.982000 0.994728 -0.994728 -v 0.988888 0.982000 -0.998630 -v 0.989061 0.989061 -0.996976 -v 0.988703 0.993813 -0.993813 -v 0.992392 0.992392 -0.992392 -v 0.988888 0.998630 -0.982000 -v 0.994728 0.994728 -0.982000 -v 0.982000 0.998630 -0.988888 -v 0.989061 0.996976 -0.989061 -v 0.993813 0.993813 -0.988703 -v 0.998630 0.982000 -0.988888 -v 0.994728 0.982000 -0.994728 -v 0.998630 0.988888 -0.982000 -v 0.996976 0.989061 -0.989061 -v 0.993813 0.988703 -0.993813 -v 0.982000 -1.000000 -0.982000 -v 0.982000 -0.982000 -1.000000 -v 1.000000 -0.982000 -0.982000 -v 0.982000 -0.998630 -0.988888 -v 0.982000 -0.994728 -0.994728 -v 0.988888 -0.998630 -0.982000 -v 0.989061 -0.996976 -0.989061 -v 0.988703 -0.993813 -0.993813 -v 0.992392 -0.992392 -0.992392 -v 0.988888 -0.982000 -0.998630 -v 0.994728 -0.982000 -0.994728 -v 0.982000 -0.988888 -0.998630 -v 0.989061 -0.989061 -0.996976 -v 0.993813 -0.988703 -0.993813 -v 0.998630 -0.988888 -0.982000 -v 0.994728 -0.994728 -0.982000 -v 0.998630 -0.982000 -0.988888 -v 0.996976 -0.989061 -0.989061 -v 0.993813 -0.993813 -0.988703 -v 1.000000 0.982000 0.982000 -v 0.982000 1.000000 0.982000 -v 0.982000 0.982000 1.000000 -v 0.998630 0.988888 0.982000 -v 0.994728 0.994728 0.982000 -v 0.998630 0.982000 0.988888 -v 0.996976 0.989061 0.989061 -v 0.993813 0.993813 0.988703 -v 0.992392 0.992392 0.992392 -v 0.982000 0.998630 0.988888 -v 0.982000 0.994728 0.994728 -v 0.988888 0.998630 0.982000 -v 0.989061 0.996976 0.989061 -v 0.988703 0.993813 0.993813 -v 0.988888 0.982000 0.998630 -v 0.994728 0.982000 0.994728 -v 0.982000 0.988888 0.998630 -v 0.989061 0.989061 0.996976 -v 0.993813 0.988703 0.993813 -v 1.000000 -0.982000 0.982000 -v 0.982000 -0.982000 1.000000 -v 0.982000 -1.000000 0.982000 -v 0.998630 -0.982000 0.988888 -v 0.994728 -0.982000 0.994728 -v 0.998630 -0.988888 0.982000 -v 0.996976 -0.989061 0.989061 -v 0.993813 -0.988703 0.993813 -v 0.992392 -0.992392 0.992392 -v 0.982000 -0.988888 0.998630 -v 0.982000 -0.994728 0.994728 -v 0.988888 -0.982000 0.998630 -v 0.989061 -0.989061 0.996976 -v 0.988703 -0.993813 0.993813 -v 0.988888 -0.998630 0.982000 -v 0.994728 -0.994728 0.982000 -v 0.982000 -0.998630 0.988888 -v 0.989061 -0.996976 0.989061 -v 0.993813 -0.993813 0.988703 -v -0.982000 0.982000 -1.000000 -v -1.000000 0.982000 -0.982000 -v -0.982000 1.000000 -0.982000 -v -0.988888 0.982000 -0.998630 -v -0.994728 0.982000 -0.994728 -v -0.982000 0.988888 -0.998630 -v -0.989061 0.989061 -0.996976 -v -0.993813 0.988703 -0.993813 -v -0.992392 0.992392 -0.992392 -v -0.998630 0.988888 -0.982000 -v -0.994728 0.994728 -0.982000 -v -0.998630 0.982000 -0.988888 -v -0.996976 0.989061 -0.989061 -v -0.993813 0.993813 -0.988703 -v -0.982000 0.998630 -0.988888 -v -0.982000 0.994728 -0.994728 -v -0.988888 0.998630 -0.982000 -v -0.989061 0.996976 -0.989061 -v -0.988703 0.993813 -0.993813 -v -1.000000 -0.982000 -0.982000 -v -0.982000 -0.982000 -1.000000 -v -0.982000 -1.000000 -0.982000 -v -0.998630 -0.982000 -0.988888 -v -0.994728 -0.982000 -0.994728 -v -0.998630 -0.988888 -0.982000 -v -0.996976 -0.989061 -0.989061 -v -0.993813 -0.988703 -0.993813 -v -0.992392 -0.992392 -0.992392 -v -0.982000 -0.988888 -0.998630 -v -0.982000 -0.994728 -0.994728 -v -0.988888 -0.982000 -0.998630 -v -0.989061 -0.989061 -0.996976 -v -0.988703 -0.993813 -0.993813 -v -0.988888 -0.998630 -0.982000 -v -0.994728 -0.994728 -0.982000 -v -0.982000 -0.998630 -0.988888 -v -0.989061 -0.996976 -0.989061 -v -0.993813 -0.993813 -0.988703 -v -1.000000 0.982000 0.982000 -v -0.982000 0.982000 1.000000 -v -0.982000 1.000000 0.982000 -v -0.998630 0.982000 0.988888 -v -0.994728 0.982000 0.994728 -v -0.998630 0.988888 0.982000 -v -0.996976 0.989061 0.989061 -v -0.993813 0.988703 0.993813 -v -0.992392 0.992392 0.992392 -v -0.982000 0.988888 0.998630 -v -0.982000 0.994728 0.994728 -v -0.988888 0.982000 0.998630 -v -0.989061 0.989061 0.996976 -v -0.988703 0.993813 0.993813 -v -0.988888 0.998630 0.982000 -v -0.994728 0.994728 0.982000 -v -0.982000 0.998630 0.988888 -v -0.989061 0.996976 0.989061 -v -0.993813 0.993813 0.988703 -v -0.982000 -1.000000 0.982000 -v -0.982000 -0.982000 1.000000 -v -1.000000 -0.982000 0.982000 -v -0.982000 -0.998630 0.988888 -v -0.982000 -0.994728 0.994728 -v -0.988888 -0.998630 0.982000 -v -0.989061 -0.996976 0.989061 -v -0.988703 -0.993813 0.993813 -v -0.992392 -0.992392 0.992392 -v -0.988888 -0.982000 0.998630 -v -0.994728 -0.982000 0.994728 -v -0.982000 -0.988888 0.998630 -v -0.989061 -0.989061 0.996976 -v -0.993813 -0.988703 0.993813 -v -0.998630 -0.988888 0.982000 -v -0.994728 -0.994728 0.982000 -v -0.998630 -0.982000 0.988888 -v -0.996976 -0.989061 0.989061 -v -0.993813 -0.993813 0.988703 -v 0.922533 0.922533 -0.940533 -v 0.940533 0.922533 -0.922533 -v 0.922533 0.940533 -0.922533 -v 0.929421 0.922533 -0.939163 -v 0.935261 0.922533 -0.935261 -v 0.922533 0.929421 -0.939163 -v 0.929594 0.929594 -0.937509 -v 0.934346 0.929236 -0.934346 -v 0.932925 0.932925 -0.932925 -v 0.939163 0.929421 -0.922533 -v 0.935261 0.935261 -0.922533 -v 0.939163 0.922533 -0.929421 -v 0.937509 0.929594 -0.929594 -v 0.934346 0.934346 -0.929236 -v 0.922533 0.939163 -0.929421 -v 0.922533 0.935261 -0.935261 -v 0.929421 0.939163 -0.922533 -v 0.929594 0.937509 -0.929594 -v 0.929236 0.934346 -0.934346 -v 0.922533 -0.940533 -0.922533 -v 0.940533 -0.922533 -0.922533 -v 0.922533 -0.922533 -0.940533 -v 0.929421 -0.939163 -0.922533 -v 0.935261 -0.935261 -0.922533 -v 0.922533 -0.939163 -0.929421 -v 0.929594 -0.937509 -0.929594 -v 0.934346 -0.934346 -0.929236 -v 0.932925 -0.932925 -0.932925 -v 0.939163 -0.922533 -0.929421 -v 0.935261 -0.922533 -0.935261 -v 0.939163 -0.929421 -0.922533 -v 0.937509 -0.929594 -0.929594 -v 0.934346 -0.929236 -0.934346 -v 0.922533 -0.929421 -0.939163 -v 0.922533 -0.935261 -0.935261 -v 0.929421 -0.922533 -0.939163 -v 0.929594 -0.929594 -0.937509 -v 0.929236 -0.934346 -0.934346 -v 0.940533 0.922533 0.922533 -v 0.922533 0.922533 0.940533 -v 0.922533 0.940533 0.922533 -v 0.939163 0.922533 0.929421 -v 0.935261 0.922533 0.935261 -v 0.939163 0.929421 0.922533 -v 0.937509 0.929594 0.929594 -v 0.934346 0.929236 0.934346 -v 0.932925 0.932925 0.932925 -v 0.922533 0.929421 0.939163 -v 0.922533 0.935261 0.935261 -v 0.929421 0.922533 0.939163 -v 0.929594 0.929594 0.937509 -v 0.929236 0.934346 0.934346 -v 0.929421 0.939163 0.922533 -v 0.935261 0.935261 0.922533 -v 0.922533 0.939163 0.929421 -v 0.929594 0.937509 0.929594 -v 0.934346 0.934346 0.929236 -v 0.940533 -0.922533 0.922533 -v 0.922533 -0.940533 0.922533 -v 0.922533 -0.922533 0.940533 -v 0.939163 -0.929421 0.922533 -v 0.935261 -0.935261 0.922533 -v 0.939163 -0.922533 0.929421 -v 0.937509 -0.929594 0.929594 -v 0.934346 -0.934346 0.929236 -v 0.932925 -0.932925 0.932925 -v 0.922533 -0.939163 0.929421 -v 0.922533 -0.935261 0.935261 -v 0.929421 -0.939163 0.922533 -v 0.929594 -0.937509 0.929594 -v 0.929236 -0.934346 0.934346 -v 0.929421 -0.922533 0.939163 -v 0.935261 -0.922533 0.935261 -v 0.922533 -0.929421 0.939163 -v 0.929594 -0.929594 0.937509 -v 0.934346 -0.929236 0.934346 -v -0.922533 0.922533 -0.940533 -v -0.922533 0.940533 -0.922533 -v -0.940533 0.922533 -0.922533 -v -0.922533 0.929421 -0.939163 -v -0.922533 0.935261 -0.935261 -v -0.929421 0.922533 -0.939163 -v -0.929594 0.929594 -0.937509 -v -0.929236 0.934346 -0.934346 -v -0.932925 0.932925 -0.932925 -v -0.929421 0.939163 -0.922533 -v -0.935261 0.935261 -0.922533 -v -0.922533 0.939163 -0.929421 -v -0.929594 0.937509 -0.929594 -v -0.934346 0.934346 -0.929236 -v -0.939163 0.922533 -0.929421 -v -0.935261 0.922533 -0.935261 -v -0.939163 0.929421 -0.922533 -v -0.937509 0.929594 -0.929594 -v -0.934346 0.929236 -0.934346 -v -0.940533 -0.922533 -0.922533 -v -0.922533 -0.940533 -0.922533 -v -0.922533 -0.922533 -0.940533 -v -0.939163 -0.929421 -0.922533 -v -0.935261 -0.935261 -0.922533 -v -0.939163 -0.922533 -0.929421 -v -0.937509 -0.929594 -0.929594 -v -0.934346 -0.934346 -0.929236 -v -0.932925 -0.932925 -0.932925 -v -0.922533 -0.939163 -0.929421 -v -0.922533 -0.935261 -0.935261 -v -0.929421 -0.939163 -0.922533 -v -0.929594 -0.937509 -0.929594 -v -0.929236 -0.934346 -0.934346 -v -0.929421 -0.922533 -0.939163 -v -0.935261 -0.922533 -0.935261 -v -0.922533 -0.929421 -0.939163 -v -0.929594 -0.929594 -0.937509 -v -0.934346 -0.929236 -0.934346 -v -0.940533 0.922533 0.922533 -v -0.922533 0.940533 0.922533 -v -0.922533 0.922533 0.940533 -v -0.939163 0.929421 0.922533 -v -0.935261 0.935261 0.922533 -v -0.939163 0.922533 0.929421 -v -0.937509 0.929594 0.929594 -v -0.934346 0.934346 0.929236 -v -0.932925 0.932925 0.932925 -v -0.922533 0.939163 0.929421 -v -0.922533 0.935261 0.935261 -v -0.929421 0.939163 0.922533 -v -0.929594 0.937509 0.929594 -v -0.929236 0.934346 0.934346 -v -0.929421 0.922533 0.939163 -v -0.935261 0.922533 0.935261 -v -0.922533 0.929421 0.939163 -v -0.929594 0.929594 0.937509 -v -0.934346 0.929236 0.934346 -v -0.922533 -0.940533 0.922533 -v -0.940533 -0.922533 0.922533 -v -0.922533 -0.922533 0.940533 -v -0.929421 -0.939163 0.922533 -v -0.935261 -0.935261 0.922533 -v -0.922533 -0.939163 0.929421 -v -0.929594 -0.937509 0.929594 -v -0.934346 -0.934346 0.929236 -v -0.932925 -0.932925 0.932925 -v -0.939163 -0.922533 0.929421 -v -0.935261 -0.922533 0.935261 -v -0.939163 -0.929421 0.922533 -v -0.937509 -0.929594 0.929594 -v -0.934346 -0.929236 0.934346 -v -0.922533 -0.929421 0.939163 -v -0.922533 -0.935261 0.935261 -v -0.929421 -0.922533 0.939163 -v -0.929594 -0.929594 0.937509 -v -0.929236 -0.934346 0.934346 -vt 0.127250 0.502250 -vt 0.372750 0.502250 -vt 0.372750 0.747750 -vt 0.127250 0.747750 -vt 0.377250 0.002250 -vt 0.622750 0.002250 -vt 0.622750 0.247750 -vt 0.377250 0.247750 -vt 0.377392 0.252392 -vt 0.377392 0.497608 -vt 0.622608 0.497608 -vt 0.622608 0.252392 -vt 0.377250 0.752250 -vt 0.622750 0.752250 -vt 0.622750 0.997750 -vt 0.377250 0.997750 -vt 0.627250 0.502250 -vt 0.872750 0.502250 -vt 0.872750 0.747750 -vt 0.627250 0.747750 -vt 0.377250 0.502250 -vt 0.622750 0.502250 -vt 0.622750 0.747750 -vt 0.377250 0.747750 -vt 0.127392 0.502392 -vt 0.127392 0.747608 -vt 0.372608 0.747608 -vt 0.372608 0.502392 -vt 0.377392 0.002392 -vt 0.377392 0.247608 -vt 0.622608 0.247608 -vt 0.622608 0.002392 -vt 0.377392 0.752392 -vt 0.377392 0.997608 -vt 0.622608 0.997608 -vt 0.622608 0.752392 -vt 0.627392 0.502392 -vt 0.627392 0.747608 -vt 0.872608 0.747608 -vt 0.872608 0.502392 -vt 0.377392 0.502392 -vt 0.377392 0.747608 -vt 0.622608 0.747608 -vt 0.622608 0.502392 -vt 0.622750 0.497750 -vt 0.623611 0.497750 -vt 0.623633 0.498633 -vt 0.622750 0.498611 -vt 0.625000 0.497750 -vt 0.625000 0.498588 -vt 0.623588 0.500000 -vt 0.622750 0.500000 -vt 0.624683 0.500000 -vt 0.626389 0.502250 -vt 0.626367 0.501367 -vt 0.627250 0.501389 -vt 0.625000 0.502250 -vt 0.625000 0.501412 -vt 0.626412 0.500000 -vt 0.627250 0.500000 -vt 0.622750 0.501389 -vt 0.623633 0.501367 -vt 0.623611 0.502250 -vt 0.372750 0.501389 -vt 0.373633 0.501367 -vt 0.373611 0.502250 -vt 0.372750 0.500000 -vt 0.373588 0.500000 -vt 0.375000 0.501412 -vt 0.375000 0.502250 -vt 0.375000 0.500317 -vt 0.377250 0.497750 -vt 0.377250 0.498611 -vt 0.376367 0.498633 -vt 0.376389 0.497750 -vt 0.377250 0.500000 -vt 0.376412 0.500000 -vt 0.375000 0.498588 -vt 0.375000 0.497750 -vt 0.376389 0.502250 -vt 0.376367 0.501367 -vt 0.377250 0.501389 -vt 0.623611 0.747750 -vt 0.623633 0.748633 -vt 0.622750 0.748611 -vt 0.625000 0.747750 -vt 0.625000 0.748588 -vt 0.623588 0.750000 -vt 0.622750 0.750000 -vt 0.625000 0.749683 -vt 0.627250 0.748611 -vt 0.626367 0.748633 -vt 0.626389 0.747750 -vt 0.627250 0.750000 -vt 0.626412 0.750000 -vt 0.622750 0.751389 -vt 0.623633 0.751367 -vt 0.623611 0.752250 -vt 0.625000 0.751412 -vt 0.625000 0.752250 -vt 0.377250 0.748611 -vt 0.376367 0.748633 -vt 0.376389 0.747750 -vt 0.377250 0.750000 -vt 0.376412 0.750000 -vt 0.375000 0.748588 -vt 0.375000 0.747750 -vt 0.375317 0.750000 -vt 0.376389 0.752250 -vt 0.376367 0.751367 -vt 0.377250 0.751389 -vt 0.375000 0.752250 -vt 0.375000 0.751412 -vt 0.373611 0.747750 -vt 0.373633 0.748633 -vt 0.372750 0.748611 -vt 0.373588 0.750000 -vt 0.372750 0.750000 -vt 0.622750 0.252250 -vt 0.622750 0.251389 -vt 0.623633 0.251367 -vt 0.623611 0.252250 -vt 0.622750 0.250000 -vt 0.623588 0.250000 -vt 0.625000 0.251412 -vt 0.625000 0.252250 -vt 0.624049 0.250000 -vt 0.623611 0.247750 -vt 0.623633 0.248633 -vt 0.622750 0.248611 -vt 0.625000 0.247750 -vt 0.625000 0.248588 -vt 0.625000 0.249049 -vt 0.872750 0.501389 -vt 0.873633 0.501367 -vt 0.873611 0.502250 -vt 0.872750 0.500000 -vt 0.873588 0.500000 -vt 0.875000 0.501412 -vt 0.875000 0.502250 -vt 0.874049 0.500000 -vt 0.377250 0.248611 -vt 0.376367 0.248633 -vt 0.376389 0.247750 -vt 0.377250 0.250000 -vt 0.376412 0.250000 -vt 0.375000 0.248588 -vt 0.375000 0.247750 -vt 0.375951 0.250000 -vt 0.377250 0.252250 -vt 0.376389 0.252250 -vt 0.376367 0.251367 -vt 0.377250 0.251389 -vt 0.375000 0.252250 -vt 0.375000 0.251412 -vt 0.375000 0.250951 -vt 0.126389 0.502250 -vt 0.126367 0.501367 -vt 0.127250 0.501389 -vt 0.125000 0.502250 -vt 0.125000 0.501412 -vt 0.126412 0.500000 -vt 0.127250 0.500000 -vt 0.125000 0.500951 -vt 0.622750 0.001389 -vt 0.623633 0.001367 -vt 0.623611 0.002250 -vt 0.622750 0.000000 -vt 0.623588 0.000000 -vt 0.625000 0.001412 -vt 0.625000 0.002250 -vt 0.624049 0.000000 -vt 0.623611 0.997750 -vt 0.623633 0.998633 -vt 0.622750 0.998611 -vt 0.625000 0.997750 -vt 0.625000 0.998588 -vt 0.623588 1.000000 -vt 0.622750 1.000000 -vt 0.625000 0.999049 -vt 0.873611 0.747750 -vt 0.873633 0.748633 -vt 0.872750 0.748611 -vt 0.875000 0.747750 -vt 0.875000 0.748588 -vt 0.873588 0.750000 -vt 0.872750 0.750000 -vt 0.875000 0.749049 -vt 0.127250 0.748611 -vt 0.126367 0.748633 -vt 0.126389 0.747750 -vt 0.127250 0.750000 -vt 0.126412 0.750000 -vt 0.125000 0.748588 -vt 0.125000 0.747750 -vt 0.125951 0.750000 -vt 0.377250 0.998611 -vt 0.376367 0.998633 -vt 0.376389 0.997750 -vt 0.377250 1.000000 -vt 0.376412 1.000000 -vt 0.375000 0.998588 -vt 0.375000 0.997750 -vt 0.375951 1.000000 -vt 0.376389 0.002250 -vt 0.376367 0.001367 -vt 0.377250 0.001389 -vt 0.375000 0.002250 -vt 0.375000 0.001412 -vt 0.376412 0.000000 -vt 0.377250 0.000000 -vt 0.375000 0.000951 -vt 0.622608 0.498523 -vt 0.623546 0.498546 -vt 0.623523 0.497608 -vt 0.622608 0.500000 -vt 0.623498 0.500000 -vt 0.625000 0.498499 -vt 0.625000 0.497608 -vt 0.625000 0.500337 -vt 0.623523 0.502392 -vt 0.623546 0.501454 -vt 0.622608 0.501477 -vt 0.625000 0.502392 -vt 0.625000 0.501501 -vt 0.627392 0.501477 -vt 0.626454 0.501454 -vt 0.626477 0.502392 -vt 0.627392 0.500000 -vt 0.626502 0.500000 -vt 0.373523 0.502392 -vt 0.373546 0.501454 -vt 0.372608 0.501477 -vt 0.375000 0.502392 -vt 0.375000 0.501501 -vt 0.373499 0.500000 -vt 0.372608 0.500000 -vt 0.375337 0.500000 -vt 0.377392 0.501477 -vt 0.376454 0.501454 -vt 0.376477 0.502392 -vt 0.377392 0.500000 -vt 0.376501 0.500000 -vt 0.376477 0.497608 -vt 0.376454 0.498546 -vt 0.377392 0.498523 -vt 0.375000 0.497608 -vt 0.375000 0.498499 -vt 0.622608 0.748523 -vt 0.623546 0.748546 -vt 0.623523 0.747608 -vt 0.622608 0.750000 -vt 0.623499 0.750000 -vt 0.625000 0.748498 -vt 0.625000 0.747608 -vt 0.624663 0.750000 -vt 0.623523 0.752392 -vt 0.623546 0.751454 -vt 0.622608 0.751477 -vt 0.625000 0.752392 -vt 0.625000 0.751501 -vt 0.626477 0.747608 -vt 0.626454 0.748546 -vt 0.627392 0.748523 -vt 0.626501 0.750000 -vt 0.627392 0.750000 -vt 0.376477 0.747608 -vt 0.376454 0.748546 -vt 0.377392 0.748523 -vt 0.375000 0.747608 -vt 0.375000 0.748499 -vt 0.376501 0.750000 -vt 0.377392 0.750000 -vt 0.375000 0.749663 -vt 0.372608 0.748523 -vt 0.373546 0.748546 -vt 0.373523 0.747608 -vt 0.372608 0.750000 -vt 0.373498 0.750000 -vt 0.377392 0.751477 -vt 0.376454 0.751454 -vt 0.376477 0.752392 -vt 0.375000 0.751501 -vt 0.375000 0.752392 -vt 0.623523 0.252392 -vt 0.623546 0.251454 -vt 0.622608 0.251477 -vt 0.625000 0.252392 -vt 0.625000 0.251501 -vt 0.623499 0.250000 -vt 0.622608 0.250000 -vt 0.625000 0.251011 -vt 0.873523 0.502392 -vt 0.873546 0.501454 -vt 0.872608 0.501477 -vt 0.875000 0.502392 -vt 0.875000 0.501501 -vt 0.873499 0.500000 -vt 0.872608 0.500000 -vt 0.875000 0.501011 -vt 0.622608 0.248523 -vt 0.623546 0.248546 -vt 0.623523 0.247608 -vt 0.625000 0.248499 -vt 0.625000 0.247608 -vt 0.623989 0.250000 -vt 0.376477 0.247608 -vt 0.376454 0.248546 -vt 0.377392 0.248523 -vt 0.375000 0.247608 -vt 0.375000 0.248499 -vt 0.376501 0.250000 -vt 0.377392 0.250000 -vt 0.375000 0.248989 -vt 0.127392 0.501477 -vt 0.126454 0.501454 -vt 0.126477 0.502392 -vt 0.127392 0.500000 -vt 0.126501 0.500000 -vt 0.125000 0.501501 -vt 0.125000 0.502392 -vt 0.126011 0.500000 -vt 0.377392 0.251477 -vt 0.376454 0.251454 -vt 0.376477 0.252392 -vt 0.375000 0.251501 -vt 0.375000 0.252392 -vt 0.376011 0.250000 -vt 0.623523 0.002392 -vt 0.623546 0.001454 -vt 0.622608 0.001477 -vt 0.625000 0.002392 -vt 0.625000 0.001501 -vt 0.623498 0.000000 -vt 0.622608 0.000000 -vt 0.625000 0.001011 -vt 0.872608 0.748523 -vt 0.873546 0.748546 -vt 0.873523 0.747608 -vt 0.872608 0.750000 -vt 0.873498 0.750000 -vt 0.875000 0.748499 -vt 0.875000 0.747608 -vt 0.873989 0.750000 -vt 0.622608 0.998523 -vt 0.623546 0.998546 -vt 0.623523 0.997608 -vt 0.622608 1.000000 -vt 0.623499 1.000000 -vt 0.625000 0.998499 -vt 0.625000 0.997608 -vt 0.623989 1.000000 -vt 0.126477 0.747608 -vt 0.126454 0.748546 -vt 0.127392 0.748523 -vt 0.125000 0.747608 -vt 0.125000 0.748498 -vt 0.126501 0.750000 -vt 0.127392 0.750000 -vt 0.125000 0.748989 -vt 0.377392 0.001477 -vt 0.376454 0.001454 -vt 0.376477 0.002392 -vt 0.377392 0.000000 -vt 0.376501 0.000000 -vt 0.375000 0.001501 -vt 0.375000 0.002392 -vt 0.376011 0.000000 -vt 0.376477 0.997608 -vt 0.376454 0.998546 -vt 0.377392 0.998523 -vt 0.375000 0.997608 -vt 0.375000 0.998499 -vt 0.376501 1.000000 -vt 0.377392 1.000000 -vt 0.375000 0.998989 -vn 0.0000 -1.0000 0.0000 -vn -1.0000 0.0000 0.0000 -vn 0.0000 0.0000 1.0000 -vn 0.0000 1.0000 0.0000 -vn 1.0000 0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -vn 0.2049 0.2049 -0.9571 -vn 0.1818 0.5500 -0.8152 -vn 0.5500 0.1818 -0.8152 -vn 0.4931 0.4931 -0.7167 -vn 0.2049 0.9571 -0.2049 -vn 0.5500 0.8152 -0.1818 -vn 0.1818 0.8152 -0.5500 -vn 0.4931 0.7167 -0.4931 -vn 0.9571 0.2049 -0.2049 -vn 0.8152 0.1818 -0.5500 -vn 0.8152 0.5500 -0.1818 -vn 0.7167 0.4931 -0.4931 -vn 0.2049 -0.9571 -0.2049 -vn 0.1818 -0.8152 -0.5500 -vn 0.5500 -0.8152 -0.1818 -vn 0.4931 -0.7167 -0.4931 -vn 0.2049 -0.2049 -0.9571 -vn 0.5500 -0.1818 -0.8152 -vn 0.1818 -0.5500 -0.8152 -vn 0.4931 -0.4931 -0.7167 -vn 0.9571 -0.2049 -0.2049 -vn 0.8152 -0.5500 -0.1818 -vn 0.8152 -0.1818 -0.5500 -vn 0.7167 -0.4931 -0.4931 -vn 0.9571 0.2049 0.2049 -vn 0.8152 0.5500 0.1818 -vn 0.8152 0.1818 0.5500 -vn 0.7167 0.4931 0.4931 -vn 0.2049 0.9571 0.2049 -vn 0.1818 0.8152 0.5500 -vn 0.5500 0.8152 0.1818 -vn 0.4931 0.7167 0.4931 -vn 0.2049 0.2049 0.9571 -vn 0.5500 0.1818 0.8152 -vn 0.1818 0.5500 0.8152 -vn 0.4931 0.4931 0.7167 -vn 0.9571 -0.2049 0.2049 -vn 0.8152 -0.1818 0.5500 -vn 0.8152 -0.5500 0.1818 -vn 0.7167 -0.4931 0.4931 -vn 0.2049 -0.2049 0.9571 -vn 0.1818 -0.5500 0.8152 -vn 0.5500 -0.1818 0.8152 -vn 0.4931 -0.4931 0.7167 -vn 0.2049 -0.9571 0.2049 -vn 0.5500 -0.8152 0.1818 -vn 0.1818 -0.8152 0.5500 -vn 0.4931 -0.7167 0.4931 -vn -0.2049 0.2049 -0.9571 -vn -0.5500 0.1818 -0.8152 -vn -0.1818 0.5500 -0.8152 -vn -0.4931 0.4931 -0.7167 -vn -0.9571 0.2049 -0.2049 -vn -0.8152 0.5500 -0.1818 -vn -0.8152 0.1818 -0.5500 -vn -0.7167 0.4931 -0.4931 -vn -0.2049 0.9571 -0.2049 -vn -0.1818 0.8152 -0.5500 -vn -0.5500 0.8152 -0.1818 -vn -0.4931 0.7167 -0.4931 -vn -0.9571 -0.2049 -0.2049 -vn -0.8152 -0.1818 -0.5500 -vn -0.8152 -0.5500 -0.1818 -vn -0.7167 -0.4931 -0.4931 -vn -0.2049 -0.2049 -0.9571 -vn -0.1818 -0.5500 -0.8152 -vn -0.5500 -0.1818 -0.8152 -vn -0.4931 -0.4931 -0.7167 -vn -0.2049 -0.9571 -0.2049 -vn -0.5500 -0.8152 -0.1818 -vn -0.1818 -0.8152 -0.5500 -vn -0.4931 -0.7167 -0.4931 -vn -0.9571 0.2049 0.2049 -vn -0.8152 0.1818 0.5500 -vn -0.8152 0.5500 0.1818 -vn -0.7167 0.4931 0.4931 -vn -0.2049 0.2049 0.9571 -vn -0.1818 0.5500 0.8152 -vn -0.5500 0.1818 0.8152 -vn -0.4931 0.4931 0.7167 -vn -0.2049 0.9571 0.2049 -vn -0.5500 0.8152 0.1818 -vn -0.1818 0.8152 0.5500 -vn -0.4931 0.7167 0.4931 -vn -0.2049 -0.9571 0.2049 -vn -0.1818 -0.8152 0.5500 -vn -0.5500 -0.8152 0.1818 -vn -0.4931 -0.7167 0.4931 -vn -0.2049 -0.2049 0.9571 -vn -0.5500 -0.1818 0.8152 -vn -0.1818 -0.5500 0.8152 -vn -0.4931 -0.4931 0.7167 -vn -0.9571 -0.2049 0.2049 -vn -0.8152 -0.5500 0.1818 -vn -0.8152 -0.1818 0.5500 -vn -0.7167 -0.4931 0.4931 -vn -0.1951 -0.9808 0.0000 -vn -0.5556 -0.8315 0.0000 -vn -0.8315 -0.5556 0.0000 -vn -0.9808 -0.1951 0.0000 -vn 0.0000 -0.9808 -0.1951 -vn 0.0000 -0.8315 -0.5556 -vn 0.0000 -0.5556 -0.8315 -vn 0.0000 -0.1951 -0.9808 -vn 0.9808 0.0000 -0.1951 -vn 0.8315 0.0000 -0.5556 -vn 0.5556 0.0000 -0.8315 -vn 0.1951 0.0000 -0.9808 -vn -0.1951 0.0000 0.9808 -vn -0.5556 0.0000 0.8315 -vn -0.8315 0.0000 0.5556 -vn -0.9808 0.0000 0.1951 -vn 0.1951 0.0000 0.9808 -vn 0.5556 0.0000 0.8315 -vn 0.8315 0.0000 0.5556 -vn 0.9808 0.0000 0.1951 -vn -0.1951 0.0000 -0.9808 -vn -0.5556 0.0000 -0.8315 -vn -0.8315 0.0000 -0.5556 -vn -0.9808 0.0000 -0.1951 -vn 0.0000 0.9808 0.1951 -vn 0.0000 0.8315 0.5556 -vn 0.0000 0.5556 0.8315 -vn 0.0000 0.1951 0.9808 -vn 0.1951 0.9808 0.0000 -vn 0.5556 0.8315 0.0000 -vn 0.8315 0.5556 0.0000 -vn 0.9808 0.1951 0.0000 -vn 0.0000 -0.9808 0.1951 -vn 0.0000 -0.8315 0.5556 -vn 0.0000 -0.5556 0.8315 -vn 0.0000 -0.1951 0.9808 -vn -0.1951 0.9808 0.0000 -vn -0.5556 0.8315 0.0000 -vn -0.8315 0.5556 0.0000 -vn -0.9808 0.1951 0.0000 -vn 0.0000 0.9808 -0.1951 -vn 0.0000 0.8315 -0.5556 -vn 0.0000 0.5556 -0.8315 -vn 0.0000 0.1951 -0.9808 -vn 0.1951 -0.9808 0.0000 -vn 0.5556 -0.8315 0.0000 -vn 0.8315 -0.5556 0.0000 -vn 0.9808 -0.1951 0.0000 -usemtl SurfaceCube1 -s off -f 98/1/1 20/2/1 60/3/1 134/4/1 -f 136/5/2 115/6/2 78/7/2 96/8/2 -f 250/9/3 174/10/3 153/11/3 229/12/3 -f 59/13/3 41/14/3 116/15/3 135/16/3 -f 2/17/4 79/18/4 117/19/4 40/20/4 -f 22/21/5 3/22/5 39/23/5 58/24/5 -f 249/25/4 286/26/4 211/27/4 172/28/4 -f 287/29/5 248/30/5 231/31/5 267/32/5 -f 212/33/6 288/34/6 269/35/6 192/36/6 -f 155/37/1 193/38/1 268/39/1 230/40/1 -f 173/41/2 210/42/2 191/43/2 154/44/2 -f 1/45/7 4/46/7 7/47/7 6/48/7 -f 4/46/8 5/49/8 8/50/8 7/47/8 -f 6/48/9 7/47/9 19/51/9 16/52/9 -f 7/47/10 8/50/10 9/53/10 19/51/10 -f 2/17/11 10/54/11 13/55/11 12/56/11 -f 10/54/12 11/57/12 14/58/12 13/55/12 -f 12/56/13 13/55/13 8/59/13 5/60/13 -f 13/55/14 14/58/14 9/53/14 8/59/14 -f 3/22/15 15/61/15 18/62/15 17/63/15 -f 15/61/16 16/52/16 19/51/16 18/62/16 -f 17/63/17 18/62/17 14/58/17 11/57/17 -f 18/62/18 19/51/18 9/53/18 14/58/18 -f 20/2/19 23/64/19 26/65/19 25/66/19 -f 23/64/20 24/67/20 27/68/20 26/65/20 -f 25/66/21 26/65/21 38/69/21 35/70/21 -f 26/65/22 27/68/22 28/71/22 38/69/22 -f 21/72/23 29/73/23 32/74/23 31/75/23 -f 29/73/24 30/76/24 33/77/24 32/74/24 -f 31/75/25 32/74/25 27/78/25 24/79/25 -f 32/74/26 33/77/26 28/71/26 27/78/26 -f 22/21/27 34/80/27 37/81/27 36/82/27 -f 34/80/28 35/70/28 38/69/28 37/81/28 -f 36/82/29 37/81/29 33/77/29 30/76/29 -f 37/81/30 38/69/30 28/71/30 33/77/30 -f 39/23/31 42/83/31 45/84/31 44/85/31 -f 42/83/32 43/86/32 46/87/32 45/84/32 -f 44/85/33 45/84/33 57/88/33 54/89/33 -f 45/84/34 46/87/34 47/90/34 57/88/34 -f 40/20/35 48/91/35 51/92/35 50/93/35 -f 48/91/36 49/94/36 52/95/36 51/92/36 -f 50/93/37 51/92/37 46/87/37 43/86/37 -f 51/92/38 52/95/38 47/90/38 46/87/38 -f 41/14/39 53/96/39 56/97/39 55/98/39 -f 53/96/40 54/89/40 57/88/40 56/97/40 -f 55/98/41 56/97/41 52/99/41 49/100/41 -f 56/97/42 57/88/42 47/90/42 52/99/42 -f 58/24/43 61/101/43 64/102/43 63/103/43 -f 61/101/44 62/104/44 65/105/44 64/102/44 -f 63/103/45 64/102/45 76/106/45 73/107/45 -f 64/102/46 65/105/46 66/108/46 76/106/46 -f 59/13/47 67/109/47 70/110/47 69/111/47 -f 67/109/48 68/112/48 71/113/48 70/110/48 -f 69/111/49 70/110/49 65/105/49 62/104/49 -f 70/110/50 71/113/50 66/108/50 65/105/50 -f 60/3/51 72/114/51 75/115/51 74/116/51 -f 72/114/52 73/107/52 76/106/52 75/115/52 -f 74/116/53 75/115/53 71/117/53 68/118/53 -f 75/115/54 76/106/54 66/108/54 71/117/54 -f 77/119/55 80/120/55 83/121/55 82/122/55 -f 80/120/56 81/123/56 84/124/56 83/121/56 -f 82/122/57 83/121/57 95/125/57 92/126/57 -f 83/121/58 84/124/58 85/127/58 95/125/58 -f 78/7/59 86/128/59 89/129/59 88/130/59 -f 86/128/60 87/131/60 90/132/60 89/129/60 -f 88/130/61 89/129/61 84/124/61 81/123/61 -f 89/129/62 90/132/62 85/133/62 84/124/62 -f 79/18/63 91/134/63 94/135/63 93/136/63 -f 91/134/64 92/137/64 95/138/64 94/135/64 -f 93/136/65 94/135/65 90/139/65 87/140/65 -f 94/135/66 95/138/66 85/141/66 90/139/66 -f 96/8/67 99/142/67 102/143/67 101/144/67 -f 99/142/68 100/145/68 103/146/68 102/143/68 -f 101/144/69 102/143/69 114/147/69 111/148/69 -f 102/143/70 103/146/70 104/149/70 114/147/70 -f 97/150/71 105/151/71 108/152/71 107/153/71 -f 105/151/72 106/154/72 109/155/72 108/152/72 -f 107/153/73 108/152/73 103/146/73 100/145/73 -f 108/152/74 109/155/74 104/156/74 103/146/74 -f 98/1/75 110/157/75 113/158/75 112/159/75 -f 110/157/76 111/160/76 114/161/76 113/158/76 -f 112/159/77 113/158/77 109/162/77 106/163/77 -f 113/158/78 114/161/78 104/164/78 109/162/78 -f 115/6/79 118/165/79 121/166/79 120/167/79 -f 118/165/80 119/168/80 122/169/80 121/166/80 -f 120/167/81 121/166/81 133/170/81 130/171/81 -f 121/166/82 122/169/82 123/172/82 133/170/82 -f 116/15/83 124/173/83 127/174/83 126/175/83 -f 124/173/84 125/176/84 128/177/84 127/174/84 -f 126/175/85 127/174/85 122/178/85 119/179/85 -f 127/174/86 128/177/86 123/180/86 122/178/86 -f 117/19/87 129/181/87 132/182/87 131/183/87 -f 129/181/88 130/184/88 133/185/88 132/182/88 -f 131/183/89 132/182/89 128/186/89 125/187/89 -f 132/182/90 133/185/90 123/188/90 128/186/90 -f 134/4/91 137/189/91 140/190/91 139/191/91 -f 137/189/92 138/192/92 141/193/92 140/190/92 -f 139/191/93 140/190/93 152/194/93 149/195/93 -f 140/190/94 141/193/94 142/196/94 152/194/94 -f 135/16/95 143/197/95 146/198/95 145/199/95 -f 143/197/96 144/200/96 147/201/96 146/198/96 -f 145/199/97 146/198/97 141/202/97 138/203/97 -f 146/198/98 147/201/98 142/204/98 141/202/98 -f 136/5/99 148/205/99 151/206/99 150/207/99 -f 148/205/100 149/208/100 152/209/100 151/206/100 -f 150/207/101 151/206/101 147/210/101 144/211/101 -f 151/206/102 152/209/102 142/212/102 147/210/102 -f 153/11/95 156/213/95 159/214/95 158/215/95 -f 156/213/96 157/216/96 160/217/96 159/214/96 -f 158/215/97 159/214/97 171/218/97 168/219/97 -f 159/214/98 160/217/98 161/220/98 171/218/98 -f 154/44/99 162/221/99 165/222/99 164/223/99 -f 162/221/100 163/224/100 166/225/100 165/222/100 -f 164/223/101 165/222/101 160/217/101 157/216/101 -f 165/222/102 166/225/102 161/220/102 160/217/102 -f 155/37/91 167/226/91 170/227/91 169/228/91 -f 167/226/92 168/229/92 171/230/92 170/227/92 -f 169/228/93 170/227/93 166/225/93 163/224/93 -f 170/227/94 171/230/94 161/220/94 166/225/94 -f 172/28/87 175/231/87 178/232/87 177/233/87 -f 175/231/88 176/234/88 179/235/88 178/232/88 -f 177/233/89 178/232/89 190/236/89 187/237/89 -f 178/232/90 179/235/90 180/238/90 190/236/90 -f 173/41/79 181/239/79 184/240/79 183/241/79 -f 181/239/80 182/242/80 185/243/80 184/240/80 -f 183/241/81 184/240/81 179/235/81 176/234/81 -f 184/240/82 185/243/82 180/238/82 179/235/82 -f 174/10/83 186/244/83 189/245/83 188/246/83 -f 186/244/84 187/247/84 190/248/84 189/245/84 -f 188/246/85 189/245/85 185/243/85 182/242/85 -f 189/245/86 190/248/86 180/238/86 185/243/86 -f 191/43/67 194/249/67 197/250/67 196/251/67 -f 194/249/68 195/252/68 198/253/68 197/250/68 -f 196/251/69 197/250/69 209/254/69 206/255/69 -f 197/250/70 198/253/70 199/256/70 209/254/70 -f 192/36/71 200/257/71 203/258/71 202/259/71 -f 200/257/72 201/260/72 204/261/72 203/258/72 -f 202/259/73 203/258/73 198/253/73 195/252/73 -f 203/258/74 204/261/74 199/256/74 198/253/74 -f 193/38/75 205/262/75 208/263/75 207/264/75 -f 205/262/76 206/255/76 209/254/76 208/263/76 -f 207/264/77 208/263/77 204/265/77 201/266/77 -f 208/263/78 209/254/78 199/256/78 204/265/78 -f 210/42/59 213/267/59 216/268/59 215/269/59 -f 213/267/60 214/270/60 217/271/60 216/268/60 -f 215/269/61 216/268/61 228/272/61 225/273/61 -f 216/268/62 217/271/62 218/274/62 228/272/62 -f 211/27/63 219/275/63 222/276/63 221/277/63 -f 219/275/64 220/278/64 223/279/64 222/276/64 -f 221/277/65 222/276/65 217/271/65 214/270/65 -f 222/276/66 223/279/66 218/274/66 217/271/66 -f 212/33/55 224/280/55 227/281/55 226/282/55 -f 224/280/56 225/273/56 228/272/56 227/281/56 -f 226/282/57 227/281/57 223/283/57 220/284/57 -f 227/281/58 228/272/58 218/274/58 223/283/58 -f 229/12/47 232/285/47 235/286/47 234/287/47 -f 232/285/48 233/288/48 236/289/48 235/286/48 -f 234/287/49 235/286/49 247/290/49 244/291/49 -f 235/286/50 236/289/50 237/292/50 247/290/50 -f 230/40/51 238/293/51 241/294/51 240/295/51 -f 238/293/52 239/296/52 242/297/52 241/294/52 -f 240/295/53 241/294/53 236/298/53 233/299/53 -f 241/294/54 242/297/54 237/300/54 236/298/54 -f 231/31/43 243/301/43 246/302/43 245/303/43 -f 243/301/44 244/291/44 247/290/44 246/302/44 -f 245/303/45 246/302/45 242/304/45 239/305/45 -f 246/302/46 247/290/46 237/306/46 242/304/46 -f 248/30/31 251/307/31 254/308/31 253/309/31 -f 251/307/32 252/310/32 255/311/32 254/308/32 -f 253/309/33 254/308/33 266/312/33 263/313/33 -f 254/308/34 255/311/34 256/314/34 266/312/34 -f 249/25/35 257/315/35 260/316/35 259/317/35 -f 257/315/36 258/318/36 261/319/36 260/316/36 -f 259/317/37 260/316/37 255/320/37 252/321/37 -f 260/316/38 261/319/38 256/322/38 255/320/38 -f 250/9/39 262/323/39 265/324/39 264/325/39 -f 262/323/40 263/313/40 266/312/40 265/324/40 -f 264/325/41 265/324/41 261/326/41 258/327/41 -f 265/324/42 266/312/42 256/328/42 261/326/42 -f 267/32/27 270/329/27 273/330/27 272/331/27 -f 270/329/28 271/332/28 274/333/28 273/330/28 -f 272/331/29 273/330/29 285/334/29 282/335/29 -f 273/330/30 274/333/30 275/336/30 285/334/30 -f 268/39/19 276/337/19 279/338/19 278/339/19 -f 276/337/20 277/340/20 280/341/20 279/338/20 -f 278/339/21 279/338/21 274/342/21 271/343/21 -f 279/338/22 280/341/22 275/344/22 274/342/22 -f 269/35/23 281/345/23 284/346/23 283/347/23 -f 281/345/24 282/348/24 285/349/24 284/346/24 -f 283/347/25 284/346/25 280/350/25 277/351/25 -f 284/346/26 285/349/26 275/352/26 280/350/26 -f 286/26/11 289/353/11 292/354/11 291/355/11 -f 289/353/12 290/356/12 293/357/12 292/354/12 -f 291/355/13 292/354/13 304/358/13 301/359/13 -f 292/354/14 293/357/14 294/360/14 304/358/14 -f 287/29/15 295/361/15 298/362/15 297/363/15 -f 295/361/16 296/364/16 299/365/16 298/362/16 -f 297/363/17 298/362/17 293/366/17 290/367/17 -f 298/362/18 299/365/18 294/368/18 293/366/18 -f 288/34/7 300/369/7 303/370/7 302/371/7 -f 300/369/8 301/372/8 304/373/8 303/370/8 -f 302/371/9 303/370/9 299/374/9 296/375/9 -f 303/370/10 304/373/10 294/376/10 299/374/10 -f 98/1/103 134/4/103 139/191/103 110/157/103 -f 110/157/104 139/191/104 149/195/104 111/160/104 -f 111/148/105 149/208/105 148/205/105 101/144/105 -f 101/144/106 148/205/106 136/5/106 96/8/106 -f 20/2/107 98/1/107 112/159/107 23/64/107 -f 23/64/108 112/159/108 106/163/108 24/67/108 -f 24/79/109 106/154/109 105/151/109 31/75/109 -f 31/75/110 105/151/110 97/150/110 21/72/110 -f 3/22/111 22/21/111 36/82/111 15/61/111 -f 15/61/112 36/82/112 30/76/112 16/52/112 -f 16/52/113 30/76/113 29/73/113 6/48/113 -f 6/48/114 29/73/114 21/72/114 1/45/114 -f 135/16/115 116/15/115 126/175/115 143/197/115 -f 143/197/116 126/175/116 119/179/116 144/200/116 -f 144/211/117 119/168/117 118/165/117 150/207/117 -f 150/207/118 118/165/118 115/6/118 136/5/118 -f 41/14/119 59/13/119 69/111/119 53/96/119 -f 53/96/120 69/111/120 62/104/120 54/89/120 -f 54/89/121 62/104/121 61/101/121 44/85/121 -f 44/85/122 61/101/122 58/24/122 39/23/122 -f 77/119/123 97/150/123 107/153/123 80/120/123 -f 80/120/124 107/153/124 100/145/124 81/123/124 -f 81/123/125 100/145/125 99/142/125 88/130/125 -f 88/130/126 99/142/126 96/8/126 78/7/126 -f 40/20/127 117/19/127 131/183/127 48/91/127 -f 48/91/128 131/183/128 125/187/128 49/94/128 -f 49/100/129 125/176/129 124/173/129 55/98/129 -f 55/98/130 124/173/130 116/15/130 41/14/130 -f 2/17/131 40/20/131 50/93/131 10/54/131 -f 10/54/132 50/93/132 43/86/132 11/57/132 -f 11/57/133 43/86/133 42/83/133 17/63/133 -f 17/63/134 42/83/134 39/23/134 3/22/134 -f 134/4/135 60/3/135 74/116/135 137/189/135 -f 137/189/136 74/116/136 68/118/136 138/192/136 -f 138/203/137 68/112/137 67/109/137 145/199/137 -f 145/199/138 67/109/138 59/13/138 135/16/138 -f 117/19/139 79/18/139 93/136/139 129/181/139 -f 129/181/140 93/136/140 87/140/140 130/184/140 -f 130/171/141 87/131/141 86/128/141 120/167/141 -f 120/167/142 86/128/142 78/7/142 115/6/142 -f 79/18/143 2/17/143 12/56/143 91/134/143 -f 91/134/144 12/56/144 5/60/144 92/137/144 -f 92/126/145 5/49/145 4/46/145 82/122/145 -f 82/122/146 4/46/146 1/45/146 77/119/146 -f 60/3/147 20/2/147 25/66/147 72/114/147 -f 72/114/148 25/66/148 35/70/148 73/107/148 -f 73/107/149 35/70/149 34/80/149 63/103/149 -f 63/103/150 34/80/150 22/21/150 58/24/150 -f 248/30/134 287/29/134 297/363/134 251/307/134 -f 251/307/133 297/363/133 290/367/133 252/310/133 -f 252/321/132 290/356/132 289/353/132 259/317/132 -f 259/317/131 289/353/131 286/26/131 249/25/131 -f 174/10/130 250/9/130 264/325/130 186/244/130 -f 186/244/129 264/325/129 258/327/129 187/247/129 -f 187/237/128 258/318/128 257/315/128 177/233/128 -f 177/233/127 257/315/127 249/25/127 172/28/127 -f 153/11/115 174/10/115 188/246/115 156/213/115 -f 156/213/116 188/246/116 182/242/116 157/216/116 -f 157/216/117 182/242/117 181/239/117 164/223/117 -f 164/223/118 181/239/118 173/41/118 154/44/118 -f 287/29/111 267/32/111 272/331/111 295/361/111 -f 295/361/112 272/331/112 282/335/112 296/364/112 -f 296/375/113 282/348/113 281/345/113 302/371/113 -f 302/371/114 281/345/114 269/35/114 288/34/114 -f 191/43/126 210/42/126 215/269/126 194/249/126 -f 194/249/125 215/269/125 225/273/125 195/252/125 -f 195/252/124 225/273/124 224/280/124 202/259/124 -f 202/259/123 224/280/123 212/33/123 192/36/123 -f 231/31/122 248/30/122 253/309/122 243/301/122 -f 243/301/121 253/309/121 263/313/121 244/291/121 -f 244/291/120 263/313/120 262/323/120 234/287/120 -f 234/287/119 262/323/119 250/9/119 229/12/119 -f 192/36/110 269/35/110 283/347/110 200/257/110 -f 200/257/109 283/347/109 277/351/109 201/260/109 -f 201/266/108 277/340/108 276/337/108 207/264/108 -f 207/264/107 276/337/107 268/39/107 193/38/107 -f 154/44/106 191/43/106 196/251/106 162/221/106 -f 162/221/105 196/251/105 206/255/105 163/224/105 -f 163/224/104 206/255/104 205/262/104 169/228/104 -f 169/228/103 205/262/103 193/38/103 155/37/103 -f 288/34/146 212/33/146 226/282/146 300/369/146 -f 300/369/145 226/282/145 220/284/145 301/372/145 -f 301/359/144 220/278/144 219/275/144 291/355/144 -f 291/355/143 219/275/143 211/27/143 286/26/143 -f 267/32/150 231/31/150 245/303/150 270/329/150 -f 270/329/149 245/303/149 239/305/149 271/332/149 -f 271/343/148 239/296/148 238/293/148 278/339/148 -f 278/339/147 238/293/147 230/40/147 268/39/147 -f 229/12/138 153/11/138 158/215/138 232/285/138 -f 232/285/137 158/215/137 168/219/137 233/288/137 -f 233/299/136 168/229/136 167/226/136 240/295/136 -f 240/295/135 167/226/135 155/37/135 230/40/135 -f 210/42/142 173/41/142 183/241/142 213/267/142 -f 213/267/141 183/241/141 176/234/141 214/270/141 -f 214/270/140 176/234/140 175/231/140 221/277/140 -f 221/277/139 175/231/139 172/28/139 211/27/139 -f 97/150/6 77/119/6 1/45/6 21/72/6 -o CubeInside_Cube.001 -v -0.389567 0.005587 0.587025 -v -0.389567 0.587025 -0.005587 -v -0.389567 -0.587025 0.005587 -v -0.389567 -0.005587 -0.587025 -v 0.389567 0.005587 0.587025 -v 0.389567 0.587025 -0.005587 -v 0.389567 -0.587025 0.005587 -v 0.389567 -0.005587 -0.587025 -vt 0.375000 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.250000 -vt 0.375000 0.250000 -vt 0.625000 0.500000 -vt 0.375000 0.500000 -vt 0.625000 0.750000 -vt 0.375000 0.750000 -vt 0.625000 1.000000 -vt 0.375000 1.000000 -vt 0.125000 0.500000 -vt 0.125000 0.750000 -vt 0.875000 0.500000 -vt 0.875000 0.750000 -vn -1.0000 0.0000 0.0000 -vn 0.0000 -0.7138 -0.7003 -vn 1.0000 0.0000 0.0000 -vn 0.0000 0.7138 0.7003 -vn 0.0000 -0.7003 0.7138 -vn 0.0000 0.7003 -0.7138 -usemtl Material.001 -s off -f 305/377/151 306/378/151 308/379/151 307/380/151 -f 307/380/152 308/379/152 312/381/152 311/382/152 -f 311/382/153 312/381/153 310/383/153 309/384/153 -f 309/384/154 310/383/154 306/385/154 305/386/154 -f 307/387/155 311/382/155 309/384/155 305/388/155 -f 312/381/156 308/389/156 306/390/156 310/383/156 diff --git a/Assets/Objects/ShieldEasy.obj b/Assets/Objects/ShieldEasy.obj deleted file mode 100644 index 30fb005..0000000 --- a/Assets/Objects/ShieldEasy.obj +++ /dev/null @@ -1,53 +0,0 @@ -# Blender v2.93.4 OBJ File: 'ShieldEasy.blend' -# www.blender.org -mtllib ShieldEasy.mtl -o Cube -v 0.039594 1.757440 -1.174040 -v 0.039594 -1.757440 -1.174040 -v 0.039594 1.757440 1.174040 -v 0.039594 -1.757440 1.174040 -v -0.039594 1.757440 -1.174040 -v -0.039594 -1.757440 -1.174040 -v -0.039594 1.757440 1.174040 -v -0.039594 -1.757440 1.174040 -vt 0.625000 0.500000 -vt 0.875000 0.500000 -vt 0.875000 0.750000 -vt 0.625000 0.750000 -vt 0.375000 0.750000 -vt 0.625000 1.000000 -vt 0.375000 1.000000 -vt 0.375000 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.250000 -vt 0.375000 0.250000 -vt 0.125000 0.500000 -vt 0.375000 0.500000 -vt 0.125000 0.750000 -vn 0.0000 1.0000 0.0000 -vn 0.0000 0.0000 1.0000 -vn -1.0000 0.0000 0.0000 -vn 0.0000 -1.0000 0.0000 -vn 1.0000 0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -usemtl Wood -s off -f 1/1/1 5/2/1 7/3/1 3/4/1 -f 4/5/2 3/4/2 7/6/2 8/7/2 -f 8/8/3 7/9/3 5/10/3 6/11/3 -f 6/12/4 2/13/4 4/5/4 8/14/4 -f 2/13/5 1/1/5 3/4/5 4/5/5 -f 6/11/6 5/10/6 1/1/6 2/13/6 -o Plane -v 0.050835 1.504309 1.019811 -v 0.050835 -1.495691 1.019811 -v 0.050835 1.504309 -0.980189 -v 0.050835 -1.495691 -0.980189 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vn 1.0000 -0.0000 0.0000 -usemtl Iron -s off -f 9/15/7 10/16/7 12/17/7 11/18/7 diff --git a/Assets/GrassFlowers/Textures/Ground.meta b/Assets/Objects/Warehouse.meta similarity index 77% rename from Assets/GrassFlowers/Textures/Ground.meta rename to Assets/Objects/Warehouse.meta index 62c60b8..cfba33e 100644 --- a/Assets/GrassFlowers/Textures/Ground.meta +++ b/Assets/Objects/Warehouse.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1778770213e6d284eafc7eaa31ef8f4c +guid: e492bb68ebb6d8e489959fee9a829a3a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Objects/Warehouse/Warehouse_level_1.fbx b/Assets/Objects/Warehouse/Warehouse_level_1.fbx new file mode 100644 index 0000000..dfe14ce Binary files /dev/null and b/Assets/Objects/Warehouse/Warehouse_level_1.fbx differ diff --git a/Assets/Objects/Cube1.obj.meta b/Assets/Objects/Warehouse/Warehouse_level_1.fbx.meta similarity index 97% rename from Assets/Objects/Cube1.obj.meta rename to Assets/Objects/Warehouse/Warehouse_level_1.fbx.meta index 182708c..a3db554 100644 --- a/Assets/Objects/Cube1.obj.meta +++ b/Assets/Objects/Warehouse/Warehouse_level_1.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 5d76c7ce2d446ac44925540552b4cf65 +guid: 58ed7c948063db949b6cf8b56570779b ModelImporter: - serializedVersion: 20200 + serializedVersion: 21100 internalIDToNameTable: [] externalObjects: {} materials: diff --git a/Assets/Objects/Warehouse/Warehouse_level_2.fbx b/Assets/Objects/Warehouse/Warehouse_level_2.fbx new file mode 100644 index 0000000..dbf09d1 Binary files /dev/null and b/Assets/Objects/Warehouse/Warehouse_level_2.fbx differ diff --git a/Assets/Objects/ShieldEasy.obj.meta b/Assets/Objects/Warehouse/Warehouse_level_2.fbx.meta similarity index 97% rename from Assets/Objects/ShieldEasy.obj.meta rename to Assets/Objects/Warehouse/Warehouse_level_2.fbx.meta index dda5c1d..e2ae318 100644 --- a/Assets/Objects/ShieldEasy.obj.meta +++ b/Assets/Objects/Warehouse/Warehouse_level_2.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 015170acb6b6b5545bf827b6dfd500d8 +guid: 07a788d1349d8c64890183af65f25eb6 ModelImporter: - serializedVersion: 20200 + serializedVersion: 21100 internalIDToNameTable: [] externalObjects: {} materials: diff --git a/Assets/Objects/Warehouse/Warehouse_level_4.fbx b/Assets/Objects/Warehouse/Warehouse_level_4.fbx new file mode 100644 index 0000000..e2007cd Binary files /dev/null and b/Assets/Objects/Warehouse/Warehouse_level_4.fbx differ diff --git a/Assets/Objects/terrain01.fbx.meta b/Assets/Objects/Warehouse/Warehouse_level_4.fbx.meta similarity index 97% rename from Assets/Objects/terrain01.fbx.meta rename to Assets/Objects/Warehouse/Warehouse_level_4.fbx.meta index 4bbac4d..3a6fdba 100644 --- a/Assets/Objects/terrain01.fbx.meta +++ b/Assets/Objects/Warehouse/Warehouse_level_4.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: ba77b52e38e6ecf41b467f3c2adcfafb +guid: 4effc28206419704cbfe36aa3046d68c ModelImporter: - serializedVersion: 20200 + serializedVersion: 21100 internalIDToNameTable: [] externalObjects: {} materials: diff --git a/Assets/Objects/terrain01.fbx b/Assets/Objects/terrain01.fbx deleted file mode 100644 index c021631..0000000 Binary files a/Assets/Objects/terrain01.fbx and /dev/null differ diff --git a/Assets/Prefabs/Buildings/House.prefab b/Assets/Prefabs/Buildings/House.prefab index b1a1f33..0fdac7b 100644 --- a/Assets/Prefabs/Buildings/House.prefab +++ b/Assets/Prefabs/Buildings/House.prefab @@ -52,6 +52,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -89,7 +90,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1795195828905777770} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: fa15d3dbf2db3504eab6d81839f8c74b, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 @@ -148,6 +149,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -213,7 +215,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 494189295979627311} - - component: {fileID: 8068927831030430839} - component: {fileID: 7337432708349338768} m_Layer: 0 m_Name: House @@ -238,22 +239,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &8068927831030430839 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5179206290616997027} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 --- !u!114 &7337432708349338768 MonoBehaviour: m_ObjectHideFlags: 0 @@ -268,3 +253,4 @@ MonoBehaviour: m_EditorClassIdentifier: title: House description: A place for people to live in. + buildingType: 0 diff --git a/Assets/Prefabs/Buildings/HouseConstruction.prefab b/Assets/Prefabs/Buildings/HouseConstruction.prefab index fedf1e8..07b56fb 100644 --- a/Assets/Prefabs/Buildings/HouseConstruction.prefab +++ b/Assets/Prefabs/Buildings/HouseConstruction.prefab @@ -52,6 +52,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -89,7 +90,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1874134898345004315} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: fa15d3dbf2db3504eab6d81839f8c74b, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 @@ -147,6 +148,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -199,7 +201,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 301781106009560158} - - component: {fileID: 8041566757370854614} - component: {fileID: 1315160238030080861} m_Layer: 0 m_Name: HouseConstruction @@ -224,22 +225,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &8041566757370854614 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4975262029746308050} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 --- !u!114 &1315160238030080861 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index d700a97..9a1617f 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -139,7 +139,7 @@ CapsuleCollider: m_IsTrigger: 0 m_Enabled: 1 m_Radius: 0.8 - m_Height: 3.5 + m_Height: 4 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} --- !u!54 &95348670 @@ -172,6 +172,11 @@ MonoBehaviour: m_EditorClassIdentifier: terrain: {fileID: 1417065444} prefab: {fileID: 194332003443584216, guid: 1c0b2ac83b1c14641b7e9eee6c5776b3, type: 3} +--- !u!4 &95348674 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + m_PrefabInstance: {fileID: 8390537188401440993} + m_PrefabAsset: {fileID: 0} --- !u!1 &114639927 GameObject: m_ObjectHideFlags: 0 @@ -202,7 +207,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 708126143} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -413,6 +418,7 @@ Transform: - {fileID: 1238304666} - {fileID: 1300620966} - {fileID: 763358974} + - {fileID: 1735927146} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -579,7 +585,7 @@ GameObject: - component: {fileID: 708126141} - component: {fileID: 708126140} m_Layer: 5 - m_Name: Canvas + m_Name: HUD m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -659,7 +665,6 @@ RectTransform: m_Children: - {fileID: 185435515} - {fileID: 1048269304} - - {fileID: 1690461076} - {fileID: 114639928} - {fileID: 1395840125} m_Father: {fileID: 0} @@ -704,6 +709,7 @@ MonoBehaviour: m_EditorClassIdentifier: title: New Building description: A cool new building + buildingType: 0 inventory: [] inventorySpace: 0 --- !u!65 &763358971 @@ -783,6 +789,24 @@ Transform: m_Father: {fileID: 317073667} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &958599864 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2550463727306718371, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + m_PrefabInstance: {fileID: 2075598895} + m_PrefabAsset: {fileID: 0} +--- !u!65 &958599868 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958599864} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.019743247, y: 0.019999994, z: 0.014233764} + m_Center: {x: 0.00012837116, y: 4.7271787e-17, z: -0.10644658} --- !u!1 &1048269303 GameObject: m_ObjectHideFlags: 0 @@ -875,7 +899,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f9379cc95b36d44bd902c97580c107, type: 3} m_Name: m_EditorClassIdentifier: - GamerManager: {fileID: 1861247503} --- !u!4 &1238304666 stripped Transform: m_CorrespondingSourceObject: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} @@ -964,12 +987,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 708126143} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -3.9089966} - m_SizeDelta: {x: 78.3094, y: 46.091} + m_AnchoredPosition: {x: 1.7000122, y: -0.016723633} + m_SizeDelta: {x: 72.6616, y: 13.0733} m_Pivot: {x: 0, y: 1} --- !u!114 &1395840126 MonoBehaviour: @@ -1032,14 +1055,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 12 + m_fontSizeBase: 12 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 1 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1082,6 +1105,94 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1395840124} m_CullTransparentMesh: 1 +--- !u!1 &1416366111 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1416366114} + - component: {fileID: 1416366112} + - component: {fileID: 1416366113} + m_Layer: 0 + m_Name: MinimapCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &1416366112 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416366111} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0.19326274, g: 0.48865005, b: 0.9528302, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.01 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 30 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 2528b91a6c8f85e44b612cc07ebb36ae, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &1416366113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416366111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cae4d204e179a7d4d87a943ab285ac92, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 95348674} +--- !u!4 &1416366114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416366111} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 100, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1417065444 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7029954221290272535, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} @@ -1158,105 +1269,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} m_PrefabInstance: {fileID: 1440733975} m_PrefabAsset: {fileID: 0} ---- !u!1 &1690461075 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!4 &1735927146 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + m_PrefabInstance: {fileID: 2075598895} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1690461076} - - component: {fileID: 1690461079} - - component: {fileID: 1690461078} - - component: {fileID: 1690461077} - m_Layer: 5 - m_Name: EventLog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1690461076 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1690461075} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 708126143} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -150, y: 0} - m_SizeDelta: {x: 300, y: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1690461077 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1690461075} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1690461078 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1690461075} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1690461079 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1690461075} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!1001 &1799643402 PrefabInstance: m_ObjectHideFlags: 0 @@ -1390,7 +1407,6 @@ GameObject: m_Component: - component: {fileID: 1861247505} - component: {fileID: 1861247504} - - component: {fileID: 1861247506} - component: {fileID: 1861247507} - component: {fileID: 1861247508} m_Layer: 0 @@ -1428,21 +1444,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1861247506 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1861247503} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41974f676d374a946813f4863f75f978, type: 3} - m_Name: - m_EditorClassIdentifier: - eventObject: {fileID: 8681335675325213624, guid: 240f676d062888042ac64a67d71aaa9d, type: 3} - parentEventObject: {fileID: 1690461076} - events: [] --- !u!114 &1861247507 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1468,6 +1469,103 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3f1735c997ccb39408dfa8bf3790319f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &2075598895 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 317073667} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalScale.x + value: 2.2806 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalScale.y + value: 2.0199504 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalScale.z + value: 2.2806 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalPosition.x + value: 37.743706 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalPosition.y + value: 15.2939 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalPosition.z + value: 111.99756 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8442031686558042824, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_ReceiveShadows + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1760714182489039777, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_Name + value: Warehouse_level_4 + objectReference: {fileID: 0} + - target: {fileID: 4370951913967234905, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_CastShadows + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4370951913967234905, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_ReceiveShadows + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4370951913967234905, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_DynamicOccludee + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4370951913967234905, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_LightProbeUsage + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4370951913967234905, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} --- !u!1001 &7029954222161724659 PrefabInstance: m_ObjectHideFlags: 0 @@ -1541,6 +1639,22 @@ PrefabInstance: propertyPath: mouseSensitivityY value: 600 objectReference: {fileID: 0} + - target: {fileID: 8390537187866079439, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_BackGroundColor.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8390537187866079439, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_BackGroundColor.b + value: 0.9528302 + objectReference: {fileID: 0} + - target: {fileID: 8390537187866079439, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_BackGroundColor.g + value: 0.48865005 + objectReference: {fileID: 0} + - target: {fileID: 8390537187866079439, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_BackGroundColor.r + value: 0.19326274 + objectReference: {fileID: 0} - target: {fileID: 8390537188327132961, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: interactionText value: @@ -1555,7 +1669,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: jumpForce - value: 3.5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: jumpHeight @@ -1589,6 +1703,10 @@ PrefabInstance: propertyPath: m_Name value: FirstPerson Player objectReference: {fileID: 0} + - target: {fileID: 8390537188327133021, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_TagString + value: FPSPlayer + objectReference: {fileID: 0} - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_RootOrder value: 1 @@ -1599,7 +1717,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.y - value: 25.47 + value: 25 objectReference: {fileID: 0} - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.z @@ -1635,7 +1753,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8390537189371922023, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.z - value: -18.4 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a86db7765f277243b912c20f451dc47, type: 3} diff --git a/Assets/Scripts/Building/BuildingBlueprint.cs b/Assets/Scripts/Building/BuildingBlueprint.cs index bd5a873..394b10a 100644 --- a/Assets/Scripts/Building/BuildingBlueprint.cs +++ b/Assets/Scripts/Building/BuildingBlueprint.cs @@ -5,11 +5,10 @@ using UnityEngine; public abstract class BuildingBlueprint : MonoBehaviour { public bool isColliding; - public bool followMouse = true; public GameObject constructionPrefab; private GameObject terrain; - + private Canvas hud; Ray ray; @@ -20,63 +19,115 @@ public abstract class BuildingBlueprint : MonoBehaviour private void Start() { + hud = GameObject.Find("HUD").GetComponent(); //Get HUD Canvas + terrain = GameObject.FindGameObjectWithTag("Terrain"); //Get Terrain + + //Bug Fix Blueprints already existing + //Delete/CleanUp all objs with tag "Blueprint" GameObject[] blueprints = GameObject.FindGameObjectsWithTag("Blueprint"); foreach (GameObject blueprint in blueprints) - GameObject.Destroy(blueprint); + Destroy(blueprint); - gameObject.tag = "Blueprint"; + + gameObject.tag = "Blueprint"; //Give Gameobject the tag "Blueprint" (after deleting all objs with this tag) - terrain = GameObject.FindGameObjectWithTag("Terrain"); - Init(); + hud.enabled = false; //Hide HUD + + Init(); //Call init callback function for children } - - //Collision - public void OnCollisionEnter(Collision collision) - { - isColliding = true; - - Debug.Log("Colliding True"); - } - public void OnCollisionStay(Collision collision) - { - isColliding = true; - Debug.Log("Colliding True"); - } - public void OnCollisionExit(Collision collision) - { - isColliding = false; - Debug.Log("Colliding False"); - } - - //Placing public void Update() { - if (followMouse) - { - //Following Mouse - ray = Camera.main.ScreenPointToRay(Input.mousePosition); - RaycastHit hitData; - if (terrain.GetComponent().Raycast(ray, out hitData, Mathf.Infinity)) - { - transform.position = hitData.point; - } - } - - if (Input.GetMouseButtonDown(0) && !isColliding) - { - Instantiate(constructionPrefab, transform.position, transform.rotation); - Destroy(this.gameObject); - } + FollowMouse(); + Rotate(); + //Collinding Callbacks if (isColliding) - { + { WhileColliding(); } else { WhileNotColliding(); } + + //PLACE + if (Input.GetMouseButtonDown(0) && !isColliding) + { + Place(); + } } + void FollowMouse() + { + ray = Camera.main.ScreenPointToRay(Input.mousePosition); + RaycastHit hitData; + if (terrain.GetComponent().Raycast(ray, out hitData, Mathf.Infinity)) + { + transform.position = hitData.point; + } + } + void Rotate() + { + if (Input.GetButtonDown("Rotate")) + { + Debug.Log("Rotate+"); + if (Input.GetKey(KeyCode.LeftShift)) + { + transform.Rotate(0, 5, 0); + } + else if (Input.GetKey(KeyCode.LeftControl)) + { + transform.Rotate(0, 45, 0); + } + else + { + transform.Rotate(0, 22.5f, 0); + } + + } + + if (Input.GetButtonDown("CounterRotate")) + { + Debug.Log("Rotate-"); + if (Input.GetKey(KeyCode.LeftShift)) + { + transform.Rotate(0, -5, 0); + } + else if (Input.GetKey(KeyCode.LeftControl)) + { + transform.Rotate(0, -45, 0); + } + else + { + transform.Rotate(0, -22.5f, 0); + } + + } + } + void Place() + { + Instantiate(constructionPrefab, transform.position, transform.rotation); + Destroy(this.gameObject); + hud.enabled = true; + } + + + //Collision + public void OnCollisionEnter(Collision c) + { + isColliding = true; + + Debug.Log("Colliding True"); + } + public void OnCollisionStay(Collision c) + { + isColliding = true; + Debug.Log("Colliding True"); + } + public void OnCollisionExit(Collision c) + { + isColliding = false; + Debug.Log("Colliding False"); + } } diff --git a/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs b/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs index b26daf9..415604f 100644 --- a/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs +++ b/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs @@ -14,15 +14,12 @@ public class HouseConstruction : BuildingConstruction public override void Init() { - gameManager = GameObject.Find("GameManager"); - gameManager.GetComponent().CreateEvent("Construction: House"); } public override bool CheckForResources() { if (havingWood == neededWood) { - gameManager.GetComponent().CreateEvent("Construction: House: finished"); return true; } return false; diff --git a/Assets/Scripts/Character/PlayerMovement.cs b/Assets/Scripts/Character/PlayerMovement.cs index e11bc10..59dbc69 100644 --- a/Assets/Scripts/Character/PlayerMovement.cs +++ b/Assets/Scripts/Character/PlayerMovement.cs @@ -30,6 +30,8 @@ public class PlayerMovement : MonoBehaviour Vector3 movement; + + private void Start() { rb = GetComponent(); diff --git a/Assets/Scripts/EventLog.cs b/Assets/Scripts/EventLog.cs deleted file mode 100644 index e0b30ad..0000000 --- a/Assets/Scripts/EventLog.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class EventLog : MonoBehaviour -{ - [Header("Event Log")] - [SerializeField] private GameObject eventObject; - [SerializeField] private Transform parentEventObject; - Vector3 position = new Vector3 (Screen.width-200, 134f, 0f); - [SerializeField] GameObject[] events; - void Start() - { - - - } - - // Update is called once per frame - void Update() - { - events = GameObject.FindGameObjectsWithTag("Event"); - if(events.Length <= 4) - { - switch (events.Length) - { - case 0: - position.y = 134f; - break; - case 1: - position.y = 174f; - break; - case 2: - position.y = 214f; - break; - case 3: - position.y = 254f; - break; - } - - //Relocate - - for (int i = 0; i < events.Length; i++) - { - switch (events.Length) - { - case 1: - events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); - break; - case 2: - events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); - events[1].transform.position = new Vector3(Screen.width - 200, 174f, 0f); - break; - case 3: - events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); - events[1].transform.position = new Vector3(Screen.width - 200, 174f, 0f); - events[2].transform.position = new Vector3(Screen.width - 200, 214f, 0f); - break; - case 4: - events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); - events[1].transform.position = new Vector3(Screen.width - 200, 174f, 0f); - events[2].transform.position = new Vector3(Screen.width - 200, 214f, 0f); - events[3].transform.position = new Vector3(Screen.width - 200, 254f, 0f); - break; - } - } - - - } - - } - - public void CreateEvent(string msg) - { - Instantiate(eventObject, position, Quaternion.identity, parentEventObject); - eventObject.GetComponent().ChangeText(msg); - } - -} diff --git a/Assets/Scripts/EventScript.cs b/Assets/Scripts/EventScript.cs deleted file mode 100644 index bea6d6d..0000000 --- a/Assets/Scripts/EventScript.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class EventScript : MonoBehaviour -{ - //[SerializeField] private Text text; - void Start() - { - - Invoke("Delete", 5f); - } - - // Update is called once per frame - void Update() - { - - } - - public void ChangeText(string msg) - { - Text t = GetComponentInChildren(); - t.text = msg; - } - - void Delete() - { - Destroy(this.gameObject); - } -} diff --git a/Assets/Scripts/EventScript.cs.meta b/Assets/Scripts/EventScript.cs.meta deleted file mode 100644 index 3e9d7cc..0000000 --- a/Assets/Scripts/EventScript.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9be9743e89535f6429f5773fd772d746 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/LightSwitch.cs b/Assets/Scripts/LightSwitch.cs index 1fef45d..3502939 100644 --- a/Assets/Scripts/LightSwitch.cs +++ b/Assets/Scripts/LightSwitch.cs @@ -4,7 +4,6 @@ using UnityEngine; public class LightSwitch : Interactable { - public GameObject GameManager; public Light m_Light; public bool isOn; @@ -30,14 +29,6 @@ public class LightSwitch : Interactable public override void Interact() { isOn = !isOn; - - if (isOn) { - GameManager.GetComponent().CreateEvent("Licht2"); - } - else - { - GameManager.GetComponent().CreateEvent("Licht1"); - } //Debug.Log("Click Light"); UpdateLight(); diff --git a/Assets/Scripts/TimeSwitchBtn.cs b/Assets/Scripts/TimeSwitchBtn.cs index b12eac0..5db7585 100644 --- a/Assets/Scripts/TimeSwitchBtn.cs +++ b/Assets/Scripts/TimeSwitchBtn.cs @@ -4,9 +4,8 @@ using UnityEngine; public class TimeSwitchBtn: Interactable { - public GameObject GameManager; public bool dark; - + public GameObject GameManager; public override string GetDescription() { @@ -30,12 +29,10 @@ public class TimeSwitchBtn: Interactable if (dark) { - GameManager.GetComponent().CreateEvent("Tag!"); GameManager.GetComponent().secondsOfDay = 0; } else { - GameManager.GetComponent().CreateEvent("Nacht!"); GameManager.GetComponent().secondsOfDay = 30000; } } diff --git a/Packages/manifest.json b/Packages/manifest.json index f83d9a4..44cd762 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.2d.sprite": "1.0.0", "com.unity.collab-proxy": "1.9.0", "com.unity.ide.rider": "3.0.7", "com.unity.ide.visualstudio": "2.0.11", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 316e621..9b20fb1 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,11 @@ { "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.collab-proxy": { "version": "1.9.0", "depth": 0, diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 24f8951..0f08b43 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -362,7 +362,7 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: r + positiveButton: x altNegativeButton: altPositiveButton: gravity: 1000 @@ -378,7 +378,7 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: q + positiveButton: y altNegativeButton: altPositiveButton: gravity: 1000 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index fe1188f..fe53db0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.1.22f1 -m_EditorVersionWithRevision: 2021.1.22f1 (a137e5fb0427) +m_EditorVersion: 2021.1.23f1 +m_EditorVersionWithRevision: 2021.1.23f1 (b50729e604a9) diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index b388863..2e73064 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -10,6 +10,7 @@ TagManager: - Terrain - Blueprint - StorageBuilding + - FPSPlayer layers: - Default - TransparentFX diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/UserSettings/Search.settings @@ -0,0 +1 @@ +{} \ No newline at end of file