diff options
13 files changed, 1592 insertions, 1480 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationClip/jump_loop_Z1.anim b/Assets/Bundle/Unit/PC/Erika/AnimationClip/jump_loop_Z1.anim index 67f7d0f4..1b53acdc 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationClip/jump_loop_Z1.anim +++ b/Assets/Bundle/Unit/PC/Erika/AnimationClip/jump_loop_Z1.anim @@ -7111,19 +7111,19 @@ AnimationClip: m_AdditiveReferencePoseTime: 0 m_StartTime: 0 m_StopTime: 1.5333334 - m_OrientationOffsetY: 0 + m_OrientationOffsetY: -1.7 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 m_LoopTime: 1 m_LoopBlend: 1 - m_LoopBlendOrientation: 0 + m_LoopBlendOrientation: 1 m_LoopBlendPositionY: 0 m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 + m_KeepOriginalOrientation: 1 + m_KeepOriginalPositionY: 0 m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 + m_HeightFromFeet: 1 m_Mirror: 0 m_EditorCurves: [] m_EulerEditorCurves: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset index 5450dbaf..fb1d508b 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset @@ -106,8 +106,9 @@ MonoBehaviour: m_keys: m_values: [] properties: - m_keys: - m_values: [] + m_keys: 07000000 + m_values: + - 0.55 --- !u!114 &114282673544850798 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset index 309a603b..d86ea9bf 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Jump Up(Clone) + m_Name: Jump Up m_EditorClassIdentifier: animationName: Jump Up animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Jump Up.anim diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/jump_landing 1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/jump_landing 1.asset index 4b3e3da0..8d0d3b93 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/jump_landing 1.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/jump_landing 1.asset @@ -14,32 +14,44 @@ MonoBehaviour: m_EditorClassIdentifier: animationName: jump_landing 1 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/jump_landing 1.anim - animationEvents: [] + animationEvents: + - {fileID: 114250295280482152} hurtBoxes: [] hitBoxes: [] throwBoxes: [] blockBoxes: [] defendBoxes: [] + overrideRootMotion: 1 + rootMotionOverrideData: + positions: + - position: {x: 0, y: 1, z: 0} + frame: 0 + - position: {x: 0, y: 0, z: 0} + frame: 2 + - position: {x: 0, y: 0, z: 0} + frame: 5 + - position: {x: 0, y: 0, z: 0} + frame: 21 speedCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.8 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 - outWeight: 0 + outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 1 + value: 0.8 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 - inWeight: 0 + inWeight: 0.33333334 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 @@ -53,3 +65,25 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: + m_values: [] +--- !u!114 &114250295280482152 +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: 7b8952562a0fbae41a92bd6c1f897ca1, type: 3} + m_Name: EventUnit_SetPosition + m_EditorClassIdentifier: + startFrame: 3 + setX: 0 + x: 0 + setY: 1 + y: 0 + setZ: 0 + z: 0 diff --git a/Assets/Scenes/Demo/AnimationEditScene.unity b/Assets/Scenes/Demo/AnimationEditScene.unity index c4f53d32..615a4387 100644 --- a/Assets/Scenes/Demo/AnimationEditScene.unity +++ b/Assets/Scenes/Demo/AnimationEditScene.unity @@ -112,37 +112,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &42275887 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 42275888} - m_Layer: 0 - m_Name: Bip01_L_Foot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &42275888 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 42275887} - m_LocalRotation: {x: -0.024161316, y: 0.124149695, z: -0.021467388, w: 0.99173707} - m_LocalPosition: {x: -0.26188183, y: 0.00000009386549, z: 0.00000042239392} - m_LocalScale: {x: 0.99999994, y: 1, z: 1} - m_Children: - - {fileID: 443809543} - m_Father: {fileID: 1563342670} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &89054486 GameObject: m_ObjectHideFlags: 0 @@ -188,36 +157,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ClearTime: 2 ---- !u!1 &90183816 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 90183817} - m_Layer: 0 - m_Name: Bip01_HeadNub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &90183817 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 90183816} - m_LocalRotation: {x: -0.00000022500257, y: 1.7347266e-18, z: -1.3877788e-17, w: 1} - m_LocalPosition: {x: -0.08935898, y: 0.000000019073486, z: 0.000000015497209} - m_LocalScale: {x: 1, y: 1.0000001, z: 1} - m_Children: [] - m_Father: {fileID: 1314776083} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &108944114 GameObject: m_ObjectHideFlags: 0 @@ -4975,72 +4914,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &123155139 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 123155140} - - component: {fileID: 123155142} - - component: {fileID: 123155141} - m_Layer: 0 - m_Name: Erika_Robot(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &123155140 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 123155139} - m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0.14154625, y: 0.59459496, z: 0} - m_LocalScale: {x: 0.7000002, y: 0.7, z: 0.7000002} - m_Children: - - {fileID: 584020820} - - {fileID: 1014808335} - - {fileID: 1984954696} - m_Father: {fileID: 1498070814} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &123155141 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 123155139} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f2a6b1bbe8a21fe44b9a3626c5c94ec2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!95 &123155142 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 123155139} - m_Enabled: 1 - m_Avatar: {fileID: 9000000, guid: 9e88de20522c1b34289699be7c70f503, type: 3} - m_Controller: {fileID: 312582471} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &151273306 GameObject: m_ObjectHideFlags: 0 @@ -14626,38 +14499,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &175241491 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 175241492} - m_Layer: 0 - m_Name: Bip01_L_Finger2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &175241492 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175241491} - m_LocalRotation: {x: -0.009766415, y: 0.4355598, z: -0.27369395, w: 0.85748696} - m_LocalPosition: {x: -0.08509573, y: 0.01251139, z: -0.007837229} - m_LocalScale: {x: 1.0000004, y: 0.9999997, z: 1} - m_Children: - - {fileID: 1930182801} - m_Father: {fileID: 207278918} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &191721029 +--- !u!1 &254320224 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14665,94 +14507,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 191721030} + - component: {fileID: 254320225} m_Layer: 0 - m_Name: Bip01_L_Finger1Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &191721030 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 191721029} - m_LocalRotation: {x: -0.00000079494583, y: -4.1633406e-17, z: 5.5511118e-17, w: 1} - m_LocalPosition: {x: -0.025208663, y: -0.000000076293944, z: 5.968559e-15} - m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001} - m_Children: [] - m_Father: {fileID: 1153488635} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &196915937 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 196915938} - m_Layer: 0 - m_Name: Bip01_L_Finger0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &196915938 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 196915937} - m_LocalRotation: {x: 0.22418548, y: 0.38420397, z: -0.30996722, w: 0.84026694} - m_LocalPosition: {x: -0.05137835, y: 0.008330817, z: -0.03716016} - m_LocalScale: {x: 1.0000002, y: 0.9999998, z: 1.0000004} - m_Children: - - {fileID: 1649772006} - m_Father: {fileID: 207278918} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &207278917 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 207278918} - m_Layer: 0 - m_Name: Bip01_L_Hand + m_Name: Bip01_R_Finger3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &207278918 +--- !u!4 &254320225 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 207278917} - m_LocalRotation: {x: 0.93733, y: -0.004999555, z: -0.16877182, w: 0.3048009} - m_LocalPosition: {x: -0.172958, y: 0.000000042165926, z: -0.000000049132503} - m_LocalScale: {x: 0.99999994, y: 1, z: 1} + m_GameObject: {fileID: 254320224} + m_LocalRotation: {x: -0.059121005, y: -0.21540806, z: 0.37622717, w: -0.8991982} + m_LocalPosition: {x: -0.08151567, y: 0.013640919, z: -0.01601535} + m_LocalScale: {x: 1.0000004, y: 0.9999998, z: 1.0000001} m_Children: - - {fileID: 196915938} - - {fileID: 459193252} - - {fileID: 175241492} - - {fileID: 1407265817} - m_Father: {fileID: 618238134} - m_RootOrder: 0 + - {fileID: 621014916} + m_Father: {fileID: 823944282} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &225923426 +--- !u!1 &278563087 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14760,61 +14538,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 225923427} + - component: {fileID: 278563088} m_Layer: 0 - m_Name: Bip01_R_Finger21 + m_Name: Bip01_R_Toe0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &225923427 +--- !u!4 &278563088 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 225923426} - m_LocalRotation: {x: 0.22944106, y: -0.24657182, z: 0.41891694, w: -0.84324837} - m_LocalPosition: {x: -0.03031253, y: -0.000000016133061, z: 0.000000024932872} - m_LocalScale: {x: 1.0000002, y: 0.9999998, z: 1} + m_GameObject: {fileID: 278563087} + m_LocalRotation: {x: 0.005790743, y: -0.008622324, z: -0.7664677, w: 0.642199} + m_LocalPosition: {x: -0.08594917, y: 0.066251084, z: -0.00000024639624} + m_LocalScale: {x: 1.0000001, y: 0.99999976, z: 1} m_Children: - - {fileID: 1008617737} - m_Father: {fileID: 313036274} + - {fileID: 1846281464} + m_Father: {fileID: 1125475256} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &238740766 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 238740767} - m_Layer: 0 - m_Name: Bip01_L_Clavicle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &238740767 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 238740766} - m_LocalRotation: {x: -0.69928205, y: -0.2745548, z: 0.6516648, w: -0.10467766} - m_LocalPosition: {x: 0.03657107, y: 0.017407324, z: 0.08729733} - m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 1} - m_Children: - - {fileID: 1283271953} - m_Father: {fileID: 1856545036} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &257905771 +--- !u!1 &287647130 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14822,30 +14569,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 257905772} + - component: {fileID: 287647131} m_Layer: 0 - m_Name: Bip01_R_UpperArm + m_Name: Bip01_L_Toe0Nub m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &257905772 +--- !u!4 &287647131 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257905771} - m_LocalRotation: {x: 0.4527954, y: -0.4653071, z: 0.037644777, w: -0.7596371} - m_LocalPosition: {x: -0.081466265, y: 0.00000011293165, z: -0.00000009826532} - m_LocalScale: {x: 1, y: 0.99999994, z: 1.0000001} - m_Children: - - {fileID: 1831241444} - m_Father: {fileID: 1993840474} + m_GameObject: {fileID: 287647130} + m_LocalRotation: {x: 0.00000015925002, y: 0.0000005878736, z: 1, w: 1.2959718e-13} + m_LocalPosition: {x: -0.032491323, y: 0.000000039528786, z: -0.000000125209} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2143044205} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &287696898 +--- !u!1 &312241469 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14853,30 +14599,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 287696899} + - component: {fileID: 312241470} m_Layer: 0 - m_Name: Bip01_R_Finger01 + m_Name: Bip01_R_Finger1Nub m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &287696899 +--- !u!4 &312241470 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 287696898} - m_LocalRotation: {x: 0.23865595, y: -0.5462365, z: -0.09551482, w: -0.7972114} - m_LocalPosition: {x: -0.02408105, y: -0.000000080665345, z: 0.000000032266087} - m_LocalScale: {x: 0.9999999, y: 1.0000001, z: 0.99999994} - m_Children: - - {fileID: 289136754} - m_Father: {fileID: 625892228} + m_GameObject: {fileID: 312241469} + m_LocalRotation: {x: 0.00000041922317, y: 0.00000031242666, z: 0.99999994, w: 0.0003451458} + m_LocalPosition: {x: -0.025208702, y: -5.8264504e-15, z: 0.000000009536743} + m_LocalScale: {x: 0.99999994, y: 1, z: 1.0000001} + m_Children: [] + m_Father: {fileID: 1581585724} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &289136753 +--- !u!1 &316448054 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14884,29 +14629,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 289136754} + - component: {fileID: 316448055} m_Layer: 0 - m_Name: Bip01_R_Finger0Nub + m_Name: Bip01_HeadNub m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &289136754 +--- !u!4 &316448055 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 289136753} - m_LocalRotation: {x: 0.00000009668988, y: -0.00000016403918, z: 0.99999994, w: -0.0003452789} - m_LocalPosition: {x: -0.028186798, y: -0.0000000667572, z: -3.289813e-14} - m_LocalScale: {x: 1, y: 1.0000001, z: 0.99999994} + m_GameObject: {fileID: 316448054} + m_LocalRotation: {x: -0.00000022500257, y: 1.7347266e-18, z: -1.3877788e-17, w: 1} + m_LocalPosition: {x: -0.08935898, y: 0.000000019073486, z: 0.000000015497209} + m_LocalScale: {x: 1, y: 1.0000001, z: 1} m_Children: [] - m_Father: {fileID: 287696899} + m_Father: {fileID: 1533865001} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &289907652 +--- !u!1 &324625646 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14914,46 +14659,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 289907653} + - component: {fileID: 324625647} m_Layer: 0 - m_Name: Bip01_R_Hand + m_Name: Bip01_L_Calf m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &289907653 +--- !u!4 &324625647 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 289907652} - m_LocalRotation: {x: -0.41487733, y: -0.113922335, z: 0.71343195, w: -0.55309445} - m_LocalPosition: {x: -0.17295843, y: 0.00000013098686, z: -0.000000053743214} - m_LocalScale: {x: 1.0000002, y: 0.9999997, z: 1.0000004} + m_GameObject: {fileID: 324625646} + m_LocalRotation: {x: 0.024992697, y: 0.028559923, z: 0.34204248, w: 0.9389178} + m_LocalPosition: {x: -0.32738468, y: 0.00000011733185, z: 0.00000058079183} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 625892228} - - {fileID: 1234186487} - - {fileID: 313036274} - - {fileID: 584228539} - - {fileID: 1616518123} - - {fileID: 421926007} - m_Father: {fileID: 1831241444} + - {fileID: 381128044} + m_Father: {fileID: 613554792} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!221 &312582471 -AnimatorOverrideController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: override controller - m_Controller: {fileID: 9100000, guid: 47311b4ae25969546aa7fca07ea0405a, type: 2} - m_Clips: - - m_OriginalClip: {fileID: 7400000, guid: d1dee14942f17c745bb953c649ee14e5, type: 2} - m_OverrideClip: {fileID: 7400000, guid: e40d4e05553066545b4d61f5f92a528a, type: 2} ---- !u!1 &313036273 +--- !u!1 &337038608 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14961,30 +14690,33 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 313036274} + - component: {fileID: 337038609} m_Layer: 0 - m_Name: Bip01_R_Finger2 + m_Name: Bip01_L_Hand m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &313036274 +--- !u!4 &337038609 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 313036273} - m_LocalRotation: {x: 0.030314188, y: -0.4526973, z: 0.47768486, w: -0.7523053} - m_LocalPosition: {x: -0.08509593, y: 0.012511395, z: 0.007837344} - m_LocalScale: {x: 1.0000002, y: 0.9999999, z: 1.0000001} + m_GameObject: {fileID: 337038608} + m_LocalRotation: {x: 0.978417, y: 0.10672889, z: 0.01015447, w: 0.1766525} + m_LocalPosition: {x: -0.172958, y: 0.000000042165926, z: -0.000000049132503} + m_LocalScale: {x: 0.99999994, y: 1, z: 1} m_Children: - - {fileID: 225923427} - m_Father: {fileID: 289907653} - m_RootOrder: 2 + - {fileID: 1107881948} + - {fileID: 817077265} + - {fileID: 2081965470} + - {fileID: 1959548002} + m_Father: {fileID: 2112553071} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &328345775 +--- !u!1 &344828271 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14992,27 +14724,27 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 328345776} + - component: {fileID: 344828272} m_Layer: 0 - m_Name: GameObject (1) + m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &328345776 +--- !u!4 &344828272 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 328345775} + m_GameObject: {fileID: 344828271} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: -0.489} + m_LocalPosition: {x: 0, y: 0, z: 0.466} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 421926007} - m_RootOrder: 1 + m_Father: {fileID: 1916500494} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &361974703 GameObject: @@ -19770,6 +19502,99 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &371673809 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 371673810} + m_Layer: 0 + m_Name: Bone04 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &371673810 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371673809} + m_LocalRotation: {x: -0.000000048428763, y: 0.00000013411035, z: -0.00000012775088, + w: 1} + m_LocalPosition: {x: -0.11361407, y: 0.000000012999827, z: 0.000000003504331} + m_LocalScale: {x: 0.99999994, y: 1.0000002, z: 0.9999999} + m_Children: [] + m_Father: {fileID: 762093359} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &381128043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 381128044} + m_Layer: 0 + m_Name: Bip01_L_Foot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &381128044 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381128043} + m_LocalRotation: {x: -0.03322561, y: 0.013540256, z: 0.275108, w: 0.96074367} + m_LocalPosition: {x: -0.26188183, y: 0.00000009386549, z: 0.00000042239392} + m_LocalScale: {x: 0.99999994, y: 1, z: 1} + m_Children: + - {fileID: 2143044205} + m_Father: {fileID: 324625647} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &387103422 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 387103423} + m_Layer: 0 + m_Name: Bone02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &387103423 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 387103422} + m_LocalRotation: {x: -0.0000000037253085, y: -1.3877788e-16, z: -1.3010427e-17, + w: 1} + m_LocalPosition: {x: -0.36140585, y: -0.00000009875901, z: -0.0000000035386658} + m_LocalScale: {x: 1, y: 1.0000002, z: 0.9999999} + m_Children: [] + m_Father: {fileID: 689531762} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &403046859 GameObject: m_ObjectHideFlags: 0 @@ -29310,121 +29135,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &421926006 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 421926007} - - component: {fileID: 421926011} - - component: {fileID: 421926010} - - component: {fileID: 421926009} - - component: {fileID: 421926008} - m_Layer: 0 - m_Name: LongSword (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &421926007 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 421926006} - m_LocalRotation: {x: -0.24720925, y: -0.40268856, z: 0.18871981, w: -0.86088} - m_LocalPosition: {x: 0.1611, y: -0.1365, z: 0.21} - m_LocalScale: {x: 0.01006957, y: 0.014763792, z: 0.9952188} - m_Children: - - {fileID: 1888613086} - - {fileID: 328345776} - m_Father: {fileID: 289907653} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 144.716, y: 227.31201, z: 171.132} ---- !u!114 &421926008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 421926006} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f6c2c9828fec98747a1b0680f47bed80, type: 3} - m_Name: - m_EditorClassIdentifier: - UseWith2D: 0 - SortingLayerName: - SortingOrder: 0 - PointStart: {fileID: 328345776} - PointEnd: {fileID: 1888613086} - MaxFrame: 10 - Granularity: 60 - MyColor: {r: 1, g: 1, b: 1, a: 0.5019608} - MyMaterial: {fileID: 2100000, guid: 9db63a4774ae8954ab6f503f10fb20e4, type: 2} ---- !u!65 &421926009 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 421926006} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &421926010 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 421926006} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: fb1a6b631853ec045bdfb595c327997c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &421926011 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 421926006} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &440750933 GameObject: m_ObjectHideFlags: 0 @@ -34183,68 +33893,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &443809542 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 443809543} - m_Layer: 0 - m_Name: Bip01_L_Toe0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &443809543 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 443809542} - m_LocalRotation: {x: -0.050630648, y: -0.029244721, z: -0.70652753, w: 0.705266} - m_LocalPosition: {x: -0.085949264, y: 0.06625112, z: 0.0000001466643} - m_LocalScale: {x: 1.0000002, y: 1, z: 1} - m_Children: - - {fileID: 639238732} - m_Father: {fileID: 42275888} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &459193251 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 459193252} - m_Layer: 0 - m_Name: Bip01_L_Finger1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &459193252 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 459193251} - m_LocalRotation: {x: 0.0024740768, y: 0.48921746, z: -0.27932453, w: 0.8262191} - m_LocalPosition: {x: -0.08424862, y: 0.012339441, z: -0.037419852} - m_LocalScale: {x: 1.0000002, y: 0.9999998, z: 1} - m_Children: - - {fileID: 1153488635} - m_Father: {fileID: 207278918} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &483744137 GameObject: m_ObjectHideFlags: 0 @@ -43765,36 +43413,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &537320802 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 537320803} - m_Layer: 0 - m_Name: Bip01_L_Finger2Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &537320803 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537320802} - m_LocalRotation: {x: -0.0000008387114, y: -6.938891e-17, z: -2.7755635e-17, w: 1} - m_LocalPosition: {x: -0.025772514, y: 0.000000038146972, z: 6.750156e-16} - m_LocalScale: {x: 1, y: 1.0000001, z: 1} - m_Children: [] - m_Father: {fileID: 1930182801} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &576787327 GameObject: m_ObjectHideFlags: 0 @@ -43864,7 +43482,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &584020819 +--- !u!1 &591748445 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -43872,117 +43490,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 584020820} - - component: {fileID: 584020821} + - component: {fileID: 591748446} m_Layer: 0 - m_Name: 40_06 + m_Name: Bip01_L_Finger1Nub m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &584020820 +--- !u!4 &591748446 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 584020819} - m_LocalRotation: {x: -0, y: -0.2956758, z: -0, w: 0.95528835} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 591748445} + m_LocalRotation: {x: -0.00000079494583, y: -4.1633406e-17, z: 5.5511118e-17, w: 1} + m_LocalPosition: {x: -0.025208663, y: -0.000000076293944, z: 5.968559e-15} + m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001} m_Children: [] - m_Father: {fileID: 123155140} + m_Father: {fileID: 2012816008} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &584020821 -SkinnedMeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 584020819} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d743391c976d45f41be9ace4cf3bc3ac, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - serializedVersion: 2 - m_Quality: 0 - m_UpdateWhenOffscreen: 0 - m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 4300000, guid: 9e88de20522c1b34289699be7c70f503, type: 3} - m_Bones: - - {fileID: 775407649} - - {fileID: 1984954696} - - {fileID: 1701530966} - - {fileID: 1875745849} - - {fileID: 1856545036} - - {fileID: 1314776083} - - {fileID: 238740767} - - {fileID: 1283271953} - - {fileID: 618238134} - - {fileID: 207278918} - - {fileID: 196915938} - - {fileID: 1649772006} - - {fileID: 459193252} - - {fileID: 1153488635} - - {fileID: 175241492} - - {fileID: 1930182801} - - {fileID: 1407265817} - - {fileID: 1766895557} - - {fileID: 1993840474} - - {fileID: 257905772} - - {fileID: 1831241444} - - {fileID: 289907653} - - {fileID: 625892228} - - {fileID: 287696899} - - {fileID: 1234186487} - - {fileID: 591399995} - - {fileID: 313036274} - - {fileID: 225923427} - - {fileID: 584228539} - - {fileID: 586566371} - - {fileID: 1504744638} - - {fileID: 1563342670} - - {fileID: 42275888} - - {fileID: 443809543} - - {fileID: 680099762} - - {fileID: 1707221870} - - {fileID: 771461226} - - {fileID: 1426591682} - m_BlendShapeWeights: [] - m_RootBone: {fileID: 1984954696} - m_AABB: - m_Center: {x: -0.0097737685, y: -0.011292309, z: -0.109718874} - m_Extent: {x: 0.21953902, y: 0.2945871, z: 0.5579216} - m_DirtyAABB: 0 ---- !u!1 &584228538 +--- !u!1 &613554791 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -43990,30 +43520,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 584228539} + - component: {fileID: 613554792} m_Layer: 0 - m_Name: Bip01_R_Finger3 + m_Name: Bip01_L_Thigh m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &584228539 +--- !u!4 &613554792 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 584228538} - m_LocalRotation: {x: -0.05296261, y: -0.3745646, z: 0.51523334, w: -0.7690455} - m_LocalPosition: {x: -0.08151567, y: 0.013640919, z: -0.01601535} - m_LocalScale: {x: 1.0000004, y: 0.9999998, z: 1.0000001} + m_GameObject: {fileID: 613554791} + m_LocalRotation: {x: -0.178485, y: 0.9624523, z: 0.19704664, w: 0.054785363} + m_LocalPosition: {x: 0.00000016793128, y: 0.00000016756452, z: 0.085535005} + m_LocalScale: {x: 1.0000002, y: 0.99999994, z: 1.0000001} m_Children: - - {fileID: 586566371} - m_Father: {fileID: 289907653} - m_RootOrder: 3 + - {fileID: 324625647} + m_Father: {fileID: 760042064} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &586566370 +--- !u!1 &621014915 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -44021,7 +43551,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 586566371} + - component: {fileID: 621014916} m_Layer: 0 m_Name: Bip01_R_Finger31 m_TagString: Untagged @@ -44029,173 +43559,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &586566371 +--- !u!4 &621014916 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 586566370} - m_LocalRotation: {x: 0.23100129, y: -0.15484802, z: 0.524883, w: -0.80446154} + m_GameObject: {fileID: 621014915} + m_LocalRotation: {x: 0.22376287, y: -0.16694151, z: 0.58558625, w: -0.76101875} m_LocalPosition: {x: -0.024786694, y: 0.00000001099981, z: -0.0000000080665234} m_LocalScale: {x: 1.0000002, y: 0.9999999, z: 1} m_Children: - - {fileID: 934983765} - m_Father: {fileID: 584228539} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &591399994 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 591399995} - m_Layer: 0 - m_Name: Bip01_R_Finger11 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &591399995 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 591399994} - m_LocalRotation: {x: 0.2312781, y: -0.35013273, z: 0.408591, w: -0.8105375} - m_LocalPosition: {x: -0.029807415, y: 0.0000000043999306, z: 0.0000001129314} - m_LocalScale: {x: 1.0000005, y: 0.9999998, z: 1.0000001} - m_Children: - - {fileID: 804308870} - m_Father: {fileID: 1234186487} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &611527687 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 611527688} - m_Layer: 0 - m_Name: Bip01_R_Toe0Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &611527688 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 611527687} - m_LocalRotation: {x: 0.000001727194, y: 0.000000037252654, z: 0.00000016340393, - w: 1} - m_LocalPosition: {x: -0.03249138, y: 0.000000011962838, z: 5.1514347e-16} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1426591682} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &618238133 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 618238134} - m_Layer: 0 - m_Name: Bip01_L_Forearm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &618238134 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 618238133} - m_LocalRotation: {x: -0.31583792, y: 0.29494217, z: 0.5831128, w: 0.6879208} - m_LocalPosition: {x: -0.18664832, y: 0.00000011568154, z: -0.0000001098149} - m_LocalScale: {x: 1.0000004, y: 0.99999964, z: 1} - m_Children: - - {fileID: 207278918} - m_Father: {fileID: 1283271953} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &625892227 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 625892228} - m_Layer: 0 - m_Name: Bip01_R_Finger0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &625892228 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 625892227} - m_LocalRotation: {x: -0.56470597, y: 0.49539933, z: -0.015559521, w: 0.65988225} - m_LocalPosition: {x: -0.05137855, y: 0.008330947, z: 0.037160244} - m_LocalScale: {x: 1.0000002, y: 0.99999964, z: 1.0000001} - m_Children: - - {fileID: 287696899} - m_Father: {fileID: 289907653} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &639238731 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 639238732} - m_Layer: 0 - m_Name: Bip01_L_Toe0Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &639238732 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 639238731} - m_LocalRotation: {x: 0.00000015925002, y: 0.0000005878736, z: 1, w: 1.2959718e-13} - m_LocalPosition: {x: -0.032491323, y: 0.000000039528786, z: -0.000000125209} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 443809543} + - {fileID: 1111931382} + m_Father: {fileID: 254320225} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &659412353 @@ -48953,7 +48329,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &680099761 +--- !u!1 &689531761 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -48961,30 +48337,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 680099762} + - component: {fileID: 689531762} m_Layer: 0 - m_Name: Bip01_R_Thigh + m_Name: Bone01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &680099762 +--- !u!4 &689531762 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 680099761} - m_LocalRotation: {x: -0.12964813, y: 0.9666973, z: 0.18746811, w: -0.11637673} - m_LocalPosition: {x: -0.00000030799623, y: -0.0000001176985, z: -0.08553498} - m_LocalScale: {x: 1, y: 0.99999994, z: 1} + m_GameObject: {fileID: 689531761} + m_LocalRotation: {x: -0.2734937, y: 0.024100497, z: -0.92554826, w: 0.2607314} + m_LocalPosition: {x: 0.041816693, y: -0.010132938, z: 0.000000039598987} + m_LocalScale: {x: 1.0000005, y: 0.9999998, z: 0.9999999} m_Children: - - {fileID: 1707221870} - m_Father: {fileID: 775407649} - m_RootOrder: 1 + - {fileID: 387103423} + m_Father: {fileID: 762093359} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &771299854 +--- !u!1 &745448737 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -48992,47 +48368,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 771299856} - - component: {fileID: 771299855} - m_Layer: 8 - m_Name: PostProcessing + - component: {fileID: 745448738} + m_Layer: 0 + m_Name: Bip01_R_Forearm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &771299855 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 771299854} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} - m_Name: - m_EditorClassIdentifier: - sharedProfile: {fileID: 11400000, guid: a8096d7d8b843a542b3510b76d322da8, type: 2} - isGlobal: 1 - blendDistance: 0 - weight: 1 - priority: 0 ---- !u!4 &771299856 +--- !u!4 &745448738 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 771299854} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.036584, y: -0.8207834, z: 2.3014834} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 + m_GameObject: {fileID: 745448737} + m_LocalRotation: {x: 0.29738104, y: -0.24923787, z: 0.2872376, w: 0.8757509} + m_LocalPosition: {x: -0.18664853, y: 0.00000008488206, z: 0.00000008891536} + m_LocalScale: {x: 1, y: 0.9999997, z: 1} + m_Children: + - {fileID: 823944282} + m_Father: {fileID: 1155959751} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &771461225 +--- !u!1 &760042063 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -49040,30 +48399,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 771461226} + - component: {fileID: 760042064} m_Layer: 0 - m_Name: Bip01_R_Foot + m_Name: Bip01_Pelvis m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &771461226 +--- !u!4 &760042064 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 771461225} - m_LocalRotation: {x: 0.21550421, y: -0.010212484, z: 0.1232292, w: 0.9686425} - m_LocalPosition: {x: -0.26188183, y: 0.00000014079814, z: -0.0000007274562} - m_LocalScale: {x: 1.0000001, y: 1, z: 1} + m_GameObject: {fileID: 760042063} + m_LocalRotation: {x: 0.46391955, y: -0.4728976, z: -0.44609737, w: -0.6017837} + m_LocalPosition: {x: 0.10180179, y: 0.01630571, z: -0.063446835} + m_LocalScale: {x: 0.9999999, y: 1, z: 1} m_Children: - - {fileID: 1426591682} - m_Father: {fileID: 1707221870} + - {fileID: 613554792} + - {fileID: 1683707989} + - {fileID: 1603122479} + m_Father: {fileID: 937622255} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &775407648 +--- !u!1 &762093358 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -49071,32 +48432,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 775407649} + - component: {fileID: 762093359} m_Layer: 0 - m_Name: Bip01_Pelvis + m_Name: 40_06_wuqi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &775407649 +--- !u!4 &762093359 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 775407648} - m_LocalRotation: {x: 0.3574581, y: -0.51329654, z: -0.30991662, w: -0.71603227} - m_LocalPosition: {x: 0.09780815, y: -0.027167434, z: -0.18238425} - m_LocalScale: {x: 0.9999999, y: 1, z: 1} + m_GameObject: {fileID: 762093358} + m_LocalRotation: {x: 0.93394923, y: -0.16590418, z: -0.31508994, w: 0.03054544} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99999994, y: 1, z: 1} m_Children: - - {fileID: 1504744638} - - {fileID: 680099762} - - {fileID: 1701530966} - m_Father: {fileID: 1984954696} + - {fileID: 689531762} + - {fileID: 371673810} + m_Father: {fileID: 1819095051} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &804308869 +--- !u!1 &771299854 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -49104,27 +48464,45 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 804308870} - m_Layer: 0 - m_Name: Bip01_R_Finger1Nub + - component: {fileID: 771299856} + - component: {fileID: 771299855} + m_Layer: 8 + m_Name: PostProcessing m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &804308870 +--- !u!114 &771299855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 771299854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: a8096d7d8b843a542b3510b76d322da8, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 1 + priority: 0 +--- !u!4 &771299856 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 804308869} - m_LocalRotation: {x: 0.00000041922317, y: 0.00000031242666, z: 0.99999994, w: 0.0003451458} - m_LocalPosition: {x: -0.025208702, y: -5.8264504e-15, z: 0.000000009536743} - m_LocalScale: {x: 0.99999994, y: 1, z: 1.0000001} + m_GameObject: {fileID: 771299854} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.036584, y: -0.8207834, z: 2.3014834} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 591399995} - m_RootOrder: 0 + m_Father: {fileID: 0} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &808775187 GameObject: @@ -53881,6 +53259,104 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &817077264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 817077265} + m_Layer: 0 + m_Name: Bip01_L_Finger1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &817077265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817077264} + m_LocalRotation: {x: 0.028939035, y: 0.56869346, z: -0.24924384, w: 0.7833441} + m_LocalPosition: {x: -0.08424862, y: 0.012339441, z: -0.037419852} + m_LocalScale: {x: 1.0000002, y: 0.9999998, z: 1} + m_Children: + - {fileID: 2012816008} + m_Father: {fileID: 337038609} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &823944281 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 823944282} + m_Layer: 0 + m_Name: Bip01_R_Hand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &823944282 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 823944281} + m_LocalRotation: {x: -0.5336059, y: 0.004256829, z: 0.5742465, w: -0.6208765} + m_LocalPosition: {x: -0.17295843, y: 0.00000013098686, z: -0.000000053743214} + m_LocalScale: {x: 1.0000002, y: 0.9999997, z: 1.0000004} + m_Children: + - {fileID: 1323630201} + - {fileID: 1685326571} + - {fileID: 1542250896} + - {fileID: 254320225} + - {fileID: 1819095051} + - {fileID: 1916500494} + m_Father: {fileID: 745448738} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &824835155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 824835156} + m_Layer: 0 + m_Name: Bip01_Spine1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &824835156 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 824835155} + m_LocalRotation: {x: 0.09392693, y: 0.014615041, z: -0.0065209274, w: 0.9954505} + m_LocalPosition: {x: -0.09309901, y: -0.00010160353, z: -0.00001898283} + m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} + m_Children: + - {fileID: 1058043025} + m_Father: {fileID: 1603122479} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &861741897 GameObject: m_ObjectHideFlags: 0 @@ -54024,37 +53500,7 @@ MonoBehaviour: m_BeforeTransparentBundles: [] m_BeforeStackBundles: [] m_AfterStackBundles: [] ---- !u!1 &934983764 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 934983765} - m_Layer: 0 - m_Name: Bip01_R_Finger3Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &934983765 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 934983764} - m_LocalRotation: {x: 0.00000047609635, y: 0.000000020656456, z: 0.99999994, w: 0.0003451458} - m_LocalPosition: {x: -0.020666676, y: 2.9842794e-15, z: 0.000000028610229} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 586566371} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &995186825 +--- !u!1 &937622254 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -54062,30 +53508,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 995186826} + - component: {fileID: 937622255} m_Layer: 0 - m_Name: Bone01 + m_Name: body m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &995186826 +--- !u!4 &937622255 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 995186825} - m_LocalRotation: {x: -0.35402998, y: 0.031197492, z: -0.84939426, w: 0.39015257} - m_LocalPosition: {x: 0.041816693, y: -0.010132938, z: 0.000000039598987} - m_LocalScale: {x: 1.0000005, y: 0.9999998, z: 0.9999999} + m_GameObject: {fileID: 937622254} + m_LocalRotation: {x: -0.27411792, y: 0.6518124, z: 0.65181243, w: 0.27411783} + m_LocalPosition: {x: 0.13741477, y: 1.6859169, z: 0.014656001} + m_LocalScale: {x: 2.539999, y: 2.5399995, z: 2.5399997} m_Children: - - {fileID: 1935566995} - m_Father: {fileID: 1043604762} - m_RootOrder: 0 + - {fileID: 760042064} + m_Father: {fileID: 1129740184} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1008617736 +--- !u!1 &995996740 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -54093,110 +53539,28 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1008617737} + - component: {fileID: 995996741} m_Layer: 0 - m_Name: Bip01_R_Finger2Nub + m_Name: Bip01_R_Finger0Nub m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1008617737 +--- !u!4 &995996741 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008617736} - m_LocalRotation: {x: 0.00000019373944, y: 0.0000005065914, z: 0.99999994, w: 0.00034514573} - m_LocalPosition: {x: -0.025772667, y: -0.00000007629395, z: 0.000000028610224} - m_LocalScale: {x: 1.0000001, y: 1, z: 1} + m_GameObject: {fileID: 995996740} + m_LocalRotation: {x: 0.00000009668988, y: -0.00000016403918, z: 0.99999994, w: -0.0003452789} + m_LocalPosition: {x: -0.028186798, y: -0.0000000667572, z: -3.289813e-14} + m_LocalScale: {x: 1, y: 1.0000001, z: 0.99999994} m_Children: [] - m_Father: {fileID: 225923427} + m_Father: {fileID: 1771794501} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1014808334 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1014808335} - - component: {fileID: 1014808336} - m_Layer: 0 - m_Name: 40_06_wuqi_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1014808335 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014808334} - m_LocalRotation: {x: -0, y: -0.2956758, z: -0, w: 0.95528835} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 123155140} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &1014808336 -SkinnedMeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014808334} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 2fade982e278c14458a9b05f164944cb, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - serializedVersion: 2 - m_Quality: 0 - m_UpdateWhenOffscreen: 0 - m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 4300002, guid: 9e88de20522c1b34289699be7c70f503, type: 3} - m_Bones: - - {fileID: 995186826} - - {fileID: 1043604762} - m_BlendShapeWeights: [] - m_RootBone: {fileID: 1043604762} - m_AABB: - m_Center: {x: 0.1254181, y: -0.065377235, z: 0.000000070780516} - m_Extent: {x: 0.2952843, y: 0.2824861, z: 0.02829496} - m_DirtyAABB: 0 --- !u!1 &1036440312 GameObject: m_ObjectHideFlags: 0 @@ -54242,7 +53606,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ClearTime: 2 ---- !u!1 &1043604761 +--- !u!1 &1058043024 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -54250,28 +53614,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1043604762} + - component: {fileID: 1058043025} m_Layer: 0 - m_Name: 40_06_wuqi + m_Name: Bip01_Neck m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1043604762 +--- !u!4 &1058043025 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1043604761} - m_LocalRotation: {x: 0.92854357, y: -0.108829744, z: -0.3546221, w: 0.014356425} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99999994, y: 1, z: 1} + m_GameObject: {fileID: 1058043024} + m_LocalRotation: {x: -0.047063563, y: 0.055026315, z: -0.317619, w: 0.9454499} + m_LocalPosition: {x: -0.14913236, y: 0.006819147, z: 0.0000020914397} + m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 0.9999999} m_Children: - - {fileID: 995186826} - - {fileID: 1282016198} - m_Father: {fileID: 1616518123} + - {fileID: 1533865001} + - {fileID: 1362464472} + - {fileID: 1544545054} + m_Father: {fileID: 824835156} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1077360195 @@ -68560,6 +67925,282 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &1107881947 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1107881948} + m_Layer: 0 + m_Name: Bip01_L_Finger0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1107881948 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1107881947} + m_LocalRotation: {x: 0.23198706, y: 0.5075931, z: -0.28284106, w: 0.7800848} + m_LocalPosition: {x: -0.05137835, y: 0.008330817, z: -0.03716016} + m_LocalScale: {x: 1.0000002, y: 0.9999998, z: 1.0000004} + m_Children: + - {fileID: 1671592783} + m_Father: {fileID: 337038609} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1111931381 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1111931382} + m_Layer: 0 + m_Name: Bip01_R_Finger3Nub + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1111931382 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111931381} + m_LocalRotation: {x: 0.00000047609635, y: 0.000000020656456, z: 0.99999994, w: 0.0003451458} + m_LocalPosition: {x: -0.020666676, y: 2.9842794e-15, z: 0.000000028610229} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 621014916} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1125475255 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1125475256} + m_Layer: 0 + m_Name: Bip01_R_Foot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1125475256 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1125475255} + m_LocalRotation: {x: 0.23567393, y: 0.05808575, z: -0.06847657, w: 0.967675} + m_LocalPosition: {x: -0.26188183, y: 0.00000014079814, z: -0.0000007274562} + m_LocalScale: {x: 1.0000001, y: 1, z: 1} + m_Children: + - {fileID: 278563088} + m_Father: {fileID: 1185637646} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1129740183 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1129740184} + - component: {fileID: 1129740186} + - component: {fileID: 1129740185} + m_Layer: 0 + m_Name: Erika_Robot(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1129740184 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129740183} + m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.7000002, y: 0.7, z: 0.7000002} + m_Children: + - {fileID: 1132365804} + - {fileID: 1544398700} + - {fileID: 937622255} + m_Father: {fileID: 1619842995} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1129740185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129740183} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2a6b1bbe8a21fe44b9a3626c5c94ec2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!95 &1129740186 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129740183} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 9e88de20522c1b34289699be7c70f503, type: 3} + m_Controller: {fileID: 1322681899} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1132365803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1132365804} + - component: {fileID: 1132365805} + m_Layer: 0 + m_Name: 40_06 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1132365804 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132365803} + m_LocalRotation: {x: -0, y: -0.2956758, z: -0, w: 0.95528835} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1129740184} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &1132365805 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132365803} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d743391c976d45f41be9ace4cf3bc3ac, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 4300000, guid: 9e88de20522c1b34289699be7c70f503, type: 3} + m_Bones: + - {fileID: 760042064} + - {fileID: 937622255} + - {fileID: 1603122479} + - {fileID: 824835156} + - {fileID: 1058043025} + - {fileID: 1533865001} + - {fileID: 1362464472} + - {fileID: 1320037205} + - {fileID: 2112553071} + - {fileID: 337038609} + - {fileID: 1107881948} + - {fileID: 1671592783} + - {fileID: 817077265} + - {fileID: 2012816008} + - {fileID: 2081965470} + - {fileID: 1948801044} + - {fileID: 1959548002} + - {fileID: 1152774742} + - {fileID: 1544545054} + - {fileID: 1155959751} + - {fileID: 745448738} + - {fileID: 823944282} + - {fileID: 1323630201} + - {fileID: 1771794501} + - {fileID: 1685326571} + - {fileID: 1581585724} + - {fileID: 1542250896} + - {fileID: 1292385346} + - {fileID: 254320225} + - {fileID: 621014916} + - {fileID: 613554792} + - {fileID: 324625647} + - {fileID: 381128044} + - {fileID: 2143044205} + - {fileID: 1683707989} + - {fileID: 1185637646} + - {fileID: 1125475256} + - {fileID: 278563088} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 937622255} + m_AABB: + m_Center: {x: -0.0097737685, y: -0.011292309, z: -0.109718874} + m_Extent: {x: 0.21953902, y: 0.2945871, z: 0.5579216} + m_DirtyAABB: 0 --- !u!1 &1141527490 GameObject: m_ObjectHideFlags: 0 @@ -73381,7 +73022,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1153488634 +--- !u!1 &1152774741 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -73389,27 +73030,58 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1153488635} + - component: {fileID: 1152774742} m_Layer: 0 - m_Name: Bip01_L_Finger11 + m_Name: Bip01_L_Finger31 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1153488635 +--- !u!4 &1152774742 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1153488634} - m_LocalRotation: {x: 0.09872272, y: -0.5544017, z: 0.29616594, w: -0.771478} - m_LocalPosition: {x: -0.029807413, y: 0.00000017342997, z: 0.000000023466209} - m_LocalScale: {x: 1.0000004, y: 0.9999996, z: 1} + m_GameObject: {fileID: 1152774741} + m_LocalRotation: {x: 0.10584765, y: -0.61816376, z: 0.24068171, w: -0.7407714} + m_LocalPosition: {x: -0.024786739, y: 0.00000007663179, z: 0.00000010266465} + m_LocalScale: {x: 1.0000002, y: 0.99999976, z: 1} + m_Children: + - {fileID: 1792325196} + m_Father: {fileID: 1959548002} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1155959750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1155959751} + m_Layer: 0 + m_Name: Bip01_R_UpperArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1155959751 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155959750} + m_LocalRotation: {x: 0.44831964, y: -0.6086685, z: -0.14948486, w: -0.63732755} + m_LocalPosition: {x: -0.081466265, y: 0.00000011293165, z: -0.00000009826532} + m_LocalScale: {x: 1, y: 0.99999994, z: 1.0000001} m_Children: - - {fileID: 191721030} - m_Father: {fileID: 459193252} + - {fileID: 745448738} + m_Father: {fileID: 1544545054} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1163248615 @@ -78176,6 +77848,37 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &1185637645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1185637646} + m_Layer: 0 + m_Name: Bip01_R_Calf + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1185637646 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1185637645} + m_LocalRotation: {x: 0.07741032, y: -0.2446402, z: 0.8748259, w: 0.4108996} + m_LocalPosition: {x: -0.32738468, y: 0.00000023466373, z: -0.0000010068528} + m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001} + m_Children: + - {fileID: 1125475256} + m_Father: {fileID: 1683707989} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1209790437 GameObject: m_ObjectHideFlags: 0 @@ -82931,7 +82634,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1234186486 +--- !u!1 &1292385345 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -82939,30 +82642,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1234186487} + - component: {fileID: 1292385346} m_Layer: 0 - m_Name: Bip01_R_Finger1 + m_Name: Bip01_R_Finger21 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1234186487 +--- !u!4 &1292385346 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1234186486} - m_LocalRotation: {x: 0.12530814, y: -0.46077204, z: 0.35852066, w: -0.80215335} - m_LocalPosition: {x: -0.08424888, y: 0.012339574, z: 0.037419893} - m_LocalScale: {x: 1.0000002, y: 0.99999964, z: 1} + m_GameObject: {fileID: 1292385345} + m_LocalRotation: {x: 0.21696778, y: -0.29565224, z: 0.528876, w: -0.76537895} + m_LocalPosition: {x: -0.03031253, y: -0.000000016133061, z: 0.000000024932872} + m_LocalScale: {x: 1.0000002, y: 0.9999998, z: 1} m_Children: - - {fileID: 591399995} - m_Father: {fileID: 289907653} - m_RootOrder: 1 + - {fileID: 1313506115} + m_Father: {fileID: 1542250896} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1282016197 +--- !u!1 &1313506114 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -82970,58 +82673,26 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1282016198} + - component: {fileID: 1313506115} m_Layer: 0 - m_Name: Bone04 + m_Name: Bip01_R_Finger2Nub m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1282016198 +--- !u!4 &1313506115 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1282016197} - m_LocalRotation: {x: -0.000000048428763, y: 0.00000013411035, z: -0.00000012775088, - w: 1} - m_LocalPosition: {x: -0.11361407, y: 0.000000012999827, z: 0.000000003504331} - m_LocalScale: {x: 0.99999994, y: 1.0000002, z: 0.9999999} + m_GameObject: {fileID: 1313506114} + m_LocalRotation: {x: 0.00000019373944, y: 0.0000005065914, z: 0.99999994, w: 0.00034514573} + m_LocalPosition: {x: -0.025772667, y: -0.00000007629395, z: 0.000000028610224} + m_LocalScale: {x: 1.0000001, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1043604762} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1283271952 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1283271953} - m_Layer: 0 - m_Name: Bip01_L_UpperArm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1283271953 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283271952} - m_LocalRotation: {x: 0.23462875, y: -0.038915806, z: 0.02316539, w: 0.9710295} - m_LocalPosition: {x: -0.081466004, y: -0.000000004399934, z: -0.00000011073173} - m_LocalScale: {x: 1.0000002, y: 0.99999994, z: 1.0000001} - m_Children: - - {fileID: 618238134} - m_Father: {fileID: 238740767} + m_Father: {fileID: 1292385346} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1314568543 @@ -87781,7 +87452,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1314776082 +--- !u!1 &1320037204 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -87789,27 +87460,69 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1314776083} + - component: {fileID: 1320037205} m_Layer: 0 - m_Name: Bip01_Head + m_Name: Bip01_L_UpperArm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1314776083 +--- !u!4 &1320037205 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314776082} - m_LocalRotation: {x: 0.10745454, y: 0.1083225, z: -0.018458752, w: -0.988119} - m_LocalPosition: {x: -0.046630166, y: -0.000000023466338, z: -0.000000023466345} - m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 1} + m_GameObject: {fileID: 1320037204} + m_LocalRotation: {x: 0.23117515, y: -0.1392211, z: 0.16830686, w: 0.9480761} + m_LocalPosition: {x: -0.081466004, y: -0.000000004399934, z: -0.00000011073173} + m_LocalScale: {x: 1.0000002, y: 0.99999994, z: 1.0000001} m_Children: - - {fileID: 90183817} - m_Father: {fileID: 1856545036} + - {fileID: 2112553071} + m_Father: {fileID: 1362464472} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!221 &1322681899 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: override controller + m_Controller: {fileID: 9100000, guid: 47311b4ae25969546aa7fca07ea0405a, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: d1dee14942f17c745bb953c649ee14e5, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 26bb0d2d4098c084b9f324a004bea6d2, type: 2} +--- !u!1 &1323630200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1323630201} + m_Layer: 0 + m_Name: Bip01_R_Finger0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1323630201 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1323630200} + m_LocalRotation: {x: -0.59966236, y: 0.43716657, z: -0.08323356, w: 0.6651035} + m_LocalPosition: {x: -0.05137855, y: 0.008330947, z: 0.037160244} + m_LocalScale: {x: 1.0000002, y: 0.99999964, z: 1.0000001} + m_Children: + - {fileID: 1771794501} + m_Father: {fileID: 823944282} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1326207094 @@ -92567,6 +92280,36 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &1326748761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1326748762} + m_Layer: 0 + m_Name: Bone04_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1326748762 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1326748761} + m_LocalRotation: {x: -0.0000005555558, y: -8.3266733e-17, z: 1.38777415e-17, w: 1} + m_LocalPosition: {x: -0.10880185, y: 0.000000076293944, z: -1.3287149e-14} + m_LocalScale: {x: 1, y: 1.0000001, z: 0.99999994} + m_Children: [] + m_Father: {fileID: 1819095051} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1350552981 GameObject: m_ObjectHideFlags: 0 @@ -97324,7 +97067,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1407265816 +--- !u!1 &1362464471 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -97332,59 +97075,28 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1407265817} + - component: {fileID: 1362464472} m_Layer: 0 - m_Name: Bip01_L_Finger3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1407265817 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1407265816} - m_LocalRotation: {x: -0.05445507, y: 0.33380383, z: -0.22672951, w: 0.91334736} - m_LocalPosition: {x: -0.081515536, y: 0.013640816, z: 0.016015444} - m_LocalScale: {x: 1.0000005, y: 0.99999976, z: 1.0000001} - m_Children: - - {fileID: 1766895557} - m_Father: {fileID: 207278918} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1426591681 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1426591682} - m_Layer: 0 - m_Name: Bip01_R_Toe0 + m_Name: Bip01_L_Clavicle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1426591682 +--- !u!4 &1362464472 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1426591681} - m_LocalRotation: {x: 0.009641619, y: -0.014356315, z: -0.80284625, w: 0.5959353} - m_LocalPosition: {x: -0.08594917, y: 0.066251084, z: -0.00000024639624} - m_LocalScale: {x: 1.0000001, y: 0.99999976, z: 1} + m_GameObject: {fileID: 1362464471} + m_LocalRotation: {x: -0.67261064, y: -0.14108993, z: 0.68462384, w: -0.24285555} + m_LocalPosition: {x: 0.03657107, y: 0.017407324, z: 0.08729733} + m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 1} m_Children: - - {fileID: 611527688} - m_Father: {fileID: 771461226} - m_RootOrder: 0 + - {fileID: 1320037205} + m_Father: {fileID: 1058043025} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1468232990 GameObject: @@ -97430,7 +97142,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_UnitColliderCount: 0 ---- !u!1 &1498070813 +--- !u!1 &1515449448 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -97438,30 +97150,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1498070814} + - component: {fileID: 1515449449} m_Layer: 0 - m_Name: RootActionTool + m_Name: Bip01_L_Finger0Nub m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1498070814 +--- !u!4 &1515449449 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1498070813} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1515449448} + m_LocalRotation: {x: -0.000013783456, y: 0.00004436678, z: 0.000020964444, w: 1} + m_LocalPosition: {x: -0.028186912, y: -0.0000011634835, z: 0.0000025939933} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 123155140} - m_Father: {fileID: 0} - m_RootOrder: 11 + m_Children: [] + m_Father: {fileID: 1671592783} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1504744637 +--- !u!1 &1533865000 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -97469,30 +97180,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1504744638} + - component: {fileID: 1533865001} m_Layer: 0 - m_Name: Bip01_L_Thigh + m_Name: Bip01_Head m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1504744638 +--- !u!4 &1533865001 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504744637} - m_LocalRotation: {x: -0.652388, y: 0.72928745, z: 0.17590788, w: 0.107639} - m_LocalPosition: {x: 0.00000016793128, y: 0.00000016756452, z: 0.085535005} - m_LocalScale: {x: 1.0000002, y: 0.99999994, z: 1.0000001} + m_GameObject: {fileID: 1533865000} + m_LocalRotation: {x: -0.37747055, y: -0.1416841, z: -0.10473947, w: -0.9091047} + m_LocalPosition: {x: -0.046630166, y: -0.000000023466338, z: -0.000000023466345} + m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 1} m_Children: - - {fileID: 1563342670} - m_Father: {fileID: 775407649} + - {fileID: 316448055} + m_Father: {fileID: 1058043025} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1563342669 +--- !u!1 &1542250895 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -97500,28 +97211,171 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1563342670} + - component: {fileID: 1542250896} m_Layer: 0 - m_Name: Bip01_L_Calf + m_Name: Bip01_R_Finger2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1563342670 +--- !u!4 &1542250896 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1563342669} - m_LocalRotation: {x: 0.09202963, y: -0.063211545, z: 0.85485524, w: 0.5067123} - m_LocalPosition: {x: -0.32738468, y: 0.00000011733185, z: 0.00000058079183} + m_GameObject: {fileID: 1542250895} + m_LocalRotation: {x: 0.054014117, y: -0.27949205, z: 0.38071355, w: -0.8797863} + m_LocalPosition: {x: -0.08509593, y: 0.012511395, z: 0.007837344} + m_LocalScale: {x: 1.0000002, y: 0.9999999, z: 1.0000001} + m_Children: + - {fileID: 1292385346} + m_Father: {fileID: 823944282} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1544398699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1544398700} + - component: {fileID: 1544398701} + m_Layer: 0 + m_Name: 40_06_wuqi_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1544398700 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544398699} + m_LocalRotation: {x: -0, y: -0.2956758, z: -0, w: 0.95528835} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1129740184} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &1544398701 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544398699} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2fade982e278c14458a9b05f164944cb, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 4300002, guid: 9e88de20522c1b34289699be7c70f503, type: 3} + m_Bones: + - {fileID: 689531762} + - {fileID: 762093359} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 762093359} + m_AABB: + m_Center: {x: 0.1254181, y: -0.065377235, z: 0.000000070780516} + m_Extent: {x: 0.2952843, y: 0.2824861, z: 0.02829496} + m_DirtyAABB: 0 +--- !u!1 &1544545053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1544545054} + m_Layer: 0 + m_Name: Bip01_R_Clavicle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1544545054 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544545053} + m_LocalRotation: {x: 0.7239112, y: 0.14373443, z: 0.6284146, w: -0.24573988} + m_LocalPosition: {x: 0.047632538, y: 0.026799843, z: -0.07921414} + m_LocalScale: {x: 0.9999999, y: 0.99999976, z: 0.9999999} m_Children: - - {fileID: 42275888} - m_Father: {fileID: 1504744638} - m_RootOrder: 0 + - {fileID: 1155959751} + m_Father: {fileID: 1058043025} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1576749284 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1576749285} + m_Layer: 0 + m_Name: GameObject (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1576749285 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1576749284} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: -0.489} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1916500494} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1576806749 GameObject: @@ -102287,6 +102141,37 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &1581585723 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1581585724} + m_Layer: 0 + m_Name: Bip01_R_Finger11 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1581585724 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1581585723} + m_LocalRotation: {x: 0.22282186, y: -0.39187986, z: 0.4678396, w: -0.76020175} + m_LocalPosition: {x: -0.029807415, y: 0.0000000043999306, z: 0.0000001129314} + m_LocalScale: {x: 1.0000005, y: 0.9999998, z: 1.0000001} + m_Children: + - {fileID: 312241470} + m_Father: {fileID: 1685326571} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1595931928 GameObject: m_ObjectHideFlags: 0 @@ -107051,6 +106936,37 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &1603122478 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1603122479} + m_Layer: 0 + m_Name: Bip01_Spine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1603122479 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1603122478} + m_LocalRotation: {x: -0.21735941, y: 0.10079506, z: -0.039872814, w: 0.9700543} + m_LocalPosition: {x: -0.05737207, y: 0.0035605342, z: 0.0033644496} + m_LocalScale: {x: 1, y: 0.99999994, z: 1} + m_Children: + - {fileID: 824835156} + m_Father: {fileID: 760042064} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1604877671 GameObject: m_ObjectHideFlags: 0 @@ -107096,7 +107012,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ClearTime: 2 ---- !u!1 &1616518122 +--- !u!1 &1619842994 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -107104,29 +107020,28 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1616518123} + - component: {fileID: 1619842995} m_Layer: 0 - m_Name: Bone03 + m_Name: RootActionTool m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1616518123 +--- !u!4 &1619842995 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1616518122} - m_LocalRotation: {x: -0.29795498, y: -0.3802044, z: -0.7917348, w: 0.37392974} - m_LocalPosition: {x: -0.08042663, y: 0.018215375, z: 0.058707643} - m_LocalScale: {x: 1.0000002, y: 0.9999995, z: 1.0000005} + m_GameObject: {fileID: 1619842994} + 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_Children: - - {fileID: 1043604762} - - {fileID: 1656090151} - m_Father: {fileID: 289907653} - m_RootOrder: 4 + - {fileID: 1129740184} + m_Father: {fileID: 0} + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1630809000 GameObject: @@ -111886,37 +111801,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1649772005 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1649772006} - m_Layer: 0 - m_Name: Bip01_L_Finger01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1649772006 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1649772005} - m_LocalRotation: {x: -0.072987385, y: 0.32648686, z: -0.49812785, w: 0.7999674} - m_LocalPosition: {x: -0.02408098, y: -0.0000010002474, z: 0.000001968227} - m_LocalScale: {x: 1.0000004, y: 0.9999997, z: 1} - m_Children: - - {fileID: 2021894652} - m_Father: {fileID: 196915938} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1655124697 GameObject: m_ObjectHideFlags: 0 @@ -116681,7 +116565,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1656090150 +--- !u!1 &1671592782 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -116689,27 +116573,28 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1656090151} + - component: {fileID: 1671592783} m_Layer: 0 - m_Name: Bone04_2 + m_Name: Bip01_L_Finger01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1656090151 +--- !u!4 &1671592783 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1656090150} - m_LocalRotation: {x: -0.0000005555558, y: -8.3266733e-17, z: 1.38777415e-17, w: 1} - m_LocalPosition: {x: -0.10880185, y: 0.000000076293944, z: -1.3287149e-14} - m_LocalScale: {x: 1, y: 1.0000001, z: 0.99999994} - m_Children: [] - m_Father: {fileID: 1616518123} - m_RootOrder: 1 + m_GameObject: {fileID: 1671592782} + m_LocalRotation: {x: -0.073427334, y: 0.29393232, z: -0.44739962, w: 0.84145457} + m_LocalPosition: {x: -0.02408098, y: -0.0000010002474, z: 0.000001968227} + m_LocalScale: {x: 1.0000004, y: 0.9999997, z: 1} + m_Children: + - {fileID: 1515449449} + m_Father: {fileID: 1107881948} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1680813692 GameObject: @@ -121475,7 +121360,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1701530965 +--- !u!1 &1683707988 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -121483,30 +121368,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1701530966} + - component: {fileID: 1683707989} m_Layer: 0 - m_Name: Bip01_Spine + m_Name: Bip01_R_Thigh m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1701530966 +--- !u!4 &1683707989 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1701530965} - m_LocalRotation: {x: -0.038312986, y: 0.1859234, z: -0.2984454, w: 0.9353582} - m_LocalPosition: {x: -0.05737207, y: 0.0035605342, z: 0.0033644496} + m_GameObject: {fileID: 1683707988} + m_LocalRotation: {x: -0.51622117, y: 0.8407355, z: -0.07743665, w: -0.14381666} + m_LocalPosition: {x: -0.00000030799623, y: -0.0000001176985, z: -0.08553498} m_LocalScale: {x: 1, y: 0.99999994, z: 1} m_Children: - - {fileID: 1875745849} - m_Father: {fileID: 775407649} - m_RootOrder: 2 + - {fileID: 1185637646} + m_Father: {fileID: 760042064} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1707221869 +--- !u!1 &1685326570 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -121514,28 +121399,28 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1707221870} + - component: {fileID: 1685326571} m_Layer: 0 - m_Name: Bip01_R_Calf + m_Name: Bip01_R_Finger1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1707221870 +--- !u!4 &1685326571 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1707221869} - m_LocalRotation: {x: -0.054741666, y: -0.011093363, z: 0.5549624, w: 0.82999825} - m_LocalPosition: {x: -0.32738468, y: 0.00000023466373, z: -0.0000010068528} - m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001} + m_GameObject: {fileID: 1685326570} + m_LocalRotation: {x: 0.12670292, y: -0.31496888, z: 0.278644, w: -0.8983866} + m_LocalPosition: {x: -0.08424888, y: 0.012339574, z: 0.037419893} + m_LocalScale: {x: 1.0000002, y: 0.99999964, z: 1} m_Children: - - {fileID: 771461226} - m_Father: {fileID: 680099762} - m_RootOrder: 0 + - {fileID: 1581585724} + m_Father: {fileID: 823944282} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1722379007 GameObject: @@ -121572,37 +121457,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1766895556 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1766895557} - m_Layer: 0 - m_Name: Bip01_L_Finger31 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1766895557 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1766895556} - m_LocalRotation: {x: 0.10608887, y: -0.6084853, z: 0.23691063, w: -0.7499095} - m_LocalPosition: {x: -0.024786739, y: 0.00000007663179, z: 0.00000010266465} - m_LocalScale: {x: 1.0000002, y: 0.99999976, z: 1} - m_Children: - - {fileID: 1951486789} - m_Father: {fileID: 1407265817} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1767094587 GameObject: m_ObjectHideFlags: 0 @@ -121648,6 +121502,37 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ClearTime: 2 +--- !u!1 &1771794500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1771794501} + m_Layer: 0 + m_Name: Bip01_R_Finger01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1771794501 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771794500} + m_LocalRotation: {x: 0.23811388, y: -0.5529281, z: -0.09644185, w: -0.7926357} + m_LocalPosition: {x: -0.02408105, y: -0.000000080665345, z: 0.000000032266087} + m_LocalScale: {x: 0.9999999, y: 1.0000001, z: 0.99999994} + m_Children: + - {fileID: 995996741} + m_Father: {fileID: 1323630201} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1772028774 GameObject: m_ObjectHideFlags: 0 @@ -126406,6 +126291,36 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &1792325195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1792325196} + m_Layer: 0 + m_Name: Bip01_L_Finger3Nub + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1792325196 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1792325195} + m_LocalRotation: {x: -0.00000082966125, y: 2.0816675e-16, z: 7.979745e-17, w: 1} + m_LocalPosition: {x: -0.020666694, y: -0.000000019073486, z: -0.000000019073486} + m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} + m_Children: [] + m_Father: {fileID: 1152774742} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1813621498 GameObject: m_ObjectHideFlags: 0 @@ -131161,7 +131076,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1831241443 +--- !u!1 &1819095050 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131169,30 +131084,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1831241444} + - component: {fileID: 1819095051} m_Layer: 0 - m_Name: Bip01_R_Forearm + m_Name: Bone03 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1831241444 +--- !u!4 &1819095051 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1831241443} - m_LocalRotation: {x: 0.40169397, y: -0.098353624, z: 0.08940888, w: 0.90607655} - m_LocalPosition: {x: -0.18664853, y: 0.00000008488206, z: 0.00000008891536} - m_LocalScale: {x: 1, y: 0.9999997, z: 1} + m_GameObject: {fileID: 1819095050} + m_LocalRotation: {x: -0.4065145, y: -0.4444451, z: -0.79688257, w: 0.04682665} + m_LocalPosition: {x: -0.08042663, y: 0.018215375, z: 0.058707643} + m_LocalScale: {x: 1.0000002, y: 0.9999995, z: 1.0000005} m_Children: - - {fileID: 289907653} - m_Father: {fileID: 257905772} - m_RootOrder: 0 + - {fileID: 762093359} + - {fileID: 1326748762} + m_Father: {fileID: 823944282} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1856545035 +--- !u!1 &1846281463 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131200,32 +131116,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1856545036} + - component: {fileID: 1846281464} m_Layer: 0 - m_Name: Bip01_Neck + m_Name: Bip01_R_Toe0Nub m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1856545036 +--- !u!4 &1846281464 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1856545035} - m_LocalRotation: {x: 0.0706226, y: 0.016518043, z: -0.37732506, w: 0.9232364} - m_LocalPosition: {x: -0.14913236, y: 0.006819147, z: 0.0000020914397} - m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 0.9999999} - m_Children: - - {fileID: 1314776083} - - {fileID: 238740767} - - {fileID: 1993840474} - m_Father: {fileID: 1875745849} + m_GameObject: {fileID: 1846281463} + m_LocalRotation: {x: 0.000001727194, y: 0.000000037252654, z: 0.00000016340393, + w: 1} + m_LocalPosition: {x: -0.03249138, y: 0.000000011962838, z: 5.1514347e-16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 278563088} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1875745848 +--- !u!1 &1916500493 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131233,91 +131147,114 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1875745849} + - component: {fileID: 1916500494} + - component: {fileID: 1916500498} + - component: {fileID: 1916500497} + - component: {fileID: 1916500496} + - component: {fileID: 1916500495} m_Layer: 0 - m_Name: Bip01_Spine1 + m_Name: LongSword (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1875745849 +--- !u!4 &1916500494 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1875745848} - m_LocalRotation: {x: 0.19980697, y: -0.011083061, z: 0.1768232, w: 0.96368456} - m_LocalPosition: {x: -0.09309901, y: -0.00010160353, z: -0.00001898283} - m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} + m_GameObject: {fileID: 1916500493} + m_LocalRotation: {x: -0.24720925, y: -0.40268856, z: 0.18871981, w: -0.86088} + m_LocalPosition: {x: 0.1611, y: -0.1365, z: 0.21} + m_LocalScale: {x: 0.01006957, y: 0.014763792, z: 0.9952188} m_Children: - - {fileID: 1856545036} - m_Father: {fileID: 1701530966} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1888613085 -GameObject: + - {fileID: 344828272} + - {fileID: 1576749285} + m_Father: {fileID: 823944282} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 144.716, y: 227.31201, z: 171.132} +--- !u!114 &1916500495 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1888613086} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1888613086 -Transform: + m_GameObject: {fileID: 1916500493} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6c2c9828fec98747a1b0680f47bed80, type: 3} + m_Name: + m_EditorClassIdentifier: + UseWith2D: 0 + SortingLayerName: + SortingOrder: 0 + PointStart: {fileID: 1576749285} + PointEnd: {fileID: 344828272} + MaxFrame: 10 + Granularity: 60 + MyColor: {r: 1, g: 1, b: 1, a: 0.5019608} + MyMaterial: {fileID: 2100000, guid: 9db63a4774ae8954ab6f503f10fb20e4, type: 2} +--- !u!65 &1916500496 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888613085} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.466} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 421926007} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1930182800 -GameObject: + m_GameObject: {fileID: 1916500493} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1916500497 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1930182801} - m_Layer: 0 - m_Name: Bip01_L_Finger21 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1930182801 -Transform: + m_GameObject: {fileID: 1916500493} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fb1a6b631853ec045bdfb595c327997c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1916500498 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1930182800} - m_LocalRotation: {x: 0.10083106, y: -0.56220037, z: 0.2520996, w: -0.7811592} - m_LocalPosition: {x: -0.030312594, y: 0.000000086164974, z: 0.00000006306543} - m_LocalScale: {x: 1.0000004, y: 0.9999996, z: 1} - m_Children: - - {fileID: 537320803} - m_Father: {fileID: 175241492} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1935566994 + m_GameObject: {fileID: 1916500493} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1948801043 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131325,30 +131262,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1935566995} + - component: {fileID: 1948801044} m_Layer: 0 - m_Name: Bone02 + m_Name: Bip01_L_Finger21 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1935566995 +--- !u!4 &1948801044 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1935566994} - m_LocalRotation: {x: -0.0000000037253085, y: -1.3877788e-16, z: -1.3010427e-17, - w: 1} - m_LocalPosition: {x: -0.36140585, y: -0.00000009875901, z: -0.0000000035386658} - m_LocalScale: {x: 1, y: 1.0000002, z: 0.9999999} - m_Children: [] - m_Father: {fileID: 995186826} + m_GameObject: {fileID: 1948801043} + m_LocalRotation: {x: 0.0969193, y: -0.6514268, z: 0.2953557, w: -0.692109} + m_LocalPosition: {x: -0.030312594, y: 0.000000086164974, z: 0.00000006306543} + m_LocalScale: {x: 1.0000004, y: 0.9999996, z: 1} + m_Children: + - {fileID: 2004634153} + m_Father: {fileID: 2081965470} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1951486788 +--- !u!1 &1959548001 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131356,27 +131293,28 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1951486789} + - component: {fileID: 1959548002} m_Layer: 0 - m_Name: Bip01_L_Finger3Nub + m_Name: Bip01_L_Finger3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1951486789 +--- !u!4 &1959548002 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1951486788} - m_LocalRotation: {x: -0.00000082966125, y: 2.0816675e-16, z: 7.979745e-17, w: 1} - m_LocalPosition: {x: -0.020666694, y: -0.000000019073486, z: -0.000000019073486} - m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} - m_Children: [] - m_Father: {fileID: 1766895557} - m_RootOrder: 0 + m_GameObject: {fileID: 1959548001} + m_LocalRotation: {x: -0.0153681, y: 0.46481955, z: -0.2675636, w: 0.84386986} + m_LocalPosition: {x: -0.081515536, y: 0.013640816, z: 0.016015444} + m_LocalScale: {x: 1.0000005, y: 0.99999976, z: 1.0000001} + m_Children: + - {fileID: 1152774742} + m_Father: {fileID: 337038609} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1963377758 GameObject: @@ -140893,37 +140831,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1984954695 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1984954696} - m_Layer: 0 - m_Name: body - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1984954696 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1984954695} - m_LocalRotation: {x: -0.27411792, y: 0.6518124, z: 0.65181243, w: 0.27411783} - m_LocalPosition: {x: 0.13741477, y: 1.6859169, z: 0.01465599} - m_LocalScale: {x: 2.539999, y: 2.5399995, z: 2.5399997} - m_Children: - - {fileID: 775407649} - m_Father: {fileID: 123155140} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1991550205 GameObject: m_ObjectHideFlags: 0 @@ -145682,7 +145589,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1993840473 +--- !u!1 &2004634152 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -145690,30 +145597,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1993840474} + - component: {fileID: 2004634153} m_Layer: 0 - m_Name: Bip01_R_Clavicle + m_Name: Bip01_L_Finger2Nub m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1993840474 +--- !u!4 &2004634153 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1993840473} - m_LocalRotation: {x: 0.6318616, y: 0.13604961, z: 0.7238873, w: -0.24130614} - m_LocalPosition: {x: 0.047632538, y: 0.026799843, z: -0.07921414} - m_LocalScale: {x: 0.9999999, y: 0.99999976, z: 0.9999999} - m_Children: - - {fileID: 257905772} - m_Father: {fileID: 1856545036} - m_RootOrder: 2 + m_GameObject: {fileID: 2004634152} + m_LocalRotation: {x: -0.0000008387114, y: -6.938891e-17, z: -2.7755635e-17, w: 1} + m_LocalPosition: {x: -0.025772514, y: 0.000000038146972, z: 6.750156e-16} + m_LocalScale: {x: 1, y: 1.0000001, z: 1} + m_Children: [] + m_Father: {fileID: 1948801044} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2021894651 +--- !u!1 &2012816007 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -145721,28 +145627,60 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2021894652} + - component: {fileID: 2012816008} m_Layer: 0 - m_Name: Bip01_L_Finger0Nub + m_Name: Bip01_L_Finger11 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2021894652 +--- !u!4 &2012816008 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2021894651} - m_LocalRotation: {x: -0.000013783456, y: 0.00004436678, z: 0.000020964444, w: 1} - m_LocalPosition: {x: -0.028186912, y: -0.0000011634835, z: 0.0000025939933} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1649772006} + m_GameObject: {fileID: 2012816007} + m_LocalRotation: {x: 0.09958169, y: -0.532327, z: 0.28329873, w: -0.79148805} + m_LocalPosition: {x: -0.029807413, y: 0.00000017342997, z: 0.000000023466209} + m_LocalScale: {x: 1.0000004, y: 0.9999996, z: 1} + m_Children: + - {fileID: 591748446} + m_Father: {fileID: 817077265} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2081965469 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2081965470} + m_Layer: 0 + m_Name: Bip01_L_Finger2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2081965470 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2081965469} + m_LocalRotation: {x: 0.00869076, y: 0.50716853, z: -0.29718333, w: 0.8089417} + m_LocalPosition: {x: -0.08509573, y: 0.01251139, z: -0.007837229} + m_LocalScale: {x: 1.0000004, y: 0.9999997, z: 1} + m_Children: + - {fileID: 1948801044} + m_Father: {fileID: 337038609} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2098653157 GameObject: m_ObjectHideFlags: 0 @@ -145910,6 +145848,37 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2112553070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2112553071} + m_Layer: 0 + m_Name: Bip01_L_Forearm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2112553071 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112553070} + m_LocalRotation: {x: -0.22542045, y: 0.29318485, z: 0.44462588, w: 0.81580395} + m_LocalPosition: {x: -0.18664832, y: 0.00000011568154, z: -0.0000001098149} + m_LocalScale: {x: 1.0000004, y: 0.99999964, z: 1} + m_Children: + - {fileID: 337038609} + m_Father: {fileID: 1320037205} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2137539566 GameObject: m_ObjectHideFlags: 0 @@ -146002,3 +145971,34 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: -137.82199, y: -87.41101, z: 86.146996} +--- !u!1 &2143044204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2143044205} + m_Layer: 0 + m_Name: Bip01_L_Toe0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2143044205 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2143044204} + m_LocalRotation: {x: -0.05532536, y: -0.02546245, z: -0.7192968, w: 0.6920281} + m_LocalPosition: {x: -0.085949264, y: 0.06625112, z: 0.0000001466643} + m_LocalScale: {x: 1.0000002, y: 1, z: 1} + m_Children: + - {fileID: 287647131} + m_Father: {fileID: 381128044} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Unit/AnimationData.cs b/Assets/Scripts/Unit/AnimationData.cs index c62e35fc..04a5fbb3 100644 --- a/Assets/Scripts/Unit/AnimationData.cs +++ b/Assets/Scripts/Unit/AnimationData.cs @@ -84,6 +84,8 @@ public enum EAnimationProperty TransitionInDuration = 3, // 过渡到这个动作的时间
TransitionOutDuration = 5, // 过渡到下一个动作的时间
CanBeInterrupted = 4, // 是否可以被打断
+ ORMEnforcement = 6, // 限制Y坐标的rootmotion不能小于0，仅限override rootmotion
+ Endpoint = 7, // 结束点，范围[0-1]，如果只截取动作的一部分，用这个属性设置
}
[Serializable]
diff --git a/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs b/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs index b5c0833f..73c65a0c 100644 --- a/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs +++ b/Assets/Scripts/Unit/Components/UnitState/PCState_Event.cs @@ -5,8 +5,19 @@ using UnityEngine; public partial class PCState : UnitState
{
+
void OnTimeLineEvent(AnimationEventBase animEvent)
{
+ if(animEvent is EventUnit_SetPosition)
+ {
+ EventUnit_SetPosition setPos = animEvent as EventUnit_SetPosition;
+ Vector3 pos = owner.transform.position;
+ if(setPos.setY)
+ {
+ pos.y = setPos.y;
+ }
+ owner.transform.position = pos;
+ }
}
diff --git a/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs b/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs index 2cfaf876..14d62c87 100644 --- a/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs +++ b/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs @@ -43,14 +43,9 @@ public partial class PCState : UnitState IEnumerator Idle(IdleParam param) {
- //if (m_Owner.isInAir) // 浮空切换到landing
- //{
- // ChangeState(EUnitState.Landing, new LandingParam());
- //}
- //else // idle
- //{
- m_Owner.SetYPosition(0);
m_Owner.pcAnimation.AnimIdle();
+ yield return new WaitForTransitionDone(owner.unitAnimation);
+ m_Owner.SetYPosition(0);
while (true)
{
if (Input.GetKeyDown("j"))
@@ -81,7 +76,6 @@ public partial class PCState : UnitState }
yield return null;
} - //} } void OnIdleExit(EUnitState nextState) @@ -106,7 +100,11 @@ public partial class PCState : UnitState //if (Input.GetKey(param.key)) m_Owner.pcAnimation.AnimMove(); while (Input.GetKey(param.key)) - { + {
+ if (Input.GetKeyDown("u"))
+ {
+ ChangeState(EUnitState.AttackToAir, new SkillParam());
+ }
yield return null; } ChangeState(EUnitState.Idle, new IdleParam()); @@ -188,7 +186,7 @@ public partial class PCState : UnitState }
}
- if (isAnimationReachEnd) + if (isAnimationReachEnd || isAnimationReachEndPoint) { ChangeState(EUnitState.Landing, new LandingParam()); }
@@ -334,9 +332,13 @@ public partial class PCState : UnitState while (true) { Vector3 pos = m_Owner.transform.position; - vy += g * Time.deltaTime; - pos.y += vy * Time.deltaTime; - pos.y = Mathf.Max(0, pos.y);
+ + if(!landingGround)
+ {
+ vy += g * Time.deltaTime;
+ pos.y += vy * Time.deltaTime;
+ pos.y = Mathf.Max(0, pos.y);
+ } TryDash(); @@ -352,13 +354,16 @@ public partial class PCState : UnitState TurnAround(true); pos.x += vx * Time.deltaTime; } + if (Input.GetKeyDown("j"))
{
ChangeState(EUnitState.AirAttack, new SkillParam());
} + m_Owner.transform.position = pos; + if (pos.y > 0 && pos.y <= 1 && !landingGround) - { + {
landingGround = true; m_Owner.pcAnimation.AnimLandingGround(); } diff --git a/Assets/Scripts/Unit/Components/UnitState/UnitState.cs b/Assets/Scripts/Unit/Components/UnitState/UnitState.cs index b94a98df..ff42c2be 100644 --- a/Assets/Scripts/Unit/Components/UnitState/UnitState.cs +++ b/Assets/Scripts/Unit/Components/UnitState/UnitState.cs @@ -17,6 +17,18 @@ public class UnitState : UnitComponent }
} + // 如果设置了endpoint属性，检查是否到了endpoint + public virtual bool isAnimationReachEndPoint
+ {
+ get
+ {
+ var layer = owner.unitAnimation.baseLayer;
+ if (!layer.animationData.HasProperty(EAnimationProperty.Endpoint))
+ return false;
+ return layer.playbackNormalizedTime >= layer.animationData.GetProperty(EAnimationProperty.Endpoint);
+ }
+ } + public virtual bool isComboOpen
{
get
diff --git a/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs b/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs new file mode 100644 index 00000000..2298492b --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs @@ -0,0 +1,23 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventUnit_SetPosition : AnimationEventBase
+{
+ public override TimelineEventProxy.EEventType type => TimelineEventProxy.EEventType.EventUnit_SetPosition;
+
+ public override string shortName => "P";
+
+ public bool setX;
+ [If("setX")]
+ public float x;
+
+ public bool setY;
+ [If("setY")]
+ public float y;
+
+ public bool setZ;
+ [If("setZ")]
+ public float z;
+
+}
diff --git a/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs.meta b/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs.meta new file mode 100644 index 00000000..d7ccb476 --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventUnit_SetPosition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7b8952562a0fbae41a92bd6c1f897ca1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unit/TimelineEventProxy.cs b/Assets/Scripts/Unit/TimelineEventProxy.cs index 10dae57d..e3ce605e 100644 --- a/Assets/Scripts/Unit/TimelineEventProxy.cs +++ b/Assets/Scripts/Unit/TimelineEventProxy.cs @@ -54,6 +54,8 @@ public partial class TimelineEventProxy EventCamera_Blur, // 相机模糊 EventCamera_WhiteOut, // 相机白屏 + EventUnit_SetPosition, // 设置位置 + EventMesh_AfterImage, // 角色残像
EventMesh_AfterImageStop, // 角色残像停止事件
EventMesh_FadeIn, // 角色透明度 @@ -253,6 +255,11 @@ public partial class TimelineEventProxy }
- #endregion + void EventUnit_SetPosition(AnimationEventBase animEvent)
+ {
+ // 在unitState回调里处理
+ }
+
+ #endregion }
\ No newline at end of file diff --git a/Assets/Scripts/Unit/UnitRootMotion.cs b/Assets/Scripts/Unit/UnitRootMotion.cs index 98789725..5234daab 100644 --- a/Assets/Scripts/Unit/UnitRootMotion.cs +++ b/Assets/Scripts/Unit/UnitRootMotion.cs @@ -97,7 +97,13 @@ public class UnitRootMotion : UnitComponent m_PrevFrame = frame;
Vector3 dest = rmData.GetRootMotionDistance(m_PrevFrame, frame);
Vector3 realDest = m_Owner.transform.rotation * dest;
+ if(animData.GetProperty(EAnimationProperty.ORMEnforcement) != 0)
+ {
+ if(m_Owner.transform.position.y + realDest.y < 0)
+ realDest.y = 0;
+ }
m_Owner.transform.position += realDest;
+
m_PrevFrame = frame;
}
else
|