Merge pull request #2084 from cre8ivepark/Dev_Working_Branch

[Dev] Removing unused Animation script & animation in HolographicButton prefab
microsoft · May 11, 2018 · 30e4283 · 30e4283
2 parents 52547d9 + 1f68ae6
commit 30e4283
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 150 deletions.
diff --git a/Assets/MixedRealityToolkit-Examples/UX/Prefabs/ButtonHolographic.prefab b/Assets/MixedRealityToolkit-Examples/UX/Prefabs/ButtonHolographic.prefab
@@ -70,14 +70,12 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 4400682673061142}
+  - component: {fileID: 65959870370459156}
   - component: {fileID: 114985427041226018}
   - component: {fileID: 114941441034285770}
   - component: {fileID: 114539127433989172}
   - component: {fileID: 114724965930856538}
   - component: {fileID: 114888990318196948}
-  - component: {fileID: 65959870370459156}
-  - component: {fileID: 95836897654538082}
-  - component: {fileID: 114372868302156270}
   m_Layer: 5
   m_Name: ButtonHolographic
   m_TagString: Untagged
@@ -340,23 +338,6 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.12, y: 0.12, z: 0.02}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!95 &95836897654538082
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1619954670119144}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: dade752fc71c3d940ba5cc7eaf201f24, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
 --- !u!102 &102082490485545312
 TextMesh:
   serializedVersion: 3
@@ -378,61 +359,6 @@ TextMesh:
   m_Color:
     serializedVersion: 2
     rgba: 4294967295
---- !u!114 &114372868302156270
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1619954670119144}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 728fec8e9feecf64f933543126cbecae, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  TargetAnimator: {fileID: 95836897654538082}
-  AnimActions:
-  - ButtonState: 0
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 0
-    FloatValue: 0
-    InvalidParam: 0
-  - ButtonState: 1
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 1
-    FloatValue: 0
-    InvalidParam: 0
-  - ButtonState: 2
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 2
-    FloatValue: 0
-    InvalidParam: 0
-  - ButtonState: 3
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 3
-    FloatValue: 0
-    InvalidParam: 0
-  - ButtonState: 4
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 4
-    FloatValue: 0
-    InvalidParam: 0
-  - ButtonState: 5
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 5
-    FloatValue: 0
-    InvalidParam: 0
 --- !u!114 &114539127433989172
 MonoBehaviour:
   m_ObjectHideFlags: 1

diff --git a/Assets/MixedRealityToolkit/UX/Prefabs/Buttons/HolographicButton.prefab b/Assets/MixedRealityToolkit/UX/Prefabs/Buttons/HolographicButton.prefab
@@ -36,14 +36,12 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 4249060311757736}
+  - component: {fileID: 65091470401894616}
   - component: {fileID: 114549673379926378}
   - component: {fileID: 114759408391228376}
   - component: {fileID: 114731001419964972}
   - component: {fileID: 114540301864412650}
   - component: {fileID: 114284851947377390}
-  - component: {fileID: 65091470401894616}
-  - component: {fileID: 95444211700001698}
-  - component: {fileID: 114586770699789526}
   m_Layer: 5
   m_Name: HolographicButton
   m_TagString: Untagged
@@ -340,23 +338,6 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.12, y: 0.12, z: 0.02}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!95 &95444211700001698
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1210820392543280}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: dade752fc71c3d940ba5cc7eaf201f24, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
 --- !u!102 &102845526646414632
 TextMesh:
   serializedVersion: 3
@@ -434,61 +415,6 @@ MonoBehaviour:
   RequireGaze: 1
   MainCollider: {fileID: 65091470401894616}
   MainRenderer: {fileID: 23637783586042108}
---- !u!114 &114586770699789526
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1210820392543280}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 728fec8e9feecf64f933543126cbecae, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  TargetAnimator: {fileID: 95444211700001698}
-  AnimActions:
-  - ButtonState: 0
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 0
-    FloatValue: 0
-    InvalidParam: 0
-  - ButtonState: 1
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 1
-    FloatValue: 0
-    InvalidParam: 0
-  - ButtonState: 2
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 2
-    FloatValue: 0
-    InvalidParam: 0
-  - ButtonState: 3
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 3
-    FloatValue: 0
-    InvalidParam: 0
-  - ButtonState: 4
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 4
-    FloatValue: 0
-    InvalidParam: 0
-  - ButtonState: 5
-    ParamName: State
-    ParamType: 3
-    BoolValue: 0
-    IntValue: 5
-    FloatValue: 0
-    InvalidParam: 0
 --- !u!114 &114731001419964972
 MonoBehaviour:
   m_ObjectHideFlags: 1