Browse Source

修复种花动画Bug

LiuQilin 7 years ago
parent
commit
d8219853f1
3 changed files with 187 additions and 22 deletions
  1. 166 0
      Assets/Resource/Logo.unity
  2. 15 2
      Assets/Script/Editor/EditorAuxiliary.cs
  3. 6 20
      Assets/Script/Tool/Auxiliary.cs

+ 166 - 0
Assets/Resource/Logo.unity

@@ -192,6 +192,146 @@ Prefab:
       propertyPath: m_Name
       value: Canvas (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 224964317361793810, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 224244550881901290, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224429567860854048, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 224297559150198766, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 27
+      objectReference: {fileID: 0}
+    - target: {fileID: 224301720278101990, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 224903490475154396, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 24
+      objectReference: {fileID: 0}
+    - target: {fileID: 224317587197903578, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 224441247632943000, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 224509309068479312, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 224886965450808824, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 224216203107484194, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 224246756044616158, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 224460117936396002, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 224635568216794974, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 224264575441689428, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: 224640583794403420, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 21
+      objectReference: {fileID: 0}
+    - target: {fileID: 224866873176071794, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 224216352824261512, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 224102181510017788, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 224083969509934846, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224085330785925536, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 22
+      objectReference: {fileID: 0}
+    - target: {fileID: 224499353917912188, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 224694386806689142, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 26
+      objectReference: {fileID: 0}
+    - target: {fileID: 224852284275629218, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 224903833123223624, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 224315228996335140, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 224522843245776806, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224454876144202192, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 12
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
   m_IsPrefabParent: 0
@@ -698,6 +838,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1833966245}
   - component: {fileID: 1833966244}
+  - component: {fileID: 1833966246}
   m_Layer: 0
   m_Name: ManagerGame
   m_TagString: Untagged
@@ -733,3 +874,28 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1833966246
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1833966243}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3cac44ec7ca55734c9dd55ba09a4b72a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  RegistLock: 0
+  String1: 
+  String2: 
+  Sprite: {fileID: 0}
+  TextAsset: {fileID: 0}
+  Texture: {fileID: 0}
+  Texture1: {fileID: 0}
+  Texture2: {fileID: 0}
+  AnimationClip: {fileID: 7400000, guid: fb372b7e1f7d8e8418dfbd552cfebde5, type: 2}
+  Font: {fileID: 0}
+  Go: {fileID: 0}
+  Sprites: []
+  GoList: []
+  SrList: []

+ 15 - 2
Assets/Script/Editor/EditorAuxiliary.cs

@@ -29,7 +29,7 @@ public class EditorAuxiliary : Editor
 
         if (GUILayout.Button("Temp"))
         {
-            //Animation animation;animation.clip.SetCurve();
+            
         }
 
         if (GUILayout.Button("PrintBounds"))
@@ -79,13 +79,26 @@ public class EditorAuxiliary : Editor
 
         if (GUILayout.Button("CopyCurve"))
         {
+            //修改路径
+            EditorCurveBinding[] bindings = AnimationUtility.GetCurveBindings(Script.AnimationClip);
+
+            for (int i = 0; i < bindings.Length; i++)
+            {
+                ObjectReferenceKeyframe[] keyframes = AnimationUtility.GetObjectReferenceCurve(Script.AnimationClip, bindings[i]);
+                bindings[i].path = "H_" + bindings[i].path;
+                bindings[i].path = bindings[i].path.Replace(" ", "");
+                AnimationUtility.SetObjectReferenceCurve(Script.AnimationClip, bindings[i], keyframes);
+            }
+
+
+            //复制动画
             //EditorCurveBinding[] bindings = AnimationUtility.GetCurveBindings(Script.ClipOrigin);
 
             //for (int i = 0; i < bindings.Length; i++)
             //{
             //    Debug.Log(string.Format("path : {0}  type : {1}  name : {2}", bindings[i].path, bindings[i].type, bindings[i].propertyName));
             //}
-            
+
             //EditorCurveBinding bindingOrigin = new EditorCurveBinding();
 
             //bindingOrigin.type = typeof(SpriteRenderer);

+ 6 - 20
Assets/Script/Tool/Auxiliary.cs

@@ -68,6 +68,7 @@ public class Auxiliary : Regist
     public Texture2D Texture;
     public Texture2D Texture1;
     public Texture2D Texture2;
+    public AnimationClip AnimationClip;
 
     public Font Font;
     public GameObject Go;
@@ -131,10 +132,6 @@ public class Auxiliary : Regist
         Instance = this;
     }
 
-    //private int TypeID = 0;
-    private float DeltaSize = 0.5f;
-    //private AwardUIType Type;
-    private List<Image> AwardImages = new List<Image>();
     private void Update()
     {
         #region 调试
@@ -153,48 +150,37 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.A))
         {
-            Image AwardImage0 = ResourceManager.Get<Image>(ObjectLabel.AB_AwardImage0);
-            Image AwardImage1 = ResourceManager.Get<Image>(ObjectLabel.AB_AwardImage1);
-            Image AwardImage2 = ResourceManager.Get<Image>(ObjectLabel.AB_AwardImage2);
-            AwardImages.Add(AwardImage0);
-            AwardImages.Add(AwardImage1);
-            AwardImages.Add(AwardImage2);
+
         }
 
         if (Input.GetKeyDown(KeyCode.S))
         {
-            DeltaSize += 0.05f;
-            Debug.Log(DeltaSize);
+
         }
 
         if (Input.GetKeyDown(KeyCode.D))
         {
-            DeltaSize -= 0.05f;
-            Debug.Log(DeltaSize);
+
         }
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
             Manager.MinigameCDTimer = 0;
-            //TypeID++;
-            //Type = (AwardUIType) TypeID;
         }
 
         if (Input.GetKeyDown(KeyCode.X))
         {
             MiniGameManager.GameTimer = 45;
-            //TypeID--;
-            //Type = (AwardUIType)TypeID;
         }
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-            //SetupAwardUI.Setup(Type, 1, AwardImages, DeltaSize, DeltaSize);
+
         }
 
         if (Input.GetKeyDown(KeyCode.V))
         {
-            //SetupAwardUI.Setup(Type, 808, AwardImages, DeltaSize, DeltaSize);
+
         }
 
         //if (Input.GetKeyDown(KeyCode.B))