diff --git a/Assets/GameContent/Scene_ClincOut/animationRaw/外出佩佩天桥上挥手动画.png.meta b/Assets/GameContent/Scene_ClincOut/animationRaw/外出佩佩天桥上挥手动画.png.meta index 98c90d5e5..005f0e9f1 100644 --- a/Assets/GameContent/Scene_ClincOut/animationRaw/外出佩佩天桥上挥手动画.png.meta +++ b/Assets/GameContent/Scene_ClincOut/animationRaw/外出佩佩天桥上挥手动画.png.meta @@ -132,6 +132,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/GameContent/Scene_ClincOut/animationRaw/外出医生动画.png.meta b/Assets/GameContent/Scene_ClincOut/animationRaw/外出医生动画.png.meta index f05e6251c..9900af07d 100644 --- a/Assets/GameContent/Scene_ClincOut/animationRaw/外出医生动画.png.meta +++ b/Assets/GameContent/Scene_ClincOut/animationRaw/外出医生动画.png.meta @@ -132,6 +132,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/GameContent/Scene_ClincOut/controller/外出佩佩动画.controller b/Assets/GameContent/Scene_ClincOut/controller/外出佩佩动画.controller index 8364995d8..f09bc1c24 100644 --- a/Assets/GameContent/Scene_ClincOut/controller/外出佩佩动画.controller +++ b/Assets/GameContent/Scene_ClincOut/controller/外出佩佩动画.controller @@ -1,5 +1,57 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8696484359776113309 +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: 568706136c5d98746b4f42c422429cff, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-3868665583142346324 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LOOP + 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: 1bcea1b5f5521a4479d45fcc24827833, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -42,13 +94,91 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: e20c69477ca8fa94ca1bdf632e6593a4, type: 2} + m_Motion: {fileID: 7400000, guid: 38652d860b6b31744a8f07f7b160880c, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &5428450754003371519 +--- !u!1102 &735897414780199443 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GET + 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: e5bbe6c6443795c4dac92282d21ea2c2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &2018828444822549541 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: lift up + 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: fbc6e581648111849993b553bc7e0bf1, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &2071079180772408772 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CATCHING + 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: 8d7f6a13c16553e448788e5ea5d18b03, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &6301476670225981927 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -68,7 +198,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: f468217ea82a20c428e4018154d7858b, type: 2} + m_Motion: {fileID: 7400000, guid: 056d0141cb9f29f47a654e2957e76426, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -85,10 +215,25 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 686793158106515661} - m_Position: {x: 230, y: 0, z: 0} + m_Position: {x: 280, y: 110, z: 0} - serializedVersion: 1 - m_State: {fileID: 5428450754003371519} - m_Position: {x: 260, y: 90, z: 0} + m_State: {fileID: 6301476670225981927} + m_Position: {x: 500, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2071079180772408772} + m_Position: {x: 500, y: 230, z: 0} + - serializedVersion: 1 + m_State: {fileID: 735897414780199443} + m_Position: {x: 280, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8696484359776113309} + m_Position: {x: 280, y: 230, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2018828444822549541} + m_Position: {x: 500, y: 290, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3868665583142346324} + m_Position: {x: 280, y: 290, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -96,6 +241,6 @@ AnimatorStateMachine: 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_ExitPosition: {x: 930, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 686793158106515661} diff --git a/Assets/RawResources/Actor/外出佩佩动画.aseprite.meta b/Assets/RawResources/Actor/外出佩佩动画.aseprite.meta index 612110a82..1063f55aa 100644 --- a/Assets/RawResources/Actor/外出佩佩动画.aseprite.meta +++ b/Assets/RawResources/Actor/外出佩佩动画.aseprite.meta @@ -2,27 +2,7 @@ fileFormatVersion: 2 guid: 19d56b05fbd8fba4f9df2b4e9d4b77c1 ScriptedImporter: internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:AnimationClip - assembly: UnityEngine.AnimationModule - name: ABOVE - second: {fileID: 7400000, guid: 9f5bde8a704b30c4599434547655efc3, type: 2} - - first: - type: UnityEngine:AnimationClip - assembly: UnityEngine.AnimationModule - name: BACK - second: {fileID: 7400000, guid: f468217ea82a20c428e4018154d7858b, type: 2} - - first: - type: UnityEngine:AnimationClip - assembly: UnityEngine.AnimationModule - name: HOODBACK - second: {fileID: 7400000, guid: e20c69477ca8fa94ca1bdf632e6593a4, type: 2} - - first: - type: UnityEngine:AnimationClip - assembly: UnityEngine.AnimationModule - name: WAVE - second: {fileID: 7400000, guid: 10255ae127abc4e49b14321e3830748d, type: 2} + externalObjects: {} serializedVersion: 2 userData: assetBundleName: @@ -55,7 +35,7 @@ ScriptedImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 43 + spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 0 generateCubemap: 6 @@ -115,7 +95,7 @@ ScriptedImporter: addSortingGroup: 1 addShadowCasters: 0 importFileNodeState: 1 - platformSettingsDirtyTick: 638842206422956391 + platformSettingsDirtyTick: 0 textureAssetName: singleSpriteImportData: - name: @@ -150,7 +130,7 @@ ScriptedImporter: y: 154 width: 84 height: 135 - spriteID: 4a9b323fb378a12449c90e4453f25d62 + spriteID: c27f3ad437124db48bda8694bf8dd26a spriteBone: [] spriteOutline: [] vertices: [] @@ -170,7 +150,7 @@ ScriptedImporter: y: 297 width: 84 height: 135 - spriteID: a782fc670dd2b8744bf5ff7ffc9e55f0 + spriteID: c690ec51f27c67d4bbe70612899344f5 spriteBone: [] spriteOutline: [] vertices: [] @@ -190,7 +170,7 @@ ScriptedImporter: y: 4 width: 84 height: 135 - spriteID: d72b4cac6cd9d8341a961cab9c29a2fd + spriteID: ba63b5dbd76e3da43a68a082a202e254 spriteBone: [] spriteOutline: [] vertices: [] @@ -210,7 +190,7 @@ ScriptedImporter: y: 147 width: 84 height: 135 - spriteID: b40f5a118c52f114a95044fa6b9f18c9 + spriteID: 1a61176a90f52494da5ace5cc208257b spriteBone: [] spriteOutline: [] vertices: [] @@ -230,7 +210,7 @@ ScriptedImporter: y: 4 width: 84 height: 142 - spriteID: 31ef83af1765f0645ab86bed18782520 + spriteID: 0fab7b2ca8c90784a909932ba584bb9b spriteBone: [] spriteOutline: [] vertices: [] @@ -250,7 +230,7 @@ ScriptedImporter: y: 154 width: 84 height: 142 - spriteID: e4542f886f4bec04094c530475594bc0 + spriteID: 4cd259fed5a090a49b39cc4320f920fb spriteBone: [] spriteOutline: [] vertices: [] @@ -270,7 +250,7 @@ ScriptedImporter: y: 304 width: 84 height: 142 - spriteID: 4b2d1cb4a285f26418e09bd5432a5541 + spriteID: 4fc9947a7fcf278469aea2cc0223a90e spriteBone: [] spriteOutline: [] vertices: [] @@ -290,7 +270,7 @@ ScriptedImporter: y: 4 width: 84 height: 142 - spriteID: 8ea6287cabcb6aa4f9c448f55b5a05a6 + spriteID: 0dfbb8ef39eab9c4e97ca3108876eb1d spriteBone: [] spriteOutline: [] vertices: [] @@ -315,7 +295,7 @@ ScriptedImporter: y: -4 width: 84 height: 135 - spriteId: 4a9b323fb378a12449c90e4453f25d62 + spriteId: c27f3ad437124db48bda8694bf8dd26a - name: "\u5916\u51FA\u4F69\u4F69\u52A8\u753B_Frame_5" frameIndex: 5 cellRect: @@ -323,7 +303,7 @@ ScriptedImporter: y: -4 width: 84 height: 135 - spriteId: a782fc670dd2b8744bf5ff7ffc9e55f0 + spriteId: c690ec51f27c67d4bbe70612899344f5 - name: "\u5916\u51FA\u4F69\u4F69\u52A8\u753B_Frame_6" frameIndex: 6 cellRect: @@ -331,7 +311,7 @@ ScriptedImporter: y: -4 width: 84 height: 135 - spriteId: d72b4cac6cd9d8341a961cab9c29a2fd + spriteId: ba63b5dbd76e3da43a68a082a202e254 - name: "\u5916\u51FA\u4F69\u4F69\u52A8\u753B_Frame_7" frameIndex: 7 cellRect: @@ -339,7 +319,7 @@ ScriptedImporter: y: -4 width: 84 height: 135 - spriteId: b40f5a118c52f114a95044fa6b9f18c9 + spriteId: 1a61176a90f52494da5ace5cc208257b - name: "\u5916\u51FA\u4F69\u4F69\u52A8\u753B_Frame_0" frameIndex: 0 cellRect: @@ -347,7 +327,7 @@ ScriptedImporter: y: -4 width: 84 height: 142 - spriteId: 31ef83af1765f0645ab86bed18782520 + spriteId: 0fab7b2ca8c90784a909932ba584bb9b - name: "\u5916\u51FA\u4F69\u4F69\u52A8\u753B_Frame_1" frameIndex: 1 cellRect: @@ -355,7 +335,7 @@ ScriptedImporter: y: -4 width: 84 height: 142 - spriteId: e4542f886f4bec04094c530475594bc0 + spriteId: 4cd259fed5a090a49b39cc4320f920fb - name: "\u5916\u51FA\u4F69\u4F69\u52A8\u753B_Frame_2" frameIndex: 2 cellRect: @@ -363,7 +343,7 @@ ScriptedImporter: y: -4 width: 84 height: 142 - spriteId: 4b2d1cb4a285f26418e09bd5432a5541 + spriteId: 4fc9947a7fcf278469aea2cc0223a90e - name: "\u5916\u51FA\u4F69\u4F69\u52A8\u753B_Frame_3" frameIndex: 3 cellRect: @@ -371,70 +351,10 @@ ScriptedImporter: y: -4 width: 84 height: 142 - spriteId: 8ea6287cabcb6aa4f9c448f55b5a05a6 + spriteId: 0dfbb8ef39eab9c4e97ca3108876eb1d 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 + platformSettings: [] secondarySpriteTextures: [] spritePackingTag: canvasSize: {x: 87, y: 139}