forked from RE-SS3D/SS3D
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into Audio-System
- Loading branch information
Showing
75 changed files
with
2,610 additions
and
146 deletions.
There are no files selected for viewing
Binary file not shown.
111 changes: 111 additions & 0 deletions
111
Assets/Art/Models/Furniture/Generic/Seats/DinerBooth.fbx.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
17 changes: 0 additions & 17 deletions
17
Assets/Content/Data/TileMap/Resources/Entities/EngiBorg.asset
This file was deleted.
Oops, something went wrong.
22 changes: 22 additions & 0 deletions
22
Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/DinnerBooth.asset
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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: DinnerBooth | ||
| m_EditorClassIdentifier: | ||
| nameString: DinnerBooth | ||
| prefab: {fileID: 8085678556641831659, guid: 85fa4c9b76b4b23458dcf24a745a1dfe, type: 3} | ||
| icon: {fileID: 0} | ||
| layer: 7 | ||
| genericType: 5 | ||
| specificType: 0 | ||
| width: 1 | ||
| height: 1 |
2 changes: 1 addition & 1 deletion
2
...ap/Resources/Entities/EngiBorg.asset.meta → ...ture/Generic/Seats/DinnerBooth.asset.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
157 changes: 157 additions & 0 deletions
157
Assets/Content/WorldObjects/Furniture/Generic/Seats/DinnerBooth.prefab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!1 &8085678556641831659 | ||
| GameObject: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| serializedVersion: 6 | ||
| m_Component: | ||
| - component: {fileID: 1750478436839435592} | ||
| - component: {fileID: 7418334817260183665} | ||
| - component: {fileID: 1740478804813226977} | ||
| - component: {fileID: 7950383285113202337} | ||
| - component: {fileID: 8031370004641457100} | ||
| - component: {fileID: -8047018632482240439} | ||
| m_Layer: 0 | ||
| m_Name: DinnerBooth | ||
| m_TagString: Untagged | ||
| m_Icon: {fileID: 0} | ||
| m_NavMeshLayer: 0 | ||
| m_StaticEditorFlags: 0 | ||
| m_IsActive: 1 | ||
| --- !u!4 &1750478436839435592 | ||
| Transform: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8085678556641831659} | ||
| m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| m_LocalPosition: {x: 9.950995, y: 0.52496845, z: 0.5001033} | ||
| m_LocalScale: {x: 1, y: 1, z: 1} | ||
| m_ConstrainProportionsScale: 0 | ||
| m_Children: [] | ||
| m_Father: {fileID: 0} | ||
| m_RootOrder: 0 | ||
| m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
| --- !u!33 &7418334817260183665 | ||
| MeshFilter: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8085678556641831659} | ||
| m_Mesh: {fileID: 559316708432223863, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| --- !u!23 &1740478804813226977 | ||
| MeshRenderer: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8085678556641831659} | ||
| m_Enabled: 1 | ||
| m_CastShadows: 0 | ||
| 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: 2100000, guid: 695c4de41b9578049a93f19b1eef7213, 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 | ||
| m_AdditionalVertexStreams: {fileID: 0} | ||
| --- !u!114 &7950383285113202337 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8085678556641831659} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: 479fbe67c0de04b449f924bc5462ede3, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| _componentIndexCache: 0 | ||
| _addedNetworkObject: {fileID: 8031370004641457100} | ||
| _networkObjectCache: {fileID: 8031370004641457100} | ||
| AdjacencyResolver: | ||
| o: {fileID: 559316708432223863, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| uLeft: {fileID: -8315600635035084004, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| uRight: {fileID: -8218306467633424491, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| i: {fileID: -2434755278463371002, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| lIn: {fileID: -8550456321050019914, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| lOut: {fileID: -819412828331094011, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| --- !u!114 &8031370004641457100 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8085678556641831659} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| <IsNested>k__BackingField: 0 | ||
| <ComponentIndex>k__BackingField: 0 | ||
| <PredictedSpawn>k__BackingField: {fileID: 0} | ||
| _networkBehaviours: | ||
| - {fileID: 7950383285113202337} | ||
| <ParentNetworkObject>k__BackingField: {fileID: 0} | ||
| <ChildNetworkObjects>k__BackingField: [] | ||
| SerializedTransformProperties: | ||
| Position: {x: 9.950995, y: 0.52496845, z: 0.5001033} | ||
| Rotation: {x: 0, y: 0, z: 0, w: 1} | ||
| LocalScale: {x: 1, y: 1, z: 1} | ||
| _isNetworked: 1 | ||
| _isGlobal: 0 | ||
| _initializeOrder: 0 | ||
| _defaultDespawnType: 0 | ||
| NetworkObserver: {fileID: 0} | ||
| <PrefabId>k__BackingField: 0 | ||
| <SpawnableCollectionId>k__BackingField: 0 | ||
| _scenePathHash: 0 | ||
| <SceneId>k__BackingField: 0 | ||
| <AssetPathHash>k__BackingField: 3148903556074791268 | ||
| --- !u!64 &-8047018632482240439 | ||
| MeshCollider: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8085678556641831659} | ||
| m_Material: {fileID: 0} | ||
| m_IsTrigger: 0 | ||
| m_Enabled: 1 | ||
| serializedVersion: 4 | ||
| m_Convex: 0 | ||
| m_CookingOptions: 30 | ||
| m_Mesh: {fileID: 559316708432223863, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} |
7 changes: 7 additions & 0 deletions
7
Assets/Content/WorldObjects/Furniture/Generic/Seats/DinnerBooth.prefab.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.