diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.fbx.meta index f3a7c8c0..8687f7e2 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.fbx.meta @@ -41,10 +41,39 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: "\u64E6\u624B" + name: zhijin1 takeName: internalID: 3060610079319413300 firstFrame: 2330 + lastFrame: 2440 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 0 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: zhijin2 + takeName: + internalID: -6004787696405322892 + firstFrame: 2440 lastFrame: 2500 wrapMode: 0 orientationOffsetY: 0 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.txt index 3c414329..9549ec0c 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.txt +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.txt @@ -1 +1,2 @@ -2330-2500 擦手 \ No newline at end of file +2330-2440 zhijin1 +2440-2500 zhijin2 \ No newline at end of file diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index 19d5c200..5f8b2ce5 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -17945,6 +17945,7 @@ Animation: m_Animation: {fileID: 3060610079319413300, guid: be7f28f8b62754942a777770653e1620, type: 3} m_Animations: - {fileID: 3060610079319413300, guid: be7f28f8b62754942a777770653e1620, type: 3} + - {fileID: -6004787696405322892, guid: be7f28f8b62754942a777770653e1620, type: 3} m_WrapMode: 0 m_PlayAutomatically: 0 m_AnimatePhysics: 0 diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml index 29b30475..f04d54e7 100644 --- a/Data/Xml/Study.xml +++ b/Data/Xml/Study.xml @@ -992,10 +992,9 @@ - - - - + + + @@ -1017,7 +1016,11 @@ - + + + + + @@ -1224,15 +1227,21 @@ - - - + + + + + + + + + - + - + @@ -1240,6 +1249,7 @@ + @@ -1248,10 +1258,7 @@ - - - - + @@ -1332,7 +1339,8 @@ - + + @@ -1388,9 +1396,14 @@ - - - + + + + + + + + @@ -1433,7 +1446,9 @@ - + + + @@ -1486,9 +1501,13 @@ - - - + + + + + + + @@ -2219,7 +2238,6 @@ - @@ -2239,7 +2257,6 @@ - @@ -2322,6 +2339,8 @@ + + @@ -2828,19 +2847,15 @@ - - - -