diff --git a/Assets/models/dobber.blend b/Assets/models/dobber.blend index 05cc1d0..4e1b694 100644 --- a/Assets/models/dobber.blend +++ b/Assets/models/dobber.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43b2c0edc2ede723bec5d12bb69bf108873519ee486f87bcfffcd36327582bc1 -size 867324 +oid sha256:4b97c677f138216b125461d199d6625b8fe3b0c890c67d6909cec68c3f06b2da +size 1335880 diff --git a/Assets/models/dobber.blend1 b/Assets/models/dobber.blend1 new file mode 100644 index 0000000..67dc920 Binary files /dev/null and b/Assets/models/dobber.blend1 differ diff --git a/Assets/models/dobber.blend1.meta b/Assets/models/dobber.blend1.meta new file mode 100644 index 0000000..0661901 --- /dev/null +++ b/Assets/models/dobber.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: da09f27324a91ec469fae450ba24cfe8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/models/dobber.fbx b/Assets/models/dobber.fbx new file mode 100644 index 0000000..b0fa00f --- /dev/null +++ b/Assets/models/dobber.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:251f3df0f2bb8332aede6b234c2378c1d1da21bb0582fde2d0f2c8d4f651537e +size 213340 diff --git a/Assets/models/dobber.fbx.meta b/Assets/models/dobber.fbx.meta new file mode 100644 index 0000000..4960e1e --- /dev/null +++ b/Assets/models/dobber.fbx.meta @@ -0,0 +1,102 @@ +fileFormatVersion: 2 +guid: f6c10dd1253711b4e832373429b08971 +ModelImporter: + serializedVersion: 20200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + 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 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + 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/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 8d57145..af96b10 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -48,26 +48,6 @@ "key": "editor.showSceneInfo", "value": "{\"m_Value\":false}" }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "mesh.newShapesSnapToGrid", - "value": "{\"m_Value\":true}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "editor.autoRecalculateCollisions", - "value": "{\"m_Value\":false}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "mesh.meshColliderIsConvex", - "value": "{\"m_Value\":false}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "editor.showEditorNotifications", - "value": "{\"m_Value\":false}" - }, { "type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.rectSelectModifier", @@ -82,41 +62,6 @@ "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.selectMode", "value": "{\"m_Value\":1}" - }, - { - "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "mesh.newShapePivotLocation", - "value": "{\"m_Value\":1}" - }, - { - "type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "mesh.shadowCastingMode", - "value": "{\"m_Value\":1}" - }, - { - "type": "UnityEngine.Material, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "mesh.userMaterial", - "value": "{\"m_Value\":{\"instanceID\":0}}" - }, - { - "type": "UnityEditor.StaticEditorFlags, UnityEditor.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "mesh.defaultStaticEditorFlags", - "value": "{\"m_Value\":0}" - }, - { - "type": "UnityEngine.ProBuilder.ColliderType, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "mesh.newShapeColliderType", - "value": "{\"m_Value\":2}" - }, - { - "type": "UnityEngine.ProBuilder.UnwrapParameters, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "lightmapping.defaultLightmapUnwrapParameters", - "value": "{\"m_Value\":{\"m_HardAngle\":88.0,\"m_PackMargin\":20.0,\"m_AngleError\":8.0,\"m_AreaError\":15.0}}" - }, - { - "type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "SubdivideEdges.subdivisions", - "value": "{\"m_Value\":1}" } ] }