From a46d19a6203632802a07f8ae19521a1bbf487e0e Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Wed, 28 Apr 2021 14:45:37 +0100 Subject: [PATCH] import arrow model and fix particle emission --- game/Assets/3D Assets/TRAPS/Arrow.fbx | 3 + game/Assets/3D Assets/TRAPS/Arrow.fbx.meta | 107 ++++++++++++++++++ .../3D Assets/TRIM 1/Meshes/Wall_C.fbx.meta | 7 +- game/Assets/Prefabs/Traps/ArrowWall.prefab | 18 +-- 4 files changed, 125 insertions(+), 10 deletions(-) create mode 100644 game/Assets/3D Assets/TRAPS/Arrow.fbx create mode 100644 game/Assets/3D Assets/TRAPS/Arrow.fbx.meta diff --git a/game/Assets/3D Assets/TRAPS/Arrow.fbx b/game/Assets/3D Assets/TRAPS/Arrow.fbx new file mode 100644 index 0000000..7de1cb9 --- /dev/null +++ b/game/Assets/3D Assets/TRAPS/Arrow.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5eaf9d2a7ccfe1855c656ab9d19d781962d05df200fb7ffc0d2c9bde8aa15587 +size 681760 diff --git a/game/Assets/3D Assets/TRAPS/Arrow.fbx.meta b/game/Assets/3D Assets/TRAPS/Arrow.fbx.meta new file mode 100644 index 0000000..7c563b3 --- /dev/null +++ b/game/Assets/3D Assets/TRAPS/Arrow.fbx.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: c35d572b63b1e1b418b0a1ee9d773370 +ModelImporter: + serializedVersion: 20200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert1 + second: {fileID: 2100000, guid: a0427cf339e5891468d5f2b433b2d44a, type: 2} + 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: 100 + 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/game/Assets/3D Assets/TRIM 1/Meshes/Wall_C.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Wall_C.fbx.meta index 01ec1ba..5280285 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Wall_C.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Wall_C.fbx.meta @@ -3,7 +3,12 @@ guid: 84d1abd228b21df47af6e0f4750ab193 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/Prefabs/Traps/ArrowWall.prefab b/game/Assets/Prefabs/Traps/ArrowWall.prefab index 7579b68..6034b93 100644 --- a/game/Assets/Prefabs/Traps/ArrowWall.prefab +++ b/game/Assets/Prefabs/Traps/ArrowWall.prefab @@ -26,8 +26,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7705893802528651092} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -1} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0.945, z: -0.916} + m_LocalScale: {x: 0.96121, y: 0.87204, z: 1} m_Children: [] m_Father: {fileID: 8768409224895496785} m_RootOrder: 0 @@ -52,7 +52,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b451a052397f03c4f8a04d915d1c0492, type: 3} + - {fileID: 2100004, guid: b451a052397f03c4f8a04d915d1c0492, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -93,7 +93,7 @@ ParticleSystemRenderer: m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} + m_Mesh: {fileID: 5302568919011541938, guid: c35d572b63b1e1b418b0a1ee9d773370, type: 3} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} @@ -171,7 +171,7 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - moveWithTransform: 1 + moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} scalingMode: 2 randomSeed: 0 @@ -509,7 +509,7 @@ ParticleSystem: startRotationX: serializedVersion: 2 minMaxState: 0 - scalar: 0 + scalar: -1.5707963 minScalar: 0 maxCurve: serializedVersion: 2 @@ -666,9 +666,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 100 size3D: 0 - rotation3D: 0 + rotation3D: 1 gravityModifier: serializedVersion: 2 minMaxState: 0 @@ -3741,7 +3741,7 @@ ParticleSystem: m_Bounce: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 0 minScalar: 1 maxCurve: serializedVersion: 2