From 13a7291a14ca743963f864d4ce7bac82e7007479 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Mon, 1 Sep 2025 13:36:35 +0900 Subject: [PATCH 01/11] =?UTF-8?q?=ED=94=8C=EB=A0=88=EC=9D=B4=EC=96=B4=20->?= =?UTF-8?q?=20=EC=BA=90=EB=A6=AD=ED=84=B0=20=EB=A0=88=EC=9D=B4=EC=96=B4=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD,=20=EC=9B=94=EB=93=9CUI=20=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=96=B4=20=EC=B6=94=EA=B0=80,=20=EC=9B=94=EB=93=9C=20UI=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Settings/PC_Renderer.asset | 4 +- .../Common/RestaurantOrder.prefab | 7 +- .../_Addressables/Materials/Restaurant.meta | 8 + .../Materials/Restaurant/Order.meta | 8 + .../Order/SpatialUi_SpriteBubble.mat | 368 ++++++++++++++++++ .../Order/SpatialUi_SpriteBubble.mat.meta | 8 + .../Materials/Restaurant/Order/bubble.png | 3 + .../Restaurant/Order/bubble.png.meta | 117 ++++++ .../_Addressables/Prefabs/CustomerNpc.prefab | 34 +- .../Prefabs/RestaurantNpc.prefab | 32 ++ .../Component/PropUiDisplayComponent.cs | 69 +++- .../Component/RestaurantUiDisplayComponent.cs | 22 ++ ProjectSettings/TagManager.asset | 4 +- 13 files changed, 666 insertions(+), 18 deletions(-) create mode 100644 Assets/_DDD/_Addressables/Materials/Restaurant.meta create mode 100644 Assets/_DDD/_Addressables/Materials/Restaurant/Order.meta create mode 100644 Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble.mat create mode 100644 Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble.mat.meta create mode 100644 Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png create mode 100644 Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png.meta diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index 36d385602..817b39bc3 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58e66ea6da44f2d670e8317b778ec45ec4f1e45b9db64a252486547af8db9726 -size 9717 +oid sha256:128038ec4bebf184e3e25685d6ba8b93d1185d041df5a4d32f55d434ae3c89f8 +size 10883 diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab index c6b9273d8..da054320c 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab @@ -197,7 +197,7 @@ MonoBehaviour: SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: - - {fileID: 2100000, guid: efc890589b4c46948885cd750384bc6f, type: 2} + - {fileID: 2100000, guid: cecea4c48dc174e34973ec5b33b2b2a9, type: 2} SerializedBytesString: Prefab: {fileID: 0} PrefabModificationsReferencedUnityObjects: [] @@ -241,7 +241,10 @@ MonoBehaviour: - Name: Entry: 8 Data: - _temporarySprite: {fileID: 21300000, guid: deef7d28045284f449ec0c47e1cbbcdc, type: 3} + _offset: {x: 0, y: 1.5, z: 1.35} + _rotation: {x: 40, y: 0, z: 0} + _temporarySprite: {fileID: 21300000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3} + _fixedSpriteSize: {x: 0.2, y: 0.2} --- !u!114 &1332098886975329103 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Addressables/Materials/Restaurant.meta b/Assets/_DDD/_Addressables/Materials/Restaurant.meta new file mode 100644 index 000000000..486796647 --- /dev/null +++ b/Assets/_DDD/_Addressables/Materials/Restaurant.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af3aa25466d5e442a84ae048b92da1ae +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Materials/Restaurant/Order.meta b/Assets/_DDD/_Addressables/Materials/Restaurant/Order.meta new file mode 100644 index 000000000..add52414f --- /dev/null +++ b/Assets/_DDD/_Addressables/Materials/Restaurant/Order.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c1edc9254d7f455b9d985b586d860b5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble.mat b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble.mat new file mode 100644 index 000000000..c81351ea7 --- /dev/null +++ b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble.mat @@ -0,0 +1,368 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SpatialUi_SpriteBubble + m_Shader: {fileID: 4800000, guid: 13c02b14c4d048fa9653293d54f6e0e1, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BackgroundTexture: + m_Texture: {fileID: 2800000, guid: f88e7478e74a14cb6a820978eb9f452f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorRampTex: + m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorRampTexGradient: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorSwapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeBurnTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _GlowTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineDistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OverlayTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShineMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpriteTexture: + m_Texture: {fileID: 2800000, guid: 7394cfdc5ad4642058b80a859c8a7319, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _AddPrecomputedVelocity: 0 + - _Alpha: 1 + - _AlphaClip: 0 + - _AlphaCutoffValue: 0.25 + - _AlphaOutlineBlend: 1 + - _AlphaOutlineGlow: 5 + - _AlphaOutlineMinAlpha: 0 + - _AlphaOutlinePower: 1 + - _AlphaRoundThreshold: 0.5 + - _AlphaToMask: 0 + - _BillboardY: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BlurHD: 0 + - _BlurIntensity: 10 + - _Brightness: 0 + - _BumpScale: 1 + - _ChromAberrAlpha: 0.4 + - _ChromAberrAmount: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _ClipUvDown: 0 + - _ClipUvLeft: 0 + - _ClipUvRight: 0 + - _ClipUvUp: 0 + - _ColorChangeLuminosity: 0 + - _ColorChangeTolerance: 0.25 + - _ColorChangeTolerance2: 0.25 + - _ColorChangeTolerance3: 0.25 + - _ColorMask: 15 + - _ColorRampBlend: 1 + - _ColorRampLuminosity: 0 + - _ColorRampOutline: 0 + - _ColorSwapBlend: 1 + - _ColorSwapBlueLuminosity: 0.5 + - _ColorSwapGreenLuminosity: 0.5 + - _ColorSwapRedLuminosity: 0.5 + - _Contrast: 1 + - _Cull: 2 + - _CullingOption: 0 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DistortAmount: 0.5 + - _DistortTexXSpeed: 5 + - _DistortTexYSpeed: 5 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EditorDrawers: 6 + - _EnableExternalAlpha: 0 + - _EnvironmentReflections: 1 + - _FadeAmount: -0.1 + - _FadeBurnGlow: 2 + - _FadeBurnTransition: 0.075 + - _FadeBurnWidth: 0.025 + - _FishEyeUvAmount: 0.35 + - _FlickerAlpha: 0 + - _FlickerFreq: 0.2 + - _FlickerPercent: 0.05 + - _GhostBlend: 1 + - _GhostColorBoost: 1 + - _GhostTransparency: 0 + - _GlitchAmount: 3 + - _GlitchSize: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Glow: 10 + - _GlowGlobal: 1 + - _GradBlend: 1 + - _GradBoostX: 1.2 + - _GradBoostY: 1.2 + - _GradIsRadial: 0 + - _GrassManualAnim: 1 + - _GrassManualToggle: 0 + - _GrassRadialBend: 0.1 + - _GrassSpeed: 2 + - _GrassWind: 20 + - _GreyscaleBlend: 1 + - _GreyscaleLuminosity: 0 + - _GreyscaleOutline: 0 + - _HandDrawnAmount: 10 + - _HandDrawnSpeed: 5 + - _HitEffectBlend: 1 + - _HitEffectGlow: 5 + - _HologramBlend: 1 + - _HologramMaxAlpha: 0.75 + - _HologramMinAlpha: 0.1 + - _HologramStripesAmount: 0.1 + - _HologramStripesSpeed: 4.5 + - _HologramUnmodAmount: 0 + - _HsvBright: 1 + - _HsvSaturation: 1 + - _HsvShift: 180 + - _InnerOutlineAlpha: 1 + - _InnerOutlineGlow: 4 + - _InnerOutlineThickness: 1 + - _MaxXUV: 1 + - _MaxYUV: 1 + - _Metallic: 0 + - _MinXUV: 0 + - _MinYUV: 0 + - _MotionBlurAngle: 0.1 + - _MotionBlurDist: 1.25 + - _MyDstMode: 10 + - _MySrcMode: 5 + - _NegativeAmount: 1 + - _OcclusionStrength: 1 + - _OffsetUvX: 0 + - _OffsetUvY: 0 + - _OnlyInnerOutline: 0 + - _OnlyOutline: 0 + - _OutlineAlpha: 1 + - _OutlineDistortAmount: 0.5 + - _OutlineDistortTexXSpeed: 5 + - _OutlineDistortTexYSpeed: 5 + - _OutlineGlow: 1.5 + - _OutlinePixelWidth: 1 + - _OutlineTexXSpeed: 10 + - _OutlineTexYSpeed: 0 + - _OutlineWidth: 0.004 + - _OverlayBlend: 1 + - _OverlayGlow: 1 + - _OverlayTextureScrollXSpeed: 0.25 + - _OverlayTextureScrollYSpeed: 0.25 + - _Parallax: 0.005 + - _PinchUvAmount: 0.35 + - _PixelateSize: 32 + - _PosterizeGamma: 0.75 + - _PosterizeNumColors: 8 + - _PosterizeOutline: 0 + - _QueueOffset: 0 + - _RadialClip: 45 + - _RadialClip2: 0 + - _RadialStartAngle: 90 + - _RandomSeed: 0 + - _ReceiveShadows: 1 + - _RectSize: 1 + - _RotateUvAmount: 0 + - _RoundWaveSpeed: 2 + - _RoundWaveStrength: 0.7 + - _ShadowAlpha: 0.5 + - _ShadowX: 0.1 + - _ShadowY: -0.05 + - _ShakeUvSpeed: 2.5 + - _ShakeUvX: 1.5 + - _ShakeUvY: 1 + - _ShineGlow: 1 + - _ShineLocation: 0.5 + - _ShineRotate: 0 + - _ShineWidth: 0.1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _Surface: 0 + - _TextureScrollXSpeed: 1 + - _TextureScrollYSpeed: 0 + - _TwistUvAmount: 1 + - _TwistUvPosX: 0.5 + - _TwistUvPosY: 0.5 + - _TwistUvRadius: 0.75 + - _WarpScale: 0.5 + - _WarpSpeed: 8 + - _WarpStrength: 0.025 + - _WaveAmount: 7 + - _WaveSpeed: 10 + - _WaveStrength: 7.5 + - _WaveX: 0 + - _WaveY: 0.5 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZTestMode: 4 + - _ZWrite: 1 + - _ZoomUvAmount: 0.5 + m_Colors: + - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1} + - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 1, g: 1, b: 1, a: 1} + - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1} + - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} + - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} + - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} + - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} + - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1} + - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1} + - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _OverlayColor: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} + - _ShineColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &5575994803489782819 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble.mat.meta b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble.mat.meta new file mode 100644 index 000000000..a82da59fd --- /dev/null +++ b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cecea4c48dc174e34973ec5b33b2b2a9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png new file mode 100644 index 000000000..20e5e813d --- /dev/null +++ b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5717b1f64428e89ba75c0be9c4ce16281be2c762b584922129d5a048501dd7d +size 3799 diff --git a/Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png.meta b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png.meta new file mode 100644 index 000000000..e7bbcd418 --- /dev/null +++ b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 94f9e78fc7b864b93842bdfa21276f09 +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 + 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/_DDD/_Addressables/Prefabs/CustomerNpc.prefab b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab index 5ee65ca4d..234795d0e 100644 --- a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab @@ -14,7 +14,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3540956906288785900, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_Layer - value: 0 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3854744934792897056, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_Data.m_UniqueID @@ -1672,6 +1672,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3983248675539552489, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + propertyPath: zSpacing + value: -0.0001 + objectReference: {fileID: 0} - target: {fileID: 3983248675539552489, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: initialSkinName value: Casper @@ -1680,10 +1684,22 @@ PrefabInstance: propertyPath: skeletonDataAsset value: objectReference: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} + - target: {fileID: 4246001044237372826, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4900607124439125211, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 5108021082109611361, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: _availableInteractions value: 2 objectReference: {fileID: 0} + - target: {fileID: 5523461449651244940, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 5654854357519457123, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: gravity.x value: NaN @@ -1708,6 +1724,14 @@ PrefabInstance: propertyPath: alwaysDrawGizmos value: 1 objectReference: {fileID: 0} + - target: {fileID: 6312111630636169229, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6336425934484470474, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6336425934484470474, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_Materials.Array.size value: 4 @@ -1728,6 +1752,10 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[3]' value: objectReference: {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2} + - target: {fileID: 6558328110360087691, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 6826437533270866908, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: externalBehavior value: @@ -1750,7 +1778,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_Layer - value: 16 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7545136660434259176, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_Constraints @@ -1762,7 +1790,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8155105186346135386, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_Layer - value: 0 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8165702938223525558, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: graphMask.value diff --git a/Assets/_DDD/_Addressables/Prefabs/RestaurantNpc.prefab b/Assets/_DDD/_Addressables/Prefabs/RestaurantNpc.prefab index 992df8657..f36c6d194 100644 --- a/Assets/_DDD/_Addressables/Prefabs/RestaurantNpc.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/RestaurantNpc.prefab @@ -12,6 +12,10 @@ PrefabInstance: propertyPath: _initialSkinName value: Casper objectReference: {fileID: 0} + - target: {fileID: 1549638263379651312, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_LocalScale.x value: 2 @@ -64,10 +68,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2182479135931305606, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_Name value: RestaurantNpc objectReference: {fileID: 0} + - target: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6791841979869644848, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7190839386876602598, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7741631174553725873, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8389753198886579169, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_Materials.Array.size value: 0 @@ -88,6 +116,10 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[3]' value: objectReference: {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2} + - target: {fileID: 8715759041625857895, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 127430239903465757, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} m_RemovedGameObjects: [] diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs index 81b715375..20651703d 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs @@ -7,10 +7,16 @@ namespace DDD.Restaurant { public abstract class PropUiDisplayComponent : SerializedMonoBehaviour where T : Enum { + [SerializeField] + protected Vector3 _offset = new Vector3(0.0f, 0.75f, 0.675f); + [SerializeField] + protected Vector3 _rotation = new Vector3(40.0f, 0, 0); private IInteractionSubsystemObject _interactionSubsystemObject; private Dictionary _materialDictionary; - private T _prevInteractionType; + private T _currentInteractionType; + protected IInteractable _interactable; protected SpriteRenderer _spriteRenderer; + protected Transform _spriteTransform; private void Awake() { Initialize(); @@ -20,8 +26,7 @@ private void Awake() protected virtual void Initialize() { - bool isInteractionSubsystem = gameObject.TryGetComponent(out _interactionSubsystemObject); - var interactable = GetComponent(); + bool isInteractionSubsystem = GetOwnerInteractable(out _interactable); if (!isInteractionSubsystem) { Debug.LogError($"Interaction Subsystem<{typeof(T)}> is not exist"); @@ -30,31 +35,77 @@ protected virtual void Initialize() // TODO: 임시 나중에 제대로 수정할 것 var uiGameObject = Instantiate(new GameObject("TemporaryUi"), transform); - uiGameObject.transform.position = interactable.GetInteractionPoints()[0] + Vector3.up * 2; + _spriteTransform = uiGameObject.transform; + uiGameObject.layer = LayerMask.NameToLayer("WorldUI"); + UpdateSpriteTransform(); + _spriteRenderer = uiGameObject.AddComponent(); _spriteRenderer.enabled = false; _materialDictionary = SetMaterialDictionary(); } + private void UpdateSpriteTransform() + { + _spriteTransform.position = GetDisplayPosition(); + _spriteTransform.rotation = Quaternion.Euler(GetDisplayRotation()); + } + + private bool GetOwnerInteractable(out IInteractable interactable) + { + bool isInteractionSubsystem = gameObject.TryGetComponent(out _interactionSubsystemObject); + interactable = GetComponent(); + return isInteractionSubsystem; + } + + protected virtual Vector3 GetDisplayPosition() + { + return transform.position + _offset; + } + + protected virtual Vector3 GetDisplayRotation() + { + return _rotation; + } + private void Update() { - T currentInteractionType = _interactionSubsystemObject.GetInteractionSubsystemType(); - if (EqualityComparer.Default.Equals(_prevInteractionType, currentInteractionType)) return; - _prevInteractionType = currentInteractionType; - UpdateView(_prevInteractionType); + T interactionType = _interactionSubsystemObject.GetInteractionSubsystemType(); + if (EqualityComparer.Default.Equals(_currentInteractionType, interactionType)) return; + SetCurrentInteractionType(interactionType); + UpdateView(GetCurrentInteractionType()); + } + + public T GetCurrentInteractionType() + { + return _currentInteractionType; + } + + public void SetCurrentInteractionType(T interactionType) + { + _currentInteractionType = interactionType; } private void UpdateView(T state) + { + if (UpdateSpriteMaterial(state)) + { + return; + } + UpdateSpriteTransform(); + } + + private bool UpdateSpriteMaterial(T state) { if (!_materialDictionary.TryGetValue(state, out var material) || material == null) { // TODO 캔버스 다운 _spriteRenderer.enabled = false; - return; + return true; } // ui 머티리얼 교체 _spriteRenderer.enabled = true; _spriteRenderer.material = material; + return false; } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs index 21098a4b0..cebc84afe 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs @@ -10,6 +10,8 @@ public class RestaurantUiDisplayComponent : PropUiDisplayComponent _materialDictionary = new(); protected override Dictionary SetMaterialDictionary() @@ -21,6 +23,26 @@ protected override void Initialize() { base.Initialize(); _spriteRenderer.sprite = _temporarySprite; + _spriteRenderer.transform.localScale = _fixedSpriteSize; + } + + protected override Vector3 GetDisplayPosition() + { + if (GetCurrentInteractionType() == RestaurantOrderType.Order) + { + // Find interaction points from interactable owner + if (_interactable == null) + { + return base.GetDisplayPosition(); + } + + var points = _interactable.GetInteractionPoints(); + if (points is { Length: > 0 }) + { + return points[0] + _offset; + } + } + return base.GetDisplayPosition(); } } } \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 63e0e52b4..821df1908 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:411a0243cb87e0bcd8781e3198ba1f82af7279c14555e3b2db93884f5b7ea700 -size 636 +oid sha256:6c91ea0bee02701e2f20333be55e0b5b54c388d26e9745e469d9479529f01ef6 +size 633 From 7442deefeae8105e0d2db22425e81667d4f29517 Mon Sep 17 00:00:00 2001 From: hho210 Date: Mon, 1 Sep 2025 13:52:33 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=EC=8A=A4=ED=85=8C=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8,=20=EB=81=BC=EC=9E=84=20?= =?UTF-8?q?=EC=BD=94=EB=9E=84=20=EC=A0=9C=EA=B1=B0,=20=EC=BD=94=EB=9E=8401?= =?UTF-8?q?=20=ED=94=84=EB=A6=AC=ED=8C=B9=ED=99=94,=20=EC=8A=A4=EC=9C=84?= =?UTF-8?q?=EC=B9=98,=EB=A9=94=EB=89=B4=ED=8C=90=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=88=98=EC=A0=95,=20=EC=A3=BC=EB=B0=A9=EA=B8=B0?= =?UTF-8?q?=EA=B5=AC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Environments/Props/Prop_Fence.prefab | 12 + .../Environments/Props/Prop_Open.prefab | 161 +- .../Environments/Props/Prop_RumBarrel.prefab | 16 + .../Environments/Props/Prop_Stove.prefab | 75 - .../Environments/Props/Prop_Stove.prefab.meta | 7 - .../Environments/Props/Stove/Stove.mat | 151 - .../Environments/Props/Stove/Stove.mat.meta | 8 - .../Environments/Props/Stove/Stove.png | 3 - .../Environments/Props/Stove/Stove.png.meta | 143 - .../Props/Window2/WindowFrame.mat | 2 + .../Props/_old/Prefabs/Old/Coral01.prefab | 6 +- .../_old/Spines/OpenSwitch/OpenSwitch.atlas | 82 + .../Spines/OpenSwitch/OpenSwitch.atlas.meta} | 3 +- .../Spines/OpenSwitch/OpenSwitch.atlas.txt | 83 +- .../_old/Spines/OpenSwitch/OpenSwitch.png | 4 +- .../Spines/OpenSwitch/OpenSwitch.skel.bytes | 4 +- .../Prop/MenuBoard/PropMenuBoard.prefab | 13 +- .../Environments/Prop/Pot1/Prop_Pot1.prefab | 11 +- .../_Addressables/Scenes/Restaurant.unity | 2831 +++++++++-------- 19 files changed, 1780 insertions(+), 1835 deletions(-) delete mode 100644 Assets/_DDD/Restaurant/Environments/Props/Prop_Stove.prefab delete mode 100644 Assets/_DDD/Restaurant/Environments/Props/Prop_Stove.prefab.meta delete mode 100644 Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.mat delete mode 100644 Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.mat.meta delete mode 100644 Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.png delete mode 100644 Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.png.meta create mode 100644 Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas rename Assets/_DDD/Restaurant/Environments/Props/{Stove.meta => _old/Spines/OpenSwitch/OpenSwitch.atlas.meta} (67%) diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Fence.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_Fence.prefab index 2a49e4bf2..eee4317f2 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_Fence.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_Fence.prefab @@ -84,6 +84,18 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 094899c1afd763f459f6a1f461cba5c5, type: 2} + - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Size.x + value: 0.99 + objectReference: {fileID: 0} + - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Size.z + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Center.z + value: 0.14 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Open.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_Open.prefab index 4b8b4924c..ae8ee7a30 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_Open.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_Open.prefab @@ -1,5 +1,135 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &6763219558441662797 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9059377735625185194} + - component: {fileID: 5304993695204765191} + - component: {fileID: 1500344406833374910} + - component: {fileID: 4890633252512986786} + m_Layer: 0 + m_Name: Spine GameObject (OpenSwitch) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9059377735625185194 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6763219558441662797} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8881739536043914635} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!33 &5304993695204765191 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6763219558441662797} + m_Mesh: {fileID: 0} +--- !u!23 &1500344406833374910 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6763219558441662797} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a287e4cf739397e41a00b772a97fc1f7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &4890633252512986786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6763219558441662797} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: d89793e4ce0651c4885db355edd439d1, type: 2} + initialSkinName: + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: Idle + loop: 1 + timeScale: 1 --- !u!1001 &4777358697124966162 PrefabInstance: m_ObjectHideFlags: 0 @@ -10,15 +140,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalPosition.x @@ -72,6 +202,10 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags value: 0 @@ -98,11 +232,14 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_IsTrigger - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4111453722694982297, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + insertIndex: 0 + addedObject: {fileID: 9059377735625185194} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} insertIndex: -1 @@ -117,6 +254,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: -4132148316966952702} m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} +--- !u!4 &8881739536043914635 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4111453722694982297, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + m_PrefabInstance: {fileID: 4777358697124966162} + m_PrefabAsset: {fileID: 0} --- !u!1 &9211739394093953175 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} @@ -137,12 +279,12 @@ MonoBehaviour: _interactionType: 1 _executionParameters: _holdTime: 0.1 - _holdTime: 0.5 _displayParameters: - _messageKey: Test + k__BackingField: + k__BackingField: _interactionAvailableFlows: 1 _aiInteractionPoints: [] - autoInitialize: 1 + _autoInitialize: 1 --- !u!114 &3538352761187622062 MonoBehaviour: m_ObjectHideFlags: 0 @@ -337,7 +479,7 @@ MonoBehaviour: seeThroughTextureUVSpace: 0 seeThroughTextureScale: 1 seeThroughChildrenSortingMode: 0 - rmsCount: 1 + rmsCount: 2 hitFxInitialIntensity: 0 hitFxMode: 0 hitFxFadeOutDuration: 0.25 @@ -396,4 +538,3 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _managementType: 1 - _cookwareType: 0 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_RumBarrel.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_RumBarrel.prefab index 1c939adbf..a534eb661 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_RumBarrel.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_RumBarrel.prefab @@ -84,6 +84,22 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 9c408af9e1c239947b295321f1a3332f, type: 2} + - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Size.x + value: 0.87 + objectReference: {fileID: 0} + - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Size.y + value: 0.95 + objectReference: {fileID: 0} + - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Size.z + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Center.z + value: 0.2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Stove.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_Stove.prefab deleted file mode 100644 index 82da03261..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_Stove.prefab +++ /dev/null @@ -1,75 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4777358697124966162 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_Name - value: Prop_Stove - objectReference: {fileID: 0} - - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: 9edeb757fc5945643b08f5fd6f0352ea, type: 2} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Stove.prefab.meta b/Assets/_DDD/Restaurant/Environments/Props/Prop_Stove.prefab.meta deleted file mode 100644 index 772dfc9ab..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_Stove.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d6177bb7c30e785488ac32b61897d2af -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.mat b/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.mat deleted file mode 100644 index b7594db84..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.mat +++ /dev/null @@ -1,151 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-3789712415343660289 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 9 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Stove - m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHATEST_ON - - _METALLICSPECGLOSSMAP - - _NORMALMAP - - _OCCLUSIONMAP - - _PARALLAXMAP - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2450 - stringTagMap: - RenderType: TransparentCutout - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: c2293cf2323eb61449d39a8b130d5dd9, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlphaClip: 1 - - _AlphaToMask: 1 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _CastShadows: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EMISSION: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _METALLICSPECGLOSSMAP: 1 - - _Metallic: 0 - - _NORMALMAP: 1 - - _OCCLUSIONMAP: 1 - - _OcclusionStrength: 1 - - _PARALLAXMAP: 1 - - _Parallax: 0.005 - - _QueueControl: 0 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _XRMotionVectorsPass: 1 - - _ZTest: 4 - - _ZWrite: 1 - - _ZWriteControl: 0 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.mat.meta b/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.mat.meta deleted file mode 100644 index 177c0ef87..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9edeb757fc5945643b08f5fd6f0352ea -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.png b/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.png deleted file mode 100644 index c0fcefa04..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8db236f19355a266c3ffc59d6d5e0044466c48d799387d1afa3cb5c58f9decc3 -size 79402 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.png.meta b/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.png.meta deleted file mode 100644 index 16a7fb693..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Stove/Stove.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: c2293cf2323eb61449d39a8b130d5dd9 -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/_DDD/Restaurant/Environments/Props/Window2/WindowFrame.mat b/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowFrame.mat index 03056dbe9..e6e39acd2 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowFrame.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowFrame.mat @@ -105,6 +105,7 @@ Material: - _AddPrecomputedVelocity: 0 - _AlphaClip: 1 - _AlphaToMask: 1 + - _ApplyGI: 1 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 @@ -119,6 +120,7 @@ Material: - _DstBlendAlpha: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 + - _GlobalIlluminationIntensity: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral01.prefab b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral01.prefab index c9a318ec2..2016ef11f 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral01.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral01.prefab @@ -42,15 +42,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalScale.x - value: 1.4999999 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalScale.y - value: 1.4999999 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalScale.z - value: 1.4999999 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas new file mode 100644 index 000000000..4a745e78a --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas @@ -0,0 +1,82 @@ +OpenSwitch.png +size:695,1035 +filter:Linear,Linear +scale:0.5 +Eyelight +bounds:220,537,91,58 +rotate:90 +Fire01 +bounds:220,495,53,40 +Fire02 +bounds:222,726,88,70 +Fire03 +bounds:163,223,105,101 +rotate:90 +Fire04 +bounds:338,18,111,120 +Fire05 +bounds:338,140,112,139 +rotate:90 +Fire06 +bounds:2,208,120,159 +rotate:90 +Fire07 +bounds:479,22,142,184 +Fire08 +bounds:2,2,132,204 +Fire09 +bounds:481,208,166,208 +rotate:90 +Fire10 +bounds:312,566,159,217 +rotate:90 +Fire11 +bounds:2,644,152,218 +rotate:90 +Fire12 +bounds:267,254,154,212 +rotate:90 +Fire13 +bounds:2,490,152,216 +rotate:90 +Fire14 +bounds:531,376,159,213 +Fire15 +bounds:539,591,154,214 +Fire16 +bounds:2,330,158,213 +rotate:90 +Fire17 +bounds:280,410,154,214 +rotate:90 +Fire18 +bounds:542,807,146,226 +Fire19 +bounds:313,886,147,227 +rotate:90 +Fire20 +bounds:313,727,157,224 +rotate:90 +ribbon01 +bounds:280,578,50,29 +rotate:90 +ribbon02 +bounds:623,102,37,104 +ribbon03 +bounds:222,678,46,86 +rotate:90 +ribbon04 +bounds:222,630,46,86 +rotate:90 +switch01 +bounds:2,798,235,309 +rotate:90 +switch02 +bounds:136,7,199,99 +rotate:90 +switch03 +bounds:237,7,199,99 +rotate:90 +switchknob +bounds:220,357,136,45 +rotate:90 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Stove.meta b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas.meta similarity index 67% rename from Assets/_DDD/Restaurant/Environments/Props/Stove.meta rename to Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas.meta index 6b0d1221f..add549d60 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Stove.meta +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: b3fbe9c062a126149a60f4579f52fa29 -folderAsset: yes +guid: adc192fc97d879747bb8eea1c1f00ad8 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas.txt b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas.txt index 1bd80c465..4a745e78a 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas.txt +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas.txt @@ -1,69 +1,82 @@ OpenSwitch.png -size:1992,1408 +size:695,1035 filter:Linear,Linear +scale:0.5 Eyelight -bounds:650,841,182,115 -Fire01 -bounds:834,865,106,79 +bounds:220,537,91,58 rotate:90 +Fire01 +bounds:220,495,53,40 Fire02 -bounds:473,816,175,140 +bounds:222,726,88,70 Fire03 -bounds:1642,42,210,201 +bounds:163,223,105,101 rotate:90 Fire04 -bounds:1761,262,221,240 +bounds:338,18,111,120 Fire05 -bounds:1761,504,223,277 +bounds:338,140,112,139 +rotate:90 Fire06 -bounds:1519,463,240,318 +bounds:2,208,120,159 +rotate:90 Fire07 -bounds:847,8,284,368 +bounds:479,22,142,184 Fire08 -bounds:1727,998,263,408 +bounds:2,2,132,204 Fire09 -bounds:430,2,332,415 +bounds:481,208,166,208 rotate:90 Fire10 -bounds:788,973,317,433 -Fire11 -bounds:592,378,303,436 -Fire12 -bounds:1417,982,308,424 -Fire13 -bounds:897,432,303,431 -Fire14 -bounds:2,13,318,426 +bounds:312,566,159,217 rotate:90 +Fire11 +bounds:2,644,152,218 +rotate:90 +Fire12 +bounds:267,254,154,212 +rotate:90 +Fire13 +bounds:2,490,152,216 +rotate:90 +Fire14 +bounds:531,376,159,213 Fire15 -bounds:1133,2,308,428 +bounds:539,591,154,214 Fire16 -bounds:1202,456,315,426 +bounds:2,330,158,213 +rotate:90 Fire17 -bounds:1107,978,308,428 +bounds:280,410,154,214 +rotate:90 Fire18 -bounds:298,336,292,451 +bounds:542,807,146,226 Fire19 -bounds:2,333,294,454 +bounds:313,886,147,227 +rotate:90 Fire20 -bounds:473,958,313,448 +bounds:313,727,157,224 +rotate:90 ribbon01 -bounds:915,871,100,57 +bounds:280,578,50,29 rotate:90 ribbon02 -bounds:1642,254,74,207 +bounds:623,102,37,104 ribbon03 -bounds:974,879,92,171 +bounds:222,678,46,86 rotate:90 ribbon04 -bounds:1147,884,92,171 +bounds:222,630,46,86 rotate:90 switch01 -bounds:2,789,469,617 +bounds:2,798,235,309 +rotate:90 switch02 -bounds:1593,783,397,197 +bounds:136,7,199,99 +rotate:90 switch03 -bounds:1443,57,397,197 +bounds:237,7,199,99 rotate:90 switchknob -bounds:1320,886,271,90 +bounds:220,357,136,45 +rotate:90 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.png b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.png index 6172f043a..b3def70bf 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.png +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:279df255ad6e323b63a7a46a65b5bc9c6b32da87f6931ad53899f6dfe510f973 -size 1349657 +oid sha256:0260cae905b062b2eb350527a3a869ea5c0d4157c14b85f49a5b2d62bc0ea898 +size 402280 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.skel.bytes b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.skel.bytes index 5ea846e72..38f0cd62a 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.skel.bytes +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.skel.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52972f7c5ec8ed28135cbaf0a32c9976e06ec6105348121832ee8edde02f2993 -size 7222 +oid sha256:d468e570d61ab528040a06db6b5578f0f086ef04c9bb2fc2c8c6fdb54b08c1ed +size 6748 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab index 55acc7db6..7bba5c65a 100644 --- a/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab +++ b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab @@ -10,15 +10,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalPosition.x @@ -71,7 +71,7 @@ PrefabInstance: - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: 8735f3d63bc14e74da558970523bd1bd, type: 2} + objectReference: {fileID: 2100000, guid: 6ee848655b3f6b94ebc4f55b95f1b46e, type: 2} - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Size.x value: 1 @@ -126,10 +126,11 @@ MonoBehaviour: _executionParameters: _holdTime: 0 _displayParameters: - _messageKey: Test + k__BackingField: + k__BackingField: _interactionAvailableFlows: 1 _aiInteractionPoints: [] - autoInitialize: 1 + _autoInitialize: 1 --- !u!114 &4545680930728379745 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Pot1/Prop_Pot1.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Pot1/Prop_Pot1.prefab index d1f17534a..1eb129c34 100644 --- a/Assets/_DDD/_Addressables/Environments/Prop/Pot1/Prop_Pot1.prefab +++ b/Assets/_DDD/_Addressables/Environments/Prop/Pot1/Prop_Pot1.prefab @@ -218,15 +218,15 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 7d58c54c5eebea647b71bbf633965a5c, type: 2} - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Size.x - value: 1 + value: 0.94 objectReference: {fileID: 0} - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Size.z - value: 0.97 + value: 0.78 objectReference: {fileID: 0} - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Center.z - value: 0.34 + value: 0.21 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -295,10 +295,11 @@ MonoBehaviour: _executionParameters: _holdTime: 0 _displayParameters: - _messageKey: Test + k__BackingField: + k__BackingField: _interactionAvailableFlows: 2 _aiInteractionPoints: [] - autoInitialize: 1 + _autoInitialize: 1 --- !u!114 &276462347427572734 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 4444d43a5..7e8272033 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -119,6 +119,132 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &11446136 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 11446139} + - component: {fileID: 11446138} + - component: {fileID: 11446137} + m_Layer: 8 + m_Name: Spot Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!114 &11446137 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11446136} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!108 &11446138 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11446136} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 2 + m_Color: {r: 0.25299624, g: 0.3124172, b: 0.654088, a: 1} + m_Intensity: 300 + m_Range: 15 + m_SpotAngle: 68.265305 + m_InnerSpotAngle: 53.265305 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 10 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &11446139 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11446136} + serializedVersion: 2 + m_LocalRotation: {x: 0.9990483, y: -0, z: -0, w: 0.043619424} + m_LocalPosition: {x: -1.54, y: 6.088584, z: 7.09} + m_LocalScale: {x: 5.4299297, y: 5.4299397, z: 5.4299397} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 95, y: 0, z: 0} +--- !u!4 &15774998 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + m_PrefabInstance: {fileID: 422708278} + m_PrefabAsset: {fileID: 0} --- !u!1001 &21055480 PrefabInstance: m_ObjectHideFlags: 0 @@ -213,6 +339,100 @@ Transform: m_CorrespondingSourceObject: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} m_PrefabInstance: {fileID: 21055480} m_PrefabAsset: {fileID: 0} +--- !u!1001 &23698207 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 963529281} + m_Modifications: + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.x + value: 11.51 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.z + value: 10.91 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4581555104234214369, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Name + value: PropLantern_006 + objectReference: {fileID: 0} + - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Lightmapping + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_BounceIntensity + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} +--- !u!4 &23698208 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + m_PrefabInstance: {fileID: 23698207} + m_PrefabAsset: {fileID: 0} --- !u!4 &27095953 stripped Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} @@ -330,9 +550,17 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1274705225} m_Modifications: + - target: {fileID: 2593083138191906822, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2593083138191906822, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} + - target: {fileID: 4535379467923761962, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4535379467923761962, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.x - value: -1.5 + value: -0.13999987 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.y @@ -421,14 +649,7 @@ Transform: m_Children: - {fileID: 925564584} - {fileID: 120525694} - - {fileID: 799076591} - {fileID: 1986236741} - - {fileID: 1771012165} - - {fileID: 1757685827} - - {fileID: 1887891931} - - {fileID: 571830392} - - {fileID: 661919367} - - {fileID: 944817148} m_Father: {fileID: 531027750} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &116540217 @@ -459,7 +680,7 @@ Transform: m_GameObject: {fileID: 116540217} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.0019419168, z: -0, w: 0.99999815} - m_LocalPosition: {x: 1.0350003, y: 0.004, z: 16.501589} + m_LocalPosition: {x: 0.94500035, y: 0.004, z: 16.501589} m_LocalScale: {x: 0.20280915, y: 0.21705438, z: 0.09875836} m_ConstrainProportionsScale: 0 m_Children: [] @@ -540,6 +761,80 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 116540217} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &118486837 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + m_PrefabInstance: {fileID: 742266652} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &120409123 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 531027750} + m_Modifications: + - target: {fileID: 923914767764296274, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.x + value: -10.82 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0020012856 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.z + value: 5.05 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5985680150362701905, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Name + value: Coral01 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} --- !u!1001 &120525693 PrefabInstance: m_ObjectHideFlags: 0 @@ -749,6 +1044,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} m_PrefabInstance: {fileID: 786654108} m_PrefabAsset: {fileID: 0} +--- !u!4 &155767582 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + m_PrefabInstance: {fileID: 1541760815} + m_PrefabAsset: {fileID: 0} --- !u!1001 &167402585 PrefabInstance: m_ObjectHideFlags: 0 @@ -845,7 +1145,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_LocalPosition.x - value: 8.44 + value: 16.66 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_LocalPosition.y @@ -1098,6 +1398,100 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} m_PrefabInstance: {fileID: 220942095} m_PrefabAsset: {fileID: 0} +--- !u!1001 &229733027 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 963529281} + m_Modifications: + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.x + value: 9.51 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.z + value: 7.9 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4581555104234214369, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Name + value: PropLantern_008 + objectReference: {fileID: 0} + - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Lightmapping + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_BounceIntensity + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} +--- !u!4 &229733028 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + m_PrefabInstance: {fileID: 229733027} + m_PrefabAsset: {fileID: 0} --- !u!4 &238319909 stripped Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} @@ -1261,7 +1655,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.x - value: 9.047286 + value: 9.191 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.y @@ -1269,7 +1663,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.z - value: 19.014263 + value: 18.572 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalRotation.w @@ -1369,6 +1763,138 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} +--- !u!1001 &281473490 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2029954630} + m_Modifications: + - target: {fileID: 3782685999912116715, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.x + value: -9.502999 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.z + value: 6.038001 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Name + value: Prop_Rum_013 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} +--- !u!4 &281473491 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + m_PrefabInstance: {fileID: 281473490} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &286090336 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2029954630} + m_Modifications: + - target: {fileID: 3782685999912116715, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.x + value: 9.474999 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.z + value: 4.939002 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Name + value: Prop_Rum_011 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} +--- !u!4 &286090337 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + m_PrefabInstance: {fileID: 286090336} + m_PrefabAsset: {fileID: 0} --- !u!1 &296314360 GameObject: m_ObjectHideFlags: 0 @@ -1688,7 +2214,7 @@ Transform: m_GameObject: {fileID: 314916195} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -0.51, y: -0.0031901114, z: 16.451588} + m_LocalPosition: {x: -0.59999996, y: -0.0031901114, z: 16.451588} m_LocalScale: {x: 0.117231786, y: 0.117231786, z: 0.117231786} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1865,7 +2391,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: 9a40bae43e44b7943afced8a73294742, type: 3} propertyPath: m_LocalPosition.x - value: -1.49 + value: 16.65 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 9a40bae43e44b7943afced8a73294742, type: 3} propertyPath: m_LocalPosition.y @@ -1873,7 +2399,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 9a40bae43e44b7943afced8a73294742, type: 3} propertyPath: m_LocalPosition.z - value: 17.93 + value: 14.98 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 9a40bae43e44b7943afced8a73294742, type: 3} propertyPath: m_LocalRotation.w @@ -2047,7 +2573,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 50949da5c9906489cad4e3f39ecd615b, type: 3} propertyPath: m_LocalPosition.x - value: 6.52 + value: 7.59 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 50949da5c9906489cad4e3f39ecd615b, type: 3} propertyPath: m_LocalPosition.y @@ -2125,7 +2651,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2572090280532963011, guid: c420e95c35d66c440a4d714f4f2ba3c3, type: 3} propertyPath: m_LocalPosition.x - value: 2.36 + value: 2.31 objectReference: {fileID: 0} - target: {fileID: 2572090280532963011, guid: c420e95c35d66c440a4d714f4f2ba3c3, type: 3} propertyPath: m_LocalPosition.y @@ -2354,6 +2880,95 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} m_PrefabInstance: {fileID: 960434773} m_PrefabAsset: {fileID: 0} +--- !u!1001 &422708278 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 963529281} + m_Modifications: + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.x + value: -6.37 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.z + value: 6.18 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4581555104234214369, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Name + value: PropLantern_004 + objectReference: {fileID: 0} + - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Lightmapping + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_BounceIntensity + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} --- !u!1001 &426856374 PrefabInstance: m_ObjectHideFlags: 0 @@ -2487,7 +3102,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: 32b633e713645dd458855dd329294017, type: 3} propertyPath: m_LocalPosition.x - value: 9.01 + value: 10.51 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 32b633e713645dd458855dd329294017, type: 3} propertyPath: m_LocalPosition.y @@ -2495,7 +3110,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 32b633e713645dd458855dd329294017, type: 3} propertyPath: m_LocalPosition.z - value: 23.406 + value: 24 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 32b633e713645dd458855dd329294017, type: 3} propertyPath: m_LocalRotation.w @@ -2601,7 +3216,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.x - value: 4.19 + value: 4.5435 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y @@ -2715,6 +3330,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fa353764662051b4aa59a202b194039b, type: 3} +--- !u!4 &521950079 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + m_PrefabInstance: {fileID: 1484995331} + m_PrefabAsset: {fileID: 0} --- !u!1 &530276984 GameObject: m_ObjectHideFlags: 0 @@ -2743,7 +3363,7 @@ Transform: m_GameObject: {fileID: 530276984} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.0019419168, z: -0, w: 0.99999815} - m_LocalPosition: {x: -1.51, y: 0.004, z: 10.99} + m_LocalPosition: {x: -0.14999986, y: 0.004, z: 10.99} m_LocalScale: {x: 0.29397187, y: 0.21705438, z: 0.1950584} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2887,6 +3507,11 @@ Transform: - {fileID: 201468378} - {fileID: 895876632} - {fileID: 1454537160} + - {fileID: 2047850667} + - {fileID: 1251583601} + - {fileID: 795652936} + - {fileID: 521950079} + - {fileID: 155767582} - {fileID: 34818738} - {fileID: 110947503} - {fileID: 192891836} @@ -2974,7 +3599,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7441964798915251620, guid: f31c9741224e4a240ab335095d3a9e32, type: 3} propertyPath: m_LocalPosition.x - value: -3.331 + value: -17.31 objectReference: {fileID: 0} - target: {fileID: 7441964798915251620, guid: f31c9741224e4a240ab335095d3a9e32, type: 3} propertyPath: m_LocalPosition.y @@ -3181,7 +3806,7 @@ Transform: m_GameObject: {fileID: 564055758} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.0019419168, z: -0, w: 0.99999815} - m_LocalPosition: {x: -0.542629, y: 0.004, z: 16.501589} + m_LocalPosition: {x: -0.632629, y: 0.004, z: 16.501589} m_LocalScale: {x: 0.09945761, y: 0.21705438, z: 0.09875836} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3262,136 +3887,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 564055758} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &571830391 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 571830392} - - component: {fileID: 571830395} - - component: {fileID: 571830394} - - component: {fileID: 571830393} - m_Layer: 7 - m_Name: Spine GameObject (Coral)_014 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &571830392 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 571830391} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -11.42, y: 0, z: 4} - m_LocalScale: {x: 0.15793099, y: 0.157931, z: 0.157931} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 110947503} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &571830393 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 571830391} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 6b5bd0b2f566ab747acd71c481b9275b, type: 2} - initialSkinName: Coral01 - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: Coral01/Idle - loop: 1 - timeScale: 1 ---- !u!23 &571830394 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 571830391} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 962be7b2d7cbbb148a99015ef44dbbf4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &571830395 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 571830391} - m_Mesh: {fileID: 0} --- !u!1 &575217083 GameObject: m_ObjectHideFlags: 0 @@ -3443,7 +3938,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: d0589962e362948469d3f34634081926, type: 3} propertyPath: m_LocalPosition.x - value: -5.507 + value: -4.8 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: d0589962e362948469d3f34634081926, type: 3} propertyPath: m_LocalPosition.y @@ -3502,9 +3997,17 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1274705225} m_Modifications: + - target: {fileID: 2593083138191906822, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2593083138191906822, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} + - target: {fileID: 4535379467923761962, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4535379467923761962, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.x - value: -6.44 + value: -5.08 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.y @@ -3608,7 +4111,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: 24943e78c04972c46bfd1212be293bc8, type: 3} propertyPath: m_LocalPosition.x - value: 8.97 + value: 9.677 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 24943e78c04972c46bfd1212be293bc8, type: 3} propertyPath: m_LocalPosition.y @@ -3674,7 +4177,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2572090280532963011, guid: c420e95c35d66c440a4d714f4f2ba3c3, type: 3} propertyPath: m_LocalPosition.x - value: 2.36 + value: 2.31 objectReference: {fileID: 0} - target: {fileID: 2572090280532963011, guid: c420e95c35d66c440a4d714f4f2ba3c3, type: 3} propertyPath: m_LocalPosition.y @@ -3784,7 +4287,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.x - value: 8.64 + value: 9.81 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y @@ -3836,136 +4339,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} m_PrefabInstance: {fileID: 653815452} m_PrefabAsset: {fileID: 0} ---- !u!1 &661919366 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 661919367} - - component: {fileID: 661919370} - - component: {fileID: 661919369} - - component: {fileID: 661919368} - m_Layer: 7 - m_Name: Spine GameObject (Coral)_007 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &661919367 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 661919366} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 5.59, y: 0, z: 18.93} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 110947503} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &661919368 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 661919366} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 6b5bd0b2f566ab747acd71c481b9275b, type: 2} - initialSkinName: Coral01 - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: Coral01/Idle - loop: 1 - timeScale: 1 ---- !u!23 &661919369 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 661919366} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 962be7b2d7cbbb148a99015ef44dbbf4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &661919370 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 661919366} - m_Mesh: {fileID: 0} --- !u!4 &664149228 stripped Transform: m_CorrespondingSourceObject: {fileID: 491456, guid: 7cfc30e9807ebb54e92fbc67239154cc, type: 3} @@ -4050,7 +4423,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalPosition.x - value: 15.275978 + value: 17.78 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalPosition.y @@ -4208,7 +4581,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.x - value: -10.707997 + value: -9.69 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.y @@ -4343,6 +4716,95 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: d0ac24eea271d7540b30f3f07f915589, type: 3} m_PrefabInstance: {fileID: 1369491033} m_PrefabAsset: {fileID: 0} +--- !u!1001 &742266652 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 963529281} + m_Modifications: + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.x + value: -10.28 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.y + value: 1.93 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.z + value: 8.649 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4581555104234214369, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Name + value: PropLantern_003 + objectReference: {fileID: 0} + - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Lightmapping + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_BounceIntensity + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} --- !u!1 &750091254 GameObject: m_ObjectHideFlags: 0 @@ -4371,7 +4833,7 @@ Transform: m_GameObject: {fileID: 750091254} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.0019419168, z: -0, w: 0.99999815} - m_LocalPosition: {x: -1.4820005, y: 0.004, z: 18.51959} + m_LocalPosition: {x: 16.657999, y: 0.004, z: 15.56959} m_LocalScale: {x: 0.29494336, y: 0.21705, z: 0.09876001} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4567,100 +5029,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9a40bae43e44b7943afced8a73294742, type: 3} ---- !u!1001 &760040120 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 963529281} - m_Modifications: - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalScale.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalScale.z - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalPosition.x - value: 7.99798 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalPosition.y - value: -0.11400008 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalPosition.z - value: 13.905999 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4581555104234214369, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Name - value: PropLantern_003 - objectReference: {fileID: 0} - - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Lightmapping - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Shadows.m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_BounceIntensity - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} ---- !u!4 &760040121 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - m_PrefabInstance: {fileID: 760040120} - m_PrefabAsset: {fileID: 0} --- !u!1001 &761682093 PrefabInstance: m_ObjectHideFlags: 0 @@ -5151,7 +5519,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3102649314828302494, guid: 8bbc5a3a79a43814b88e3f5c5df9fdd4, type: 3} propertyPath: m_LocalPosition.x - value: 2.49 + value: 3.51 objectReference: {fileID: 0} - target: {fileID: 3102649314828302494, guid: 8bbc5a3a79a43814b88e3f5c5df9fdd4, type: 3} propertyPath: m_LocalPosition.y @@ -5159,7 +5527,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3102649314828302494, guid: 8bbc5a3a79a43814b88e3f5c5df9fdd4, type: 3} propertyPath: m_LocalPosition.z - value: 14.97 + value: 15.072 objectReference: {fileID: 0} - target: {fileID: 3102649314828302494, guid: 8bbc5a3a79a43814b88e3f5c5df9fdd4, type: 3} propertyPath: m_LocalRotation.w @@ -5198,68 +5566,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bbc5a3a79a43814b88e3f5c5df9fdd4, type: 3} ---- !u!4 &799076591 stripped +--- !u!4 &795652936 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - m_PrefabInstance: {fileID: 808175113} + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + m_PrefabInstance: {fileID: 827314146} m_PrefabAsset: {fileID: 0} ---- !u!1001 &808175113 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 110947503} - m_Modifications: - - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - propertyPath: m_LocalPosition.x - value: 9.385097 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - propertyPath: m_LocalPosition.z - value: 4.988653 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9211739394093953175, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} - propertyPath: m_Name - value: Prop_Coral03_002 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} --- !u!4 &823489446 stripped Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} @@ -5347,6 +5658,75 @@ Transform: m_CorrespondingSourceObject: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} m_PrefabInstance: {fileID: 825053428} m_PrefabAsset: {fileID: 0} +--- !u!1001 &827314146 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 531027750} + m_Modifications: + - target: {fileID: 923914767764296274, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.x + value: -9.92 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0020012856 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.z + value: 4.25 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5985680150362701905, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Name + value: Coral01_002 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} --- !u!1001 &830615546 PrefabInstance: m_ObjectHideFlags: 0 @@ -5431,7 +5811,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalPosition.x - value: 15.275978 + value: 17.78 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalPosition.y @@ -5745,7 +6125,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8716330663916682320, guid: 89ee6a00e60534abebdf75b387fc4275, type: 3} propertyPath: m_LocalPosition.x - value: -1.292 + value: -1.56 objectReference: {fileID: 0} - target: {fileID: 8716330663916682320, guid: 89ee6a00e60534abebdf75b387fc4275, type: 3} propertyPath: m_LocalPosition.y @@ -6067,136 +6447,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} m_PrefabInstance: {fileID: 931717435} m_PrefabAsset: {fileID: 0} ---- !u!1 &944817147 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 944817148} - - component: {fileID: 944817151} - - component: {fileID: 944817150} - - component: {fileID: 944817149} - m_Layer: 7 - m_Name: Spine GameObject (Coral)_015 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &944817148 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 944817147} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -3.01, y: -0.05, z: 4.18} - m_LocalScale: {x: 0.15793099, y: 0.157931, z: 0.157931} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 110947503} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &944817149 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 944817147} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 6b5bd0b2f566ab747acd71c481b9275b, type: 2} - initialSkinName: Coral01 - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: Coral01/Idle - loop: 1 - timeScale: 1 ---- !u!23 &944817150 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 944817147} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 962be7b2d7cbbb148a99015ef44dbbf4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &944817151 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 944817147} - m_Mesh: {fileID: 0} --- !u!1001 &952511014 PrefabInstance: m_ObjectHideFlags: 0 @@ -6205,9 +6455,17 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1274705225} m_Modifications: + - target: {fileID: 2593083138191906822, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2593083138191906822, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} + - target: {fileID: 4535379467923761962, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4535379467923761962, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.x - value: 3.44 + value: 4.8 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.y @@ -6351,7 +6609,11 @@ Transform: m_Children: - {fileID: 21055481} - {fileID: 931717436} - - {fileID: 760040121} + - {fileID: 118486837} + - {fileID: 15774998} + - {fileID: 1887332780} + - {fileID: 23698208} + - {fileID: 229733028} m_Father: {fileID: 1428769370} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &978385295 stripped @@ -6373,7 +6635,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalPosition.x - value: 15.275978 + value: 17.78 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalPosition.y @@ -6557,7 +6819,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: 24943e78c04972c46bfd1212be293bc8, type: 3} propertyPath: m_LocalPosition.x - value: 4.109999 + value: 4.816999 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 24943e78c04972c46bfd1212be293bc8, type: 3} propertyPath: m_LocalPosition.y @@ -6604,136 +6866,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 24943e78c04972c46bfd1212be293bc8, type: 3} ---- !u!1 &1010893240 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1010893241} - - component: {fileID: 1010893244} - - component: {fileID: 1010893243} - - component: {fileID: 1010893242} - m_Layer: 0 - m_Name: Spine GameObject (OpenSwitch)_002 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1010893241 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1010893240} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 5.32, y: 0, z: 14} - m_LocalScale: {x: 3, y: 3, z: 3} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1428769370} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &1010893242 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1010893240} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: d89793e4ce0651c4885db355edd439d1, type: 2} - initialSkinName: - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: On - loop: 1 - timeScale: 1 ---- !u!23 &1010893243 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1010893240} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a287e4cf739397e41a00b772a97fc1f7, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1010893244 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1010893240} - m_Mesh: {fileID: 0} --- !u!1 &1015166832 GameObject: m_ObjectHideFlags: 0 @@ -7052,7 +7184,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: d0589962e362948469d3f34634081926, type: 3} propertyPath: m_LocalPosition.x - value: -10.14 + value: -9.433001 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: d0589962e362948469d3f34634081926, type: 3} propertyPath: m_LocalPosition.y @@ -7348,7 +7480,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.x - value: -1.85 + value: -1.4965001 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y @@ -7421,11 +7553,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 982181638859743806, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} propertyPath: m_LocalPosition.x - value: 2.546 + value: 2.08 objectReference: {fileID: 0} - target: {fileID: 982181638859743806, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.0001 objectReference: {fileID: 0} - target: {fileID: 982181638859743806, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} propertyPath: m_LocalPosition.z @@ -7487,7 +7619,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: 24943e78c04972c46bfd1212be293bc8, type: 3} propertyPath: m_LocalPosition.x - value: -0.72 + value: -0.01300025 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 24943e78c04972c46bfd1212be293bc8, type: 3} propertyPath: m_LocalPosition.y @@ -7679,7 +7811,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: 9626d38eca67bcc4cb4139d3694577d8, type: 3} propertyPath: m_LocalPosition.x - value: 13.05 + value: 15.05 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 9626d38eca67bcc4cb4139d3694577d8, type: 3} propertyPath: m_LocalPosition.y @@ -7788,136 +7920,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: d0ac24eea271d7540b30f3f07f915589, type: 3} m_PrefabInstance: {fileID: 1167013783} m_PrefabAsset: {fileID: 0} ---- !u!1 &1171242826 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1171242827} - - component: {fileID: 1171242830} - - component: {fileID: 1171242829} - - component: {fileID: 1171242828} - m_Layer: 0 - m_Name: Spine GameObject (OpenSwitch) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1171242827 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1171242826} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 3.5, y: 0, z: 14} - m_LocalScale: {x: 3, y: 3, z: 3} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1428769370} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &1171242828 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1171242826} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: d89793e4ce0651c4885db355edd439d1, type: 2} - initialSkinName: - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: Idle - loop: 1 - timeScale: 1 ---- !u!23 &1171242829 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1171242826} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a287e4cf739397e41a00b772a97fc1f7, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1171242830 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1171242826} - m_Mesh: {fileID: 0} --- !u!1 &1173755932 GameObject: m_ObjectHideFlags: 0 @@ -8039,6 +8041,72 @@ Transform: m_Children: [] m_Father: {fileID: 1625822452} m_LocalEulerAnglesHint: {x: 31.664, y: -18.709, z: -16.217} +--- !u!1001 &1179009102 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2029954630} + m_Modifications: + - target: {fileID: 3782685999912116715, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.x + value: -9.775 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.z + value: 6.388 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Name + value: Prop_Rum_012 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} +--- !u!4 &1179009103 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + m_PrefabInstance: {fileID: 1179009102} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1183658512 PrefabInstance: m_ObjectHideFlags: 0 @@ -8474,6 +8542,11 @@ Transform: m_Children: [] m_Father: {fileID: 454759171} m_LocalEulerAnglesHint: {x: 0, y: -0.223, z: 0} +--- !u!4 &1251583601 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + m_PrefabInstance: {fileID: 2004980195} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1253092465 PrefabInstance: m_ObjectHideFlags: 0 @@ -8853,6 +8926,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} m_PrefabInstance: {fileID: 1629500546} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1360260545 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2029954630} + m_Modifications: + - target: {fileID: 3782685999912116715, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.x + value: 9.152999 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.z + value: 4.743001 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Name + value: Prop_Rum_010 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} +--- !u!4 &1360260546 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + m_PrefabInstance: {fileID: 1360260545} + m_PrefabAsset: {fileID: 0} --- !u!1 &1367038805 GameObject: m_ObjectHideFlags: 0 @@ -9204,6 +9343,95 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1048366b48a8cc3429168da2a8224d7d, type: 3} +--- !u!1001 &1381080945 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 963529281} + m_Modifications: + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.x + value: -6.87 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.z + value: 5.77 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4581555104234214369, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Name + value: PropLantern_005 + objectReference: {fileID: 0} + - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Lightmapping + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_BounceIntensity + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} --- !u!1001 &1390875352 PrefabInstance: m_ObjectHideFlags: 0 @@ -9212,9 +9440,13 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1274705225} m_Modifications: + - target: {fileID: 5304993695204765191, guid: 578d3d14793df9949bf890b9c5077723, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 578d3d14793df9949bf890b9c5077723, type: 3} propertyPath: m_LocalPosition.x - value: 4.49 + value: 4.99 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 578d3d14793df9949bf890b9c5077723, type: 3} propertyPath: m_LocalPosition.y @@ -9362,9 +9594,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 1171242827} - - {fileID: 1433300845} - - {fileID: 1010893241} - {fileID: 299328232} - {fileID: 727345922} - {fileID: 1417742146} @@ -9383,136 +9612,6 @@ Transform: - {fileID: 454759171} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1433300844 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1433300845} - - component: {fileID: 1433300848} - - component: {fileID: 1433300847} - - component: {fileID: 1433300846} - m_Layer: 0 - m_Name: Spine GameObject (OpenSwitch)_001 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1433300845 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433300844} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 7.09, y: 0, z: 14} - m_LocalScale: {x: 3, y: 3, z: 3} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1428769370} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &1433300846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433300844} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: d89793e4ce0651c4885db355edd439d1, type: 2} - initialSkinName: - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: Off - loop: 1 - timeScale: 1 ---- !u!23 &1433300847 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433300844} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a287e4cf739397e41a00b772a97fc1f7, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1433300848 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433300844} - m_Mesh: {fileID: 0} --- !u!4 &1439675990 stripped Transform: m_CorrespondingSourceObject: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} @@ -9602,6 +9701,75 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 9a40bae43e44b7943afced8a73294742, type: 3} m_PrefabInstance: {fileID: 1471333024} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1484995331 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 531027750} + m_Modifications: + - target: {fileID: 923914767764296274, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.x + value: -6.17 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0020012856 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.z + value: 4.26 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5985680150362701905, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Name + value: Coral01_003 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} --- !u!4 &1521649615 stripped Transform: m_CorrespondingSourceObject: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} @@ -9730,15 +9898,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.x - value: 8.34 + value: 10.71 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.076 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.z - value: 8.2 + value: 5.147 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalRotation.w @@ -9782,6 +9950,75 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} m_PrefabInstance: {fileID: 1535615171} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1541760815 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 531027750} + m_Modifications: + - target: {fileID: 923914767764296274, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.x + value: -10.48 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0020012856 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.z + value: 3.47 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5985680150362701905, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Name + value: Coral01_004 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} --- !u!1001 &1565010536 PrefabInstance: m_ObjectHideFlags: 0 @@ -10001,7 +10238,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} propertyPath: m_LocalPosition.x - value: 12.937981 + value: 14.937981 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} propertyPath: m_LocalPosition.y @@ -10302,6 +10539,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 1adf83789591d4cef928dc9f32c49610, type: 3} m_PrefabInstance: {fileID: 200803425} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1672772949 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2029954630} + m_Modifications: + - target: {fileID: 3782685999912116715, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.x + value: -9.180999 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.z + value: 6.234002 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Name + value: Prop_Rum_014 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} +--- !u!4 &1672772950 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + m_PrefabInstance: {fileID: 1672772949} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1678409379 PrefabInstance: m_ObjectHideFlags: 0 @@ -10487,7 +10790,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} propertyPath: m_LocalPosition.x - value: 1 + value: 0.91 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} propertyPath: m_LocalPosition.y @@ -10920,271 +11223,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} ---- !u!1 &1757685826 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1757685827} - - component: {fileID: 1757685830} - - component: {fileID: 1757685829} - - component: {fileID: 1757685828} - m_Layer: 7 - m_Name: Spine GameObject (Coral)_011 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1757685827 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757685826} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -8.92, y: 0, z: 4.43} - m_LocalScale: {x: 0.15793099, y: 0.157931, z: 0.157931} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 110947503} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &1757685828 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757685826} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 6b5bd0b2f566ab747acd71c481b9275b, type: 2} - initialSkinName: Coral01 - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: Coral01/Idle - loop: 1 - timeScale: 1 ---- !u!23 &1757685829 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757685826} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 962be7b2d7cbbb148a99015ef44dbbf4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1757685830 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757685826} - m_Mesh: {fileID: 0} --- !u!4 &1763303460 stripped Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} m_PrefabInstance: {fileID: 1224190071} m_PrefabAsset: {fileID: 0} ---- !u!1 &1771012164 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1771012165} - - component: {fileID: 1771012168} - - component: {fileID: 1771012167} - - component: {fileID: 1771012166} - m_Layer: 7 - m_Name: Spine GameObject (Coral)_009 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1771012165 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1771012164} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -9.953256, y: 0, z: 5.4975586} - m_LocalScale: {x: 0.15793099, y: 0.157931, z: 0.157931} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 110947503} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &1771012166 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1771012164} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 6b5bd0b2f566ab747acd71c481b9275b, type: 2} - initialSkinName: Coral01 - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: Coral01/Idle - loop: 1 - timeScale: 1 ---- !u!23 &1771012167 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1771012164} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 962be7b2d7cbbb148a99015ef44dbbf4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1771012168 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1771012164} - m_Mesh: {fileID: 0} --- !u!1 &1775054119 GameObject: m_ObjectHideFlags: 0 @@ -11499,7 +11542,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 982181638859743806, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} propertyPath: m_LocalPosition.x - value: 6.085 + value: 7.15 objectReference: {fileID: 0} - target: {fileID: 982181638859743806, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} propertyPath: m_LocalPosition.y @@ -11627,136 +11670,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 411410f9528530540bdec97694c0e4f8, type: 3} ---- !u!1 &1887891930 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1887891931} - - component: {fileID: 1887891934} - - component: {fileID: 1887891933} - - component: {fileID: 1887891932} - m_Layer: 7 - m_Name: Spine GameObject (Coral)_013 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1887891931 +--- !u!4 &1887332780 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + m_PrefabInstance: {fileID: 1381080945} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1887891930} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -11.47, y: 0, z: 5.96} - m_LocalScale: {x: 0.15793099, y: 0.157931, z: 0.157931} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 110947503} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &1887891932 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1887891930} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 6b5bd0b2f566ab747acd71c481b9275b, type: 2} - initialSkinName: Coral01 - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: Coral01/Idle - loop: 1 - timeScale: 1 ---- !u!23 &1887891933 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1887891930} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 962be7b2d7cbbb148a99015ef44dbbf4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1887891934 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1887891930} - m_Mesh: {fileID: 0} --- !u!1001 &1905307357 PrefabInstance: m_ObjectHideFlags: 0 @@ -12074,7 +11992,7 @@ Transform: m_GameObject: {fileID: 1967062957} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.0019419168, z: -0, w: 0.99999815} - m_LocalPosition: {x: 3.55, y: 0.004, z: 10.99} + m_LocalPosition: {x: 4.91, y: 0.004, z: 10.99} m_LocalScale: {x: 0.29397187, y: 0.21705438, z: 0.1950584} m_ConstrainProportionsScale: 0 m_Children: [] @@ -12350,6 +12268,141 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1986236740} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1987890768 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2029954630} + m_Modifications: + - target: {fileID: 3782685999912116715, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.x + value: 8.881 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalPosition.z + value: 5.093 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + propertyPath: m_Name + value: Prop_Rum_009 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} +--- !u!4 &1987890769 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} + m_PrefabInstance: {fileID: 1987890768} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2004980195 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 531027750} + m_Modifications: + - target: {fileID: 923914767764296274, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.x + value: -8.89 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0020012856 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalPosition.z + value: 5.05 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5985680150362701905, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Name + value: Coral01_001 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} --- !u!1 &2029954629 GameObject: m_ObjectHideFlags: 0 @@ -12380,10 +12433,16 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 140557231} - - {fileID: 1967307666} - {fileID: 1461522567} - - {fileID: 547082078} - {fileID: 238319909} + - {fileID: 1987890769} + - {fileID: 1360260546} + - {fileID: 286090337} + - {fileID: 1179009103} + - {fileID: 281473491} + - {fileID: 1672772950} + - {fileID: 1967307666} + - {fileID: 547082078} - {fileID: 146725274} m_Father: {fileID: 1274705225} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12415,7 +12474,7 @@ Transform: m_GameObject: {fileID: 2041706294} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.0019419168, z: -0, w: 0.99999815} - m_LocalPosition: {x: -6.51, y: 0.004, z: 10.99} + m_LocalPosition: {x: -5.15, y: 0.004, z: 10.99} m_LocalScale: {x: 0.29397187, y: 0.21705438, z: 0.1950584} m_ConstrainProportionsScale: 0 m_Children: [] @@ -12501,6 +12560,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 982181638859743806, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} m_PrefabInstance: {fileID: 1905307357} m_PrefabAsset: {fileID: 0} +--- !u!4 &2047850667 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} + m_PrefabInstance: {fileID: 120409123} + m_PrefabAsset: {fileID: 0} --- !u!4 &2072563474 stripped Transform: m_CorrespondingSourceObject: {fileID: 472992, guid: 1048366b48a8cc3429168da2a8224d7d, type: 3} @@ -12696,7 +12760,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.076 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.z @@ -13787,7 +13851,7 @@ Transform: m_GameObject: {fileID: 8260046952024566068} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 7.23, y: 0, z: 15} + m_LocalPosition: {x: 8.03, y: 0, z: 15} m_LocalScale: {x: 2, y: 20, z: 30} m_ConstrainProportionsScale: 0 m_Children: [] @@ -15710,6 +15774,7 @@ SceneRoots: - {fileID: 1056730803} - {fileID: 2093714585} - {fileID: 1311720132} + - {fileID: 11446139} - {fileID: 346249095} - {fileID: 612992553} - {fileID: 761682093} From 49a709b3c4ec1754b2d81b7828dba9293383fda3 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Mon, 1 Sep 2025 14:30:29 +0900 Subject: [PATCH 03/11] =?UTF-8?q?=ED=95=98=EC=9D=B4=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=EC=95=84=EC=9B=83=EB=9D=BC=EC=9D=B8,=20=EC=9B=94?= =?UTF-8?q?=EB=93=9C=20UI=20=EB=A0=8C=EB=8D=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Settings/PC_Renderer.asset | 2 +- .../Common/RestaurantOrder.prefab | 70 +++++++++-- .../Interactables/Prop_CustomerTable.prefab | 112 +++++++++++++++++- .../_Addressables/Prefabs/CustomerNpc.prefab | 4 +- .../Restaurant/Character/Npc/NpcMovement.cs | 2 +- .../Event/Cosmetic/InteractableHighlight.cs | 5 + 6 files changed, 180 insertions(+), 15 deletions(-) diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index 817b39bc3..b9ebf5fac 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:128038ec4bebf184e3e25685d6ba8b93d1185d041df5a4d32f55d434ae3c89f8 +oid sha256:0fbc5c82e6400866f12f4a776985d65f98c1a9e27d9c5104d528026b30388f47 size 10883 diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab index da054320c..09b034e02 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 3857692527302447930} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.4, y: 0, z: 0} + m_LocalPosition: {x: -0.5, y: -0.165, z: -0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -102,6 +102,7 @@ GameObject: - component: {fileID: 29040892075516248} - component: {fileID: 1332098886975329103} - component: {fileID: 3786917981383564029} + - component: {fileID: 1886819858489010523} m_Layer: 7 m_Name: RestaurantOrder m_TagString: Untagged @@ -252,26 +253,26 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4103096974375017811} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f0feb22ab60a4d1885271637838f43b9, type: 3} m_Name: m_EditorClassIdentifier: _availableStyle: Color: {r: 1, g: 1, b: 1, a: 1} - Width: 1 + Width: 0.5 Opacity: 1 _focusedStyle: Color: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - Width: 1 + Width: 0.5 Opacity: 1 _unavailableStyle: Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} Width: 0.5 - Opacity: 1 + Opacity: 0.5 _objectiveStyle: Color: {r: 0, g: 1, b: 1, a: 1} - Width: 1 + Width: 0.5 Opacity: 1 _breathingSpeed: 2 _breathingRange: 0.3 @@ -479,9 +480,64 @@ MonoBehaviour: seeThroughTextureUVSpace: 0 seeThroughTextureScale: 1 seeThroughChildrenSortingMode: 0 - rmsCount: 1 + rmsCount: 2 hitFxInitialIntensity: 0 hitFxMode: 0 hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 +--- !u!212 &1886819858489010523 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4103096974375017811} + 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: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: c607300554a0c44469620484fccbf239, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab index 2a2467dee..15b6b6071 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab @@ -8,17 +8,69 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8881739536043914635} m_Modifications: + - target: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.y + value: -0.165 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Radius + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.y + value: -0.165 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.z + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalPosition.x value: 0.2 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalPosition.y - value: 0.25 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalPosition.z - value: 0.2 + value: 0.165 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalRotation.w @@ -70,17 +122,69 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8881739536043914635} m_Modifications: + - target: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.y + value: -0.165 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.z + value: -0.1 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Radius + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.y + value: -0.165 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.z + value: -0.1 + objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalPosition.x value: -0.2 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalPosition.y - value: 0.25 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalPosition.z - value: 0.2 + value: 0.165 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab index 234795d0e..4e2728746 100644 --- a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab @@ -1947,9 +1947,9 @@ MonoBehaviour: m_NumColorKeys: 2 m_NumAlphaKeys: 2 outlineGradientInLocalSpace: 0 - outlineWidth: 0.45 + outlineWidth: 0.2 outlineBlurPasses: 2 - outlineQuality: 3 + outlineQuality: 2 outlineEdgeMode: 0 outlineEdgeThreshold: 0.995 outlineSharpness: 1 diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs index 4248d0aa1..31b36cdb7 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs @@ -96,7 +96,7 @@ public bool TryTeleportToPosition(Vector3 position) public bool HasReachedDestination() { - return _iAstarAi.pathPending == false && _iAstarAi.reachedEndOfPath; + return _iAstarAi.pathPending == false && _iAstarAi.reachedDestination; } public bool IsPositionMovable(Vector3 endPosition) diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs index 8ff387554..f2d0eeb04 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs @@ -95,11 +95,16 @@ public void RegisterHighlightProxy(GameObject highlightProxyObject) { var highlightProxy = highlightProxyObject.GetComponent(); _highlightProxy = highlightProxy; + _highlightProxy.enabled = true; ApplyHighlightSettings(highlightProxy); } public void ClearHighlightProxy() { + if (_highlightProxy) + { + _highlightProxy.enabled = false; + } _highlightProxy = null; } From e018efe9a42cd9c51f1318105385110f6f0e8357 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Mon, 1 Sep 2025 14:33:29 +0900 Subject: [PATCH 04/11] =?UTF-8?q?NPC=20=EC=8A=A4=ED=8F=B0=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Addressables/Scenes/Restaurant.unity | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 7e8272033..5f8f9542b 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -1573,15 +1573,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3} propertyPath: m_LocalPosition.x - value: 3.6498075 + value: 3.65 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3} propertyPath: m_LocalPosition.y - value: 0.53 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3} propertyPath: m_LocalPosition.z - value: 3.17 + value: 3.2 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3} propertyPath: m_LocalRotation.w @@ -6301,15 +6301,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3} propertyPath: m_LocalPosition.x - value: 6.541485 + value: 7.6 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3} propertyPath: m_LocalPosition.y - value: 0.53 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3} propertyPath: m_LocalPosition.z - value: 24.356 + value: 24.9 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3} propertyPath: m_LocalRotation.w From 92f24af250c84b97a833d81e09cfe21d7413bc59 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Mon, 1 Sep 2025 15:03:53 +0900 Subject: [PATCH 05/11] =?UTF-8?q?Prop=20World=20Ui=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/RestaurantOrder.prefab | 130 ++---------------- .../Component/PropUiDisplayComponent.cs | 22 ++- .../Component/RestaurantUiDisplayComponent.cs | 16 +-- 3 files changed, 35 insertions(+), 133 deletions(-) diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab index 09b034e02..84946ab73 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab @@ -9,7 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1664322405549350652} - - component: {fileID: 8522104897182006738} m_Layer: 0 m_Name: InteractionPoint m_TagString: Untagged @@ -32,61 +31,6 @@ Transform: m_Children: [] m_Father: {fileID: 3697702677815423220} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8522104897182006738 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3857692527302447930} - 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: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c607300554a0c44469620484fccbf239, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 5.12, y: 5.12} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &4103096974375017811 GameObject: m_ObjectHideFlags: 0 @@ -102,7 +46,6 @@ GameObject: - component: {fileID: 29040892075516248} - component: {fileID: 1332098886975329103} - component: {fileID: 3786917981383564029} - - component: {fileID: 1886819858489010523} m_Layer: 7 m_Name: RestaurantOrder m_TagString: Untagged @@ -223,7 +166,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: @@ -236,6 +179,18 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 4 + - Name: $v + Entry: 10 + Data: 0 + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -269,7 +224,7 @@ MonoBehaviour: _unavailableStyle: Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} Width: 0.5 - Opacity: 0.5 + Opacity: 1 _objectiveStyle: Color: {r: 0, g: 1, b: 1, a: 1} Width: 0.5 @@ -480,64 +435,9 @@ MonoBehaviour: seeThroughTextureUVSpace: 0 seeThroughTextureScale: 1 seeThroughChildrenSortingMode: 0 - rmsCount: 2 + rmsCount: 0 hitFxInitialIntensity: 0 hitFxMode: 0 hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 ---- !u!212 &1886819858489010523 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4103096974375017811} - 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: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c607300554a0c44469620484fccbf239, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 5.12, y: 5.12} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs index 20651703d..e7ade474d 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs @@ -7,10 +7,10 @@ namespace DDD.Restaurant { public abstract class PropUiDisplayComponent : SerializedMonoBehaviour where T : Enum { - [SerializeField] - protected Vector3 _offset = new Vector3(0.0f, 0.75f, 0.675f); [SerializeField] protected Vector3 _rotation = new Vector3(40.0f, 0, 0); + [SerializeField] + protected Sprite _defaultSprite; private IInteractionSubsystemObject _interactionSubsystemObject; private Dictionary _materialDictionary; private T _currentInteractionType; @@ -35,16 +35,19 @@ protected virtual void Initialize() // TODO: 임시 나중에 제대로 수정할 것 var uiGameObject = Instantiate(new GameObject("TemporaryUi"), transform); + + _spriteRenderer = uiGameObject.AddComponent(); + _spriteRenderer.sprite = GetDisplaySprite(); + _spriteRenderer.enabled = false; + _spriteTransform = uiGameObject.transform; uiGameObject.layer = LayerMask.NameToLayer("WorldUI"); UpdateSpriteTransform(); - - _spriteRenderer = uiGameObject.AddComponent(); - _spriteRenderer.enabled = false; + _materialDictionary = SetMaterialDictionary(); } - private void UpdateSpriteTransform() + protected virtual void UpdateSpriteTransform() { _spriteTransform.position = GetDisplayPosition(); _spriteTransform.rotation = Quaternion.Euler(GetDisplayRotation()); @@ -57,9 +60,14 @@ private bool GetOwnerInteractable(out IInteractable interactable) return isInteractionSubsystem; } + protected virtual Sprite GetDisplaySprite() + { + return _defaultSprite; + } + protected virtual Vector3 GetDisplayPosition() { - return transform.position + _offset; + return transform.position; } protected virtual Vector3 GetDisplayRotation() diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs index cebc84afe..2edef1651 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs @@ -9,7 +9,7 @@ namespace DDD.Restaurant public class RestaurantUiDisplayComponent : PropUiDisplayComponent { [SerializeField] - private Sprite _temporarySprite; + protected Vector3 _offset = new Vector3(0.0f, 0.75f, 0.675f); [SerializeField] private Vector2 _fixedSpriteSize = new Vector2(.2f, .2f); [OdinSerialize] @@ -19,10 +19,9 @@ protected override Dictionary SetMaterialDictiona return _materialDictionary; } - protected override void Initialize() + protected override void UpdateSpriteTransform() { - base.Initialize(); - _spriteRenderer.sprite = _temporarySprite; + base.UpdateSpriteTransform(); _spriteRenderer.transform.localScale = _fixedSpriteSize; } @@ -31,18 +30,13 @@ protected override Vector3 GetDisplayPosition() if (GetCurrentInteractionType() == RestaurantOrderType.Order) { // Find interaction points from interactable owner - if (_interactable == null) - { - return base.GetDisplayPosition(); - } - - var points = _interactable.GetInteractionPoints(); + var points = _interactable?.GetInteractionPoints(); if (points is { Length: > 0 }) { return points[0] + _offset; } } - return base.GetDisplayPosition(); + return transform.position; } } } \ No newline at end of file From e100edc360ec0837143e191fb5a398a4694fc42d Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Mon, 1 Sep 2025 15:16:01 +0900 Subject: [PATCH 06/11] =?UTF-8?q?RestaurantOrder-Serve=20=EC=8A=A4?= =?UTF-8?q?=ED=94=84=EB=9D=BC=EC=9D=B4=ED=8A=B8=20=EB=A0=8C=EB=8D=94=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/RestaurantOrder.prefab | 4 +-- .../Component/PropUiDisplayComponent.cs | 12 +++++-- .../Component/RestaurantUiDisplayComponent.cs | 31 ++++++++++++++++--- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab index 84946ab73..003272451 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab @@ -197,9 +197,9 @@ MonoBehaviour: - Name: Entry: 8 Data: - _offset: {x: 0, y: 1.5, z: 1.35} _rotation: {x: 40, y: 0, z: 0} - _temporarySprite: {fileID: 21300000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3} + _defaultSprite: {fileID: 21300000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3} + _offset: {x: 0, y: 1.5, z: 1.35} _fixedSpriteSize: {x: 0.2, y: 0.2} --- !u!114 &1332098886975329103 MonoBehaviour: diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs index e7ade474d..707183dcc 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs @@ -95,25 +95,31 @@ public void SetCurrentInteractionType(T interactionType) private void UpdateView(T state) { - if (UpdateSpriteMaterial(state)) + if (!UpdateSpriteMaterial(state)) { return; } UpdateSpriteTransform(); } + virtual protected Color GetSpriteColor() + { + return Color.white; + } + private bool UpdateSpriteMaterial(T state) { if (!_materialDictionary.TryGetValue(state, out var material) || material == null) { // TODO 캔버스 다운 _spriteRenderer.enabled = false; - return true; + return false; } + material.color = GetSpriteColor(); // ui 머티리얼 교체 _spriteRenderer.enabled = true; _spriteRenderer.material = material; - return false; + return true; } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs index 2edef1651..9829eb4d6 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs @@ -2,6 +2,7 @@ using UnityEngine; using Sirenix.OdinInspector; using Sirenix.Serialization; +using UnityEngine.Serialization; namespace DDD.Restaurant @@ -11,8 +12,12 @@ public class RestaurantUiDisplayComponent : PropUiDisplayComponent _materialDictionary = new(); protected override Dictionary SetMaterialDictionary() { @@ -22,7 +27,25 @@ protected override Dictionary SetMaterialDictiona protected override void UpdateSpriteTransform() { base.UpdateSpriteTransform(); - _spriteRenderer.transform.localScale = _fixedSpriteSize; + _spriteRenderer.transform.localScale = _fixedLocalScale; + } + + protected override Sprite GetDisplaySprite() + { + if (GetCurrentInteractionType() == RestaurantOrderType.Serve) + { + // TODO : Sprite by current restaurant order type. get from RestaurantOrderObject. + } + return base.GetDisplaySprite(); + } + + protected override Color GetSpriteColor() + { + if (GetCurrentInteractionType() == RestaurantOrderType.Serve) + { + return _disabledColor; + } + return base.GetSpriteColor(); } protected override Vector3 GetDisplayPosition() @@ -36,7 +59,7 @@ protected override Vector3 GetDisplayPosition() return points[0] + _offset; } } - return transform.position; + return transform.position + _disabledOffset; } } } \ No newline at end of file From 86518fcd84d051772c8fdf0793e91c30b23c5aa3 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Mon, 1 Sep 2025 15:25:06 +0900 Subject: [PATCH 07/11] =?UTF-8?q?WorldUiDisplay=20=EB=88=84=EB=9D=BD?= =?UTF-8?q?=EB=90=9C=20=EC=A7=81=EB=A0=AC=ED=99=94=20=EB=B3=B5=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs index 9829eb4d6..9bf89c93f 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs @@ -17,7 +17,7 @@ public class RestaurantUiDisplayComponent : PropUiDisplayComponent _materialDictionary = new(); protected override Dictionary SetMaterialDictionary() { From 32d2e31b50b1b6f667901fdc142e857e8dbcaaa9 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Mon, 1 Sep 2025 15:36:49 +0900 Subject: [PATCH 08/11] =?UTF-8?q?PropUiDisplay=20=EC=A7=81=EB=A0=AC?= =?UTF-8?q?=ED=99=94=20=EB=88=84=EB=9D=BD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interactables/Common/RestaurantOrder.prefab | 8 +++++--- .../Ui/OrderUi/Component/PropUiDisplayComponent.cs | 8 ++++---- .../Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs | 7 ++++++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab index 003272451..249c94e7f 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab @@ -172,7 +172,7 @@ MonoBehaviour: Data: - Name: $k Entry: 3 - Data: 2 + Data: 4 - Name: $v Entry: 10 Data: 0 @@ -184,7 +184,7 @@ MonoBehaviour: Data: - Name: $k Entry: 3 - Data: 4 + Data: 2 - Name: $v Entry: 10 Data: 0 @@ -200,7 +200,9 @@ MonoBehaviour: _rotation: {x: 40, y: 0, z: 0} _defaultSprite: {fileID: 21300000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3} _offset: {x: 0, y: 1.5, z: 1.35} - _fixedSpriteSize: {x: 0.2, y: 0.2} + _disabledOffset: {x: 0, y: 0.2, z: 0.165} + _fixedLocalScale: {x: 0.2, y: 0.2} + _disabledColor: {r: 0.6627451, g: 0.6627451, b: 0.6627451, a: 0.5} --- !u!114 &1332098886975329103 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs index 707183dcc..160b71c9b 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs @@ -12,7 +12,7 @@ public abstract class PropUiDisplayComponent : SerializedMonoBehaviour where [SerializeField] protected Sprite _defaultSprite; private IInteractionSubsystemObject _interactionSubsystemObject; - private Dictionary _materialDictionary; + private Dictionary _internalMaterials; private T _currentInteractionType; protected IInteractable _interactable; protected SpriteRenderer _spriteRenderer; @@ -22,7 +22,7 @@ private void Awake() Initialize(); } - protected abstract Dictionary SetMaterialDictionary(); + protected abstract Dictionary GetInteractionDisplayMaterials(); protected virtual void Initialize() { @@ -44,7 +44,7 @@ protected virtual void Initialize() uiGameObject.layer = LayerMask.NameToLayer("WorldUI"); UpdateSpriteTransform(); - _materialDictionary = SetMaterialDictionary(); + _internalMaterials = GetInteractionDisplayMaterials(); } protected virtual void UpdateSpriteTransform() @@ -109,7 +109,7 @@ virtual protected Color GetSpriteColor() private bool UpdateSpriteMaterial(T state) { - if (!_materialDictionary.TryGetValue(state, out var material) || material == null) + if (!_internalMaterials.TryGetValue(state, out var material) || material == null) { // TODO 캔버스 다운 _spriteRenderer.enabled = false; diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs index 9bf89c93f..636f936ea 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs @@ -19,11 +19,16 @@ public class RestaurantUiDisplayComponent : PropUiDisplayComponent _materialDictionary = new(); - protected override Dictionary SetMaterialDictionary() + protected override Dictionary GetInteractionDisplayMaterials() { return _materialDictionary; } + protected override void Initialize() + { + base.Initialize(); + } + protected override void UpdateSpriteTransform() { base.UpdateSpriteTransform(); From 529da3b713d360f3881a43a7bbd2ab5cd795c7b2 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Mon, 1 Sep 2025 16:26:38 +0900 Subject: [PATCH 09/11] =?UTF-8?q?RestaurantOrder=20Serve=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EC=9D=BC=20=EB=95=8C=20=EC=9D=8C=EC=8B=9D=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/RestaurantOrder.prefab | 7 +- .../SpatialUi_SpriteBubble_Translucent.mat | 368 ++++++++++++++++++ ...patialUi_SpriteBubble_Translucent.mat.meta | 8 + .../Restaurant/Order/bubble.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_001.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_002.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_003.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_004.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_005.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_006.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_007.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_008.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_009.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_011.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_012.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_013.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_014.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_016.png.meta | 2 +- .../Sprites/Ui/Foods/item_food_017.png.meta | 2 +- .../AssetPostprocessorSprite.cs | 2 +- .../InteractionSubsystem_Order.cs | 1 + .../RestaurantOrderSolver_Order.cs | 30 +- .../FlowStates/RestaurantManagementState.cs | 4 +- .../_Scripts/Restaurant/Ui/Hud/BillHud.cs | 7 +- .../Component/PropUiDisplayComponent.cs | 13 +- .../Component/RestaurantUiDisplayComponent.cs | 11 +- 26 files changed, 437 insertions(+), 46 deletions(-) create mode 100644 Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble_Translucent.mat create mode 100644 Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble_Translucent.mat.meta diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab index 249c94e7f..5d6eeb540 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab @@ -141,6 +141,7 @@ MonoBehaviour: SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: + - {fileID: 2100000, guid: 3420d0083698c4732af621bf37a11cbb, type: 2} - {fileID: 2100000, guid: cecea4c48dc174e34973ec5b33b2b2a9, type: 2} SerializedBytesString: Prefab: {fileID: 0} @@ -187,7 +188,7 @@ MonoBehaviour: Data: 2 - Name: $v Entry: 10 - Data: 0 + Data: 1 - Name: Entry: 8 Data: @@ -201,8 +202,8 @@ MonoBehaviour: _defaultSprite: {fileID: 21300000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3} _offset: {x: 0, y: 1.5, z: 1.35} _disabledOffset: {x: 0, y: 0.2, z: 0.165} - _fixedLocalScale: {x: 0.2, y: 0.2} - _disabledColor: {r: 0.6627451, g: 0.6627451, b: 0.6627451, a: 0.5} + _fixedLocalScale: {x: 0.3, y: 0.3} + _disabledColor: {r: 0.6627451, g: 0.6627451, b: 0.6627451, a: 0.65882355} --- !u!114 &1332098886975329103 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble_Translucent.mat b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble_Translucent.mat new file mode 100644 index 000000000..50dd16ed1 --- /dev/null +++ b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble_Translucent.mat @@ -0,0 +1,368 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SpatialUi_SpriteBubble_Translucent + m_Shader: {fileID: 4800000, guid: 13c02b14c4d048fa9653293d54f6e0e1, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BackgroundTexture: + m_Texture: {fileID: 2800000, guid: f88e7478e74a14cb6a820978eb9f452f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorRampTex: + m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorRampTexGradient: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorSwapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeBurnTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _GlowTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineDistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OverlayTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShineMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpriteTexture: + m_Texture: {fileID: 2800000, guid: 7394cfdc5ad4642058b80a859c8a7319, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _AddPrecomputedVelocity: 0 + - _Alpha: 1 + - _AlphaClip: 0 + - _AlphaCutoffValue: 0.25 + - _AlphaOutlineBlend: 1 + - _AlphaOutlineGlow: 5 + - _AlphaOutlineMinAlpha: 0 + - _AlphaOutlinePower: 1 + - _AlphaRoundThreshold: 0.5 + - _AlphaToMask: 0 + - _BillboardY: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BlurHD: 0 + - _BlurIntensity: 10 + - _Brightness: 0 + - _BumpScale: 1 + - _ChromAberrAlpha: 0.4 + - _ChromAberrAmount: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _ClipUvDown: 0 + - _ClipUvLeft: 0 + - _ClipUvRight: 0 + - _ClipUvUp: 0 + - _ColorChangeLuminosity: 0 + - _ColorChangeTolerance: 0.25 + - _ColorChangeTolerance2: 0.25 + - _ColorChangeTolerance3: 0.25 + - _ColorMask: 15 + - _ColorRampBlend: 1 + - _ColorRampLuminosity: 0 + - _ColorRampOutline: 0 + - _ColorSwapBlend: 1 + - _ColorSwapBlueLuminosity: 0.5 + - _ColorSwapGreenLuminosity: 0.5 + - _ColorSwapRedLuminosity: 0.5 + - _Contrast: 1 + - _Cull: 2 + - _CullingOption: 0 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DistortAmount: 0.5 + - _DistortTexXSpeed: 5 + - _DistortTexYSpeed: 5 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EditorDrawers: 6 + - _EnableExternalAlpha: 0 + - _EnvironmentReflections: 1 + - _FadeAmount: -0.1 + - _FadeBurnGlow: 2 + - _FadeBurnTransition: 0.075 + - _FadeBurnWidth: 0.025 + - _FishEyeUvAmount: 0.35 + - _FlickerAlpha: 0 + - _FlickerFreq: 0.2 + - _FlickerPercent: 0.05 + - _GhostBlend: 1 + - _GhostColorBoost: 1 + - _GhostTransparency: 0 + - _GlitchAmount: 3 + - _GlitchSize: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Glow: 10 + - _GlowGlobal: 1 + - _GradBlend: 1 + - _GradBoostX: 1.2 + - _GradBoostY: 1.2 + - _GradIsRadial: 0 + - _GrassManualAnim: 1 + - _GrassManualToggle: 0 + - _GrassRadialBend: 0.1 + - _GrassSpeed: 2 + - _GrassWind: 20 + - _GreyscaleBlend: 1 + - _GreyscaleLuminosity: 0 + - _GreyscaleOutline: 0 + - _HandDrawnAmount: 10 + - _HandDrawnSpeed: 5 + - _HitEffectBlend: 1 + - _HitEffectGlow: 5 + - _HologramBlend: 1 + - _HologramMaxAlpha: 0.75 + - _HologramMinAlpha: 0.1 + - _HologramStripesAmount: 0.1 + - _HologramStripesSpeed: 4.5 + - _HologramUnmodAmount: 0 + - _HsvBright: 1 + - _HsvSaturation: 1 + - _HsvShift: 180 + - _InnerOutlineAlpha: 1 + - _InnerOutlineGlow: 4 + - _InnerOutlineThickness: 1 + - _MaxXUV: 1 + - _MaxYUV: 1 + - _Metallic: 0 + - _MinXUV: 0 + - _MinYUV: 0 + - _MotionBlurAngle: 0.1 + - _MotionBlurDist: 1.25 + - _MyDstMode: 10 + - _MySrcMode: 5 + - _NegativeAmount: 1 + - _OcclusionStrength: 1 + - _OffsetUvX: 0 + - _OffsetUvY: 0 + - _OnlyInnerOutline: 0 + - _OnlyOutline: 0 + - _OutlineAlpha: 1 + - _OutlineDistortAmount: 0.5 + - _OutlineDistortTexXSpeed: 5 + - _OutlineDistortTexYSpeed: 5 + - _OutlineGlow: 1.5 + - _OutlinePixelWidth: 1 + - _OutlineTexXSpeed: 10 + - _OutlineTexYSpeed: 0 + - _OutlineWidth: 0.004 + - _OverlayBlend: 1 + - _OverlayGlow: 1 + - _OverlayTextureScrollXSpeed: 0.25 + - _OverlayTextureScrollYSpeed: 0.25 + - _Parallax: 0.005 + - _PinchUvAmount: 0.35 + - _PixelateSize: 32 + - _PosterizeGamma: 0.75 + - _PosterizeNumColors: 8 + - _PosterizeOutline: 0 + - _QueueOffset: 0 + - _RadialClip: 45 + - _RadialClip2: 0 + - _RadialStartAngle: 90 + - _RandomSeed: 0 + - _ReceiveShadows: 1 + - _RectSize: 1 + - _RotateUvAmount: 0 + - _RoundWaveSpeed: 2 + - _RoundWaveStrength: 0.7 + - _ShadowAlpha: 0.5 + - _ShadowX: 0.1 + - _ShadowY: -0.05 + - _ShakeUvSpeed: 2.5 + - _ShakeUvX: 1.5 + - _ShakeUvY: 1 + - _ShineGlow: 1 + - _ShineLocation: 0.5 + - _ShineRotate: 0 + - _ShineWidth: 0.1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _Surface: 0 + - _TextureScrollXSpeed: 1 + - _TextureScrollYSpeed: 0 + - _TwistUvAmount: 1 + - _TwistUvPosX: 0.5 + - _TwistUvPosY: 0.5 + - _TwistUvRadius: 0.75 + - _WarpScale: 0.5 + - _WarpSpeed: 8 + - _WarpStrength: 0.025 + - _WaveAmount: 7 + - _WaveSpeed: 10 + - _WaveStrength: 7.5 + - _WaveX: 0 + - _WaveY: 0.5 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZTestMode: 4 + - _ZWrite: 1 + - _ZoomUvAmount: 0.5 + m_Colors: + - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1} + - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 1, g: 1, b: 1, a: 1} + - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1} + - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} + - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} + - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} + - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} + - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1} + - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1} + - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _OverlayColor: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} + - _ShineColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &5575994803489782819 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble_Translucent.mat.meta b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble_Translucent.mat.meta new file mode 100644 index 000000000..a108a15bf --- /dev/null +++ b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble_Translucent.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3420d0083698c4732af621bf37a11cbb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png.meta b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png.meta index e7bbcd418..e894fda4c 100644 --- a/Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png.meta +++ b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/bubble.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_001.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_001.png.meta index 2eabb919e..45b64fb25 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_001.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_001.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.1015625} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_002.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_002.png.meta index b37a91067..5fb19ef35 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_002.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_002.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.068359375} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_003.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_003.png.meta index 5b55594b8..3eca2bd92 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_003.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_003.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.1171875} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_004.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_004.png.meta index 273cf4528..a1cb4843e 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_004.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_004.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.109375} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_005.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_005.png.meta index 4f78ce2d4..fedd58bc1 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_005.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_005.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_006.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_006.png.meta index ebcff3d75..19361ae16 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_006.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_006.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.12890625} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_007.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_007.png.meta index e37484d19..d715b878a 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_007.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_007.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.083984375} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_008.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_008.png.meta index 56db3be97..042ebe20a 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_008.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_008.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.091796875} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_009.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_009.png.meta index 5d242638b..553b66a64 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_009.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_009.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.021484375} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_011.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_011.png.meta index 02d9115e3..00d6df70c 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_011.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_011.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.05859375} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_012.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_012.png.meta index 2990a9715..da0ee65b5 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_012.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_012.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.044921875} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_013.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_013.png.meta index 2f2224869..e756b3c78 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_013.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_013.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.0703125} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_014.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_014.png.meta index 19c8f5f99..92741e954 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_014.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_014.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.05078125} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_016.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_016.png.meta index 602d157b4..72719b525 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_016.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_016.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_017.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_017.png.meta index 1833eb119..0c5e4151e 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_017.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_017.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.03515625} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs index 1c4c17d5e..281a6e9e7 100644 --- a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs @@ -47,7 +47,7 @@ public static void OnPreprocessTextureForUi(TextureImporter importer) importer.spriteImportMode = SpriteImportMode.Single; // 기본 PPU (UI는 100 또는 1 고정 추천) - importer.spritePixelsPerUnit = 100f; + // importer.spritePixelsPerUnit = 100f; importer.sRGBTexture = true; importer.isReadable = false; diff --git a/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs index 6b8a4ad8d..5384e5cb6 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs @@ -19,6 +19,7 @@ public class RestaurantOrderObjectState public GameObject Customer; public GameObject Worker; + public string RecipeId; public string FoodId; } diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs index f8a3d2b0c..a03a0bbff 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs @@ -15,7 +15,7 @@ public string MenuId public class RestaurantOrderEvent : IEvent { - public string RecipeId; + public RestaurantOrderObjectState OrderObjectState; } public class RestaurantOrderSolver_Order : RestaurantOrderSolverBase @@ -27,30 +27,34 @@ public override bool ExecuteInteractionSubsystem(IInteractor interactor, IIntera var highlightComponent = highlightObject?.GetComponent(); highlightComponent?.ClearHighlightProxy(); - // Worker takes the order - var orderObject = GetRestaurantOrderObject(interactable); - if (orderObject != null) - { - orderObject.GetOrderObjectState().Worker = interactor.GetInteractorGameObject(); - } - // Pick random menu from today's menu list - var foodCandidates = RestaurantState.Instance.ManagementState.GetTodayFoodMenus(); - if (foodCandidates == null || foodCandidates.Count == 0) + var recipeCandidates = RestaurantState.Instance.ManagementState.GetTodayRecipes(); + if (recipeCandidates == null || recipeCandidates.Count == 0) { Debug.LogError("[RestaurantOrderSolver_Order] No food menu found"); return false; } // TODO : 손님 데이터를 바탕으로 선호하는 음식을 골라야 할수도 있음. interactable에서 직접 가져오거나 payload로 전달받아야 함. payload를 받을 경우 RestaurantOrderMenuPayload와 통합해야함 - var foodMenu = foodCandidates[Random.Range(0, foodCandidates.Count)]; + var recipeMenu = recipeCandidates[Random.Range(0, recipeCandidates.Count)]; + + // Worker takes the order + var orderObject = GetRestaurantOrderObject(interactable); + if (orderObject != null) + { + orderObject.GetOrderObjectState().Worker = interactor.GetInteractorGameObject(); + orderObject.GetOrderObjectState().RecipeId = recipeMenu; + var recipeData = DataManager.Instance.GetDataAsset(); + recipeData.TryGetDataById(recipeMenu, out var recipeDataEntry); + orderObject.GetOrderObjectState().FoodId = recipeDataEntry?.RecipeResult; + } // Create payload and set the menu RestaurantOrderMenuPayload orderPayload = ScriptableObject.CreateInstance(); - orderPayload.MenuId = foodMenu; + orderPayload.MenuId = recipeMenu; RestaurantOrderEvent evt = new RestaurantOrderEvent(); - evt.RecipeId = foodMenu; + evt.OrderObjectState = orderObject?.GetOrderObjectState(); EventBus.Broadcast(evt); return base.ExecuteInteractionSubsystem(interactor, interactable, payload); diff --git a/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs index d74454884..312475a3a 100644 --- a/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs +++ b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs @@ -63,12 +63,12 @@ public bool HasMatchedMenuWithCookware() return _cookwareToRecipeMapping.Values.Any(recipeSet => recipeSet.Count > 0); } - public List GetTodayFoodMenus() + public List GetTodayRecipes() { return _todayFoodRecipeAndAmounts.Keys.ToList(); } - public int GetTodayFoodAvailableCount(string recipeId) + public int GetTodayRecipeAvailableCount(string recipeId) { return _todayFoodRecipeAndAmounts.GetValueOrDefault(recipeId, 0); } diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs index 21daed8ab..4624d793c 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs @@ -19,12 +19,7 @@ private void Start() public void HandleEvent(RestaurantOrderEvent evt) { var billItem = Instantiate(_billItemPrefab, _billItemsLayoutTransform); - var recipeData = DataManager.Instance.GetDataAsset(); - if (recipeData.TryGetDataById(evt.RecipeId, out var recipeDataEntry)) - { - var sprite = DataManager.Instance.GetSprite(recipeDataEntry.RecipeResult); - billItem.GetComponent().sprite = sprite; - } + var sprite = DataManager.Instance.GetSprite(evt.OrderObjectState?.FoodId); } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs index 160b71c9b..a74b4ba3f 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs @@ -11,7 +11,7 @@ public abstract class PropUiDisplayComponent : SerializedMonoBehaviour where protected Vector3 _rotation = new Vector3(40.0f, 0, 0); [SerializeField] protected Sprite _defaultSprite; - private IInteractionSubsystemObject _interactionSubsystemObject; + protected IInteractionSubsystemObject _interactionSubsystemObject; private Dictionary _internalMaterials; private T _currentInteractionType; protected IInteractable _interactable; @@ -37,7 +37,7 @@ protected virtual void Initialize() var uiGameObject = Instantiate(new GameObject("TemporaryUi"), transform); _spriteRenderer = uiGameObject.AddComponent(); - _spriteRenderer.sprite = GetDisplaySprite(); + UpdateSprite(); _spriteRenderer.enabled = false; _spriteTransform = uiGameObject.transform; @@ -47,6 +47,11 @@ protected virtual void Initialize() _internalMaterials = GetInteractionDisplayMaterials(); } + private void UpdateSprite() + { + _spriteRenderer.sprite = GetDisplaySprite(); + } + protected virtual void UpdateSpriteTransform() { _spriteTransform.position = GetDisplayPosition(); @@ -99,6 +104,7 @@ private void UpdateView(T state) { return; } + UpdateSprite(); UpdateSpriteTransform(); } @@ -115,7 +121,8 @@ private bool UpdateSpriteMaterial(T state) _spriteRenderer.enabled = false; return false; } - material.color = GetSpriteColor(); + // material.color = Color.white; + _spriteRenderer.color = GetSpriteColor(); // ui 머티리얼 교체 _spriteRenderer.enabled = true; _spriteRenderer.material = material; diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs index 636f936ea..f958f894c 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs @@ -37,9 +37,16 @@ protected override void UpdateSpriteTransform() protected override Sprite GetDisplaySprite() { - if (GetCurrentInteractionType() == RestaurantOrderType.Serve) + if (GetCurrentInteractionType() == RestaurantOrderType.Serve && _interactionSubsystemObject != null) { - // TODO : Sprite by current restaurant order type. get from RestaurantOrderObject. + // Sprite by current restaurant order type. get from RestaurantOrderObject. + if (_interactionSubsystemObject is IRestaurantOrderObject orderObject) + { + string foodId = orderObject.GetOrderObjectState().FoodId; + Debug.Assert(foodId != null, nameof(foodId) + " != null"); + var sprite = DataManager.Instance.GetSprite(foodId); + return sprite; + } } return base.GetDisplaySprite(); } From 2edec060c5c2a9a8e402899755115f93420f59ad Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Mon, 1 Sep 2025 16:33:43 +0900 Subject: [PATCH 10/11] =?UTF-8?q?PropUiDisplay=20=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=96=B4=20=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ui/OrderUi/Component/PropUiDisplayComponent.cs | 9 ++++++++- .../Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs index a74b4ba3f..a8d034ae6 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs @@ -41,7 +41,7 @@ protected virtual void Initialize() _spriteRenderer.enabled = false; _spriteTransform = uiGameObject.transform; - uiGameObject.layer = LayerMask.NameToLayer("WorldUI"); + uiGameObject.layer = GetDisplayLayer(); UpdateSpriteTransform(); _internalMaterials = GetInteractionDisplayMaterials(); @@ -65,6 +65,11 @@ private bool GetOwnerInteractable(out IInteractable interactable) return isInteractionSubsystem; } + protected virtual int GetDisplayLayer() + { + return LayerMask.NameToLayer("WorldUI"); + } + protected virtual Sprite GetDisplaySprite() { return _defaultSprite; @@ -126,6 +131,8 @@ private bool UpdateSpriteMaterial(T state) // ui 머티리얼 교체 _spriteRenderer.enabled = true; _spriteRenderer.material = material; + _spriteTransform.gameObject.layer = GetDisplayLayer(); + return true; } } diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs index f958f894c..aa8d0454e 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs @@ -73,5 +73,14 @@ protected override Vector3 GetDisplayPosition() } return transform.position + _disabledOffset; } + + protected override int GetDisplayLayer() + { + if (GetCurrentInteractionType() == RestaurantOrderType.Serve) + { + return LayerMask.NameToLayer("Prop"); + } + return base.GetDisplayLayer(); + } } } \ No newline at end of file From b7ad8ebae9d65338283230c32861aebc62cf24eb Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Mon, 1 Sep 2025 16:38:42 +0900 Subject: [PATCH 11/11] =?UTF-8?q?Bill=20=EC=9D=8C=EC=8B=9D=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=20=EB=88=84=EB=9D=BD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs index 4624d793c..8df145532 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs @@ -20,6 +20,7 @@ public void HandleEvent(RestaurantOrderEvent evt) { var billItem = Instantiate(_billItemPrefab, _billItemsLayoutTransform); var sprite = DataManager.Instance.GetSprite(evt.OrderObjectState?.FoodId); + billItem.GetComponent().sprite = sprite; } } } \ No newline at end of file