diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta index 6c61308f..ec0c84dd 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta @@ -37,7 +37,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 @@ -164,11 +164,11 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 1 + animationType: 2 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.txt deleted file mode 100644 index 21905dbf..00000000 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.txt +++ /dev/null @@ -1,2 +0,0 @@ -3800-3880 46chuangjin1 -3880-3960 46chuangjin2 \ No newline at end of file diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/第二层创巾/创巾/chuangjin.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/第二层创巾/创巾/chuangjin.fbx.meta index 8dc09034..5071654a 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/第二层创巾/创巾/chuangjin.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/第二层创巾/创巾/chuangjin.fbx.meta @@ -24,7 +24,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 @@ -122,11 +122,11 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 1 + animationType: 2 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/第二层创巾/创巾/chuangjin.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/第二层创巾/创巾/chuangjin.txt deleted file mode 100644 index dc0a7216..00000000 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/第二层创巾/创巾/chuangjin.txt +++ /dev/null @@ -1 +0,0 @@ -6240-6281 46chuangjin2ceng \ No newline at end of file diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/第二层创巾/创巾/chuangjin.txt.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/第二层创巾/创巾/chuangjin.txt.meta deleted file mode 100644 index 0831ecb0..00000000 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/第二层创巾/创巾/chuangjin.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ae19093e7b7304d49b45e50f1f154651 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index e946d7da..cec0705a 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -14036,7 +14036,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6056746226357768549, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3} propertyPath: m_Animations.Array.size - value: 38 + value: 37 objectReference: {fileID: 0} - target: {fileID: 6056746226357768549, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3} propertyPath: m_Animations.Array.data[21] @@ -14089,19 +14089,19 @@ PrefabInstance: - target: {fileID: 6056746226357768549, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3} propertyPath: m_Animations.Array.data[33] value: - objectReference: {fileID: 3060610079319413300, guid: a049fcbd41c02f34baebf552b3185d4d, type: 3} + objectReference: {fileID: 3060610079319413300, guid: 4c0e49a192618b047a0ac4d981ac805e, type: 3} - target: {fileID: 6056746226357768549, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3} propertyPath: m_Animations.Array.data[34] value: - objectReference: {fileID: 3060610079319413300, guid: 4c0e49a192618b047a0ac4d981ac805e, type: 3} + objectReference: {fileID: -6004787696405322892, guid: 383f6f82144eac545bea932bd6aeebd1, type: 3} - target: {fileID: 6056746226357768549, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3} propertyPath: m_Animations.Array.data[35] value: - objectReference: {fileID: -6004787696405322892, guid: 383f6f82144eac545bea932bd6aeebd1, type: 3} + objectReference: {fileID: -6004787696405322892, guid: a2a1f988a08d26440b0eda4029929157, type: 3} - target: {fileID: 6056746226357768549, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3} propertyPath: m_Animations.Array.data[36] value: - objectReference: {fileID: -6004787696405322892, guid: a2a1f988a08d26440b0eda4029929157, type: 3} + objectReference: {fileID: 3060610079319413300, guid: a9fb3fc52e31e724c8d6c848492054e0, type: 3} - target: {fileID: 6056746226357768549, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3} propertyPath: m_Animations.Array.data[37] value: @@ -20228,7 +20228,6 @@ Transform: - {fileID: 715309540} - {fileID: 383561005} - {fileID: 578070457} - - {fileID: 1093019040} - {fileID: 2080054415} - {fileID: 27532955} - {fileID: 1690066284} @@ -20236,7 +20235,6 @@ Transform: - {fileID: 1297725842} - {fileID: 1212497062} - {fileID: 1723608868} - - {fileID: 1404724517} - {fileID: 1113248793} - {fileID: 941499784} - {fileID: 44765869} @@ -20296,6 +20294,9 @@ Transform: - {fileID: 240567763} - {fileID: 1544556236} - {fileID: 602279188} + - {fileID: 1813719264} + - {fileID: 1093019040} + - {fileID: 925500724} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &758617108 @@ -21142,6 +21143,201 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.16181622, y: 0.012764765, z: 0.05644876} m_Center: {x: -0.024277057, y: 0.00000010891718, z: 0.000000022112925} +--- !u!1001 &925500723 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 738442634} + m_Modifications: + - target: {fileID: -9189648273554680409, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.007863433 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_DirtyAABB + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Center.x + value: -0.030609071 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Center.y + value: -0.1494008 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Center.z + value: 0.012814462 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Extent.x + value: 0.6505505 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Extent.y + value: 0.16692969 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Extent.z + value: 0.47031492 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: e2d56916f80c37a45b2cf27fdfae95b9, type: 2} + - target: {fileID: -3887185075125053422, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: e2d56916f80c37a45b2cf27fdfae95b9, type: 2} + - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_DirtyAABB + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Center.x + value: -0.030609071 + objectReference: {fileID: 0} + - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Center.y + value: -0.1494008 + objectReference: {fileID: 0} + - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Center.z + value: 0.012814462 + objectReference: {fileID: 0} + - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Extent.x + value: 0.6505505 + objectReference: {fileID: 0} + - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Extent.y + value: 0.16692969 + objectReference: {fileID: 0} + - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_AABB.m_Extent.z + value: 0.47031492 + objectReference: {fileID: 0} + - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: e2d56916f80c37a45b2cf27fdfae95b9, type: 2} + - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: e2d56916f80c37a45b2cf27fdfae95b9, type: 2} + - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_BlendShapeWeights.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_Name + value: chuangjin + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + insertIndex: -1 + addedObject: {fileID: 925500727} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + insertIndex: -1 + addedObject: {fileID: 925500728} + m_SourcePrefab: {fileID: 100100000, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} +--- !u!4 &925500724 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + m_PrefabInstance: {fileID: 925500723} + m_PrefabAsset: {fileID: 0} +--- !u!1 &925500725 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + m_PrefabInstance: {fileID: 925500723} + m_PrefabAsset: {fileID: 0} +--- !u!111 &925500727 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 925500725} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 3060610079319413300, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + m_Animations: + - {fileID: 3060610079319413300, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + - {fileID: -6004787696405322892, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + m_WrapMode: 0 + m_PlayAutomatically: 0 + m_AnimatePhysics: 0 + m_CullingType: 0 +--- !u!95 &925500728 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 925500725} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1001 &930017809 PrefabInstance: m_ObjectHideFlags: 0 @@ -27560,7 +27756,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 8db5e854b2c673547ad565cf03a94754, type: 3} + insertIndex: -1 + addedObject: {fileID: 1475867575} m_SourcePrefab: {fileID: 100100000, guid: 8db5e854b2c673547ad565cf03a94754, type: 3} --- !u!4 &1093019040 stripped Transform: @@ -37191,92 +37390,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0a6273571c5b2184fa38e7d7bdccc57f, type: 3} m_PrefabInstance: {fileID: 1359275436} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1404724516 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 738442634} - m_Modifications: - - target: {fileID: -9189648273554680409, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -0.00000019867969 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: e2d56916f80c37a45b2cf27fdfae95b9, type: 2} - - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_Materials.Array.data[2] - value: - objectReference: {fileID: 2100000, guid: e2d56916f80c37a45b2cf27fdfae95b9, type: 2} - - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_BlendShapeWeights.Array.size - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_Name - value: chuangjin - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2223639932434330405, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_PlayAutomatically - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} ---- !u!4 &1404724517 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - m_PrefabInstance: {fileID: 1404724516} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1410392748 PrefabInstance: m_ObjectHideFlags: 0 @@ -38319,6 +38432,32 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7da0dd5278931af4283cc70b28ae083c, type: 3} m_PrefabInstance: {fileID: 1472968995} m_PrefabAsset: {fileID: 0} +--- !u!1 &1475867574 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 8db5e854b2c673547ad565cf03a94754, type: 3} + m_PrefabInstance: {fileID: 1093019039} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1475867575 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475867574} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1496669003 GameObject: m_ObjectHideFlags: 0 @@ -47655,7 +47794,6 @@ Animation: - {fileID: 3060610079319413300, guid: c5eaedb1fe2aec1448d2afcc3eea9a5c, type: 3} - {fileID: -6004787696405322892, guid: c5eaedb1fe2aec1448d2afcc3eea9a5c, type: 3} - {fileID: 3060610079319413300, guid: f8a7bd7c22cd7f34cae9ecc575fb0979, type: 3} - - {fileID: 3060610079319413300, guid: 6b1fd1932ba889f4d90c21cc17c0a8a2, type: 3} - {fileID: -6004787696405322892, guid: a03311e14cdec924aa5ae3bde1a2206e, type: 3} m_WrapMode: 0 m_PlayAutomatically: 0 @@ -47901,6 +48039,85 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c501664a7a8563f4fbc7039f89693ee1, type: 3} m_PrefabInstance: {fileID: 1776258166} m_PrefabAsset: {fileID: 0} +--- !u!1 &1813719263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1813719264} + - component: {fileID: 1813719266} + - component: {fileID: 1813719265} + m_Layer: 0 + m_Name: ChuangJin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1813719264 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813719263} + serializedVersion: 2 + 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: 738442634} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1813719265 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813719263} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!320 &1813719266 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813719263} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 11400000, guid: 6a7e8e07646d3c74695a5422d1190604, type: 2} + m_InitialState: 0 + m_WrapMode: 2 + m_DirectorUpdateMode: 1 + m_InitialTime: 0 + m_SceneBindings: + - key: {fileID: 5527926292699786092, guid: 6a7e8e07646d3c74695a5422d1190604, type: 2} + value: {fileID: 1475867574} + - key: {fileID: -8653705755278076843, guid: 6a7e8e07646d3c74695a5422d1190604, type: 2} + value: {fileID: 1475867575} + - key: {fileID: 6862385988991075172, guid: 6a7e8e07646d3c74695a5422d1190604, type: 2} + value: {fileID: 925500725} + - key: {fileID: -5236381648747817177, guid: 6a7e8e07646d3c74695a5422d1190604, type: 2} + value: {fileID: 925500728} + m_ExposedReferences: + m_References: [] --- !u!1 &1820055308 GameObject: m_ObjectHideFlags: 0 @@ -58161,6 +58378,14 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1007619859752080460, guid: ff4670f5a4c43f74d92845260f7f92f6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5894828509976324021, guid: ff4670f5a4c43f74d92845260f7f92f6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/TimeLines/ChuangJin.playable b/Assets/TimeLines/ChuangJin.playable new file mode 100644 index 00000000..f73d2204 --- /dev/null +++ b/Assets/TimeLines/ChuangJin.playable @@ -0,0 +1,591 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8653705755278076843 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track (1) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 6.666666666666667 + m_ClipIn: 0 + m_Asset: {fileID: -4247593140445469339} + m_Duration: 1.708333333333333 + m_TimeScale: 1 + m_ParentTrack: {fileID: -8653705755278076843} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 1 + m_PreExtrapolationMode: 1 + m_PostExtrapolationTime: Infinity + m_PreExtrapolationTime: 6.666666666666667 + m_DisplayName: 46chuangjin2ceng + m_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 0 + m_InfiniteClipPostExtrapolation: 0 + m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0} + m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: 0} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 +--- !u!114 &-5236381648747817177 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: 454703045166598495} + m_Duration: 3.3333333333333335 + m_TimeScale: 1 + m_ParentTrack: {fileID: -5236381648747817177} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 1 + m_PreExtrapolationMode: 1 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: 46chuangjin1 + - m_Version: 1 + m_Start: 3.3333333333333335 + m_ClipIn: 0 + m_Asset: {fileID: 2664585270520410081} + m_Duration: 3.3333333333333335 + m_TimeScale: 1 + m_ParentTrack: {fileID: -5236381648747817177} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 1 + m_PreExtrapolationMode: 1 + m_PostExtrapolationTime: Infinity + m_PreExtrapolationTime: 0 + m_DisplayName: 46chuangjin2 + m_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 0 + m_InfiniteClipPostExtrapolation: 0 + m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0} + m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: 0} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 +--- !u!114 &-4247593140445469339 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3} + m_Name: AnimationPlayableAsset + m_EditorClassIdentifier: + m_Clip: {fileID: 3060610079319413300, guid: 8db5e854b2c673547ad565cf03a94754, type: 3} + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_UseTrackMatchFields: 1 + m_MatchTargetFields: 63 + m_RemoveStartOffset: 1 + m_ApplyFootIK: 1 + m_Loop: 0 + m_Version: 1 + m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &-2218430480874903349 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3} + m_Name: ChuangJin + m_EditorClassIdentifier: + m_Version: 0 + m_Tracks: + - {fileID: 6862385988991075172} + - {fileID: -5236381648747817177} + - {fileID: 5527926292699786092} + - {fileID: -8653705755278076843} + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 24 + m_ScenePreview: 1 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} +--- !u!114 &454703045166598495 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3} + m_Name: AnimationPlayableAsset + m_EditorClassIdentifier: + m_Clip: {fileID: 3060610079319413300, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_UseTrackMatchFields: 1 + m_MatchTargetFields: 63 + m_RemoveStartOffset: 1 + m_ApplyFootIK: 1 + m_Loop: 0 + m_Version: 1 + m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &2664585270520410081 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3} + m_Name: AnimationPlayableAsset + m_EditorClassIdentifier: + m_Clip: {fileID: -6004787696405322892, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_UseTrackMatchFields: 1 + m_MatchTargetFields: 63 + m_RemoveStartOffset: 1 + m_ApplyFootIK: 1 + m_Loop: 0 + m_Version: 1 + m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &2796668390217144311 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset(Clone)(Clone) + m_EditorClassIdentifier: +--- !u!114 &5527926292699786092 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track (1) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 6.666666666666667 + m_ClipIn: 0 + m_Asset: {fileID: 2796668390217144311} + m_Duration: 1.7499999999999991 + m_TimeScale: 1 + m_ParentTrack: {fileID: 5527926292699786092} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 +--- !u!114 &6862385988991075172 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track (2) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: -2218430480874903349} + m_Duration: 8.416666666666666 + m_TimeScale: 1 + m_ParentTrack: {fileID: 6862385988991075172} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.txt.meta b/Assets/TimeLines/ChuangJin.playable.meta similarity index 52% rename from Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.txt.meta rename to Assets/TimeLines/ChuangJin.playable.meta index 6d51472a..8cd9c1c0 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.txt.meta +++ b/Assets/TimeLines/ChuangJin.playable.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 136956c22389540469a0ff6f4d2df505 -TextScriptImporter: +guid: 6a7e8e07646d3c74695a5422d1190604 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index 80fba398..7cb44641 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -1501,29 +1501,28 @@ - + - + - + - - + @@ -2490,14 +2489,16 @@ - - + + + + - - + + @@ -2644,8 +2645,7 @@ - - + diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml index a872b1ef..d76fd62f 100644 --- a/Data/Xml/Study.xml +++ b/Data/Xml/Study.xml @@ -805,8 +805,6 @@ - - @@ -1597,9 +1595,11 @@ - - - + + + + + @@ -1615,6 +1615,8 @@ + + @@ -1680,7 +1682,8 @@ - + + @@ -1888,15 +1891,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -2034,6 +2104,7 @@ + @@ -2057,6 +2128,12 @@ + + + + + + @@ -2094,6 +2171,7 @@ + @@ -2245,6 +2323,8 @@ + + @@ -3234,8 +3314,7 @@ - - +