diff --git a/Assets/01.Scenes/99.Tycoon41.unity b/Assets/01.Scenes/99.Tycoon41.unity index 5e66cc0d2..9b8fc5395 100644 --- a/Assets/01.Scenes/99.Tycoon41.unity +++ b/Assets/01.Scenes/99.Tycoon41.unity @@ -5077,7 +5077,7 @@ Transform: m_GameObject: {fileID: 545850347} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 11.74, y: 25.711504, z: -35.34178} + m_LocalPosition: {x: -9.2, y: 18.705118, z: -26.991896} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5171,7 +5171,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 886251e9a18ece04ea8e61686c173e1b, type: 3} m_Name: m_EditorClassIdentifier: - CameraDistance: 40 + CameraDistance: 29.1 DeadZoneDepth: 0 Composition: ScreenPosition: {x: 0, y: 0} @@ -6717,7 +6717,7 @@ MonoBehaviour: m_EditorClassIdentifier: Priority: Enabled: 1 - m_Value: 2 + m_Value: 0 OutputChannel: 1 StandbyUpdate: 2 m_StreamingVersion: 20230301 @@ -7816,9 +7816,9 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 300 - field of view: 60 - orthographic: 1 - orthographic size: 50 + field of view: 30 + orthographic: 0 + orthographic size: 15.39 m_Depth: 1 m_CullingMask: serializedVersion: 2 @@ -7842,8 +7842,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873223985} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 300, y: 0, z: -10} + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: -9.2, y: 18.705118, z: -26.991896} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -19988,9 +19988,13 @@ PrefabInstance: propertyPath: m_Name value: TycoonPlayer objectReference: {fileID: 0} + - target: {fileID: 2768568390039878737, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x - value: 11.74 + value: -9.2 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab index b0ddfded2..f1062f5a7 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab @@ -15,7 +15,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3761582068579457947 Transform: m_ObjectHideFlags: 0 @@ -103,8 +103,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6890449309489634406} - - {fileID: 4249680526890324545} - - {fileID: 2723336856557495468} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &228391631632049680 @@ -164,7 +162,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4218287217843781513 Transform: m_ObjectHideFlags: 0 @@ -197,7 +195,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3685666716780329301 Transform: m_ObjectHideFlags: 0 @@ -242,9 +240,9 @@ Transform: m_GameObject: {fileID: 806534525030859642} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -5, y: 0, z: -1.31} - m_LocalScale: {x: 7.4367, y: 6.1862903, z: 3.71835} - m_ConstrainProportionsScale: 0 + m_LocalPosition: {x: -9.01, y: 0, z: -1.25} + m_LocalScale: {x: 5.5216007, y: 6.1862903, z: 3.71835} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 4374501888181262139} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} @@ -385,7 +383,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6051159417414277454} - - {fileID: 2217706067516797671} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1209340447500098857 @@ -414,7 +411,7 @@ Transform: m_GameObject: {fileID: 1209340447500098857} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -7.16, y: -13.495887, z: 10.63} + m_LocalPosition: {x: -8.52, y: -13.495887, z: 10.63} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -643,7 +640,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -20.25, y: -0, z: -1} - m_LocalScale: {x: 15, y: 28.25, z: 1} + m_LocalScale: {x: 15, y: 22.27682, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8218453808976519578} @@ -718,7 +715,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &625538338881475774 Transform: m_ObjectHideFlags: 0 @@ -840,7 +837,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4068649883988211428 Transform: m_ObjectHideFlags: 0 @@ -874,7 +871,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6188623789039685238 Transform: m_ObjectHideFlags: 0 @@ -924,93 +921,6 @@ Transform: - {fileID: 7906693004392999617} m_Father: {fileID: 2700294535905665279} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3918016113627323715 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4918534656771323673} - - component: {fileID: 3670220714206135312} - m_Layer: 0 - m_Name: BlockLine - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4918534656771323673 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3918016113627323715} - serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -5.17, y: -0, z: -11.57} - m_LocalScale: {x: 15, y: 13.25, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8218453808976519578} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!212 &3670220714206135312 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3918016113627323715} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &4053257104853021878 GameObject: m_ObjectHideFlags: 0 @@ -1038,7 +948,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -20.4, y: 0, z: -11.31} - m_LocalScale: {x: 15, y: 21.82707, z: 1} + m_LocalScale: {x: 15, y: 22.582287, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8218453808976519578} @@ -1292,7 +1202,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2653731595491371991 Transform: m_ObjectHideFlags: 0 @@ -1660,7 +1570,7 @@ Transform: m_GameObject: {fileID: 6167379985984560553} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -7.32, y: 0, z: -1.42} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1668,6 +1578,7 @@ Transform: - {fileID: 5683503415639918258} - {fileID: 7517107198582341405} - {fileID: 6205356118384669691} + - {fileID: 9219827482834055853} m_Father: {fileID: 1402113424960589398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6602221549203288876 @@ -1807,7 +1718,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4918534656771323673} - {fileID: 340290249118331972} - {fileID: 531294077404143236} - {fileID: 3944723234071144117} @@ -1949,7 +1859,7 @@ Transform: m_GameObject: {fileID: 7296203630985359826} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 9.69, y: -0, z: -11.42} + m_LocalPosition: {x: 1.94, y: -0, z: -11.42} m_LocalScale: {x: 15, y: 20.300024, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2025,7 +1935,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4777049926120389234 Transform: m_ObjectHideFlags: 0 @@ -2209,7 +2119,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -20.25, y: -0, z: 8.93} - m_LocalScale: {x: 15, y: 40.5, z: 1} + m_LocalScale: {x: 15, y: 22.33008, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8218453808976519578} @@ -2958,68 +2868,6 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 5208870527646795580, guid: 7b7db0ecd011126468c97c4ca74270d1, type: 3} m_PrefabInstance: {fileID: 1168966408690609472} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1188169479254458416 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7219412584754126181} - m_Modifications: - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalPosition.x - value: 7.26 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalPosition.z - value: 2.67 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6075426784951483330, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_Name - value: Barrel (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 56f291167a33ba3439141926db46c4a6, type: 3} ---- !u!4 &2217706067516797671 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - m_PrefabInstance: {fileID: 1188169479254458416} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1285214752534804129 PrefabInstance: m_ObjectHideFlags: 0 @@ -3546,6 +3394,10 @@ PrefabInstance: propertyPath: m_Name value: KitchenKnife objectReference: {fileID: 0} + - target: {fileID: 1289740829694047075, guid: c928e68200dd5ac4090671cbba2ed322, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5408174685234625142, guid: c928e68200dd5ac4090671cbba2ed322, type: 3} propertyPath: m_LocalPosition.x value: 0.41012555 @@ -3748,9 +3600,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1402113424960589398} m_Modifications: + - target: {fileID: 809828747251277026, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 109afa56f22782a4baef8705031c807a, type: 3} propertyPath: m_LocalPosition.x - value: 9.94 + value: -6.5600004 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 109afa56f22782a4baef8705031c807a, type: 3} propertyPath: m_LocalPosition.y @@ -3816,6 +3680,10 @@ PrefabInstance: propertyPath: m_Name value: BeverageMachine objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3962,68 +3830,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7686860294138350331, guid: c625f910e02ef344c8b7071d43ed0e8c, type: 3} m_PrefabInstance: {fileID: 3112673737608038983} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3130241720435594875 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 486796670898722635} - m_Modifications: - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalPosition.x - value: -18.043 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalPosition.z - value: 4.3 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6075426784951483330, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_Name - value: Rum (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} ---- !u!4 &2723336856557495468 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - m_PrefabInstance: {fileID: 3130241720435594875} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3223456272433789393 PrefabInstance: m_ObjectHideFlags: 0 @@ -4032,9 +3838,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1402113424960589398} m_Modifications: + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.x - value: -1.309 + value: -7.099 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.y @@ -4160,68 +3978,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} m_PrefabInstance: {fileID: 3578289723384366598} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3765576498426945686 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 486796670898722635} - m_Modifications: - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalPosition.x - value: -17.318 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalPosition.z - value: 4.607 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6075426784951483330, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - propertyPath: m_Name - value: Rum (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} ---- !u!4 &4249680526890324545 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} - m_PrefabInstance: {fileID: 3765576498426945686} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4210278958342568409 PrefabInstance: m_ObjectHideFlags: 0 @@ -4606,19 +4362,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: -2.71 + value: -4.6099997 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.y @@ -4882,7 +4638,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.x - value: -18.374 + value: -19.16 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.y @@ -4890,7 +4646,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.z - value: 4.7009997 + value: -3.25 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalRotation.w @@ -5060,6 +4816,10 @@ PrefabInstance: propertyPath: m_Name value: PowerSwitch objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: c9a0d1b04962a6c419e9b2e2e3b73901, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8857736056138880520, guid: c9a0d1b04962a6c419e9b2e2e3b73901, type: 3} propertyPath: m_Enabled value: 0 @@ -5166,19 +4926,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalScale.x - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalScale.y - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalScale.z - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalPosition.x - value: 2.75 + value: -3.04 objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalPosition.y @@ -5236,19 +4996,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalScale.x - value: 5 + value: 3 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalScale.y - value: 5 + value: 3 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalScale.z - value: 5 + value: 3 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalPosition.x - value: 8.56 + value: -0.61 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalPosition.y @@ -5372,19 +5132,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: 0.31999993 + value: -1.2300003 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.y @@ -5444,9 +5204,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7219412584754126181} m_Modifications: + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.x - value: 6.83 + value: -9.67 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.y @@ -5508,19 +5280,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: -2.71 + value: -4.61 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.y @@ -5669,19 +5441,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: 0.32 + value: -1.23 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.y @@ -5885,6 +5657,10 @@ PrefabInstance: propertyPath: m_Name value: 99EXXXX objectReference: {fileID: 0} + - target: {fileID: 3229364190588727142, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} propertyPath: m_LocalPosition.x value: -1.86 @@ -6149,6 +5925,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 7686860294138350331, guid: c625f910e02ef344c8b7071d43ed0e8c, type: 3} m_PrefabInstance: {fileID: 8124482328605545903} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8416804165228621391 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.x + value: -2.95 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.z + value: -7.14 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_Name + value: CustomerTable3 (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} +--- !u!4 &9219827482834055853 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + m_PrefabInstance: {fileID: 8416804165228621391} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8459888864537640777 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab index 2b4ec38d6..de7bcb031 100644 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab @@ -67,6 +67,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5610572193944832828} m_Modifications: + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.x value: -0.641 @@ -133,6 +145,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5610572193944832828} m_Modifications: + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.x value: 0.61 @@ -199,6 +223,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5610572193944832828} m_Modifications: + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.x value: 0.285 @@ -265,6 +301,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5610572193944832828} m_Modifications: + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -331,6 +379,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5610572193944832828} m_Modifications: + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.x value: -0.862 @@ -397,6 +457,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5610572193944832828} m_Modifications: + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.x value: 0