diff --git a/Assets/Objects/Human without head.fbx.meta b/Assets/Objects/Human without head.fbx.meta deleted file mode 100644 index 09a4148..0000000 --- a/Assets/Objects/Human without head.fbx.meta +++ /dev/null @@ -1,105 +0,0 @@ -fileFormatVersion: 2 -guid: 01316cb596562384da845bc519fb90de -ModelImporter: - serializedVersion: 21202 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 1 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 0 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Objects/Human.meta b/Assets/Objects/Human.meta new file mode 100644 index 0000000..0aafffa --- /dev/null +++ b/Assets/Objects/Human.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f84d04801151c324b9aa3c9aabc3d5bc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Human without head.fbx b/Assets/Objects/Human/Human without head.fbx similarity index 100% rename from Assets/Objects/Human without head.fbx rename to Assets/Objects/Human/Human without head.fbx diff --git a/Assets/Objects/Human/Human without head.fbx.meta b/Assets/Objects/Human/Human without head.fbx.meta new file mode 100644 index 0000000..348e645 --- /dev/null +++ b/Assets/Objects/Human/Human without head.fbx.meta @@ -0,0 +1,703 @@ +fileFormatVersion: 2 +guid: 01316cb596562384da845bc519fb90de +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 3 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: + - boneName: Hip + 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: Thigh_L + 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: Thigh_R + 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: Shin_L + 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: Shin_R + 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: Foot_L + 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: Foot_R + 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: Spine + 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: Neck + 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: Head + 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: Shoulder_L + 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: Shoulder_R + 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: Upperarm_L + 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: Upperarm_R + 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: Forearm_L + 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: Forearm_R + 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: Hand_L + 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: Hand_R + 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: Toes_L + 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: Toes_R + 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: ThumbKnuckle_L + 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: ThumbTip_L + 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: PointerKnuckle_L + 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: PointerTip_L + 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: MiddleKnuckle_L + 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: MiddleTip_L + 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: RingKnuckle_L + 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: RingTip_L + 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: PinkeyKnuckle_L + 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: PinkeyTip_L + 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: ThumbKnuckle_R + 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: ThumbTip_R + 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: PointerKnuckle_R + 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: PointerTip_R + 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: MiddleKnuckle_R + 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: MiddleTip_R + 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: RingKnuckle_R + 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: RingTip_R + 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: PinkeyKnuckle_R + 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: PinkeyTip_R + 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: LowerChest + 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 + skeleton: + - name: Human without head(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: Body.001 + parentName: Human without head(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: -0.7071067, y: -0.000000030908616, z: 0.000000030908623, w: 0.7071068} + scale: {x: 100, y: 100, z: 100} + - name: Armature.002 + parentName: Human without head(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: -0.7071067, y: -0.000000030908616, z: 0.000000030908623, w: 0.7071068} + scale: {x: 100, y: 100, z: 100} + - name: Hip + parentName: Armature.002 + position: {x: -0, y: 0.0005664833, z: 0.009570958} + rotation: {x: 0.7724445, y: 0.0000000757077, z: 0.000000092082544, w: 0.6350823} + scale: {x: 1, y: 0.9999999, z: 0.9999999} + - name: Spine + parentName: Hip + position: {x: 1.7763568e-17, y: 0.001223198, z: 3.7252902e-11} + rotation: {x: -0.19388841, y: 4.618528e-14, z: -0.000000046226607, w: 0.9810236} + scale: {x: 1, y: 0.99999994, z: 0.99999994} + - name: LowerChest + parentName: Spine + position: {x: 5.205464e-18, y: 0.0017673955, z: -7.4505804e-11} + rotation: {x: 0.054505616, y: -4.1935036e-14, z: 0.000000012995182, w: 0.9985135} + scale: {x: 1, y: 1, z: 0.9999999} + - name: UpperChest + parentName: LowerChest + position: {x: -2.1439888e-17, y: 0.0012521596, z: 1.11758706e-10} + rotation: {x: 0.18059467, y: 1.9732666e-14, z: 0.000000043057128, w: 0.98355764} + scale: {x: 1, y: 1, z: 0.9999999} + - name: Neck + parentName: UpperChest + position: {x: 5.849617e-17, y: 0.0012967435, z: 0} + rotation: {x: 0.021262541, y: -3.27501e-14, z: 0.000000005069358, w: 0.999774} + scale: {x: 1, y: 0.99999994, z: 0.9999998} + - name: Head + parentName: Neck + position: {x: -8.888593e-17, y: 0.0013933484, z: -2.7474015e-10} + rotation: {x: -0.119090274, y: -1.841197e-14, z: -0.000000028393325, w: 0.9928835} + scale: {x: 1, y: 1, z: 1.0000002} + - name: Shoulder_L + parentName: LowerChest + position: {x: -2.1439888e-17, y: 0.0012521596, z: 1.11758706e-10} + rotation: {x: 0.12665662, y: 0.02132283, z: 0.60561526, w: 0.7853239} + scale: {x: 1.0000004, y: 1.0000002, z: 1} + - name: Upperarm_L + parentName: Shoulder_L + position: {x: 0.0000000020617152, y: 0.0019681805, z: -3.7252902e-11} + rotation: {x: -0.111137524, y: 0.12015996, z: 0.13576932, w: 0.9771268} + scale: {x: 1, y: 0.9999999, z: 1.0000002} + - name: Forearm_L + parentName: Upperarm_L + position: {x: -3.7718564e-10, y: 0.0027853383, z: -3.7252902e-11} + rotation: {x: 0.03764393, y: -0.086988725, z: 0.0047942824, w: 0.9954863} + scale: {x: 1.0000004, y: 1.0000013, z: 1} + - name: Hand_L + parentName: Forearm_L + position: {x: 1.7334968e-10, y: 0.0027760207, z: -1.1874363e-10} + rotation: {x: -0.0012408048, y: -0.00037350506, z: -0.021220703, w: 0.99977404} + scale: {x: 0.9999998, y: 0.9999995, z: 0.99999994} + - name: PinkeyKnuckle_L + parentName: Hand_L + position: {x: -0.000028327766, y: 0.00091419823, z: -0.0003883574} + rotation: {x: -0.02639857, y: 0.019393716, z: 0.0071310382, w: 0.999438} + scale: {x: 1.0000005, y: 1.0000004, z: 0.99999994} + - name: PinkeyTip_L + parentName: PinkeyKnuckle_L + position: {x: 2.1187588e-10, y: 0.0003404039, z: -1.8626451e-11} + rotation: {x: -0.0024383734, y: -0.0032736177, z: 0.11563113, w: 0.99328387} + scale: {x: 1.0000002, y: 1.0000007, z: 0.9999997} + - name: RingKnuckle_L + parentName: Hand_L + position: {x: 0.000009627651, y: 0.0010313534, z: -0.00015135069} + rotation: {x: -0.02338338, y: 0.008382148, z: 0.037439562, w: 0.9989902} + scale: {x: 1, y: 1.0000004, z: 0.9999999} + - name: RingTip_L + parentName: RingKnuckle_L + position: {x: 3.9493897e-10, y: 0.00035789583, z: 2.7939677e-11} + rotation: {x: -0.025459718, y: -0.0035014935, z: 0.034603108, w: 0.9990707} + scale: {x: 1.0000004, y: 1.0000005, z: 0.9999998} + - name: MiddleKnuckle_L + parentName: Hand_L + position: {x: -0.000026082422, y: 0.0010846336, z: 0.000116455216} + rotation: {x: -0.028806794, y: 0.00032480195, z: 0.015345425, w: 0.99946713} + scale: {x: 1.0000002, y: 1.0000001, z: 1} + - name: MiddleTip_L + parentName: MiddleKnuckle_L + position: {x: -1.2223608e-10, y: 0.00046678729, z: -3.7252902e-11} + rotation: {x: -0.032589197, y: -0.0011391673, z: -0.01255213, w: 0.99938935} + scale: {x: 1.0000004, y: 1.0000006, z: 1.0000002} + - name: PointerKnuckle_L + parentName: Hand_L + position: {x: 0.000022739074, y: 0.0010566327, z: 0.00037232958} + rotation: {x: -0.018394902, y: -0.038939476, z: 0.03574665, w: 0.9984325} + scale: {x: 1.0000005, y: 1.0000004, z: 1.0000001} + - name: PointerTip_L + parentName: PointerKnuckle_L + position: {x: -3.9581208e-10, y: 0.00041335772, z: 1.8626451e-11} + rotation: {x: -0.017082164, y: 0.004679094, z: 0.048154023, w: 0.99868286} + scale: {x: 1.0000004, y: 1.0000007, z: 0.99999976} + - name: ThumbKnuckle_L + parentName: Hand_L + position: {x: -0.00006812706, y: 0.0005095988, z: 0.00058539904} + rotation: {x: 0.3730957, y: 0.0029239343, z: 0.04905882, w: 0.92649037} + scale: {x: 1.0000004, y: 1.0000004, z: 1.0000001} + - name: ThumbTip_L + parentName: ThumbKnuckle_L + position: {x: 2.7939676e-10, y: 0.0003288762, z: 7.4505804e-11} + rotation: {x: -0.062037714, y: 0.00000014901158, z: 0.025310148, w: 0.99775285} + scale: {x: 0.9999996, y: 0.9999997, z: 0.9999998} + - name: Shoulder_R + parentName: LowerChest + position: {x: -2.402393e-17, y: 0.0012521596, z: 1.11758706e-10} + rotation: {x: 0.12665704, y: -0.021323193, z: -0.605615, w: 0.78532404} + scale: {x: 1.0000004, y: 1.0000002, z: 0.99999976} + - name: Upperarm_R + parentName: Shoulder_R + position: {x: 6.426126e-10, y: 0.0019681805, z: -1.11758706e-10} + rotation: {x: 0.111137815, y: 0.12016, z: 0.13576922, w: -0.9771268} + scale: {x: 0.9999995, y: 1.0000005, z: 1} + - name: Forearm_R + parentName: Upperarm_R + position: {x: 8.381903e-10, y: 0.002785341, z: 0} + rotation: {x: 0.037643906, y: 0.08698877, z: -0.0047945795, w: 0.9954863} + scale: {x: 1, y: 1.0000002, z: 1.0000001} + - name: Hand_R + parentName: Forearm_R + position: {x: -2.3286703e-10, y: 0.0027760204, z: -1.0710209e-10} + rotation: {x: -0.001240775, y: 0.0003736019, z: 0.02122083, w: 0.99977404} + scale: {x: 1, y: 1.0000004, z: 0.9999999} + - name: PinkeyKnuckle_R + parentName: Hand_R + position: {x: 0.00002832808, y: 0.000914197, z: -0.00038835758} + rotation: {x: -0.026400259, y: -0.019393265, z: -0.0071329926, w: 0.99943787} + scale: {x: 1.0000001, y: 1, z: 1.0000001} + - name: PinkeyTip_R + parentName: PinkeyKnuckle_R + position: {x: -8.108327e-10, y: 0.00034040376, z: 7.4505804e-11} + rotation: {x: -0.0024381941, y: 0.0032734412, z: -0.11563107, w: 0.99328387} + scale: {x: 1.0000004, y: 1.0000007, z: 0.9999998} + - name: RingKnuckle_R + parentName: Hand_R + position: {x: -0.000009627286, y: 0.0010313533, z: -0.00015135085} + rotation: {x: -0.023382025, y: -0.00838234, z: -0.03743944, w: 0.9989902} + scale: {x: 1.0000001, y: 1, z: 0.99999994} + - name: RingTip_R + parentName: RingKnuckle_R + position: {x: -6.0807903e-10, y: 0.0003578957, z: -2.3283063e-11} + rotation: {x: -0.025459664, y: 0.0035015885, z: -0.034603078, w: 0.99907064} + scale: {x: 1.0000005, y: 1.0000008, z: 0.9999999} + - name: MiddleKnuckle_R + parentName: Hand_R + position: {x: 0.000026083344, y: 0.0010846342, z: 0.00011645494} + rotation: {x: -0.028807016, y: -0.00032483847, z: -0.015345612, w: 0.9994672} + scale: {x: 1.0000001, y: 1, z: 1} + - name: MiddleTip_R + parentName: MiddleKnuckle_R + position: {x: -1.1801603e-10, y: 0.00046678635, z: -4.6566128e-12} + rotation: {x: -0.03258918, y: 0.0011390849, z: 0.0125520285, w: 0.9993894} + scale: {x: 1.0000007, y: 1.0000005, z: 0.99999994} + - name: PointerKnuckle_R + parentName: Hand_R + position: {x: -0.000022739088, y: 0.001056633, z: 0.00037232935} + rotation: {x: -0.018394945, y: 0.038939346, z: -0.035746716, w: 0.9984326} + scale: {x: 1.0000001, y: 1, z: 1.0000002} + - name: PointerTip_R + parentName: PointerKnuckle_R + position: {x: -2.5145708e-10, y: 0.0004133581, z: 0} + rotation: {x: -0.017082172, y: -0.0046790605, z: -0.048153967, w: 0.99868286} + scale: {x: 1, y: 1.0000001, z: 0.99999976} + - name: ThumbKnuckle_R + parentName: Hand_R + position: {x: 0.00006812769, y: 0.00050959864, z: 0.000585399} + rotation: {x: 0.37309685, y: -0.0029253874, z: -0.049057383, w: 0.92648995} + scale: {x: 1.0000001, y: 1.0000004, z: 1.0000001} + - name: ThumbTip_R + parentName: ThumbKnuckle_R + position: {x: -2.4214386e-10, y: 0.0003288769, z: -2.2351741e-10} + rotation: {x: -0.06203781, y: -0.0000000372529, z: -0.025310269, w: 0.9977529} + scale: {x: 1.0000006, y: 1.0000004, z: 0.99999976} + - name: Thigh_L + parentName: Hip + position: {x: -0.00092666585, y: -0.00042531744, z: 0.000024683402} + rotation: {x: 0.9858463, y: -0.070516676, z: 0.06466749, w: 0.1376687} + scale: {x: 0.9999999, y: 0.9999998, z: 0.9999988} + - name: Shin_L + parentName: Thigh_L + position: {x: -1.2034433e-10, y: 0.0041905134, z: 6.984919e-12} + rotation: {x: 0.055484146, y: -0.020375878, z: -0.001806654, w: 0.99825} + scale: {x: 1.0000004, y: 0.99999994, z: 1.0000005} + - name: Foot_L + parentName: Shin_L + position: {x: 1.6880221e-10, y: 0.003923335, z: 9.3132255e-12} + rotation: {x: -0.5276831, y: 0.030862466, z: -0.06055056, w: 0.8467182} + scale: {x: 1, y: 0.99999976, z: 1.0000002} + - name: Toes_L + parentName: Foot_L + position: {x: -1.5133991e-10, y: 0.0013410845, z: 4.1909514e-11} + rotation: {x: -0.18418428, y: -0.68858886, z: 0.14579487, w: 0.68605065} + scale: {x: 0.9999995, y: 0.9999997, z: 1.0000001} + - name: Thigh_R + parentName: Hip + position: {x: 0.00092666585, y: -0.00042531625, z: 0.000024683548} + rotation: {x: 0.9858463, y: 0.07051662, z: -0.06466733, w: 0.1376687} + scale: {x: 0.9999997, y: 0.9999999, z: 0.99999845} + - name: Shin_R + parentName: Thigh_R + position: {x: 8.905772e-11, y: 0.004190513, z: 2.3283064e-12} + rotation: {x: 0.055484116, y: 0.02037591, z: 0.0018066093, w: 0.99825007} + scale: {x: 1.0000004, y: 1.0000004, z: 1.0000008} + - name: Foot_R + parentName: Shin_R + position: {x: 8.614734e-11, y: 0.003923335, z: 6.984919e-11} + rotation: {x: -0.52768314, y: -0.030862492, z: 0.06055056, w: 0.84671813} + scale: {x: 1.0000001, y: 0.99999994, z: 1.0000006} + - name: Toes_R + parentName: Foot_R + position: {x: 4.4237822e-11, y: 0.0013410845, z: -3.7252902e-11} + rotation: {x: -0.18418403, y: 0.68859, z: -0.14579521, w: 0.68604946} + scale: {x: 0.9999996, y: 1.0000002, z: 1.0000001} + - name: Foot_Control_L + parentName: Armature.002 + position: {x: -0.0021432796, y: 0.00046157432, z: 0.0011410763} + rotation: {x: 0.7064828, y: -0.029699659, z: 0.029699657, w: -0.7064828} + scale: {x: 0.9999999, y: 1.0000002, z: 1.0000002} + - name: Foot_Control_R + parentName: Armature.002 + position: {x: 0.0021432796, y: 0.00046157432, z: 0.0011410763} + rotation: {x: 0.7064828, y: 0.029699657, z: -0.029699659, w: -0.7064828} + scale: {x: 0.9999999, y: 1.0000002, z: 1.0000002} + - name: Arm_Control_L + parentName: Armature.002 + position: {x: -0.0029400229, y: -0.005653115, z: 0.011749784} + rotation: {x: 0.12423224, y: 0.0000000325175, z: 0.9922532, w: 7.1054274e-15} + scale: {x: 0.9999998, y: 0.9999998, z: 1} + - name: Hand_Control_L + parentName: Armature.002 + position: {x: -0.0039909403, y: 0.000023494384, z: 0.00919836} + rotation: {x: 0.12758026, y: -0.68718725, z: 0.6955022, w: 0.16665435} + scale: {x: 1.0000004, y: 1.0000006, z: 1} + - name: Leg_Control_L + parentName: Armature.002 + position: {x: -0.001583917, y: -0.0056824563, z: 0.005021654} + rotation: {x: 0.9998327, y: 0.0000000013629365, z: -0.018293513, w: -0.00000005960465} + scale: {x: 0.99999994, y: 1.0000002, z: 0.9999999} + - name: Head_Control + parentName: Armature.002 + position: {x: 7.2126086e-19, y: -0.005653115, z: 0.016127603} + rotation: {x: 1, y: -7.1054274e-15, z: 0.0000001947072, w: 2.1175824e-21} + scale: {x: 1, y: 0.9999999, z: 0.9999999} + - name: Arm_Control_R + parentName: Armature.002 + position: {x: 0.0029400229, y: -0.005653115, z: 0.011749784} + rotation: {x: -0.12423225, y: 0.00000002708714, z: 0.9922532, w: 0.0000000037252974} + scale: {x: 1, y: 0.99999994, z: 0.9999999} + - name: Hand_Control_R + parentName: Armature.002 + position: {x: 0.0039909403, y: 0.000023494384, z: 0.00919836} + rotation: {x: -0.1275802, y: -0.68718725, z: 0.6955022, w: -0.16665447} + scale: {x: 0.9999997, y: 1, z: 1} + - name: Leg_Control_R + parentName: Armature.002 + position: {x: 0.001583917, y: -0.0056824563, z: 0.005021654} + rotation: {x: 0.9998327, y: -4.997088e-10, z: 0.018293517, w: -0.00000005960465} + scale: {x: 1, y: 1.0000002, z: 1} + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 1 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 3 + humanoidOversampling: 1 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Human.blend b/Assets/Objects/Human/Human.blend similarity index 100% rename from Assets/Objects/Human.blend rename to Assets/Objects/Human/Human.blend diff --git a/Assets/Objects/Human.blend.meta b/Assets/Objects/Human/Human.blend.meta similarity index 100% rename from Assets/Objects/Human.blend.meta rename to Assets/Objects/Human/Human.blend.meta diff --git a/Assets/Objects/Human.blend1 b/Assets/Objects/Human/Human.blend1 similarity index 100% rename from Assets/Objects/Human.blend1 rename to Assets/Objects/Human/Human.blend1 diff --git a/Assets/Objects/Human.blend1.meta b/Assets/Objects/Human/Human.blend1.meta similarity index 100% rename from Assets/Objects/Human.blend1.meta rename to Assets/Objects/Human/Human.blend1.meta diff --git a/Assets/Objects/Human.fbx b/Assets/Objects/Human/Human.fbx similarity index 100% rename from Assets/Objects/Human.fbx rename to Assets/Objects/Human/Human.fbx diff --git a/Assets/Objects/Human.fbx.meta b/Assets/Objects/Human/Human.fbx.meta similarity index 100% rename from Assets/Objects/Human.fbx.meta rename to Assets/Objects/Human/Human.fbx.meta diff --git a/Assets/Objects/HumanAnimationControler.controller b/Assets/Objects/Human/HumanAnimationControler.controller similarity index 53% rename from Assets/Objects/HumanAnimationControler.controller rename to Assets/Objects/Human/HumanAnimationControler.controller index 5aaf9fa..f371066 100644 --- a/Assets/Objects/HumanAnimationControler.controller +++ b/Assets/Objects/Human/HumanAnimationControler.controller @@ -1,31 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-4969741544625218604 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Aim - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 1 - m_Motion: {fileID: -3176884680461750752, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} - m_Tag: - m_SpeedParameter: Time - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: Time --- !u!1102 &-781170557910458175 AnimatorState: serializedVersion: 6 @@ -52,6 +26,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: Time +--- !u!1102 &-529539563782206978 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 5138602965388526686, guid: 27502157baaa987469491e8fd23ff5d6, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-29801462378204144 AnimatorStateMachine: serializedVersion: 6 @@ -60,7 +60,10 @@ AnimatorStateMachine: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Base Layer - m_ChildStates: [] + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -529539563782206978} + m_Position: {x: 400, y: 210, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -70,7 +73,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 0} + m_DefaultState: {fileID: -529539563782206978} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -105,56 +108,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} - - serializedVersion: 5 - m_Name: idle - m_StateMachine: {fileID: 6188539927546276906} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 1 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} - - serializedVersion: 5 - m_Name: yeet3 - m_StateMachine: {fileID: 2359803421989368082} - m_Mask: {fileID: 31900000, guid: 6c0f24f42b987ce4884915e4f15bba46, type: 2} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 1 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &111108561234939883 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New State - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: -8945691123924629249, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1107 &949450522252485443 AnimatorStateMachine: serializedVersion: 6 @@ -177,47 +130,3 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -781170557910458175} ---- !u!1107 &2359803421989368082 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: yeet3 - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -4969741544625218604} - m_Position: {x: 320, y: 80, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -4969741544625218604} ---- !u!1107 &6188539927546276906 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: idle - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 111108561234939883} - m_Position: {x: 321.26492, y: 66.38924, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 111108561234939883} diff --git a/Assets/Objects/HumanAnimationControler.controller.meta b/Assets/Objects/Human/HumanAnimationControler.controller.meta similarity index 100% rename from Assets/Objects/HumanAnimationControler.controller.meta rename to Assets/Objects/Human/HumanAnimationControler.controller.meta diff --git a/Assets/Objects/HumanArms.mask b/Assets/Objects/Human/HumanArms.mask similarity index 100% rename from Assets/Objects/HumanArms.mask rename to Assets/Objects/Human/HumanArms.mask diff --git a/Assets/Objects/HumanArms.mask.meta b/Assets/Objects/Human/HumanArms.mask.meta similarity index 100% rename from Assets/Objects/HumanArms.mask.meta rename to Assets/Objects/Human/HumanArms.mask.meta diff --git a/Assets/Objects/HumanLegs.mask b/Assets/Objects/Human/HumanLegs.mask similarity index 100% rename from Assets/Objects/HumanLegs.mask rename to Assets/Objects/Human/HumanLegs.mask diff --git a/Assets/Objects/HumanLegs.mask.meta b/Assets/Objects/Human/HumanLegs.mask.meta similarity index 100% rename from Assets/Objects/HumanLegs.mask.meta rename to Assets/Objects/Human/HumanLegs.mask.meta diff --git a/Assets/Objects/Human/WalkAnimation_NewHuman.fbx b/Assets/Objects/Human/WalkAnimation_NewHuman.fbx new file mode 100644 index 0000000..12016c1 Binary files /dev/null and b/Assets/Objects/Human/WalkAnimation_NewHuman.fbx differ diff --git a/Assets/Objects/Human/WalkAnimation_NewHuman.fbx.meta b/Assets/Objects/Human/WalkAnimation_NewHuman.fbx.meta new file mode 100644 index 0000000..2dba770 --- /dev/null +++ b/Assets/Objects/Human/WalkAnimation_NewHuman.fbx.meta @@ -0,0 +1,791 @@ +fileFormatVersion: 2 +guid: 27502157baaa987469491e8fd23ff5d6 +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: + - first: + 74: 5138602965388526686 + second: Walk + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 3 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: + - serializedVersion: 16 + name: Walk + takeName: Armature.002|Armature.002Action + internalID: 0 + firstFrame: 0 + lastFrame: 24 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000000000001000000010000000000000000000000000000000000000001000000010000000000000000000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: Armature + weight: 1 + - path: Armature/Foot_Control_L + weight: 1 + - path: Armature/Foot_Control_R + weight: 1 + - path: Armature/Hand_L.001 + weight: 1 + - path: Armature/Hand_R.001 + weight: 1 + - path: Armature/Hip + weight: 1 + - path: Armature/Hip/Abdomen + weight: 1 + - path: Armature/Hip/Abdomen/Chest + weight: 1 + - path: Armature/Hip/Abdomen/Chest/Head + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_L + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L/Hand_L + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_R + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R + weight: 1 + - path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R/Hand_R + weight: 1 + - path: Armature/Hip/Thigh_L + weight: 1 + - path: Armature/Hip/Thigh_L/Shin_L + weight: 1 + - path: Armature/Hip/Thigh_L/Shin_L/Foot_L + weight: 1 + - path: Armature/Hip/Thigh_R + weight: 1 + - path: Armature/Hip/Thigh_R/Shin_R + weight: 1 + - path: Armature/Hip/Thigh_R/Shin_R/Foot_R + weight: 1 + - path: Armature/LookAt + weight: 1 + - path: Armature/Thigh_Control_L + weight: 1 + - path: Armature/Thigh_Control_R + weight: 1 + - path: Armature/UpperArm_Control_L + weight: 1 + - path: Armature/UpperArm_Control_R + weight: 1 + - path: Cube + weight: 1 + maskType: 1 + maskSource: {fileID: 31900000, guid: 260396a74121dac48aa1a8521a962289, type: 2} + additiveReferencePoseFrame: 0 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: + - boneName: Hip + 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: Thigh_L + 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: Thigh_R + 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: Shin_L + 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: Shin_R + 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: Foot_L + 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: Foot_R + 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: Spine + 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: Neck + 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: Head + 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: Shoulder_L + 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: Shoulder_R + 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: Upperarm_L + 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: Upperarm_R + 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: Forearm_L + 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: Forearm_R + 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: Hand_L + 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: Hand_R + 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: Toes_L + 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: Toes_R + 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: ThumbKnuckle_L + 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: ThumbTip_L + 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: PointerKnuckle_L + 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: PointerTip_L + 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: MiddleKnuckle_L + 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: MiddleTip_L + 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: RingKnuckle_L + 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: RingTip_L + 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: PinkeyKnuckle_L + 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: PinkeyTip_L + 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: ThumbKnuckle_R + 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: ThumbTip_R + 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: PointerKnuckle_R + 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: PointerTip_R + 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: MiddleKnuckle_R + 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: MiddleTip_R + 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: RingKnuckle_R + 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: RingTip_R + 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: PinkeyKnuckle_R + 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: PinkeyTip_R + 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: LowerChest + 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 + skeleton: + - name: Human without head(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: Body.001 + parentName: Human without head(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: -0.7071067, y: -0.000000030908616, z: 0.000000030908623, w: 0.7071068} + scale: {x: 100, y: 100, z: 100} + - name: Armature.002 + parentName: Human without head(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: -0.7071067, y: -0.000000030908616, z: 0.000000030908623, w: 0.7071068} + scale: {x: 100, y: 100, z: 100} + - name: Hip + parentName: Armature.002 + position: {x: -0, y: 0.0005664833, z: 0.009570958} + rotation: {x: 0.7724445, y: 0.0000000757077, z: 0.000000092082544, w: 0.6350823} + scale: {x: 1, y: 0.9999999, z: 0.9999999} + - name: Spine + parentName: Hip + position: {x: 1.7763568e-17, y: 0.001223198, z: 3.7252902e-11} + rotation: {x: -0.19388841, y: 4.618528e-14, z: -0.000000046226607, w: 0.9810236} + scale: {x: 1, y: 0.99999994, z: 0.99999994} + - name: LowerChest + parentName: Spine + position: {x: 5.205464e-18, y: 0.0017673955, z: -7.4505804e-11} + rotation: {x: 0.054505616, y: -4.1935036e-14, z: 0.000000012995182, w: 0.9985135} + scale: {x: 1, y: 1, z: 0.9999999} + - name: UpperChest + parentName: LowerChest + position: {x: -2.1439888e-17, y: 0.0012521596, z: 1.11758706e-10} + rotation: {x: 0.18059467, y: 1.9732666e-14, z: 0.000000043057128, w: 0.98355764} + scale: {x: 1, y: 1, z: 0.9999999} + - name: Neck + parentName: UpperChest + position: {x: 5.849617e-17, y: 0.0012967435, z: 0} + rotation: {x: 0.021262541, y: -3.27501e-14, z: 0.000000005069358, w: 0.999774} + scale: {x: 1, y: 0.99999994, z: 0.9999998} + - name: Head + parentName: Neck + position: {x: -8.888593e-17, y: 0.0013933484, z: -2.7474015e-10} + rotation: {x: -0.119090274, y: -1.841197e-14, z: -0.000000028393325, w: 0.9928835} + scale: {x: 1, y: 1, z: 1.0000002} + - name: Shoulder_L + parentName: LowerChest + position: {x: -2.1439888e-17, y: 0.0012521596, z: 1.11758706e-10} + rotation: {x: 0.12665662, y: 0.02132283, z: 0.60561526, w: 0.7853239} + scale: {x: 1.0000004, y: 1.0000002, z: 1} + - name: Upperarm_L + parentName: Shoulder_L + position: {x: 0.0000000020617152, y: 0.0019681805, z: -3.7252902e-11} + rotation: {x: -0.111137524, y: 0.12015996, z: 0.13576932, w: 0.9771268} + scale: {x: 1, y: 0.9999999, z: 1.0000002} + - name: Forearm_L + parentName: Upperarm_L + position: {x: -3.7718564e-10, y: 0.0027853383, z: -3.7252902e-11} + rotation: {x: 0.03764393, y: -0.086988725, z: 0.0047942824, w: 0.9954863} + scale: {x: 1.0000004, y: 1.0000013, z: 1} + - name: Hand_L + parentName: Forearm_L + position: {x: 1.7334968e-10, y: 0.0027760207, z: -1.1874363e-10} + rotation: {x: -0.0012408048, y: -0.00037350506, z: -0.021220703, w: 0.99977404} + scale: {x: 0.9999998, y: 0.9999995, z: 0.99999994} + - name: PinkeyKnuckle_L + parentName: Hand_L + position: {x: -0.000028327766, y: 0.00091419823, z: -0.0003883574} + rotation: {x: -0.02639857, y: 0.019393716, z: 0.0071310382, w: 0.999438} + scale: {x: 1.0000005, y: 1.0000004, z: 0.99999994} + - name: PinkeyTip_L + parentName: PinkeyKnuckle_L + position: {x: 2.1187588e-10, y: 0.0003404039, z: -1.8626451e-11} + rotation: {x: -0.0024383734, y: -0.0032736177, z: 0.11563113, w: 0.99328387} + scale: {x: 1.0000002, y: 1.0000007, z: 0.9999997} + - name: RingKnuckle_L + parentName: Hand_L + position: {x: 0.000009627651, y: 0.0010313534, z: -0.00015135069} + rotation: {x: -0.02338338, y: 0.008382148, z: 0.037439562, w: 0.9989902} + scale: {x: 1, y: 1.0000004, z: 0.9999999} + - name: RingTip_L + parentName: RingKnuckle_L + position: {x: 3.9493897e-10, y: 0.00035789583, z: 2.7939677e-11} + rotation: {x: -0.025459718, y: -0.0035014935, z: 0.034603108, w: 0.9990707} + scale: {x: 1.0000004, y: 1.0000005, z: 0.9999998} + - name: MiddleKnuckle_L + parentName: Hand_L + position: {x: -0.000026082422, y: 0.0010846336, z: 0.000116455216} + rotation: {x: -0.028806794, y: 0.00032480195, z: 0.015345425, w: 0.99946713} + scale: {x: 1.0000002, y: 1.0000001, z: 1} + - name: MiddleTip_L + parentName: MiddleKnuckle_L + position: {x: -1.2223608e-10, y: 0.00046678729, z: -3.7252902e-11} + rotation: {x: -0.032589197, y: -0.0011391673, z: -0.01255213, w: 0.99938935} + scale: {x: 1.0000004, y: 1.0000006, z: 1.0000002} + - name: PointerKnuckle_L + parentName: Hand_L + position: {x: 0.000022739074, y: 0.0010566327, z: 0.00037232958} + rotation: {x: -0.018394902, y: -0.038939476, z: 0.03574665, w: 0.9984325} + scale: {x: 1.0000005, y: 1.0000004, z: 1.0000001} + - name: PointerTip_L + parentName: PointerKnuckle_L + position: {x: -3.9581208e-10, y: 0.00041335772, z: 1.8626451e-11} + rotation: {x: -0.017082164, y: 0.004679094, z: 0.048154023, w: 0.99868286} + scale: {x: 1.0000004, y: 1.0000007, z: 0.99999976} + - name: ThumbKnuckle_L + parentName: Hand_L + position: {x: -0.00006812706, y: 0.0005095988, z: 0.00058539904} + rotation: {x: 0.3730957, y: 0.0029239343, z: 0.04905882, w: 0.92649037} + scale: {x: 1.0000004, y: 1.0000004, z: 1.0000001} + - name: ThumbTip_L + parentName: ThumbKnuckle_L + position: {x: 2.7939676e-10, y: 0.0003288762, z: 7.4505804e-11} + rotation: {x: -0.062037714, y: 0.00000014901158, z: 0.025310148, w: 0.99775285} + scale: {x: 0.9999996, y: 0.9999997, z: 0.9999998} + - name: Shoulder_R + parentName: LowerChest + position: {x: -2.402393e-17, y: 0.0012521596, z: 1.11758706e-10} + rotation: {x: 0.12665704, y: -0.021323193, z: -0.605615, w: 0.78532404} + scale: {x: 1.0000004, y: 1.0000002, z: 0.99999976} + - name: Upperarm_R + parentName: Shoulder_R + position: {x: 6.426126e-10, y: 0.0019681805, z: -1.11758706e-10} + rotation: {x: 0.111137815, y: 0.12016, z: 0.13576922, w: -0.9771268} + scale: {x: 0.9999995, y: 1.0000005, z: 1} + - name: Forearm_R + parentName: Upperarm_R + position: {x: 8.381903e-10, y: 0.002785341, z: 0} + rotation: {x: 0.037643906, y: 0.08698877, z: -0.0047945795, w: 0.9954863} + scale: {x: 1, y: 1.0000002, z: 1.0000001} + - name: Hand_R + parentName: Forearm_R + position: {x: -2.3286703e-10, y: 0.0027760204, z: -1.0710209e-10} + rotation: {x: -0.001240775, y: 0.0003736019, z: 0.02122083, w: 0.99977404} + scale: {x: 1, y: 1.0000004, z: 0.9999999} + - name: PinkeyKnuckle_R + parentName: Hand_R + position: {x: 0.00002832808, y: 0.000914197, z: -0.00038835758} + rotation: {x: -0.026400259, y: -0.019393265, z: -0.0071329926, w: 0.99943787} + scale: {x: 1.0000001, y: 1, z: 1.0000001} + - name: PinkeyTip_R + parentName: PinkeyKnuckle_R + position: {x: -8.108327e-10, y: 0.00034040376, z: 7.4505804e-11} + rotation: {x: -0.0024381941, y: 0.0032734412, z: -0.11563107, w: 0.99328387} + scale: {x: 1.0000004, y: 1.0000007, z: 0.9999998} + - name: RingKnuckle_R + parentName: Hand_R + position: {x: -0.000009627286, y: 0.0010313533, z: -0.00015135085} + rotation: {x: -0.023382025, y: -0.00838234, z: -0.03743944, w: 0.9989902} + scale: {x: 1.0000001, y: 1, z: 0.99999994} + - name: RingTip_R + parentName: RingKnuckle_R + position: {x: -6.0807903e-10, y: 0.0003578957, z: -2.3283063e-11} + rotation: {x: -0.025459664, y: 0.0035015885, z: -0.034603078, w: 0.99907064} + scale: {x: 1.0000005, y: 1.0000008, z: 0.9999999} + - name: MiddleKnuckle_R + parentName: Hand_R + position: {x: 0.000026083344, y: 0.0010846342, z: 0.00011645494} + rotation: {x: -0.028807016, y: -0.00032483847, z: -0.015345612, w: 0.9994672} + scale: {x: 1.0000001, y: 1, z: 1} + - name: MiddleTip_R + parentName: MiddleKnuckle_R + position: {x: -1.1801603e-10, y: 0.00046678635, z: -4.6566128e-12} + rotation: {x: -0.03258918, y: 0.0011390849, z: 0.0125520285, w: 0.9993894} + scale: {x: 1.0000007, y: 1.0000005, z: 0.99999994} + - name: PointerKnuckle_R + parentName: Hand_R + position: {x: -0.000022739088, y: 0.001056633, z: 0.00037232935} + rotation: {x: -0.018394945, y: 0.038939346, z: -0.035746716, w: 0.9984326} + scale: {x: 1.0000001, y: 1, z: 1.0000002} + - name: PointerTip_R + parentName: PointerKnuckle_R + position: {x: -2.5145708e-10, y: 0.0004133581, z: 0} + rotation: {x: -0.017082172, y: -0.0046790605, z: -0.048153967, w: 0.99868286} + scale: {x: 1, y: 1.0000001, z: 0.99999976} + - name: ThumbKnuckle_R + parentName: Hand_R + position: {x: 0.00006812769, y: 0.00050959864, z: 0.000585399} + rotation: {x: 0.37309685, y: -0.0029253874, z: -0.049057383, w: 0.92648995} + scale: {x: 1.0000001, y: 1.0000004, z: 1.0000001} + - name: ThumbTip_R + parentName: ThumbKnuckle_R + position: {x: -2.4214386e-10, y: 0.0003288769, z: -2.2351741e-10} + rotation: {x: -0.06203781, y: -0.0000000372529, z: -0.025310269, w: 0.9977529} + scale: {x: 1.0000006, y: 1.0000004, z: 0.99999976} + - name: Thigh_L + parentName: Hip + position: {x: -0.00092666585, y: -0.00042531744, z: 0.000024683402} + rotation: {x: 0.9858463, y: -0.070516676, z: 0.06466749, w: 0.1376687} + scale: {x: 0.9999999, y: 0.9999998, z: 0.9999988} + - name: Shin_L + parentName: Thigh_L + position: {x: -1.2034433e-10, y: 0.0041905134, z: 6.984919e-12} + rotation: {x: 0.055484146, y: -0.020375878, z: -0.001806654, w: 0.99825} + scale: {x: 1.0000004, y: 0.99999994, z: 1.0000005} + - name: Foot_L + parentName: Shin_L + position: {x: 1.6880221e-10, y: 0.003923335, z: 9.3132255e-12} + rotation: {x: -0.5276831, y: 0.030862466, z: -0.06055056, w: 0.8467182} + scale: {x: 1, y: 0.99999976, z: 1.0000002} + - name: Toes_L + parentName: Foot_L + position: {x: -1.5133991e-10, y: 0.0013410845, z: 4.1909514e-11} + rotation: {x: -0.18418428, y: -0.68858886, z: 0.14579487, w: 0.68605065} + scale: {x: 0.9999995, y: 0.9999997, z: 1.0000001} + - name: Thigh_R + parentName: Hip + position: {x: 0.00092666585, y: -0.00042531625, z: 0.000024683548} + rotation: {x: 0.9858463, y: 0.07051662, z: -0.06466733, w: 0.1376687} + scale: {x: 0.9999997, y: 0.9999999, z: 0.99999845} + - name: Shin_R + parentName: Thigh_R + position: {x: 8.905772e-11, y: 0.004190513, z: 2.3283064e-12} + rotation: {x: 0.055484116, y: 0.02037591, z: 0.0018066093, w: 0.99825007} + scale: {x: 1.0000004, y: 1.0000004, z: 1.0000008} + - name: Foot_R + parentName: Shin_R + position: {x: 8.614734e-11, y: 0.003923335, z: 6.984919e-11} + rotation: {x: -0.52768314, y: -0.030862492, z: 0.06055056, w: 0.84671813} + scale: {x: 1.0000001, y: 0.99999994, z: 1.0000006} + - name: Toes_R + parentName: Foot_R + position: {x: 4.4237822e-11, y: 0.0013410845, z: -3.7252902e-11} + rotation: {x: -0.18418403, y: 0.68859, z: -0.14579521, w: 0.68604946} + scale: {x: 0.9999996, y: 1.0000002, z: 1.0000001} + - name: Foot_Control_L + parentName: Armature.002 + position: {x: -0.0021432796, y: 0.00046157432, z: 0.0011410763} + rotation: {x: 0.7064828, y: -0.029699659, z: 0.029699657, w: -0.7064828} + scale: {x: 0.9999999, y: 1.0000002, z: 1.0000002} + - name: Foot_Control_R + parentName: Armature.002 + position: {x: 0.0021432796, y: 0.00046157432, z: 0.0011410763} + rotation: {x: 0.7064828, y: 0.029699657, z: -0.029699659, w: -0.7064828} + scale: {x: 0.9999999, y: 1.0000002, z: 1.0000002} + - name: Arm_Control_L + parentName: Armature.002 + position: {x: -0.0029400229, y: -0.005653115, z: 0.011749784} + rotation: {x: 0.12423224, y: 0.0000000325175, z: 0.9922532, w: 7.1054274e-15} + scale: {x: 0.9999998, y: 0.9999998, z: 1} + - name: Hand_Control_L + parentName: Armature.002 + position: {x: -0.0039909403, y: 0.000023494384, z: 0.00919836} + rotation: {x: 0.12758026, y: -0.68718725, z: 0.6955022, w: 0.16665435} + scale: {x: 1.0000004, y: 1.0000006, z: 1} + - name: Leg_Control_L + parentName: Armature.002 + position: {x: -0.001583917, y: -0.0056824563, z: 0.005021654} + rotation: {x: 0.9998327, y: 0.0000000013629365, z: -0.018293513, w: -0.00000005960465} + scale: {x: 0.99999994, y: 1.0000002, z: 0.9999999} + - name: Head_Control + parentName: Armature.002 + position: {x: 7.2126086e-19, y: -0.005653115, z: 0.016127603} + rotation: {x: 1, y: -7.1054274e-15, z: 0.0000001947072, w: 2.1175824e-21} + scale: {x: 1, y: 0.9999999, z: 0.9999999} + - name: Arm_Control_R + parentName: Armature.002 + position: {x: 0.0029400229, y: -0.005653115, z: 0.011749784} + rotation: {x: -0.12423225, y: 0.00000002708714, z: 0.9922532, w: 0.0000000037252974} + scale: {x: 1, y: 0.99999994, z: 0.9999999} + - name: Hand_Control_R + parentName: Armature.002 + position: {x: 0.0039909403, y: 0.000023494384, z: 0.00919836} + rotation: {x: -0.1275802, y: -0.68718725, z: 0.6955022, w: -0.16665447} + scale: {x: 0.9999997, y: 1, z: 1} + - name: Leg_Control_R + parentName: Armature.002 + position: {x: 0.001583917, y: -0.0056824563, z: 0.005021654} + rotation: {x: 0.9998327, y: -4.997088e-10, z: 0.018293517, w: -0.00000005960465} + scale: {x: 1, y: 1.0000002, z: 1} + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 1 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 01316cb596562384da845bc519fb90de, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 3 + humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player/Player Animation Test.prefab b/Assets/Prefabs/Player/Player Animation Test.prefab index 7f78553..114cba3 100644 --- a/Assets/Prefabs/Player/Player Animation Test.prefab +++ b/Assets/Prefabs/Player/Player Animation Test.prefab @@ -137,14 +137,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197111048} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.754, z: 0.4} + m_LocalPosition: {x: 0, y: 1.6539999, z: 0.4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 357599824} - {fileID: 65959153} - m_Father: {fileID: 6272346181302961296} - m_RootOrder: 3 + m_Father: {fileID: 5767109144009335573} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8865635171929772803 MonoBehaviour: @@ -288,178 +288,6 @@ Transform: m_Father: {fileID: 6272346181657429396} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4824770690127859843 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5844730607706440515} - - component: {fileID: 763023871062575730} - - component: {fileID: 3585047559268765858} - m_Layer: 0 - m_Name: PlayerNameText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5844730607706440515 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4824770690127859843} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6272346181302961296} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 2.8} - m_SizeDelta: {x: 20, y: 5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &763023871062575730 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4824770690127859843} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3585047559268765858 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4824770690127859843} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Username - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4293783039 - m_fontColor: {r: 1, g: 0.9283019, b: 0.9283019, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 8 - m_fontSizeBase: 8 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 763023871062575730} - m_maskType: 0 --- !u!1 &6272346181302961293 GameObject: m_ObjectHideFlags: 0 @@ -481,9 +309,8 @@ GameObject: - component: {fileID: 6207632454083444980} - component: {fileID: 1509131218531316230} - component: {fileID: -7261721819113345487} - - component: {fileID: 8957579265169979397} - - component: {fileID: 3965891812990671158} - component: {fileID: 8357986889675898169} + - component: {fileID: 701870116503968957} m_Layer: 0 m_Name: Player Animation Test m_TagString: Player @@ -503,11 +330,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5844730607706440515} - {fileID: 6272346182417644039} - {fileID: 981273033772084037} - - {fileID: 1197111049} - {fileID: 5767109144009335573} + - {fileID: 7193250173947823100} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -561,6 +387,7 @@ MonoBehaviour: walkSpeed: 5 sprintSpeed: 7 aimWalkSpeed: 3 + fallDamageSpeed: 10 moveSmoothTime: 0.05 gravity: -10 jumpHeight: 1 @@ -602,15 +429,15 @@ MonoBehaviour: positionMultY: 5 positionMultZ: 1 playerMouseLook: {fileID: 5630859218361338035} - cameraRecoilX: 10 - cameraRecoilY: 10 + cameraRecoilX: 1 + cameraRecoilY: 1 rotX: 1 rotationMultX: 5 rotationOffsetX: 0.1 rotY: 1 - rotationMultY: 0 - rotZ: 0 - rotationMultZ: 0 + rotationMultY: 5 + rotZ: 1 + rotationMultZ: 15 sideSwey: 1 sweyMultX: 1 sweyMultY: 0 @@ -666,6 +493,7 @@ MonoBehaviour: syncMode: 0 syncInterval: 0.1 isAlive: 1 + playerUIController: {fileID: 701870116503968957} clientId: 0 username: usernameTextObj: {fileID: 0} @@ -825,42 +653,6 @@ MonoBehaviour: showOverlay: 0 overlayColor: {r: 0, g: 0, b: 0, a: 0.5} target: {fileID: 2848367205963120269} ---- !u!95 &8957579265169979397 -Animator: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &3965891812990671158 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fff0960ef4ea6e04eac66b4a7fd2189d, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RigLayers: - - m_Rig: {fileID: 8865635171929772803} - m_Active: 1 - m_Effectors: [] --- !u!114 &8357986889675898169 MonoBehaviour: m_ObjectHideFlags: 0 @@ -878,6 +670,23 @@ MonoBehaviour: currentWeaponIndex: 0 activeWeapons: [] cam: {fileID: 6272346181657429395} +--- !u!114 &701870116503968957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 39474c96d3f51c84688c71e41ec03d7b, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + playerUICanvas: {fileID: 7193250173947823101} + damageImage: {fileID: 7193250173330865329} + healthText: {fileID: 3136766855045967149} --- !u!1 &6272346181657429393 GameObject: m_ObjectHideFlags: 0 @@ -998,7 +807,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6272346181302961296} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6522444664664986769 GameObject: @@ -1046,26 +855,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!95 &1978909962 -Animator: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6576156620079053231} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &7061967201775281134 GameObject: m_ObjectHideFlags: 0 @@ -1097,7 +886,7 @@ Transform: m_Children: - {fileID: 6272346181657429396} m_Father: {fileID: 6272346181302961296} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1345655087433563259 MonoBehaviour: @@ -1142,6 +931,141 @@ Transform: m_Father: {fileID: 6272346181657429396} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8483875681964867841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8103478712350276139} + - component: {fileID: 9008161453866234613} + - component: {fileID: 3136766855045967149} + m_Layer: 5 + m_Name: Health + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8103478712350276139 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8483875681964867841} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7193250173947823100} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 146, y: 126} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9008161453866234613 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8483875681964867841} + m_CullTransparentMesh: 1 +--- !u!114 &3136766855045967149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8483875681964867841} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 100 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 100 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1001 &3292089710699836531 PrefabInstance: m_ObjectHideFlags: 0 @@ -1209,6 +1133,18 @@ PrefabInstance: propertyPath: weaponKind value: 1 objectReference: {fileID: 0} + - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: magazinSize + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: totalAmmunition + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: currentAmmunition + value: 12 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3} --- !u!1 &7768205653369755348 stripped @@ -1241,6 +1177,156 @@ Transform: m_CorrespondingSourceObject: {fileID: 5792494204646893847, guid: bd217f9f85ce78e46a925776562625e8, type: 3} m_PrefabInstance: {fileID: 3292089710699836531} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6230258771961872805 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6272346181302961296} + m_Modifications: + - target: {fileID: 3865739619533045015, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3865739619533045015, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3865739619533045015, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739619533045015, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508120, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508120, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_AdditionalShaderChannelsFlag + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508123, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_MatchWidthOrHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508125, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_Name + value: Player UI + objectReference: {fileID: 0} + - target: {fileID: 3865739620182508125, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} +--- !u!223 &7193250173947823101 stripped +Canvas: + m_CorrespondingSourceObject: {fileID: 3865739620182508120, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + m_PrefabInstance: {fileID: 6230258771961872805} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7193250173330865329 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3865739619533045012, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + m_PrefabInstance: {fileID: 6230258771961872805} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7193250173947823100 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3865739620182508121, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3} + m_PrefabInstance: {fileID: 6230258771961872805} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6305701708507383038 PrefabInstance: m_ObjectHideFlags: 0 @@ -1250,7 +1336,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} propertyPath: m_RootOrder - value: 4 + value: 2 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} propertyPath: m_LocalPosition.x @@ -1394,16 +1480,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3} ---- !u!1 &6576156620079053231 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} - m_PrefabInstance: {fileID: 6305701708507383038} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5767109144009335573 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} - m_PrefabInstance: {fileID: 6305701708507383038} - m_PrefabAsset: {fileID: 0} --- !u!4 &8334588817950881727 stripped Transform: m_CorrespondingSourceObject: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} @@ -1434,3 +1510,49 @@ Transform: m_CorrespondingSourceObject: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} m_PrefabInstance: {fileID: 6305701708507383038} m_PrefabAsset: {fileID: 0} +--- !u!1 &6576156620079053231 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5767109144009335573 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_PrefabInstance: {fileID: 6305701708507383038} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1978909962 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576156620079053231} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 01316cb596562384da845bc519fb90de, type: 3} + m_Controller: {fileID: 9100000, guid: bcfd120671431f84097ebc1045370f76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &3855419186248803448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576156620079053231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fff0960ef4ea6e04eac66b4a7fd2189d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RigLayers: + - m_Rig: {fileID: 8865635171929772803} + m_Active: 1 + m_Effectors: [] diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index fd55a23..e013d91 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -1445,7 +1445,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1351784389 GameObject: @@ -1749,7 +1749,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.2000122, y: -5.9759827} + m_AnchoredPosition: {x: -0.2000122, y: -5.975952} m_SizeDelta: {x: 560.5, y: 40.112} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1457976036 @@ -2055,7 +2055,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -14, y: 0.000030517578} + m_AnchoredPosition: {x: -14, y: 0} m_SizeDelta: {x: 560.5, y: 17.470001} m_Pivot: {x: 1, y: 1} --- !u!114 &1729968089 @@ -2207,7 +2207,7 @@ Transform: - {fileID: 76630395} - {fileID: 104338203} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2119583729 GameObject: @@ -2304,7 +2304,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1496806602367600913 PrefabInstance: @@ -2315,7 +2315,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3365311783543717598, guid: 5cd2e2b44dc49ae44b48fc76a1e09712, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 3365311783543717598, guid: 5cd2e2b44dc49ae44b48fc76a1e09712, type: 3} propertyPath: m_LocalPosition.x @@ -2392,7 +2392,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2849906635484503724, guid: f0c1bca3291086d449266d9ed8942180, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 2849906635484503724, guid: f0c1bca3291086d449266d9ed8942180, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 7eb7d99..d158c15 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -7,6 +7,10 @@ public class Player : NetworkBehaviour { public bool isAlive = true; public Team team; + + + + [SerializeField]PlayerUIController playerUIController; [SerializeField] private const int defaultHp = 100; GameObject GameManager; GameMaster gameMaster; @@ -42,11 +46,9 @@ public class Player : NetworkBehaviour { if (isLocalPlayer) { - if (Input.GetKeyDown("n")) + if (Input.GetKeyDown(KeyCode.N)) { - //Debug.Log("Request respawn on local player"); - CmdRespawnRequest(); - //transform.position = Vector3.zero; + playerUIController.showHit(); } } @@ -111,6 +113,7 @@ public class Player : NetworkBehaviour if (isAlive) { + ShowHit(); health -= value; if (health <= 0) { @@ -120,6 +123,12 @@ public class Player : NetworkBehaviour } } + + [ClientRpc] + private void ShowHit() + { + playerUIController.showHit(); + } public void SetHealth(int value) { if (isAlive) diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 385d3e1..90f64c9 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -13,6 +13,7 @@ public class PlayerController : NetworkBehaviour [SerializeField] private float walkSpeed = 6.0f; [SerializeField] private float sprintSpeed = 10.0f; [SerializeField] private float aimWalkSpeed = 3.0f; + [SerializeField] private float fallDamageSpeed = 10.0f; [SerializeField][Range(0.0f, 0.5f)] private float moveSmoothTime = 0.001f; [SerializeField] float gravity = -10.0f; @@ -96,7 +97,11 @@ public class PlayerController : NetworkBehaviour Gizmos.color = Color.red; Gizmos.DrawRay(new Ray(transform.position, moveDirection * 50)); } - + [Command] + void CmdFallDamage(int damage) + { + GetComponent().RemoveHealth(damage); + } private void UpdateMovement() { @@ -115,6 +120,13 @@ public class PlayerController : NetworkBehaviour } + if(isGrounded && velocity.y < -fallDamageSpeed) + { + Debug.Log(velocity.y); + Debug.Log("Fall Damage"); + CmdFallDamage((int)Mathf.Abs(velocity.y)); + } + //Grounded if (velocityY < 0) { diff --git a/Assets/Scripts/Player/UI Player.meta b/Assets/Scripts/Player/UI Player.meta new file mode 100644 index 0000000..017624d --- /dev/null +++ b/Assets/Scripts/Player/UI Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0a3c5a29b2b3314a845a2041778a5e7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/UI Player/PlayerUIController.cs b/Assets/Scripts/Player/UI Player/PlayerUIController.cs new file mode 100644 index 0000000..98ca3af --- /dev/null +++ b/Assets/Scripts/Player/UI Player/PlayerUIController.cs @@ -0,0 +1,62 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using Mirror; +using TMPro; + +public class PlayerUIController : NetworkBehaviour +{ + [SerializeField] Canvas playerUICanvas; + [SerializeField] Image damageImage; + [SerializeField] TMP_Text healthText; + float hitVal = 0; + private void Start() + { + if (isLocalPlayer) + { + playerUICanvas.enabled = true; + } + } + /* + void Start() + { + GameObject imgObject = new GameObject("testAAA"); + + RectTransform trans = imgObject.AddComponent(); + trans.transform.SetParent(playerUICanvas.transform); // setting parent + trans.localScale = Vector3.one; + trans.anchoredPosition = new Vector2(0f, 0f); // setting position, will be on center + trans.sizeDelta = new Vector2(150, 200); // custom size + + Image image = imgObject.AddComponent(); + Texture2D tex = Resources.Load("red"); + image.sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f)); + imgObject.transform.SetParent(playerUICanvas.transform); + }*/ + + // Update is called once per frame + void FixedUpdate() + { + hitVal = gravityValue(hitVal,0.01f,0.01f,1,0,false); + damageImage.GetComponent().SetAlpha(hitVal); + healthText.text = GetComponent().health.ToString(); + } + + public void showHit() + { + hitVal = 1; + } + + + float gravityValue(float curretnValue, float rateOfChangePos, float rateOfChangeNeg, float maxValue, float minValue, bool add) + { + // The currentValue will be advanced by the rateOfChangePos and reduced by the rateOfChangeNeg depending on the add boolean. But only in the specified range. + // Usage: val = gravityValue(val, 0.01f, 0.05f, 1, 0, true); + float value = curretnValue; + if (add) value += rateOfChangePos; + else value -= rateOfChangeNeg; + + return Mathf.Clamp(value, minValue, maxValue); + } +} diff --git a/Assets/Scripts/Player/UI Player/PlayerUIController.cs.meta b/Assets/Scripts/Player/UI Player/PlayerUIController.cs.meta new file mode 100644 index 0000000..b873a1f --- /dev/null +++ b/Assets/Scripts/Player/UI Player/PlayerUIController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 39474c96d3f51c84688c71e41ec03d7b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Weapons/Shoot.cs b/Assets/Scripts/Weapons/Shoot.cs index bb34cbe..2a4a920 100644 --- a/Assets/Scripts/Weapons/Shoot.cs +++ b/Assets/Scripts/Weapons/Shoot.cs @@ -71,17 +71,21 @@ public class Shoot : NetworkBehaviour [Command] // This code will be executed on the Server. private void CmdFireBullet() { - ray = new Ray(mCamera.transform.position, mCamera.transform.forward); // Raycast from Camera - if (Physics.Raycast(ray, out crosshairHitPoint, 5000f)) { // Check if Raycast is beyond 5000 - hitpos = crosshairHitPoint.point; // If hitpoint is under 5000 - } else { - hitpos = mCamera.transform.position + mCamera.transform.forward * 5000; - } - _pointDirection = hitpos - muzzle.transform.position; - _lookRotation = Quaternion.LookRotation(_pointDirection); - shootAnim.rotationMod[1] = Quaternion.RotateTowards(weaponHolder.transform.rotation, _lookRotation, 1f); // Point weapon to raycast hitpoint from camera if (weapon.AllowAction) { // If not reloading etc. + ray = new Ray(mCamera.transform.position, mCamera.transform.forward); // Raycast from Camera + if (Physics.Raycast(ray, out crosshairHitPoint, 5000f)) + { // Check if Raycast is beyond 5000 + hitpos = crosshairHitPoint.point; // If hitpoint is under 5000 + } + else + { + hitpos = mCamera.transform.position + mCamera.transform.forward * 5000; + } + _pointDirection = hitpos - muzzle.transform.position; + _lookRotation = Quaternion.LookRotation(_pointDirection); + shootAnim.rotationMod[1] = Quaternion.RotateTowards(weaponHolder.transform.rotation, _lookRotation, 1f); // Point weapon to raycast hitpoint from camera + if (Physics.Raycast(muzzle.transform.position, muzzle.transform.forward, out hit) && weapon.CurrentAmmunition > 0) { // Raycast from Bullet Exit Point to camera raycast bulletHole(GameObject.CreatePrimitive(PrimitiveType.Sphere), hit); // Creates bullethole where raycast hits if (hit.transform.gameObject.GetComponent() != null) { // If hit object is a player diff --git a/Assets/Textures/Sprites.meta b/Assets/Textures/Sprites.meta new file mode 100644 index 0000000..d5b2e4a --- /dev/null +++ b/Assets/Textures/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b10311b1c24b4d643988f7f5de7246ae +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Sprites/UI.meta b/Assets/Textures/Sprites/UI.meta new file mode 100644 index 0000000..8d8b950 --- /dev/null +++ b/Assets/Textures/Sprites/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b182159762c2b4f4791a9b8c57732855 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Sprites/UI/Health.meta b/Assets/Textures/Sprites/UI/Health.meta new file mode 100644 index 0000000..a2cb65c --- /dev/null +++ b/Assets/Textures/Sprites/UI/Health.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 566ca94da6db97e4da6c8ea3eff22de8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Sprites/UI/Health/BloodSplatter_01.png b/Assets/Textures/Sprites/UI/Health/BloodSplatter_01.png new file mode 100644 index 0000000..5de82db Binary files /dev/null and b/Assets/Textures/Sprites/UI/Health/BloodSplatter_01.png differ diff --git a/Assets/Textures/Sprites/UI/Health/BloodSplatter_01.png.meta b/Assets/Textures/Sprites/UI/Health/BloodSplatter_01.png.meta new file mode 100644 index 0000000..3038c06 --- /dev/null +++ b/Assets/Textures/Sprites/UI/Health/BloodSplatter_01.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: f3485fe0fa73b4348997466b52e0d031 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Sprites/UI/Health/Damage.png b/Assets/Textures/Sprites/UI/Health/Damage.png new file mode 100644 index 0000000..ddd182b Binary files /dev/null and b/Assets/Textures/Sprites/UI/Health/Damage.png differ diff --git a/Assets/Textures/Sprites/UI/Health/Damage.png.meta b/Assets/Textures/Sprites/UI/Health/Damage.png.meta new file mode 100644 index 0000000..414ac5e --- /dev/null +++ b/Assets/Textures/Sprites/UI/Health/Damage.png.meta @@ -0,0 +1,122 @@ +fileFormatVersion: 2 +guid: 38b32680794c76841a245879147fdce8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Sprites/UI/Health/Player UI.prefab b/Assets/Textures/Sprites/UI/Health/Player UI.prefab new file mode 100644 index 0000000..5790353 --- /dev/null +++ b/Assets/Textures/Sprites/UI/Health/Player UI.prefab @@ -0,0 +1,179 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3865739619533045014 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3865739619533045015} + - component: {fileID: 3865739619533045013} + - component: {fileID: 3865739619533045012} + m_Layer: 5 + m_Name: BloodScreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3865739619533045015 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3865739619533045014} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3865739620182508121} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1600, y: 900} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3865739619533045013 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3865739619533045014} + m_CullTransparentMesh: 1 +--- !u!114 &3865739619533045012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3865739619533045014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 38b32680794c76841a245879147fdce8, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3865739620182508125 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3865739620182508121} + - component: {fileID: 3865739620182508120} + - component: {fileID: 3865739620182508123} + - component: {fileID: 3865739620182508122} + m_Layer: 5 + m_Name: Player UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3865739620182508121 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3865739620182508125} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3865739619533045015} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &3865739620182508120 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3865739620182508125} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3865739620182508123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3865739620182508125} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1600, y: 900} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &3865739620182508122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3865739620182508125} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 diff --git a/Assets/Textures/Sprites/UI/Health/Player UI.prefab.meta b/Assets/Textures/Sprites/UI/Health/Player UI.prefab.meta new file mode 100644 index 0000000..eb47ded --- /dev/null +++ b/Assets/Textures/Sprites/UI/Health/Player UI.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1694107e062c51a49add7c6c9c7a0fbc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index cd9ba98..721672e 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,7 +2,7 @@ "dependencies": { "com.hwaet.projectcloner": "https://github.com/hwaet/UnityProjectCloner.git", "com.unity.animation.rigging": "1.1.1", - "com.unity.collab-proxy": "1.13.5", + "com.unity.collab-proxy": "1.15.1", "com.unity.ide.rider": "3.0.7", "com.unity.ide.visualstudio": "2.0.12", "com.unity.ide.vscode": "1.2.4", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b63cbb8..869e76a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -27,7 +27,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.13.5", + "version": "1.15.1", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 03f4c05..d1f16a3 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.2.0f1 -m_EditorVersionWithRevision: 2021.2.0f1 (4bf1ec4b23c9) +m_EditorVersion: 2021.2.3f1 +m_EditorVersionWithRevision: 2021.2.3f1 (32358a8527b4) diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index a1d1e0c..b846229 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -20,7 +20,7 @@ MonoBehaviour: x: 0 y: 30 width: 1536 - height: 730.8 + height: 731 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 @@ -45,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 709.60004 + x: 538.4 y: 73.6 - width: 459.59998 - height: 451.8 + width: 866.7999 + height: 418.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -59,25 +59,25 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 459.59998, y: 430.8} + m_TargetSize: {x: 706, y: 397.2} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 - m_VSyncEnabled: 0 + m_VSyncEnabled: 1 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -183.84 - m_HBaseRangeMax: 183.84 - m_VBaseRangeMin: -172.31999 - m_VBaseRangeMax: 172.31999 + m_HBaseRangeMin: -282.4 + m_HBaseRangeMax: 282.4 + m_VBaseRangeMin: -158.88 + m_VBaseRangeMax: 158.88 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 459.59998 - height: 430.8 + width: 866.7999 + height: 397.2 m_Scale: {x: 1, y: 1} - m_Translation: {x: 229.79999, y: 215.4} + m_Translation: {x: 433.39996, y: 198.6} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -229.79999 - y: -215.4 - width: 459.59998 - height: 430.8 + x: -433.39996 + y: -198.6 + width: 866.7999 + height: 397.2 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 574.5, y: 564.75} + m_LastWindowPixelSize: {x: 1083.4999, y: 522.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,8 +136,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 - height: 730.8 + width: 1407.2 + height: 731 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 @@ -162,8 +162,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 - height: 472.8 + width: 1407.2 + height: 439.2 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 @@ -185,10 +185,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 293.6 - height: 472.8 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 398.4 + height: 439.2 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -215,9 +215,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73.6 - width: 292.6 - height: 451.8 + y: 19 + width: 397.4 + height: 418.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -227,7 +227,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: deecfeff30edfeff98effeff20fafeff72fafeffdafcfeff4c06ffffa606ffff0e09ffff6613ffffb813ffff2016ffffd81effff2a1fffff9221ffff442effff962efffffe30ffff7038ffffc238ffff2a3bffff3441ffff8841fffff043ffffc258ffff1459ffff7c5bffff6a62ffffc462ffff2c65ffffd86fffff2a70ffff9272ffff6680ffffb880ffff2083ffff408affff928afffffa8cffffb893ffff0a94ffff7296ffff3499ffff8699ffffee9bffff269effff789effffe0a0ffffa2abffffaaabffffb0abffffdcabffff50eeffff2afbffff + m_ExpandedIDs: 2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -266,10 +266,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 293.6 + x: 398.4 y: 0 - width: 415.99997 - height: 472.8 + width: 140.00003 + height: 439.2 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 9} @@ -277,7 +277,7 @@ MonoBehaviour: - {fileID: 8} - {fileID: 9} m_Selected: 1 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -298,10 +298,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 298.6 - y: 19 - width: 871.6 - height: 450.2 + x: 328.80002 + y: 73.6 + width: 318 + height: 418 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -309,15 +309,32 @@ MonoBehaviour: m_ViewTransforms: m_KeySerializationHelper: - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + - {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2} m_ValueSerializationHelper: - - e00: 1.0177464 + - e00: 0.70260465 e01: 0 e02: 0 - e03: -77.03352 + e03: -189.3735 e10: 0 - e11: 1.0177464 + e11: 0.70260465 e12: 0 - e13: 111.43313 + e13: 63.08463 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.6782804 + e01: 0 + e02: 0 + e03: -240.35721 + e10: 0 + e11: 0.6782804 + e12: 0 + e13: 92.776474 e20: 0 e21: 0 e22: 1 @@ -327,9 +344,9 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_AnimatorController: {fileID: 9100000, guid: bcfd120671431f84097ebc1045370f76, type: 2} m_BreadCrumbs: - - m_Target: {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + - m_Target: {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} @@ -339,7 +356,7 @@ MonoBehaviour: m_MiniTool: 0 m_LockTracker: m_IsLocked: 0 - m_CurrentEditor: 1 + m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 --- !u!114 &9 @@ -362,10 +379,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 293.6 + x: 398.4 y: 73.6 - width: 413.99997 - height: 451.8 + width: 138.00003 + height: 418.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -375,7 +392,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -98.400024, y: -26} + snapOffset: {x: -100, y: -26} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings @@ -387,7 +404,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: -141, y: 149} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 2.600006, y: 0} snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 @@ -430,7 +447,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -171.7, y: 86} + snapOffset: {x: -112.000015, y: 86} snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: Orientation @@ -578,9 +595,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.36444837, y: 8.662055, z: 6.1208687} + m_Target: {x: 11.616212, y: 1.3419256, z: 4.6519175} speed: 2 - m_Value: {x: -0.36444837, y: 8.662055, z: 6.1208687} + m_Value: {x: 11.616212, y: 1.3419256, z: 4.6519175} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -627,13 +644,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.14265797, y: -0.8023181, z: 0.212259, w: -0.53944343} + m_Target: {x: -0.20971945, y: 0.7315626, z: -0.25770992, w: -0.5953333} speed: 2 - m_Value: {x: -0.1426495, y: -0.8022705, z: 0.21224639, w: -0.5394114} + m_Value: {x: -0.20971923, y: 0.73156184, z: -0.25770965, w: -0.5953326} m_Size: - m_Target: 3.234408 + m_Target: 0.93468356 speed: 2 - m_Value: 3.234408 + m_Value: 0.93468356 m_Ortho: m_Target: 0 speed: 2 @@ -673,10 +690,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 709.6 + x: 538.4 y: 0 - width: 461.59998 - height: 472.8 + width: 868.7999 + height: 439.2 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} @@ -694,23 +711,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 472.8 - width: 1171.2 - height: 258 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} + y: 439.2 + width: 1407.2 + height: 291.8 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} - {fileID: 13} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -732,9 +749,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 546.4 - width: 1170.2 - height: 237 + y: 458.2 + width: 1406.2 + height: 270.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -764,10 +781,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 167} + scrollPos: {x: 0, y: 191} m_SelectedIDs: 16650000 m_LastClickedID: 25878 - m_ExpandedIDs: 000000000a6300000c6300000e630000dc640000e064000000ca9a3bffffff7f + m_ExpandedIDs: 00000000ce640000d0640000d2640000ea64000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -795,7 +812,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000000a6300000c6300000e630000 + m_ExpandedIDs: 00000000ce640000d0640000d2640000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -823,7 +840,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000 + m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -872,9 +889,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 546.4 - width: 1170.2 - height: 237 + y: 512 + width: 1129 + height: 271 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -889,17 +906,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: InspectorWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1171.2 + x: 1407.2 y: 0 - width: 364.80005 - height: 730.8 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + width: 128.80005 + height: 731 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -925,10 +942,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1171.2001 + x: 1407.2001 y: 73.6 - width: 363.80005 - height: 709.8 + width: 127.80005 + height: 710 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -936,7 +953,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 160 + m_CachedPref: 151 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index cf01531..eea7ea6 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -45,7 +45,7 @@ MonoBehaviour: x: 0 y: 0 width: 1536 - height: 780.8 + height: 781 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -90,7 +90,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 760.8 + y: 761 width: 1536 height: 20 m_MinSize: {x: 0, y: 0} @@ -115,11 +115,11 @@ MonoBehaviour: x: 0 y: 30 width: 1536 - height: 730.8 + height: 731 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 58 + controlID: 93 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1130.4 - height: 730.8 + width: 1130 + height: 731 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 59 + controlID: 94 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1130.4 - height: 438.4 + width: 1130 + height: 439 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 60 + controlID: 85 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,10 +188,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 329.6 - height: 438.4 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 328 + height: 439 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -212,10 +212,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 329.6 + x: 328 y: 0 - width: 320.80002 - height: 438.4 + width: 321 + height: 439 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} @@ -223,7 +223,7 @@ MonoBehaviour: - {fileID: 15} - {fileID: 16} m_Selected: 1 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -239,10 +239,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 650.4 + x: 649 y: 0 - width: 480 - height: 438.4 + width: 481 + height: 439 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} @@ -260,23 +260,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 438.4 - width: 1130.4 - height: 292.4 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 18} + y: 439 + width: 1130 + height: 292 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} - {fileID: 18} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -292,12 +292,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1130.4 + x: 1130 y: 0 - width: 405.59998 - height: 730.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + width: 406 + height: 731 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -323,10 +323,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 650.4 + x: 648.8 y: 73.6 - width: 478 - height: 417.4 + width: 479 + height: 418 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -337,13 +337,13 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 478, y: 396.4} + m_TargetSize: {x: 479, y: 397} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 - m_VSyncEnabled: 0 + m_VSyncEnabled: 1 m_Gizmos: 0 m_Stats: 0 m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 @@ -352,17 +352,17 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -191.2 - m_HBaseRangeMax: 191.2 - m_VBaseRangeMin: -158.56 - m_VBaseRangeMax: 158.56 + m_HBaseRangeMin: -191.6 + m_HBaseRangeMax: 191.6 + m_VBaseRangeMin: -158.8 + m_VBaseRangeMax: 158.8 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 - m_HSlider: 1 - m_VSlider: 1 + m_HSlider: 0 + m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 @@ -373,23 +373,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 478 - height: 396.4 - m_Scale: {x: 1.2742728, y: 1.2742728} - m_Translation: {x: 236.31642, y: 199.931} + width: 479 + height: 397 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 239.5, y: 198.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -185.45198 - y: -156.89812 - width: 375.1159 - height: 311.07938 + x: -239.5 + y: -198.5 + width: 479 + height: 397 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 597.5, y: 521.75} + m_LastWindowPixelSize: {x: 598.75, y: 522.5} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -417,8 +417,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 328.6 - height: 417.4 + width: 327 + height: 418 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -428,7 +428,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: be6effff0c6fffff3473fffff27cffff407dffff6881ffff5488ffffa288ffffee8affff968bffffe48bffff0c90ffff389dffff869dffffaaa1ffff64b1ffffb2b1ffffd6b5ffffecddffff3adeffff5ce2ffff78e6ffff18ebffffceecffff1cedffff34f1fffffcf7ffff2afbffff12900000 + m_ExpandedIDs: 2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -444,7 +444,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -472,10 +472,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 298.6 - y: 19 - width: 871.6 - height: 450.2 + x: 328.80002 + y: 73.6 + width: 318 + height: 418 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -483,15 +483,32 @@ MonoBehaviour: m_ViewTransforms: m_KeySerializationHelper: - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + - {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2} m_ValueSerializationHelper: - - e00: 1.0177464 + - e00: 0.70260465 e01: 0 e02: 0 - e03: -77.03352 + e03: -189.3735 e10: 0 - e11: 1.0177464 + e11: 0.70260465 e12: 0 - e13: 111.43313 + e13: 63.08463 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.6782804 + e01: 0 + e02: 0 + e03: -240.35721 + e10: 0 + e11: 0.6782804 + e12: 0 + e13: 92.776474 e20: 0 e21: 0 e22: 1 @@ -501,9 +518,9 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_AnimatorController: {fileID: 9100000, guid: bcfd120671431f84097ebc1045370f76, type: 2} m_BreadCrumbs: - - m_Target: {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + - m_Target: {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} @@ -513,7 +530,7 @@ MonoBehaviour: m_MiniTool: 0 m_LockTracker: m_IsLocked: 0 - m_CurrentEditor: 1 + m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 --- !u!114 &16 @@ -536,10 +553,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 329.6 + x: 328 y: 73.6 - width: 318.80002 - height: 417.4 + width: 319 + height: 418 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -549,7 +566,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -98.400024, y: -26} + snapOffset: {x: -100, y: -26} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings @@ -604,7 +621,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -111.20001, y: 86} + snapOffset: {x: -112.000015, y: 86} snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: Orientation @@ -752,9 +769,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.9768813, y: 1.8128467, z: 3.5595982} + m_Target: {x: 11.616212, y: 1.3419256, z: 4.6519175} speed: 2 - m_Value: {x: 1.9768813, y: 1.8128467, z: 3.5595982} + m_Value: {x: 11.616212, y: 1.3419256, z: 4.6519175} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -801,17 +818,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_Target: {x: -0.20971945, y: 0.7315626, z: -0.25770992, w: -0.5953333} speed: 2 - m_Value: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_Value: {x: -0.20971923, y: 0.73156184, z: -0.25770965, w: -0.5953326} m_Size: - m_Target: 11.444273 + m_Target: 0.93468356 speed: 2 - m_Value: 11.444273 + m_Value: 0.93468356 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -854,8 +871,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 512 - width: 1129.4 - height: 271.4 + width: 1129 + height: 271 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -873,22 +890,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/GameManager + - Assets/Prefabs/Player m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts/GameManager + - Assets/Prefabs/Player m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 116.600006} - m_SelectedIDs: 8c720000 - m_LastClickedID: 29324 - m_ExpandedIDs: 00000000726400007464000076640000547200005872000000ca9a3bffffff7f + scrollPos: {x: 0, y: 191} + m_SelectedIDs: 1a650000 + m_LastClickedID: 25882 + m_ExpandedIDs: 00000000ce640000d0640000d2640000ee64000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -916,7 +933,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000726400007464000076640000 + m_ExpandedIDs: 00000000ce640000d0640000d2640000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -941,10 +958,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: be7bffff - m_LastClickedInstanceID: -33858 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -994,7 +1011,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 512 - width: 1129.4 + width: 1128.6 height: 271.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1022,8 +1039,8 @@ MonoBehaviour: serializedVersion: 2 x: 1130.4 y: 73.6 - width: 404.59998 - height: 709.8 + width: 405 + height: 710 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default