Model Fixing (#574)

* Model Fixing Fixed the water cooler, filling cabinets, janicart and changed the multitool * Model Fixing Cryotube, sleeper, vendings
RE-SS3D · Dec 6, 2020 · 469a3b4 · 469a3b4
1 parent 8f72c67
commit 469a3b4
Show file tree

Hide file tree

Showing 16 changed files with 5,583 additions and 5,234 deletions.
diff --git a/Assets/Art/Models/Furniture/Generic/water cooler.fbx b/Assets/Art/Models/Furniture/Generic/water cooler.fbx
diff --git a/Assets/Art/Models/Furniture/Machines/Medical/Sleeper Bed.fbx b/Assets/Art/Models/Furniture/Machines/Medical/Sleeper Bed.fbx
diff --git a/Assets/Art/Models/Furniture/Machines/Medical/cryotube.fbx b/Assets/Art/Models/Furniture/Machines/Medical/cryotube.fbx
diff --git a/Assets/Art/Models/Furniture/Machines/Vendors/vending machines.fbx b/Assets/Art/Models/Furniture/Machines/Vendors/vending machines.fbx
diff --git a/Assets/Art/Models/Furniture/Storage/filing cabinets.fbx b/Assets/Art/Models/Furniture/Storage/filing cabinets.fbx
diff --git a/Assets/Art/Models/Furniture/Storage/janitorial cart.fbx b/Assets/Art/Models/Furniture/Storage/janitorial cart.fbx
diff --git a/Assets/Art/Models/Items/Functional/Tools/Generic/multitool.fbx b/Assets/Art/Models/Items/Functional/Tools/Generic/multitool.fbx
diff --git a/Assets/Art/Models/Items/Functional/Tools/Generic/multitool.fbx.meta b/Assets/Art/Models/Items/Functional/Tools/Generic/multitool.fbx.meta
diff --git a/Assets/Art/Sounds/Effects.meta b/Assets/Art/Sounds/Effects.meta
diff --git a/Assets/Content/Furniture/Generic/Water Cooler.prefab b/Assets/Content/Furniture/Generic/Water Cooler.prefab
@@ -34,7 +34,8 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 820258431473122037}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -178,3 +179,133 @@ MonoBehaviour:
   localPositionSensitivity: 0.01
   localRotationSensitivity: 0.01
   localScaleSensitivity: 0.01
+--- !u!1 &7943964851516787929
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 820258431473122037}
+  - component: {fileID: 1500670450250931093}
+  - component: {fileID: 4826789624377952239}
+  - component: {fileID: 708306545422624464}
+  - component: {fileID: 8952054571029827556}
+  - component: {fileID: 7355367087431884817}
+  m_Layer: 0
+  m_Name: Gallon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &820258431473122037
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7943964851516787929}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.922, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5543375027458810491}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1500670450250931093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7943964851516787929}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  sceneId: 0
+  serverOnly: 0
+  m_AssetId: 
+  hasSpawned: 0
+--- !u!33 &4826789624377952239
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7943964851516787929}
+  m_Mesh: {fileID: -1038654132399250416, guid: 9b3ccbd5b5dd6f34cb9c0fb39ba88d8a, type: 3}
+--- !u!23 &708306545422624464
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7943964851516787929}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 7b91bd4845c08c04f96e3a5f5c47aeca, 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
+--- !u!64 &8952054571029827556
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7943964851516787929}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -1038654132399250416, guid: 9b3ccbd5b5dd6f34cb9c0fb39ba88d8a, type: 3}
+--- !u!114 &7355367087431884817
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7943964851516787929}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2f74aedd71d9a4f55b3ce499326d45fb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncMode: 0
+  syncInterval: 0.1
+  clientAuthority: 0
+  localPositionSensitivity: 0.01
+  localRotationSensitivity: 0.01
+  localScaleSensitivity: 0.01
diff --git a/Assets/Content/Items/Functional/Tools/Generic/multitool.prefab b/Assets/Content/Items/Functional/Tools/Generic/multitool.prefab
@@ -62,7 +62,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6814766556652304684}
-  m_Mesh: {fileID: -405258063262372677, guid: 920182fefed625c44afd365212ffca6a, type: 3}
+  m_Mesh: {fileID: 2454747108899390493, guid: 8952047475be13d4ba1d5c06820d905f, type: 3}
 --- !u!23 &5093074332610645488
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -132,7 +132,7 @@ MeshCollider:
   serializedVersion: 4
   m_Convex: 1
   m_CookingOptions: 30
-  m_Mesh: {fileID: -405258063262372677, guid: 920182fefed625c44afd365212ffca6a, type: 3}
+  m_Mesh: {fileID: 2454747108899390493, guid: 8952047475be13d4ba1d5c06820d905f, type: 3}
 --- !u!114 &883693477356993085
 MonoBehaviour:
   m_ObjectHideFlags: 0