diff --git a/Assets/Scripts/Menu.meta b/Assets/Animations/menu.meta similarity index 77% rename from Assets/Scripts/Menu.meta rename to Assets/Animations/menu.meta index 24a0958..2579cce 100644 --- a/Assets/Scripts/Menu.meta +++ b/Assets/Animations/menu.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0ef9190e46442564697eb0c9534ef95e +guid: aade6823bb1ae6c47b95a95f3100becf folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Animations/menu/Typing.fbx b/Assets/Animations/menu/Typing.fbx new file mode 100644 index 0000000..11e56ef --- /dev/null +++ b/Assets/Animations/menu/Typing.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93141aba87577d1ac4d38863cf260bfebfdf87abae6d25040918cc60d74b9ec7 +size 3080592 diff --git a/Assets/Animations/menu/Typing.fbx.meta b/Assets/Animations/menu/Typing.fbx.meta new file mode 100644 index 0000000..ab161d0 --- /dev/null +++ b/Assets/Animations/menu/Typing.fbx.meta @@ -0,0 +1,894 @@ +fileFormatVersion: 2 +guid: 773838649264c7b44acda83206e62291 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + 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: computer_sitting + takeName: mixamo.com + internalID: -203655887218126122 + firstFrame: 0 + lastFrame: 494 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 1 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 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: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: + - boneName: mixamorig:Hips + 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: mixamorig:LeftUpLeg + 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: mixamorig:RightUpLeg + 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: mixamorig:LeftLeg + 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: mixamorig:RightLeg + 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: mixamorig:LeftFoot + 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: mixamorig:RightFoot + 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: mixamorig: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: mixamorig:Spine1 + humanName: Chest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig: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: mixamorig: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: mixamorig:LeftShoulder + 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: mixamorig:RightShoulder + 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: mixamorig:LeftArm + 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: mixamorig:RightArm + 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: mixamorig:LeftForeArm + 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: mixamorig:RightForeArm + 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: mixamorig:LeftHand + 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: mixamorig:RightHand + 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: mixamorig:LeftToeBase + 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: mixamorig:RightToeBase + 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: mixamorig:LeftHandThumb1 + 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: mixamorig:LeftHandThumb2 + 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: mixamorig:LeftHandThumb3 + humanName: Left Thumb Distal + 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: mixamorig:LeftHandIndex1 + 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: mixamorig:LeftHandIndex2 + 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: mixamorig:LeftHandIndex3 + humanName: Left Index Distal + 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: mixamorig:LeftHandMiddle1 + 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: mixamorig:LeftHandMiddle2 + 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: mixamorig:LeftHandMiddle3 + humanName: Left Middle Distal + 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: mixamorig:LeftHandRing1 + 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: mixamorig:LeftHandRing2 + 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: mixamorig:LeftHandRing3 + humanName: Left Ring Distal + 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: mixamorig:LeftHandPinky1 + 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: mixamorig:LeftHandPinky2 + 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: mixamorig:LeftHandPinky3 + humanName: Left Little Distal + 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: mixamorig:RightHandThumb1 + 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: mixamorig:RightHandThumb2 + 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: mixamorig:RightHandThumb3 + humanName: Right Thumb Distal + 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: mixamorig:RightHandIndex1 + 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: mixamorig:RightHandIndex2 + 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: mixamorig:RightHandIndex3 + humanName: Right Index Distal + 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: mixamorig:RightHandMiddle1 + 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: mixamorig:RightHandMiddle2 + 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: mixamorig:RightHandMiddle3 + humanName: Right Middle Distal + 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: mixamorig:RightHandRing1 + 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: mixamorig:RightHandRing2 + 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: mixamorig:RightHandRing3 + humanName: Right Ring Distal + 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: mixamorig:RightHandPinky1 + 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: mixamorig:RightHandPinky2 + 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: mixamorig:RightHandPinky3 + humanName: Right Little Distal + 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: mixamorig:Spine2 + humanName: UpperChest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + skeleton: + - name: Typing(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: Beta_Surface + parentName: Typing(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: Beta_Joints + parentName: Typing(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Hips + parentName: Typing(Clone) + position: {x: 0.00068016193, y: 1.0719985, z: 0.03261068} + rotation: {x: 0.006458373, y: -0.0000000018971846, z: -0.00000025150243, w: 0.99997914} + scale: {x: 0.99999994, y: 1, z: 1.0000004} + - name: mixamorig:Spine + parentName: mixamorig:Hips + position: {x: 4.2558305e-12, y: 0.101824366, z: -3.9690472e-17} + rotation: {x: -0.08015575, y: 9.85978e-10, z: 0.00000024900214, w: 0.9967824} + scale: {x: 1, y: 0.99999994, z: 0.99999976} + - name: mixamorig:Spine1 + parentName: mixamorig:Spine + position: {x: 9.32854e-23, y: 0.10002675, z: 5.83388e-18} + rotation: {x: -0, y: -7.263727e-10, z: -6.202399e-11, w: 1} + scale: {x: 0.99999994, y: 1, z: 1} + - name: mixamorig:Spine2 + parentName: mixamorig:Spine1 + position: {x: -1.1375431e-16, y: 0.09322091, z: 0.000000002823681} + rotation: {x: 0.012885651, y: 8.891114e-11, z: 0.000000037274965, w: 0.999917} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Neck + parentName: mixamorig:Spine2 + position: {x: -4.1474883e-12, y: 0.16865322, z: 5.7686385e-16} + rotation: {x: -0.0000000074505797, y: -4.4195637e-11, z: 3.6107176e-10, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Head + parentName: mixamorig:Neck + position: {x: 0.0000000010756748, y: 0.09341923, z: 0.028410409} + rotation: {x: 0.0000000074505797, y: -1.10113224e-10, z: -5.975969e-10, w: 1} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:HeadTop_End + parentName: mixamorig:Head + position: {x: -0.000000009856974, y: 0.2096278, z: 0.10122935} + rotation: {x: -0, y: -0, z: 8.2040735e-19, w: 1} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:RightShoulder + parentName: mixamorig:Spine2 + position: {x: 0.0456997, y: 0.111958444, z: -0.008066318} + rotation: {x: -0.48443058, y: -0.5709637, z: 0.5261637, w: -0.40308717} + scale: {x: 1.0000002, y: 1.0000002, z: 1.0000004} + - name: mixamorig:RightArm + parentName: mixamorig:RightShoulder + position: {x: -3.151008e-17, y: 0.108381756, z: -9.694985e-18} + rotation: {x: 0.024616182, y: 0.0025622249, z: -0.10349858, w: -0.9943217} + scale: {x: 0.9999998, y: 1.0000005, z: 1} + - name: mixamorig:RightForeArm + parentName: mixamorig:RightArm + position: {x: 9.964063e-11, y: 0.27841517, z: 3.5581792e-16} + rotation: {x: -0.00000006519257, y: -0.00000005681067, z: 0.00000014451506, w: 1} + scale: {x: 1.0000001, y: 0.9999998, z: 1.0000001} + - name: mixamorig:RightHand + parentName: mixamorig:RightForeArm + position: {x: -0.00000022858599, y: 0.2832884, z: 0.000000044725386} + rotation: {x: -0.000000027939674, y: 0.00000003585593, z: -0.0000001184744, w: 1} + scale: {x: 1.0000001, y: 0.9999999, z: 0.99999994} + - name: mixamorig:RightHandThumb1 + parentName: mixamorig:RightHand + position: {x: -0.026818518, y: 0.02464805, z: 0.01573984} + rotation: {x: 0.11661039, y: -0.123563275, z: 0.33744976, w: 0.92588437} + scale: {x: 1.0000004, y: 1.0000005, z: 1.0000002} + - name: mixamorig:RightHandThumb2 + parentName: mixamorig:RightHandThumb1 + position: {x: 1.5692586e-16, y: 0.041889854, z: -9.679277e-17} + rotation: {x: -0.00231567, y: 0.0011703967, z: -0.009300041, w: 0.99995345} + scale: {x: 1, y: 1.0000007, z: 1.0000008} + - name: mixamorig:RightHandThumb3 + parentName: mixamorig:RightHandThumb2 + position: {x: 1.837671e-16, y: 0.03416271, z: 1.9955813e-16} + rotation: {x: -0.0016648587, y: 0.0008077296, z: -0.0069198236, w: 0.9999743} + scale: {x: 1, y: 1, z: 1.0000001} + - name: mixamorig:RightHandThumb4 + parentName: mixamorig:RightHandThumb3 + position: {x: 1.4209324e-16, y: 0.025749773, z: -2.6613211e-16} + rotation: {x: 0.0057749664, y: 0.11750923, z: 0.048743706, w: 0.99185807} + scale: {x: 1, y: 1.0000001, z: 1.0000004} + - name: mixamorig:RightHandIndex1 + parentName: mixamorig:RightHand + position: {x: -0.02259835, y: 0.091082826, z: 0.0051786215} + rotation: {x: -0.00000053271305, y: 0.000000009297955, z: 0.00016410046, w: 1} + scale: {x: 1.0000005, y: 1.0000006, z: 1.0000004} + - name: mixamorig:RightHandIndex2 + parentName: mixamorig:RightHandIndex1 + position: {x: 8.564062e-17, y: 0.037, z: -9.3649935e-17} + rotation: {x: -0.000000022368448, y: -0.00000008412105, z: -0.00025557776, w: 1} + scale: {x: 1.0000004, y: 1.0000005, z: 1.0000005} + - name: mixamorig:RightHandIndex3 + parentName: mixamorig:RightHandIndex2 + position: {x: 3.4287106e-15, y: 0.028499998, z: -8.893045e-12} + rotation: {x: -0.000000024209966, y: 0.000000043014442, z: 0.000087941306, w: 1} + scale: {x: 0.99999994, y: 1, z: 1.0000002} + - name: mixamorig:RightHandIndex4 + parentName: mixamorig:RightHandIndex3 + position: {x: -7.9067536e-15, y: 0.027721904, z: 5.114471e-12} + rotation: {x: 0.000000096646566, y: -0.0010026237, z: -0.00008708179, w: 0.9999996} + scale: {x: 1.0000001, y: 0.99999994, z: 1.0000002} + - name: mixamorig:RightHandMiddle1 + parentName: mixamorig:RightHand + position: {x: 0.00000023687323, y: 0.09532501, z: 0.0000003985569} + rotation: {x: -0.0000008549435, y: -0.000000043353204, z: 0.0005017248, w: 0.9999999} + scale: {x: 1.0000004, y: 1.0000005, z: 1.0000002} + - name: mixamorig:RightHandMiddle2 + parentName: mixamorig:RightHandMiddle1 + position: {x: 1.0026188e-16, y: 0.037, z: -2.8084325e-16} + rotation: {x: -0.00000011183708, y: -0.00000004686837, z: -0.0008499421, w: 0.9999997} + scale: {x: 1, y: 1.0000001, z: 1.0000006} + - name: mixamorig:RightHandMiddle3 + parentName: mixamorig:RightHandMiddle2 + position: {x: 2.5163898e-15, y: 0.0295, z: -1.5411337e-10} + rotation: {x: -0.0000000148883395, y: 0.000000066476105, z: 0.0003218456, w: 1} + scale: {x: 1.0000002, y: 1.0000008, z: 1.0000006} + - name: mixamorig:RightHandMiddle4 + parentName: mixamorig:RightHandMiddle3 + position: {x: -1.1329194e-15, y: 0.029466288, z: 7.2058734e-11} + rotation: {x: 0.00000025915438, y: -0.00092876883, z: -0.00016645905, w: 0.99999964} + scale: {x: 1.0000005, y: 1.0000007, z: 1.0000004} + - name: mixamorig:RightHandRing1 + parentName: mixamorig:RightHand + position: {x: 0.01865133, y: 0.09103592, z: 0.0004306965} + rotation: {x: -0.000000108030136, y: -0.0000000135186955, z: 0.0001559675, w: -1} + scale: {x: 1.0000004, y: 1.0000007, z: 1.0000005} + - name: mixamorig:RightHandRing2 + parentName: mixamorig:RightHandRing1 + position: {x: 5.1494657e-17, y: 0.03379273, z: -2.837085e-16} + rotation: {x: -0.000000018623453, y: -0.000000029808525, z: -0.00022146938, w: -1} + scale: {x: 1.0000002, y: 1.0000004, z: 1.0000005} + - name: mixamorig:RightHandRing3 + parentName: mixamorig:RightHandRing2 + position: {x: -2.6225074e-15, y: 0.028896846, z: 8.202333e-12} + rotation: {x: -0.00000005588383, y: -0.000000030027703, z: 0.00011284687, w: 1} + scale: {x: 0.9999998, y: 1.0000001, z: 0.99999994} + - name: mixamorig:RightHandRing4 + parentName: mixamorig:RightHandRing3 + position: {x: -4.719501e-15, y: 0.026388155, z: 5.682296e-12} + rotation: {x: -0.00000008752448, y: -0.00014611542, z: 0.00079923106, w: 0.99999964} + scale: {x: 1.0000002, y: 0.99999994, z: 0.99999994} + - name: mixamorig:RightHandPinky1 + parentName: mixamorig:RightHand + position: {x: 0.038062774, y: 0.08076676, z: 0.004867037} + rotation: {x: -0.000004591409, y: 8.8297003e-10, z: 0.0005205032, w: -0.9999999} + scale: {x: 1.0000002, y: 1.0000004, z: 1.0000002} + - name: mixamorig:RightHandPinky2 + parentName: mixamorig:RightHandPinky1 + position: {x: 1.0715117e-16, y: 0.036, z: -3.087779e-16} + rotation: {x: 0.00000014715758, y: -0.000000050063623, z: -0.0008463034, w: 0.99999964} + scale: {x: 1.0000002, y: 1.0000004, z: 1.0000007} + - name: mixamorig:RightHandPinky3 + parentName: mixamorig:RightHandPinky2 + position: {x: 5.2800265e-16, y: 0.020999998, z: -2.1163896e-10} + rotation: {x: -0.000000009270366, y: -0.0000000056211213, z: 0.0004967925, w: 0.99999994} + scale: {x: 1, y: 1, z: 1.0000005} + - name: mixamorig:RightHandPinky4 + parentName: mixamorig:RightHandPinky3 + position: {x: -1.2959057e-15, y: 0.02115781, z: 1.4407352e-10} + rotation: {x: 0.00000010234743, y: 0.0015694563, z: -0.000041371542, w: -0.99999875} + scale: {x: 1.0000001, y: 0.99999994, z: 0.9999997} + - name: mixamorig:LeftShoulder + parentName: mixamorig:Spine2 + position: {x: -0.045704458, y: 0.11195644, z: -0.008066272} + rotation: {x: 0.48442274, y: -0.5709705, z: 0.5261617, w: 0.40308973} + scale: {x: 1, y: 0.9999998, z: 0.9999998} + - name: mixamorig:LeftArm + parentName: mixamorig:LeftShoulder + position: {x: 2.6006848e-17, y: 0.108377054, z: -9.237507e-18} + rotation: {x: -0.024606433, y: 0.0025613902, z: -0.10350455, w: 0.9943213} + scale: {x: 1.0000002, y: 1.0000007, z: 1.0000005} + - name: mixamorig:LeftForeArm + parentName: mixamorig:LeftArm + position: {x: -9.0380454e-17, y: 0.2784152, z: -4.3119334e-17} + rotation: {x: -0, y: -0, z: 0.0000000022191666, w: 1} + scale: {x: 0.9999998, y: 1.0000001, z: 0.9999999} + - name: mixamorig:LeftHand + parentName: mixamorig:LeftForeArm + position: {x: -0.00000005438735, y: 0.28328833, z: -0.0000000055642486} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:LeftHandThumb1 + parentName: mixamorig:LeftHand + position: {x: 0.026817314, y: 0.024661448, z: 0.015761929} + rotation: {x: 0.11634476, y: 0.123310946, z: -0.3373185, w: 0.9259992} + scale: {x: 1.0000004, y: 1.0000002, z: 1.0000005} + - name: mixamorig:LeftHandThumb2 + parentName: mixamorig:LeftHandThumb1 + position: {x: 8.920065e-17, y: 0.041870944, z: 1.1859406e-16} + rotation: {x: -0.0020670441, y: -0.0010428763, z: 0.008213565, w: 0.99996364} + scale: {x: 1.0000002, y: 1.0000002, z: 1.0000008} + - name: mixamorig:LeftHandThumb3 + parentName: mixamorig:LeftHandThumb2 + position: {x: 1.2823348e-17, y: 0.034183882, z: 5.503636e-16} + rotation: {x: -0.0015313063, y: -0.0007452269, z: 0.006073054, w: 0.9999801} + scale: {x: 0.9999998, y: 1.0000002, z: 0.9999998} + - name: mixamorig:LeftHandThumb4 + parentName: mixamorig:LeftHandThumb3 + position: {x: -1.6462281e-16, y: 0.025805814, z: 2.600447e-17} + rotation: {x: 0.005153355, y: -0.12268279, z: -0.041651476, w: 0.9915581} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandIndex1 + parentName: mixamorig:LeftHand + position: {x: 0.022598628, y: 0.09109309, z: 0.005180343} + rotation: {x: 0.00000066868944, y: -0.00000003096647, z: 0.000044027318, w: 1} + scale: {x: 1.0000001, y: 1.0000001, z: 1.0000004} + - name: mixamorig:LeftHandIndex2 + parentName: mixamorig:LeftHandIndex1 + position: {x: 6.4293255e-17, y: 0.037, z: -7.240398e-17} + rotation: {x: 0.00000038184297, y: 0.0000000916482, z: -0.00010504844, w: 1} + scale: {x: 0.9999999, y: 1.0000001, z: 1.0000002} + - name: mixamorig:LeftHandIndex3 + parentName: mixamorig:LeftHandIndex2 + position: {x: 7.177584e-15, y: 0.028499998, z: 3.2100108e-16} + rotation: {x: 0.00000021607002, y: -0.00000011912647, z: 0.00006626486, w: 1} + scale: {x: 1.0000002, y: 1.0000001, z: 0.9999998} + - name: mixamorig:LeftHandIndex4 + parentName: mixamorig:LeftHandIndex3 + position: {x: -8.589727e-15, y: 0.027748656, z: 3.9775513e-16} + rotation: {x: 0.00000019942254, y: 0.00037768038, z: 0.000013121837, w: 1} + scale: {x: 1.0000008, y: 1.0000008, z: 1.0000012} + - name: mixamorig:LeftHandMiddle1 + parentName: mixamorig:LeftHand + position: {x: 0.0000003660436, y: 0.095334016, z: -0.00000032540473} + rotation: {x: 0.00000037997953, y: 0.000000006752086, z: 0.00003162369, w: 1} + scale: {x: 1, y: 1.0000002, z: 1.0000002} + - name: mixamorig:LeftHandMiddle2 + parentName: mixamorig:LeftHandMiddle1 + position: {x: 1.8484327e-17, y: 0.037, z: -4.1078256e-17} + rotation: {x: -0.00000007823076, y: 0.0000000051167075, z: -0.000021157213, w: 1} + scale: {x: 1, y: 0.9999998, z: 0.9999998} + - name: mixamorig:LeftHandMiddle3 + parentName: mixamorig:LeftHandMiddle2 + position: {x: 2.870735e-14, y: 0.0295, z: -1.8927175e-16} + rotation: {x: -0.00000041909436, y: 0.00000004842692, z: -0.000020670725, w: 1} + scale: {x: 1.0000001, y: 1.0000004, z: 1.0000005} + - name: mixamorig:LeftHandMiddle4 + parentName: mixamorig:LeftHandMiddle3 + position: {x: 8.712009e-14, y: 0.029528635, z: -1.3157035e-15} + rotation: {x: -0.00000008308994, y: 0.0010241575, z: -0.000027954866, w: 0.99999946} + scale: {x: 1.0000001, y: 1.0000007, z: 1.0000004} + - name: mixamorig:LeftHandRing1 + parentName: mixamorig:LeftHand + position: {x: -0.018650811, y: 0.09104528, z: 0.00043028235} + rotation: {x: 0.0000007059425, y: -0.000000039115548, z: -0.0000063470434, w: 1} + scale: {x: 1, y: 1.0000001, z: 1.0000002} + - name: mixamorig:LeftHandRing2 + parentName: mixamorig:LeftHandRing1 + position: {x: 3.8807003e-17, y: 0.0315, z: -1.2637012e-16} + rotation: {x: -0, y: -0, z: 2.7613328e-14, w: 1} + scale: {x: 0.9999999, y: 1.0000005, z: 1.0000004} + - name: mixamorig:LeftHandRing3 + parentName: mixamorig:LeftHandRing2 + position: {x: -0.000000026432891, y: 0.0295, z: 0.0000000052098597} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 0.99999994, z: 0.99999994} + - name: mixamorig:LeftHandRing4 + parentName: mixamorig:LeftHandRing3 + position: {x: 0.0000002327433, y: 0.026443163, z: -0.000000014607575} + rotation: {x: -0.0000003116571, y: -0.00049340323, z: -0.000016044216, w: 0.9999999} + scale: {x: 1.0000002, y: 1.0000004, z: 1.0000002} + - name: mixamorig:LeftHandPinky1 + parentName: mixamorig:LeftHand + position: {x: -0.038062632, y: 0.08077779, z: 0.00486877} + rotation: {x: -0.000004990026, y: 0.000000004423793, z: -0.002044808, w: 0.999998} + scale: {x: 1, y: 1.0000001, z: 1.0000002} + - name: mixamorig:LeftHandPinky2 + parentName: mixamorig:LeftHandPinky1 + position: {x: 3.8940705e-17, y: 0.036, z: 2.5409893e-16} + rotation: {x: 0.00000066494107, y: 0.000000011484529, z: 0.00021062777, w: 1} + scale: {x: 1.0000004, y: 0.99999994, z: 1.0000001} + - name: mixamorig:LeftHandPinky3 + parentName: mixamorig:LeftHandPinky2 + position: {x: -2.4071785e-15, y: 0.021000002, z: 3.3381643e-16} + rotation: {x: 0.00000017513149, y: -0.00000002395056, z: 0.00006709503, w: 1} + scale: {x: 1.0000004, y: 1.0000004, z: 1.0000002} + - name: mixamorig:LeftHandPinky4 + parentName: mixamorig:LeftHandPinky3 + position: {x: -1.10373645e-14, y: 0.021255314, z: -4.7608096e-17} + rotation: {x: 0.00000010583966, y: 0.00078336906, z: 0.00029541863, w: 0.99999964} + scale: {x: 0.9999998, y: 1.0000005, z: 1.0000005} + - name: mixamorig:RightUpLeg + parentName: mixamorig:Hips + position: {x: 0.08207789, y: -0.06771764, z: -0.015122186} + rotation: {x: -0.0000000044954924, y: 0.010356486, z: 0.9999464, w: -0.00000026898414} + scale: {x: 1.0000002, y: 1.0000005, z: 1.0000001} + - name: mixamorig:RightLeg + parentName: mixamorig:RightUpLeg + position: {x: -6.197275e-11, y: 0.44371462, z: -1.6627694e-15} + rotation: {x: -0.03809139, y: -0.0000000044072905, z: -0.000000034710276, w: 0.99927425} + scale: {x: 1.0000001, y: 1.0000001, z: 1} + - name: mixamorig:RightFoot + parentName: mixamorig:RightLeg + position: {x: 5.538293e-11, y: 0.4452781, z: 1.8670634e-16} + rotation: {x: 0.4597401, y: -0.000000005123167, z: 0.00000013445316, w: 0.8880536} + scale: {x: 1.0000008, y: 1.0000004, z: 1.0000001} + - name: mixamorig:RightToeBase + parentName: mixamorig:RightFoot + position: {x: 1.2271307e-17, y: 0.13816866, z: 4.8857846e-17} + rotation: {x: 0.3352416, y: -7.981855e-10, z: 0.000000110928035, w: 0.94213223} + scale: {x: 1.0000002, y: 0.99999994, z: 0.99999994} + - name: mixamorig:RightToe_End + parentName: mixamorig:RightToeBase + position: {x: 3.3725423e-18, y: 0.09278121, z: 4.2890198e-17} + rotation: {x: -0.000000059604638, y: -0.01160807, z: -0.00000003050081, w: 0.99993265} + scale: {x: 1.0000007, y: 1.0000005, z: 1.0000004} + - name: mixamorig:LeftUpLeg + parentName: mixamorig:Hips + position: {x: -0.08207788, y: -0.06771803, z: -0.015122138} + rotation: {x: -0.0000000023306368, y: 0.010367973, z: 0.9999463, w: -0.00000026315777} + scale: {x: 1, y: 1.0000004, z: 0.9999999} + - name: mixamorig:LeftLeg + parentName: mixamorig:LeftUpLeg + position: {x: -6.468267e-11, y: 0.4437139, z: 3.7506209e-16} + rotation: {x: -0.03811246, y: 0.0000000030689702, z: -0.000000017195292, w: 0.9992735} + scale: {x: 1.0000011, y: 1.0000006, z: 1.0000002} + - name: mixamorig:LeftFoot + parentName: mixamorig:LeftLeg + position: {x: 5.5477796e-11, y: 0.44527847, z: -2.2030602e-16} + rotation: {x: 0.4597487, y: 0.0000000014897619, z: 0.00000012044751, w: 0.88804907} + scale: {x: 1.0000008, y: 1.0000006, z: 1.0000001} + - name: mixamorig:LeftToeBase + parentName: mixamorig:LeftFoot + position: {x: -2.3797458e-17, y: 0.13816865, z: -3.4315254e-17} + rotation: {x: 0.3352414, y: 5.317825e-10, z: 0.00000011757977, w: 0.94213235} + scale: {x: 1.0000007, y: 1.0000006, z: 0.99999994} + - name: mixamorig:LeftToe_End + parentName: mixamorig:LeftToeBase + position: {x: 4.3545176e-19, y: 0.09278137, z: -1.3126546e-17} + rotation: {x: 0.000000029802312, y: 0.011869163, z: 0.000000001629814, w: 0.99992955} + scale: {x: 1.0000014, y: 1.0000007, z: 1.0000007} + 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 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/movement/Stand--Idle.anim.fbx.meta b/Assets/Animations/movement/Stand--Idle.anim.fbx.meta index c184163..8c1c74d 100644 --- a/Assets/Animations/movement/Stand--Idle.anim.fbx.meta +++ b/Assets/Animations/movement/Stand--Idle.anim.fbx.meta @@ -44,8 +44,8 @@ ModelImporter: cycleOffset: 0 loop: 0 hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 + loopTime: 1 + loopBlend: 1 loopBlendOrientation: 1 loopBlendPositionY: 1 loopBlendPositionXZ: 1 diff --git a/Assets/Assets/Anime Girl/Model/Anime_Girl.controller b/Assets/Assets/Anime Girl/Model/Anime_Girl.controller index 0bfef02..26afa20 100644 --- a/Assets/Assets/Anime Girl/Model/Anime_Girl.controller +++ b/Assets/Assets/Anime Girl/Model/Anime_Girl.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-6730198344960978218 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: InMenu + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.9848178 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-5590362795948243233 AnimatorState: serializedVersion: 6 @@ -145,6 +170,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-1565395807645794573 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: InMenu + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4949688742649318102} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.5194731 + m_TransitionOffset: 0.2550577 + m_ExitTime: 0.8873203 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 --- !u!1101 &-1285597810872963057 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -261,6 +311,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: InMenu + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -345,7 +401,7 @@ AnimatorStateMachine: m_Position: {x: 630, y: -10, z: 0} - serializedVersion: 1 m_State: {fileID: 1683933815276700887} - m_Position: {x: 530, y: 220, z: 0} + m_Position: {x: 40, y: -210, z: 0} - serializedVersion: 1 m_State: {fileID: -5590362795948243233} m_Position: {x: 630, y: -160, z: 0} @@ -358,15 +414,19 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -345546078774493414} m_Position: {x: -20, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4949688742649318102} + m_Position: {x: 40, y: -270, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: -1285597810872963057} + - {fileID: -1565395807645794573} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_AnyStatePosition: {x: -160, y: -210, z: 0} m_EntryPosition: {x: 140, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_ExitPosition: {x: 290, y: -200, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -3687732817109132895} --- !u!206 &1555666136689333084 @@ -443,6 +503,33 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &4949688742649318102 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: computer_sitting + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6730198344960978218} + 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: -203655887218126122, guid: 773838649264c7b44acda83206e62291, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &5352032957858167824 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/MyPrefabs/EscMenuLaptop.prefab b/Assets/MyPrefabs/EscMenuLaptop.prefab new file mode 100644 index 0000000..fc383f8 --- /dev/null +++ b/Assets/MyPrefabs/EscMenuLaptop.prefab @@ -0,0 +1,237 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &65801587080712962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7504116677341731219} + - component: {fileID: 4908728627166713711} + - component: {fileID: 4510043916461372939} + m_Layer: 0 + m_Name: PartsB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7504116677341731219 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65801587080712962} + serializedVersion: 2 + m_LocalRotation: {x: -0.13052624, y: -0, z: -0, w: 0.9914449} + m_LocalPosition: {x: -0, y: 0.016181115, z: -0.12545727} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8340039650122096020} + m_LocalEulerAnglesHint: {x: -15, y: 0, z: 0} +--- !u!33 &4908728627166713711 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65801587080712962} + m_Mesh: {fileID: 8002242806711332626, guid: 178c7d3b10c1fcc43ba148ffc6ca66b4, type: 3} +--- !u!23 &4510043916461372939 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65801587080712962} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 2100000, guid: c21071ea682562f4499fac02217f29e4, type: 2} + - {fileID: 2100000, guid: b19da6aa2e43a06439f77b851cf77586, 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!1 &1714068424392069510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8340039650122096020} + - component: {fileID: 1000054050892321159} + - component: {fileID: 5093065478540955309} + m_Layer: 0 + m_Name: PartsA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8340039650122096020 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714068424392069510} + serializedVersion: 2 + m_LocalRotation: {x: 0.043619405, y: 0, z: 0, w: 0.9990483} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7504116677341731219} + m_Father: {fileID: 8861382932115143395} + m_LocalEulerAnglesHint: {x: 5, y: 0, z: 0} +--- !u!33 &1000054050892321159 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714068424392069510} + m_Mesh: {fileID: 1730524453621059734, guid: 178c7d3b10c1fcc43ba148ffc6ca66b4, type: 3} +--- !u!23 &5093065478540955309 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714068424392069510} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 2100000, guid: c21071ea682562f4499fac02217f29e4, 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!1 &4237441724355846855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8861382932115143395} + - component: {fileID: 8556627949130779586} + - component: {fileID: 5977583606498309505} + m_Layer: 0 + m_Name: EscMenuLaptop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8861382932115143395 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237441724355846855} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.45, y: 0.821, z: 0.754} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8340039650122096020} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8556627949130779586 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237441724355846855} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.46, y: 0.29, z: 0.34} + m_Center: {x: 0, y: 0.13, z: -0.03} +--- !u!114 &5977583606498309505 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237441724355846855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49c2318ab1c822c478f9c1097f46cacb, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/MyPrefabs/EscMenuLaptop.prefab.meta b/Assets/MyPrefabs/EscMenuLaptop.prefab.meta new file mode 100644 index 0000000..48d041c --- /dev/null +++ b/Assets/MyPrefabs/EscMenuLaptop.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 46e7274ba9f3eb64090928052818b195 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyPrefabs/Player.prefab b/Assets/MyPrefabs/Player.prefab index 8bad25d..90e0aee 100644 --- a/Assets/MyPrefabs/Player.prefab +++ b/Assets/MyPrefabs/Player.prefab @@ -744,6 +744,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 1 animator: {fileID: 1242338324907940129} + laptopPrefab: {fileID: 4237441724355846855, guid: 46e7274ba9f3eb64090928052818b195, type: 3} playerRigidbody: {fileID: 0} isGrounded: 0 moveDirection: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Menu/Menu.unity b/Assets/Scenes/Menu/Menu.unity index 467a748..70fc162 100644 --- a/Assets/Scenes/Menu/Menu.unity +++ b/Assets/Scenes/Menu/Menu.unity @@ -1019,8 +1019,8 @@ Transform: m_GameObject: {fileID: 758280061} serializedVersion: 2 m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.7071079} - m_LocalPosition: {x: 2.084, y: 1.487, z: -4.38} - m_LocalScale: {x: 0.67, y: 0.3526316, z: 0.3526316} + m_LocalPosition: {x: 2.103, y: 1.471, z: -2.405} + m_LocalScale: {x: 0.22, y: 0.11578947, z: 0.11578947} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} @@ -1467,7 +1467,7 @@ MonoBehaviour: timeInterpolationGui: 0 gamePlayerPrefab: {fileID: 5294076190035633177, guid: 19b8b462ea29c124ca06ccb21b9751f9, type: 3} GamePlayers: [] - PlayerInMenu: {fileID: 7779280043360359539, guid: 22aace1332feb514b823ccbdd87e8439, type: 3} + PlayerInMenu: {fileID: 2047094407} menuScene: Assets/Scenes/Menu/Menu.unity --- !u!114 &1495427290 MonoBehaviour: @@ -1582,6 +1582,11 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1980327457} m_Mesh: {fileID: 8002242806711332626, guid: 178c7d3b10c1fcc43ba148ffc6ca66b4, type: 3} +--- !u!1 &2047094407 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7779280043360359539, guid: 22aace1332feb514b823ccbdd87e8439, type: 3} + m_PrefabInstance: {fileID: 7475690541026574254} + m_PrefabAsset: {fileID: 0} --- !u!1 &8009012610911607 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CustomNetworkManager.cs b/Assets/Scripts/CustomNetworkManager.cs index e818e3f..775545c 100644 --- a/Assets/Scripts/CustomNetworkManager.cs +++ b/Assets/Scripts/CustomNetworkManager.cs @@ -18,20 +18,29 @@ public class CustomNetworkManager : NetworkManager public override void OnStartServer() { - Destroy(PlayerInMenu); + if (PlayerInMenu != null && PlayerInMenu.scene.IsValid()) + { + Destroy(PlayerInMenu); + } + else + { + Debug.LogWarning("PlayerInMenu is not a valid scene instance."); + } + spawnPrefabs = Resources.LoadAll("SpawnablePrefabs").ToList(); } // ReSharper disable Unity.PerformanceAnalysis public override void OnStartClient() { - Destroy(PlayerInMenu); var spawnablePrefabs = Resources.LoadAll("SpawnablePrefabs"); foreach (var prefab in spawnablePrefabs) { NetworkClient.RegisterPrefab(prefab); } + + if(PlayerInMenu != null) DestroyImmediate(PlayerInMenu, true); } // ReSharper disable Unity.PerformanceAnalysis diff --git a/Assets/Scripts/Interactive/PlayerMenu.cs b/Assets/Scripts/Interactive/PlayerMenu.cs new file mode 100644 index 0000000..84bde13 --- /dev/null +++ b/Assets/Scripts/Interactive/PlayerMenu.cs @@ -0,0 +1,31 @@ +using UnityEngine; + +namespace Interactive +{ + public class PlayerMenu : MonoBehaviour + { + private Camera _cam; + private float _smoothSpeed = 3f; + private Transform _playerTransform; + + void Start() + { + _cam = Camera.main; + _playerTransform = transform.GetComponentInParent().transform; + } + + void Update() + { + Vector3 direction = transform.position - _cam.transform.position; + + Quaternion targetRotation = Quaternion.LookRotation(direction); + + Transform transform1; + (transform1 = _cam.transform).rotation = Quaternion.Slerp(_cam.transform.rotation, targetRotation, _smoothSpeed * Time.deltaTime); + transform.LookAt(transform1); + + var targetPos = _playerTransform.position + _playerTransform.up * 0.638f + _playerTransform.forward * 0.27f; + transform.position += (targetPos - transform.position) * Time.deltaTime * 4f; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Menu/LaptopMenu.cs.meta b/Assets/Scripts/Interactive/PlayerMenu.cs.meta similarity index 83% rename from Assets/Scripts/Menu/LaptopMenu.cs.meta rename to Assets/Scripts/Interactive/PlayerMenu.cs.meta index ca4e50b..bf56781 100644 --- a/Assets/Scripts/Menu/LaptopMenu.cs.meta +++ b/Assets/Scripts/Interactive/PlayerMenu.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4d6bf0b487037d349a3803506d02debc +guid: 49c2318ab1c822c478f9c1097f46cacb MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Menu/LaptopMenu.cs b/Assets/Scripts/Menu/LaptopMenu.cs deleted file mode 100644 index a7a973f..0000000 --- a/Assets/Scripts/Menu/LaptopMenu.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class LaptopMenu : MonoBehaviour -{ - -} diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 9bfddc4..39eca76 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -15,6 +15,7 @@ namespace Player public LayerMask groundLayer; public Animator animator; public readonly StateMachine StateMachine = new StateMachine(); + public GameObject laptopPrefab; [HideInInspector] public Rigidbody playerRigidbody; public bool isGrounded; @@ -29,6 +30,7 @@ namespace Player StateMachine.Add(new Walk(this)); StateMachine.Add(new Run(this)); StateMachine.Add(new Jump(this)); + StateMachine.Add(new MenuState(this)); StateMachine.SetCurrentState(PlayerState.Walk); } @@ -43,9 +45,13 @@ namespace Player if (isGrounded && Input.GetButtonDown("Jump")) { - Debug.Log("JUMP"); StateMachine.SetCurrentState(PlayerState.Jump); } + + if (Input.GetKeyDown(KeyCode.Escape) && StateMachine.GetCurrentState().ID != PlayerState.Menu) + { + StateMachine.SetCurrentState(PlayerState.Menu); + } StateMachine.Update(); } @@ -63,5 +69,24 @@ namespace Player Gizmos.DrawWireSphere(groundCheck.position, groundCheckRadius); } } + + private GameObject _laptopInstance; + + public void OpenMenu() + { + Vector3 spawnPosition = transform.position + Vector3.up * 2f + Vector3.forward * 1f; + + _laptopInstance = Instantiate(laptopPrefab, spawnPosition, Quaternion.identity); + _laptopInstance.transform.SetParent(transform); + + Debug.Log("Open menu"); + Debug.Log(_laptopInstance.transform.position); + } + + public void CloseMenu() + { + Destroy(_laptopInstance); + Debug.Log("DESTROY"); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Player/PlayerState.cs b/Assets/Scripts/Player/PlayerState.cs index eed6c08..4dff9f4 100644 --- a/Assets/Scripts/Player/PlayerState.cs +++ b/Assets/Scripts/Player/PlayerState.cs @@ -5,6 +5,6 @@ Jump, Walk, Run, - Crouch + Menu } } \ No newline at end of file diff --git a/Assets/Scripts/Player/States/MenuState.cs b/Assets/Scripts/Player/States/MenuState.cs new file mode 100644 index 0000000..e917281 --- /dev/null +++ b/Assets/Scripts/Player/States/MenuState.cs @@ -0,0 +1,50 @@ +using System.Collections; +using System.Collections.Generic; +using Mirror; +using StateMachine; +using UnityEngine; + +namespace Player.States +{ + public class MenuState : State + { + private readonly Player _player; + private static readonly int Anim = Animator.StringToHash("InMenu"); + private bool _canExitMenu; + + public MenuState(Player player) : base(PlayerState.Menu) + { + _player = player; + } + + public override void Enter() + { + _player.OpenMenu(); + _player.animator.SetBool(Anim, true); + Cursor.lockState = CursorLockMode.Confined; + _canExitMenu = false; + _player.StartCoroutine(EnableMenuExit()); + } + + private IEnumerator EnableMenuExit() + { + yield return new WaitForSeconds(0.5f); + _canExitMenu = true; + } + + public override void Update() + { + if (_canExitMenu && Input.GetKeyDown(KeyCode.Escape) && _player.animator.GetBool(Anim) == true) + { + _player.StateMachine.SetCurrentState(PlayerState.Walk); + } + } + + public override void Exit() + { + _player.CloseMenu(); + _player.animator.SetBool(Anim, false); + Cursor.lockState = CursorLockMode.Locked; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Player/States/MenuState.cs.meta b/Assets/Scripts/Player/States/MenuState.cs.meta new file mode 100644 index 0000000..bc63eac --- /dev/null +++ b/Assets/Scripts/Player/States/MenuState.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9e3f48579b5e4ee6b1d683c8757dd85f +timeCreated: 1729275550 \ No newline at end of file diff --git a/Assets/Scripts/StateMachine/State.cs b/Assets/Scripts/StateMachine/State.cs index a897c3a..3ef710b 100644 --- a/Assets/Scripts/StateMachine/State.cs +++ b/Assets/Scripts/StateMachine/State.cs @@ -1,3 +1,5 @@ +using UnityEngine; + namespace StateMachine { public class State diff --git a/Assets/Scripts/StateMachine/StateMachine.cs b/Assets/Scripts/StateMachine/StateMachine.cs index 9a96698..16b62bd 100644 --- a/Assets/Scripts/StateMachine/StateMachine.cs +++ b/Assets/Scripts/StateMachine/StateMachine.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using UnityEngine; namespace StateMachine { diff --git a/Assets/TODO.txt b/Assets/TODO.txt index 4263fcc..d0cca1c 100644 --- a/Assets/TODO.txt +++ b/Assets/TODO.txt @@ -1,10 +1,12 @@ +https://github.com/DapperDino/Unity-Multiplayer-Tutorials-Old/tree/main + Нужно что бы было очень много персонажей и они выбирались рандомно, можно было заменить по нажатию на кнопку, но без повторений за одну сессию +Игровое меню это гараж, по совместительству лобби, поставить ноутбук, и там хостить или присоединятся -https://github.com/DapperDino/Unity-Multiplayer-Tutorials-Old/tree/main ++Худа не будет, при нажатии кнопки вызова меню, с неба падает ноутбук, камера на него и открывается типо меню (С анимацией) без прицелов итп -Худа не будет, при нажатии кнопки вызова меню, с неба падает ноутбук, камера на него и открывается типо меню (С анимацией) без прицелов итп +Сделать само меню в ноутбуке Шутер от первого лица, с читами, кнопка вызова читов, мб консоль со скрытой командой, когда пишешь help выведет список команд, и одна из них разблокирует чит панель