diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 125a0e104..1f26cbe8a 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -3425,7 +3425,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24.15 + m_fontSize: 27.3 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -7211,7 +7211,7 @@ Transform: m_GameObject: {fileID: 545850347} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 1.06, y: 7.4278765, z: -17.090446} + m_LocalPosition: {x: 1.4, y: 7.427876, z: -17.380447} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8922,134 +8922,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &733323112 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 733323113} - - component: {fileID: 733323115} - - component: {fileID: 733323114} - m_Layer: 0 - m_Name: BackgroundUiCamera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &733323113 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 733323112} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 873223992} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &733323114 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 733323112} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 1 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - m_Quality: 3 - m_FrameInfluence: 0.1 - m_JitterScale: 1 - m_MipBias: 0 - m_VarianceClampScale: 0.9 - m_ContrastAdaptiveSharpening: 0 ---- !u!20 &733323115 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 733323112} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 4 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.01 - far clip plane: 300 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 524288 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &744781104 GameObject: m_ObjectHideFlags: 0 @@ -9406,7 +9278,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 41.4 + m_fontSize: 46.85 m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -10017,7 +9889,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34.5 + m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -10284,7 +10156,6 @@ MonoBehaviour: m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 m_Cameras: - - {fileID: 733323115} - {fileID: 1985878519} - {fileID: 1355183327} m_RendererIndex: -1 @@ -10390,11 +10261,10 @@ Transform: m_GameObject: {fileID: 873223985} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0.50000006, y: 8.188489, z: -15.430697} + m_LocalPosition: {x: 0.50000006, y: 8.188489, z: -17.370697} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 733323113} - {fileID: 1355183324} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 9.569, y: 87.98, z: 0} @@ -10420,6 +10290,7 @@ MonoBehaviour: _confinerCollider: {fileID: 1589932376} _transparencySortAxis: {x: 0, y: 0, z: 0} _cameraDistance: {x: 5, y: 10} + _initializedDistance: 7 _zoomPower: 0.5 _zoomLerpSpeed: 5 _zoomOutConfinerScale: {x: 1, y: 1, z: 0} @@ -10436,6 +10307,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dec61aec08a92c54282e06819b88a31c, type: 3} m_Name: m_EditorClassIdentifier: + _cameras: + - {fileID: 873223991} + - {fileID: 1355183327} + - {fileID: 1985878519} _canvasRectTransforms: - {fileID: 1861226431} - {fileID: 532586500} @@ -10632,11 +10507,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15c02fef22ba8d0488bd2517167c117c, type: 3} ---- !u!4 &883069349 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1150836517969909917, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - m_PrefabInstance: {fileID: 1336734153} - m_PrefabAsset: {fileID: 0} --- !u!1 &887608711 GameObject: m_ObjectHideFlags: 0 @@ -11866,7 +11736,7 @@ MonoBehaviour: _spawnTransform: {fileID: 970735072} _spawnLocation: {fileID: 218784750} _pushDirection: {x: -3, y: -1, z: 0} - _pushPower: 50 + _pushPower: 5 _pouringSfxName: Pouring _succeedMakingCocktailSfxName: SucceedMakingCocktail _failedMakingCocktailSfxName: FailedMakingCocktail @@ -19095,7 +18965,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34.5 + m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -20015,7 +19885,7 @@ Transform: m_GameObject: {fileID: 1589932375} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0, y: 8.38, z: -15.27} + m_LocalPosition: {x: 0, y: 8.38, z: -17.21} m_LocalScale: {x: 1, y: 1, z: 0} m_ConstrainProportionsScale: 0 m_Children: [] @@ -20179,7 +20049,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34.5 + m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -21582,7 +21452,6 @@ MonoBehaviour: - {fileID: 113068682} - {fileID: 1540696676} - {fileID: 1062518307} - - {fileID: 883069349} - {fileID: 195540918} - {fileID: 1909132787} k__BackingField: [] @@ -22232,7 +22101,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34.5 + m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -22319,7 +22188,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 90, y: -50} - m_SizeDelta: {x: 99.37, y: 60} + m_SizeDelta: {x: 100.44, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1728335879 MonoBehaviour: @@ -22457,7 +22326,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1920, y: 1080} + m_SizeDelta: {x: 1080, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1730992468 MonoBehaviour: @@ -22509,7 +22378,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 733323115} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -22744,7 +22613,7 @@ MonoBehaviour: m_EditorClassIdentifier: version: 1073741824 data: - dataString: UEsDBBQAAAgIAABIIewzg0WLvAIAAPkFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5wWFUmjZ2y7Qdg9tUemqh00PTjwhFo4d+aNAK/77jh1DApUiJZp5M/PmzUy+CJemhtwqfa85e1QMyM8e8d/kR691PsCOrpVc8U84Yt44s6UH0YB5oZYrtA99mFEVWM3zX3ItPDhBo5O8ULpasDXMlLEGzQUVBtCllfXREk1fPbKLAfv4/vTv3gG/cpAW9HdUPxkMI7A/HdwGrJO5oFUNzHNuQ4bTwThGjQfjgJTYUAQ1eXIlBDeRD7H7OvQ7o7Vx2A0CGKfYX2Di8SXwdWlD+Lgb/lwUBmzkqel+zjUK1eQlv1WjXkXNpqH3QYXzlUa314FXk/bxm3/SuAutqodj5WHia9iS55sXus+psR15u+b5OXUnt1RsaCbgrQT5pO61cpKh02rnQ52Bq3kn1am3WQn5psU1XC+Mrv4+qmE70EPofreyUD+0Cl631r8GzEqoIH9M6T3RMvUpQePw/mA/YX9MLIRWzxHjX+m6u2jRcce1seiKfKLVY5c4IWAgc4i69z1AenqZctrnIovA1Yvh7ExpCcEcCdYgqbD7JWa0lytw4evwuvDcUX9zkV30HU/pIiSYW3ySXLiWansatsb1NWGnj1//3v0QTKm2j2DKZ2cFlx21veMJBZ4pKZvN7Yp5DFs5XdC8E2ZhZ52GObU0VEM6uGCsG4pahgjphPC7HBoIjLAB/7x7fUuKdUUwkyclw+2dvQP9tePs/EJIQm/olGXF+GqYTW5us/4oG0GWwyhLJgwm0yEJJ8Qlyk3FstErqoTbJdteJJ6Lz/gCxlKnqQyTZ5pu7/lnpTqT57JQq1wDyOcmw6lZ0FgEfzBswTi2uQJruQx7Sb5SIlS+AZaeEqVB2MXOapq2WVJS8w9lvSUls/AfTIk3ny4SV/eDw9YXP0sGAkcH7JULqGjtXcmBHP4DUEsDBBQAAAgIAABIIez9o8lSawAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz1DPUUVBKL0osyCgGCoA5pZkpIHa0kkGieaJlSlKaqZFhkpm5RZKucZJxalJyqnGSgVlKqpmloVIsUH1JZUGqX2JuKkRPQGJJRlpmXkpmXrqee1FmijvIaKXYWgBQSwECLQAUAAAICAAASCHsM4NFi7wCAAD5BQAACwAkAAAAAAAAAAAAAAAAAAAAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAASCHs/aPJUmsAAAB3AAAACQAkAAAAAAAAAAAAAAAJAwAAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsFBgAAAAACAAIAuAAAAL8DAAAAAA== + dataString: UEsDBBQAAAgIAABIIexHw7YYvAIAAPoFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5wUlpdCyt12g7R7aotJVD5senHhCLIwd+aNAK/77jh1DApUiJZp5M/PmzUy+CJemhsIqfa85e1QMyM8e8d/kR691PsCOrpRc8k84Yt44s5UH0YB5oZYrtKc+zKgNWM2LX3IlPDhBo5O8VHozZyuYKmMNmksqDKBLK+ujJZq+emQXA/bx/enfvQN+FSAt6O+ofjJII7CfJoPbAHayEHRTA/Ok25h0MhjFsJvBKCAldhRBTaJCCcFNJETsvg4NT2ltHLaDAMYpNhioeHwFfFXZED7qhj+XpQEbiWq6n3GNSjV5yW/VyLehZt3Q+6DC+UrD2+vAq0n7+M0/btylVpuHY+U08TVsxYv1C90X1NiOvl3z7Jy6k1sq1jQX8FaBfFL3WjnJ0Gm186HOwNWsk+rU27SCYt3iGq4XRld/n1XaTvQQut8tLdQPrYLXrfWvAbMUKsgfU3pPtEx8StA4vD/YT1ggEwuh1XPE+Fe66m5adNxxbSy6Ip9o9dgFTggYyAKi7n0PkJ5erpz2ucg8cPViODtVWkIwR4I1SCrsfoEZ7eUKXPg6vC48d9QfXWQXfcdbuggJ5hafJBeuhdqehq1xfU3Y6ePXv3c/BFOp7SOY6tlZwWVHbe94QoGnSspmc7tiHsOWTpe06IRZ2FmnYUYtDdWQDi4Y64ailiFCOiH8LocGAiNswD/vXt+KYl0RzORJyXB7Z+9Af+U4O78QktAbOmF5ObpK8/HNbd4f5kPICxjmyZjBeJKScEJcotxULBq9okq4XbLtReK5+IwvYCx1msoweabp9p5/blRn8lyWalloAPncZDg1CxqL4A+GzRnHNpdgLZdhL8lXRoQq1sCyU6IsCDvfWU2zNktGav6hrLdkZBp+hBnx5tNF4up+cNj64mfJQODogL1yARtae1dyIIf/UEsDBBQAAAgIAABIIeyfkg7JbAAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz0jPVUVBKL0osyCgGChiCOKWZKSB2tJJBonmiZUpSmqmRYZKZuUWSrnGScWpScqpxkoFZSqqZpaFSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEgh7EfDthi8AgAA+gUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7J+SDslsAAAAdwAAAAkAJAAAAAAAAAAAAAAACQMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADAAwAAAAA= file_cachedStartup: {fileID: 0} cacheStartup: 0 showNavGraphs: 1 @@ -25574,7 +25443,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 209.37, y: 0} + m_SizeDelta: {x: 210.44, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1983229440 MonoBehaviour: @@ -28278,7 +28147,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x - value: 1.06 + value: 1.4 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.y @@ -28286,7 +28155,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.z - value: -9.43 + value: -9.72 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/02.Scripts/AspectRatioController.cs b/Assets/02.Scripts/AspectRatioController.cs index bbeb04ec3..a1b93a1a8 100644 --- a/Assets/02.Scripts/AspectRatioController.cs +++ b/Assets/02.Scripts/AspectRatioController.cs @@ -5,6 +5,9 @@ namespace BlueWater { public class AspectRatioController : MonoBehaviour { + [SerializeField] + private List _cameras = new(); + [SerializeField] private List _canvasRectTransforms = new(); @@ -33,23 +36,25 @@ namespace BlueWater private void SetCamera() { - Camera mainCamera = Camera.main; - Rect cameraRect = mainCamera.rect; - float scaleHeight = GetScaleHeight(); - float scaleWidth = 1f / scaleHeight; - - if (scaleHeight < 1f) + foreach (var element in _cameras) { - cameraRect.height = scaleHeight; - cameraRect.y = (1f - scaleHeight) / 2f; - } - else - { - cameraRect.width = scaleWidth; - cameraRect.x = (1f - scaleWidth) / 2f; - } + Rect cameraRect = element.rect; + float scaleHeight = GetScaleHeight(); + float scaleWidth = 1f / scaleHeight; - mainCamera.rect = cameraRect; + if (scaleHeight < 1f) + { + cameraRect.height = scaleHeight; + cameraRect.y = (1f - scaleHeight) / 2f; + } + else + { + cameraRect.width = scaleWidth; + cameraRect.x = (1f - scaleWidth) / 2f; + } + + element.rect = cameraRect; + } } private void AdjustUI() diff --git a/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs b/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs index 7835a0b72..bc5534326 100644 --- a/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs @@ -1,6 +1,7 @@ using System; using BlueWater.Utility; using UnityEngine; +using UnityEngine.Serialization; namespace BlueWater.Tycoons { @@ -28,6 +29,9 @@ namespace BlueWater.Tycoons public class GarnishBarrel : Barrel { + [SerializeField] + private SpriteRenderer _signImage; + [SerializeField] private GarnishType _garnishType; @@ -37,6 +41,7 @@ namespace BlueWater.Tycoons { base.Start(); + _signImage.sprite = IsActivated ? LiquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock; SpineController.PlayAnimation(GarnishBarrelSpineAnimation.InactiveIdle, true); } @@ -124,6 +129,8 @@ namespace BlueWater.Tycoons public override void Activate() { base.Activate(); + + _signImage.sprite = IsActivated ? LiquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock; _currentLevel = GetCurrentLevel(); IdleAnimation(); diff --git a/Assets/02.Scripts/SceneController.cs b/Assets/02.Scripts/SceneController.cs index 9d3343c59..622f48600 100644 --- a/Assets/02.Scripts/SceneController.cs +++ b/Assets/02.Scripts/SceneController.cs @@ -89,15 +89,21 @@ namespace BlueWater asyncOperation.allowSceneActivation = true; await Task.Delay((int)(_loadingWaitTime * 1000)); - _fadeOut.Restart(); _loadingPanelFadeOut.Restart(); - Task[] fadeOutTasks = - { - _fadeOut.AsyncWaitForCompletion(), - _loadingPanelFadeOut.AsyncWaitForCompletion() - }; + await _loadingPanelFadeOut.AsyncWaitForCompletion(); + + _fadeOut.Restart(); + await _fadeOut.AsyncWaitForCompletion(); + + // _fadeOut.Restart(); + // _loadingPanelFadeOut.Restart(); + // Task[] fadeOutTasks = + // { + // _fadeOut.AsyncWaitForCompletion(), + // _loadingPanelFadeOut.AsyncWaitForCompletion() + // }; - await Task.WhenAll(fadeOutTasks); + //await Task.WhenAll(fadeOutTasks); PopupUiController.ClearPopup(); VisualFeedbackManager.Instance.ResetTimeScale(); diff --git a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset index ba6b3f2e5..d359ca74d 100644 --- a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset @@ -465,7 +465,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 24 k__BackingField: 5 - k__BackingField: + k__BackingField: Upgrade7 k__BackingField: 1 k__BackingField: 5000 - k__BackingField: 36 @@ -530,7 +530,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 20 k__BackingField: 4 - k__BackingField: Upgrade7 + k__BackingField: k__BackingField: 1 k__BackingField: 6000 - k__BackingField: 41 @@ -595,7 +595,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 16 k__BackingField: 3 - k__BackingField: Upgrade8 + k__BackingField: k__BackingField: 1 k__BackingField: 7000 - k__BackingField: 46 diff --git a/Assets/02.Scripts/Tycoon/CrewController.cs b/Assets/02.Scripts/Tycoon/CrewController.cs index 8761d866f..6c596e1ee 100644 --- a/Assets/02.Scripts/Tycoon/CrewController.cs +++ b/Assets/02.Scripts/Tycoon/CrewController.cs @@ -32,7 +32,7 @@ namespace BlueWater.Tycoons private Transform _servingCrewSpawnTransform; [SerializeField] - private List _bartenderCrewSpawnTransforms; + private List _bartenderCrewSpawnTransforms = new(5); [field: Title("실시간 데이터")] [field: SerializeField] @@ -87,11 +87,14 @@ namespace BlueWater.Tycoons public BartenderCrew CreateBartenderCrew() { - var currentBartenderCount = BartenderCrews.Count; - var newCrew = Instantiate(_bartenderCrewPrefab, _bartenderCrewSpawnTransforms[currentBartenderCount].position, _bartenderCrewPrefab.transform.rotation); + int randomIndex = Random.Range(0, _bartenderCrewSpawnTransforms.Count); + Transform spawnTransform = _bartenderCrewSpawnTransforms[randomIndex]; + _bartenderCrewSpawnTransforms.Remove(spawnTransform); + + var newCrew = Instantiate(_bartenderCrewPrefab, spawnTransform.position, _bartenderCrewPrefab.transform.rotation); Utils.RegisterList(BartenderCrews, newCrew); Utils.RegisterList(Crews, newCrew); - newCrew.SetBartenderTable(_bartenderCrewSpawnTransforms[currentBartenderCount].GetComponentInParent()); + newCrew.SetBartenderTable(spawnTransform.GetComponentInParent()); newCrew.Initialize(); EventManager.InvokeUpdateCrewUi(BartenderCrews.Count, ServerCrews.Count, CleanerCrews.Count); diff --git a/Assets/02.Scripts/Tycoon/Garnish.cs b/Assets/02.Scripts/Tycoon/Garnish.cs index 8bd5f7390..15a1555fa 100644 --- a/Assets/02.Scripts/Tycoon/Garnish.cs +++ b/Assets/02.Scripts/Tycoon/Garnish.cs @@ -10,12 +10,12 @@ namespace BlueWater.Tycoons private IObjectPool _managedPool; - public void Initialize(Vector3 spawnPosition, Quaternion rotation, Collider2D targetCollider, Vector3 pushForce, Color color) + public void Initialize(Vector3 spawnPosition, Quaternion rotation, Collider2D targetCollider, Vector3 pushForce, Sprite sprite) { transform.position = spawnPosition; transform.rotation = rotation; TargetCollider = targetCollider; - SpriteRenderer.color = color; + SpriteRenderer.sprite = sprite; Rigidbody2D.linearVelocity = Vector2.zero; CanInteraction = true; diff --git a/Assets/02.Scripts/Tycoon/LiquidController.cs b/Assets/02.Scripts/Tycoon/LiquidController.cs index 1f74b37cf..369998f4a 100644 --- a/Assets/02.Scripts/Tycoon/LiquidController.cs +++ b/Assets/02.Scripts/Tycoon/LiquidController.cs @@ -267,8 +267,7 @@ namespace BlueWater private void OnGetLiquidObject(Liquid liquid) { _instanceLiquidCount++; - var liquidColor = _currentBarrel.GetLiquidData().Color; - liquid.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, liquidColor); + liquid.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, _currentBarrel.GetLiquidData().Color); _activeLiquidDatas.Add(liquid); } @@ -295,8 +294,7 @@ namespace BlueWater private void OnGetGarnishObject(Garnish garnish) { _instanceLiquidCount++; - var liquidColor = _currentBarrel.GetLiquidData().Color; - garnish.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, liquidColor); + garnish.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, _currentBarrel.GetLiquidData().Sprite); _activeGarnishDatas.Add(garnish); } diff --git a/Assets/02.Scripts/Tycoon/TycoonCardController.cs b/Assets/02.Scripts/Tycoon/TycoonCardController.cs index 92854856c..56764509f 100644 --- a/Assets/02.Scripts/Tycoon/TycoonCardController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonCardController.cs @@ -102,10 +102,10 @@ namespace BlueWater.Tycoons _tycoonStatus.PlayerMoveSpeedMultiplier += 0.1f; break; case "ExpBoost": - _tycoonStatus.ExpMultiplier += 0.2f; + _tycoonStatus.ExpMultiplier += 0.1f; break; case "GoldBoost": - _tycoonStatus.GoldMultiplier += 0.2f; + _tycoonStatus.GoldMultiplier += 0.1f; break; case "AllCleanUp": EventManager.InvokeCleaningAll(); @@ -117,7 +117,7 @@ namespace BlueWater.Tycoons _tycoonStatus.PlayerDashCooldownReduction += 1; break; case "TipBoost": - _tycoonStatus.TipMultiplier += 0.2f; + _tycoonStatus.TipMultiplier += 0.1f; break; case "EndGoldBoost": _tycoonStatus.EndGoldMultiplier += 0.1f; @@ -133,7 +133,7 @@ namespace BlueWater.Tycoons { EventManager.InvokeAutoSupplyBarrels(); } - _tycoonStatus.BarrelAutoIncrease += 2; + _tycoonStatus.BarrelAutoIncrease += 1; break; case "ServerNpcUpgrade": _tycoonStatus.ServerTipMultiplier += 0.1f; diff --git a/Assets/02.Scripts/Tycoon/TycoonStatus.cs b/Assets/02.Scripts/Tycoon/TycoonStatus.cs index 017888087..3b673374d 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStatus.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStatus.cs @@ -373,6 +373,9 @@ namespace BlueWater.Tycoons tycoonManager.CustomerTableController.ShowCustomerTable(6); tycoonManager.TycoonIngredientController.GarnishBarrel2.Activate(); break; + case "Upgrade7": + tycoonManager.CustomerTableController.ShowCustomerTable(7); + break; } } diff --git a/Assets/02.Scripts/TycoonCameraManager.cs b/Assets/02.Scripts/TycoonCameraManager.cs index 1b7a00d13..51449a63e 100644 --- a/Assets/02.Scripts/TycoonCameraManager.cs +++ b/Assets/02.Scripts/TycoonCameraManager.cs @@ -4,7 +4,6 @@ using Sirenix.OdinInspector; using Unity.Cinemachine; using UnityEngine; using UnityEngine.InputSystem; -using UnityEngine.Serialization; namespace BlueWater { @@ -48,6 +47,9 @@ namespace BlueWater [SerializeField] private Vector2 _cameraDistance = new(5f, 10f); + [SerializeField] + private float _initializedDistance = 7f; + [SerializeField, Range(0.01f, 1f)] private float _zoomPower = 0.5f; @@ -93,8 +95,9 @@ namespace BlueWater _zoomOutAction.performed += OnZoomChanged; _zoomInAction.canceled += OnZoomChanged; _zoomOutAction.canceled += OnZoomChanged; - - _targetCameraDistance = _baseCameraComposer.CameraDistance; + + _targetCameraDistance = _initializedDistance; + _baseCameraComposer.CameraDistance = _initializedDistance; } private void LateUpdate() diff --git a/Assets/02.Scripts/Ui/Tycoon/ManualCocktailButton.cs b/Assets/02.Scripts/Ui/Tycoon/ManualCocktailButton.cs index 42955500b..076b4a460 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ManualCocktailButton.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ManualCocktailButton.cs @@ -5,17 +5,26 @@ using UnityEngine.UI; namespace BlueWater.Uis { - public class ManualCocktailButton : MonoBehaviour, ISelectHandler + public class ManualCocktailButton : MonoBehaviour, ISelectHandler, IDeselectHandler { + [field: SerializeField] + public Button Button { get; private set; } + [field: SerializeField] public Image Image { get; private set; } [field: SerializeField] - public Button Button { get; private set; } + public Image SelectedImage { get; private set; } private Action _onSelectedAction; - private ManualBook _manual; // 다른 스크립트가 붙은 오브젝트를 참조 (에디터에서 설정 가능) - + + private void Start() + { + if (EventSystem.current.currentSelectedGameObject == gameObject) return; + + SelectedImage.enabled = false; + } + private void OnDestroy() { _onSelectedAction = null; @@ -23,9 +32,15 @@ namespace BlueWater.Uis public void OnSelect(BaseEventData eventData) { + SelectedImage.enabled = true; _onSelectedAction?.Invoke(this); } + public void OnDeselect(BaseEventData eventData) + { + SelectedImage.enabled = false; + } + public void SetImage(Sprite sprite) => Image.sprite = sprite; public void AddSelectedAction(Action selectedAction) diff --git a/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs b/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs index d7c98725e..14cc1d9bf 100644 --- a/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs @@ -62,6 +62,8 @@ namespace BlueWater.Uis _ => liqueurImage.sprite }; + liqueurImage.enabled = int.Parse(currentLevelData.Idx) != 35; + StartCoroutine(StartUpgradePopupCoroutine(currentLevelData)); } diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png index 67a139559..fc88c48ba 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png index 85c7b5110..0ac2c40a1 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png index 96ff1af9b..45638cc76 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png index 943ce801f..03cfbf0c7 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png index 5937bbe5c..2699c49da 100644 Binary files a/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png and b/Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png differ diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number8.png b/Assets/03.Images/Tycoons/TableNumbers/Number8.png new file mode 100644 index 000000000..9a6bee7fd Binary files /dev/null and b/Assets/03.Images/Tycoons/TableNumbers/Number8.png differ diff --git a/Assets/03.Images/Tycoons/TableNumbers/Number8.png.meta b/Assets/03.Images/Tycoons/TableNumbers/Number8.png.meta new file mode 100644 index 000000000..40c9ba74c --- /dev/null +++ b/Assets/03.Images/Tycoons/TableNumbers/Number8.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 2e59433fdfb8d904193a78578799fe50 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 256 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/SelectedButton.png b/Assets/03.Images/Ui/SelectedButton.png new file mode 100644 index 000000000..f756ac7e8 Binary files /dev/null and b/Assets/03.Images/Ui/SelectedButton.png differ diff --git a/Assets/03.Images/Ui/SelectedButton.png.meta b/Assets/03.Images/Ui/SelectedButton.png.meta new file mode 100644 index 000000000..ecb946e2b --- /dev/null +++ b/Assets/03.Images/Ui/SelectedButton.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: ee589fb376657c8409ee578a30295ce4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/GarnishObject.prefab b/Assets/05.Prefabs/GarnishObject.prefab index ac18f70e4..a6f25be3d 100644 --- a/Assets/05.Prefabs/GarnishObject.prefab +++ b/Assets/05.Prefabs/GarnishObject.prefab @@ -79,7 +79,7 @@ SpriteRenderer: m_SortingLayerID: -403788685 m_SortingLayer: 1 m_SortingOrder: 12 - m_Sprite: {fileID: 21300000, guid: c6fd44c44ec0c504c9d09e9c3e421708, type: 3} + m_Sprite: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -124,8 +124,8 @@ CircleCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_Radius: 0.1 + m_Offset: {x: 0, y: 0.5} + m_Radius: 0.15 --- !u!50 &3470010340248184897 Rigidbody2D: serializedVersion: 5 @@ -138,11 +138,11 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 10 + m_Mass: 1 m_LinearDamping: 0 m_AngularDamping: 0 m_GravityScale: 6 - m_Material: {fileID: 6200000, guid: 98be3277bd162b947a951461d0862c30, type: 2} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 diff --git a/Assets/05.Prefabs/LiquidObject.prefab b/Assets/05.Prefabs/LiquidObject.prefab index 78e68b77d..4e659317c 100644 --- a/Assets/05.Prefabs/LiquidObject.prefab +++ b/Assets/05.Prefabs/LiquidObject.prefab @@ -138,7 +138,7 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 10 + m_Mass: 1 m_LinearDamping: 0 m_AngularDamping: 0 m_GravityScale: 6 @@ -168,3 +168,4 @@ MonoBehaviour: SpriteRenderer: {fileID: 3772201455671009312} Rigidbody2D: {fileID: 3470010340248184897} _distanceThreshold: 0.5 + _autoDestroyTime: 2 diff --git a/Assets/05.Prefabs/Managers/SceneController.prefab b/Assets/05.Prefabs/Managers/SceneController.prefab index 542a2a2f2..a7d7332d1 100644 --- a/Assets/05.Prefabs/Managers/SceneController.prefab +++ b/Assets/05.Prefabs/Managers/SceneController.prefab @@ -180,7 +180,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 diff --git a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab index 23b2a55db..6a086b486 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab @@ -204,7 +204,7 @@ Transform: m_GameObject: {fileID: 806534525030859642} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0.5, y: 0, z: -9.2} + m_LocalPosition: {x: 0.5, y: 0, z: -9.9} m_LocalScale: {x: 1.5000001, y: 1.5000001, z: 1.5000001} m_ConstrainProportionsScale: 1 m_Children: [] @@ -259,7 +259,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 - m_Size: {x: 12, y: 4.6} + m_Size: {x: 12, y: 6} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -284,7 +284,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 12, y: 4.6, z: 0.20000005} + m_Size: {x: 12, y: 6, z: 0.20000005} m_Center: {x: 0, y: 0, z: 0.1} --- !u!1 &833462480456262630 GameObject: @@ -432,7 +432,7 @@ Transform: m_GameObject: {fileID: 867242612611201267} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.2, y: 0, z: -12.3} + m_LocalPosition: {x: 4.2, y: 0, z: -14.157} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -553,7 +553,7 @@ Transform: m_GameObject: {fileID: 1374224201695919457} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -13.654} + m_LocalPosition: {x: 0, y: 0, z: -15.33} m_LocalScale: {x: 20, y: 20, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1381,7 +1381,7 @@ Transform: m_GameObject: {fileID: 3574788125460926962} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 9.5, y: 0.02, z: -12.525} + m_LocalPosition: {x: 9.5, y: 0.02, z: -14.28} m_LocalScale: {x: 8, y: 18, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1474,6 +1474,9 @@ Transform: - {fileID: 1884538194477235979} - {fileID: 3184709087590945661} - {fileID: 15063307170712282} + - {fileID: 7934584519629395654} + - {fileID: 9103619715228063648} + - {fileID: 439588947673517340} - {fileID: 7588144410252115732} - {fileID: 7199668351690860011} - {fileID: 1504273964312338762} @@ -1514,7 +1517,6 @@ Transform: - {fileID: 8215217592705991455} - {fileID: 4720396809056904249} - {fileID: 3046327071067763815} - - {fileID: 8957809684606458930} - {fileID: 1699537259008859303} - {fileID: 4514038873713163783} m_Father: {fileID: 1402113424960589398} @@ -1842,7 +1844,7 @@ Transform: m_GameObject: {fileID: 4429176273173160133} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} - m_LocalPosition: {x: -8.2300005, y: 1.224, z: -12.655} + m_LocalPosition: {x: -8.2300005, y: 1.224, z: -14.326} m_LocalScale: {x: 8, y: 18, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2342,7 +2344,7 @@ Transform: m_GameObject: {fileID: 5395843532474874433} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -9.15, y: 2.99, z: -13.78} + m_LocalPosition: {x: -9.15, y: 2.99, z: -16.74} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2703,7 +2705,7 @@ Transform: m_GameObject: {fileID: 5517982228828518161} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -10.534079, y: -11.51, z: 16.126} + m_LocalPosition: {x: -10.534079, y: -11.51, z: 14.460099} m_LocalScale: {x: 3.0270743, y: 1.4890996, z: 1.4890996} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2948,7 +2950,7 @@ Transform: m_GameObject: {fileID: 5787249065842187424} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} - m_LocalPosition: {x: -8, y: 0.032, z: -12.5} + m_LocalPosition: {x: -8, y: 0.032, z: -14.2} m_LocalScale: {x: 8, y: 17.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3362,7 +3364,7 @@ Transform: m_GameObject: {fileID: 6149458588773273519} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -8.1, y: 0.02, z: -12.504} + m_LocalPosition: {x: -8.1, y: 0.02, z: -14.28} m_LocalScale: {x: 8, y: 18, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3459,6 +3461,7 @@ Transform: - {fileID: 8315382596739698807} - {fileID: 6469486675253099335} - {fileID: 3958622835900991993} + - {fileID: 3608626553558940079} m_Father: {fileID: 1402113424960589398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6561218302089288419 @@ -3897,6 +3900,8 @@ Transform: - {fileID: 7680135709204807122} - {fileID: 5428005388665326353} - {fileID: 8358914661500279496} + - {fileID: 696494929667380382} + - {fileID: 8016072737559426839} - {fileID: 78551889992244127} - {fileID: 4901768809126662981} - {fileID: 726512946242113663} @@ -4253,7 +4258,7 @@ Transform: m_GameObject: {fileID: 7016509031281172236} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -10.534079, y: -12.882196, z: 16.1259} + m_LocalPosition: {x: -10.534079, y: -12.882196, z: 14.46} m_LocalScale: {x: 3.0270743, y: 1.4890996, z: 1.4890996} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4374,7 +4379,7 @@ Transform: m_GameObject: {fileID: 7275254627196952520} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 15.500001, y: -0.0000003039837, z: -6.6499996} + m_LocalPosition: {x: 15.500001, y: -0.0000003039837, z: -7.35} m_LocalScale: {x: 1.5000001, y: 1.5000001, z: 1.5000001} m_ConstrainProportionsScale: 1 m_Children: [] @@ -4429,7 +4434,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 - m_Size: {x: 8, y: 8} + m_Size: {x: 8, y: 9.4} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -4454,7 +4459,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 8, y: 8, z: 0.20000005} + m_Size: {x: 8, y: 9.4, z: 0.20000005} m_Center: {x: 0, y: 0, z: 0.1} --- !u!1 &7284433069509439501 GameObject: @@ -4869,8 +4874,11 @@ Transform: - {fileID: 2455954377325744780} - {fileID: 3609482425278322695} - {fileID: 3177565744668460228} + - {fileID: 1520256586777912410} - {fileID: 2414486782411523370} + - {fileID: 2249372822816885132} - {fileID: 3257286541736357490} + - {fileID: 6892543249209373078} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7671313022360079293 @@ -5096,7 +5104,6 @@ GameObject: m_Component: - component: {fileID: 6336830780491525739} - component: {fileID: 1159815963323569174} - - component: {fileID: 1299893904132244610} m_Layer: 7 m_Name: SpriteWall2 m_TagString: Untagged @@ -5113,7 +5120,7 @@ Transform: m_GameObject: {fileID: 7878113179815356644} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} - m_LocalPosition: {x: -8.25, y: 0.675, z: -3.3389988} + m_LocalPosition: {x: -8.25, y: 0.675, z: -5.06} m_LocalScale: {x: 1.5000001, y: 1.5000001, z: 1.5000001} m_ConstrainProportionsScale: 1 m_Children: [] @@ -5174,27 +5181,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!65 &1299893904132244610 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7878113179815356644} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 14, y: 15.7, z: 0.20000005} - m_Center: {x: 0, y: 0, z: 0.1} --- !u!1 &8105190190815360951 GameObject: m_ObjectHideFlags: 0 @@ -5718,7 +5704,7 @@ Transform: m_GameObject: {fileID: 8854654418663393334} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.756, y: 0, z: -6.2} + m_LocalPosition: {x: 9.42, y: 0, z: -6.2} m_LocalScale: {x: 4, y: 1, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5899,7 +5885,7 @@ Transform: m_GameObject: {fileID: 9097385722952236996} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.71, y: 14.232195, z: -19.532372} + m_LocalPosition: {x: 0.71, y: 14.232195, z: -21.198273} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -6548,6 +6534,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 469339270411033614} m_PrefabAsset: {fileID: 0} +--- !u!1001 &509351241840731721 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7840828557760237144} + m_Modifications: + - target: {fileID: 528369701346911359, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalPosition.x + value: 10.99 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalPosition.y + value: -14.342195 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalPosition.z + value: 6.71 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_Name + value: Barrel01 (57) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} +--- !u!4 &696494929667380382 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + m_PrefabInstance: {fileID: 509351241840731721} + m_PrefabAsset: {fileID: 0} --- !u!1001 &575623548738411704 PrefabInstance: m_ObjectHideFlags: 0 @@ -6634,7 +6686,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5927803667513949971, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.x - value: 0.17 + value: 0.3 objectReference: {fileID: 0} - target: {fileID: 6817574259189873408, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_Sprite @@ -6650,6 +6702,93 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} m_PrefabInstance: {fileID: 575623548738411704} m_PrefabAsset: {fileID: 0} +--- !u!1001 &622162924248104907 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6949237465215798611} + m_Modifications: + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.x + value: -0.178 + objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.z + value: -0.046 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.x + value: 15.05 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.z + value: -13.25 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1519019258008198363, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_SpriteSortPoint + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Name + value: LongTableBar (11) + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1519019258008198363, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} +--- !u!4 &439588947673517340 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + m_PrefabInstance: {fileID: 622162924248104907} + m_PrefabAsset: {fileID: 0} --- !u!1001 &643692214518992977 PrefabInstance: m_ObjectHideFlags: 0 @@ -6761,6 +6900,10 @@ PrefabInstance: propertyPath: m_Size.x value: 3 objectReference: {fileID: 0} + - target: {fileID: 2152858845316769879, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_Size.x value: 3 @@ -6848,6 +6991,10 @@ PrefabInstance: propertyPath: m_Size.x value: 3 objectReference: {fileID: 0} + - target: {fileID: 2152858845316769879, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_Size.x value: 3 @@ -7022,11 +7169,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: b65dd40588cdc9f4a99bb99c878ca5ee, type: 3} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: -1 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -10.5 + value: -11 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7620,6 +7767,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 1259222572328833493} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1264533589657549659 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9100781300246522471} + m_Modifications: + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.x + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.y + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.z + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalPosition.x + value: -3.2189994 + 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: -11.3220005 + 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 (10) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 56f291167a33ba3439141926db46c4a6, type: 3} +--- !u!4 &2249372822816885132 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + m_PrefabInstance: {fileID: 1264533589657549659} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1485307938930544092 PrefabInstance: m_ObjectHideFlags: 0 @@ -7632,6 +7853,26 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9848078 + objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.x + value: 0.17364816 + objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_LocalPosition.x value: -2.4 @@ -7642,7 +7883,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_LocalPosition.z - value: -12.65 + value: -14.4 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_LocalRotation.w @@ -7672,10 +7913,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1519019258008198363, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_Size.x value: 3.9 objectReference: {fileID: 0} + - target: {fileID: 2152858845316769879, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3.9 + objectReference: {fileID: 0} - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_Size.x value: 3.9 @@ -7911,6 +8160,10 @@ PrefabInstance: propertyPath: m_Size.x value: 3 objectReference: {fileID: 0} + - target: {fileID: 2152858845316769879, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_Size.x value: 3 @@ -8021,6 +8274,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 1935416965558377052} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1991417301695796877 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9100781300246522471} + m_Modifications: + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.x + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.y + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.z + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalPosition.x + value: -3.57 + 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: -11.14 + 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 (9) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 56f291167a33ba3439141926db46c4a6, type: 3} +--- !u!4 &1520256586777912410 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + m_PrefabInstance: {fileID: 1991417301695796877} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2014178616186210549 PrefabInstance: m_ObjectHideFlags: 0 @@ -8149,7 +8476,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} propertyPath: m_Name - value: BartenderTable02 (4) + value: BartenderTable02 (3) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -8253,11 +8580,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 5c4eb3dc818df94479ff187bc42e326b, type: 3} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: 7.8 + value: 7.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -10.5 + value: -11 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8489,27 +8816,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalScale.x - value: 0.38128 + value: 0.24999999 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalScale.y - value: 0.38128003 + value: 0.24999999 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalScale.z - value: 0.38128003 + value: 0.24999999 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.x - value: -7.748889 + value: -7.723 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.y - value: 0.37500095 + value: 0.234 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.z - value: -6.514002 + value: -6.673 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalRotation.w @@ -8628,6 +8955,22 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9848078 + objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.x + value: 0.17364816 + objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_LocalPosition.x value: 11 @@ -8638,7 +8981,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_LocalPosition.z - value: -12.65 + value: -14.4 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_LocalRotation.w @@ -8668,10 +9011,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1519019258008198363, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_Size.x value: 4.2 objectReference: {fileID: 0} + - target: {fileID: 2152858845316769879, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 4.2 + objectReference: {fileID: 0} - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_Size.x value: 4.2 @@ -8704,19 +9055,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalScale.x - value: 0.90398 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalScale.y - value: 0.90398 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalScale.z - value: 0.90398 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.x - value: 5.161 + value: 4.991 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.y @@ -8724,7 +9075,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.z - value: -9.248 + value: -11.003 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalRotation.w @@ -8778,19 +9129,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalScale.x - value: 0.90398 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalScale.y - value: 0.90398 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalScale.z - value: 0.90398 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.x - value: 5.17 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.y @@ -8798,7 +9149,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.z - value: -9.696 + value: -11.32 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalRotation.w @@ -9430,7 +9781,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.x - value: 6 + value: 7.021 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.y @@ -9494,6 +9845,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1031605920973182729} m_Modifications: + - target: {fileID: 528369701346911359, guid: b3ebd96a054999f449bad045e6334acb, type: 3} + propertyPath: m_LocalPosition.z + value: -0.292 + objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: b3ebd96a054999f449bad045e6334acb, type: 3} propertyPath: m_LocalPosition.x value: 12.63 @@ -9916,19 +10271,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalScale.x - value: 0.90398 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalScale.y - value: 0.90398 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalScale.z - value: 0.90398 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.x - value: 5.671 + value: 5.342 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.y @@ -9936,7 +10291,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.z - value: -9.478001 + value: -11.185 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalRotation.w @@ -10209,7 +10564,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.z - value: -7.9 + value: -8.2 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalRotation.w @@ -10518,7 +10873,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} propertyPath: m_Name - value: BartenderTable02 (5) + value: BartenderTable02 (4) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -10744,6 +11099,60 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} m_PrefabInstance: {fileID: 4107890935217180184} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4118960014346151245 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 354575985089928609, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 2e59433fdfb8d904193a78578799fe50, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.x + value: -5.5 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.z + value: -13.5 + 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 (7) + objectReference: {fileID: 0} + - target: {fileID: 9182593229863186613, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: _tableNumber + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 9182593229863186613, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: _carpetObject + value: + objectReference: {fileID: 5201607581264057475} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} +--- !u!4 &3608626553558940079 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + m_PrefabInstance: {fileID: 4118960014346151245} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4372031069168839376 PrefabInstance: m_ObjectHideFlags: 0 @@ -10985,11 +11394,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 174c8a230ccfc2043ab9b5137298a192, type: 3} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: -3 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -12 + value: -13.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11511,7 +11920,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.z - value: -7.9 + value: -8.2 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalRotation.w @@ -12591,6 +13000,10 @@ PrefabInstance: propertyPath: m_Size.x value: 3 objectReference: {fileID: 0} + - target: {fileID: 2152858845316769879, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_Size.x value: 3 @@ -12763,6 +13176,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} m_PrefabInstance: {fileID: 5836542928189845586} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5844790106914374465 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9100781300246522471} + m_Modifications: + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.x + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.y + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalScale.z + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_LocalPosition.x + value: -3.5609994 + 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: -11.457 + 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 (11) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 56f291167a33ba3439141926db46c4a6, type: 3} +--- !u!4 &6892543249209373078 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + m_PrefabInstance: {fileID: 5844790106914374465} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5938849513838622013 PrefabInstance: m_ObjectHideFlags: 0 @@ -12979,11 +13466,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 078ce8d0847afe74393a6137ba2afeb2, type: 3} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: -5 + value: -4.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -10.5 + value: -11 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13091,27 +13578,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalScale.x - value: 0.38128 + value: 0.24999999 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalScale.y - value: 0.38128003 + value: 0.24999999 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalScale.z - value: 0.38128003 + value: 0.24999999 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.x - value: -7.4858885 + value: -7.506 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.y - value: 0.3730011 + value: 0.23200014 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.z - value: -6.7280016 + value: -6.8869996 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalRotation.w @@ -13238,7 +13725,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5927803667513949971, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.x - value: 0.17 + value: 0.3 objectReference: {fileID: 0} - target: {fileID: 6817574259189873408, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_Sprite @@ -13400,11 +13887,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: 3 + value: 3.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -10.5 + value: -11 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13652,11 +14139,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 20291345993905b44944786d63ee52f7, type: 3} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: 1 + value: 2.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -12 + value: -13.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13988,6 +14475,93 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 6934448979949371676} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6964439310761174033 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6949237465215798611} + m_Modifications: + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.x + value: -0.178 + objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.z + value: -0.046 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.x + value: 15.05 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.z + value: -11.4 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1519019258008198363, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_SpriteSortPoint + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Name + value: LongTableBar (9) + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1519019258008198363, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} +--- !u!4 &7934584519629395654 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + m_PrefabInstance: {fileID: 6964439310761174033} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6997171527821239918 PrefabInstance: m_ObjectHideFlags: 0 @@ -14068,7 +14642,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.z - value: -7.9 + value: -8.2 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalRotation.w @@ -14112,6 +14686,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} m_PrefabInstance: {fileID: 7004458989155631108} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7027068546569029056 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7840828557760237144} + m_Modifications: + - target: {fileID: 528369701346911359, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalPosition.x + value: 12.98 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalPosition.y + value: -14.342195 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalPosition.z + value: 7.47 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + propertyPath: m_Name + value: Barrel01 (59) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} +--- !u!4 &8016072737559426839 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} + m_PrefabInstance: {fileID: 7027068546569029056} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7091674533196051391 PrefabInstance: m_ObjectHideFlags: 0 @@ -14192,7 +14832,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: b3ebd96a054999f449bad045e6334acb, type: 3} propertyPath: m_LocalPosition.z - value: -15.15 + value: -16.72 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: b3ebd96a054999f449bad045e6334acb, type: 3} propertyPath: m_LocalRotation.w @@ -14246,27 +14886,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalScale.x - value: 0.38128 + value: 0.24999999 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalScale.y - value: 0.38128003 + value: 0.24999999 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalScale.z - value: 0.38128003 + value: 0.24999999 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.x - value: -7.6178885 + value: -7.613 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.y - value: 0.3730011 + value: 0.23200014 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.z - value: -6.2630014 + value: -6.4219995 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalRotation.w @@ -14441,6 +15081,10 @@ PrefabInstance: propertyPath: m_Size.x value: 3 objectReference: {fileID: 0} + - target: {fileID: 2152858845316769879, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_Size.x value: 3 @@ -14549,7 +15193,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 9e5375e8c94af9f49a9661227294f024, type: 3} propertyPath: m_LocalPosition.x - value: 2.9500003 + value: 2.893 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 9e5375e8c94af9f49a9661227294f024, type: 3} propertyPath: m_LocalPosition.y @@ -14557,7 +15201,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 9e5375e8c94af9f49a9661227294f024, type: 3} propertyPath: m_LocalPosition.z - value: -11.95 + value: -13.971 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 9e5375e8c94af9f49a9661227294f024, type: 3} propertyPath: m_LocalRotation.w @@ -14927,6 +15571,10 @@ PrefabInstance: propertyPath: m_Size.x value: 3 objectReference: {fileID: 0} + - target: {fileID: 2152858845316769879, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} propertyPath: m_Size.x value: 3 @@ -15025,6 +15673,93 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} m_PrefabInstance: {fileID: 8021190882530232665} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8137278670157129079 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6949237465215798611} + m_Modifications: + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.x + value: -0.178 + objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 528369701346911359, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.z + value: -0.046 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.x + value: 15.05 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalPosition.z + value: -12.33 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1519019258008198363, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5899354841691025914, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_SpriteSortPoint + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + propertyPath: m_Name + value: LongTableBar (10) + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1519019258008198363, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} +--- !u!4 &9103619715228063648 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} + m_PrefabInstance: {fileID: 8137278670157129079} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8194048684285091157 PrefabInstance: m_ObjectHideFlags: 0 @@ -15117,7 +15852,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.z - value: -7.9 + value: -8.2 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalRotation.w @@ -15394,7 +16129,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} propertyPath: m_LocalPosition.z - value: -12.39 + value: -14 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} propertyPath: m_LocalRotation.w @@ -15485,68 +16220,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7686860294138350331, guid: c625f910e02ef344c8b7071d43ed0e8c, type: 3} m_PrefabInstance: {fileID: 8512506406752906641} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8605708765100654800 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 8480552838860958414} - m_Modifications: - - target: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - propertyPath: m_LocalPosition.x - value: 6.9 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - propertyPath: m_LocalPosition.z - value: -7.2 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - propertyPath: m_Name - value: BartenderTable02 (3) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} ---- !u!4 &8957809684606458930 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} - m_PrefabInstance: {fileID: 8605708765100654800} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8672589958834113685 PrefabInstance: m_ObjectHideFlags: 0 @@ -15561,11 +16234,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: e559443096a97744eab174b24d76661d, type: 3} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: 6 + value: 6.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -12 + value: -13.5 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab index 85d601850..7631ff260 100644 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab @@ -80,6 +80,14 @@ PrefabInstance: propertyPath: m_Size.x value: 0.8 objectReference: {fileID: 0} + - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Size.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Center.z + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Sprite value: diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab index a73a36147..21f9b2b89 100644 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab @@ -84,6 +84,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Size.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Center.z + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Sprite value: diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/LongTableBar.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/LongTableBar.prefab index df4c3de55..79b1900ba 100644 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/LongTableBar.prefab +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/LongTableBar.prefab @@ -30,15 +30,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalRotation.w - value: 0.9659258 + value: 0.9396927 objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalRotation.x - value: 0.2588191 + value: 0.3420201 objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 30 + value: 40 objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_ConstrainProportionsScale @@ -88,6 +88,10 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 9c91c2a8c472b7442b3b35a3352da1ca, type: 3} + - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_DrawMode + value: 2 + objectReference: {fileID: 0} - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_WasSpriteAssigned value: 1 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab index 1bb899ebf..88514fba4 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab @@ -1,5 +1,180 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &53315982314087943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3774544468100080203} + - component: {fileID: 7568071763441364114} + m_Layer: 8 + m_Name: GarnishImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3774544468100080203 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 53315982314087943} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.01, y: 0.22, z: -0} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8876145828805270831} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7568071763441364114 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 53315982314087943} + 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: 4 + m_Sprite: {fileID: 21300000, guid: 1506abfb2ff26fa4aacdeb4b0efc9663, 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 &2950790416231040701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8876145828805270831} + - component: {fileID: 5638515703643889331} + m_Layer: 8 + m_Name: GarnishImageBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8876145828805270831 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2950790416231040701} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.4, y: 0, z: 0} + m_LocalScale: {x: -0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3774544468100080203} + m_Father: {fileID: 203741387490724426} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5638515703643889331 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2950790416231040701} + 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: 3 + m_Sprite: {fileID: 21300000, guid: d2ba40b4f14eca14e816e51ee69cf81a, 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!1001 &7343451337687172630 PrefabInstance: m_ObjectHideFlags: 0 @@ -8,18 +183,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.z - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 40 @@ -216,7 +379,10 @@ PrefabInstance: - {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_RemovedGameObjects: - {fileID: 8884531212319162473, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 8876145828805270831} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 @@ -237,6 +403,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 183186261584935481} m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!4 &203741387490724426 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} --- !u!1 &672328621937310823 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} @@ -378,6 +549,8 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 + _signImage: {fileID: 7568071763441364114} + _garnishType: 0 --- !u!114 &3688680572007923171 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab index 5b1598ab5..8f406c33f 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab @@ -113,7 +113,7 @@ Transform: m_GameObject: {fileID: 5773649549535946419} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.508, y: 0, z: 0} + m_LocalPosition: {x: -0.5, y: 0, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -357,18 +357,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.z - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 40 @@ -415,11 +403,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: d98551edcbd98e542af000fc7aaaf794, type: 3} - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x - value: -0.17 + value: -0.3 objectReference: {fileID: 0} - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive @@ -674,7 +662,7 @@ MonoBehaviour: physicsMovementRelativeTo: {fileID: 0} updateTiming: 1 unscaledTime: 0 - _animationName: IdleNormal + _animationName: Empty loop: 0 timeScale: 1 --- !u!33 &183186261584935481 @@ -708,7 +696,7 @@ MonoBehaviour: k__BackingField: {fileID: 0} k__BackingField: {fileID: 1653087204473300138} k__BackingField: 1 - k__BackingField: 0.8 + k__BackingField: 1 k__BackingField: IsOpened: 0 SpineController: {fileID: 3688680572007923171} @@ -726,8 +714,6 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 _liquidImage: {fileID: 6817574259189873408} - _fill: {fileID: 7052380446467937511} - _colorIntensity: 2 k__BackingField: 0 _playerHoldingTime: 3 --- !u!114 &3688680572007923171 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab index 2f75df1d2..b1eed7b78 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab @@ -68,7 +68,7 @@ MonoBehaviour: m_text: 1000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2} - m_sharedMaterial: {fileID: 1072195877514824051, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2} + m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -286,15 +286,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/SlimeGarnish.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/SlimeGarnish.prefab index 3c97df7ca..9e4eea13b 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/SlimeGarnish.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/SlimeGarnish.prefab @@ -1,5 +1,180 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2284906308842303576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8893665596850653755} + - component: {fileID: 7499315364276866109} + m_Layer: 8 + m_Name: GarnishImageBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8893665596850653755 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2284906308842303576} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.5, y: 0, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3094450970644478020} + m_Father: {fileID: 203741387490724426} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7499315364276866109 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2284906308842303576} + 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: 3 + m_Sprite: {fileID: 21300000, guid: d2ba40b4f14eca14e816e51ee69cf81a, 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 &2595489033786271151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3094450970644478020} + - component: {fileID: 5482427695418099457} + m_Layer: 8 + m_Name: GarnishImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3094450970644478020 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2595489033786271151} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.01, y: 0.22, z: -0} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8893665596850653755} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5482427695418099457 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2595489033786271151} + 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: 4 + m_Sprite: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, 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!1001 &7343451337687172630 PrefabInstance: m_ObjectHideFlags: 0 @@ -8,18 +183,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.z - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 40 @@ -192,7 +355,10 @@ PrefabInstance: - {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_RemovedGameObjects: - {fileID: 8884531212319162473, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 8893665596850653755} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 @@ -213,6 +379,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 183186261584935481} m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!4 &203741387490724426 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} --- !u!1 &672328621937310823 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} @@ -354,6 +525,8 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 + _signImage: {fileID: 5482427695418099457} + _garnishType: 0 --- !u!114 &3688680572007923171 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab index 677946721..e7bbd6cb4 100644 --- a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab +++ b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab @@ -86,7 +86,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!114 &5028824454365225125 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Uis/Tycoons/ManualCocktailButton.prefab b/Assets/05.Prefabs/Uis/Tycoons/ManualCocktailButton.prefab index 153d7df26..9634e7ed2 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/ManualCocktailButton.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/ManualCocktailButton.prefab @@ -33,12 +33,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 423343075028179217} + - {fileID: 8010817879590752548} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 140, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &555777395799226202 CanvasRenderer: @@ -97,7 +98,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -109,7 +110,7 @@ MonoBehaviour: m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 21300000, guid: ee589fb376657c8409ee578a30295ce4, type: 3} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal @@ -118,7 +119,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 4734109970123610176} + m_TargetGraphic: {fileID: 2561490607785646214} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -134,8 +135,84 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b470f74ac4a54bb4fae06d22ecef1c0e, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: {fileID: 1754191685957469056}