diff --git a/Assets/AddressableAssetsData/AssetGroups/Scene_Bar.asset b/Assets/AddressableAssetsData/AssetGroups/Scene_Bar.asset index a42743951..55cc7b5e7 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Scene_Bar.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Scene_Bar.asset @@ -37,11 +37,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 7ba8eca4e18291341a10ef7c8c858bd9 - m_Address: "Animation/\u9152\u5427\u533B\u751F" - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 5f26e5dcbc809104f92f908082de97d5 m_Address: "Animation/\u8C03\u9152\u59B9\u6D4B\u8BD5" m_ReadOnly: 0 diff --git a/Assets/GameContent/Scene_Bar/animation/breathe2.anim b/Assets/GameContent/Scene_Bar/animation/breathe2.anim deleted file mode 100644 index ddd2bb81c..000000000 --- a/Assets/GameContent/Scene_Bar/animation/breathe2.anim +++ /dev/null @@ -1,70 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: breathe2 - 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: -5434132881220064168, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 0.4000001 - value: {fileID: 8044891020412161781, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 0.9000001 - value: {fileID: 5003902666465592400, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 1.4000001 - value: {fileID: -8144785932942564333, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 1.9000001 - value: {fileID: -8144785932942564333, guid: 5d0076f62a8b558488c6b6e7d9dc405e, 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.9100001 - 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/GameContent/Scene_Bar/animation/transition.anim b/Assets/GameContent/Scene_Bar/animation/transition.anim deleted file mode 100644 index 8e828a7a9..000000000 --- a/Assets/GameContent/Scene_Bar/animation/transition.anim +++ /dev/null @@ -1,68 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: transition - 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: 3367836725992432288, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 0.30000007 - value: {fileID: 7850325496264352535, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 0.49999988 - value: {fileID: -6970686742144224756, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 0.69999987 - value: {fileID: -6970686742144224756, guid: 5d0076f62a8b558488c6b6e7d9dc405e, 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.70999986 - 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/GameContent/Scene_Bar/animation/酒吧内.anim.meta b/Assets/GameContent/Scene_Bar/animation/酒吧内.anim.meta deleted file mode 100644 index e9d145d8e..000000000 --- a/Assets/GameContent/Scene_Bar/animation/酒吧内.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8e52cc1a057d7944caec2df719ad5459 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameContent/Scene_Bar/animation/breathe3.anim b/Assets/GameContent/Scene_Bar/animation/低头loop.anim similarity index 50% rename from Assets/GameContent/Scene_Bar/animation/breathe3.anim rename to Assets/GameContent/Scene_Bar/animation/低头loop.anim index 548edd11d..98d92e60d 100644 --- a/Assets/GameContent/Scene_Bar/animation/breathe3.anim +++ b/Assets/GameContent/Scene_Bar/animation/低头loop.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: breathe3 + m_Name: "\u4F4E\u5934loop" serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -21,19 +21,15 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 4650882201333737428, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 0.6000004 - value: {fileID: 7459874236260416044, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 0.7000003 - value: {fileID: -6392199399509158729, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 1 - value: {fileID: -3553840406736822508, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 1.6000004 - value: {fileID: 3783851965607355705, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 1.8000002 - value: {fileID: -6402636442861636754, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} - - time: 2.1000001 - value: {fileID: -6402636442861636754, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} + value: {fileID: -810397243861226217, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 0.4 + value: {fileID: 8801702321598809908, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 0.9 + value: {fileID: -2385979661269870160, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 1.4 + value: {fileID: 6864103713155009498, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 1.9 + value: {fileID: 6864103713155009498, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} attribute: m_Sprite path: classID: 212 @@ -45,14 +41,28 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -810397243861226217, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 8801702321598809908, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -2385979661269870160, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 6864103713155009498, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 6864103713155009498, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 2.1100001 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -63,7 +73,7 @@ AnimationClip: m_LoopBlendPositionY: 0 m_LoopBlendPositionXZ: 0 m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 0 + m_KeepOriginalPositionY: 1 m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 diff --git a/Assets/GameContent/Scene_Bar/animation/breathe3.anim.meta b/Assets/GameContent/Scene_Bar/animation/低头loop.anim.meta similarity index 79% rename from Assets/GameContent/Scene_Bar/animation/breathe3.anim.meta rename to Assets/GameContent/Scene_Bar/animation/低头loop.anim.meta index ee5079b3b..f2c80b0f6 100644 --- a/Assets/GameContent/Scene_Bar/animation/breathe3.anim.meta +++ b/Assets/GameContent/Scene_Bar/animation/低头loop.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cdaf5960e20207d46b4fff4c89dd860d +guid: a8c01277f14742a4789318ee987828d1 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/RawResources/Actor/酒吧人物/医生Idle.anim b/Assets/GameContent/Scene_Bar/animation/低头动作.anim similarity index 54% rename from Assets/RawResources/Actor/酒吧人物/医生Idle.anim rename to Assets/GameContent/Scene_Bar/animation/低头动作.anim index c0058a337..c9af38e30 100644 --- a/Assets/RawResources/Actor/酒吧人物/医生Idle.anim +++ b/Assets/GameContent/Scene_Bar/animation/低头动作.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u533B\u751FIdle" + m_Name: "\u4F4E\u5934\u52A8\u4F5C" serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -21,15 +21,13 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 7775007450094160942, guid: 0cea27261fffbf741bf731d5075bfb88, type: 3} + value: {fileID: 3494292240966420453, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 0.3 + value: {fileID: 1041592516194663820, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} - time: 0.5 - value: {fileID: 5633751320196528272, guid: 0cea27261fffbf741bf731d5075bfb88, type: 3} - - time: 0.8 - value: {fileID: -3814031830717977439, guid: 0cea27261fffbf741bf731d5075bfb88, type: 3} - - time: 1.3 - value: {fileID: -6659459464340912206, guid: 0cea27261fffbf741bf731d5075bfb88, type: 3} - - time: 1.8 - value: {fileID: -6659459464340912206, guid: 0cea27261fffbf741bf731d5075bfb88, type: 3} + value: {fileID: -1700935873401235253, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 0.7 + value: {fileID: -1700935873401235253, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} attribute: m_Sprite path: classID: 212 @@ -41,25 +39,38 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 3494292240966420453, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 1041592516194663820, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -1700935873401235253, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -1700935873401235253, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.81 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 m_LoopBlendPositionXZ: 0 m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 0 + m_KeepOriginalPositionY: 1 m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 diff --git a/Assets/GameContent/Scene_Bar/animation/breathe1.anim.meta b/Assets/GameContent/Scene_Bar/animation/低头动作.anim.meta similarity index 79% rename from Assets/GameContent/Scene_Bar/animation/breathe1.anim.meta rename to Assets/GameContent/Scene_Bar/animation/低头动作.anim.meta index 3065685e1..5e2d8e986 100644 --- a/Assets/GameContent/Scene_Bar/animation/breathe1.anim.meta +++ b/Assets/GameContent/Scene_Bar/animation/低头动作.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ea8f270fc8c15064a9eba36c6a5a9481 +guid: 18dd5bac7a794cb42854de70495a6a76 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/GameContent/Scene_Bar/animation/breathe1.anim b/Assets/GameContent/Scene_Bar/animation/侧头.anim similarity index 53% rename from Assets/GameContent/Scene_Bar/animation/breathe1.anim rename to Assets/GameContent/Scene_Bar/animation/侧头.anim index c40effaee..0cf0b395c 100644 --- a/Assets/GameContent/Scene_Bar/animation/breathe1.anim +++ b/Assets/GameContent/Scene_Bar/animation/侧头.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: breathe1 + m_Name: "\u4FA7\u5934" serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -21,15 +21,15 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 6296264662499445590, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} + value: {fileID: -6291852080377846833, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} - time: 0.6 - value: {fileID: -656599950358754020, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} + value: {fileID: -2409077141896951511, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} - time: 0.8 - value: {fileID: 6895898105935669943, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} + value: {fileID: -412922141766790701, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} - time: 1.55 - value: {fileID: -7463473138157845808, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} + value: {fileID: 181789239935441317, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} - time: 1.8499999 - value: {fileID: -7463473138157845808, guid: 5d0076f62a8b558488c6b6e7d9dc405e, type: 3} + value: {fileID: 181789239935441317, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} attribute: m_Sprite path: classID: 212 @@ -41,14 +41,28 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -6291852080377846833, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -2409077141896951511, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -412922141766790701, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 181789239935441317, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 181789239935441317, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.8599999 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -59,7 +73,7 @@ AnimationClip: m_LoopBlendPositionY: 0 m_LoopBlendPositionXZ: 0 m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 0 + m_KeepOriginalPositionY: 1 m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 diff --git a/Assets/GameContent/Scene_Bar/animation/transition.anim.meta b/Assets/GameContent/Scene_Bar/animation/侧头.anim.meta similarity index 79% rename from Assets/GameContent/Scene_Bar/animation/transition.anim.meta rename to Assets/GameContent/Scene_Bar/animation/侧头.anim.meta index 429f4bcd2..9e83a3c99 100644 --- a/Assets/GameContent/Scene_Bar/animation/transition.anim.meta +++ b/Assets/GameContent/Scene_Bar/animation/侧头.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d1956fbab19a95e4697e2b5eee21aa7a +guid: aa3eb1b245e78a14ca4539062b4622e5 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/GameContent/Scene_Bar/animation/酒吧内.anim b/Assets/GameContent/Scene_Bar/animation/正常loop.anim similarity index 53% rename from Assets/GameContent/Scene_Bar/animation/酒吧内.anim rename to Assets/GameContent/Scene_Bar/animation/正常loop.anim index 5860a965e..76fe76059 100644 --- a/Assets/GameContent/Scene_Bar/animation/酒吧内.anim +++ b/Assets/GameContent/Scene_Bar/animation/正常loop.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\xE9\N\x92\xE5\x90\xA7\xE5\x86\N" + m_Name: "\u6B63\u5E38loop" serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -21,15 +21,15 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 5006122824116408337, guid: 1644f4ea9360a6842bc3b4d0d496d22a, type: 3} + value: {fileID: 1187172506669757455, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} - time: 0.6 - value: {fileID: -6533654951950459363, guid: 1644f4ea9360a6842bc3b4d0d496d22a, type: 3} + value: {fileID: 1174811718905152438, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} - time: 0.8 - value: {fileID: 1144689169274451861, guid: 1644f4ea9360a6842bc3b4d0d496d22a, type: 3} + value: {fileID: -6847017129552461766, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} - time: 1.55 - value: {fileID: -1167244539411588232, guid: 1644f4ea9360a6842bc3b4d0d496d22a, type: 3} + value: {fileID: 2151026930018020789, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} - time: 1.8499999 - value: {fileID: -1167244539411588232, guid: 1644f4ea9360a6842bc3b4d0d496d22a, type: 3} + value: {fileID: 2151026930018020789, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} attribute: m_Sprite path: classID: 212 @@ -41,14 +41,28 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 1187172506669757455, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 1174811718905152438, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -6847017129552461766, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 2151026930018020789, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 2151026930018020789, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.8599999 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -59,7 +73,7 @@ AnimationClip: m_LoopBlendPositionY: 0 m_LoopBlendPositionXZ: 0 m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 0 + m_KeepOriginalPositionY: 1 m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 diff --git a/Assets/GameContent/Scene_Bar/animation/breathe2.anim.meta b/Assets/GameContent/Scene_Bar/animation/正常loop.anim.meta similarity index 79% rename from Assets/GameContent/Scene_Bar/animation/breathe2.anim.meta rename to Assets/GameContent/Scene_Bar/animation/正常loop.anim.meta index ea2fcd30a..756f587d5 100644 --- a/Assets/GameContent/Scene_Bar/animation/breathe2.anim.meta +++ b/Assets/GameContent/Scene_Bar/animation/正常loop.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 90500c370f190bb468531da1b6ffa3f6 +guid: e4e03d6be168bd6449b23e6161039cc6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/RawResources/Art/酒吧素材/酒吧内角色动画/医生Idle.anim b/Assets/GameContent/Scene_Bar/animation/正常动作.anim similarity index 50% rename from Assets/RawResources/Art/酒吧素材/酒吧内角色动画/医生Idle.anim rename to Assets/GameContent/Scene_Bar/animation/正常动作.anim index c0058a337..0c3939563 100644 --- a/Assets/RawResources/Art/酒吧素材/酒吧内角色动画/医生Idle.anim +++ b/Assets/GameContent/Scene_Bar/animation/正常动作.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u533B\u751FIdle" + m_Name: "\u6B63\u5E38\u52A8\u4F5C" serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -21,15 +21,15 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 7775007450094160942, guid: 0cea27261fffbf741bf731d5075bfb88, type: 3} - - time: 0.5 - value: {fileID: 5633751320196528272, guid: 0cea27261fffbf741bf731d5075bfb88, type: 3} + value: {fileID: 1187172506669757455, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 0.6 + value: {fileID: 1174811718905152438, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} - time: 0.8 - value: {fileID: -3814031830717977439, guid: 0cea27261fffbf741bf731d5075bfb88, type: 3} - - time: 1.3 - value: {fileID: -6659459464340912206, guid: 0cea27261fffbf741bf731d5075bfb88, type: 3} - - time: 1.8 - value: {fileID: -6659459464340912206, guid: 0cea27261fffbf741bf731d5075bfb88, type: 3} + value: {fileID: -6847017129552461766, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 1.55 + value: {fileID: 2151026930018020789, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 1.8499999 + value: {fileID: 2151026930018020789, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} attribute: m_Sprite path: classID: 212 @@ -41,25 +41,39 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 1187172506669757455, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 1174811718905152438, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -6847017129552461766, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 2151026930018020789, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 2151026930018020789, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.81 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 m_LoopBlendPositionXZ: 0 m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 0 + m_KeepOriginalPositionY: 1 m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 diff --git a/Assets/GameContent/Scene_Bar/animation/正常动作.anim.meta b/Assets/GameContent/Scene_Bar/animation/正常动作.anim.meta new file mode 100644 index 000000000..60cb3cea0 --- /dev/null +++ b/Assets/GameContent/Scene_Bar/animation/正常动作.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 675769bceec74994ab0bd0daa22ce025 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameContent/Scene_Bar/animation/趴下loop.anim b/Assets/GameContent/Scene_Bar/animation/趴下loop.anim new file mode 100644 index 000000000..bb3d36ee6 --- /dev/null +++ b/Assets/GameContent/Scene_Bar/animation/趴下loop.anim @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u8DB4\u4E0Bloop" + 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: 4200157998446303042, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 0.6 + value: {fileID: 8969760424312856943, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 0.70000005 + value: {fileID: 2684664656003861872, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 1 + value: {fileID: -5807352163222385082, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 1.6 + value: {fileID: -8309252443898821317, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 1.8000001 + value: {fileID: -1769655145076053783, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 2.1000001 + value: {fileID: 673895336919162707, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 2.4 + value: {fileID: -4259360744749524271, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 2.7 + value: {fileID: -621364188014457510, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - time: 3 + value: {fileID: -621364188014457510, guid: 7699eb486739ec441b49c7eaafb425ad, 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: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 4200157998446303042, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 8969760424312856943, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 2684664656003861872, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -5807352163222385082, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -8309252443898821317, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -1769655145076053783, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: 673895336919162707, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -4259360744749524271, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -621364188014457510, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + - {fileID: -621364188014457510, guid: 7699eb486739ec441b49c7eaafb425ad, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/GameContent/Scene_Bar/animation/趴下loop.anim.meta b/Assets/GameContent/Scene_Bar/animation/趴下loop.anim.meta new file mode 100644 index 000000000..f6a20f3b6 --- /dev/null +++ b/Assets/GameContent/Scene_Bar/animation/趴下loop.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a219f769264b95a4fac06fd400656685 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameContent/Scene_Bar/animationRaw.meta b/Assets/GameContent/Scene_Bar/animationRaw.meta new file mode 100644 index 000000000..88bcfac63 --- /dev/null +++ b/Assets/GameContent/Scene_Bar/animationRaw.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ac53ab68d7e4304999b762548c5ce53 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.json b/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.json new file mode 100644 index 000000000..f54df231a --- /dev/null +++ b/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.json @@ -0,0 +1,222 @@ +{ "frames": { + "酒吧医生呼吸循环 0.aseprite": { + "frame": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 600 + }, + "酒吧医生呼吸循环 1.aseprite": { + "frame": { "x": 56, "y": 0, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 200 + }, + "酒吧医生呼吸循环 2.aseprite": { + "frame": { "x": 112, "y": 0, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 750 + }, + "酒吧医生呼吸循环 3.aseprite": { + "frame": { "x": 168, "y": 0, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 300 + }, + "酒吧医生呼吸循环 4.aseprite": { + "frame": { "x": 224, "y": 0, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 300 + }, + "酒吧医生呼吸循环 5.aseprite": { + "frame": { "x": 280, "y": 0, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 200 + }, + "酒吧医生呼吸循环 6.aseprite": { + "frame": { "x": 336, "y": 0, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 200 + }, + "酒吧医生呼吸循环 7.aseprite": { + "frame": { "x": 392, "y": 0, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 400 + }, + "酒吧医生呼吸循环 8.aseprite": { + "frame": { "x": 0, "y": 129, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 500 + }, + "酒吧医生呼吸循环 9.aseprite": { + "frame": { "x": 56, "y": 129, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 500 + }, + "酒吧医生呼吸循环 10.aseprite": { + "frame": { "x": 112, "y": 129, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 500 + }, + "酒吧医生呼吸循环 11.aseprite": { + "frame": { "x": 168, "y": 129, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 600 + }, + "酒吧医生呼吸循环 12.aseprite": { + "frame": { "x": 224, "y": 129, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 100 + }, + "酒吧医生呼吸循环 13.aseprite": { + "frame": { "x": 280, "y": 129, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 300 + }, + "酒吧医生呼吸循环 14.aseprite": { + "frame": { "x": 336, "y": 129, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 600 + }, + "酒吧医生呼吸循环 15.aseprite": { + "frame": { "x": 392, "y": 129, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 200 + }, + "酒吧医生呼吸循环 16.aseprite": { + "frame": { "x": 0, "y": 258, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 300 + }, + "酒吧医生呼吸循环 17.aseprite": { + "frame": { "x": 56, "y": 258, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 300 + }, + "酒吧医生呼吸循环 18.aseprite": { + "frame": { "x": 112, "y": 258, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 300 + }, + "酒吧医生呼吸循环 19.aseprite": { + "frame": { "x": 168, "y": 258, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 300 + }, + "酒吧医生呼吸循环 20.aseprite": { + "frame": { "x": 224, "y": 258, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 600 + }, + "酒吧医生呼吸循环 21.aseprite": { + "frame": { "x": 280, "y": 258, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 200 + }, + "酒吧医生呼吸循环 22.aseprite": { + "frame": { "x": 336, "y": 258, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 750 + }, + "酒吧医生呼吸循环 23.aseprite": { + "frame": { "x": 392, "y": 258, "w": 56, "h": 129 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 56, "h": 129 }, + "sourceSize": { "w": 56, "h": 129 }, + "duration": 300 + } + }, + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.17-x64", + "image": "酒吧医生呼吸循环.png", + "format": "RGBA8888", + "size": { "w": 448, "h": 387 }, + "scale": "1", + "frameTags": [ + { + "name": "正常loop", + "from": 0, + "to": 3, + "direction": "forward", + "color": "#000000ff" + }, + { "name": "正常动作", "from": 0, "to": 3, "direction": "forward", "color": "#000000ff" }, + { "name": "低头动作", "from": 4, "to": 6, "direction": "forward", "color": "#fe5b59ff" }, + { "name": "低头loop", "from": 7, "to": 10, "direction": "forward", "color": "#000000ff" }, + { "name": "趴下loop", "from": 11, "to": 19, "direction": "forward", "color": "#000000ff" }, + { "name": "侧头", "from": 20, "to": 23, "direction": "forward", "color": "#000000ff" } + ], + "layers": [ + { "name": "doctor", "opacity": 255, "blendMode": "normal" } + ], + "slices": [ + ] + } +} diff --git a/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.json.meta b/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.json.meta new file mode 100644 index 000000000..1b95e9625 --- /dev/null +++ b/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 46b717c9baa02594a9b94f4f820f6185 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.png b/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.png new file mode 100644 index 000000000..9b3d147ff --- /dev/null +++ b/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05665cdbcbaa30042ba5664720bbf9190da0ac17c22676b5192975f4151e61ce +size 32379 diff --git a/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.png.meta b/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.png.meta new file mode 100644 index 000000000..e1c57e3cd --- /dev/null +++ b/Assets/GameContent/Scene_Bar/animationRaw/酒吧医生呼吸循环.png.meta @@ -0,0 +1,694 @@ +fileFormatVersion: 2 +guid: 7699eb486739ec441b49c7eaafb425ad +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: 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: 1024 + 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: iPhone + 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: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 0.aseprite" + rect: + serializedVersion: 2 + x: 0 + y: 258 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 39910dbc14934044f8cac33c78b72b3f + internalID: 1187172506669757455 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 1.aseprite" + rect: + serializedVersion: 2 + x: 56 + y: 258 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a3c0833fc7290fb41a2a8a7600c08e36 + internalID: 1174811718905152438 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 2.aseprite" + rect: + serializedVersion: 2 + x: 112 + y: 258 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8f45e5d457064334a82665f7a7ff0e5e + internalID: -6847017129552461766 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 3.aseprite" + rect: + serializedVersion: 2 + x: 168 + y: 258 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a19def609f3a2f74e920a3bd93c1afc2 + internalID: 2151026930018020789 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 4.aseprite" + rect: + serializedVersion: 2 + x: 224 + y: 258 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b127696e7d8667841bb9b6d8cdae56ff + internalID: 3494292240966420453 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 5.aseprite" + rect: + serializedVersion: 2 + x: 280 + y: 258 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eed5eb453b0df5640b5ed23e5e599aa9 + internalID: 1041592516194663820 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 6.aseprite" + rect: + serializedVersion: 2 + x: 336 + y: 258 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 60d982b9721911b4bbac2ebe565da936 + internalID: -1700935873401235253 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 7.aseprite" + rect: + serializedVersion: 2 + x: 392 + y: 258 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fc5b489134930c847b980680fc7a48be + internalID: -810397243861226217 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 8.aseprite" + rect: + serializedVersion: 2 + x: 0 + y: 129 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9871cc8f308df684080e2d64e3b775bb + internalID: 8801702321598809908 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 9.aseprite" + rect: + serializedVersion: 2 + x: 56 + y: 129 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ed0e099ee671a7545af059904672f495 + internalID: -2385979661269870160 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 10.aseprite" + rect: + serializedVersion: 2 + x: 112 + y: 129 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3ffb74a426623fe4898ce50454b44ae1 + internalID: 6864103713155009498 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 11.aseprite" + rect: + serializedVersion: 2 + x: 168 + y: 129 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b06bfa1e4ff664e4ab4e0ebd4b9315c2 + internalID: 4200157998446303042 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 12.aseprite" + rect: + serializedVersion: 2 + x: 224 + y: 129 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0ef584447a2a0754086d3e896a4f256d + internalID: 8969760424312856943 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 13.aseprite" + rect: + serializedVersion: 2 + x: 280 + y: 129 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0bbb891adc3375845a78c67453620f91 + internalID: 2684664656003861872 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 14.aseprite" + rect: + serializedVersion: 2 + x: 336 + y: 129 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c015af4c1a7c5564aa5f3f663ac8392f + internalID: -5807352163222385082 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 15.aseprite" + rect: + serializedVersion: 2 + x: 392 + y: 129 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5b04f74d3a5ae9f4182ffc1ce7a83d3f + internalID: -8309252443898821317 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 16.aseprite" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 99d638a050c8347439b67335b47a9842 + internalID: -1769655145076053783 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 17.aseprite" + rect: + serializedVersion: 2 + x: 56 + y: 0 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2934776d85afa9f45a0f6bd344c2690e + internalID: 673895336919162707 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 18.aseprite" + rect: + serializedVersion: 2 + x: 112 + y: 0 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ccc0cc48bdd9fbd4f823f8203ae052e5 + internalID: -4259360744749524271 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 19.aseprite" + rect: + serializedVersion: 2 + x: 168 + y: 0 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 07b1777e42278dd42870c3ae2fda6160 + internalID: -621364188014457510 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 20.aseprite" + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 54858bd7f9371ef42b5aa8fa0356e907 + internalID: -6291852080377846833 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 21.aseprite" + rect: + serializedVersion: 2 + x: 280 + y: 0 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ce751b60f3ce4d941b2c1bb0789e9727 + internalID: -2409077141896951511 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 22.aseprite" + rect: + serializedVersion: 2 + x: 336 + y: 0 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 36ef1d7f2b3bda94b9732d0be4a71fad + internalID: -412922141766790701 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 23.aseprite" + rect: + serializedVersion: 2 + x: 392 + y: 0 + width: 56 + height: 129 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b54976650ea57d642af31c21c7b85e05 + internalID: 181789239935441317 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 0.aseprite": 1187172506669757455 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 1.aseprite": 1174811718905152438 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 10.aseprite": 6864103713155009498 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 11.aseprite": 4200157998446303042 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 12.aseprite": 8969760424312856943 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 13.aseprite": 2684664656003861872 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 14.aseprite": -5807352163222385082 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 15.aseprite": -8309252443898821317 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 16.aseprite": -1769655145076053783 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 17.aseprite": 673895336919162707 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 18.aseprite": -4259360744749524271 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 19.aseprite": -621364188014457510 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 2.aseprite": -6847017129552461766 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 20.aseprite": -6291852080377846833 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 21.aseprite": -2409077141896951511 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 22.aseprite": -412922141766790701 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 23.aseprite": 181789239935441317 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 3.aseprite": 2151026930018020789 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 4.aseprite": 3494292240966420453 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 5.aseprite": 1041592516194663820 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 6.aseprite": -1700935873401235253 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 7.aseprite": -810397243861226217 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 8.aseprite": 8801702321598809908 + "\u9152\u5427\u533B\u751F\u547C\u5438\u5FAA\u73AF 9.aseprite": -2385979661269870160 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameContent/Scene_Bar/controller/酒吧医生.controller b/Assets/GameContent/Scene_Bar/controller/酒吧医生.controller index 68aa77a44..5d154d8ae 100644 --- a/Assets/GameContent/Scene_Bar/controller/酒吧医生.controller +++ b/Assets/GameContent/Scene_Bar/controller/酒吧医生.controller @@ -21,7 +21,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: d1956fbab19a95e4697e2b5eee21aa7a, type: 2} + m_Motion: {fileID: 7400000, guid: 18dd5bac7a794cb42854de70495a6a76, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -47,7 +47,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: cdaf5960e20207d46b4fff4c89dd860d, type: 2} + m_Motion: {fileID: 7400000, guid: a219f769264b95a4fac06fd400656685, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -73,7 +73,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 90500c370f190bb468531da1b6ffa3f6, type: 2} + m_Motion: {fileID: 7400000, guid: a8c01277f14742a4789318ee987828d1, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -156,7 +156,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 7615255923581734750} - m_Position: {x: 350, y: 110, z: 0} + m_Position: {x: 360, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: 6323183987908155161} m_Position: {x: 170, y: 260, z: 0} @@ -172,9 +172,6 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 7371399739941830829} m_Position: {x: 340, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: 4355421462422718838} - m_Position: {x: 0, y: 0, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -185,32 +182,6 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 7615255923581734750} ---- !u!1102 &4355421462422718838 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: transition 0 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: d1956fbab19a95e4697e2b5eee21aa7a, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &6323183987908155161 AnimatorState: serializedVersion: 6 @@ -232,7 +203,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: ea8f270fc8c15064a9eba36c6a5a9481, type: 2} + m_Motion: {fileID: 7400000, guid: 675769bceec74994ab0bd0daa22ce025, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -258,7 +229,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 8e52cc1a057d7944caec2df719ad5459, type: 2} + m_Motion: {fileID: 7400000, guid: aa3eb1b245e78a14ca4539062b4622e5, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -284,7 +255,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 9ccc09e0d078db84fae6193f99f76544, type: 2} + m_Motion: {fileID: 7400000, guid: e4e03d6be168bd6449b23e6161039cc6, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/RawResources/Actor/酒吧人物/医生Idle.anim.meta b/Assets/RawResources/Actor/酒吧人物/医生Idle.anim.meta deleted file mode 100644 index 7f34ad4c5..000000000 --- a/Assets/RawResources/Actor/酒吧人物/医生Idle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: af04c1ff43747db4bab1fe2c4c057bef -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/RawResources/Actor/酒吧人物/调酒妹/酒吧调酒妹.controller b/Assets/RawResources/Actor/酒吧人物/调酒妹/酒吧调酒妹.controller index 45fd308d1..a6f52891e 100644 --- a/Assets/RawResources/Actor/酒吧人物/调酒妹/酒吧调酒妹.controller +++ b/Assets/RawResources/Actor/酒吧人物/调酒妹/酒吧调酒妹.controller @@ -609,10 +609,10 @@ AnimatorStateMachine: m_Position: {x: 1540, y: 620, z: 0} - serializedVersion: 1 m_State: {fileID: 2537373539185539461} - m_Position: {x: 1620, y: 820, z: 0} + m_Position: {x: 1630, y: 820, z: 0} - serializedVersion: 1 m_State: {fileID: 2360747108530403705} - m_Position: {x: 1580, y: 710, z: 0} + m_Position: {x: 1590, y: 720, z: 0} - serializedVersion: 1 m_State: {fileID: 6853883352974621521} m_Position: {x: 1630, y: 550, z: 0} @@ -654,7 +654,7 @@ AnimatorStateMachine: m_Position: {x: 1990, y: 610, z: 0} - serializedVersion: 1 m_State: {fileID: -441202881873228448} - m_Position: {x: 1958.2673, y: 728.18115, z: 0} + m_Position: {x: 1960, y: 730, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/RawResources/Actor/酒吧人物/酒吧医生.aseprite b/Assets/RawResources/Actor/酒吧人物/酒吧医生.aseprite deleted file mode 100644 index ad0cb7c48..000000000 Binary files a/Assets/RawResources/Actor/酒吧人物/酒吧医生.aseprite and /dev/null differ diff --git a/Assets/RawResources/Actor/酒吧人物/酒吧医生.aseprite.meta b/Assets/RawResources/Actor/酒吧人物/酒吧医生.aseprite.meta deleted file mode 100644 index 86c387fe6..000000000 --- a/Assets/RawResources/Actor/酒吧人物/酒吧医生.aseprite.meta +++ /dev/null @@ -1,318 +0,0 @@ -fileFormatVersion: 2 -guid: eceadefc4a6e14942aa20b5d10f7cb77 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:AnimationClip - assembly: UnityEngine.AnimationModule - name: Idle - second: {fileID: 7400000, guid: 46a3b9b5f367e7248a340fd999128567, type: 2} - - first: - type: UnityEngine:AnimationClip - assembly: UnityEngine.AnimationModule - name: "\u9152\u5427\u533B\u751F_Clip" - second: {fileID: 7400000, guid: cfa16bf6e79ac1d47a72c336e21975c2, 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: 43 - 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: 639014142695720335 - 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: "\u9152\u5427\u533B\u751F_Frame_0" - originalName: - pivot: {x: 0.48039216, y: -0.03125} - alignment: 9 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 4 - y: 4 - width: 51 - height: 128 - spriteID: e1c3d7f1126128d4b9f953707f996617 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 4, y: 4} - - name: "\u9152\u5427\u533B\u751F_Frame_1" - originalName: - pivot: {x: 0.48039216, y: -0.03125} - alignment: 9 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 63 - y: 4 - width: 51 - height: 128 - spriteID: fedf33e5c6e8a4a43a3ae27d1db7806d - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 63, y: 4} - - name: "\u9152\u5427\u533B\u751F_Frame_2" - originalName: - pivot: {x: 0.47959185, y: -0.031007752} - alignment: 9 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 181 - y: 4 - width: 49 - height: 129 - spriteID: cc998ee006d7b3343a3fffc1daf23076 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 181, y: 4} - - name: "\u9152\u5427\u533B\u751F_Frame_3" - originalName: - pivot: {x: 0.48039216, y: -0.03125} - alignment: 9 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 122 - y: 4 - width: 51 - height: 128 - spriteID: 350ab90e6b545af439b0f0a9f7f8be57 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 122, y: 4} - spriteSheetImportData: [] - asepriteLayers: - - layerIndex: 0 - guid: -1368503303 - name: "\u9152\u5427\u533B\u751F" - layerFlags: 0 - layerType: 0 - blendMode: 0 - cells: - - name: "\u9152\u5427\u533B\u751F_Frame_0" - frameIndex: 0 - cellRect: - x: 5 - y: 4 - width: 51 - height: 128 - spriteId: e1c3d7f1126128d4b9f953707f996617 - - name: "\u9152\u5427\u533B\u751F_Frame_1" - frameIndex: 1 - cellRect: - x: 5 - y: 4 - width: 51 - height: 128 - spriteId: fedf33e5c6e8a4a43a3ae27d1db7806d - - name: "\u9152\u5427\u533B\u751F_Frame_2" - frameIndex: 2 - cellRect: - x: 6 - y: 4 - width: 49 - height: 129 - spriteId: cc998ee006d7b3343a3fffc1daf23076 - - name: "\u9152\u5427\u533B\u751F_Frame_3" - frameIndex: 3 - cellRect: - x: 5 - y: 4 - width: 51 - height: 128 - spriteId: 350ab90e6b545af439b0f0a9f7f8be57 - linkedCells: [] - parentIndex: -1 - platformSettings: - - name: DefaultTexturePlatform - overridden: 0 - ignorePlatformSupport: 0 - maxTextureSize: 4096 - 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: 59, y: 135} diff --git a/Assets/RawResources/Actor/酒吧人物/酒吧医生.controller b/Assets/RawResources/Actor/酒吧人物/酒吧医生.controller deleted file mode 100644 index 9a45b7af6..000000000 --- a/Assets/RawResources/Actor/酒吧人物/酒吧医生.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: "\u9152\u5427\u533B\u751F" - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 1864794602208931621} - 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 &1541517456825400747 -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: 46a3b9b5f367e7248a340fd999128567, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &1864794602208931621 -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: 1541517456825400747} - m_Position: {x: 361.00006, y: 42, 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: 1541517456825400747} diff --git a/Assets/RawResources/Actor/酒吧人物/酒吧医生.controller.meta b/Assets/RawResources/Actor/酒吧人物/酒吧医生.controller.meta deleted file mode 100644 index 3d0188b26..000000000 --- a/Assets/RawResources/Actor/酒吧人物/酒吧医生.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7ba8eca4e18291341a10ef7c8c858bd9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/RawResources/Art/酒吧素材/酒吧内角色动画/医生Idle.anim.meta b/Assets/RawResources/Art/酒吧素材/酒吧内角色动画/医生Idle.anim.meta deleted file mode 100644 index 440752db5..000000000 --- a/Assets/RawResources/Art/酒吧素材/酒吧内角色动画/医生Idle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9ccc09e0d078db84fae6193f99f76544 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: