diff --git a/Game/Assets/Images/IDLE.anim b/Game/Assets/Images/IDLE.anim deleted file mode 100644 index b1dfd53..0000000 --- a/Game/Assets/Images/IDLE.anim +++ /dev/null @@ -1,102 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: IDLE - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: - - serializedVersion: 2 - curve: - - time: 0 - value: {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.083333336 - value: {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.16666667 - value: {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.25 - value: {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.33333334 - value: {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.41666666 - value: {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.5 - value: {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.5833333 - value: {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.6666667 - value: {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.75 - value: {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.8333333 - value: {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - flags: 2 - m_SampleRate: 12 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: - - {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.9166666 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Game/Assets/Images/IdleAnim.anim b/Game/Assets/Images/IdleAnim.anim deleted file mode 100644 index 2340d7b..0000000 --- a/Game/Assets/Images/IdleAnim.anim +++ /dev/null @@ -1,108 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: IdleAnim - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: - - serializedVersion: 2 - curve: - - time: 0 - value: {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.083333336 - value: {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.16666667 - value: {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.25 - value: {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.33333334 - value: {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.41666666 - value: {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.5 - value: {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.5833333 - value: {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.6666667 - value: {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.75 - value: {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.8333333 - value: {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.9166667 - value: {fileID: -4434201147178631899, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 1 - value: {fileID: 2832486465855652433, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - flags: 2 - m_SampleRate: 12 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: - - {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -4434201147178631899, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 2832486465855652433, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1.0833334 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Game/Assets/Images/New Animation.anim b/Game/Assets/Images/New Animation.anim deleted file mode 100644 index 8e0701e..0000000 --- a/Game/Assets/Images/New Animation.anim +++ /dev/null @@ -1,108 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New Animation - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: - - serializedVersion: 2 - curve: - - time: 0 - value: {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.083333336 - value: {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.16666667 - value: {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.25 - value: {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.33333334 - value: {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.41666666 - value: {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.5 - value: {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.5833333 - value: {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.6666667 - value: {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.75 - value: {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.8333333 - value: {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 0.9166667 - value: {fileID: -4434201147178631899, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - time: 1 - value: {fileID: 2832486465855652433, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - flags: 2 - m_SampleRate: 12 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: - - {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: -4434201147178631899, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - - {fileID: 2832486465855652433, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1.0833334 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Game/Assets/Images/Tree base.PNG b/Game/Assets/Images/Tree base.PNG new file mode 100644 index 0000000..87eea21 Binary files /dev/null and b/Game/Assets/Images/Tree base.PNG differ diff --git a/Game/Assets/Images/Tree base.PNG.meta b/Game/Assets/Images/Tree base.PNG.meta new file mode 100644 index 0000000..768e6ca --- /dev/null +++ b/Game/Assets/Images/Tree base.PNG.meta @@ -0,0 +1,195 @@ +fileFormatVersion: 2 +guid: 4e5dbe3863ad35643b453144bb017a99 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8641620402995635528 + second: Tree base_0 + - first: + 213: -5523223670318519024 + second: Tree base_1 + - first: + 213: -7943099077329062254 + second: Tree base_2 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Tree base_0 + rect: + serializedVersion: 2 + x: 378 + y: 2131 + width: 9 + height: 29 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 8ba5dab570cc21880800000000000000 + internalID: -8641620402995635528 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Tree base_1 + rect: + serializedVersion: 2 + x: 387 + y: 4 + width: 1157 + height: 2156 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 01da2abc5519953b0800000000000000 + internalID: -5523223670318519024 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Tree base_2 + rect: + serializedVersion: 2 + x: 378 + y: 5 + width: 9 + height: 30 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 2967118397174c190800000000000000 + internalID: -7943099077329062254 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Tree base_0: -8641620402995635528 + Tree base_1: -5523223670318519024 + Tree base_2: -7943099077329062254 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/background draft.jpeg b/Game/Assets/Images/background draft.jpeg new file mode 100644 index 0000000..a8ea93a Binary files /dev/null and b/Game/Assets/Images/background draft.jpeg differ diff --git a/Game/Assets/Images/background draft.jpeg.meta b/Game/Assets/Images/background draft.jpeg.meta new file mode 100644 index 0000000..fb99d8a --- /dev/null +++ b/Game/Assets/Images/background draft.jpeg.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: d8072a46ef29fc44f82b16357ba64e96 +TextureImporter: + internalIDToNameTable: + - first: + 213: -3478055787618271234 + second: background draft_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: background draft_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1600 + height: 900 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: eff750e40b67bbfc0800000000000000 + internalID: -3478055787618271234 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + background draft_0: -3478055787618271234 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/idle sprites fixed 1.png b/Game/Assets/Images/idle sprites fixed 1.png new file mode 100644 index 0000000..3eb4d81 Binary files /dev/null and b/Game/Assets/Images/idle sprites fixed 1.png differ diff --git a/Game/Assets/Images/idle sprites.PNG.meta b/Game/Assets/Images/idle sprites fixed 1.png.meta similarity index 50% rename from Game/Assets/Images/idle sprites.PNG.meta rename to Game/Assets/Images/idle sprites fixed 1.png.meta index 4eae903..745fc20 100644 --- a/Game/Assets/Images/idle sprites.PNG.meta +++ b/Game/Assets/Images/idle sprites fixed 1.png.meta @@ -1,47 +1,40 @@ fileFormatVersion: 2 -guid: 538f90e730a0f7546ab3734b86c40ba9 -guid: 640e946956ffb084c8d0f325a978f7be +guid: fb533d19a165f8e449f4af11dbf4a8be TextureImporter: internalIDToNameTable: - first: - 213: -5254763888643210246 - second: idle sprites_0 + 213: -7792483657037416151 + second: idle sprites fixed_0 - first: - 213: 6308160273899767728 - second: idle sprites_1 + 213: -8279100836940419883 + second: idle sprites fixed_1 - first: - 213: -8810144250521748931 - second: idle sprites_2 + 213: 6404895348788868116 + second: idle sprites fixed_2 - first: - 213: 8716055518302679110 - second: idle sprites_3 + 213: -1544957121301416263 + second: idle sprites fixed_3 - first: - 213: -2831101797488401219 - second: idle sprites_4 + 213: 4487137833266305692 + second: idle sprites fixed_4 - first: - 213: 7011392334922980725 - second: idle sprites_5 + 213: 4653849531404390667 + second: idle sprites fixed_5 - first: - 213: 2847488349268310368 - second: idle sprites_6 + 213: 1374861269149759241 + second: idle sprites fixed_6 - first: - 213: -7052100710175725327 - second: idle sprites_7 + 213: -1479939526787242745 + second: idle sprites fixed_7 - first: - 213: 9099921138643276957 - second: idle sprites_8 + 213: 5753144094745982381 + second: idle sprites fixed_8 - first: - 213: 9079650132197346216 - second: idle sprites_9 + 213: 5052285103847608203 + second: idle sprites fixed_9 - first: - 213: -2803174831038805257 - second: idle sprites_10 - - first: - 213: -4434201147178631899 - second: idle sprites_11 - - first: - 213: 2832486465855652433 - second: idle sprites_12 + 213: 476988466753665471 + second: idle sprites fixed_10 externalObjects: {} serializedVersion: 13 mipmaps: @@ -150,352 +143,243 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: idle sprites_0 + name: idle sprites fixed_0 rect: serializedVersion: 2 - x: 0 - y: 0 - width: 174 - height: 1080 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - y: 729 - width: 6 - height: 13 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: af30fde85145317b0800000000000000 - internalID: -5254763888643210246 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites_1 - rect: - serializedVersion: 2 - x: 174 - y: 0 - width: 174 - height: 1080 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - x: 11 - y: 700 + x: 6 + y: 38 width: 156 height: 104 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 0b7c608d8561b8750800000000000000 - internalID: 6308160273899767728 + spriteID: 9297f3876698bd390800000000000000 + internalID: -7792483657037416151 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: idle sprites_2 + name: idle sprites fixed_1 rect: serializedVersion: 2 - x: 348 - y: 0 - width: 174 - height: 1080 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - x: 182 - y: 702 + x: 202 + y: 39 width: 155 height: 92 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: d3a73b77b741cb580800000000000000 - internalID: -8810144250521748931 + spriteID: 5dce68247a9ba1d80800000000000000 + internalID: -8279100836940419883 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: idle sprites_3 + name: idle sprites fixed_2 rect: serializedVersion: 2 - x: 522 - y: 0 - width: 174 - height: 1080 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - x: 343 - y: 702 + x: 410 + y: 37 width: 155 height: 87 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 640b3037056a5f870800000000000000 - internalID: 8716055518302679110 + spriteID: 414bc189262c2e850800000000000000 + internalID: 6404895348788868116 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: idle sprites_4 + name: idle sprites fixed_3 rect: serializedVersion: 2 - x: 696 - y: 0 - width: 174 - height: 1080 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - x: 506 - y: 702 + x: 609 + y: 38 width: 163 - height: 84 - alignment: 0 - pivot: {x: 0, y: 0} + height: 83 + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: db4ebbd3ae7e5b8d0800000000000000 - internalID: -2831101797488401219 + spriteID: 9b67e970fa53f8ae0800000000000000 + internalID: -1544957121301416263 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: idle sprites_5 + name: idle sprites fixed_4 rect: serializedVersion: 2 - x: 870 - y: 0 - width: 174 - height: 1080 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - x: 674 - y: 699 + x: 808 + y: 36 width: 168 - height: 81 - alignment: 0 - pivot: {x: 0, y: 0} + height: 80 + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 57d1bff3e287d4160800000000000000 - internalID: 7011392334922980725 + spriteID: c9add02e514854e30800000000000000 + internalID: 4487137833266305692 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: idle sprites_6 + name: idle sprites fixed_5 rect: serializedVersion: 2 - x: 1044 - y: 0 - width: 174 - height: 1080 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - x: 852 - y: 699 + x: 1003 + y: 35 width: 177 height: 76 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 0697338219f448720800000000000000 - internalID: 2847488349268310368 + spriteID: b011a7ddd7bc59040800000000000000 + internalID: 4653849531404390667 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: idle sprites_7 + name: idle sprites fixed_6 rect: serializedVersion: 2 - x: 1218 - y: 0 - width: 174 - height: 1080 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - x: 1045 - y: 704 + x: 1203 + y: 37 width: 182 height: 64 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 1f822b984c7e12e90800000000000000 - internalID: -7052100710175725327 + spriteID: 9073d1b3a0d741310800000000000000 + internalID: 1374861269149759241 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: idle sprites_8 + name: idle sprites fixed_7 rect: serializedVersion: 2 - x: 1392 - y: 0 - width: 174 - height: 1080 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - x: 1241 - y: 706 + x: 1411 + y: 38 width: 176 height: 68 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: d9496e8ef0a694e70800000000000000 - internalID: 9099921138643276957 + spriteID: 70569c867d2367be0800000000000000 + internalID: -1479939526787242745 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: idle sprites_9 + name: idle sprites fixed_8 rect: serializedVersion: 2 - x: 1566 - y: 0 - width: 174 - height: 1080 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - x: 1427 - y: 703 + x: 1635 + y: 40 width: 163 height: 84 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 8ab837e60b5610e70800000000000000 - internalID: 9079650132197346216 + spriteID: da578fc921647df40800000000000000 + internalID: 5753144094745982381 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: idle sprites_10 + name: idle sprites fixed_9 rect: serializedVersion: 2 - x: 1740 - y: 0 - width: 174 - height: 1080 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - x: 1596 - y: 706 - width: 154 + x: 1841 + y: 37 + width: 161 height: 92 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 7facd90d75f1919d0800000000000000 - internalID: -2803174831038805257 + spriteID: b8f85d6a8825d1640800000000000000 + internalID: 5052285103847608203 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: idle sprites_11 + name: idle sprites fixed_10 rect: serializedVersion: 2 - x: 1751 - y: 728 - width: 7 - height: 13 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 52db9cfcc8d8672c0800000000000000 - internalID: -4434201147178631899 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites_12 - rect: - serializedVersion: 2 - x: 1763 - y: 699 - width: 156 + x: 2025 + y: 38 + width: 164 height: 104 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 1528d6cfe630f4720800000000000000 - internalID: 2832486465855652433 + spriteID: fb97fcabb7a9e9600800000000000000 + internalID: 476988466753665471 vertices: [] indices: edges: [] @@ -504,8 +388,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: 26189bb86b37500408da1f12c9a366d4 - spriteID: + spriteID: fbad1284537742d408dc9b0a13c547a3 internalID: 0 vertices: [] indices: @@ -513,24 +396,19 @@ TextureImporter: weights: [] secondaryTextures: [] spriteCustomMetadata: - entries: - - key: SpriteEditor.SliceSettings - value: '{"sliceOnImport":false,"gridCellCount":{"x":11.0,"y":1.0},"gridSpriteSize":{"x":174.0,"y":1080.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.5},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":0,"pivotUnitMode":0,"slicingType":2,"keepEmptyRects":false,"isAlternate":false}' entries: [] nameFileIdTable: - idle sprites_0: -5254763888643210246 - idle sprites_1: 6308160273899767728 - idle sprites_10: -2803174831038805257 - idle sprites_11: -4434201147178631899 - idle sprites_12: 2832486465855652433 - idle sprites_2: -8810144250521748931 - idle sprites_3: 8716055518302679110 - idle sprites_4: -2831101797488401219 - idle sprites_5: 7011392334922980725 - idle sprites_6: 2847488349268310368 - idle sprites_7: -7052100710175725327 - idle sprites_8: 9099921138643276957 - idle sprites_9: 9079650132197346216 + idle sprites fixed_0: -7792483657037416151 + idle sprites fixed_1: -8279100836940419883 + idle sprites fixed_10: 476988466753665471 + idle sprites fixed_2: 6404895348788868116 + idle sprites fixed_3: -1544957121301416263 + idle sprites fixed_4: 4487137833266305692 + idle sprites fixed_5: 4653849531404390667 + idle sprites fixed_6: 1374861269149759241 + idle sprites fixed_7: -1479939526787242745 + idle sprites fixed_8: 5753144094745982381 + idle sprites fixed_9: 5052285103847608203 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Game/Assets/Images/idle sprites fixed.png b/Game/Assets/Images/idle sprites fixed.png new file mode 100644 index 0000000..3eb4d81 Binary files /dev/null and b/Game/Assets/Images/idle sprites fixed.png differ diff --git a/Game/Assets/Images/idle sprites fixed.png.meta b/Game/Assets/Images/idle sprites fixed.png.meta new file mode 100644 index 0000000..616ac20 --- /dev/null +++ b/Game/Assets/Images/idle sprites fixed.png.meta @@ -0,0 +1,416 @@ +fileFormatVersion: 2 +guid: 3f7d9158938a30f4fb279dac54851345 +TextureImporter: + internalIDToNameTable: + - first: + 213: -7792483657037416151 + second: idle sprites fixed_0 + - first: + 213: -8279100836940419883 + second: idle sprites fixed_1 + - first: + 213: 6404895348788868116 + second: idle sprites fixed_2 + - first: + 213: -1544957121301416263 + second: idle sprites fixed_3 + - first: + 213: 4487137833266305692 + second: idle sprites fixed_4 + - first: + 213: 4653849531404390667 + second: idle sprites fixed_5 + - first: + 213: 1374861269149759241 + second: idle sprites fixed_6 + - first: + 213: -1479939526787242745 + second: idle sprites fixed_7 + - first: + 213: 5753144094745982381 + second: idle sprites fixed_8 + - first: + 213: 5052285103847608203 + second: idle sprites fixed_9 + - first: + 213: 476988466753665471 + second: idle sprites fixed_10 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: idle sprites fixed_0 + rect: + serializedVersion: 2 + x: 6 + y: 38 + width: 156 + height: 104 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 9297f3876698bd390800000000000000 + internalID: -7792483657037416151 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites fixed_1 + rect: + serializedVersion: 2 + x: 202 + y: 39 + width: 155 + height: 92 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5dce68247a9ba1d80800000000000000 + internalID: -8279100836940419883 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites fixed_2 + rect: + serializedVersion: 2 + x: 410 + y: 37 + width: 155 + height: 87 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 414bc189262c2e850800000000000000 + internalID: 6404895348788868116 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites fixed_3 + rect: + serializedVersion: 2 + x: 609 + y: 38 + width: 163 + height: 83 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 9b67e970fa53f8ae0800000000000000 + internalID: -1544957121301416263 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites fixed_4 + rect: + serializedVersion: 2 + x: 808 + y: 36 + width: 168 + height: 80 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c9add02e514854e30800000000000000 + internalID: 4487137833266305692 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites fixed_5 + rect: + serializedVersion: 2 + x: 1003 + y: 35 + width: 177 + height: 76 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: b011a7ddd7bc59040800000000000000 + internalID: 4653849531404390667 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites fixed_6 + rect: + serializedVersion: 2 + x: 1203 + y: 37 + width: 182 + height: 64 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 9073d1b3a0d741310800000000000000 + internalID: 1374861269149759241 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites fixed_7 + rect: + serializedVersion: 2 + x: 1411 + y: 38 + width: 176 + height: 68 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 70569c867d2367be0800000000000000 + internalID: -1479939526787242745 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites fixed_8 + rect: + serializedVersion: 2 + x: 1635 + y: 40 + width: 163 + height: 84 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: da578fc921647df40800000000000000 + internalID: 5753144094745982381 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites fixed_9 + rect: + serializedVersion: 2 + x: 1841 + y: 37 + width: 161 + height: 92 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: b8f85d6a8825d1640800000000000000 + internalID: 5052285103847608203 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites fixed_10 + rect: + serializedVersion: 2 + x: 2025 + y: 38 + width: 164 + height: 104 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: fb97fcabb7a9e9600800000000000000 + internalID: 476988466753665471 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: fbad1284537742d408dc9b0a13c547a3 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + idle sprites fixed_0: -7792483657037416151 + idle sprites fixed_1: -8279100836940419883 + idle sprites fixed_10: 476988466753665471 + idle sprites fixed_2: 6404895348788868116 + idle sprites fixed_3: -1544957121301416263 + idle sprites fixed_4: 4487137833266305692 + idle sprites fixed_5: 4653849531404390667 + idle sprites fixed_6: 1374861269149759241 + idle sprites fixed_7: -1479939526787242745 + idle sprites fixed_8: 5753144094745982381 + idle sprites fixed_9: 5052285103847608203 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/idle sprites fixed_0.controller b/Game/Assets/Images/idle sprites fixed_0.controller new file mode 100644 index 0000000..55e8d1d --- /dev/null +++ b/Game/Assets/Images/idle sprites fixed_0.controller @@ -0,0 +1,317 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8256206867966488304 +AnimatorStateMachine: + serializedVersion: 7 + 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: 4867714824566219673} + m_Position: {x: 270, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8946204458583563640} + m_Position: {x: 530, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1292901503783358426} + m_Position: {x: 400, y: 200, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 30, y: 30, 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: 4867714824566219673} +--- !u!1101 &-3489521878920140281 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1292901503783358426} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1912279150782776439 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8946204458583563640} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-699895348011422805 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4867714824566219673} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.72727275 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-282604017707346780 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4867714824566219673} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: idle sprites fixed_0 + serializedVersion: 6 + m_AnimatorParameters: + - m_Name: WalkingRight + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: WalkingLeft + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8256206867966488304} + 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} + m_EvaluateTransitionsOnStart: 1 +--- !u!1101 &711880722001846590 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8946204458583563640} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.72727275 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1292901503783358426 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: move left + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -699895348011422805} + - {fileID: 711880722001846590} + 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: f4079fad1a3933942bab286f5825935a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &1899649019099201245 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1292901503783358426} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &4867714824566219673 +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: + - {fileID: -1912279150782776439} + - {fileID: 1899649019099201245} + 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: 9c05e7e3341328e45b70c952167a4bfd, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &8946204458583563640 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: move right + m_Speed: 1.5 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -282604017707346780} + - {fileID: -3489521878920140281} + 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: 5acd4bf343da8104a87c0c0547f97bb8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Game/Assets/Images/idle sprites_0 2.controller.meta b/Game/Assets/Images/idle sprites fixed_0.controller.meta similarity index 79% rename from Game/Assets/Images/idle sprites_0 2.controller.meta rename to Game/Assets/Images/idle sprites fixed_0.controller.meta index af3896a..a1a7b88 100644 --- a/Game/Assets/Images/idle sprites_0 2.controller.meta +++ b/Game/Assets/Images/idle sprites fixed_0.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d099f4c53e520fc41a58cecaa11501ca +guid: 3bbead65504fbb048ac08d62468d0776 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Game/Assets/Images/idle sprites.PNG b/Game/Assets/Images/idle sprites.PNG deleted file mode 100644 index 2ea3442..0000000 Binary files a/Game/Assets/Images/idle sprites.PNG and /dev/null differ diff --git a/Game/Assets/Images/idle sprites_0.controller b/Game/Assets/Images/idle sprites_0.controller deleted file mode 100644 index 608ea98..0000000 --- a/Game/Assets/Images/idle sprites_0.controller +++ /dev/null @@ -1,160 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-8599204486223594959 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New Animation 0 - 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: f2b51e043776ecd43b84ba8a0d8fd11e, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &-1055372056651480406 -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: 690f4f6ba2c1a4944ac1e7c986ca70fc, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &-249702646013297434 -AnimatorStateMachine: - serializedVersion: 7 - 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: 2181362964201342827} - m_Position: {x: 200, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: -8599204486223594959} - m_Position: {x: 235, y: 65, z: 0} - - serializedVersion: 1 - m_State: {fileID: 2450296654011153953} - m_Position: {x: 270, y: 130, z: 0} - - serializedVersion: 1 - m_State: {fileID: -1055372056651480406} - m_Position: {x: 305, y: 195, 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: 2181362964201342827} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: idle sprites_0 - serializedVersion: 6 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -249702646013297434} - 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} - m_EvaluateTransitionsOnStart: 1 ---- !u!1102 &2181362964201342827 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New Animation - 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: f2b51e043776ecd43b84ba8a0d8fd11e, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &2450296654011153953 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New Animation 1 - 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: f2b51e043776ecd43b84ba8a0d8fd11e, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Game/Assets/Images/idle.anim b/Game/Assets/Images/idle.anim new file mode 100644 index 0000000..fc5248b --- /dev/null +++ b/Game/Assets/Images/idle.anim @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: idle + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -7792483657037416151, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - time: 0.083333336 + value: {fileID: -8279100836940419883, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - time: 0.25 + value: {fileID: 6404895348788868116, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - time: 0.41666666 + value: {fileID: -1544957121301416263, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - time: 0.5 + value: {fileID: 4487137833266305692, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - time: 0.5833333 + value: {fileID: 4653849531404390667, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - time: 0.6666667 + value: {fileID: 1374861269149759241, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - time: 0.75 + value: {fileID: -1479939526787242745, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - time: 0.8333333 + value: {fileID: 5753144094745982381, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - time: 0.9166667 + value: {fileID: 5052285103847608203, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - time: 1 + value: {fileID: 476988466753665471, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -7792483657037416151, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - {fileID: -8279100836940419883, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - {fileID: 6404895348788868116, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - {fileID: -1544957121301416263, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - {fileID: 4487137833266305692, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - {fileID: 4653849531404390667, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - {fileID: 1374861269149759241, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - {fileID: -1479939526787242745, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - {fileID: 5753144094745982381, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - {fileID: 5052285103847608203, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + - {fileID: 476988466753665471, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0833334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Game/Assets/Images/New Animation.anim.meta b/Game/Assets/Images/idle.anim.meta similarity index 79% rename from Game/Assets/Images/New Animation.anim.meta rename to Game/Assets/Images/idle.anim.meta index 26d438c..3499fb4 100644 --- a/Game/Assets/Images/New Animation.anim.meta +++ b/Game/Assets/Images/idle.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f2b51e043776ecd43b84ba8a0d8fd11e +guid: 9c05e7e3341328e45b70c952167a4bfd NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Game/Assets/Images/move left sprites.PNG b/Game/Assets/Images/move left sprites.PNG new file mode 100644 index 0000000..8336eee Binary files /dev/null and b/Game/Assets/Images/move left sprites.PNG differ diff --git a/Game/Assets/Images/move left sprites.PNG.meta b/Game/Assets/Images/move left sprites.PNG.meta new file mode 100644 index 0000000..80c3515 --- /dev/null +++ b/Game/Assets/Images/move left sprites.PNG.meta @@ -0,0 +1,403 @@ +fileFormatVersion: 2 +guid: 8a09ff1ca81d40b42a0f99a6e916f734 +TextureImporter: + internalIDToNameTable: + - first: + 213: 7172997434342616088 + second: move left sprites_0 + - first: + 213: 333159453481405331 + second: move left sprites_1 + - first: + 213: 7182890312757596932 + second: move left sprites_2 + - first: + 213: -8928412750637259901 + second: move left sprites_3 + - first: + 213: -7368679760753876399 + second: move left sprites_4 + - first: + 213: -2209944899056703041 + second: move left sprites_5 + - first: + 213: 5526630993716671410 + second: move left sprites_6 + - first: + 213: 6850907481828492867 + second: move left sprites_7 + - first: + 213: -3731264425923602790 + second: move left sprites_8 + - first: + 213: 4998206906294770345 + second: move left sprites_9 + - first: + 213: -51016692038788055 + second: move left sprites_10 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: move left sprites_0 + rect: + serializedVersion: 2 + x: 6 + y: 38 + width: 157 + height: 105 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 81ca7c0992b9b8360800000000000000 + internalID: 7172997434342616088 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move left sprites_1 + rect: + serializedVersion: 2 + x: 217 + y: 37 + width: 153 + height: 94 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 39b825ef1ce9f9400800000000000000 + internalID: 333159453481405331 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move left sprites_2 + rect: + serializedVersion: 2 + x: 416 + y: 37 + width: 153 + height: 94 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 403d280dea0cea360800000000000000 + internalID: 7182890312757596932 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move left sprites_3 + rect: + serializedVersion: 2 + x: 614 + y: 37 + width: 155 + height: 84 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 383a23678e7e71480800000000000000 + internalID: -8928412750637259901 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move left sprites_4 + rect: + serializedVersion: 2 + x: 819 + y: 37 + width: 155 + height: 84 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 152a7ac6cc03db990800000000000000 + internalID: -7368679760753876399 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move left sprites_5 + rect: + serializedVersion: 2 + x: 1026 + y: 37 + width: 152 + height: 90 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: fb9e986b2d2b451e0800000000000000 + internalID: -2209944899056703041 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move left sprites_6 + rect: + serializedVersion: 2 + x: 1224 + y: 37 + width: 155 + height: 84 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 2b375218b9982bc40800000000000000 + internalID: 5526630993716671410 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move left sprites_7 + rect: + serializedVersion: 2 + x: 1426 + y: 35 + width: 154 + height: 87 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 346047b9e00531f50800000000000000 + internalID: 6850907481828492867 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move left sprites_8 + rect: + serializedVersion: 2 + x: 1629 + y: 35 + width: 154 + height: 87 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a9695c116c2e73cc0800000000000000 + internalID: -3731264425923602790 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move left sprites_9 + rect: + serializedVersion: 2 + x: 1840 + y: 37 + width: 153 + height: 94 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 9aa9a9b13b23d5540800000000000000 + internalID: 4998206906294770345 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move left sprites_10 + rect: + serializedVersion: 2 + x: 2033 + y: 39 + width: 156 + height: 104 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 92c9961c690ca4ff0800000000000000 + internalID: -51016692038788055 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 6d07bb8e8aa91674f913ccedd88a0ae1 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + move left sprites_0: 7172997434342616088 + move left sprites_1: 333159453481405331 + move left sprites_10: -51016692038788055 + move left sprites_2: 7182890312757596932 + move left sprites_3: -8928412750637259901 + move left sprites_4: -7368679760753876399 + move left sprites_5: -2209944899056703041 + move left sprites_6: 5526630993716671410 + move left sprites_7: 6850907481828492867 + move left sprites_8: -3731264425923602790 + move left sprites_9: 4998206906294770345 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/move left.anim b/Game/Assets/Images/move left.anim new file mode 100644 index 0000000..ca14e7c --- /dev/null +++ b/Game/Assets/Images/move left.anim @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: move left + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 7172997434342616088, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - time: 0.083333336 + value: {fileID: 333159453481405331, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - time: 0.16666667 + value: {fileID: 7182890312757596932, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - time: 0.25 + value: {fileID: -8928412750637259901, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - time: 0.33333334 + value: {fileID: -7368679760753876399, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - time: 0.41666666 + value: {fileID: -2209944899056703041, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - time: 0.5 + value: {fileID: 5526630993716671410, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - time: 0.5833333 + value: {fileID: 6850907481828492867, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - time: 0.6666667 + value: {fileID: -3731264425923602790, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - time: 0.75 + value: {fileID: 4998206906294770345, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - time: 0.8333333 + value: {fileID: -51016692038788055, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 7172997434342616088, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - {fileID: 333159453481405331, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - {fileID: 7182890312757596932, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - {fileID: -8928412750637259901, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - {fileID: -7368679760753876399, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - {fileID: -2209944899056703041, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - {fileID: 5526630993716671410, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - {fileID: 6850907481828492867, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - {fileID: -3731264425923602790, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - {fileID: 4998206906294770345, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + - {fileID: -51016692038788055, guid: 8a09ff1ca81d40b42a0f99a6e916f734, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.9166666 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Game/Assets/Images/IDLE.anim.meta b/Game/Assets/Images/move left.anim.meta similarity index 79% rename from Game/Assets/Images/IDLE.anim.meta rename to Game/Assets/Images/move left.anim.meta index e603a2c..2728695 100644 --- a/Game/Assets/Images/IDLE.anim.meta +++ b/Game/Assets/Images/move left.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 690f4f6ba2c1a4944ac1e7c986ca70fc +guid: f4079fad1a3933942bab286f5825935a NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Game/Assets/Images/move right sprites.PNG b/Game/Assets/Images/move right sprites.PNG new file mode 100644 index 0000000..3c0488c Binary files /dev/null and b/Game/Assets/Images/move right sprites.PNG differ diff --git a/Game/Assets/Images/move right sprites.PNG.meta b/Game/Assets/Images/move right sprites.PNG.meta new file mode 100644 index 0000000..2400119 --- /dev/null +++ b/Game/Assets/Images/move right sprites.PNG.meta @@ -0,0 +1,403 @@ +fileFormatVersion: 2 +guid: 6abb4553219fdaf4fa2be630c5261d82 +TextureImporter: + internalIDToNameTable: + - first: + 213: 2405516605127754082 + second: move right sprites_0 + - first: + 213: -973246071042092853 + second: move right sprites_1 + - first: + 213: -5261284432256797041 + second: move right sprites_2 + - first: + 213: 8121817319359148187 + second: move right sprites_3 + - first: + 213: 2355488530663706863 + second: move right sprites_4 + - first: + 213: -8288327958169655737 + second: move right sprites_5 + - first: + 213: 6193587568908039515 + second: move right sprites_6 + - first: + 213: -2746542838842709361 + second: move right sprites_7 + - first: + 213: -5930012053502843775 + second: move right sprites_8 + - first: + 213: 7993214736094113718 + second: move right sprites_9 + - first: + 213: 7053751462238987933 + second: move right sprites_10 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: move right sprites_0 + rect: + serializedVersion: 2 + x: 6 + y: 38 + width: 157 + height: 105 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 26181fd7b9c126120800000000000000 + internalID: 2405516605127754082 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move right sprites_1 + rect: + serializedVersion: 2 + x: 203 + y: 37 + width: 153 + height: 94 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: bc0dd78dad55e72f0800000000000000 + internalID: -973246071042092853 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move right sprites_2 + rect: + serializedVersion: 2 + x: 413 + y: 35 + width: 154 + height: 87 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f867a013fa92cf6b0800000000000000 + internalID: -5261284432256797041 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move right sprites_3 + rect: + serializedVersion: 2 + x: 616 + y: 35 + width: 154 + height: 87 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: b90740b12dd76b070800000000000000 + internalID: 8121817319359148187 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move right sprites_4 + rect: + serializedVersion: 2 + x: 817 + y: 37 + width: 155 + height: 84 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: fe097b6b65060b020800000000000000 + internalID: 2355488530663706863 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move right sprites_5 + rect: + serializedVersion: 2 + x: 1018 + y: 37 + width: 152 + height: 90 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 746eb5fa2a1f9fc80800000000000000 + internalID: -8288327958169655737 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move right sprites_6 + rect: + serializedVersion: 2 + x: 1222 + y: 37 + width: 155 + height: 84 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: b55f902341b04f550800000000000000 + internalID: 6193587568908039515 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move right sprites_7 + rect: + serializedVersion: 2 + x: 1427 + y: 37 + width: 155 + height: 84 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f8a236207d152e9d0800000000000000 + internalID: -2746542838842709361 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move right sprites_8 + rect: + serializedVersion: 2 + x: 1627 + y: 37 + width: 153 + height: 94 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 184ad25b47d54bda0800000000000000 + internalID: -5930012053502843775 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move right sprites_9 + rect: + serializedVersion: 2 + x: 1826 + y: 37 + width: 153 + height: 94 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 6bfae4ed37a9dee60800000000000000 + internalID: 7993214736094113718 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: move right sprites_10 + rect: + serializedVersion: 2 + x: 2033 + y: 39 + width: 156 + height: 104 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d96a5a02595f3e160800000000000000 + internalID: 7053751462238987933 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5d16670ec301db74292b69968c165e98 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + move right sprites_0: 2405516605127754082 + move right sprites_1: -973246071042092853 + move right sprites_10: 7053751462238987933 + move right sprites_2: -5261284432256797041 + move right sprites_3: 8121817319359148187 + move right sprites_4: 2355488530663706863 + move right sprites_5: -8288327958169655737 + move right sprites_6: 6193587568908039515 + move right sprites_7: -2746542838842709361 + move right sprites_8: -5930012053502843775 + move right sprites_9: 7993214736094113718 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/idle sprites_0 1.controller b/Game/Assets/Images/move right sprites_0 1.controller similarity index 83% rename from Game/Assets/Images/idle sprites_0 1.controller rename to Game/Assets/Images/move right sprites_0 1.controller index d20b37b..8cf548d 100644 --- a/Game/Assets/Images/idle sprites_0 1.controller +++ b/Game/Assets/Images/move right sprites_0 1.controller @@ -1,13 +1,35 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-8470273330122212232 +--- !u!1107 &-7774158709629541209 +AnimatorStateMachine: + serializedVersion: 7 + 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: -5760614348152409442} + 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: -5760614348152409442} +--- !u!1102 &-5760614348152409442 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: IDLE + m_Name: move right m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -20,47 +42,25 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 690f4f6ba2c1a4944ac1e7c986ca70fc, type: 2} + m_Motion: {fileID: 7400000, guid: 5acd4bf343da8104a87c0c0547f97bb8, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1107 &-3480220879903128428 -AnimatorStateMachine: - serializedVersion: 7 - 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: -8470273330122212232} - 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: -8470273330122212232} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: idle sprites_0 1 + m_Name: move right sprites_0 1 serializedVersion: 6 m_AnimatorParameters: [] m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer - m_StateMachine: {fileID: -3480220879903128428} + m_StateMachine: {fileID: -7774158709629541209} m_Mask: {fileID: 0} m_Motions: [] m_Behaviours: [] diff --git a/Game/Assets/Images/idle sprites_0.controller.meta b/Game/Assets/Images/move right sprites_0 1.controller.meta similarity index 79% rename from Game/Assets/Images/idle sprites_0.controller.meta rename to Game/Assets/Images/move right sprites_0 1.controller.meta index 597d2d1..e8afe4d 100644 --- a/Game/Assets/Images/idle sprites_0.controller.meta +++ b/Game/Assets/Images/move right sprites_0 1.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 68a5ea0278ade9b46a889ab648eb07d2 +guid: 1b9cd543cfe14be4c919145d10a08375 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Game/Assets/Images/idle sprites_0 2.controller b/Game/Assets/Images/move right sprites_0.controller similarity index 83% rename from Game/Assets/Images/idle sprites_0 2.controller rename to Game/Assets/Images/move right sprites_0.controller index be3db1d..77eaae4 100644 --- a/Game/Assets/Images/idle sprites_0 2.controller +++ b/Game/Assets/Images/move right sprites_0.controller @@ -1,58 +1,13 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-3393340397108767926 -AnimatorStateMachine: - serializedVersion: 7 - 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: 3384176208710211919} - 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: 3384176208710211919} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: idle sprites_0 2 - serializedVersion: 6 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -3393340397108767926} - 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} - m_EvaluateTransitionsOnStart: 1 ---- !u!1102 &3384176208710211919 +--- !u!1102 &-9184444648078489840 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: IdleAnim + m_Name: moving right m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -65,9 +20,54 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 155766a386f1556489b5dd4391116403, type: 2} + m_Motion: {fileID: 7400000, guid: 5ae3c02690a25f24295ce15bc9e8f1fd, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1107 &-8757819097493796775 +AnimatorStateMachine: + serializedVersion: 7 + 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: -9184444648078489840} + 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: -9184444648078489840} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: move right sprites_0 + serializedVersion: 6 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8757819097493796775} + 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} + m_EvaluateTransitionsOnStart: 1 diff --git a/Game/Assets/Images/idle sprites_0 1.controller.meta b/Game/Assets/Images/move right sprites_0.controller.meta similarity index 79% rename from Game/Assets/Images/idle sprites_0 1.controller.meta rename to Game/Assets/Images/move right sprites_0.controller.meta index 1496810..7e6ca84 100644 --- a/Game/Assets/Images/idle sprites_0 1.controller.meta +++ b/Game/Assets/Images/move right sprites_0.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 45af239697c23ba4193cb2d9284303b4 +guid: 086ea77f6db6a9a428edbac541623e37 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Game/Assets/Images/move right.anim b/Game/Assets/Images/move right.anim new file mode 100644 index 0000000..a494eeb --- /dev/null +++ b/Game/Assets/Images/move right.anim @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: move right + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -973246071042092853, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - time: 0.083333336 + value: {fileID: -5261284432256797041, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - time: 0.16666667 + value: {fileID: 8121817319359148187, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - time: 0.25 + value: {fileID: 2355488530663706863, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - time: 0.33333334 + value: {fileID: 2355488530663706863, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - time: 0.41666666 + value: {fileID: -8288327958169655737, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - time: 0.5 + value: {fileID: -8288327958169655737, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - time: 0.5833333 + value: {fileID: -8288327958169655737, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - time: 0.6666667 + value: {fileID: 6193587568908039515, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - time: 0.75 + value: {fileID: 6193587568908039515, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -973246071042092853, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - {fileID: -5261284432256797041, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - {fileID: 8121817319359148187, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - {fileID: 2355488530663706863, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - {fileID: 2355488530663706863, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - {fileID: -8288327958169655737, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - {fileID: -8288327958169655737, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - {fileID: -8288327958169655737, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - {fileID: 6193587568908039515, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + - {fileID: 6193587568908039515, guid: 6abb4553219fdaf4fa2be630c5261d82, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Game/Assets/Images/IdleAnim.anim.meta b/Game/Assets/Images/move right.anim.meta similarity index 79% rename from Game/Assets/Images/IdleAnim.anim.meta rename to Game/Assets/Images/move right.anim.meta index a411f80..b92e039 100644 --- a/Game/Assets/Images/IdleAnim.anim.meta +++ b/Game/Assets/Images/move right.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 155766a386f1556489b5dd4391116403 +guid: 5acd4bf343da8104a87c0c0547f97bb8 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Game/Assets/Images/rechtangle_border.png b/Game/Assets/Images/rechtangle_border.png new file mode 100644 index 0000000..80421d1 Binary files /dev/null and b/Game/Assets/Images/rechtangle_border.png differ diff --git a/Game/Assets/Images/rechtangle_border.png.meta b/Game/Assets/Images/rechtangle_border.png.meta new file mode 100644 index 0000000..e15131f --- /dev/null +++ b/Game/Assets/Images/rechtangle_border.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: de5b5157d5e6c184999fbd2fa136aca8 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8969500473317401404 + second: rechtangle_border_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: rechtangle_border_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 280 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 4ccd73b87dee58380800000000000000 + internalID: -8969500473317401404 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + rechtangle_border_0: -8969500473317401404 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Materials.meta b/Game/Assets/Materials.meta new file mode 100644 index 0000000..bbeecda --- /dev/null +++ b/Game/Assets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e256b7a17137934da05d27d3fe43269 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Materials/droplet_mat.physicsMaterial2D b/Game/Assets/Materials/droplet_mat.physicsMaterial2D new file mode 100644 index 0000000..234c603 --- /dev/null +++ b/Game/Assets/Materials/droplet_mat.physicsMaterial2D @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: droplet_mat + serializedVersion: 2 + friction: 0.4 + bounciness: 0.2 + m_FrictionCombine: 1 + m_BounceCombine: 4 diff --git a/Game/Assets/Materials/droplet_mat.physicsMaterial2D.meta b/Game/Assets/Materials/droplet_mat.physicsMaterial2D.meta new file mode 100644 index 0000000..00bdf41 --- /dev/null +++ b/Game/Assets/Materials/droplet_mat.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 337b322827b169942b2fc112eaecc384 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Prefabs/BottomBorder.prefab b/Game/Assets/Prefabs/BottomBorder.prefab new file mode 100644 index 0000000..d5ab937 --- /dev/null +++ b/Game/Assets/Prefabs/BottomBorder.prefab @@ -0,0 +1,140 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2217298787221768457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6697231539295441165} + - component: {fileID: 5414581434838103820} + - component: {fileID: -5774478715409898150} + m_Layer: 0 + m_Name: BottomBorder + m_TagString: Border + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6697231539295441165 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217298787221768457} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -4.5, z: 0} + m_LocalScale: {x: 22.340736, y: 0.9602, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5414581434838103820 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217298787221768457} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.49019608} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!61 &-5774478715409898150 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217298787221768457} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 diff --git a/Game/Assets/Prefabs/BottomBorder.prefab.meta b/Game/Assets/Prefabs/BottomBorder.prefab.meta new file mode 100644 index 0000000..15692b2 --- /dev/null +++ b/Game/Assets/Prefabs/BottomBorder.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Prefabs/Hole.prefab b/Game/Assets/Prefabs/Hole.prefab new file mode 100644 index 0000000..864e17f --- /dev/null +++ b/Game/Assets/Prefabs/Hole.prefab @@ -0,0 +1,131 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3028864304894384228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7329357223832181834} + - component: {fileID: 1230242963583950091} + - component: {fileID: 9204716000211697423} + m_Layer: 0 + m_Name: Hole + m_TagString: Hole + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7329357223832181834 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3028864304894384228} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.15, y: 4.35, z: 0} + m_LocalScale: {x: 2, y: 3, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1230242963583950091 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3028864304894384228} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!70 &9204716000211697423 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3028864304894384228} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 1, y: 1} + m_Direction: 0 diff --git a/Game/Assets/Prefabs/Hole.prefab.meta b/Game/Assets/Prefabs/Hole.prefab.meta new file mode 100644 index 0000000..1bffb41 --- /dev/null +++ b/Game/Assets/Prefabs/Hole.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2104fa77ddd078b48b1f646a4be3ccf8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Prefabs/PlayerDroplet.prefab b/Game/Assets/Prefabs/PlayerDroplet.prefab index a97bfee..b297235 100644 --- a/Game/Assets/Prefabs/PlayerDroplet.prefab +++ b/Game/Assets/Prefabs/PlayerDroplet.prefab @@ -13,6 +13,8 @@ GameObject: - component: {fileID: 4266476263824402640} - component: {fileID: 218454750066863599} - component: {fileID: -8535381027169538} + - component: {fileID: 5971260404453589572} + - component: {fileID: 4218697106962905645} m_Layer: 0 m_Name: PlayerDroplet m_TagString: Untagged @@ -29,7 +31,7 @@ Transform: m_GameObject: {fileID: 2141180002423843430} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.363, y: 1.155, z: 0} + m_LocalPosition: {x: -0.34, y: 0.97, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -80,8 +82,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -925020913 + m_SortingLayer: 1 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} @@ -93,7 +95,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 + m_SpriteSortPoint: 1 --- !u!50 &4266476263824402640 Rigidbody2D: serializedVersion: 5 @@ -105,11 +107,11 @@ Rigidbody2D: m_BodyType: 0 m_Simulated: 1 m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 + m_UseAutoMass: 1 m_Mass: 1 m_LinearDamping: 0 m_AngularDamping: 0.05 - m_GravityScale: 1 + m_GravityScale: 1.6 m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -120,7 +122,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 0 + m_Constraints: 4 --- !u!61 &218454750066863599 BoxCollider2D: m_ObjectHideFlags: 0 @@ -131,7 +133,7 @@ BoxCollider2D: m_Enabled: 1 serializedVersion: 3 m_Density: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: 337b322827b169942b2fc112eaecc384, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -155,7 +157,7 @@ BoxCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: 0.6} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -179,9 +181,51 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 64d83d81ffe9aeb419af4eb171357948, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::DropletMovement - jumpingPower: 2 + maxFallTime: 0.5 + jumpingPower: 9 moveSpeed: 5 dashingPower: 24 dashingTime: 0.2 dashingCooldown: 1 tr: {fileID: 0} + animator: {fileID: 4218697106962905645} +--- !u!111 &5971260404453589572 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141180002423843430} + m_Enabled: 1 + serializedVersion: 4 + m_Animation: {fileID: 7400000, guid: 9c05e7e3341328e45b70c952167a4bfd, type: 2} + m_Animations: + - {fileID: 7400000, guid: 9c05e7e3341328e45b70c952167a4bfd, type: 2} + - {fileID: 7400000, guid: 5acd4bf343da8104a87c0c0547f97bb8, type: 2} + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 1 + m_UpdateMode: 0 + m_CullingType: 0 +--- !u!95 &4218697106962905645 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141180002423843430} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 3bbead65504fbb048ac08d62468d0776, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Game/Assets/Prefabs/Tree.prefab b/Game/Assets/Prefabs/Tree.prefab new file mode 100644 index 0000000..92e60e1 --- /dev/null +++ b/Game/Assets/Prefabs/Tree.prefab @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8851845362353968682 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3683337692723927349} + - component: {fileID: 8100904432411870408} + - component: {fileID: 8092102445200365313} + m_Layer: 0 + m_Name: Tree + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3683337692723927349 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8851845362353968682} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 12.6986265, y: 34.7, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8100904432411870408 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8851845362353968682} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: -85329693 + m_SortingLayer: -1 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: 21300000, guid: 4e5dbe3863ad35643b453144bb017a99, type: 3} + m_Color: {r: 1, g: 0.9803922, b: 0.9803922, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!95 &8092102445200365313 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8851845362353968682} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 84a0b0c17d2112c46a707a111ab670a9, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Game/Assets/Prefabs/Tree.prefab.meta b/Game/Assets/Prefabs/Tree.prefab.meta new file mode 100644 index 0000000..8b6f365 --- /dev/null +++ b/Game/Assets/Prefabs/Tree.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 63a81e9c39aed7249bdeb557c0054e6c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scenes/MainScene.unity b/Game/Assets/Scenes/MainScene.unity index ea8c67a..98927eb 100644 --- a/Game/Assets/Scenes/MainScene.unity +++ b/Game/Assets/Scenes/MainScene.unity @@ -129,11 +129,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.x - value: 0.39 + value: 1.37 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.y - value: 1.94 + value: 4.62 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.z @@ -176,227 +176,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} ---- !u!1001 &279662124 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8535381027169538, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: moveSpeed - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -8535381027169538, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: jumpingPower - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_Name - value: PlayerDroplet - objectReference: {fileID: 0} - - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_Mass - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_Constraints - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_UseAutoMass - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_GravityScale - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalScale.y - value: 0.5957 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalPosition.x - value: -4.63 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalPosition.y - value: 3.74 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - insertIndex: -1 - addedObject: {fileID: 279662126} - m_SourcePrefab: {fileID: 100100000, guid: d56297e435f8410a584581d73d99d2e4, type: 3} ---- !u!1 &279662125 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - m_PrefabInstance: {fileID: 279662124} - m_PrefabAsset: {fileID: 0} ---- !u!114 &279662126 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 279662125} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b3b9fc97a2d39d2d84c4be43a79247a, type: 3} - m_Name: - m_EditorClassIdentifier: '::' - threshold: 0.05 - multiplier: 5 ---- !u!1 &357828117 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 357828119} - - component: {fileID: 357828118} - - component: {fileID: 357828120} - m_Layer: 0 - m_Name: Tree - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &357828118 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 357828117} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: -85329693 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.627451, g: 0.3215686, b: 0.1764706, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 ---- !u!4 &357828119 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 357828117} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 12.6986265, y: 34.7, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &357828120 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 357828117} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 84a0b0c17d2112c46a707a111ab670a9, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &505713147 GameObject: m_ObjectHideFlags: 0 @@ -409,6 +188,7 @@ GameObject: - component: {fileID: 505713150} - component: {fileID: 505713149} - component: {fileID: 505713148} + - component: {fileID: 505713152} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -528,22 +308,475 @@ Transform: m_GameObject: {fileID: 505713147} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: 0.059518814, y: 6.55, z: -9.325845} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &505713152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505713147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineBrain + ShowDebugText: 0 + ShowCameraFrustum: 1 + IgnoreTimeScale: 0 + WorldUpOverride: {fileID: 0} + ChannelMask: -1 + UpdateMethod: 2 + BlendUpdateMethod: 1 + LensModeOverride: + Enabled: 0 + DefaultMode: 2 + DefaultBlend: + Style: 1 + Time: 2 + CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + CustomBlends: {fileID: 0} +--- !u!1 &526821479 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + m_PrefabInstance: {fileID: 1681788161} + m_PrefabAsset: {fileID: 0} +--- !u!114 &526821483 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 526821479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 021d37d1b6e71b143adc6f4842f7d76c, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::TreeSpawner + treePrefab: {fileID: 526821479} + player: {fileID: 662084242} +--- !u!4 &662084242 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + m_PrefabInstance: {fileID: 1445156949} + m_PrefabAsset: {fileID: 0} +--- !u!1 &750131489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 750131492} + - component: {fileID: 750131491} + - component: {fileID: 750131493} + m_Layer: 0 + m_Name: CinemachineCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &750131491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750131489} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineCamera + Priority: + Enabled: 0 + m_Value: 0 + OutputChannel: 1 + StandbyUpdate: 2 + m_StreamingVersion: 20241001 + m_LegacyPriority: 0 + Target: + TrackingTarget: {fileID: 662084242} + LookAtTarget: {fileID: 0} + CustomLookAtTarget: 0 + Lens: + FieldOfView: 60 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + PhysicalProperties: + GateFit: 2 + SensorSize: {x: 21.946, y: 16.002} + LensShift: {x: 0, y: 0} + FocusDistance: 10 + Iso: 200 + ShutterSpeed: 0.005 + Aperture: 16 + BladeCount: 5 + Curvature: {x: 2, y: 11} + BarrelClipping: 0.25 + Anamorphism: 0 + BlendHint: 0 +--- !u!4 &750131492 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750131489} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.059518814, y: 6.55, z: -9.325845} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1779940217} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &750131493 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750131489} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b617507da6d07e749b7efdb34e1173e1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineFollow + TrackerSettings: + BindingMode: 5 + PositionDamping: {x: 0, y: 1, z: 0} + AngularDampingMode: 0 + RotationDamping: {x: 0, y: 0, z: 0} + QuaternionDamping: 1 + FollowOffset: {x: 0, y: 0, z: -10} +--- !u!1001 &945103274 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3028864304894384228, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} + propertyPath: m_Name + value: Hole + objectReference: {fileID: 0} + - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} + propertyPath: m_LocalPosition.x + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} + propertyPath: m_LocalPosition.y + value: 5.1 + objectReference: {fileID: 0} + - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} --- !u!4 &1124127124 stripped Transform: m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} m_PrefabInstance: {fileID: 274994935} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1445156949 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8535381027169538, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: jumpingPower + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_Name + value: PlayerDroplet + objectReference: {fileID: 0} + - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_Mass + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_GravityScale + value: 1.6 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalPosition.x + value: -3.55 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalPosition.y + value: 6.55 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d56297e435f8410a584581d73d99d2e4, type: 3} +--- !u!1001 &1681788161 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2257095878498355338, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalScale.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2257095878498355338, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalScale.y + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 2257095878498355338, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalPosition.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalPosition.x + value: -0.6441 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalPosition.y + value: 6.31478 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Name + value: Tree + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + insertIndex: -1 + addedObject: {fileID: 526821483} + m_SourcePrefab: {fileID: 100100000, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} --- !u!4 &1710653547 stripped Transform: m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} m_PrefabInstance: {fileID: 1958370634} m_PrefabAsset: {fileID: 0} +--- !u!1 &1779940216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1779940217} + - component: {fileID: 1779940218} + m_Layer: 0 + m_Name: background draft_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1779940217 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1779940216} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.9285485, y: 0.7304959, z: 9.325845} + m_LocalScale: {x: 1.28, y: 1.28, z: 0.64} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 750131492} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1779940218 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1779940216} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: -85329693 + m_SortingLayer: -1 + m_SortingOrder: 1 + m_MaskInteraction: 0 + m_Sprite: {fileID: -3478055787618271234, guid: d8072a46ef29fc44f82b16357ba64e96, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 16, y: 9} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 --- !u!1001 &1890470405 PrefabInstance: m_ObjectHideFlags: 0 @@ -554,11 +787,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.x - value: -3.03753 + value: -2.37 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.y - value: -0.38336 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.z @@ -616,11 +849,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.x - value: -6.2 + value: -5.67 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.y - value: 2.81 + value: 5.38 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.z @@ -702,6 +935,8 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 505713151} - - {fileID: 279662124} - - {fileID: 357828119} + - {fileID: 1681788161} - {fileID: 2072448676} + - {fileID: 1445156949} + - {fileID: 750131492} + - {fileID: 945103274} diff --git a/Game/Assets/Scenes/cems scene.unity b/Game/Assets/Scenes/cems scene.unity index 4f44f2c..5d7ca7e 100644 --- a/Game/Assets/Scenes/cems scene.unity +++ b/Game/Assets/Scenes/cems scene.unity @@ -131,10 +131,18 @@ PrefabInstance: propertyPath: moveSpeed value: 5 objectReference: {fileID: 0} + - target: {fileID: 218454750066863599, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_Offset.y + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_Name value: PlayerDroplet objectReference: {fileID: 0} + - target: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_GravityScale value: 1 @@ -386,10 +394,152 @@ MonoBehaviour: m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 m_Version: 2 +--- !u!1001 &5794961297083258421 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 416544106080536276, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9975641 + objectReference: {fileID: 0} + - target: {fileID: 416544106080536276, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.y + value: -0.06975647 + objectReference: {fileID: 0} + - target: {fileID: 416544106080536276, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 731006480404616409, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Offset.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 2257095878498355338, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2257095878498355338, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalScale.x + value: 0.8366327 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalScale.y + value: 0.8284174 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalPosition.x + value: -0.17 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalPosition.y + value: 0.12 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5029488714018677603, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Size.x + value: 19.199999 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Size.y + value: 21.605274 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4e5dbe3863ad35643b453144bb017a99, type: 3} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Color.b + value: 0.9803922 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Color.g + value: 0.9803922 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_SortingOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Name + value: Tree + objectReference: {fileID: 0} + - target: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8863759867266962758, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1033363058} + - {fileID: 5794961297083258421} - {fileID: 906924948} - {fileID: 127014195} diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 316546f..9326e5b 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -4,11 +4,16 @@ using System.Collections; public class DropletMovement : MonoBehaviour { private Rigidbody2D rb; + private Collider2D characterCollider; // helper variables private bool isGrounded = true; private float facingDirection = 1f; private bool isDropping = false; + private float fallAngleThreshold = -45f; + private float fallTimer; + private bool isFalling; + public float maxFallTime = 0.5f; // movement private Vector2 movement; @@ -23,14 +28,37 @@ public class DropletMovement : MonoBehaviour public float dashingCooldown = 1f; [SerializeField] private TrailRenderer tr; + [SerializeField] private Animator animator; void Start() { rb = GetComponent(); } + [System.Obsolete] void Update() { + + //reset falltimer when start the jump + if ((Input.GetKeyDown(KeyCode.W) || Input.GetKeyDown(KeyCode.UpArrow)) && isGrounded) + { + fallTimer = 0f; //jump resets falltime + } + + //fall damage + if (isGrounded && fallTimer > 0.6f) + { + Destroy(gameObject); //TODO + } + + //handle jump/midair variables + if (isGrounded) + { + isFalling = false; + } else + { + HandleMidairLogic(); + } //dashing if (isDashing) @@ -48,6 +76,18 @@ public class DropletMovement : MonoBehaviour { rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower); } + if (movement.x > 0) { + animator.SetBool("WalkingRight", true); + animator.SetBool("WalkingLeft", false); + } else if (movement.x <0 && movement.x != 0) + { + animator.SetBool("WalkingRight", false); + animator.SetBool("WalkingLeft", true); + } else + { + animator.SetBool("WalkingRight", false); + animator.SetBool("WalkingLeft", false); + } if (Input.GetKeyDown(KeyCode.LeftShift) && canDash) { StartCoroutine(Dash()); @@ -72,6 +112,46 @@ public class DropletMovement : MonoBehaviour rb.linearVelocity = new Vector2(movement.x * moveSpeed, rb.linearVelocity.y); } + private void OnTriggerEnter2D(Collider2D other) + { + /*if (other.CompareTag("Border")) + { + Destroy(gameObject); //for now it destroys the droplet + Debug.Log("Droplet dropped down, animation, game end!"); + }*/ + + //Hole + if (other.CompareTag("Hole")) + { + Destroy(gameObject); + Debug.Log("Fell in hole!"); + } + + } + + [System.Obsolete] + private void HandleMidairLogic() + { + if (rb.linearVelocity.y >= 0) + { + isFalling = false; + fallTimer = 0f; + return; + } + + float movementAngle = Mathf.Atan2(rb.velocity.y, rb.velocity.x) * Mathf.Rad2Deg; + //Degrees: 0 - right, 90 - up, -90 - down --> downwards is beteen -90 and -180 + //Standard treshhold (degree) = -45 --> between -45 and -135 degrees is falling (instead of jumping) + bool fallingDown = (movementAngle < fallAngleThreshold && movementAngle > (-180f - fallAngleThreshold)); + + if (fallingDown || rb.velocity.x == 0) + { + isFalling = true; + fallTimer += Time.deltaTime; + Debug.Log($"Fall time: {fallTimer:F2} seconds"); + } + } + private IEnumerator Dash() { canDash = false; diff --git a/Game/Assets/Scripts/TreeSpawner.cs b/Game/Assets/Scripts/TreeSpawner.cs new file mode 100644 index 0000000..c75379f --- /dev/null +++ b/Game/Assets/Scripts/TreeSpawner.cs @@ -0,0 +1,27 @@ +using UnityEngine; + +public class TreeSpawner : MonoBehaviour +{ + public GameObject treePrefab; + public Transform player; + + private bool hasSpawned = false; + + void Update() + { + + Debug.Log("TreeSpawner running"); + + if (hasSpawned) return; + + if (player.position.y < transform.position.y - 3f) + { + hasSpawned = true; + + float treeHeight = GetComponent().bounds.size.y; + Vector3 spawnPos = (transform.position + Vector3.down * treeHeight) - new Vector3(0,-0.2f,0); + + Instantiate(treePrefab, spawnPos, Quaternion.identity); + } + } +} \ No newline at end of file diff --git a/Game/Assets/Scripts/TreeSpawner.cs.meta b/Game/Assets/Scripts/TreeSpawner.cs.meta new file mode 100644 index 0000000..b4715a1 --- /dev/null +++ b/Game/Assets/Scripts/TreeSpawner.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 021d37d1b6e71b143adc6f4842f7d76c \ No newline at end of file diff --git a/Game/Packages/manifest.json b/Game/Packages/manifest.json index a81a312..4bc13e3 100644 --- a/Game/Packages/manifest.json +++ b/Game/Packages/manifest.json @@ -8,6 +8,9 @@ "com.unity.2d.tilemap": "1.0.0", "com.unity.2d.tilemap.extras": "7.0.1", "com.unity.2d.tooling": "2.0.2", + "com.unity.ai.assistant": "2.11.0-pre.1", + "com.unity.ai.inference": "2.6.1", + "com.unity.cinemachine": "3.1.6", "com.unity.collab-proxy": "2.12.4", "com.unity.ide.rider": "3.0.40", "com.unity.ide.visualstudio": "2.0.27", diff --git a/Game/Packages/packages-lock.json b/Game/Packages/packages-lock.json index fecc0d9..bb04b7a 100644 --- a/Game/Packages/packages-lock.json +++ b/Game/Packages/packages-lock.json @@ -99,9 +99,36 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ai.assistant": { + "version": "2.11.0-pre.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.2d.sprite": "1.0.0", + "com.unity.mathematics": "1.3.2", + "com.unity.nuget.mono-cecil": "1.11.5", + "com.unity.modules.uielements": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ai.inference": { + "version": "2.6.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.17", + "com.unity.dt.app-ui": "1.3.6", + "com.unity.collections": "2.4.3", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.imageconversion": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.29", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -109,6 +136,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.cinemachine": { + "version": "3.1.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.splines": "2.0.0", + "com.unity.modules.imgui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { "version": "2.12.4", "depth": 0, @@ -128,6 +165,18 @@ "com.unity.test-framework.performance": "3.0.3" } }, + "com.unity.dt.app-ui": { + "version": "2.1.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.screencapture": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "2.0.5", "depth": 1, @@ -178,7 +227,14 @@ }, "com.unity.nuget.mono-cecil": { "version": "1.11.6", - "depth": 2, + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.2.2", + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -239,6 +295,13 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.settings-manager": { + "version": "2.1.1", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.shadergraph": { "version": "17.4.0", "depth": 1, @@ -248,6 +311,17 @@ "com.unity.searcher": "4.9.3" } }, + "com.unity.splines": { + "version": "2.8.4", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.modules.imgui": "1.0.0", + "com.unity.settings-manager": "1.0.3" + }, + "url": "https://packages.unity.com" + }, "com.unity.sysroot.base": { "version": "1.1.0", "depth": 1, diff --git a/Game/ProjectSettings/EditorBuildSettings.asset b/Game/ProjectSettings/EditorBuildSettings.asset index 835c33f..035080d 100644 --- a/Game/ProjectSettings/EditorBuildSettings.asset +++ b/Game/ProjectSettings/EditorBuildSettings.asset @@ -9,4 +9,5 @@ EditorBuildSettings: path: Assets/Scenes/SampleScene.unity guid: 8c9cfa26abfee488c85f1582747f6a02 m_configObjects: + com.unity.dt.app-ui: {fileID: 11400000, guid: 1b1c20d82303e4b5781c3ef50ac1449f, type: 2} com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} diff --git a/Game/ProjectSettings/Packages/com.unity.ai.assistant/Settings.json b/Game/ProjectSettings/Packages/com.unity.ai.assistant/Settings.json new file mode 100644 index 0000000..84a24e4 --- /dev/null +++ b/Game/ProjectSettings/Packages/com.unity.ai.assistant/Settings.json @@ -0,0 +1,8 @@ +{ + "CustomInstructionsGUID": "", + "CheckpointEnabled": false, + "GitInstanceTypeValue": 0, + "CustomGitPath": "", + "CheckpointRetentionWeeks": 2, + "PlanExecutionPromptDismissed": false +} \ No newline at end of file diff --git a/Game/ProjectSettings/ProjectSettings.asset b/Game/ProjectSettings/ProjectSettings.asset index 5af14e7..702b7c4 100644 --- a/Game/ProjectSettings/ProjectSettings.asset +++ b/Game/ProjectSettings/ProjectSettings.asset @@ -777,7 +777,9 @@ PlayerSettings: webGLCloseOnQuit: 0 webWasm2023: 0 webEnableSubmoduleStrippingCompatibility: 0 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + Standalone: SENTIS_ANALYTICS_ENABLED;APP_UI_EDITOR_ONLY + WebGL: SENTIS_ANALYTICS_ENABLED;APP_UI_EDITOR_ONLY additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: diff --git a/Game/ProjectSettings/TagManager.asset b/Game/ProjectSettings/TagManager.asset index 9b79b97..f4a2fa8 100644 --- a/Game/ProjectSettings/TagManager.asset +++ b/Game/ProjectSettings/TagManager.asset @@ -3,7 +3,9 @@ --- !u!78 &1 TagManager: serializedVersion: 3 - tags: [] + tags: + - Border + - Hole layers: - Default - TransparentFX @@ -44,6 +46,9 @@ TagManager: - name: Default uniqueID: 0 locked: 0 + - name: front + uniqueID: 3369946383 + locked: 0 m_RenderingLayers: - Default m_MigratedRenderPipelines: [] diff --git a/pictures/Tree base.PNG b/pictures/Tree base.PNG new file mode 100644 index 0000000..87eea21 Binary files /dev/null and b/pictures/Tree base.PNG differ diff --git a/pictures/dash left.png b/pictures/dash left.png new file mode 100644 index 0000000..c807a8c Binary files /dev/null and b/pictures/dash left.png differ diff --git a/pictures/dash right.PNG b/pictures/dash right.PNG new file mode 100644 index 0000000..12097a0 Binary files /dev/null and b/pictures/dash right.PNG differ diff --git a/pictures/drop_draft.kra b/pictures/drop_draft.kra deleted file mode 100644 index 8cd2f1c..0000000 Binary files a/pictures/drop_draft.kra and /dev/null differ diff --git a/pictures/idle sprites fixed.png b/pictures/idle sprites fixed.png new file mode 100644 index 0000000..3eb4d81 Binary files /dev/null and b/pictures/idle sprites fixed.png differ diff --git a/pictures/idle sprites.PNG b/pictures/idle sprites.PNG deleted file mode 100644 index 2ea3442..0000000 Binary files a/pictures/idle sprites.PNG and /dev/null differ diff --git a/pictures/move left sprites.PNG b/pictures/move left sprites.PNG index 2cd0a9d..8336eee 100644 Binary files a/pictures/move left sprites.PNG and b/pictures/move left sprites.PNG differ diff --git a/pictures/move right sprites.PNG b/pictures/move right sprites.PNG index ee2f8f2..3c0488c 100644 Binary files a/pictures/move right sprites.PNG and b/pictures/move right sprites.PNG differ