diff --git a/Assets/Animations/PlayerAnimations/Idle/X Bot@Idle.fbx b/Assets/Animations/PlayerAnimations/Idle/PlayerIdle.fbx similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/X Bot@Idle.fbx rename to Assets/Animations/PlayerAnimations/Idle/PlayerIdle.fbx diff --git a/Assets/Models/Astronaut/LowPolyScifiGun.fbx.meta b/Assets/Animations/PlayerAnimations/Idle/PlayerIdle.fbx.meta similarity index 98% rename from Assets/Models/Astronaut/LowPolyScifiGun.fbx.meta rename to Assets/Animations/PlayerAnimations/Idle/PlayerIdle.fbx.meta index 47bd7ea..0f7a5ef 100644 --- a/Assets/Models/Astronaut/LowPolyScifiGun.fbx.meta +++ b/Assets/Animations/PlayerAnimations/Idle/PlayerIdle.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 63d8273e095d54643b5ee5ff97691008 +guid: be1b71370e0a8824594b2e60f834ce7b ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] diff --git a/Assets/Animations/PlayerAnimations/Idle/X Bot@Pistol Idle.fbx b/Assets/Animations/PlayerAnimations/Idle/PlayerPistolIdle.fbx similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/X Bot@Pistol Idle.fbx rename to Assets/Animations/PlayerAnimations/Idle/PlayerPistolIdle.fbx diff --git a/Assets/Animations/PlayerAnimations/Idle/X Bot@Idle.fbx.meta b/Assets/Animations/PlayerAnimations/Idle/PlayerPistolIdle.fbx.meta similarity index 75% rename from Assets/Animations/PlayerAnimations/Idle/X Bot@Idle.fbx.meta rename to Assets/Animations/PlayerAnimations/Idle/PlayerPistolIdle.fbx.meta index 1c8cec9..192f6a1 100644 --- a/Assets/Animations/PlayerAnimations/Idle/X Bot@Idle.fbx.meta +++ b/Assets/Animations/PlayerAnimations/Idle/PlayerPistolIdle.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3bc973c7992a5774fa8723d1065bfe28 +guid: 5c2ba5be7605c5f409365e3b25ec4104 ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] @@ -31,36 +31,7 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: - - serializedVersion: 16 - name: Idle - takeName: mixamo.com - internalID: -203655887218126122 - firstFrame: 0 - lastFrame: 59 - 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: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 + clipAnimations: [] isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Animations/PlayerAnimations/Idle/X Bot@Pistol Idle.fbx.meta b/Assets/Animations/PlayerAnimations/Idle/X Bot@Pistol Idle.fbx.meta deleted file mode 100644 index d488d60..0000000 --- a/Assets/Animations/PlayerAnimations/Idle/X Bot@Pistol Idle.fbx.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: 995daa6cc74179043b8b31348a750c1e -ModelImporter: - serializedVersion: 21300 - 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: - - serializedVersion: 16 - name: Pistol Idle - takeName: mixamo.com - internalID: -203655887218126122 - firstFrame: 0 - lastFrame: 40 - 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: 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 - 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 - 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 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Running/X Bot@Pistol Run.fbx b/Assets/Animations/PlayerAnimations/Running/PlayerPistol.fbx similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/X Bot@Pistol Run.fbx rename to Assets/Animations/PlayerAnimations/Running/PlayerPistol.fbx diff --git a/Assets/Animations/PlayerAnimations/Running/X Bot@Pistol Run.fbx.meta b/Assets/Animations/PlayerAnimations/Running/PlayerPistol.fbx.meta similarity index 98% rename from Assets/Animations/PlayerAnimations/Running/X Bot@Pistol Run.fbx.meta rename to Assets/Animations/PlayerAnimations/Running/PlayerPistol.fbx.meta index 321f7e6..fe148a5 100644 --- a/Assets/Animations/PlayerAnimations/Running/X Bot@Pistol Run.fbx.meta +++ b/Assets/Animations/PlayerAnimations/Running/PlayerPistol.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e35ac80a5338e544788e07c1e73fb2a2 +guid: b745b26e63ff7c347b89bdfbbc57a28b ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] @@ -33,7 +33,7 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: Pistol Run + name: mixamo.com takeName: mixamo.com internalID: -203655887218126122 firstFrame: 0 diff --git a/Assets/Animations/PlayerAnimations/Running/X Bot@Running.fbx b/Assets/Animations/PlayerAnimations/Running/PlayerRunning.fbx similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/X Bot@Running.fbx rename to Assets/Animations/PlayerAnimations/Running/PlayerRunning.fbx diff --git a/Assets/Animations/PlayerAnimations/Running/X Bot@Running.fbx.meta b/Assets/Animations/PlayerAnimations/Running/PlayerRunning.fbx.meta similarity index 75% rename from Assets/Animations/PlayerAnimations/Running/X Bot@Running.fbx.meta rename to Assets/Animations/PlayerAnimations/Running/PlayerRunning.fbx.meta index d1ae92e..72a8525 100644 --- a/Assets/Animations/PlayerAnimations/Running/X Bot@Running.fbx.meta +++ b/Assets/Animations/PlayerAnimations/Running/PlayerRunning.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 54a418da24d11804b83af7708b40f0c1 +guid: a0a4d13267a3c6f41a314c43592fd39c ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] @@ -31,36 +31,7 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: - - serializedVersion: 16 - name: Running - takeName: mixamo.com - internalID: -203655887218126122 - firstFrame: 0 - lastFrame: 21 - 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: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 + clipAnimations: [] isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Animations/PlayerAnimations/mixamorig_Hips.controller b/Assets/Animations/PlayerAnimations/mixamorig_Hips.controller index ee321bb..470839d 100644 --- a/Assets/Animations/PlayerAnimations/mixamorig_Hips.controller +++ b/Assets/Animations/PlayerAnimations/mixamorig_Hips.controller @@ -909,7 +909,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -203655887218126122, guid: 54a418da24d11804b83af7708b40f0c1, type: 3} + m_Motion: {fileID: -203655887218126122, guid: a0a4d13267a3c6f41a314c43592fd39c, type: 3} m_Tag: m_SpeedParameter: RunningSpeed m_MirrorParameter: @@ -1071,7 +1071,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -203655887218126122, guid: e35ac80a5338e544788e07c1e73fb2a2, type: 3} + m_Motion: {fileID: -203655887218126122, guid: b745b26e63ff7c347b89bdfbbc57a28b, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -1251,55 +1251,55 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 1 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: RunningSpeed m_Type: 1 m_DefaultFloat: 1 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: SideSpeed m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsCarrying m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: HasGun m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: WasHit m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsDead m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: StrafingSpeed m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: StrafingDirection m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -1800,7 +1800,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -203655887218126122, guid: 3bc973c7992a5774fa8723d1065bfe28, type: 3} + m_Motion: {fileID: -203655887218126122, guid: be1b71370e0a8824594b2e60f834ce7b, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -2311,7 +2311,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -203655887218126122, guid: 995daa6cc74179043b8b31348a750c1e, type: 3} + m_Motion: {fileID: -203655887218126122, guid: 5c2ba5be7605c5f409365e3b25ec4104, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -2524,10 +2524,10 @@ AnimatorStateMachine: m_Position: {x: -130, y: 410, z: 0} - serializedVersion: 1 m_State: {fileID: 2448133036534709572} - m_Position: {x: 309.8631, y: 112.56933, z: 0} + m_Position: {x: 310, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: -9042336647299626999} - m_Position: {x: 560, y: 220, z: 0} + m_Position: {x: 600, y: 250, z: 0} - serializedVersion: 1 m_State: {fileID: -2847804469841402747} m_Position: {x: 560, y: 80, z: 0} @@ -2536,7 +2536,7 @@ AnimatorStateMachine: m_Position: {x: 500, y: 30, z: 0} - serializedVersion: 1 m_State: {fileID: 8758987059409697143} - m_Position: {x: 550, y: 380, z: 0} + m_Position: {x: 350, y: 290, z: 0} - serializedVersion: 1 m_State: {fileID: 583101868980985703} m_Position: {x: 160, y: 600, z: 0} diff --git a/Assets/Models/Astronaut/Helmet_Solo.blend b/Assets/Models/Astronaut/Helmet_Solo.blend index a4b1753..0f05f03 100644 Binary files a/Assets/Models/Astronaut/Helmet_Solo.blend and b/Assets/Models/Astronaut/Helmet_Solo.blend differ diff --git a/Assets/Models/Astronaut/Helmet_Solo.blend1 b/Assets/Models/Astronaut/Helmet_Solo.blend1 new file mode 100644 index 0000000..ec46b2c Binary files /dev/null and b/Assets/Models/Astronaut/Helmet_Solo.blend1 differ diff --git a/Assets/Models/Astronaut/Helmet_Solo.blend1.meta b/Assets/Models/Astronaut/Helmet_Solo.blend1.meta new file mode 100644 index 0000000..91f06f4 --- /dev/null +++ b/Assets/Models/Astronaut/Helmet_Solo.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d3210de799e80bc43b3e60e9b1bae2ea +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Astronaut/Helmet_Solo.fbx b/Assets/Models/Astronaut/Helmet_Solo.fbx new file mode 100644 index 0000000..5efe3d1 --- /dev/null +++ b/Assets/Models/Astronaut/Helmet_Solo.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7112be9b0c04927fc3658d1f6dd60f6a8096eeba0a998667cc88403f0514954d +size 530428 diff --git a/Assets/Models/Astronaut/Helmet_Solo.fbx.meta b/Assets/Models/Astronaut/Helmet_Solo.fbx.meta new file mode 100644 index 0000000..d853db6 --- /dev/null +++ b/Assets/Models/Astronaut/Helmet_Solo.fbx.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: f9117e19caf839748b401ffe4c03c88f +ModelImporter: + serializedVersion: 21300 + 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: 1 + 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 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Astronaut/LowPolyScifiGun.fbx b/Assets/Models/Astronaut/LowPolyScifiPistol.fbx similarity index 100% rename from Assets/Models/Astronaut/LowPolyScifiGun.fbx rename to Assets/Models/Astronaut/LowPolyScifiPistol.fbx diff --git a/Assets/Models/Astronaut/LowPolyScifiPistol.fbx.meta b/Assets/Models/Astronaut/LowPolyScifiPistol.fbx.meta new file mode 100644 index 0000000..cc1ba1b --- /dev/null +++ b/Assets/Models/Astronaut/LowPolyScifiPistol.fbx.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 258666917294e8b4db299cbb76fd6a98 +ModelImporter: + serializedVersion: 21300 + 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: 1 + 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 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/FORGE3D.meta b/Assets/Packages/FORGE3D.meta new file mode 100644 index 0000000..eff0af1 --- /dev/null +++ b/Assets/Packages/FORGE3D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7dbfdfe297b3b246855c7d6bca8298e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/FORGE3D/Planets.meta b/Assets/Packages/FORGE3D/Planets.meta new file mode 100644 index 0000000..b0eda11 --- /dev/null +++ b/Assets/Packages/FORGE3D/Planets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d1ae527a336406748ab3f360e0bb40df +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/FORGE3D/Planets/SRP Templates.meta b/Assets/Packages/FORGE3D/Planets/SRP Templates.meta new file mode 100644 index 0000000..fd28d90 --- /dev/null +++ b/Assets/Packages/FORGE3D/Planets/SRP Templates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 297afae1127d57b4482c5a41fdc539e1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/FORGE3D/Planets/SRP Templates/Planets Standard.unitypackage.meta b/Assets/Packages/FORGE3D/Planets/SRP Templates/Planets Standard.unitypackage.meta new file mode 100644 index 0000000..2eef9b5 --- /dev/null +++ b/Assets/Packages/FORGE3D/Planets/SRP Templates/Planets Standard.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b10d50360d4e3b147814d612fbc15579 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/FORGE3D/Planets/SRP Templates/Planets URP.unitypackage.meta b/Assets/Packages/FORGE3D/Planets/SRP Templates/Planets URP.unitypackage.meta new file mode 100644 index 0000000..5fba61a --- /dev/null +++ b/Assets/Packages/FORGE3D/Planets/SRP Templates/Planets URP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0131d12f9e32257438829a840e60ca41 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GunPrefabs/Pistol1.prefab b/Assets/Prefabs/GunPrefabs/Pistol1.prefab index 94c3565..d5d45ee 100644 --- a/Assets/Prefabs/GunPrefabs/Pistol1.prefab +++ b/Assets/Prefabs/GunPrefabs/Pistol1.prefab @@ -600,7 +600,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6700653566957051900} - m_Mesh: {fileID: 2941274158721294118, guid: 63d8273e095d54643b5ee5ff97691008, type: 3} + m_Mesh: {fileID: 2941274158721294118, guid: 258666917294e8b4db299cbb76fd6a98, type: 3} --- !u!23 &1039715520343193334 MeshRenderer: m_ObjectHideFlags: 0 @@ -623,9 +623,9 @@ MeshRenderer: m_Materials: - {fileID: 2100000, guid: e1fe5134720cba140901cf75d1d6080f, type: 2} - {fileID: 2100000, guid: e1fe5134720cba140901cf75d1d6080f, type: 2} - - {fileID: -6922793697723135513, guid: 63d8273e095d54643b5ee5ff97691008, type: 3} - - {fileID: -6629797300637803691, guid: 63d8273e095d54643b5ee5ff97691008, type: 3} - - {fileID: -3846018093981099296, guid: 63d8273e095d54643b5ee5ff97691008, type: 3} + - {fileID: 2100000, guid: e1fe5134720cba140901cf75d1d6080f, type: 2} + - {fileID: 2100000, guid: e1fe5134720cba140901cf75d1d6080f, type: 2} + - {fileID: 2100000, guid: e1fe5134720cba140901cf75d1d6080f, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0