于:道具2&3 动画修改

2bfbfe6a · Yuyang · cf5ebe91 · 2bfbfe6a · 2bfbfe6a · 2bfbfe6a
Commit 2bfbfe6a authored Mar 04, 2021 by Yuyang
3 changed files
--- a/BoomMaster/Assets/#C2_Animations/Porps2_Attack.anim
+++ b/BoomMaster/Assets/#C2_Animations/Porps2_Attack.anim
@@ -88,9 +88,18 @@ AnimationClip:
  - curve:
      serializedVersion: 2
      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.008395195, y: 5.5, z: 0.024882317}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 0.033333335
-        value: {x: 0.008395195, y: 0, z: 0.024882317}
+        value: {x: 0.008395195, y: 5.5, z: 0.024882317}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@@ -99,7 +108,7 @@ AnimationClip:
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 0.06666667
-        value: {x: 0.008395195, y: 0, z: 0.024882317}
+        value: {x: 0.008395195, y: 5.5, z: 0.024882317}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@@ -108,7 +117,7 @@ AnimationClip:
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 0.45
-        value: {x: 0.6269435, y: 0, z: 0.024882317}
+        value: {x: 0.6269435, y: 5.5, z: 0.024882317}
        inSlope: {x: 0.6676981, y: 0, z: 0}
        outSlope: {x: 0.6676981, y: 0, z: 0}
        tangentMode: 0
@@ -117,7 +126,7 @@ AnimationClip:
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 0.48333332
-        value: {x: 0.63839436, y: 0, z: 0.07298898}
+        value: {x: 0.63839436, y: 5.5, z: 0.07298898}
        inSlope: {x: 0, y: 0, z: 2.7455997}
        outSlope: {x: 0, y: 0, z: 2.7455997}
        tangentMode: 0
@@ -126,7 +135,7 @@ AnimationClip:
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 0.7
-        value: {x: -2.4631925, y: 0, z: 1.0148823}
+        value: {x: -2.4631925, y: 5.5, z: 1.0148823}
        inSlope: {x: -9.041074, y: 0, z: 0}
        outSlope: {x: -9.041074, y: 0, z: 0}
        tangentMode: 0
@@ -135,7 +144,7 @@ AnimationClip:
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 0.73333335
-        value: {x: -2.621605, y: 0, z: 1.012504}
+        value: {x: -2.621605, y: 5.5, z: 1.012504}
        inSlope: {x: 0, y: 0, z: -0.14131323}
        outSlope: {x: 0, y: 0, z: -0.14131323}
        tangentMode: 0
@@ -144,7 +153,7 @@ AnimationClip:
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 1.8666667
-        value: {x: 0.0020768177, y: 0, z: 0.024882317}
+        value: {x: 0.0020768177, y: 5.5, z: 0.024882317}
        inSlope: {x: 0.3754076, y: 0, z: 0}
        outSlope: {x: 0.3754076, y: 0, z: 0}
        tangentMode: 0
@@ -153,7 +162,7 @@ AnimationClip:
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 1.9
-        value: {x: 0.008395195, y: 0, z: 0.024882317}
+        value: {x: 0.008395195, y: 5.5, z: 0.024882317}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@@ -637,6 +646,25 @@ AnimationClip:
    path: 
    classID: 4
    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 5.5
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
  m_EulerEditorCurves:
  - curve:
      serializedVersion: 2

--- a/BoomMaster/Assets/#C2_Animations/Porps3_Attack.anim
+++ b/BoomMaster/Assets/#C2_Animations/Porps3_Attack.anim
@@ -75,104 +75,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    path: 
-  m_PositionCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: -0.0050325394, y: 0, z: -0.0060274005}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.033333335
-        value: {x: 0.04501778, y: 0.18125041, z: -0.0060274005}
-        inSlope: {x: 2.8565302, y: 10.344534, z: 0}
-        outSlope: {x: 2.8565302, y: 10.344534, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.25
-        value: {x: 1.0249662, y: 3.73, z: -0.0060274005}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.28333333
-        value: {x: 0.7051166, y: 3.5774832, z: -0.0060274005}
-        inSlope: {x: -17.867466, y: -8.51991, z: 0}
-        outSlope: {x: -17.867466, y: -8.51991, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.43333334
-        value: {x: -2.6450334, y: 1.98, z: 0.14915664}
-        inSlope: {x: 0, y: 0, z: 0.8276481}
-        outSlope: {x: 0, y: 0, z: 0.8276481}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.46666667
-        value: {x: -2.6450334, y: 1.98, z: 0.16397256}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.56666666
-        value: {x: -2.6450334, y: 1.98, z: 0.16397256}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.6
-        value: {x: -2.6005726, y: 1.9385706, z: 0.16397256}
-        inSlope: {x: 2.595542, y: -2.4185727, z: 0}
-        outSlope: {x: 2.595542, y: -2.4185727, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 1
-        value: {x: -0.0050325394, y: -0.48, z: -0.0031644222}
-        inSlope: {x: 0, y: 0, z: -0.16713676}
-        outSlope: {x: 0, y: 0, z: -0.16713676}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 1.0333333
-        value: {x: -0.0050325394, y: -0.48, z: -0.0060274005}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: 
+  m_PositionCurves: []
  m_ScaleCurves:
  - curve:
      serializedVersion: 2
@@ -235,13 +138,6 @@ AnimationClip:
    m_Extent: {x: 0, y: 0, z: 0}
  m_ClipBindingConstant:
    genericBindings:
-    - serializedVersion: 2
-      path: 0
-      attribute: 1
-      script: {fileID: 0}
-      typeID: 4
-      customType: 0
-      isPPtrCurve: 0
    - serializedVersion: 2
      path: 0
      attribute: 4
@@ -262,7 +158,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 1.0333333
+    m_StopTime: 1
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@@ -278,171 +174,6 @@ AnimationClip:
    m_HeightFromFeet: 0
    m_Mirror: 0
  m_EditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -0.0050325394
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.25
-        value: 1.0249662
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.43333334
-        value: -2.6450334
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.56666666
-        value: -2.6450334
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1
-        value: -0.0050325394
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.x
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.25
-        value: 3.73
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.43333334
-        value: 1.98
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.56666666
-        value: 1.98
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1
-        value: -0.48
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.y
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0.033333335
-        value: -0.0060274005
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.28333333
-        value: -0.0060274005
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.46666667
-        value: 0.16397256
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.6
-        value: 0.16397256
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.0333333
-        value: -0.0060274005
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.z
-    path: 
-    classID: 4
-    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:

--- a/BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
+++ b/BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
@@ -1089,6 +1089,7 @@ Transform:
  - {fileID: 4722576578400883437}
  - {fileID: 478456513641011278}
  - {fileID: 8275423476694078730}
+  - {fileID: 3295746585153034900}
  m_Father: {fileID: 3451800651537292263}
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8553,7 +8554,7 @@ Camera:
    height: 1
  near clip plane: 0.3
  far clip plane: 1000
-  field of view: 45
+  field of view: 50
  orthographic: 0
  orthographic size: 5
  m_Depth: -1
@@ -16972,6 +16973,81 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+--- !u!1001 &1649144151
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1633887187434432277}
+    m_Modifications:
+    - target: {fileID: 613928655656575005, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_Name
+      value: Props2Parent
+      objectReference: {fileID: 0}
+    - target: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 70bcd958a01d35d46b076a3b8e96ae38, type: 3}
+--- !u!4 &3295746585153034900 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3295746585719942083, guid: 70bcd958a01d35d46b076a3b8e96ae38,
+    type: 3}
+  m_PrefabInstance: {fileID: 1649144151}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3451800649634096616
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -18741,6 +18817,12 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: f4cc010b6570f694bbf02f9c498e799b, type: 3}
+--- !u!1 &6685223597104144725 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: f4cc010b6570f694bbf02f9c498e799b,
+    type: 3}
+  m_PrefabInstance: {fileID: 3451800651623626844}
+  m_PrefabAsset: {fileID: 0}
 --- !u!33 &1713320689503201648 stripped
 MeshFilter:
  m_CorrespondingSourceObject: {fileID: -5178661895559278292, guid: f4cc010b6570f694bbf02f9c498e799b,
@@ -18759,12 +18841,6 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 3451800651623626844}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &6685223597104144725 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: f4cc010b6570f694bbf02f9c498e799b,
-    type: 3}
-  m_PrefabInstance: {fileID: 3451800651623626844}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3451800651666096333
 PrefabInstance:
  m_ObjectHideFlags: 0