diff --git a/Assets/Art Assets/Animations/Monster/Idle.anim b/Assets/Art Assets/Animations/Monster/Idle.anim index a5394fa..5b47027 100644 --- a/Assets/Art Assets/Animations/Monster/Idle.anim +++ b/Assets/Art Assets/Animations/Monster/Idle.anim @@ -17,21 +17,45 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: c2eeebd159caa2344b53b92fd3aba94b, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: bf4a6f5d22dbe1046be66641f61dc4b9, type: 3} + - time: 1 + value: {fileID: 21300000, guid: 7fbafb4ac8141c24b9b017d01a3d7f01, type: 3} + - time: 1.6666666 + value: {fileID: 21300000, guid: bf4a6f5d22dbe1046be66641f61dc4b9, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 3 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: c2eeebd159caa2344b53b92fd3aba94b, type: 3} + - {fileID: 21300000, guid: bf4a6f5d22dbe1046be66641f61dc4b9, type: 3} + - {fileID: 21300000, guid: 7fbafb4ac8141c24b9b017d01a3d7f01, type: 3} + - {fileID: 21300000, guid: bf4a6f5d22dbe1046be66641f61dc4b9, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 2 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Art Assets/Animations/Monster/Monster Idle-breathe In.controller b/Assets/Art Assets/Animations/Monster/Monster Idle-breathe In.controller index dd84329..3ad83fb 100644 --- a/Assets/Art Assets/Animations/Monster/Monster Idle-breathe In.controller +++ b/Assets/Art Assets/Animations/Monster/Monster Idle-breathe In.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-3907063939650812479 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: fe091f4063fd17242996ec29094db32b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -9,4 +35,38 @@ AnimatorController: m_Name: Monster Idle-breathe In serializedVersion: 5 m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1763186376408340028} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &1763186376408340028 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -3907063939650812479} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -3907063939650812479} diff --git a/Assets/Art Assets/Materials/Mask.mat b/Assets/Art Assets/Materials/Mask.mat index 0a72cb0..7693aa5 100644 --- a/Assets/Art Assets/Materials/Mask.mat +++ b/Assets/Art Assets/Materials/Mask.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Mask - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -19,6 +19,10 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -56,10 +60,12 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - PixelSnap: 0 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnableExternalAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -73,6 +79,8 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.32075468, g: 0.30411175, b: 0.6392157, a: 0.5882353} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe In.png b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe In.png index a00785b..939d737 100644 --- a/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe In.png +++ b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe In.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fc17662400b74b699859d4eaff9b077733d725a1dcdc509b12d5eaf24ee1218 -size 2203 +oid sha256:09fbec21bd14c977d0f11b9983c22b1f2b4893e7b3bedd0e6124997a29cb73a2 +size 2194 diff --git a/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe In.png.meta b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe In.png.meta index 9881d26..2488b71 100644 --- a/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe In.png.meta +++ b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe In.png.meta @@ -33,7 +33,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: 2 + aniso: 1 mipBias: 0 wrapU: 1 wrapV: 1 @@ -44,8 +44,8 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 7 + spritePivot: {x: 0.5, y: 0} spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 diff --git a/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Mid.png b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Mid.png new file mode 100644 index 0000000..66587e5 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Mid.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:678cecd12a07776e9db055514acb6ed045f8185990269a88742c6a12edb9ae29 +size 2190 diff --git a/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Mid.png.meta b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Mid.png.meta new file mode 100644 index 0000000..b7f7d89 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Mid.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: bf4a6f5d22dbe1046be66641f61dc4b9 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 7 + spritePivot: {x: 0.5, y: 0} + spritePixelsToUnits: 16 + 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: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + 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: 8192 + 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: 8192 + 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: 8192 + 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/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Out.png b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Out.png index fdf4c72..db45718 100644 --- a/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Out.png +++ b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Out.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbf8986939b200ba0aaf65303eb39a66c1bbc4f9d53d7d295c0f24736a07b5c6 -size 2149 +oid sha256:6181fdcb56f17d12452ac6c71782f9e7dba5eceacb7d86daad8ea06af9fd432b +size 2164 diff --git a/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Out.png.meta b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Out.png.meta index 95812c4..f648330 100644 --- a/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Out.png.meta +++ b/Assets/Art Assets/Textures/Chars/Monster/Monster Idle-breathe Out.png.meta @@ -33,7 +33,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: 2 + aniso: 1 mipBias: 0 wrapU: 1 wrapV: 1 @@ -44,8 +44,8 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 7 + spritePivot: {x: 0.5, y: 0} spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 diff --git a/Assets/Art Assets/Textures/Environ/backdrop.meta b/Assets/Art Assets/Textures/Environ/backdrop.meta new file mode 100644 index 0000000..5506c88 --- /dev/null +++ b/Assets/Art Assets/Textures/Environ/backdrop.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c0211394090e83409ae33e21a68c999 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Environ/backdrop/clouds.png.meta b/Assets/Art Assets/Textures/Environ/backdrop/clouds.png.meta new file mode 100644 index 0000000..e810cca --- /dev/null +++ b/Assets/Art Assets/Textures/Environ/backdrop/clouds.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 78baa3889d76f32468433eb1ee25ef21 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + 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: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Environ/backdrop/sky.png.meta b/Assets/Art Assets/Textures/Environ/backdrop/sky.png.meta new file mode 100644 index 0000000..e9a797d --- /dev/null +++ b/Assets/Art Assets/Textures/Environ/backdrop/sky.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: a7c69fe92097f3847aa94f42da7b6c71 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + 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: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index 2ed7828..5c5455b 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f385f33fc581a033401acee385fe82cedaf970be6044cb6933f85ac084683b05 -size 265761 +oid sha256:27b5bbbe1b767f64f4d807027699b63261d545378d2b515165cba89760345b63 +size 271582 diff --git a/Assets/Scripts/Character/CharacterInputController.cs b/Assets/Scripts/Character/CharacterInputController.cs index bb707de..447e926 100644 --- a/Assets/Scripts/Character/CharacterInputController.cs +++ b/Assets/Scripts/Character/CharacterInputController.cs @@ -14,6 +14,9 @@ public class CharacterInputController : MonoBehaviour [SerializeField] private Reference m_playerInput; + [SerializeField] + private Reference m_noInputAllowed; + [SerializeField,BoxGroup("Settings")] private float m_speed = 2.0f; @@ -37,8 +40,17 @@ public class CharacterInputController : MonoBehaviour private void Update() { - m_characterController.Move(m_movement.x * m_speed,false ,m_jump); - m_playerInput.Value = m_movement.magnitude != 0 || m_jump; + + if (!m_noInputAllowed) + { + m_characterController.Move(m_movement.x * m_speed, false, m_jump); + m_playerInput.Value = m_movement.magnitude != 0 || m_jump; + } + else + { + m_characterController.Move(0, false, false); + m_playerInput.Value = false ; + } } diff --git a/Assets/Scripts/Shaders/Image.mat b/Assets/Scripts/Shaders/Image.mat index 836be6d..ec77d72 100644 --- a/Assets/Scripts/Shaders/Image.mat +++ b/Assets/Scripts/Shaders/Image.mat @@ -68,7 +68,7 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - - _KeepColors: 0.989 + - _KeepColors: 0.925 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 diff --git a/Assets/Variables/Runtime/isNoInput.asset b/Assets/Variables/Runtime/isNoInput.asset new file mode 100644 index 0000000..4d17850 --- /dev/null +++ b/Assets/Variables/Runtime/isNoInput.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecb22b8aba55149d6ccaa0fd21d39d0fe679b567bb33be4855bcd3dfc83e5dd3 +size 463 diff --git a/Assets/Variables/Runtime/isNoInput.asset.meta b/Assets/Variables/Runtime/isNoInput.asset.meta new file mode 100644 index 0000000..ad6634d --- /dev/null +++ b/Assets/Variables/Runtime/isNoInput.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea1cffffa7e1ed34ca1fe3d3af13777c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index c31a875..cc6fdb3 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc8bf71c9cc9251063d60c600209ede412f8e764648fb3b8ebf9c484c813ba8d -size 572 +oid sha256:5357bcca9d2261b6407169d1131851508c7120dd84396b3f08abffde7144b8df +size 582