diff --git a/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset b/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset index 742765380..122b622ac 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset @@ -52,13 +52,13 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 9e274398ccb6b6e42bddf6a661a15cc7 - m_Address: "Sprite/\u5730\u94C1\u533B\u751F" + - m_GUID: 40f07326ace570241bd93fcfc3decb87 + m_Address: "Animation/\u5730\u94C1\u706B\u5C71\u6697" m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 95e3e40f4665fe247b8fe50a88243030 - m_Address: "Sprite/\u5730\u94C1\u706B\u5C71" + - m_GUID: a63b52b3e8d9e0441aaff086b9c1ae6b + m_Address: "Animation/\u5730\u94C1\u533B\u751F\u6697" m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 diff --git a/Assets/Editor/Inspector/ActorSlotEditor.cs b/Assets/Editor/Inspector/ActorSlotEditor.cs index c774e392e..a23d6cfd4 100644 --- a/Assets/Editor/Inspector/ActorSlotEditor.cs +++ b/Assets/Editor/Inspector/ActorSlotEditor.cs @@ -1,4 +1,5 @@ using UnityEditor; +using UnityEngine; namespace AibisDream.SystemEditor { @@ -15,6 +16,11 @@ namespace AibisDream.SystemEditor EditorGUILayout.LabelField("层级设置", EditorStyles.boldLabel); example.sortingLayer = EditorKit.SortingLayerField("目标层级", example.sortingLayer); example.sortingOrder = EditorGUILayout.IntField("层级顺序", example.sortingOrder); + + if (GUI.changed) + { + EditorUtility.SetDirty(target); + } } } } \ No newline at end of file diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生.aseprite b/Assets/RawResources/Actor/地铁人物/地铁医生.aseprite index 0013a43c3..a4a47936e 100644 Binary files a/Assets/RawResources/Actor/地铁人物/地铁医生.aseprite and b/Assets/RawResources/Actor/地铁人物/地铁医生.aseprite differ diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生.aseprite.meta b/Assets/RawResources/Actor/地铁人物/地铁医生.aseprite.meta index 85d08328d..6eb51c755 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁医生.aseprite.meta +++ b/Assets/RawResources/Actor/地铁人物/地铁医生.aseprite.meta @@ -125,7 +125,7 @@ ScriptedImporter: addSortingGroup: 1 addShadowCasters: 0 importFileNodeState: 1 - platformSettingsDirtyTick: 638856190730516541 + platformSettingsDirtyTick: 638862914035437330 textureAssetName: singleSpriteImportData: - name: diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生/idle.anim b/Assets/RawResources/Actor/地铁人物/地铁医生/idle.anim index a2edee26d..25a3898cf 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁医生/idle.anim +++ b/Assets/RawResources/Actor/地铁人物/地铁医生/idle.anim @@ -22,13 +22,13 @@ AnimationClip: curve: - time: 0 value: {fileID: 7434305463559662665, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 0.4 + - time: 0.3 value: {fileID: 6137534509767803006, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 0.8 + - time: 0.6 value: {fileID: -7282006862314497923, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 1.2 + - time: 0.9 value: {fileID: 890444585592387486, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 1.6 + - time: 1.2 value: {fileID: 890444585592387486, guid: d965f2e3d33fcab469cce22793840d50, type: 3} attribute: m_Sprite path: @@ -48,7 +48,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.61 + m_StopTime: 1.21 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生/idle2.anim b/Assets/RawResources/Actor/地铁人物/地铁医生/idle2.anim index 1ff80e73d..3b23bb40f 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁医生/idle2.anim +++ b/Assets/RawResources/Actor/地铁人物/地铁医生/idle2.anim @@ -22,19 +22,19 @@ AnimationClip: curve: - time: 0 value: {fileID: 3828583946930156423, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 0.4000001 + - time: 0.3000002 value: {fileID: -405660456781226711, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 0.79999995 + - time: 0.60000014 value: {fileID: 6472415650728784874, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 1.2 + - time: 0.9000001 value: {fileID: 4574903613059082061, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 1.6000001 + - time: 1.2 value: {fileID: -6578931830137292571, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 2.0000002 + - time: 1.5 value: {fileID: 5513001242242075009, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 2.3999999 + - time: 1.8000002 value: {fileID: -5845897077686334284, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 2.8 + - time: 2.1000001 value: {fileID: -5845897077686334284, guid: d965f2e3d33fcab469cce22793840d50, type: 3} attribute: m_Sprite path: @@ -54,7 +54,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 2.81 + m_StopTime: 2.1100001 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生/turn.anim b/Assets/RawResources/Actor/地铁人物/地铁医生/turn.anim index d2d2f6422..f1e6b7abf 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁医生/turn.anim +++ b/Assets/RawResources/Actor/地铁人物/地铁医生/turn.anim @@ -22,11 +22,11 @@ AnimationClip: curve: - time: 0 value: {fileID: -7178839407571898594, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 0.39999998 + - time: 0.29999995 value: {fileID: -1471086925679904356, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 0.8000001 + - time: 0.5999999 value: {fileID: 196387046388233536, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 1.2 + - time: 0.8999999 value: {fileID: 196387046388233536, guid: d965f2e3d33fcab469cce22793840d50, type: 3} attribute: m_Sprite path: @@ -39,32 +39,19 @@ AnimationClip: 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: -7178839407571898594, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - {fileID: -1471086925679904356, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - {fileID: 196387046388233536, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - {fileID: 196387046388233536, guid: d965f2e3d33fcab469cce22793840d50, type: 3} + genericBindings: [] + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.21 + m_StopTime: 0.9099999 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生/turnback.anim b/Assets/RawResources/Actor/地铁人物/地铁医生/turnback.anim index 0b5e77149..b7f5816c6 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁医生/turnback.anim +++ b/Assets/RawResources/Actor/地铁人物/地铁医生/turnback.anim @@ -22,9 +22,9 @@ AnimationClip: curve: - time: 0 value: {fileID: 7764757536718266346, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 0.4000001 + - time: 0.3000002 value: {fileID: -5446387825585544448, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - time: 0.8000001 + - time: 0.6000002 value: {fileID: -5446387825585544448, guid: d965f2e3d33fcab469cce22793840d50, type: 3} attribute: m_Sprite path: @@ -37,31 +37,19 @@ AnimationClip: 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: 7764757536718266346, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - {fileID: -5446387825585544448, guid: d965f2e3d33fcab469cce22793840d50, type: 3} - - {fileID: -5446387825585544448, guid: d965f2e3d33fcab469cce22793840d50, type: 3} + genericBindings: [] + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.81000006 + m_StopTime: 0.6100002 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生/地铁医生.png b/Assets/RawResources/Actor/地铁人物/地铁医生/地铁医生.png deleted file mode 100644 index 2a2e1d9dd..000000000 --- a/Assets/RawResources/Actor/地铁人物/地铁医生/地铁医生.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78fb629a1f35a7412eb535d0c82f6639f8f08a4a361d9da6aff40bb59d00031a -size 6600 diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生/地铁医生.png.meta b/Assets/RawResources/Actor/地铁人物/地铁医生/地铁医生.png.meta deleted file mode 100644 index 46c9942f7..000000000 --- a/Assets/RawResources/Actor/地铁人物/地铁医生/地铁医生.png.meta +++ /dev/null @@ -1,175 +0,0 @@ -fileFormatVersion: 2 -guid: 9e274398ccb6b6e42bddf6a661a15cc7 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 0 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 7 - spritePivot: {x: 0.5, y: 0} - spritePixelsToUnits: 21.5 - 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: 256 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - 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: 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: 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 - - serializedVersion: 3 - buildTarget: Server - 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 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 111 - height: 119 - alignment: 7 - pivot: {x: 0.5, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: f1f33528f62b1c8448feed515e29d1aa - internalID: -86781235 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: - Idle: -86781235 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生暗.aseprite b/Assets/RawResources/Actor/地铁人物/地铁医生暗.aseprite new file mode 100644 index 000000000..3eaefd571 Binary files /dev/null and b/Assets/RawResources/Actor/地铁人物/地铁医生暗.aseprite differ diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生暗.aseprite.meta b/Assets/RawResources/Actor/地铁人物/地铁医生暗.aseprite.meta new file mode 100644 index 000000000..029fefa34 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗.aseprite.meta @@ -0,0 +1,664 @@ +fileFormatVersion: 2 +guid: 4c8925624cd08cc488c73572737360e1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:AnimationClip + assembly: UnityEngine.AnimationModule + name: idle + second: {fileID: 7400000, guid: 99bc2eb67e506194188c5233d485dae8, type: 2} + - first: + type: UnityEngine:AnimationClip + assembly: UnityEngine.AnimationModule + name: idle2 + second: {fileID: 7400000, guid: 9c4345ad87c702a47ac08c4e77f846ec, type: 2} + - first: + type: UnityEngine:AnimationClip + assembly: UnityEngine.AnimationModule + name: turn + second: {fileID: 7400000, guid: d9fda63085823214eb2b575476727068, type: 2} + - first: + type: UnityEngine:AnimationClip + assembly: UnityEngine.AnimationModule + name: turnback + second: {fileID: 7400000, guid: 7d74348e128534747a16ed740e532254, type: 2} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 62a9f0aa5b59740cfbadc7e5f9823bb0, type: 3} + textureImporterSettings: + alphaSource: 1 + mipMapMode: 0 + enableMipMap: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + convertToNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + swizzle: 50462976 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + nPOTScale: 1 + sRGBTexture: 1 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 21.5 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 0 + flipbookColumns: 0 + ignorePngGamma: 0 + cookieMode: 0 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + normalMap: 0 + textureFormat: 0 + maxTextureSize: 0 + lightmap: 0 + compressionQuality: 0 + linearTexture: 0 + grayScaleToAlpha: 0 + rGBM: 0 + cubemapConvolutionSteps: 0 + cubemapConvolutionExponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + previousAsepriteImporterSettings: + fileImportMode: 1 + importHiddenLayers: 0 + layerImportMode: 1 + defaultPivotSpace: 0 + defaultPivotAlignment: 7 + customPivotPosition: {x: 0.5, y: 0.5} + spritePadding: 0 + generateModelPrefab: 1 + generateAnimationClips: 1 + addSortingGroup: 1 + addShadowCasters: 0 + asepriteImporterSettings: + fileImportMode: 1 + importHiddenLayers: 0 + layerImportMode: 1 + defaultPivotSpace: 0 + defaultPivotAlignment: 7 + customPivotPosition: {x: 0.5, y: 0.5} + spritePadding: 0 + generateModelPrefab: 1 + generateAnimationClips: 1 + addSortingGroup: 1 + addShadowCasters: 0 + importFileNodeState: 1 + platformSettingsDirtyTick: 638862925791922462 + textureAssetName: + singleSpriteImportData: + - name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 0, y: 0} + animatedSpriteImportData: + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_0" + originalName: + pivot: {x: 0.49107143, y: -0.008474576} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 258 + width: 112 + height: 118 + spriteID: 52cb885987dda554093344f2d8b5700f + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 258} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_1" + originalName: + pivot: {x: 0.49107143, y: -0.008403362} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 4 + width: 112 + height: 119 + spriteID: 18d8d8ab99e404f46907712406ca9aab + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_4" + originalName: + pivot: {x: 0.49107143, y: -0.008547009} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 244 + y: 4 + width: 112 + height: 117 + spriteID: 71feb1c100adeff4caf96d1c4564acb6 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 244, y: 4} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_5" + originalName: + pivot: {x: 0.49107143, y: -0.008474576} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 384 + width: 112 + height: 118 + spriteID: a27197736907d254f931281ed0b87f94 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 384} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_6" + originalName: + pivot: {x: 0.49107143, y: -0.00862069} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 244 + y: 254 + width: 112 + height: 116 + spriteID: 0026a44e2676d3246bc069fb24728d6c + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 244, y: 254} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_7" + originalName: + pivot: {x: 0.49107143, y: -0.008695652} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 364 + y: 252 + width: 112 + height: 115 + spriteID: 8bca17837a0163748b5c5614ff6638bb + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 364, y: 252} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_15" + originalName: + pivot: {x: 0.49107143, y: -0.008474576} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 124 + y: 4 + width: 112 + height: 118 + spriteID: 93aa6dee65fe9cb448f67f81a7855abc + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 124, y: 4} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_2" + originalName: + pivot: {x: 0.49107143, y: -0.008403362} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 131 + width: 112 + height: 119 + spriteID: 7464364a6f7c9c8499dfe72ffe2771d8 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 131} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_3" + originalName: + pivot: {x: 0.49107143, y: -0.008474576} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 124 + y: 130 + width: 112 + height: 118 + spriteID: cde7ab5276450354b99193b8c8370857 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 124, y: 130} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_8" + originalName: + pivot: {x: 0.49107143, y: -0.00862069} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 244 + y: 378 + width: 112 + height: 116 + spriteID: b22b5a078f817e24fab2ae571c045cfe + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 244, y: 378} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_9" + originalName: + pivot: {x: 0.49107143, y: -0.008474576} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 124 + y: 256 + width: 112 + height: 118 + spriteID: 8839386ed38c96c4fabd832aeeebb959 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 124, y: 256} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_10" + originalName: + pivot: {x: 0.49107143, y: -0.00862069} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 364 + y: 4 + width: 112 + height: 116 + spriteID: 9be1b3169273fbe44a70f8a9fa62884d + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 364, y: 4} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_11" + originalName: + pivot: {x: 0.49107143, y: -0.008695652} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 364 + y: 375 + width: 112 + height: 115 + spriteID: 75113c2b21bf2df4ca8bcfc9fb4aa892 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 364, y: 375} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_12" + originalName: + pivot: {x: 0.49107143, y: -0.00862069} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 364 + y: 128 + width: 112 + height: 116 + spriteID: 87985d22e700df44ab767652f4e3f5b2 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 364, y: 128} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_13" + originalName: + pivot: {x: 0.49107143, y: -0.008474576} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 124 + y: 382 + width: 112 + height: 118 + spriteID: 6a40c570e93a029458487a6ac2c2fa0f + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 124, y: 382} + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_14" + originalName: + pivot: {x: 0.49107143, y: -0.008547009} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 244 + y: 129 + width: 112 + height: 117 + spriteID: 361e9ea04e0384e4c9216e945e5b3ea1 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 244, y: 129} + spriteSheetImportData: [] + asepriteLayers: + - layerIndex: 0 + guid: 242046432 + name: "\u5730\u94C1\u533B\u751F\u6697" + layerFlags: 0 + layerType: 0 + blendMode: 0 + cells: + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_0" + frameIndex: 0 + cellRect: + x: 12 + y: 1 + width: 112 + height: 118 + spriteId: 52cb885987dda554093344f2d8b5700f + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_1" + frameIndex: 1 + cellRect: + x: 12 + y: 1 + width: 112 + height: 119 + spriteId: 18d8d8ab99e404f46907712406ca9aab + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_4" + frameIndex: 4 + cellRect: + x: 12 + y: 1 + width: 112 + height: 117 + spriteId: 71feb1c100adeff4caf96d1c4564acb6 + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_5" + frameIndex: 5 + cellRect: + x: 12 + y: 1 + width: 112 + height: 118 + spriteId: a27197736907d254f931281ed0b87f94 + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_6" + frameIndex: 6 + cellRect: + x: 12 + y: 1 + width: 112 + height: 116 + spriteId: 0026a44e2676d3246bc069fb24728d6c + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_7" + frameIndex: 7 + cellRect: + x: 12 + y: 1 + width: 112 + height: 115 + spriteId: 8bca17837a0163748b5c5614ff6638bb + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_15" + frameIndex: 15 + cellRect: + x: 12 + y: 1 + width: 112 + height: 118 + spriteId: 93aa6dee65fe9cb448f67f81a7855abc + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_2" + frameIndex: 2 + cellRect: + x: 12 + y: 1 + width: 112 + height: 119 + spriteId: 7464364a6f7c9c8499dfe72ffe2771d8 + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_3" + frameIndex: 3 + cellRect: + x: 12 + y: 1 + width: 112 + height: 118 + spriteId: cde7ab5276450354b99193b8c8370857 + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_8" + frameIndex: 8 + cellRect: + x: 12 + y: 1 + width: 112 + height: 116 + spriteId: b22b5a078f817e24fab2ae571c045cfe + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_9" + frameIndex: 9 + cellRect: + x: 12 + y: 1 + width: 112 + height: 118 + spriteId: 8839386ed38c96c4fabd832aeeebb959 + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_10" + frameIndex: 10 + cellRect: + x: 12 + y: 1 + width: 112 + height: 116 + spriteId: 9be1b3169273fbe44a70f8a9fa62884d + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_11" + frameIndex: 11 + cellRect: + x: 12 + y: 1 + width: 112 + height: 115 + spriteId: 75113c2b21bf2df4ca8bcfc9fb4aa892 + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_12" + frameIndex: 12 + cellRect: + x: 12 + y: 1 + width: 112 + height: 116 + spriteId: 87985d22e700df44ab767652f4e3f5b2 + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_13" + frameIndex: 13 + cellRect: + x: 12 + y: 1 + width: 112 + height: 118 + spriteId: 6a40c570e93a029458487a6ac2c2fa0f + - name: "\u5730\u94C1\u533B\u751F\u6697_Frame_14" + frameIndex: 14 + cellRect: + x: 12 + y: 1 + width: 112 + height: 117 + spriteId: 361e9ea04e0384e4c9216e945e5b3ea1 + linkedCells: [] + parentIndex: -1 + platformSettings: + - name: DefaultTexturePlatform + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Standalone + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Server + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Android + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: WebGL + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + secondarySpriteTextures: [] + spritePackingTag: + canvasSize: {x: 134, y: 144} diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生暗.meta b/Assets/RawResources/Actor/地铁人物/地铁医生暗.meta new file mode 100644 index 000000000..e0dcd4c6a --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc68a0b77a5fa2d448da27916af3bb7f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生暗/idle.anim b/Assets/RawResources/Actor/地铁人物/地铁医生暗/idle.anim new file mode 100644 index 000000000..84098a31e --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗/idle.anim @@ -0,0 +1,70 @@ +%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: -6329637469226228860, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 0.3 + value: {fileID: -1433468809298949936, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 0.6 + value: {fileID: -6751760697695651119, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 0.9 + value: {fileID: 6218530847946422011, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 1.2 + value: {fileID: 6218530847946422011, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 100 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.21 + 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: 0 + 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/RawResources/Actor/地铁人物/地铁医生暗/idle.anim.meta b/Assets/RawResources/Actor/地铁人物/地铁医生暗/idle.anim.meta new file mode 100644 index 000000000..40e19189a --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗/idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99bc2eb67e506194188c5233d485dae8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生暗/idle2.anim b/Assets/RawResources/Actor/地铁人物/地铁医生暗/idle2.anim new file mode 100644 index 000000000..6bd1fe51e --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗/idle2.anim @@ -0,0 +1,76 @@ +%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: idle2 + 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: -8541519884486623397, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 0.3000002 + value: {fileID: 2898918250173799049, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 0.60000014 + value: {fileID: -2725612924953116911, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 0.9000001 + value: {fileID: 5723162297420874195, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 1.2 + value: {fileID: -6000008109056311230, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 1.5 + value: {fileID: -2574774579603769036, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 1.8000002 + value: {fileID: -1234423325804919582, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 2.1000001 + value: {fileID: -1234423325804919582, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 100 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2.1100001 + 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: 0 + 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/RawResources/Actor/地铁人物/地铁医生暗/idle2.anim.meta b/Assets/RawResources/Actor/地铁人物/地铁医生暗/idle2.anim.meta new file mode 100644 index 000000000..2ea712297 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗/idle2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c4345ad87c702a47ac08c4e77f846ec +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生暗/turn.anim b/Assets/RawResources/Actor/地铁人物/地铁医生暗/turn.anim new file mode 100644 index 000000000..f2555d0f6 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗/turn.anim @@ -0,0 +1,68 @@ +%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: turn + 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: 5529729373443782296, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 0.29999995 + value: {fileID: -9172616434285174866, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 0.5999999 + value: {fileID: 2276066368969369136, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 0.8999999 + value: {fileID: 2276066368969369136, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 100 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.9099999 + 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: 0 + 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/RawResources/Actor/地铁人物/地铁医生暗/turn.anim.meta b/Assets/RawResources/Actor/地铁人物/地铁医生暗/turn.anim.meta new file mode 100644 index 000000000..a0ae94b6d --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗/turn.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9fda63085823214eb2b575476727068 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生暗/turnback.anim b/Assets/RawResources/Actor/地铁人物/地铁医生暗/turnback.anim new file mode 100644 index 000000000..cd3e9958b --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗/turnback.anim @@ -0,0 +1,66 @@ +%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: turnback + 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: -6714954142504330418, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 0.3000002 + value: {fileID: -8119465915803975476, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + - time: 0.6000002 + value: {fileID: -8119465915803975476, guid: 4c8925624cd08cc488c73572737360e1, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 100 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6100002 + 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: 0 + 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/RawResources/Actor/地铁人物/地铁火山/turnback.anim.meta b/Assets/RawResources/Actor/地铁人物/地铁医生暗/turnback.anim.meta similarity index 79% rename from Assets/RawResources/Actor/地铁人物/地铁火山/turnback.anim.meta rename to Assets/RawResources/Actor/地铁人物/地铁医生暗/turnback.anim.meta index 67ffab86e..d3856e00c 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁火山/turnback.anim.meta +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗/turnback.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a50f7c98d35d7024890cc81b2dd8def2 +guid: 7d74348e128534747a16ed740e532254 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生暗/地铁医生暗.controller b/Assets/RawResources/Actor/地铁人物/地铁医生暗/地铁医生暗.controller new file mode 100644 index 000000000..c61db88bf --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗/地铁医生暗.controller @@ -0,0 +1,205 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8347655247253602972 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 382871745978647277} + m_Position: {x: 260, y: 160, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7146949021591122105} + m_Position: {x: 270, y: 50, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6629190222441813299} + m_Position: {x: 520, y: 50, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2035702373553397193} + m_Position: {x: 510, y: 160, 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: 382871745978647277} +--- !u!1101 &-1804111882205638982 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6629190222441813299} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7252747 + m_HasExitTime: 1 + 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: "\u5730\u94C1\u533B\u751F\u6697" + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8347655247253602972} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &382871745978647277 +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: 99bc2eb67e506194188c5233d485dae8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &2035702373553397193 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: turnback + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5878970096344393021} + 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: 7d74348e128534747a16ed740e532254, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &5878970096344393021 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 382871745978647277} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.59016407 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &6629190222441813299 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: idle2 + 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: 9c4345ad87c702a47ac08c4e77f846ec, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &7146949021591122105 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: turn + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1804111882205638982} + 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: d9fda63085823214eb2b575476727068, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/RawResources/Actor/地铁人物/地铁医生暗/地铁医生暗.controller.meta b/Assets/RawResources/Actor/地铁人物/地铁医生暗/地铁医生暗.controller.meta new file mode 100644 index 000000000..85d73f880 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁医生暗/地铁医生暗.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a63b52b3e8d9e0441aaff086b9c1ae6b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山.aseprite b/Assets/RawResources/Actor/地铁人物/地铁火山.aseprite index 02a8d302f..b56e2faf2 100644 Binary files a/Assets/RawResources/Actor/地铁人物/地铁火山.aseprite and b/Assets/RawResources/Actor/地铁人物/地铁火山.aseprite differ diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山.aseprite.meta b/Assets/RawResources/Actor/地铁人物/地铁火山.aseprite.meta index caef01546..23f2e8f67 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁火山.aseprite.meta +++ b/Assets/RawResources/Actor/地铁人物/地铁火山.aseprite.meta @@ -18,6 +18,11 @@ ScriptedImporter: assembly: UnityEngine.AnimationModule name: turn second: {fileID: 7400000, guid: 5b1e5317a3c01ee49a9d6fcafc6f6c9d, type: 2} + - first: + type: UnityEngine:AnimationClip + assembly: UnityEngine.AnimationModule + name: turn back + second: {fileID: 7400000, guid: 3396481411f87ad4bb6071c62063a1e7, type: 2} - first: type: UnityEngine:AnimationClip assembly: UnityEngine.AnimationModule @@ -115,7 +120,7 @@ ScriptedImporter: addSortingGroup: 1 addShadowCasters: 0 importFileNodeState: 1 - platformSettingsDirtyTick: 638856191901850409 + platformSettingsDirtyTick: 638862913081952734 textureAssetName: singleSpriteImportData: - name: diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山/idle.anim b/Assets/RawResources/Actor/地铁人物/地铁火山/idle.anim index b5984fe92..b87735e27 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁火山/idle.anim +++ b/Assets/RawResources/Actor/地铁人物/地铁火山/idle.anim @@ -22,13 +22,13 @@ AnimationClip: curve: - time: 0 value: {fileID: 2360064117228472837, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 0.4 + - time: 0.3 value: {fileID: 2990586199598085165, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 0.8 + - time: 0.6 value: {fileID: -2700697087309813869, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 1.2 + - time: 0.9 value: {fileID: -2468971344451500368, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 1.6 + - time: 1.2 value: {fileID: -2468971344451500368, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} attribute: m_Sprite path: @@ -48,7 +48,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.61 + m_StopTime: 1.21 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山/idle2.anim b/Assets/RawResources/Actor/地铁人物/地铁火山/idle2.anim index 09ea659e8..0c8f8ca17 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁火山/idle2.anim +++ b/Assets/RawResources/Actor/地铁人物/地铁火山/idle2.anim @@ -22,19 +22,19 @@ AnimationClip: curve: - time: 0 value: {fileID: -6901197827070791687, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 0.4000001 + - time: 0.3000002 value: {fileID: -5529953835718180708, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 0.79999995 + - time: 0.60000014 value: {fileID: 2109848924353627652, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 1.2 + - time: 0.9000001 value: {fileID: -1889392958633554946, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 1.6000001 + - time: 1.2 value: {fileID: 931453633029854232, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 2.0000002 + - time: 1.5 value: {fileID: -5724241783417091552, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 2.3999999 + - time: 1.8000002 value: {fileID: 2996136393810681464, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 2.8 + - time: 2.1000001 value: {fileID: 2996136393810681464, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} attribute: m_Sprite path: @@ -54,7 +54,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 2.81 + m_StopTime: 2.1100001 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山/turnback.anim b/Assets/RawResources/Actor/地铁人物/地铁火山/turn back.anim similarity index 72% rename from Assets/RawResources/Actor/地铁人物/地铁火山/turnback.anim rename to Assets/RawResources/Actor/地铁人物/地铁火山/turn back.anim index 49f39051c..3d248e9eb 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁火山/turnback.anim +++ b/Assets/RawResources/Actor/地铁人物/地铁火山/turn back.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: turnback + m_Name: turn back serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -22,9 +22,9 @@ AnimationClip: curve: - time: 0 value: {fileID: -4710014530744884070, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 0.4000001 + - time: 0.3000002 value: {fileID: 656869050092131382, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 0.8000001 + - time: 0.6000002 value: {fileID: 656869050092131382, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} attribute: m_Sprite path: @@ -37,31 +37,19 @@ AnimationClip: 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: -4710014530744884070, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - {fileID: 656869050092131382, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - {fileID: 656869050092131382, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} + genericBindings: [] + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.81000006 + m_StopTime: 0.6100002 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山/turn back.anim.meta b/Assets/RawResources/Actor/地铁人物/地铁火山/turn back.anim.meta new file mode 100644 index 000000000..7b00f46c6 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山/turn back.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3396481411f87ad4bb6071c62063a1e7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山/turn.anim b/Assets/RawResources/Actor/地铁人物/地铁火山/turn.anim index ae2c21cda..947188bb0 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁火山/turn.anim +++ b/Assets/RawResources/Actor/地铁人物/地铁火山/turn.anim @@ -22,11 +22,11 @@ AnimationClip: curve: - time: 0 value: {fileID: -8557511408001388834, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 0.39999998 + - time: 0.29999995 value: {fileID: 1757130757135700974, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 0.8000001 + - time: 0.5999999 value: {fileID: 8909487138146436384, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - time: 1.2 + - time: 0.8999999 value: {fileID: 8909487138146436384, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} attribute: m_Sprite path: @@ -39,32 +39,19 @@ AnimationClip: 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: -8557511408001388834, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - {fileID: 1757130757135700974, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - {fileID: 8909487138146436384, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} - - {fileID: 8909487138146436384, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3} + genericBindings: [] + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.21 + m_StopTime: 0.9099999 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山/地铁火山.controller b/Assets/RawResources/Actor/地铁人物/地铁火山/地铁火山.controller index 0fde330f4..562ae6c30 100644 --- a/Assets/RawResources/Actor/地铁人物/地铁火山/地铁火山.controller +++ b/Assets/RawResources/Actor/地铁人物/地铁火山/地铁火山.controller @@ -69,7 +69,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: a50f7c98d35d7024890cc81b2dd8def2, type: 2} + m_Motion: {fileID: 7400000, guid: 3396481411f87ad4bb6071c62063a1e7, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山/地铁火山.png b/Assets/RawResources/Actor/地铁人物/地铁火山/地铁火山.png deleted file mode 100644 index 0370546a7..000000000 --- a/Assets/RawResources/Actor/地铁人物/地铁火山/地铁火山.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:beb90b36a8e86c8f6e375748016bac28cb798b9bea08e2906ee776ce026d2af6 -size 4393 diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山/地铁火山.png.meta b/Assets/RawResources/Actor/地铁人物/地铁火山/地铁火山.png.meta deleted file mode 100644 index deb1ee6ff..000000000 --- a/Assets/RawResources/Actor/地铁人物/地铁火山/地铁火山.png.meta +++ /dev/null @@ -1,175 +0,0 @@ -fileFormatVersion: 2 -guid: 95e3e40f4665fe247b8fe50a88243030 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 0 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 7 - spritePivot: {x: 0.5, y: 0} - spritePixelsToUnits: 21.5 - 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: 256 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - 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: 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: 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 - - serializedVersion: 3 - buildTarget: Server - 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 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 131 - height: 139 - alignment: 7 - pivot: {x: 0.5, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 06e3bcda70adb1945b6b6ee7c6107c73 - internalID: -43643558 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: - Idle: -43643558 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山暗.aseprite b/Assets/RawResources/Actor/地铁人物/地铁火山暗.aseprite new file mode 100644 index 000000000..d7a151830 Binary files /dev/null and b/Assets/RawResources/Actor/地铁人物/地铁火山暗.aseprite differ diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山暗.aseprite.meta b/Assets/RawResources/Actor/地铁人物/地铁火山暗.aseprite.meta new file mode 100644 index 000000000..47dbe10af --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗.aseprite.meta @@ -0,0 +1,664 @@ +fileFormatVersion: 2 +guid: dd23e7e6b7f9d1344ba102d33b521295 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:AnimationClip + assembly: UnityEngine.AnimationModule + name: idle + second: {fileID: 7400000, guid: 1e3303d39576ff14c88a20688a7ec346, type: 2} + - first: + type: UnityEngine:AnimationClip + assembly: UnityEngine.AnimationModule + name: idle2 + second: {fileID: 7400000, guid: 9613c94a94ca73e449868c27f940a196, type: 2} + - first: + type: UnityEngine:AnimationClip + assembly: UnityEngine.AnimationModule + name: turn + second: {fileID: 7400000, guid: b58b7a68b2f32924499a87652f2c2418, type: 2} + - first: + type: UnityEngine:AnimationClip + assembly: UnityEngine.AnimationModule + name: turnback + second: {fileID: 7400000, guid: b62ce5d0b3c0a88499468c3c340c5807, type: 2} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 62a9f0aa5b59740cfbadc7e5f9823bb0, type: 3} + textureImporterSettings: + alphaSource: 1 + mipMapMode: 0 + enableMipMap: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + convertToNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + swizzle: 50462976 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + nPOTScale: 1 + sRGBTexture: 1 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 21.5 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 0 + flipbookColumns: 0 + ignorePngGamma: 0 + cookieMode: 0 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + normalMap: 0 + textureFormat: 0 + maxTextureSize: 0 + lightmap: 0 + compressionQuality: 0 + linearTexture: 0 + grayScaleToAlpha: 0 + rGBM: 0 + cubemapConvolutionSteps: 0 + cubemapConvolutionExponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + previousAsepriteImporterSettings: + fileImportMode: 1 + importHiddenLayers: 0 + layerImportMode: 1 + defaultPivotSpace: 0 + defaultPivotAlignment: 7 + customPivotPosition: {x: 0.5, y: 0.5} + spritePadding: 0 + generateModelPrefab: 1 + generateAnimationClips: 1 + addSortingGroup: 1 + addShadowCasters: 0 + asepriteImporterSettings: + fileImportMode: 1 + importHiddenLayers: 0 + layerImportMode: 1 + defaultPivotSpace: 0 + defaultPivotAlignment: 7 + customPivotPosition: {x: 0.5, y: 0.5} + spritePadding: 0 + generateModelPrefab: 1 + generateAnimationClips: 1 + addSortingGroup: 1 + addShadowCasters: 0 + importFileNodeState: 1 + platformSettingsDirtyTick: 638862925968103847 + textureAssetName: + singleSpriteImportData: + - name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 0, y: 0} + animatedSpriteImportData: + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_0" + originalName: + pivot: {x: 0.5340909, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 590 + width: 132 + height: 139 + spriteID: 31f19a21ce40fc942a9e9254e868e183 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 590} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_2" + originalName: + pivot: {x: 0.5300752, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 298 + width: 133 + height: 138 + spriteID: 06228f2746ca16e40b1f738a5ad87f92 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 298} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_3" + originalName: + pivot: {x: 0.52611935, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 285 + y: 4 + width: 134 + height: 136 + spriteID: 7a1d3a7ccf32d5941b555fb13cc4e795 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 285, y: 4} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_5" + originalName: + pivot: {x: 0.5300752, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 4 + width: 133 + height: 139 + spriteID: 9872d045ed3c8104e8e1b52bfd49fd17 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_6" + originalName: + pivot: {x: 0.5340909, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 737 + width: 132 + height: 139 + spriteID: 5c1b4ceaef1e0a4479af6817b88d0366 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 737} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_8" + originalName: + pivot: {x: 0.5340909, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 145 + y: 739 + width: 132 + height: 138 + spriteID: d8472872be86cc84f87d54f8dccfed49 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 145, y: 739} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_1" + originalName: + pivot: {x: 0.5340909, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 145 + y: 4 + width: 132 + height: 139 + spriteID: fc1acd1d6f9189b4aa6f40763c2bd16e + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 145, y: 4} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_4" + originalName: + pivot: {x: 0.5300752, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 444 + width: 133 + height: 138 + spriteID: 836cc8750f14677469f78cc0c3e108f6 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 444} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_7" + originalName: + pivot: {x: 0.5340909, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 145 + y: 151 + width: 132 + height: 139 + spriteID: 46d104fe75f0d1e42a10f364a9f3de41 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 145, y: 151} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_9" + originalName: + pivot: {x: 0.5340909, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 285 + y: 148 + width: 132 + height: 138 + spriteID: aa31138fb49962146a5039136e1b8238 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 285, y: 148} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_10" + originalName: + pivot: {x: 0.5340909, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 145 + y: 298 + width: 132 + height: 139 + spriteID: 0260046ccc788af4ba0a4a18e7685f9d + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 145, y: 298} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_11" + originalName: + pivot: {x: 0.5340909, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 145 + y: 445 + width: 132 + height: 139 + spriteID: e4c14f2d7bb4bcc4ab5af6c8cf93db3a + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 145, y: 445} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_12" + originalName: + pivot: {x: 0.5340909, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 285 + y: 294 + width: 132 + height: 138 + spriteID: b2f1e8f508faf064d934920a3d6bc14b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 285, y: 294} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_13" + originalName: + pivot: {x: 0.5340909, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 285 + y: 440 + width: 132 + height: 138 + spriteID: 0dfcd8c471c2f33489c67de6a63dd355 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 285, y: 440} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_14" + originalName: + pivot: {x: 0.5300752, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 151 + width: 133 + height: 139 + spriteID: 6d832cf806d3f184b9747936f32b58a1 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 151} + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_15" + originalName: + pivot: {x: 0.5340909, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 145 + y: 592 + width: 132 + height: 139 + spriteID: f1dca7b1acd231e42bd5e10e7d636d67 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 145, y: 592} + spriteSheetImportData: [] + asepriteLayers: + - layerIndex: 0 + guid: 1687885098 + name: "\u5730\u94C1\u706B\u5C71\u6697" + layerFlags: 0 + layerType: 0 + blendMode: 0 + cells: + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_0" + frameIndex: 0 + cellRect: + x: 13 + y: 0 + width: 132 + height: 139 + spriteId: 31f19a21ce40fc942a9e9254e868e183 + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_2" + frameIndex: 2 + cellRect: + x: 13 + y: 0 + width: 133 + height: 138 + spriteId: 06228f2746ca16e40b1f738a5ad87f92 + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_3" + frameIndex: 3 + cellRect: + x: 13 + y: 0 + width: 134 + height: 136 + spriteId: 7a1d3a7ccf32d5941b555fb13cc4e795 + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_5" + frameIndex: 5 + cellRect: + x: 13 + y: 0 + width: 133 + height: 139 + spriteId: 9872d045ed3c8104e8e1b52bfd49fd17 + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_6" + frameIndex: 6 + cellRect: + x: 13 + y: 0 + width: 132 + height: 139 + spriteId: 5c1b4ceaef1e0a4479af6817b88d0366 + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_8" + frameIndex: 8 + cellRect: + x: 13 + y: 0 + width: 132 + height: 138 + spriteId: d8472872be86cc84f87d54f8dccfed49 + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_1" + frameIndex: 1 + cellRect: + x: 13 + y: 0 + width: 132 + height: 139 + spriteId: fc1acd1d6f9189b4aa6f40763c2bd16e + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_4" + frameIndex: 4 + cellRect: + x: 13 + y: 0 + width: 133 + height: 138 + spriteId: 836cc8750f14677469f78cc0c3e108f6 + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_7" + frameIndex: 7 + cellRect: + x: 13 + y: 0 + width: 132 + height: 139 + spriteId: 46d104fe75f0d1e42a10f364a9f3de41 + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_9" + frameIndex: 9 + cellRect: + x: 13 + y: 0 + width: 132 + height: 138 + spriteId: aa31138fb49962146a5039136e1b8238 + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_10" + frameIndex: 10 + cellRect: + x: 13 + y: 0 + width: 132 + height: 139 + spriteId: 0260046ccc788af4ba0a4a18e7685f9d + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_11" + frameIndex: 11 + cellRect: + x: 13 + y: 0 + width: 132 + height: 139 + spriteId: e4c14f2d7bb4bcc4ab5af6c8cf93db3a + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_12" + frameIndex: 12 + cellRect: + x: 13 + y: 0 + width: 132 + height: 138 + spriteId: b2f1e8f508faf064d934920a3d6bc14b + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_13" + frameIndex: 13 + cellRect: + x: 13 + y: 0 + width: 132 + height: 138 + spriteId: 0dfcd8c471c2f33489c67de6a63dd355 + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_14" + frameIndex: 14 + cellRect: + x: 13 + y: 0 + width: 133 + height: 139 + spriteId: 6d832cf806d3f184b9747936f32b58a1 + - name: "\u5730\u94C1\u706B\u5C71\u6697_Frame_15" + frameIndex: 15 + cellRect: + x: 13 + y: 0 + width: 132 + height: 139 + spriteId: f1dca7b1acd231e42bd5e10e7d636d67 + linkedCells: [] + parentIndex: -1 + platformSettings: + - name: DefaultTexturePlatform + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Standalone + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Server + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Android + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: WebGL + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + secondarySpriteTextures: [] + spritePackingTag: + canvasSize: {x: 167, y: 151} diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山暗.meta b/Assets/RawResources/Actor/地铁人物/地铁火山暗.meta new file mode 100644 index 000000000..ce157cb1a --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66e0eecb2d1b37b4bafe69b6c200478b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山暗/idle.anim b/Assets/RawResources/Actor/地铁人物/地铁火山暗/idle.anim new file mode 100644 index 000000000..f9cc2813a --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗/idle.anim @@ -0,0 +1,70 @@ +%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: 209853762449031371, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 0.3 + value: {fileID: -398593412638602152, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 0.6 + value: {fileID: 8519804971850580941, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 0.9 + value: {fileID: -7405753667283323557, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 1.2 + value: {fileID: -7405753667283323557, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 100 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.21 + 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: 0 + 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/RawResources/Actor/地铁人物/地铁火山暗/idle.anim.meta b/Assets/RawResources/Actor/地铁人物/地铁火山暗/idle.anim.meta new file mode 100644 index 000000000..f5d47db77 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗/idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e3303d39576ff14c88a20688a7ec346 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山暗/idle2.anim b/Assets/RawResources/Actor/地铁人物/地铁火山暗/idle2.anim new file mode 100644 index 000000000..deade9939 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗/idle2.anim @@ -0,0 +1,76 @@ +%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: idle2 + 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: 3600661132109203970, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 0.3000002 + value: {fileID: -1178415474175762337, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 0.60000014 + value: {fileID: -2045445296245720620, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 0.9000001 + value: {fileID: 3389665541788505032, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 1.2 + value: {fileID: 3910535623225092448, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 1.5 + value: {fileID: -2029117818597250475, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 1.8000002 + value: {fileID: 5931372841857555190, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 2.1000001 + value: {fileID: 5931372841857555190, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 100 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2.1100001 + 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: 0 + 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/RawResources/Actor/地铁人物/地铁火山暗/idle2.anim.meta b/Assets/RawResources/Actor/地铁人物/地铁火山暗/idle2.anim.meta new file mode 100644 index 000000000..3cbc3bb33 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗/idle2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9613c94a94ca73e449868c27f940a196 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山暗/turn.anim b/Assets/RawResources/Actor/地铁人物/地铁火山暗/turn.anim new file mode 100644 index 000000000..cfe863a83 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗/turn.anim @@ -0,0 +1,68 @@ +%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: turn + 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: 6592904029311890969, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 0.29999995 + value: {fileID: 4494318350955044967, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 0.5999999 + value: {fileID: -5468880018882307505, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 0.8999999 + value: {fileID: -5468880018882307505, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 100 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.9099999 + 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: 0 + 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/RawResources/Actor/地铁人物/地铁火山暗/turn.anim.meta b/Assets/RawResources/Actor/地铁人物/地铁火山暗/turn.anim.meta new file mode 100644 index 000000000..4b756fb8d --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗/turn.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b58b7a68b2f32924499a87652f2c2418 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山暗/turnback.anim b/Assets/RawResources/Actor/地铁人物/地铁火山暗/turnback.anim new file mode 100644 index 000000000..ed6d1cdb4 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗/turnback.anim @@ -0,0 +1,66 @@ +%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: turnback + 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: -6606804407375934698, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 0.3000002 + value: {fileID: -1328516328780230178, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + - time: 0.6000002 + value: {fileID: -1328516328780230178, guid: dd23e7e6b7f9d1344ba102d33b521295, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 100 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6100002 + 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: 0 + 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/RawResources/Actor/地铁人物/地铁火山暗/turnback.anim.meta b/Assets/RawResources/Actor/地铁人物/地铁火山暗/turnback.anim.meta new file mode 100644 index 000000000..5f1c8b525 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗/turnback.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b62ce5d0b3c0a88499468c3c340c5807 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山暗/地铁火山暗.controller b/Assets/RawResources/Actor/地铁人物/地铁火山暗/地铁火山暗.controller new file mode 100644 index 000000000..45bb67771 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗/地铁火山暗.controller @@ -0,0 +1,205 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7218884433918560032 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6024142366465004354} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7252747 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-6024142366465004354 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: idle2 + 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: 9613c94a94ca73e449868c27f940a196, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4402646730992897449 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: turnback + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4318926645808293950} + 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: b62ce5d0b3c0a88499468c3c340c5807, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-4365245289257163727 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 3002605325862562607} + m_Position: {x: 250, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7431319653775752477} + m_Position: {x: 250, y: 40, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6024142366465004354} + m_Position: {x: 500, y: 40, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4402646730992897449} + m_Position: {x: 500, y: 120, 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: 3002605325862562607} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u5730\u94C1\u706B\u5C71\u6697" + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4365245289257163727} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &3002605325862562607 +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: 1e3303d39576ff14c88a20688a7ec346, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &4318926645808293950 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3002605325862562607} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.59016407 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &7431319653775752477 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: turn + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7218884433918560032} + 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: b58b7a68b2f32924499a87652f2c2418, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/RawResources/Actor/地铁人物/地铁火山暗/地铁火山暗.controller.meta b/Assets/RawResources/Actor/地铁人物/地铁火山暗/地铁火山暗.controller.meta new file mode 100644 index 000000000..57ba8f625 --- /dev/null +++ b/Assets/RawResources/Actor/地铁人物/地铁火山暗/地铁火山暗.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40f07326ace570241bd93fcfc3decb87 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Art/地铁相关/月台.png b/Assets/RawResources/Art/地铁相关/月台.png deleted file mode 100644 index 57694b1b1..000000000 --- a/Assets/RawResources/Art/地铁相关/月台.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a7ca6cf39f62b0d44f812434f63984d8ad4bc952e8e1023d7db2609e0b56339 -size 107934 diff --git a/Assets/RawResources/Art/地铁相关/月台.png.meta b/Assets/RawResources/Art/地铁相关/月台.png.meta deleted file mode 100644 index a5b064ce7..000000000 --- a/Assets/RawResources/Art/地铁相关/月台.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: 05a1931cafc565948a24fce6a63dbe99 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 0 - 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: 21.5 - 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: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - 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: 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: 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 - - serializedVersion: 3 - buildTarget: Server - 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: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/RawResources/Art/地铁相关/月台.psd b/Assets/RawResources/Art/地铁相关/月台.psd new file mode 100644 index 000000000..b129fe294 --- /dev/null +++ b/Assets/RawResources/Art/地铁相关/月台.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24ec43f9ea759e12679812063e1af4468012d8483c37965edb4215aa67fd352d +size 989932 diff --git a/Assets/RawResources/Art/地铁相关/月台.psd.meta b/Assets/RawResources/Art/地铁相关/月台.psd.meta new file mode 100644 index 000000000..7a8c39752 --- /dev/null +++ b/Assets/RawResources/Art/地铁相关/月台.psd.meta @@ -0,0 +1,299 @@ +fileFormatVersion: 2 +guid: fd71a10565f61484981023671009e62c +importerOverride: + nativeImporterType: 2089858483 + scriptedImporterType: + serializedVersion: 2 + Hash: b10b55a1aa6a1aa32521bc0cab59632e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: b2a9591990af98743ba3ff7cf1000886, type: 3} + textureImporterSettings: + alphaSource: 1 + mipMapMode: 0 + enableMipMap: 1 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + convertToNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + swizzle: 50462976 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + nPOTScale: 1 + sRGBTexture: 1 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 21.5 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 0 + flipbookColumns: 0 + ignorePngGamma: 0 + cookieMode: 0 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + normalMap: 0 + textureFormat: 0 + maxTextureSize: 0 + lightmap: 0 + compressionQuality: 0 + linearTexture: 0 + grayScaleToAlpha: 0 + rGBM: 0 + cubemapConvolutionSteps: 0 + cubemapConvolutionExponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + spriteImportData: + - name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} + mosaicSpriteImportData: [] + rigSpriteImportData: + - name: "\u6708\u53F0NPC Copy" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 228 + width: 447 + height: 82 + spriteID: 4bd2229a0eb88c648840316196d7b428 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 228} + spritePosition: {x: 1619, y: 27} + - name: "\u6708\u53F0NPC" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 318 + width: 305 + height: 83 + spriteID: c1c29741dac257c46b04614fbd0530f2 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 318} + spritePosition: {x: 1784, y: 28} + - name: "\u6708\u53F0" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 4 + width: 3840 + height: 216 + spriteID: 76aed042c6b758b4582e5ed1453b30b4 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} + characterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + sharedRigSpriteImportData: [] + sharedRigCharacterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + platformSettings: + - name: DefaultTexturePlatform + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Standalone + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Server + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Android + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: WebGL + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + mosaicLayers: 1 + characterMode: 1 + documentPivot: {x: 0, y: 0} + documentAlignment: 0 + importHiddenLayers: 0 + layerMappingOption: 2 + generatePhysicsShape: 0 + paperDollMode: 0 + keepDupilcateSpriteName: 1 + skeletonAssetReferenceID: + padding: 4 + spriteSizeExpand: 0 + spriteCategoryList: + categories: [] + spritePackingTag: + resliceFromLayer: 0 + mosaicPSDLayers: [] + rigPSDLayers: + - name: "\u6708\u53F0NPC Copy" + spriteName: "\u6708\u53F0NPC Copy" + isGroup: 0 + parentIndex: -1 + spriteID: 4bd2229a0eb88c648840316196d7b428 + layerID: 4 + mosaicPosition: {x: 4, y: 228} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6708\u53F0NPC" + spriteName: "\u6708\u53F0NPC" + isGroup: 0 + parentIndex: -1 + spriteID: c1c29741dac257c46b04614fbd0530f2 + layerID: 3 + mosaicPosition: {x: 4, y: 318} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6708\u53F0" + spriteName: "\u6708\u53F0" + isGroup: 0 + parentIndex: -1 + spriteID: 76aed042c6b758b4582e5ed1453b30b4 + layerID: 7 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + sharedRigPSDLayers: [] + pSDLayerImportSetting: [] + importFileNodeState: 1 + platformSettingsDirtyTick: 638862886471565548 + spriteSizeExpandChanged: 0 + generateGOHierarchy: 0 + textureAssetName: + prefabAssetName: + spriteLibAssetName: + skeletonAssetName: + secondarySpriteTextures: [] diff --git a/Assets/RawResources/Art/地铁相关/车厢.psd b/Assets/RawResources/Art/地铁相关/车厢.psd index ecf810113..e705868ec 100644 --- a/Assets/RawResources/Art/地铁相关/车厢.psd +++ b/Assets/RawResources/Art/地铁相关/车厢.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e5e1b3e8c6db2390de98790ca4bb6e0a3b8e80bc070a00629dcf6479564593e -size 305121 +oid sha256:f87ffdd571d11cec5e650e32fb78890cf0e5d2b08e8b8fadb04267056974a17d +size 417959 diff --git a/Assets/RawResources/Art/地铁相关/车厢.psd.meta b/Assets/RawResources/Art/地铁相关/车厢.psd.meta index dbd0b06f1..5a575527b 100644 --- a/Assets/RawResources/Art/地铁相关/车厢.psd.meta +++ b/Assets/RawResources/Art/地铁相关/车厢.psd.meta @@ -106,7 +106,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 228 + y: 452 width: 714 height: 24 spriteID: a3912a2bfb6c7e144be3dfd6d91de611 @@ -117,7 +117,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 228} + uvTransform: {x: 4, y: 452} spritePosition: {x: 0, y: 0} - name: "\u6276\u624BA" originalName: @@ -169,7 +169,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 260 + y: 484 width: 435 height: 14 spriteID: 765730de7c407aa439e42df86a903a85 @@ -180,9 +180,9 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 260} + uvTransform: {x: 4, y: 484} spritePosition: {x: 184, y: 170} - - name: "\u8F66\u53A2" + - name: "\u6697\u8F66\u53A2" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -193,7 +193,7 @@ ScriptedImporter: y: 4 width: 714 height: 216 - spriteID: 20ce7d1b34e2ee54fade37d8719cd3be + spriteID: 1a77de91329ee24409cc9588a37da613 spriteBone: [] spriteOutline: [] vertices: [] @@ -203,6 +203,27 @@ ScriptedImporter: tessellationDetail: 0 uvTransform: {x: 4, y: 4} spritePosition: {x: 0, y: 0} + - name: "\u8F66\u53A2" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 228 + width: 714 + height: 216 + spriteID: 20ce7d1b34e2ee54fade37d8719cd3be + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 228} + spritePosition: {x: 0, y: 0} rigSpriteImportData: - name: "\u524D\u6392\u5EA7\u6905" originalName: @@ -408,7 +429,7 @@ ScriptedImporter: parentIndex: -1 spriteID: a3912a2bfb6c7e144be3dfd6d91de611 layerID: 6 - mosaicPosition: {x: 4, y: 228} + mosaicPosition: {x: 4, y: 452} flatten: 0 isImported: 1 isVisible: 1 @@ -438,7 +459,17 @@ ScriptedImporter: parentIndex: -1 spriteID: 765730de7c407aa439e42df86a903a85 layerID: 3 - mosaicPosition: {x: 4, y: 260} + mosaicPosition: {x: 4, y: 484} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6697\u8F66\u53A2" + spriteName: "\u6697\u8F66\u53A2" + isGroup: 0 + parentIndex: -1 + spriteID: 1a77de91329ee24409cc9588a37da613 + layerID: 8 + mosaicPosition: {x: 4, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -448,7 +479,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 20ce7d1b34e2ee54fade37d8719cd3be layerID: 2 - mosaicPosition: {x: 4, y: 4} + mosaicPosition: {x: 4, y: 228} flatten: 0 isImported: 1 isVisible: 1 diff --git a/Assets/Resources/Yarn/FP_Prologue/Center.yarn b/Assets/Resources/Yarn/FP_Prologue/Center.yarn index 62bf8699b..3e7114f16 100644 --- a/Assets/Resources/Yarn/FP_Prologue/Center.yarn +++ b/Assets/Resources/Yarn/FP_Prologue/Center.yarn @@ -19,7 +19,7 @@ position: 205,199 //【流程相关】 //gamestage:1-引入对话；2-检查；3-检查后对话；4-调速；5-调速后对话（冷却液） -<> +<> <> <> <> diff --git a/Assets/Scenes/SubWay.unity b/Assets/Scenes/SubWay.unity index 7f298f0f6..f78f778e6 100644 --- a/Assets/Scenes/SubWay.unity +++ b/Assets/Scenes/SubWay.unity @@ -1255,7 +1255,9 @@ Transform: m_LocalPosition: {x: 107, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6011982873022618265} + - {fileID: 7011471149732556918} m_Father: {fileID: 969974276} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &459431858 @@ -1299,7 +1301,7 @@ SpriteRenderer: m_SortingLayerID: 1560193523 m_SortingLayer: -1 m_SortingOrder: 51 - m_Sprite: {fileID: 21300000, guid: 05a1931cafc565948a24fce6a63dbe99, type: 3} + m_Sprite: {fileID: 8270354366510368969, guid: fd71a10565f61484981023671009e62c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -3321,8 +3323,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7ce5564f908241b58f1376a5a6eae55e, type: 3} m_Name: m_EditorClassIdentifier: - initOnAwake: 1 - defaultTime: 2 + initOnAwake: 0 + defaultTime: 1 defaultWeather: 0 --- !u!4 &1929645612 Transform: @@ -3795,6 +3797,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &2983744810329580804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7011471149732556918} + - component: {fileID: 6626174042127066341} + m_Layer: 0 + m_Name: "\u6708\u53F0NPC Copy" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &3447714033233166438 Transform: m_ObjectHideFlags: 0 @@ -3810,6 +3829,58 @@ Transform: m_Children: [] m_Father: {fileID: 1207944149} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3451061875698856556 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8722537419231801560} + 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_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_SortingLayerID: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 53 + m_Sprite: {fileID: 1770464702371791450, guid: fd71a10565f61484981023671009e62c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 14.186047, y: 3.860465} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!212 &3485258189182791036 SpriteRenderer: m_ObjectHideFlags: 0 @@ -4271,6 +4342,21 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!4 &6011982873022618265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8722537419231801560} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.7674484, y: -1.7906978, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 459431857} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &6086942936004952135 Transform: m_ObjectHideFlags: 0 @@ -4338,6 +4424,58 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 1 m_SpriteSortPoint: 0 +--- !u!212 &6626174042127066341 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2983744810329580804} + 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_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_SortingLayerID: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 52 + m_Sprite: {fileID: 3399881772415823923, guid: fd71a10565f61484981023671009e62c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 20.790697, y: 3.8139534} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!4 &6628782913543680617 Transform: m_ObjectHideFlags: 0 @@ -4408,6 +4546,21 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!4 &7011471149732556918 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2983744810329580804} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.6046448, y: -1.860465, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 459431857} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &7246233489877852209 Animator: serializedVersion: 5 @@ -4824,6 +4977,23 @@ MonoBehaviour: - time: 2 weather: 0 sprite: {fileID: -2111994414467443159, guid: 660c87b6732769b49a9b7119b54ede83, type: 3} +--- !u!1 &8722537419231801560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6011982873022618265} + - component: {fileID: 3451061875698856556} + m_Layer: 0 + m_Name: "\u6708\u53F0NPC" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!212 &8861695100661960901 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FixSystemNew/Screen System/TaskScreen.cs b/Assets/Scripts/FixSystemNew/Screen System/TaskScreen.cs index 88d11ff13..4e4c59d69 100644 --- a/Assets/Scripts/FixSystemNew/Screen System/TaskScreen.cs +++ b/Assets/Scripts/FixSystemNew/Screen System/TaskScreen.cs @@ -46,6 +46,14 @@ namespace AibisDream public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, string lineId, bool isAutoSkip = false) { + if (_taskDict.ContainsKey(lineId)) + { + EnumEventSystem.Global.Send(DialogEventEnum.LineShown); + EnumEventSystem.Global.Send(DialogEventEnum.LineEnd); + nextStep.Invoke(); + return; + } + var taskItem = Instantiate(_taskItemPrefab, _taskListParent); var task = taskItem.GetComponent(); task.text = $"\u25cf {dialogLine}";