From ef98d2e2f33bfb0d7b49e81a84ea0f4aa4abb830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Nu=C8=9Biu?= Date: Sat, 24 Aug 2019 00:33:26 +0300 Subject: [PATCH] Remove unused Misc animations --- Assets/Animations/Misc/Pulverise.anim | 77 --------------- Assets/Animations/Misc/Pulverise.anim.meta | 8 -- Assets/Animations/Misc/Pulverised.controller | 93 ------------------- .../Misc/Pulverised.controller.meta | 8 -- .../Misc/RespawnPosition.controller | 72 -------------- .../Misc/RespawnPosition.controller.meta | 8 -- .../Walls/destructible_high_snow.prefab | 20 ---- .../Resources/Walls/destructible_snow.prefab | 20 ---- Assets/Scripts/src/Wall/DestructibleWall.cs | 10 -- 9 files changed, 316 deletions(-) delete mode 100644 Assets/Animations/Misc/Pulverise.anim delete mode 100644 Assets/Animations/Misc/Pulverise.anim.meta delete mode 100644 Assets/Animations/Misc/Pulverised.controller delete mode 100644 Assets/Animations/Misc/Pulverised.controller.meta delete mode 100644 Assets/Animations/Misc/RespawnPosition.controller delete mode 100644 Assets/Animations/Misc/RespawnPosition.controller.meta diff --git a/Assets/Animations/Misc/Pulverise.anim b/Assets/Animations/Misc/Pulverise.anim deleted file mode 100644 index e2bedcb..0000000 --- a/Assets/Animations/Misc/Pulverise.anim +++ /dev/null @@ -1,77 +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: Pulverise - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 21300052, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 0.06666667 - value: {fileID: 21300054, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 0.13333334 - value: {fileID: 21300056, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 0.2 - value: {fileID: 21300058, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - m_SampleRate: 15 - 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 - pptrCurveMapping: - - {fileID: 21300052, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - {fileID: 21300054, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - {fileID: 21300056, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - {fileID: 21300058, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.26666668 - 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/Animations/Misc/Pulverise.anim.meta b/Assets/Animations/Misc/Pulverise.anim.meta deleted file mode 100644 index 0cbf6f5..0000000 --- a/Assets/Animations/Misc/Pulverise.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 536dece361312c14bac0cf30829bee84 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Animations/Misc/Pulverised.controller b/Assets/Animations/Misc/Pulverised.controller deleted file mode 100644 index 043de82..0000000 --- a/Assets/Animations/Misc/Pulverised.controller +++ /dev/null @@ -1,93 +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: Pulverised - serializedVersion: 5 - m_AnimatorParameters: - - m_Name: Blend - m_Type: 1 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 1107354719584562404} - 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!206 &206365093828297014 -BlendTree: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Blend Tree - m_Childs: [] - m_BlendParameter: Blend - m_BlendParameterY: Blend - m_MinThreshold: 0 - m_MaxThreshold: 1 - m_UseAutomaticThresholds: 1 - m_NormalizedBlendValues: 0 - m_BlendType: 0 ---- !u!1102 &1102215421647958874 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Pulverise - 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: 206365093828297014} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &1107354719584562404 -AnimatorStateMachine: - serializedVersion: 5 - 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: 1102215421647958874} - m_Position: {x: 264, y: 72, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 48, y: 24, z: 0} - m_EntryPosition: {x: 48, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102215421647958874} diff --git a/Assets/Animations/Misc/Pulverised.controller.meta b/Assets/Animations/Misc/Pulverised.controller.meta deleted file mode 100644 index d427a88..0000000 --- a/Assets/Animations/Misc/Pulverised.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f99f14e77d0442846ba579190dffc1c2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Animations/Misc/RespawnPosition.controller b/Assets/Animations/Misc/RespawnPosition.controller deleted file mode 100644 index b474d0a..0000000 --- a/Assets/Animations/Misc/RespawnPosition.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: RespawnPosition - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 1107214311928363052} - 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 &1102082738737299528 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Pulverise - 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: 536dece361312c14bac0cf30829bee84, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &1107214311928363052 -AnimatorStateMachine: - serializedVersion: 5 - 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: 1102082738737299528} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102082738737299528} diff --git a/Assets/Animations/Misc/RespawnPosition.controller.meta b/Assets/Animations/Misc/RespawnPosition.controller.meta deleted file mode 100644 index ecf84c9..0000000 --- a/Assets/Animations/Misc/RespawnPosition.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 621169a4828cad04ba17bb6ddfae4979 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Walls/destructible_high_snow.prefab b/Assets/Resources/Walls/destructible_high_snow.prefab index 38ca5e3..e5f45ea 100644 --- a/Assets/Resources/Walls/destructible_high_snow.prefab +++ b/Assets/Resources/Walls/destructible_high_snow.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 5407421983573782568} - component: {fileID: 8221087269156402184} - - component: {fileID: 9007082834052858790} m_Layer: 0 m_Name: Sprite m_TagString: Untagged @@ -80,25 +79,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &9007082834052858790 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2151260512302392238} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: f99f14e77d0442846ba579190dffc1c2, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &8729402555587492036 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Walls/destructible_snow.prefab b/Assets/Resources/Walls/destructible_snow.prefab index 6547ed6..80cece4 100644 --- a/Assets/Resources/Walls/destructible_snow.prefab +++ b/Assets/Resources/Walls/destructible_snow.prefab @@ -121,7 +121,6 @@ GameObject: m_Component: - component: {fileID: 8553251917334281199} - component: {fileID: 2562328647522734305} - - component: {fileID: 1235137903643130781} m_Layer: 8 m_Name: Sprite m_TagString: Untagged @@ -191,22 +190,3 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &1235137903643130781 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5688352134163068791} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: f99f14e77d0442846ba579190dffc1c2, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Scripts/src/Wall/DestructibleWall.cs b/Assets/Scripts/src/Wall/DestructibleWall.cs index 54f26b1..7580ebc 100644 --- a/Assets/Scripts/src/Wall/DestructibleWall.cs +++ b/Assets/Scripts/src/Wall/DestructibleWall.cs @@ -1,4 +1,3 @@ -using System; using UnityEngine; using src.Base; @@ -14,13 +13,10 @@ namespace src.Wall private UpgradeManager _upgradeManager; public GameObject explosionPrefab; public GameObject exitDoorPrefab; - private Animator _animator; private void Start() { _upgradeManager = GameManager.instance.GetUpgradeManager(); - _animator = GetComponentInChildren(); - // _animator.speed = 0; } public void SpawnsExit() @@ -55,15 +51,9 @@ namespace src.Wall } } - private void PlayDestroyAnimation() - { - // _animator.speed = 10; - } - public void OnExplosion() { DebugHelper.LogInfo($"Destructible wall hit by explosion {transform.position}"); - PlayDestroyAnimation(); SpawnSomething(); Destroy(gameObject); }