diff --git a/Assets/Character/Animations/Player.controller b/Assets/Character/Animations/Player.controller index e26a6d4..da988e2 100644 --- a/Assets/Character/Animations/Player.controller +++ b/Assets/Character/Animations/Player.controller @@ -980,7 +980,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: acd3fdc6781e749908cec8f29cbac75f, type: 2} + m_Motion: {fileID: 7400000, guid: 05be0135d596e4d408a99feb531db4c3, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Character/Xiaoming/Animations/Xiaoming_Hurt.anim b/Assets/Character/Xiaoming/Animations/Xiaoming_Hurt.anim new file mode 100644 index 0000000..85698b8 --- /dev/null +++ b/Assets/Character/Xiaoming/Animations/Xiaoming_Hurt.anim @@ -0,0 +1,93 @@ +%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: Xiaoming_Hurt + 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: -821403454, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - time: 0.083333336 + value: {fileID: -7364402, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - time: 0.16666667 + value: {fileID: -1210044483, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - time: 0.25 + value: {fileID: -616697463, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - time: 0.33333334 + value: {fileID: 1119227221, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - time: 0.41666666 + value: {fileID: 1510821856, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - time: 0.5 + value: {fileID: 151366782, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - time: 0.5833333 + value: {fileID: 1527130941, guid: 60a5007f3239f704eb55d552cf266735, 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: -821403454, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - {fileID: -7364402, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - {fileID: -1210044483, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - {fileID: -616697463, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - {fileID: 1119227221, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - {fileID: 1510821856, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - {fileID: 151366782, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + - {fileID: 1527130941, guid: 60a5007f3239f704eb55d552cf266735, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666666 + 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/Assets/Character/Xiaoming/Animations/Xiaoming_Hurt.anim.meta b/Assets/Character/Xiaoming/Animations/Xiaoming_Hurt.anim.meta new file mode 100644 index 0000000..15bc222 --- /dev/null +++ b/Assets/Character/Xiaoming/Animations/Xiaoming_Hurt.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05be0135d596e4d408a99feb531db4c3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Character/Xiaoming/Sprites/Xiaoming_Hurt.png b/Assets/Character/Xiaoming/Sprites/Xiaoming_Hurt.png new file mode 100644 index 0000000..57c89f8 Binary files /dev/null and b/Assets/Character/Xiaoming/Sprites/Xiaoming_Hurt.png differ diff --git a/Assets/Character/Xiaoming/Sprites/Xiaoming_Hurt.png.meta b/Assets/Character/Xiaoming/Sprites/Xiaoming_Hurt.png.meta new file mode 100644 index 0000000..c389321 --- /dev/null +++ b/Assets/Character/Xiaoming/Sprites/Xiaoming_Hurt.png.meta @@ -0,0 +1,316 @@ +fileFormatVersion: 2 +guid: 60a5007f3239f704eb55d552cf266735 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + 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: 3 + 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: 3 + 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 + - serializedVersion: 3 + buildTarget: Android + 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: Xiaoming_Hurt_0 + rect: + serializedVersion: 2 + x: 0 + y: 256 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 41bc1fb593d72944b908fefd8d436a98 + internalID: -821403454 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Xiaoming_Hurt_1 + rect: + serializedVersion: 2 + x: 256 + y: 256 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c4acd8314918c4e428ea2d31ce8cce9a + internalID: -7364402 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Xiaoming_Hurt_2 + rect: + serializedVersion: 2 + x: 512 + y: 256 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c167070df0de8384a9e2af6d44cd1478 + internalID: -1210044483 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Xiaoming_Hurt_3 + rect: + serializedVersion: 2 + x: 768 + y: 256 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6edef07793222b34d9afdf4d7b436065 + internalID: -616697463 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Xiaoming_Hurt_4 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c9edb05be7dbbad45a3e00e2651131fe + internalID: 1119227221 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Xiaoming_Hurt_5 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 55912ecb753266948946c310eb8d6264 + internalID: 1510821856 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Xiaoming_Hurt_6 + rect: + serializedVersion: 2 + x: 512 + y: 0 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2819115333bb500498055e60298f0462 + internalID: 151366782 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Xiaoming_Hurt_7 + rect: + serializedVersion: 2 + x: 768 + y: 0 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 187223b21d1f8824d910a508043fa618 + internalID: 1527130941 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Xiaoming_Hurt_0: -821403454 + Xiaoming_Hurt_1: -7364402 + Xiaoming_Hurt_2: -1210044483 + Xiaoming_Hurt_3: -616697463 + Xiaoming_Hurt_4: 1119227221 + Xiaoming_Hurt_5: 1510821856 + Xiaoming_Hurt_6: 151366782 + Xiaoming_Hurt_7: 1527130941 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: