소스 검색

修复冲刺穿平台问题

WGL 4 달 전
부모
커밋
71a76abfb4

+ 50 - 50
ActionTowerDefense/Assets/Animations/Player/PlayerCollider_Fall.anim

@@ -79,26 +79,26 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
+        value: -0.19694
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
         weightedMode: 0
         inWeight: 0
         outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_IsActive
+    attribute: m_Center.x
     path: BodyCollider/BodyCollider
-    classID: 1
+    classID: 136
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.19694
+        value: 0.67778
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -108,8 +108,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Center.x
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Center.y
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -117,7 +117,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.67778
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -127,8 +127,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Center.y
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Height
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -136,7 +136,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1.559
+        value: 0.67009
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -146,8 +146,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Height
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Radius
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -155,26 +155,26 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.67009
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
         weightedMode: 0
         inWeight: 0
         outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Radius
-    path: BodyCollider/BodyCollider (1)
-    classID: 136
+    attribute: m_IsActive
+    path: BodyCollider/BodyCollider
+    classID: 1
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -232,28 +232,28 @@ AnimationClip:
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 605858901
       script: {fileID: 0}
       typeID: 136
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 1394318531
       script: {fileID: 0}
       typeID: 136
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 3094524615
       script: {fileID: 0}
       typeID: 136
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 1984117138
       script: {fileID: 0}
       typeID: 136
@@ -343,26 +343,26 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
+        value: -0.19694
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
         weightedMode: 0
         inWeight: 0
         outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_IsActive
+    attribute: m_Center.x
     path: BodyCollider/BodyCollider
-    classID: 1
+    classID: 136
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.19694
+        value: 0.67778
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -372,8 +372,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Center.x
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Center.y
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -381,7 +381,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.67778
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -391,8 +391,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Center.y
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Height
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -400,7 +400,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1.559
+        value: 0.67009
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -410,8 +410,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Height
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Radius
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -419,26 +419,26 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.67009
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
         weightedMode: 0
         inWeight: 0
         outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Radius
-    path: BodyCollider/BodyCollider (1)
-    classID: 136
+    attribute: m_IsActive
+    path: BodyCollider/BodyCollider
+    classID: 1
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103

+ 50 - 50
ActionTowerDefense/Assets/Animations/Player/PlayerCollider_Rise.anim

@@ -117,26 +117,26 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
+        value: -0.19694
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
         weightedMode: 0
         inWeight: 0
         outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_IsActive
+    attribute: m_Center.x
     path: BodyCollider/BodyCollider
-    classID: 1
+    classID: 136
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.19694
+        value: 0.67778
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -146,8 +146,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Center.x
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Center.y
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -155,7 +155,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.67778
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -165,8 +165,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Center.y
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Height
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -174,7 +174,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1.559
+        value: 0.67009
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -184,8 +184,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Height
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Radius
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -193,26 +193,26 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.67009
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
         weightedMode: 0
         inWeight: 0
         outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Radius
-    path: BodyCollider/BodyCollider (1)
-    classID: 136
+    attribute: m_IsActive
+    path: BodyCollider/BodyCollider
+    classID: 1
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -284,28 +284,28 @@ AnimationClip:
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 605858901
       script: {fileID: 0}
       typeID: 136
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 1394318531
       script: {fileID: 0}
       typeID: 136
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 3094524615
       script: {fileID: 0}
       typeID: 136
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 1984117138
       script: {fileID: 0}
       typeID: 136
@@ -433,26 +433,26 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
+        value: -0.19694
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
         weightedMode: 0
         inWeight: 0
         outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_IsActive
+    attribute: m_Center.x
     path: BodyCollider/BodyCollider
-    classID: 1
+    classID: 136
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.19694
+        value: 0.67778
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -462,8 +462,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Center.x
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Center.y
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -471,7 +471,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.67778
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -481,8 +481,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Center.y
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Height
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -490,7 +490,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1.559
+        value: 0.67009
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -500,8 +500,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Height
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Radius
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -509,26 +509,26 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.67009
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
         weightedMode: 0
         inWeight: 0
         outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Radius
-    path: BodyCollider/BodyCollider (1)
-    classID: 136
+    attribute: m_IsActive
+    path: BodyCollider/BodyCollider
+    classID: 1
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103

+ 40 - 40
ActionTowerDefense/Assets/Animations/Player/PlayerCollider_Run.anim

@@ -114,7 +114,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 1
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -133,7 +133,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -163,7 +163,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Center.x
-    path: BodyCollider/BodyCollider (1)
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -182,7 +182,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Center.y
-    path: BodyCollider/BodyCollider (1)
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -190,7 +190,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1.559
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -201,7 +201,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Height
-    path: BodyCollider/BodyCollider (1)
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -220,7 +220,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_Radius
-    path: BodyCollider/BodyCollider (1)
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   m_PPtrCurves: []
@@ -281,28 +281,28 @@ AnimationClip:
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 605858901
       script: {fileID: 0}
       typeID: 136
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 1394318531
       script: {fileID: 0}
       typeID: 136
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 3094524615
       script: {fileID: 0}
       typeID: 136
       customType: 0
       isPPtrCurve: 0
     - serializedVersion: 2
-      path: 2188086554
+      path: 3409094610
       attribute: 1984117138
       script: {fileID: 0}
       typeID: 136
@@ -411,7 +411,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 1
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -430,7 +430,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -449,7 +449,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.19694
+        value: -0.949
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -459,16 +459,16 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Center.x
-    path: BodyCollider/BodyCollider (1)
-    classID: 136
+    attribute: m_LocalPosition.x
+    path: WallTrigger
+    classID: 4
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.67778
+        value: 0.983
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -478,16 +478,16 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Center.y
-    path: BodyCollider/BodyCollider (1)
-    classID: 136
+    attribute: m_LocalPosition.y
+    path: WallTrigger
+    classID: 4
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1.559
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -497,16 +497,16 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Height
-    path: BodyCollider/BodyCollider (1)
-    classID: 136
+    attribute: m_LocalPosition.z
+    path: WallTrigger
+    classID: 4
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.67009
+        value: -0.19694
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -516,8 +516,8 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Radius
-    path: BodyCollider/BodyCollider (1)
+    attribute: m_Center.x
+    path: BodyCollider/BodyCollider
     classID: 136
     script: {fileID: 0}
   - curve:
@@ -525,7 +525,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.949
+        value: 0.67778
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -535,16 +535,16 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_LocalPosition.x
-    path: WallTrigger
-    classID: 4
+    attribute: m_Center.y
+    path: BodyCollider/BodyCollider
+    classID: 136
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.983
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -554,16 +554,16 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_LocalPosition.y
-    path: WallTrigger
-    classID: 4
+    attribute: m_Height
+    path: BodyCollider/BodyCollider
+    classID: 136
     script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 0.67009
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -573,9 +573,9 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_LocalPosition.z
-    path: WallTrigger
-    classID: 4
+    attribute: m_Radius
+    path: BodyCollider/BodyCollider
+    classID: 136
     script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0

+ 8 - 53
ActionTowerDefense/Assets/Animations/Player/PlayerCollider_Rush.anim

@@ -109,25 +109,6 @@ AnimationClip:
     path: BeHitTrigger
     classID: 65
     script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_IsActive
-    path: BodyCollider/BodyCollider
-    classID: 1
-    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
@@ -152,7 +133,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.38664
+        value: 0.17441511
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -171,7 +152,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.47071
+        value: 0.8462923
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -190,7 +171,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1.8384
+        value: 2.9605103
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -209,7 +190,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.35362
+        value: 0.72920233
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -250,13 +231,6 @@ AnimationClip:
     m_Extent: {x: 0, y: 0, z: 0}
   m_ClipBindingConstant:
     genericBindings:
-    - serializedVersion: 2
-      path: 3409094610
-      attribute: 2086281974
-      script: {fileID: 0}
-      typeID: 1
-      customType: 0
-      isPPtrCurve: 0
     - serializedVersion: 2
       path: 2188086554
       attribute: 2086281974
@@ -432,25 +406,6 @@ AnimationClip:
     path: BeHitTrigger
     classID: 65
     script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_IsActive
-    path: BodyCollider/BodyCollider
-    classID: 1
-    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
@@ -475,7 +430,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.38664
+        value: 0.17441511
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -494,7 +449,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.47071
+        value: 0.8462923
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -513,7 +468,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1.8384
+        value: 2.9605103
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -532,7 +487,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.35362
+        value: 0.72920233
         inSlope: 0
         outSlope: 0
         tangentMode: 136

+ 8 - 53
ActionTowerDefense/Assets/Animations/Player/PlayerCollider_Sprint.anim

@@ -117,26 +117,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_IsActive
-    path: BodyCollider/BodyCollider
-    classID: 1
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -0.38664
+        value: 0.17441511
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -155,7 +136,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.47071
+        value: 0.8462923
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -174,7 +155,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1.8384
+        value: 2.9605103
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -193,7 +174,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.35362
+        value: 0.72920233
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -241,13 +222,6 @@ AnimationClip:
       typeID: 1
       customType: 0
       isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 3409094610
-      attribute: 2086281974
-      script: {fileID: 0}
-      typeID: 1
-      customType: 0
-      isPPtrCurve: 0
     - serializedVersion: 2
       path: 2188086554
       attribute: 2086281974
@@ -433,26 +407,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_IsActive
-    path: BodyCollider/BodyCollider
-    classID: 1
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -0.38664
+        value: 0.17441511
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -471,7 +426,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.47071
+        value: 0.8462923
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -490,7 +445,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1.8384
+        value: 2.9605103
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -509,7 +464,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.35362
+        value: 0.72920233
         inSlope: 0
         outSlope: 0
         tangentMode: 136

+ 15 - 14
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -297,7 +297,7 @@ GameObject:
   m_Component:
   - component: {fileID: 9080369701262820802}
   - component: {fileID: 669663247824325687}
-  m_Layer: 6
+  m_Layer: 21
   m_Name: BodyCollider (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -861,6 +861,13 @@ MonoBehaviour:
   totalDieKeepTime: 1.3333334
   totalAttack_summonTime: 0.5
   totalAttack_marchTime: 0.5
+  showInjuryNum: 1
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 0}
+  injuryNumPos_summon: {x: 0, y: 1}
+  injuryNumRandom_summon: {x: 1, y: 1}
+  injuryNumPos_march: {x: 0, y: 1}
+  injuryNumRandom_march: {x: 2, y: 2}
   dieKeepTime: 0
   beHitDistance: 0
   attackDis: 0
@@ -869,17 +876,14 @@ MonoBehaviour:
   state: 1
   totalHp: 5000
   hp: 0
-  isDie: 0
-  isRevive: 0
+  canFly: 0
+  nowCanFly: 0
   canNotAddForce: 0
   canNotChangeHurt: 0
+  isDie: 0
+  isRevive: 0
   invincibleTime: 0
-  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  injuryNumTextSummon: {fileID: 0}
   isBeHitBySummonAttack: 0
-  showInjuryNum: 1
-  canFly: 0
-  nowCanFly: 0
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
@@ -888,10 +892,7 @@ MonoBehaviour:
   cookEffect: {fileID: 0}
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
-  injuryNumPos_summon: {x: 0, y: 1}
-  injuryNumRandom_summon: {x: 1, y: 1}
-  injuryNumPos_march: {x: 0, y: 1}
-  injuryNumRandom_march: {x: 2, y: 2}
+  hitResistance: 100
   foot: {fileID: 3571941039716665623}
   attributeStatus: {fileID: 0}
   hitFeedbackSystem: {fileID: 0}
@@ -900,7 +901,6 @@ MonoBehaviour:
   extraGroundGravity: -28.8
   velocityAddition: 0
   platformY: 0
-  hitResistance: 100
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -2122,6 +2122,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5eaed0a6b9d6fc6409bef80cf41a0a8e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  canBreakWall: 0
+  wallBrealNum: 10
   isShoot: 0
   type: 0
   owner: {fileID: 0}
@@ -2174,7 +2176,6 @@ MonoBehaviour:
   repelValue: 0
   offsetY: 1
   hitRate: 1
-  onlyFlyCanWeak: 0
 --- !u!1 &9046555753133816952
 GameObject:
   m_ObjectHideFlags: 0

+ 46 - 0
ActionTowerDefense/Assets/Resources/Prefab/ScenceInteraction/Platform.prefab

@@ -63,6 +63,51 @@ Transform:
   m_Father: {fileID: 9180128304838884880}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7684122083059334898
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4214188590365893651}
+  - component: {fileID: 5706277928133819894}
+  m_Layer: 23
+  m_Name: Collider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4214188590365893651
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7684122083059334898}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9180128304838884880}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &5706277928133819894
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7684122083059334898}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1.1, y: 1.1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &8413814847568148875
 GameObject:
   m_ObjectHideFlags: 0
@@ -97,6 +142,7 @@ Transform:
   m_Children:
   - {fileID: 1110442559149676122}
   - {fileID: 1931566334561107229}
+  - {fileID: 4214188590365893651}
   m_Father: {fileID: 262311660969425103}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 1 - 0
ActionTowerDefense/Assets/Resources/Prefab/ScenceInteraction/Wall.prefab

@@ -111,6 +111,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   totalNum: 10
+  wallTriggers: []
 --- !u!1 &8375663503630210449
 GameObject:
   m_ObjectHideFlags: 0

+ 142 - 0
ActionTowerDefense/Assets/Resources/Prefab/ScenceInteraction/testbridge.prefab

@@ -68,6 +68,8 @@ Transform:
   - {fileID: 1684223683758053326}
   - {fileID: 6876287536526511344}
   - {fileID: 5802755026908374823}
+  - {fileID: 1905076435838806316}
+  - {fileID: 3960870952482404508}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -389,6 +391,76 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
   m_PrefabInstance: {fileID: 1831454995907017740}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1861072946825908707
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1428988199306083933}
+    m_Modifications:
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2.74
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 168.318
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 7.765
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1611437088567555043, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_Name
+      value: Platform
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
+--- !u!4 &1905076435838806316 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+  m_PrefabInstance: {fileID: 1861072946825908707}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1911740087879832763
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -529,6 +601,76 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
   m_PrefabInstance: {fileID: 3661294152798334355}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3842762582924853331
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1428988199306083933}
+    m_Modifications:
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2.74
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 211.58
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 8.208
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1611437088567555043, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_Name
+      value: Platform (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
+--- !u!4 &3960870952482404508 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+  m_PrefabInstance: {fileID: 3842762582924853331}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4221088864082213737
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 2 - 2
ActionTowerDefense/ProjectSettings/TagManager.asset

@@ -36,9 +36,9 @@ TagManager:
   - BeSearchTrigger
   - BeHitTrigger
   - AttackTrigger
-  - 
+  - PlayerRushBody
   - Foot
-  - 
+  - CantRush
   - 
   - 
   -