From 470a11276658411419e465d4697ffd8fb2637dfc Mon Sep 17 00:00:00 2001 From: K0RB4K Date: Tue, 10 Jan 2023 16:26:20 +0100 Subject: [PATCH] added network bay asset + put in scene --- Assets/Models/Blender/NetworkBox.blend | 3 + Assets/Models/Blender/NetworkBox.blend.meta | 106 ++++++++++++++++++++ Assets/Models/NetworkBox.prefab | 87 ++++++++++++++++ Assets/Models/NetworkBox.prefab.meta | 7 ++ Assets/Scenes/FabLab/FabLab.unity | 81 ++++++++++++--- 5 files changed, 272 insertions(+), 12 deletions(-) create mode 100644 Assets/Models/Blender/NetworkBox.blend create mode 100644 Assets/Models/Blender/NetworkBox.blend.meta create mode 100644 Assets/Models/NetworkBox.prefab create mode 100644 Assets/Models/NetworkBox.prefab.meta diff --git a/Assets/Models/Blender/NetworkBox.blend b/Assets/Models/Blender/NetworkBox.blend new file mode 100644 index 0000000..daf7845 --- /dev/null +++ b/Assets/Models/Blender/NetworkBox.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b52cbaec4a876509c299e9fe2697dc01651242d9e5c4fbaa1b0b82a722e957c +size 2049264 diff --git a/Assets/Models/Blender/NetworkBox.blend.meta b/Assets/Models/Blender/NetworkBox.blend.meta new file mode 100644 index 0000000..d686b2e --- /dev/null +++ b/Assets/Models/Blender/NetworkBox.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 06a516c85ff4592d3931610c846b8363 +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: 0 + 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/NetworkBox.prefab b/Assets/Models/NetworkBox.prefab new file mode 100644 index 0000000..a02db12 --- /dev/null +++ b/Assets/Models/NetworkBox.prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2103288803068313405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1620084931302598023} + - component: {fileID: 2437689005040347682} + - component: {fileID: 446030592625008360} + m_Layer: 0 + m_Name: NetworkBox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1620084931302598023 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103288803068313405} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.0622735, y: 2.003796, z: 1.37} + m_LocalScale: {x: 0.255, y: 0.092, z: 0.002} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2437689005040347682 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103288803068313405} + m_Mesh: {fileID: -855889283239656021, guid: 06a516c85ff4592d3931610c846b8363, type: 3} +--- !u!23 &446030592625008360 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103288803068313405} + 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: 5296590585878813031, guid: 06a516c85ff4592d3931610c846b8363, type: 3} + - {fileID: 2100000, guid: e7f8455d46288cb12b49d5367b543018, type: 2} + - {fileID: -6518380632535569532, guid: 06a516c85ff4592d3931610c846b8363, type: 3} + 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} diff --git a/Assets/Models/NetworkBox.prefab.meta b/Assets/Models/NetworkBox.prefab.meta new file mode 100644 index 0000000..7eaedf7 --- /dev/null +++ b/Assets/Models/NetworkBox.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b6ebb33deb111cac8a963221c8ed3430 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 2ee046a..108379f 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2636,7 +2636,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} propertyPath: m_LocalPosition.x @@ -2901,7 +2901,7 @@ Transform: - {fileID: 1378541949} - {fileID: 1075331068} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &165972124 GameObject: @@ -4949,7 +4949,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh126290 + m_Name: pb_Mesh33242 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -7121,7 +7121,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh126602 + m_Name: pb_Mesh33556 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9548,7 +9548,7 @@ Transform: - {fileID: 1387559935} - {fileID: 1688009003} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1031756473 GameObject: @@ -10335,7 +10335,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 75.777, z: 0} --- !u!1 &1104026039 GameObject: @@ -10670,7 +10670,7 @@ Transform: - {fileID: 671271521} - {fileID: 1557224834} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1180503447 PrefabInstance: @@ -10915,7 +10915,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} propertyPath: m_LocalPosition.x @@ -11565,7 +11565,7 @@ Transform: - {fileID: 788326936} - {fileID: 386612851} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1520507909 PrefabInstance: @@ -11928,7 +11928,7 @@ Transform: - {fileID: 1695254331} - {fileID: 1180503448} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1759620593 Mesh: @@ -15108,7 +15108,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh126344 + m_Name: pb_Mesh33296 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15586,8 +15586,65 @@ Transform: - {fileID: 2002266328} - {fileID: 655794545} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2182494934729705834 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1620084931302598023, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1620084931302598023, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_LocalPosition.x + value: 5.741 + objectReference: {fileID: 0} + - target: {fileID: 1620084931302598023, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_LocalPosition.y + value: 3.898 + objectReference: {fileID: 0} + - target: {fileID: 1620084931302598023, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_LocalPosition.z + value: 3.116 + objectReference: {fileID: 0} + - target: {fileID: 1620084931302598023, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1620084931302598023, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1620084931302598023, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1620084931302598023, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1620084931302598023, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1620084931302598023, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1620084931302598023, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2103288803068313405, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} + propertyPath: m_Name + value: NetworkBox + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b6ebb33deb111cac8a963221c8ed3430, type: 3} --- !u!1001 &8736913158087471388 PrefabInstance: m_ObjectHideFlags: 0