diff --git a/Assets/AI/Gigant/Giant.prefab b/Assets/AI/Gigant/Giant.prefab index eca3f71c7..591ea2a01 100644 --- a/Assets/AI/Gigant/Giant.prefab +++ b/Assets/AI/Gigant/Giant.prefab @@ -849,14 +849,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1103688476576057160} serializedVersion: 2 - m_LocalRotation: {x: -1.9237743e-13, y: 1.00224225e-13, z: -0.8582977, w: 0.51315206} + m_LocalRotation: {x: -0.000000076948616, y: 0.0000000040026062, z: -0.7957515, w: 0.6056234} m_LocalPosition: {x: 0.017552184, y: 0.05433448, z: -0.000000009249997} m_LocalScale: {x: 0.9999999, y: 1.0000001, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1705507236814268498} m_Father: {fileID: 2489941972367910297} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -105.453} --- !u!1 &1190469614046388403 GameObject: m_ObjectHideFlags: 0 @@ -1123,15 +1123,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2271222740346332777} serializedVersion: 2 - m_LocalRotation: {x: 0.73200685, y: 0.6349631, z: 0.24436238, w: 0.035706136} - m_LocalPosition: {x: -0.054, y: 0.012, z: -0.32} + m_LocalRotation: {x: 0.73788506, y: 0.66771334, z: 0.07410056, w: -0.06475903} + m_LocalPosition: {x: -0.161, y: -0.057, z: -0.178} m_LocalScale: {x: 1.0000005, y: 0.99999744, z: 1.0000025} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1068312317936661858} - {fileID: 7268177698598271580} m_Father: {fileID: 5996888958293239168} - m_LocalEulerAnglesHint: {x: -14.954, y: 155.341, z: 101.408} + m_LocalEulerAnglesHint: {x: -11.217, y: 178.664, z: 95.847} --- !u!114 &1458412166 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2389,13 +2389,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5548355882018453932} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: -0.7067537, y: 0.00018653274, z: -0.00043907762, w: 0.7074596} + m_LocalPosition: {x: -0.0013247029, y: 0.00002997262, z: -0.0015022599} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8984972284418890104} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -89.929, y: 0, z: -0.071} --- !u!137 &1388373602175620766 SkinnedMeshRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Animations/Giant_Animations/Giant@Giant_Idle1.FBX.meta b/Assets/Animations/Giant_Animations/Giant@Giant_Idle1.FBX.meta index 124c2eae9..52e6a7c3b 100644 --- a/Assets/Animations/Giant_Animations/Giant@Giant_Idle1.FBX.meta +++ b/Assets/Animations/Giant_Animations/Giant@Giant_Idle1.FBX.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 3b84d8565ad7d574db32ea1d2afb6a4c ModelImporter: - serializedVersion: 21100 + serializedVersion: 22200 internalIDToNameTable: - first: 74: 1827226128182048838 @@ -17,11 +17,16 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: - animationImportWarnings: + animationImportWarnings: "\nClip 'Take 001' has import animation warnings that + might lower retargeting quality:\nNote: Activate translation DOF on avatar + to improve retargeting quality.\n\t'GGiantRibcage' is inbetween humanoid transforms + and has rotation animation that will be discarded.\n\t'GGiantLForearm2' is + inbetween humanoid transforms and has rotation animation that will be discarded.\n\t'GGiantRForearm2' + is inbetween humanoid transforms and has rotation animation that will be discarded.\n\t'GGiantJaw' + has translation animation that will be discarded.\n" animationRetargetingWarnings: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 @@ -42,10 +47,12 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 @@ -57,6 +64,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -67,6 +75,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -79,8 +88,704 @@ ModelImporter: importAnimation: 1 humanDescription: serializedVersion: 3 - human: [] - skeleton: [] + human: + - boneName: GGiantPelvis + humanName: Hips + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLThigh + humanName: LeftUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRThigh + humanName: RightUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLCalf + humanName: LeftLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRCalf + humanName: RightLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLFoot + humanName: LeftFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRFoot + humanName: RightFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantSpine1 + humanName: Spine + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantSpine2 + humanName: Chest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantNeck + humanName: Neck + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantHead + humanName: Head + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLCollarbone + humanName: LeftShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRCollarbone + humanName: RightShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLUpperarm + humanName: LeftUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRUpperarm + humanName: RightUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLForearm1 + humanName: LeftLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRForearm1 + humanName: RightLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLPalm + humanName: LeftHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRPalm + humanName: RightHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLDigit11 + humanName: LeftToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRDigit11 + humanName: RightToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantEye_L + humanName: LeftEye + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantEye_R + humanName: RightEye + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantJaw + humanName: Jaw + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLDigit21 + humanName: Left Thumb Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLDigit22 + humanName: Left Thumb Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLDigit11 1 + humanName: Left Index Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLDigit12 + humanName: Left Index Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLDigit31 + humanName: Left Middle Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLDigit32 + humanName: Left Middle Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLDigit41 + humanName: Left Ring Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLDigit42 + humanName: Left Ring Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLDigit51 + humanName: Left Little Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantLDigit52 + humanName: Left Little Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRDigit21 + humanName: Right Thumb Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRDigit22 + humanName: Right Thumb Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRDigit11 1 + humanName: Right Index Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRDigit12 + humanName: Right Index Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRDigit31 + humanName: Right Middle Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRDigit32 + humanName: Right Middle Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRDigit41 + humanName: Right Ring Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRDigit42 + humanName: Right Ring Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRDigit51 + humanName: Right Little Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantRDigit52 + humanName: Right Little Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: GGiantSpine3 + humanName: UpperChest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + skeleton: + - name: Giant@Giant_Idle1(Clone) + parentName: + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: GGiantPelvis + parentName: Giant@Giant_Idle1(Clone) + position: {x: -0.0009451972, y: 1.660363, z: 0.0008412199} + rotation: {x: 0.4580614, y: -0.43181354, z: -0.5556452, w: 0.5431162} + scale: {x: 1, y: 0.99999994, z: 1} + - name: GGiantLThigh + parentName: GGiantPelvis + position: {x: 0.010776977, y: -0.0032692337, z: 0.16628523} + rotation: {x: -0.12461183, y: 0.98149735, z: 0.11963781, w: 0.08259327} + scale: {x: 0.9999998, y: 1.0000001, z: 1.0000004} + - name: GGiantLCalf + parentName: GGiantLThigh + position: {x: -0.8374397, y: 0.00000072479247, z: -0.00000022888183} + rotation: {x: -0.045634538, y: -0.009275274, z: 0.33341876, w: 0.94162804} + scale: {x: 1.0000001, y: 1.0000004, z: 1.0000001} + - name: GGiantLFoot + parentName: GGiantLCalf + position: {x: -0.8137474, y: 0.0000000047683715, z: 0.000000038146972} + rotation: {x: -0.082826234, y: 0.044725478, z: -0.7848633, w: 0.6124779} + scale: {x: 0.9999997, y: 1.0000005, z: 1.0000001} + - name: GGiantLDigit11 + parentName: GGiantLFoot + position: {x: -0.27978283, y: -0.017615832, z: -0.00000045776366} + rotation: {x: 0.0000003903883, y: 0.0000026826658, z: -0.07133622, w: 0.9974523} + scale: {x: 1.0000001, y: 1, z: 1.0000001} + - name: GGiantRThigh + parentName: GGiantPelvis + position: {x: 0.010776977, y: -0.0032692337, z: -0.16628519} + rotation: {x: -0.09203382, y: 0.9914363, z: -0.07393259, w: -0.05583777} + scale: {x: 1.0000001, y: 1.0000002, z: 1.0000004} + - name: GGiantRCalf + parentName: GGiantRThigh + position: {x: -0.83743984, y: 0.0000008010864, z: 0.000000114440915} + rotation: {x: 0.044641238, y: 0.0065909214, z: 0.31812546, w: 0.94697416} + scale: {x: 0.99999976, y: 1.0000001, z: 1.0000004} + - name: GGiantRFoot + parentName: GGiantRCalf + position: {x: -0.8137472, y: -0.000000038146972, z: 0} + rotation: {x: 0.014119631, y: -0.080324486, z: -0.783716, w: 0.6157417} + scale: {x: 0.9999998, y: 1.0000007, z: 1.0000004} + - name: GGiantRDigit11 + parentName: GGiantRFoot + position: {x: -0.27978304, y: -0.017615838, z: 0.00000045776366} + rotation: {x: -0.00008206956, y: 0.0011475817, z: -0.0715912, w: 0.9974334} + scale: {x: 1.0000001, y: 1.0000001, z: 0.9999998} + - name: GGiantsash_1_Back + parentName: GGiantPelvis + position: {x: 0.15786406, y: -0.21714862, z: 0.000000030994414} + rotation: {x: -0.000000013040796, y: -7.334384e-11, z: 0.9996837, w: -0.02515024} + scale: {x: 1.0000001, y: 1.0000001, z: 1} + - name: GGiantsash_2_Back + parentName: GGiantsash_1_Back + position: {x: -0.29281402, y: 0.000000019073486, z: 0.0000000023841857} + rotation: {x: -0.000000028614815, y: -0.000000020191472, z: -0.043619376, w: 0.99904823} + scale: {x: 1.0000002, y: 1.0000002, z: 1} + - name: GGiantsash_1_Front + parentName: GGiantPelvis + position: {x: -0.03612564, y: 0.2973574, z: -0.00000008106232} + rotation: {x: -0.000000011216013, y: 6.755603e-10, z: 0.99904823, w: -0.043619387} + scale: {x: 1, y: 1.0000002, z: 1} + - name: GGiantsash_2_Front + parentName: GGiantsash_1_Front + position: {x: -0.3805165, y: 0, z: 0} + rotation: {x: 0.000000004110039, y: 0.000000014735909, z: -0.04361937, w: 0.99904823} + scale: {x: 1, y: 0.99999994, z: 1} + - name: GGiantSpine1 + parentName: GGiantPelvis + position: {x: -0.0864003, y: -0.0066105267, z: -0.000000019073486} + rotation: {x: 0.0052418634, y: -0.0015000737, z: -0.1064278, w: 0.9943055} + scale: {x: 1.0000004, y: 1.0000004, z: 0.99999994} + - name: GGiantSpine2 + parentName: GGiantSpine1 + position: {x: -0.27232727, y: 0.000000038146972, z: 0} + rotation: {x: 0.037177753, y: -0.008728539, z: 0.1760571, w: 0.98363894} + scale: {x: 1.0000004, y: 1.0000002, z: 1.0000001} + - name: GGiantSpine3 + parentName: GGiantSpine2 + position: {x: -0.23198654, y: 0, z: 0} + rotation: {x: 0.031097313, y: -0.022133118, z: 0.03456057, w: 0.99867344} + scale: {x: 1.0000005, y: 1, z: 1.0000001} + - name: GGiantRibcage + parentName: GGiantSpine3 + position: {x: -0.2492987, y: 0.000000038146972, z: -0.000000009536743} + rotation: {x: 0.0039615724, y: -0.011005305, z: -0.13522491, w: 0.9907459} + scale: {x: 0.9999992, y: 0.9999996, z: 1.0000001} + - name: GGiantLCollarbone + parentName: GGiantRibcage + position: {x: -0.054212797, y: 0.065290585, z: 0.045512915} + rotation: {x: -0.042922013, y: 0.7903232, z: 0.16879098, w: 0.58741516} + scale: {x: 0.99999964, y: 1.0000004, z: 1.0000002} + - name: GGiantLUpperarm + parentName: GGiantLCollarbone + position: {x: -0.33798534, y: 0, z: 0.00000015258789} + rotation: {x: 0.14051658, y: -0.10231438, z: -0.12752923, w: 0.97648513} + scale: {x: 1.0000004, y: 1.0000001, z: 0.99999976} + - name: GGiantLForearm1 + parentName: GGiantLUpperarm + position: {x: -0.41587096, y: 0, z: 0} + rotation: {x: -0.06783313, y: -0.009822165, z: -0.037182163, w: 0.9969552} + scale: {x: 0.9999997, y: 1, z: 0.99999946} + - name: GGiantLForearm2 + parentName: GGiantLForearm1 + position: {x: -0.223441, y: 0, z: 0} + rotation: {x: 0.021531455, y: -0.0000000145768615, z: 0.000000015218548, w: 0.9997682} + scale: {x: 1.0000001, y: 1, z: 1} + - name: GGiantLPalm + parentName: GGiantLForearm2 + position: {x: -0.223441, y: 0, z: -0.000000076293944} + rotation: {x: -0.68945634, y: 0.046387732, z: 0.06615541, w: 0.7198067} + scale: {x: 1.0000002, y: 1.0000013, z: 0.9999988} + - name: GGiantLDigit11 1 + parentName: GGiantLPalm + position: {x: -0.023659362, y: 0.000279541, z: 0.048659172} + rotation: {x: 0.7082296, y: 0.09385196, z: -0.102944925, w: 0.69210184} + scale: {x: 1.0000002, y: 1.0000013, z: 0.99999887} + - name: GGiantLDigit12 + parentName: GGiantLDigit11 1 + position: {x: -0.13850258, y: 0, z: 0} + rotation: {x: -0.0028052486, y: 0.010777454, z: 0.06488035, w: 0.9978309} + scale: {x: 1.0000004, y: 0.9999999, z: 1} + - name: GGiantLDigit21 + parentName: GGiantLPalm + position: {x: -0.17516327, y: 0.014147338, z: 0.0797089} + rotation: {x: 0.10037614, y: 0.38712338, z: -0.06293571, w: 0.91438466} + scale: {x: 0.99999976, y: 1.0000005, z: 1.0000001} + - name: GGiantLDigit22 + parentName: GGiantLDigit21 + position: {x: -0.10416496, y: 0, z: -0.000000038146972} + rotation: {x: 0.0015417058, y: 0.0076274658, z: 0.1881568, w: 0.9821082} + scale: {x: 0.9999997, y: 1.0000004, z: 0.9999999} + - name: GGiantLDigit31 + parentName: GGiantLPalm + position: {x: -0.1900145, y: 0.016461562, z: 0.029123459} + rotation: {x: 0.045241706, y: 0.047866434, z: 0.030744454, w: 0.9973549} + scale: {x: 0.9999999, y: 1.0000004, z: 1.0000001} + - name: GGiantLDigit32 + parentName: GGiantLDigit31 + position: {x: -0.111673966, y: 0, z: 0} + rotation: {x: 0.0060977363, y: -0.0022958636, z: 0.16521205, w: 0.9862366} + scale: {x: 1, y: 0.9999999, z: 1.0000004} + - name: GGiantLDigit41 + parentName: GGiantLPalm + position: {x: -0.17475525, y: 0.0029965208, z: -0.030513} + rotation: {x: -0.010253277, y: 0.054658152, z: 0.03386403, w: 0.9978781} + scale: {x: 1.0000001, y: 1.0000004, z: 1.0000001} + - name: GGiantLDigit42 + parentName: GGiantLDigit41 + position: {x: -0.1128334, y: 0.000000038146972, z: -0.000000076293944} + rotation: {x: 0.0022590272, y: -0.020461217, z: 0.2120602, w: 0.9770398} + scale: {x: 1, y: 1, z: 1.0000002} + - name: GGiantLDigit51 + parentName: GGiantLPalm + position: {x: -0.14035034, y: 0.01142807, z: -0.079209365} + rotation: {x: -0.009485125, y: 0.05767202, z: 0.03169155, w: 0.9977874} + scale: {x: 1, y: 1.0000004, z: 1.0000001} + - name: GGiantLDigit52 + parentName: GGiantLDigit51 + position: {x: -0.07542267, y: 0.000000038146972, z: 0} + rotation: {x: -0.00024427965, y: 0.000003968454, z: 0.13014114, w: 0.9914955} + scale: {x: 1.0000001, y: 0.9999999, z: 0.99999976} + - name: GGiantNeck + parentName: GGiantRibcage + position: {x: -0.0015014649, y: -0.008360748, z: -0.000000019073486} + rotation: {x: 0.0046315817, y: 0.015213304, z: -0.04283377, w: 0.99895567} + scale: {x: 0.99999994, y: 1, z: 0.99999976} + - name: GGiantHead + parentName: GGiantNeck + position: {x: -0.24813308, y: 0.000000038146972, z: 0} + rotation: {x: 0.0017630074, y: 0.015939983, z: 0.060235184, w: 0.9980554} + scale: {x: 1.0000001, y: 1, z: 0.99999994} + - name: GGiantcheek_L + parentName: GGiantHead + position: {x: -0.00421936, y: 0.22222984, z: 0.046333726} + rotation: {x: 0.20533504, y: 0.1575592, z: -0.5880185, w: 0.76632035} + scale: {x: 1.0000002, y: 1.0000005, z: 0.99999994} + - name: GGiantcheek_R + parentName: GGiantHead + position: {x: -0.00421936, y: 0.22222991, z: -0.046333708} + rotation: {x: -0.20533505, y: -0.15755907, z: -0.58801854, w: 0.76632035} + scale: {x: 1.0000008, y: 1, z: 1.0000001} + - name: GGiantEye_L + parentName: GGiantHead + position: {x: -0.04927521, y: 0.1999221, z: 0.04425432} + rotation: {x: -0.7010574, y: 0.70105743, z: 0.09229604, w: 0.09229587} + scale: {x: 1.0000006, y: 0.9999998, z: 1.0000002} + - name: GGiantEye_R + parentName: GGiantHead + position: {x: -0.049274597, y: 0.19992203, z: -0.044254337} + rotation: {x: -0.7010573, y: 0.7010575, z: -0.09229576, w: -0.09229597} + scale: {x: 1.0000005, y: 0.9999999, z: 1.0000002} + - name: GGianteyebrow_L + parentName: GGiantHead + position: {x: -0.08179321, y: 0.2567673, z: 0.017086364} + rotation: {x: 0.12278785, y: 0.69636434, z: 0.12278757, w: 0.6963642} + scale: {x: 1.0000006, y: 1.0000002, z: 0.99999964} + - name: GGianteyebrow_R + parentName: GGiantHead + position: {x: -0.08179352, y: 0.25676733, z: -0.017086377} + rotation: {x: -0.12278767, y: -0.6963643, z: 0.122787856, w: 0.6963643} + scale: {x: 1.0000004, y: 1.0000004, z: 0.9999996} + - name: GGianteyelid _L_Down + parentName: GGiantHead + position: {x: -0.04693939, y: 0.20102577, z: 0.045172043} + rotation: {x: 0.062806726, y: 0.10379317, z: -0.78895843, w: 0.60235125} + scale: {x: 1.0000004, y: 1, z: 0.99999994} + - name: GGianteyelid _L_Up + parentName: GGiantHead + position: {x: -0.049008787, y: 0.20102577, z: 0.045172043} + rotation: {x: 0.07127563, y: 0.06434643, z: -0.64265555, w: 0.76011395} + scale: {x: 1.0000006, y: 1.0000001, z: 1.0000002} + - name: GGianteyelid _R_Down + parentName: GGiantHead + position: {x: -0.046940003, y: 0.20102577, z: -0.045172047} + rotation: {x: -0.06280676, y: -0.103793204, z: -0.7889583, w: 0.60235125} + scale: {x: 1.0000001, y: 1.0000002, z: 1} + - name: GGianteyelid _R_Up + parentName: GGiantHead + position: {x: -0.049009703, y: 0.20102584, z: -0.045172032} + rotation: {x: -0.07127564, y: -0.064346425, z: -0.64265555, w: 0.76011395} + scale: {x: 1.0000006, y: 1.0000001, z: 1} + - name: GGiantJaw + parentName: GGiantHead + position: {x: 0, y: 0.061, z: 0.001} + rotation: {x: -0.011151091, y: 0.01131824, z: -0.8536739, w: 0.5205656} + scale: {x: 1.0000007, y: 1.0000002, z: 1.0000002} + - name: GGiantLip_Down + parentName: GGiantJaw + position: {x: -0.19035575, y: -0.03976425, z: 0} + rotation: {x: 0.000000015832482, y: -0.0000000637956, z: -0.000000029802326, + w: 1} + scale: {x: 0.9999999, y: 1, z: 1.0000001} + - name: GGiantLip_L + parentName: GGiantHead + position: {x: 0.0723938, y: 0.2369989, z: 0.037192006} + rotation: {x: 0.2988362, y: 0.2988362, z: -0.64085644, w: 0.6408564} + scale: {x: 1.0000006, y: 0.9999999, z: 0.9999998} + - name: GGiantLip_R + parentName: GGiantHead + position: {x: 0.072394714, y: 0.23699905, z: -0.03719201} + rotation: {x: -0.2988363, y: -0.29883617, z: -0.64085644, w: 0.6408563} + scale: {x: 1.0000005, y: 0.9999998, z: 1} + - name: GGiantLip_Up + parentName: GGiantHead + position: {x: 0.05798584, y: 0.25266883, z: 0.00000014901161} + rotation: {x: -0.00000002523049, y: 0.000000032721434, z: -0.7071068, w: 0.7071067} + scale: {x: 1.0000005, y: 0.9999998, z: 1.0000001} + - name: GGiantNose_L + parentName: GGiantHead + position: {x: 0.013337097, y: 0.2578271, z: 0.01569623} + rotation: {x: 0.3265055, y: 0.32650557, z: -0.6272114, w: 0.6272114} + scale: {x: 1.0000005, y: 0.99999976, z: 1} + - name: GGiantNose_R + parentName: GGiantHead + position: {x: 0.013336486, y: 0.25782707, z: -0.015696226} + rotation: {x: -0.3265056, y: -0.3265055, z: -0.6272114, w: 0.6272114} + scale: {x: 1.0000007, y: 0.9999998, z: 0.9999998} + - name: GGiantRCollarbone + parentName: GGiantRibcage + position: {x: -0.05421234, y: 0.06529055, z: -0.04551297} + rotation: {x: 0.045443285, y: -0.7825175, z: 0.1658482, w: 0.598411} + scale: {x: 1, y: 1.0000002, z: 1.0000002} + - name: GGiantRUpperarm + parentName: GGiantRCollarbone + position: {x: -0.33798534, y: 0.000000038146972, z: 0} + rotation: {x: -0.27117214, y: 0.15151228, z: -0.025722802, w: 0.9501832} + scale: {x: 0.99999994, y: 1, z: 0.99999964} + - name: GGiantRForearm1 + parentName: GGiantRUpperarm + position: {x: -0.4158711, y: -0.000000038146972, z: 0} + rotation: {x: 0.068143934, y: 0.010474041, z: -0.033272162, w: 0.99706554} + scale: {x: 1.0000004, y: 0.99999994, z: 0.9999998} + - name: GGiantRForearm2 + parentName: GGiantRForearm1 + position: {x: -0.223441, y: 0, z: 0} + rotation: {x: -0.021098323, y: 1.5719476e-10, z: -0.000000007448923, w: 0.99977744} + scale: {x: 1, y: 1, z: 1} + - name: GGiantRPalm + parentName: GGiantRForearm2 + position: {x: -0.223441, y: -0.000000019073486, z: 0} + rotation: {x: 0.69168025, y: 0.0069402047, z: 0.03104557, w: 0.7215029} + scale: {x: 1, y: 1.0000008, z: 0.9999997} + - name: GGiantRDigit11 1 + parentName: GGiantRPalm + position: {x: -0.02365982, y: 0.00027923583, z: -0.048659265} + rotation: {x: -0.7082296, y: -0.09385282, z: -0.102947466, w: 0.6921014} + scale: {x: 1.0000006, y: 1.0000004, z: 0.99999917} + - name: GGiantRDigit12 + parentName: GGiantRDigit11 1 + position: {x: -0.1385025, y: -0.000000076293944, z: 0} + rotation: {x: 0.0028052938, y: -0.010777526, z: 0.06488048, w: 0.9978309} + scale: {x: 1.0000001, y: 0.9999999, z: 0.9999998} + - name: GGiantRDigit21 + parentName: GGiantRPalm + position: {x: -0.1751638, y: 0.014147491, z: -0.07970899} + rotation: {x: -0.09491431, y: -0.3662977, z: -0.16226757, w: 0.9113104} + scale: {x: 0.9999999, y: 0.9999999, z: 1.0000001} + - name: GGiantRDigit22 + parentName: GGiantRDigit21 + position: {x: -0.104164734, y: 0, z: 0} + rotation: {x: -0.001541524, y: -0.0076273987, z: 0.18815713, w: 0.9821081} + scale: {x: 1.0000001, y: 1.0000002, z: 0.99999976} + - name: GGiantRDigit31 + parentName: GGiantRPalm + position: {x: -0.19001433, y: 0.016461791, z: -0.029123668} + rotation: {x: -0.04524632, y: -0.047834832, z: 0.03073198, w: 0.99735665} + scale: {x: 0.99999994, y: 1.0000005, z: 1} + - name: GGiantRDigit32 + parentName: GGiantRDigit31 + position: {x: -0.11167427, y: 0, z: -0.000000019073486} + rotation: {x: -0.0060968148, y: 0.0022959136, z: 0.16521193, w: 0.9862366} + scale: {x: 0.99999976, y: 1.0000002, z: 1.0000006} + - name: GGiantRDigit41 + parentName: GGiantRPalm + position: {x: -0.17475493, y: 0.0029963683, z: 0.030512905} + rotation: {x: 0.010261684, y: -0.05468022, z: 0.033864256, w: 0.99787676} + scale: {x: 1, y: 1.0000002, z: 0.9999998} + - name: GGiantRDigit42 + parentName: GGiantRDigit41 + position: {x: -0.11283325, y: -0.000000038146972, z: 0.000000019073486} + rotation: {x: -0.0022591874, y: 0.020462103, z: 0.21205917, w: 0.97704} + scale: {x: 0.9999997, y: 1.0000004, z: 1} + - name: GGiantRDigit51 + parentName: GGiantRPalm + position: {x: -0.14035003, y: 0.011427841, z: 0.07920938} + rotation: {x: 0.009445157, y: -0.05767109, z: 0.03168757, w: 0.99778795} + scale: {x: 1.0000002, y: 1, z: 0.9999998} + - name: GGiantRDigit52 + parentName: GGiantRDigit51 + position: {x: -0.075422816, y: 0, z: 0.000000009536743} + rotation: {x: 0.0002442741, y: -0.00000411189, z: 0.13014139, w: 0.99149543} + scale: {x: 1.0000001, y: 0.99999976, z: 0.99999994} armTwist: 0.5 foreArmTwist: 0.5 upperLegTwist: 0.5 @@ -99,6 +804,8 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 0 + remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Hair.mat b/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Hair.mat index b67a7a51f..07d0e44a7 100644 --- a/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Hair.mat +++ b/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Hair.mat @@ -107,7 +107,7 @@ Material: - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - - _Cutoff: 0.675 + - _Cutoff: 0.064 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -121,7 +121,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.266 + - _Smoothness: 0.167 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller index afdde93b1..bfa43f315 100644 --- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller +++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@Giant.controller @@ -14052,6 +14052,9 @@ AnimatorStateMachine: - first: {fileID: 0} second: - {fileID: 1109344896163405810} + - first: {fileID: 1107514516130166158} + second: + - {fileID: 1109183523796478386} - first: {fileID: 110701130} second: - {fileID: 1109075252467089046} @@ -14061,9 +14064,6 @@ AnimatorStateMachine: - first: {fileID: 1107503741397061610} second: - {fileID: 1109624683684650572} - - first: {fileID: 1107514516130166158} - second: - - {fileID: 1109183523796478386} m_StateMachineBehaviours: - {fileID: 114855645635961444} m_AnyStatePosition: {x: 48, y: 168, z: 0} @@ -14125,14 +14125,14 @@ AnimatorStateMachine: m_Position: {x: 492, y: 132, z: 0} - serializedVersion: 1 m_StateMachine: {fileID: 110751810} - m_Position: {x: 240, y: 96, z: 0} + m_Position: {x: 240, y: 100, z: 0} m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: - - first: {fileID: 110756666} - second: [] - first: {fileID: 110752648} second: [] + - first: {fileID: 110756666} + second: [] - first: {fileID: 110751810} second: [] m_StateMachineBehaviours: []