diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/50,52,53/5253/dunjian/dunjian.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/50,52,53/5253/dunjian/dunjian.fbx.meta index 5af2fa0d..5fbcf55d 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/50,52,53/5253/dunjian/dunjian.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/50,52,53/5253/dunjian/dunjian.fbx.meta @@ -41,10 +41,39 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: 5253dunjian + name: 5253dunjianZuo takeName: internalID: 3060610079319413300 firstFrame: 4220 + lastFrame: 4298 + 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: 5253dunjianYou + takeName: + internalID: -6004787696405322892 + firstFrame: 4298 lastFrame: 4330 wrapMode: 0 orientationOffsetY: 0 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/50,52,53/5253/dunjian/dunjian.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/50,52,53/5253/dunjian/dunjian.txt index 269edd00..74e34109 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/50,52,53/5253/dunjian/dunjian.txt +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/50,52,53/5253/dunjian/dunjian.txt @@ -1 +1,2 @@ -4220-4330 5253dunjian \ No newline at end of file +4220-4298 5253dunjianZuo +4298-4330 5253dunjianYou \ No newline at end of file diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml index 668a36dd..be39a400 100644 --- a/Data/Xml/Study.xml +++ b/Data/Xml/Study.xml @@ -569,7 +569,18 @@ 擦手纸 - + + 止血笔 + Models/zhixuebi + 止血笔 + + + + 酒精喷壶 + Models/penhu/AlcoholSpray.002 + 酒精喷壶 + + @@ -830,6 +841,7 @@ + @@ -856,8 +868,9 @@ + + - @@ -869,13 +882,7 @@ - - - - @@ -896,6 +903,17 @@ + + + + + + + + + + + @@ -1052,8 +1070,7 @@ - + @@ -1301,6 +1318,8 @@ + + @@ -1336,32 +1355,38 @@ - + + + - + - - - - - - - - - + + + + + + + + + + + + + @@ -1381,6 +1406,7 @@ + @@ -1398,6 +1424,11 @@ + + + + + @@ -1436,27 +1467,40 @@ - + + + + + + + + + + + - - + - + + + + + + - @@ -1464,7 +1508,9 @@ + + @@ -1478,14 +1524,17 @@ - - - - - - - + + + + + + + + + + @@ -1497,11 +1546,12 @@ - + + @@ -1513,6 +1563,7 @@ + @@ -1529,6 +1580,11 @@ + + + + + @@ -1537,14 +1593,18 @@ + - + + + + - + @@ -1591,14 +1651,17 @@ + + + - + @@ -1646,11 +1709,12 @@ - - - - + + + + + @@ -1658,7 +1722,18 @@ + + + + + + + + + + + @@ -1666,32 +1741,24 @@ - - + + - + - - - - - - - - - - - - + + @@ -1699,8 +1766,18 @@ - - + + + + + + + + + + + + @@ -1717,17 +1794,33 @@ - + + + + + + + + + + + + + + + + + - + @@ -1735,6 +1828,8 @@ + + @@ -1746,33 +1841,63 @@ - + + + + + + + + + + + + + + + - + + + + + > + + + + - + + @@ -1780,40 +1905,14 @@ - - - - - - - + --> - - - + - - - - - - - - - - + --> + --> + + + @@ -1840,6 +1942,11 @@ + + + + +