Skip to content

Commit

Permalink
Update Furniture (#1096)
Browse files Browse the repository at this point in the history
* Update lockers.fbx and prefabs

Also added a prefab for the locker lock

* Add proper vendors.fbx and update vendor prefab

* Prefabs fix

* Add furniture as tilemap objects
  • Loading branch information
cosmiccoincidence authored Mar 10, 2023
1 parent 814f2fc commit 3d8647a
Show file tree
Hide file tree
Showing 26 changed files with 896 additions and 27 deletions.
8 changes: 8 additions & 0 deletions Assets/Art/Models/Furniture/Machines/Vendors.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
126 changes: 126 additions & 0 deletions Assets/Art/Models/Furniture/Machines/Vendors/VendingMachines.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Art/Models/Furniture/Storage/Lockers.fbx
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Content/Data/TileMap/Resources/Furniture/Machines.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3}
m_Name: TableBoozeDispenser
m_EditorClassIdentifier:
nameString: table_boozedispenser
prefab: {fileID: 1918783493706165866, guid: 7b74e45100446b440b4b0a12cd6d05ef, type: 3}
icon: {fileID: 0}
layer: 7
genericType: 0
specificType: 0
width: 1
height: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3}
m_Name: VendorHotDrinks
m_EditorClassIdentifier:
nameString: vendor_hotdrinks
prefab: {fileID: 2658310835758749969, guid: b7976a98a25be4543ba45f1d5e26c072, type: 3}
icon: {fileID: 0}
layer: 7
genericType: 0
specificType: 0
width: 1
height: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3}
m_Name: SecureLocker
m_EditorClassIdentifier:
nameString: locker_secure
prefab: {fileID: 5533951594911835035, guid: 330d85a67a5891145bd8037dde90f37b, type: 3}
icon: {fileID: 0}
layer: 7
genericType: 0
specificType: 0
width: 1
height: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ GameObject:
- component: {fileID: 1871071288925904272}
- component: {fileID: 8905492951320375787}
m_Layer: 0
m_Name: HotDrinks
m_Name: VendorHotDrinks
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -45,7 +45,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2658310835758749969}
m_Mesh: {fileID: 3194831100300846016, guid: 2e56555ad4dc18b4a9667b5e0d83c93a, type: 3}
m_Mesh: {fileID: 4150681116119138116, guid: c4d23e1208d91484c948684da1e09cce, type: 3}
--- !u!23 &2658310835758749971
MeshRenderer:
m_ObjectHideFlags: 0
Expand All @@ -54,7 +54,7 @@ MeshRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2658310835758749969}
m_Enabled: 1
m_CastShadows: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
Expand Down Expand Up @@ -103,7 +103,7 @@ MeshCollider:
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 3194831100300846016, guid: 2e56555ad4dc18b4a9667b5e0d83c93a, type: 3}
m_Mesh: {fileID: 4150681116119138116, guid: c4d23e1208d91484c948684da1e09cce, type: 3}
--- !u!114 &1871071288925904272
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -129,7 +129,7 @@ MonoBehaviour:
<PrefabId>k__BackingField: 2
_scenePathHash: 0
<SceneId>k__BackingField: 0
<AssetPathHash>k__BackingField: 12242725358280836924
<AssetPathHash>k__BackingField: 2097375067128656164
_sceneNetworkObjects:
- {fileID: 0}
- {fileID: 0}
Expand Down Expand Up @@ -240,7 +240,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5223262861450433750}
m_Mesh: {fileID: 1875183323934135677, guid: 2e56555ad4dc18b4a9667b5e0d83c93a, type: 3}
m_Mesh: {fileID: 3572507922611461713, guid: c4d23e1208d91484c948684da1e09cce, type: 3}
--- !u!23 &3621050871186841336
MeshRenderer:
m_ObjectHideFlags: 0
Expand All @@ -249,7 +249,7 @@ MeshRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5223262861450433750}
m_Enabled: 1
m_CastShadows: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ GameObject:
m_Component:
- component: {fileID: 8833760637642068360}
- component: {fileID: 2081909342595332650}
- component: {fileID: 6169465375034151149}
- component: {fileID: 3298710121668139635}
- component: {fileID: 3258417366846669140}
- component: {fileID: 7727612398117917681}
Expand Down Expand Up @@ -220,23 +219,6 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &6169465375034151149
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5533951594911835035}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 135ecf6db6e77e945ac1a661c0831cd5, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 0
_addedNetworkObject: {fileID: 3258417366846669140}
_networkObjectCache: {fileID: 3258417366846669140}
Locked: 0
permissionToUnlock: {fileID: 11400000, guid: 921240e0c27686d4eaf2ff761944c5eb, type: 2}
--- !u!114 &3298710121668139635
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -294,7 +276,7 @@ MonoBehaviour:
<IsNested>k__BackingField: 0
<ComponentIndex>k__BackingField: 0
_networkBehaviours:
- {fileID: 6169465375034151149}
- {fileID: 0}
- {fileID: 3298710121668139635}
<ParentNetworkObject>k__BackingField: {fileID: 0}
<ChildNetworkObjects>k__BackingField: []
Expand Down
Loading

0 comments on commit 3d8647a

Please sign in to comment.