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 fixed 1.png.meta b/Game/Assets/Images/idle sprites fixed 1.png.meta new file mode 100644 index 0000000..745fc20 --- /dev/null +++ b/Game/Assets/Images/idle sprites fixed 1.png.meta @@ -0,0 +1,416 @@ +fileFormatVersion: 2 +guid: fb533d19a165f8e449f4af11dbf4a8be +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 index 334f947..55e8d1d 100644 --- a/Game/Assets/Images/idle sprites fixed_0.controller +++ b/Game/Assets/Images/idle sprites fixed_0.controller @@ -12,6 +12,12 @@ AnimatorStateMachine: - 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: [] @@ -22,6 +28,118 @@ AnimatorStateMachine: 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 @@ -30,7 +148,19 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: idle sprites fixed_0 serializedVersion: 6 - m_AnimatorParameters: [] + 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 @@ -45,6 +175,90 @@ AnimatorController: 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 @@ -55,7 +269,9 @@ AnimatorState: m_Name: idle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -1912279150782776439} + - {fileID: 1899649019099201245} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -71,3 +287,31 @@ AnimatorState: 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.anim b/Game/Assets/Images/idle.anim index 61e1632..fc5248b 100644 --- a/Game/Assets/Images/idle.anim +++ b/Game/Assets/Images/idle.anim @@ -24,23 +24,23 @@ AnimationClip: value: {fileID: -7792483657037416151, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} - time: 0.083333336 value: {fileID: -8279100836940419883, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} - - time: 0.16666667 - value: {fileID: 6404895348788868116, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} - time: 0.25 - value: {fileID: -1544957121301416263, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} - - time: 0.33333334 - value: {fileID: 4487137833266305692, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + value: {fileID: 6404895348788868116, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} - time: 0.41666666 - value: {fileID: 4653849531404390667, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + value: {fileID: -1544957121301416263, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} - time: 0.5 - value: {fileID: 1374861269149759241, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + value: {fileID: 4487137833266305692, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} - time: 0.5833333 - value: {fileID: -1479939526787242745, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + value: {fileID: 4653849531404390667, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} - time: 0.6666667 - value: {fileID: 5753144094745982381, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + value: {fileID: 1374861269149759241, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} - time: 0.75 - value: {fileID: 5052285103847608203, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} + 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: @@ -80,7 +80,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.9166666 + m_StopTime: 1.0833334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 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/move left.anim.meta b/Game/Assets/Images/move left.anim.meta new file mode 100644 index 0000000..2728695 --- /dev/null +++ b/Game/Assets/Images/move left.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4079fad1a3933942bab286f5825935a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: 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/move right sprites_0 1.controller b/Game/Assets/Images/move right sprites_0 1.controller new file mode 100644 index 0000000..8cf548d --- /dev/null +++ b/Game/Assets/Images/move right sprites_0 1.controller @@ -0,0 +1,73 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !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: move right + 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: 5acd4bf343da8104a87c0c0547f97bb8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !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 1 + serializedVersion: 6 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -7774158709629541209} + 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/move right sprites_0 1.controller.meta b/Game/Assets/Images/move right sprites_0 1.controller.meta new file mode 100644 index 0000000..e8afe4d --- /dev/null +++ b/Game/Assets/Images/move right sprites_0 1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b9cd543cfe14be4c919145d10a08375 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/move right sprites_0.controller b/Game/Assets/Images/move right sprites_0.controller new file mode 100644 index 0000000..77eaae4 --- /dev/null +++ b/Game/Assets/Images/move right sprites_0.controller @@ -0,0 +1,73 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9184444648078489840 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: moving right + 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: 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/move right sprites_0.controller.meta b/Game/Assets/Images/move right sprites_0.controller.meta new file mode 100644 index 0000000..7e6ca84 --- /dev/null +++ b/Game/Assets/Images/move right sprites_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 086ea77f6db6a9a428edbac541623e37 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: 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/move right.anim.meta b/Game/Assets/Images/move right.anim.meta new file mode 100644 index 0000000..b92e039 --- /dev/null +++ b/Game/Assets/Images/move right.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5acd4bf343da8104a87c0c0547f97bb8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: 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/Prefabs/PlayerDroplet.prefab b/Game/Assets/Prefabs/PlayerDroplet.prefab index 116eab7..cbfa9a9 100644 --- a/Game/Assets/Prefabs/PlayerDroplet.prefab +++ b/Game/Assets/Prefabs/PlayerDroplet.prefab @@ -107,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 @@ -181,12 +181,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 64d83d81ffe9aeb419af4eb171357948, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::DropletMovement - jumpingPower: 7 + jumpingPower: 9 moveSpeed: 5 dashingPower: 24 dashingTime: 0.2 dashingCooldown: 1 tr: {fileID: 0} + animator: {fileID: 4218697106962905645} --- !u!111 &5971260404453589572 Animation: m_ObjectHideFlags: 0 @@ -199,6 +200,7 @@ Animation: 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 diff --git a/Game/Assets/Scenes/MainScene.unity b/Game/Assets/Scenes/MainScene.unity index 8ff4f98..1768993 100644 --- a/Game/Assets/Scenes/MainScene.unity +++ b/Game/Assets/Scenes/MainScene.unity @@ -119,6 +119,11 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &150736128 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + m_PrefabInstance: {fileID: 3635665845719097076} + m_PrefabAsset: {fileID: 0} --- !u!1001 &274994935 PrefabInstance: m_ObjectHideFlags: 0 @@ -422,10 +427,11 @@ Transform: m_GameObject: {fileID: 505713147} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.361964, y: 4.1920695, z: -10} + m_LocalPosition: {x: -0.06485796, y: 4.1920695, z: -9.029667} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 150736128} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &505713152 @@ -535,7 +541,7 @@ Transform: m_GameObject: {fileID: 750131489} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.361964, y: 4.1920695, z: -10} + m_LocalPosition: {x: -0.06485796, y: 4.1920695, z: -9.029667} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -555,11 +561,90 @@ MonoBehaviour: m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineFollow TrackerSettings: BindingMode: 5 - PositionDamping: {x: 1, y: 1, z: 1} + PositionDamping: {x: 0, y: 1, z: 0} AngularDampingMode: 0 - RotationDamping: {x: 1, y: 1, z: 1} + RotationDamping: {x: 0, y: 0, z: 0} QuaternionDamping: 1 FollowOffset: {x: 0, y: 0, z: -10} +--- !u!1 &1013054605 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1013054608} + - component: {fileID: 1013054607} + - component: {fileID: 1013054606} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1013054606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013054605} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 +--- !u!114 &1013054607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013054605} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1013054608 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013054605} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1124127124 stripped Transform: m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} @@ -798,7 +883,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 505713151} m_Modifications: - target: {fileID: 2217298787221768457, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_Name @@ -810,15 +895,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.36380672 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalPosition.y - value: -4.2709 + value: -4.1920695 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 9.165956 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalRotation.w @@ -826,15 +911,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -860,6 +945,6 @@ SceneRoots: - {fileID: 505713151} - {fileID: 357828119} - {fileID: 2072448676} - - {fileID: 3635665845719097076} - {fileID: 1445156949} - {fileID: 750131492} + - {fileID: 1013054608} diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index a8b8166..efd22f5 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -23,6 +23,7 @@ public class DropletMovement : MonoBehaviour public float dashingCooldown = 1f; [SerializeField] private TrailRenderer tr; + [SerializeField] private Animator animator; void Start() { @@ -51,6 +52,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()); diff --git a/pictures/dash left.png b/pictures/dash left.png index 1e5d50a..c807a8c 100644 Binary files a/pictures/dash left.png and b/pictures/dash left.png differ