diff --git a/Assets/Editor/SpineSettings.asset b/Assets/Editor/SpineSettings.asset index bba27d7f2..15f190574 100644 --- a/Assets/Editor/SpineSettings.asset +++ b/Assets/Editor/SpineSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4d9a11e8d19732181b24e606b87465c1ea09a4507b0e0e5424cc2ba8f24706e -size 1172 +oid sha256:39182460feaf7c1a833577c31de910f42f6a3b2c6b251898b809fe945c712d72 +size 1315 diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab index 546d96553..6220a9d00 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab @@ -98,6 +98,9 @@ GameObject: - component: {fileID: 3697702677815423220} - component: {fileID: 3591347921553422000} - component: {fileID: 4456475204957017828} + - component: {fileID: 2950132940454135295} + - component: {fileID: 29040892075516248} + - component: {fileID: 1332098886975329103} m_Layer: 7 m_Name: RestaurantOrder m_TagString: Untagged @@ -154,4 +157,265 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c0b1e0992510498b8d33d5b6094b8f4b, type: 3} m_Name: m_EditorClassIdentifier: - orderType: 0 + _currentRestaurantOrderType: 0 +--- !u!135 &2950132940454135295 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4103096974375017811} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.2 + m_Center: {x: -0.4, y: 0, z: 0} +--- !u!114 &29040892075516248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4103096974375017811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3} + m_Name: + m_EditorClassIdentifier: + profile: {fileID: 0} + profileSync: 0 + camerasLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + effectGroup: 0 + effectTarget: {fileID: 0} + effectGroupLayer: + serializedVersion: 2 + m_Bits: 4294967295 + effectNameFilter: + effectNameUseRegEx: 0 + combineMeshes: 0 + alphaCutOff: 0.5 + cullBackFaces: 0 + padding: 0 + ignoreObjectVisibility: 0 + reflectionProbes: 0 + GPUInstancing: 1 + sortingPriority: 0 + optimizeSkinnedMesh: 1 + depthClip: 0 + cameraDistanceFade: 0 + cameraDistanceFadeNear: 0 + cameraDistanceFadeFar: 1000 + normalsOption: 0 + ignore: 0 + _highlighted: 0 + fadeInDuration: 0 + fadeOutDuration: 0 + flipY: 0 + constantWidth: 1 + extraCoveragePixels: 0 + minimumWidth: 0 + subMeshMask: -1 + overlay: 0 + overlayMode: 0 + overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + overlayAnimationSpeed: 1 + overlayMinIntensity: 0.5 + overlayBlending: 1 + overlayTexture: {fileID: 0} + overlayTextureUVSpace: 0 + overlayTextureScale: 1 + overlayTextureScrolling: {x: 0, y: 0} + overlayVisibility: 0 + outline: 1 + outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineColorStyle: 0 + outlineGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + outlineGradientInLocalSpace: 0 + outlineWidth: 0.45 + outlineBlurPasses: 2 + outlineQuality: 2 + outlineEdgeMode: 0 + outlineEdgeThreshold: 0.995 + outlineSharpness: 1 + outlineDownsampling: 1 + outlineVisibility: 0 + glowBlendMode: 0 + outlineBlitDebug: 0 + outlineIndependent: 0 + outlineContourStyle: 0 + outlineMaskMode: 0 + glow: 0 + glowWidth: 0.4 + glowQuality: 2 + glowBlurMethod: 0 + glowDownsampling: 2 + glowHQColor: {r: 0.64, g: 1, b: 0, a: 1} + glowDithering: 1 + glowDitheringStyle: 0 + glowMagicNumber1: 0.75 + glowMagicNumber2: 0.5 + glowAnimationSpeed: 1 + glowVisibility: 0 + glowBlitDebug: 0 + glowBlendPasses: 1 + glowPasses: + - offset: 4 + alpha: 0.1 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 3 + alpha: 0.2 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 2 + alpha: 0.3 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 1 + alpha: 0.4 + color: {r: 0.64, g: 1, b: 0, a: 1} + glowMaskMode: 0 + innerGlow: 0 + innerGlowWidth: 1 + innerGlowColor: {r: 1, g: 1, b: 1, a: 1} + innerGlowBlendMode: 0 + innerGlowVisibility: 0 + targetFX: 0 + targetFXTexture: {fileID: 0} + targetFXColor: {r: 1, g: 1, b: 1, a: 1} + targetFXCenter: {fileID: 0} + targetFXRotationSpeed: 50 + targetFXInitialScale: 4 + targetFXEndScale: 1.5 + targetFXScaleToRenderBounds: 1 + targetFXUseEnclosingBounds: 0 + targetFXAlignToGround: 0 + targetFXOffset: {x: 0, y: 0, z: 0} + targetFXFadePower: 32 + targetFXGroundMaxDistance: 10 + targetFXGroundLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + targetFXTransitionDuration: 0.5 + targetFXStayDuration: 1.5 + targetFXVisibility: 1 + iconFX: 0 + iconFXMesh: {fileID: 0} + iconFXLightColor: {r: 1, g: 1, b: 1, a: 1} + iconFXDarkColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + iconFXCenter: {fileID: 0} + iconFXRotationSpeed: 50 + iconFXAnimationOption: 0 + iconFXAnimationAmount: 0.1 + iconFXAnimationSpeed: 3 + iconFXScale: 1 + iconFXScaleToRenderBounds: 0 + iconFXOffset: {x: 0, y: 1, z: 0} + iconFXTransitionDuration: 0.5 + iconFXStayDuration: 1.5 + seeThrough: 2 + seeThroughOccluderMask: + serializedVersion: 2 + m_Bits: 4294967295 + seeThroughOccluderThreshold: 0.3 + seeThroughOccluderMaskAccurate: 0 + seeThroughOccluderCheckInterval: 1 + seeThroughOccluderCheckIndividualObjects: 0 + seeThroughDepthOffset: 0 + seeThroughMaxDepth: 0 + seeThroughIntensity: 0.8 + seeThroughTintAlpha: 0.5 + seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1} + seeThroughNoise: 1 + seeThroughBorder: 0 + seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1} + seeThroughBorderOnly: 0 + seeThroughBorderWidth: 0.45 + seeThroughOrdered: 0 + seeThroughTexture: {fileID: 0} + seeThroughTextureUVSpace: 0 + seeThroughTextureScale: 1 + seeThroughChildrenSortingMode: 0 + rmsCount: 1 + hitFxInitialIntensity: 0 + hitFxMode: 0 + hitFxFadeOutDuration: 0.25 + hitFxColor: {r: 1, g: 1, b: 1, a: 1} + hitFxRadius: 0.5 +--- !u!114 &1332098886975329103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4103096974375017811} + 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 + Opacity: 1 + _focusedStyle: + Color: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + Width: 1 + Opacity: 1 + _unavailableStyle: + Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + Width: 0.5 + Opacity: 1 + _objectiveStyle: + Color: {r: 0, g: 1, b: 1, a: 1} + Width: 1 + Opacity: 1 + _breathingSpeed: 2 + _breathingRange: 0.3 + _enableBreathingEffect: 1 + _alphaCutOff: 0.5 + _combineMeshes: 1 + _constantWidth: 1 + _outlineQuality: 2 + _outlineIndependent: 1 + _outlineBlurPasses: 1 + _outlineSharpness: 8 + _currentOutlineType: 0 + _currentOpacityMultiplier: 1 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Fence.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_Fence.prefab index d58987e20..2a49e4bf2 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_Fence.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_Fence.prefab @@ -10,15 +10,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.x - value: 4 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.y - value: 4 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.z - value: 4 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/Coral/Coral_SkeletonData.asset b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/Coral/Coral_SkeletonData.asset index 9ce98893c..154bd5924 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/Coral/Coral_SkeletonData.asset +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/Coral/Coral_SkeletonData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9559880fe04dc6d3e2e8e82c976fb71c5593ae175bd37c0d14fa05738dd439a5 -size 912 +oid sha256:ab86b4673827ea879e2a67f75b815a35d1b84ac04a8f29558ff64dc0a0345ba2 +size 913 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch.meta b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch.meta new file mode 100644 index 000000000..704913595 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c9e29468f02a6c74da61351562ff5cce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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 new file mode 100644 index 000000000..1bd80c465 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas.txt @@ -0,0 +1,69 @@ +OpenSwitch.png +size:1992,1408 +filter:Linear,Linear +Eyelight +bounds:650,841,182,115 +Fire01 +bounds:834,865,106,79 +rotate:90 +Fire02 +bounds:473,816,175,140 +Fire03 +bounds:1642,42,210,201 +rotate:90 +Fire04 +bounds:1761,262,221,240 +Fire05 +bounds:1761,504,223,277 +Fire06 +bounds:1519,463,240,318 +Fire07 +bounds:847,8,284,368 +Fire08 +bounds:1727,998,263,408 +Fire09 +bounds:430,2,332,415 +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 +rotate:90 +Fire15 +bounds:1133,2,308,428 +Fire16 +bounds:1202,456,315,426 +Fire17 +bounds:1107,978,308,428 +Fire18 +bounds:298,336,292,451 +Fire19 +bounds:2,333,294,454 +Fire20 +bounds:473,958,313,448 +ribbon01 +bounds:915,871,100,57 +rotate:90 +ribbon02 +bounds:1642,254,74,207 +ribbon03 +bounds:974,879,92,171 +rotate:90 +ribbon04 +bounds:1147,884,92,171 +rotate:90 +switch01 +bounds:2,789,469,617 +switch02 +bounds:1593,783,397,197 +switch03 +bounds:1443,57,397,197 +rotate:90 +switchknob +bounds:1320,886,271,90 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas.txt.meta b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas.txt.meta new file mode 100644 index 000000000..ac7f95643 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3003f3e6f2bf08c4a9d7c1478388be6e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.png b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.png new file mode 100644 index 000000000..6172f043a --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:279df255ad6e323b63a7a46a65b5bc9c6b32da87f6931ad53899f6dfe510f973 +size 1349657 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.png.meta b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.png.meta new file mode 100644 index 000000000..ecfab4689 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 5527cfe7bf173524b9f8da67f9b6c6c0 +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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: 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 new file mode 100644 index 000000000..5ea846e72 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.skel.bytes @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52972f7c5ec8ed28135cbaf0a32c9976e06ec6105348121832ee8edde02f2993 +size 7222 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.skel.bytes.meta b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.skel.bytes.meta new file mode 100644 index 000000000..df4e3987b --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: af26bb05b21ba794caf32a11d5a3f062 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Atlas.asset b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Atlas.asset new file mode 100644 index 000000000..7b8d42951 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Atlas.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a312998f0a63c7f616e6fec01f0fa9deed8b46ab5e013ed4bdf4ff559169905d +size 630 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Atlas.asset.meta b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Atlas.asset.meta new file mode 100644 index 000000000..7c8d4a78e --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0526b46b8123f94aabee69711470684 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Material.mat b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Material.mat new file mode 100644 index 000000000..15d88cb48 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Material.mat @@ -0,0 +1,43 @@ +%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: OpenSwitch_Material + m_Shader: {fileID: 4800000, guid: b2f45941d9f4fe9479ce1aebb9d63fbf, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 5527cfe7bf173524b9f8da67f9b6c6c0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _TintBlack: 0 + - _ZWrite: 0 + m_Colors: + - _Black: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Material.mat.meta b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Material.mat.meta new file mode 100644 index 000000000..4d732d773 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a287e4cf739397e41a00b772a97fc1f7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_SkeletonData.asset b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_SkeletonData.asset new file mode 100644 index 000000000..de81028af --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_SkeletonData.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d665bbe284e17ca361cbb9ad9791b47ccb7ffe23fe33b67ee06b0cdcc307d7e6 +size 918 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_SkeletonData.asset.meta b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_SkeletonData.asset.meta new file mode 100644 index 000000000..0f6c54df6 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Spines/OpenSwitch/OpenSwitch_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d89793e4ce0651c4885db355edd439d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/AI/Customer/Subtree/CustomerDefault.asset b/Assets/_DDD/_Addressables/AI/Customer/Subtree/CustomerDefault.asset index a793b242d..fdfd90ada 100644 --- a/Assets/_DDD/_Addressables/AI/Customer/Subtree/CustomerDefault.asset +++ b/Assets/_DDD/_Addressables/AI/Customer/Subtree/CustomerDefault.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:277f8b3b25cfe078e4838cab1222b85e5dae0bc036cb39e5f84b6e3b3fce1cd0 -size 68048 +oid sha256:4d98b77206ba374a44c488e0c83a0970ea49d46ab9e1802277e48352d9cc1a98 +size 66395 diff --git a/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset b/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset index 7e7bb95e0..6ff001db6 100644 --- a/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset +++ b/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6da8678bc90f664244b89aa26dc5c6b01c51567387ea3414b916fb27082f752b -size 16520 +oid sha256:28c1a3c2113f824ca9b3493aa71a73bffa3040160b830e2fde428b5c7bbe1610 +size 16553 diff --git a/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab index 3a88ae0ea..55acc7db6 100644 --- a/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab +++ b/Assets/_DDD/_Addressables/Environments/Prop/MenuBoard/PropMenuBoard.prefab @@ -71,7 +71,7 @@ PrefabInstance: - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: 57b8c50dcc17d23488ae2f49e6ae0195, type: 2} + objectReference: {fileID: 2100000, guid: 8735f3d63bc14e74da558970523bd1bd, type: 2} - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Size.x value: 1 @@ -383,4 +383,3 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _managementType: 0 - _cookwareType: 0 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 126935cf0..6588b6beb 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -119,6 +119,115 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &3731774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3731775} + - component: {fileID: 3731778} + - component: {fileID: 3731777} + - component: {fileID: 3731776} + m_Layer: 0 + m_Name: Plane_029 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &3731775 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3731774} + 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_LocalScale: {x: 0.29397187, y: 0.21705438, z: 0.1950584} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1274705225} + m_LocalEulerAnglesHint: {x: 0, y: -0.223, z: 0} +--- !u!64 &3731776 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3731774} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3731777 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3731774} + 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: 31321ba15b8f8eb4c954353edc038b1d, 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 &3731778 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3731774} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &21055480 PrefabInstance: m_ObjectHideFlags: 0 @@ -127,17 +236,29 @@ PrefabInstance: 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: 1.439 + value: 2.41598 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalPosition.y - value: 0.347 + value: 3.73 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalPosition.z - value: -0.147 + value: 27.171999 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalRotation.w @@ -245,10 +366,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 833084250} - {fileID: 1535615172} - - {fileID: 677451726} - - {fileID: 1917509849} - {fileID: 2126882191} m_Father: {fileID: 531027750} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -323,7 +441,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.x - value: -1.5699997 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.y @@ -331,7 +449,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.z - value: 11.51 + value: 10.83 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalRotation.w @@ -416,7 +534,6 @@ Transform: - {fileID: 1986236741} - {fileID: 1771012165} - {fileID: 1757685827} - - {fileID: 2056055817} - {fileID: 1887891931} - {fileID: 571830392} - {fileID: 661919367} @@ -594,115 +711,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} m_PrefabInstance: {fileID: 120525693} m_PrefabAsset: {fileID: 0} ---- !u!1 &133083813 -GameObject: +--- !u!1001 &137615614 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 133083814} - - component: {fileID: 133083817} - - component: {fileID: 133083816} - - component: {fileID: 133083815} - m_Layer: 0 - m_Name: Plane_030 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 0 ---- !u!4 &133083814 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133083813} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.38268343, z: -0, w: 0.92387956} - m_LocalPosition: {x: -1.4699998, y: 0.004, z: 11.5} - m_LocalScale: {x: 0.19961, y: 0.20989999, z: 0.20264} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1274705225} - m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} ---- !u!64 &133083815 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 531027750} + m_Modifications: + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalPosition.x + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalPosition.y + value: -0.189 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalPosition.z + value: 15.83 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_Name + value: Prop_Fence_001 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} +--- !u!4 &137615615 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + m_PrefabInstance: {fileID: 137615614} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133083813} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 0 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &133083816 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133083813} - 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: 31321ba15b8f8eb4c954353edc038b1d, 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 &133083817 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133083813} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &140557231 stripped Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} @@ -950,7 +1024,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: 1adf83789591d4cef928dc9f32c49610, type: 3} propertyPath: m_LocalPosition.x - value: -13.699 + value: -47.64 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1adf83789591d4cef928dc9f32c49610, type: 3} propertyPath: m_LocalPosition.y @@ -958,7 +1032,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1adf83789591d4cef928dc9f32c49610, type: 3} propertyPath: m_LocalPosition.z - value: 10.7 + value: 13.45 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1adf83789591d4cef928dc9f32c49610, type: 3} propertyPath: m_LocalRotation.w @@ -966,15 +1040,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1adf83789591d4cef928dc9f32c49610, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1adf83789591d4cef928dc9f32c49610, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1adf83789591d4cef928dc9f32c49610, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1adf83789591d4cef928dc9f32c49610, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1279,7 +1353,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.x - value: -11.003576 + value: -11.03 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.y @@ -1287,7 +1361,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.z - value: 10.90914 + value: 14.79 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalRotation.w @@ -1508,7 +1582,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: b42751c087f6610428eb4bf6264f0dc0, type: 3} propertyPath: m_LocalPosition.x - value: -10.919001 + value: -45.77 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: b42751c087f6610428eb4bf6264f0dc0, type: 3} propertyPath: m_LocalPosition.y @@ -1516,7 +1590,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: b42751c087f6610428eb4bf6264f0dc0, type: 3} propertyPath: m_LocalPosition.z - value: 10.79 + value: 11.62 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: b42751c087f6610428eb4bf6264f0dc0, type: 3} propertyPath: m_LocalRotation.w @@ -1570,7 +1644,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.x - value: -14.519 + value: -43.25 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.y @@ -1578,7 +1652,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.z - value: 10.83 + value: 15.849999 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalRotation.w @@ -2621,19 +2695,19 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 756009984} m_Modifications: - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} propertyPath: m_LocalPosition.x - value: 1.1149255 + value: -58.299995 objectReference: {fileID: 0} - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} propertyPath: m_LocalPosition.y - value: -0.0020017624 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} propertyPath: m_LocalPosition.z - value: 15.02 + value: 16.18 objectReference: {fileID: 0} - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} propertyPath: m_LocalRotation.w @@ -2641,15 +2715,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2672,6 +2746,115 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fa353764662051b4aa59a202b194039b, type: 3} +--- !u!1 &530276984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 530276985} + - component: {fileID: 530276988} + - component: {fileID: 530276987} + - component: {fileID: 530276986} + m_Layer: 0 + m_Name: Plane_028 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &530276985 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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_LocalScale: {x: 0.29397187, y: 0.21705438, z: 0.1950584} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1274705225} + m_LocalEulerAnglesHint: {x: 0, y: -0.223, z: 0} +--- !u!64 &530276986 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530276984} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &530276987 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530276984} + 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: 31321ba15b8f8eb4c954353edc038b1d, 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 &530276988 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530276984} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &531027749 GameObject: m_ObjectHideFlags: 0 @@ -2712,6 +2895,8 @@ Transform: - {fileID: 710312887} - {fileID: 1121757852} - {fileID: 1597471105} + - {fileID: 137615615} + - {fileID: 1376251426} - {fileID: 501655975} - {fileID: 421445003} - {fileID: 595841747} @@ -3350,7 +3535,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.x - value: -7.09 + value: -6.44 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.y @@ -3358,7 +3543,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.z - value: 12.68 + value: 10.83 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalRotation.w @@ -3711,7 +3896,7 @@ Transform: 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: 0.15793099, y: 0.157931, z: 0.157931} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 110947503} @@ -3957,72 +4142,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 9a40bae43e44b7943afced8a73294742, type: 3} m_PrefabInstance: {fileID: 341502325} m_PrefabAsset: {fileID: 0} ---- !u!1001 &677451725 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 34818738} - m_Modifications: - - target: {fileID: 4689806172687901599, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalScale.x - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalPosition.x - value: -8.47 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalPosition.z - value: 7.24 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9211739394093953175, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_Name - value: Prop_RumBarrel_027 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} ---- !u!4 &677451726 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - m_PrefabInstance: {fileID: 677451725} - m_PrefabAsset: {fileID: 0} --- !u!1001 &685969034 PrefabInstance: m_ObjectHideFlags: 0 @@ -4049,7 +4168,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.x - value: -8.7 + value: -32.94 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.y @@ -4057,7 +4176,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.z - value: 10.83 + value: 13.15 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalRotation.w @@ -4120,7 +4239,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.x - value: -10.681574 + value: -10.707997 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.y @@ -4128,7 +4247,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.z - value: 11.105141 + value: 14.986001 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalRotation.w @@ -4394,16 +4513,20 @@ Transform: m_GameObject: {fileID: 756009983} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -24.24, y: 0, z: 2.32} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1113365219} + - {fileID: 1906384754} + - {fileID: 1439675990} + - {fileID: 1521649615} - {fileID: 303186986} - {fileID: 1916912155} - {fileID: 1663388449} - {fileID: 154479733} - {fileID: 823489446} + - {fileID: 825053429} + - {fileID: 893215178} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &758425158 @@ -4483,17 +4606,29 @@ PrefabInstance: 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: 3.204 + value: 7.99798 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalPosition.y - value: -1.575 + value: -0.11400008 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalPosition.z - value: -6.993 + value: 13.905999 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalRotation.w @@ -4884,7 +5019,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.x - value: -12.88694 + value: -46.04 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y @@ -4892,7 +5027,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.z - value: 10.83 + value: 17.72 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.w @@ -5047,7 +5182,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3102649314828302494, guid: 8bbc5a3a79a43814b88e3f5c5df9fdd4, type: 3} propertyPath: m_LocalPosition.x - value: 6.13 + value: 2.49 objectReference: {fileID: 0} - target: {fileID: 3102649314828302494, guid: 8bbc5a3a79a43814b88e3f5c5df9fdd4, type: 3} propertyPath: m_LocalPosition.y @@ -5087,7 +5222,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3949272651232056691, guid: 8bbc5a3a79a43814b88e3f5c5df9fdd4, type: 3} propertyPath: m_LocalPosition.x - value: -1.61 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -5161,6 +5296,88 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} m_PrefabInstance: {fileID: 685969034} m_PrefabAsset: {fileID: 0} +--- !u!1001 &825053428 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 756009984} + m_Modifications: + - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_LocalPosition.x + value: -49.75 + 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: 17.74 + 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 &825053429 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + m_PrefabInstance: {fileID: 825053428} + m_PrefabAsset: {fileID: 0} --- !u!1001 &830615546 PrefabInstance: m_ObjectHideFlags: 0 @@ -5226,68 +5443,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7cfc30e9807ebb54e92fbc67239154cc, type: 3} ---- !u!4 &833084250 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - m_PrefabInstance: {fileID: 1458281794} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &852575416 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} - propertyPath: m_LocalPosition.x - value: -0.52 - objectReference: {fileID: 0} - - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} - propertyPath: m_LocalPosition.y - value: -0.0020017624 - objectReference: {fileID: 0} - - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} - propertyPath: m_LocalPosition.z - value: 15.017 - objectReference: {fileID: 0} - - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7218816355439079511, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} - propertyPath: m_Name - value: Prop_MenuBoard4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} --- !u!4 &876101440 stripped Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} @@ -5481,6 +5636,115 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &893215177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 893215178} + - component: {fileID: 893215181} + - component: {fileID: 893215180} + - component: {fileID: 893215179} + m_Layer: 0 + m_Name: Plane_023 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &893215178 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 893215177} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.0019419168, z: -0, w: 0.99999815} + m_LocalPosition: {x: -51.75, y: 0.004, z: 13.15} + m_LocalScale: {x: 2.1422317, y: 1.000074, z: 0.92314553} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 756009984} + m_LocalEulerAnglesHint: {x: 0, y: -0.223, z: 0} +--- !u!64 &893215179 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 893215177} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &893215180 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 893215177} + 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: 31321ba15b8f8eb4c954353edc038b1d, 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 &893215181 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 893215177} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &895876632 stripped Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} @@ -5686,17 +5950,29 @@ PrefabInstance: 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: 1.439 + value: 2.41598 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalPosition.y - value: 0.347 + value: 3.73 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalPosition.z - value: -4.48 + value: 18.506 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalRotation.w @@ -5788,7 +6064,7 @@ Transform: m_GameObject: {fileID: 944817147} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -1.87, y: -0.05, z: 5} + 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: [] @@ -5908,7 +6184,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalPosition.z - value: 11.51 + value: 10.83 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} propertyPath: m_LocalRotation.w @@ -6038,9 +6314,9 @@ Transform: m_GameObject: {fileID: 963529280} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.46201992, y: 3.036, z: 27.466} - m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 0 + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 21055481} - {fileID: 931717436} @@ -6418,6 +6694,136 @@ MonoBehaviour: maxX: 20 minZ: -20 maxZ: 20 +--- !u!1 &1026891718 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1026891722} + - component: {fileID: 1026891721} + - component: {fileID: 1026891720} + - component: {fileID: 1026891719} + 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!114 &1026891719 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026891718} + 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 &1026891720 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026891718} + 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 &1026891721 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026891718} + m_Mesh: {fileID: 0} +--- !u!4 &1026891722 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026891718} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: -1.412, y: 0, z: 13.163} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!1 &1041959414 GameObject: m_ObjectHideFlags: 0 @@ -7040,88 +7446,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 982181638859743806, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} m_PrefabInstance: {fileID: 1089188882} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1113365218 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 756009984} - m_Modifications: - - target: {fileID: 4689806172687901599, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalScale.x - value: 1.3182 - objectReference: {fileID: 0} - - target: {fileID: 4689806172687901599, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalScale.y - value: 1.3182 - objectReference: {fileID: 0} - - target: {fileID: 4689806172687901599, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalScale.z - value: 1.3182 - objectReference: {fileID: 0} - - target: {fileID: 4689806172687901599, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalPosition.x - value: 0.241 - objectReference: {fileID: 0} - - target: {fileID: 4689806172687901599, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalPosition.z - value: 0.232 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalPosition.x - value: -13.369 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalPosition.z - value: 12.11 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9211739394093953175, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - propertyPath: m_Name - value: Prop_CustomerTable - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} ---- !u!4 &1113365219 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 0b1ba2f28535d5147bc0ddf354d0712f, type: 3} - m_PrefabInstance: {fileID: 1113365218} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1121757851 PrefabInstance: m_ObjectHideFlags: 0 @@ -7314,115 +7638,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} ---- !u!1 &1143880225 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1143880226} - - component: {fileID: 1143880229} - - component: {fileID: 1143880228} - - component: {fileID: 1143880227} - m_Layer: 0 - m_Name: Plane_031 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 0 ---- !u!4 &1143880226 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1143880225} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.38268343, z: -0, w: 0.92387956} - m_LocalPosition: {x: -7.0200005, y: 0.004, z: 13.02} - m_LocalScale: {x: 0.19961, y: 0.20989999, z: 0.20264} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1274705225} - m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} ---- !u!64 &1143880227 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1143880225} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 0 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1143880228 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1143880225} - 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: 31321ba15b8f8eb4c954353edc038b1d, 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 &1143880229 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1143880225} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1147284796 PrefabInstance: m_ObjectHideFlags: 0 @@ -8312,11 +8527,12 @@ Transform: - {fileID: 478752914} - {fileID: 1267906223} - {fileID: 978385295} - - {fileID: 1143880226} + - {fileID: 2041706295} - {fileID: 2135907262} - - {fileID: 133083814} + - {fileID: 530276985} - {fileID: 952511015} - - {fileID: 1303428780} + - {fileID: 1967062958} + - {fileID: 3731775} - {fileID: 1565010537} - {fileID: 342945110} - {fileID: 27095953} @@ -8381,115 +8597,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} ---- !u!1 &1303428779 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1303428780} - - component: {fileID: 1303428783} - - component: {fileID: 1303428782} - - component: {fileID: 1303428781} - m_Layer: 0 - m_Name: Plane_032 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 0 ---- !u!4 &1303428780 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1303428779} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.38268343, z: -0, w: 0.92387956} - m_LocalPosition: {x: 3.51, y: 0.004, z: 11.51} - m_LocalScale: {x: 0.19961, y: 0.20989999, z: 0.20264} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1274705225} - m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} ---- !u!64 &1303428781 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1303428779} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 0 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1303428782 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1303428779} - 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: 31321ba15b8f8eb4c954353edc038b1d, 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 &1303428783 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1303428779} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1311720131 GameObject: m_ObjectHideFlags: 0 @@ -8528,7 +8635,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 756009984} m_Modifications: - target: {fileID: 1937249609879987263, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} propertyPath: m_Name @@ -8536,15 +8643,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} propertyPath: m_LocalPosition.x - value: -5.38 + value: -56.80999 objectReference: {fileID: 0} - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} propertyPath: m_LocalPosition.y - value: -0.01 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} propertyPath: m_LocalPosition.z - value: 14.977709 + value: 16.137709 objectReference: {fileID: 0} - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} propertyPath: m_LocalRotation.w @@ -8552,15 +8659,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8584,6 +8691,136 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} m_PrefabInstance: {fileID: 1629500546} m_PrefabAsset: {fileID: 0} +--- !u!1 &1361092420 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1361092424} + - component: {fileID: 1361092423} + - component: {fileID: 1361092422} + - component: {fileID: 1361092421} + 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!114 &1361092421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1361092420} + 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 &1361092422 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1361092420} + 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 &1361092423 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1361092420} + m_Mesh: {fileID: 0} +--- !u!4 &1361092424 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1361092420} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0.479, y: 0, z: 13.163} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!1 &1368937918 GameObject: m_ObjectHideFlags: 0 @@ -8750,6 +8987,72 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d0ac24eea271d7540b30f3f07f915589, type: 3} +--- !u!1001 &1376251425 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 531027750} + m_Modifications: + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalPosition.x + value: -7 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalPosition.y + value: -0.189 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalPosition.z + value: 15.83 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_Name + value: Prop_Fence_002 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} +--- !u!4 &1376251426 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} + m_PrefabInstance: {fileID: 1376251425} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1380245918 PrefabInstance: m_ObjectHideFlags: 0 @@ -8995,77 +9298,20 @@ Transform: - {fileID: 531027750} - {fileID: 963529281} - {fileID: 1604151239} - - {fileID: 1906384754} - {fileID: 1274705225} - {fileID: 454759171} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1439675990 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + m_PrefabInstance: {fileID: 1311760301} + m_PrefabAsset: {fileID: 0} --- !u!4 &1454537160 stripped Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} m_PrefabInstance: {fileID: 328733316} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1458281794 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 34818738} - m_Modifications: - - target: {fileID: 4689806172687901599, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalScale.x - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalPosition.x - value: -6.96 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalPosition.z - value: 8.71 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9211739394093953175, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_Name - value: Prop_RumBarrel_024 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} --- !u!4 &1461522567 stripped Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} @@ -9145,6 +9391,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 9a40bae43e44b7943afced8a73294742, type: 3} m_PrefabInstance: {fileID: 1471333024} m_PrefabAsset: {fileID: 0} +--- !u!4 &1521649615 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} + m_PrefabInstance: {fileID: 504708576} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1530486817 PrefabInstance: m_ObjectHideFlags: 0 @@ -9268,7 +9519,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.x - value: -5.47 + value: 8.34 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.y @@ -9276,7 +9527,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.z - value: 7.24 + value: 8.2 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalRotation.w @@ -9473,7 +9724,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} propertyPath: m_LocalPosition.x - value: -10.44 + value: -11.06 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} propertyPath: m_LocalPosition.y @@ -9481,7 +9732,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} propertyPath: m_LocalPosition.z - value: 18.471 + value: 15.83 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} propertyPath: m_LocalRotation.w @@ -9517,7 +9768,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: e3fd38671322a204ca74b9c7b16b2e82, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -10754,7 +11005,7 @@ MonoBehaviour: m_EditorClassIdentifier: version: 1073741824 data: - dataString: UEsDBBQAAAgIAABIIewaXtoYSgIAALMEAAALACQAZ3JhcGgxLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQF1U8tu2zAQ/BVD56awZRuOe4ydpoc8CstAgxQ9rMm1RJgiXZKy4xj59+5SjyhNeyI0s7PP0TkRBTgQAd0KpKp88mUw/Dz9NEiENcFW7g6er52zjvCUUdQ6Uy8Yw1KOO4LewUbjN1R5EZqwFlxoVW66lCU8Z9ruWTwe1t/XMsdbNHkoWBlBZVaYK2uaMmPCUKpg3VppbMBReklwaIDHD8hTh1QeWcdzBVchIXt0t3BCd2el2ioBgWox/fMXkVKVaDwhxHKhZNkC42VC/AbELne2MnLt4IDOw0ZpFU4c+qMZmuMcajyACTcO9kVWuS0I7FLaextW+LtSLsYKqzUKbiPDEJTJuZtzD26FsW3Pkn1x8kr4TKBh5vz6F5YuW1THUcHvGBgkB9AVKy5GA2YD5A0Xp3fgyQi0vwXVVpKLdWvruDv0RdznFrR/x6zROVDmH5q1w/4JQh1YW6aE/dIejYdyr2n4r2TGaLdxsxruY9UmWmIApfm6xFqzqHfUtWQqrXkuZ0O8az30MzuQ0FPzvvAb599aJ1Be8T39Ag3V+L9iNPkgadzYCMatYtRK0rqKL+yRW3yoAk2Ib3tg4p6Ou7DG1Kfu77WVNfZ5kxkEhz5k9IjiwejT41NPhoZNeA+HkrSLKjrqTZtXSr63QjKepbNhms7mczEbXc7lBU7kdLZJp7M5yOlEDJM4hTIqKNDfKb8O7WLob+7d20AZM65Q0MEG0fxsV+ngeKNeStvzgDJbmwnyhXmoc3Rj06FB02bldfztez9Fcn5NXv8AUEsDBBQAAAgIAABIIexc6sO8cwAAAIUAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz1rPQUVBKL0osyCgGChiBOKWZKSB2dF5pTg6Qb2xuZG5gZGRuaZlsbmhhmaKbapJiap5kZGpumZhiapJsoBQLVFVSWZDql5ibiqwzILEkIy0zLyUzL10vKDU5sbjEHWSRUmwtAFBLAQItABQAAAgIAABIIewaXtoYSgIAALMEAAALACQAAAAAAAAAAAAAAAAAAABncmFwaDEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLAQItABQAAAgIAABIIexc6sO8cwAAAIUAAAAJACQAAAAAAAAAAAAAAJcCAABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwUGAAAAAAIAAgC4AAAAVQMAAAAA + dataString: UEsDBBQAAAgIAABIIewUeeddTAIAALcEAAALACQAZ3JhcGgxLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQF1U01v2kAQ/SvI56YCE0ToMZCmh5BUGKlRqh6G3cFesd6lu2sIifLfO7P+wGnak+U38+bjzdvXRBTgQAR0K5Cq8smXwfDz5NMgEdYEW7klPN84Zx3hKaOodaZeMKalnHcEvYONxm+o8iI0aS0416rcdCVLeM603TN5PKz/b2SOd2jyUDAzgsqsMFfWNG3GhKFUwbq10tiAo/SK4NAAjx+Qpw6pPDKP9wquQkL26O7ghG5ppdoqAYF6cfjnLwpKVaLxhFCUGyWLFhgvEopvQOxyZysj1w4O6DxslFbhxKk/mqU5z6HGA5hw62BfZJXbgsCupL23YYW/K+VirrBao+AxMgxBmZynee3BLTGO7ZmyL05eCZ8JNBwxldZ/oenijOu4Lvgd1x0kB9AVsy5GgzfWDPImFhVw4MkMpOGc+ivJDTvputgSfRE13YL27yJrdA6U+Qdn7bB/hlAn1rYpYb+wR+Oh3GsS4CsZMlpu3MjDc6zaQgsMoDRfmKLWzGudupF4ad7L2RBvWy/9zC4k9NR8X/gb999aJ1Be8039HA31+D9jdPmB0jiyIYxbxqilpHUXX9gjj/hQBdoQzzpw4J4OPLfG1Ofu69rSGgudaQbBoQ8ZfUTxYPTp8alHQ8NGvIdDSdx5FV115uaVku+tkIyn6XSYptPZTExHVzN5gZdyMt2kk+kM5ORSDJO4hTIqKNDfqb4OrTD0onv3NlDGiisUdLBBfABsWengeKteStvzgDJbmwnyhXmoa3Rr06FBk7LyJj793sNIXt+Stz9QSwMEFAAACAgAAEgh7Fzqw7xzAAAAhQAAAAkAJABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQGrVipLLSrOzM9TslIw1TPWs9BRUEovSizIKAYKGIE4pZkpIHZ0XmlODpBvbG5kbmBkZG5pmWxuaGGZoptqkmJqnmRkam6ZmGJqkmygFAtUVVJZkOqXmJuKrDMgsSQjLTMvJTMvXS8oNTmxuMQdZJFSbC0AUEsBAi0AFAAACAgAAEgh7BR5511MAgAAtwQAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7Fzqw7xzAAAAhQAAAAkAJAAAAAAAAAAAAAAAmQIAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAABXAwAAAAA= file_cachedStartup: {fileID: 0} cacheStartup: 0 showNavGraphs: 1 @@ -11374,7 +11625,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1428769370} + m_TransformParent: {fileID: 756009984} m_Modifications: - target: {fileID: 1245096206122088318, guid: 2fffe0adefbc7f84cb4e5bd83eaaee83, type: 3} propertyPath: m_Name @@ -11382,15 +11633,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3622068408019896731, guid: 2fffe0adefbc7f84cb4e5bd83eaaee83, type: 3} propertyPath: m_LocalPosition.x - value: 14.41 + value: -59.769997 objectReference: {fileID: 0} - target: {fileID: 3622068408019896731, guid: 2fffe0adefbc7f84cb4e5bd83eaaee83, type: 3} propertyPath: m_LocalPosition.y - value: 0.009994507 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3622068408019896731, guid: 2fffe0adefbc7f84cb4e5bd83eaaee83, type: 3} propertyPath: m_LocalPosition.z - value: 12.470001 + value: 13.63 objectReference: {fileID: 0} - target: {fileID: 3622068408019896731, guid: 2fffe0adefbc7f84cb4e5bd83eaaee83, type: 3} propertyPath: m_LocalRotation.w @@ -11496,72 +11747,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} m_PrefabInstance: {fileID: 306753571} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1917509848 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 34818738} - m_Modifications: - - target: {fileID: 4689806172687901599, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalScale.x - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalPosition.x - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalPosition.z - value: 8.72 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9211739394093953175, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - propertyPath: m_Name - value: Prop_RumBarrel_028 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} ---- !u!4 &1917509849 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} - m_PrefabInstance: {fileID: 1917509848} - m_PrefabAsset: {fileID: 0} --- !u!1 &1932987509 GameObject: m_ObjectHideFlags: 0 @@ -11650,6 +11835,115 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 75d053617ba81429da25f2487488f291, type: 3} +--- !u!1 &1967062957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1967062958} + - component: {fileID: 1967062961} + - component: {fileID: 1967062960} + - component: {fileID: 1967062959} + m_Layer: 0 + m_Name: Plane_030 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &1967062958 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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_LocalScale: {x: 0.29397187, y: 0.21705438, z: 0.1950584} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1274705225} + m_LocalEulerAnglesHint: {x: 0, y: -0.223, z: 0} +--- !u!64 &1967062959 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1967062957} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1967062960 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1967062957} + 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: 31321ba15b8f8eb4c954353edc038b1d, 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 &1967062961 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1967062957} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1967307666 stripped Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} @@ -11882,12 +12176,7 @@ Transform: - {fileID: 146725274} m_Father: {fileID: 1274705225} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &2047062094 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 982181638859743806, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} - m_PrefabInstance: {fileID: 1905307357} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2056055816 +--- !u!1 &2039072859 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11895,46 +12184,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2056055817} - - component: {fileID: 2056055820} - - component: {fileID: 2056055819} - - component: {fileID: 2056055818} - m_Layer: 7 - m_Name: Spine GameObject (Coral)_012 + - component: {fileID: 2039072863} + - component: {fileID: 2039072862} + - component: {fileID: 2039072861} + - component: {fileID: 2039072860} + 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 &2056055817 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2056055816} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -10.44, y: 0, z: 6.99} - 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 &2056055818 +--- !u!114 &2039072860 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2056055816} + m_GameObject: {fileID: 2039072859} 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 + skeletonDataAsset: {fileID: 11400000, guid: d89793e4ce0651c4885db355edd439d1, type: 2} + initialSkinName: fixPrefabOverrideViaMeshFilter: 2 initialFlipX: 0 initialFlipY: 0 @@ -11961,16 +12235,16 @@ MonoBehaviour: physicsMovementRelativeTo: {fileID: 0} updateTiming: 1 unscaledTime: 0 - _animationName: Coral01/Idle + _animationName: On loop: 1 timeScale: 1 ---- !u!23 &2056055819 +--- !u!23 &2039072861 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2056055816} + m_GameObject: {fileID: 2039072859} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -11987,7 +12261,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 962be7b2d7cbbb148a99015ef44dbbf4, type: 2} + - {fileID: 2100000, guid: a287e4cf739397e41a00b772a97fc1f7, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12009,14 +12283,143 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &2056055820 +--- !u!33 &2039072862 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2056055816} + m_GameObject: {fileID: 2039072859} m_Mesh: {fileID: 0} +--- !u!4 &2039072863 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2039072859} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 2.39, y: 0, z: 13.163} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!1 &2041706294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2041706295} + - component: {fileID: 2041706298} + - component: {fileID: 2041706297} + - component: {fileID: 2041706296} + m_Layer: 0 + m_Name: Plane_027 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &2041706295 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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_LocalScale: {x: 0.29397187, y: 0.21705438, z: 0.1950584} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1274705225} + m_LocalEulerAnglesHint: {x: 0, y: -0.223, z: 0} +--- !u!64 &2041706296 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041706294} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2041706297 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041706294} + 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: 31321ba15b8f8eb4c954353edc038b1d, 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 &2041706298 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041706294} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &2047062094 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 982181638859743806, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} + m_PrefabInstance: {fileID: 1905307357} + m_PrefabAsset: {fileID: 0} --- !u!4 &2072563474 stripped Transform: m_CorrespondingSourceObject: {fileID: 472992, guid: 1048366b48a8cc3429168da2a8224d7d, type: 3} @@ -12147,7 +12550,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.x - value: -11.275574 + value: -11.301997 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.y @@ -12155,7 +12558,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.z - value: 11.259138 + value: 15.139998 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalRotation.w @@ -12208,7 +12611,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.x - value: -7.02 + value: -10.28 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.y @@ -12216,7 +12619,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalPosition.z - value: 5.71 + value: 7.23 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} propertyPath: m_LocalRotation.w @@ -15230,7 +15633,7 @@ SceneRoots: - {fileID: 612992553} - {fileID: 761682093} - {fileID: 549344125} - - {fileID: 852575416} - - {fileID: 1311760301} - - {fileID: 504708576} - {fileID: 1775054121} + - {fileID: 1361092424} + - {fileID: 2039072863} + - {fileID: 1026891722} diff --git a/Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs b/Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs index 3323e5a7c..10c047974 100644 --- a/Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs +++ b/Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs @@ -41,7 +41,7 @@ public InteractionDisplayParameters(string successMessageKey = "", string failur public interface IInteractable { bool CanInteract(); - bool IsInteractionHidden(); + bool IsInteractionHidden(IInteractor interactor = null); void OnInteracted(IInteractor interactor, ScriptableObject causerPayload = null); InteractionType GetInteractionType(); GameObject GetInteractableGameObject(); diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs index b954d1bf7..f294c5c79 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs @@ -8,12 +8,6 @@ public class StartRestaurantOrder : Action { [Tooltip("상호작용할 RestaurantOrderType")] [SerializeField] private RestaurantOrderType _targetOrderType = RestaurantOrderType.Wait; - [Tooltip("실제 상호작용 가능 여부를 확인하고 수행합니다")] - [SerializeField] private bool _requireCanInteract = true; - [Tooltip("성공 시 블랙보드에 현재 인터랙션 대상을 등록합니다")] - [SerializeField] private bool _registerOnBlackboard = true; - [Tooltip("성공 시 블랙보드에 현재 인터랙션 대상을 등록합니다")] - [SerializeField] private bool _UnregisterOnBlackboard = false; private IInteractor _interactor; private bool _isGetInteractor; @@ -28,29 +22,53 @@ public override void OnStart() public override TaskStatus OnUpdate() { - // 레스토랑 주문 인터랙션 후보를 가져옴 - TaskStatus targetSearchSuccess = RestaurantOrderAvailable.FindAvailableOrderInteractable(_requireCanInteract, _targetOrderType, out var - outInteractable); - if (targetSearchSuccess == TaskStatus.Failure) + var blackboard = gameObject.GetComponent(); + var target = blackboard?.GetBlackboardGameObject(nameof(RestaurantCustomerBlackboardKey.CurrentInteractionTarget)); + IInteractable currentInteractable = target?.GetComponent(); + if (_targetOrderType == RestaurantOrderType.Wait) { + // 레스토랑 주문 인터랙션 후보를 가져옴 + TaskStatus targetSearchSuccess = RestaurantOrderAvailable.FindAvailableOrderInteractable(_targetOrderType, out currentInteractable); + if (targetSearchSuccess == TaskStatus.Failure) + { + return TaskStatus.Failure; + } + var customerBlackboard = gameObject.GetComponent(); + customerBlackboard?.SetBlackboardGameObject(nameof(RestaurantCustomerBlackboardKey.CurrentInteractionTarget), currentInteractable.GetInteractableGameObject()); + } + + // Check order type of the current interactable + if (currentInteractable is IInteractionSubsystemOwner subsystemOwner) + { + if (subsystemOwner.TryGetSubsystemEnumType(out var subsystemType)) + { + if (subsystemType != _targetOrderType) + { + Debug.LogWarning($"[{GetType().Name}] 상호작용할 RestaurantOrderType이 다릅니다: {subsystemType} != {_targetOrderType}"); + return TaskStatus.Failure; + } + } + else + { + return TaskStatus.Failure; + } + } + + if (currentInteractable == null) + { + Debug.Assert(false); return TaskStatus.Failure; } // 상호작용 수행: 액션이 붙은 에이전트를 Interactor로 사용 - if (!_isGetInteractor || !_interactor.CanInteractTo(outInteractable)) + if (!_isGetInteractor) { return TaskStatus.Failure; } - RestaurantEvents.InteractionEvent.RequestInteraction(_interactor.GetInteractorGameObject(), outInteractable.gameObject, outInteractable.GetInteractionType()); + RestaurantEvents.InteractionEvent.RequestInteraction(_interactor.GetInteractorGameObject(), currentInteractable.GetInteractableGameObject(), currentInteractable.GetInteractionType()); - if (_registerOnBlackboard) - { - var customerBlackboard = gameObject.GetComponent(); - customerBlackboard?.SetBlackboardGameObject(nameof(RestaurantCustomerBlackboardKey.CurrentInteractionTarget), outInteractable.gameObject); - } - - if (_UnregisterOnBlackboard) + if (_targetOrderType == RestaurantOrderType.Busy) { var customerBlackboard = gameObject.GetComponent(); customerBlackboard?.SetBlackboardGameObject(nameof(RestaurantCustomerBlackboardKey.CurrentInteractionTarget), null); diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/WaitForPlayerInteraction.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/WaitForPlayerInteraction.cs index 30feb0826..c661a508d 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/WaitForPlayerInteraction.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/WaitForPlayerInteraction.cs @@ -9,8 +9,9 @@ namespace DDD.Restaurant public class WaitForPlayerInteraction : Action { [SerializeField] private RestaurantOrderType _targetOrderType; + [SerializeField] private RestaurantOrderType _nextOrderType; private IInteractionSubsystemObject _interactionSubsystem; - private bool _isGetInteractionSubsystem; + private bool _isSubsystemExist; public override void OnStart() { @@ -43,13 +44,19 @@ public override void OnStart() $"[{GetType().Name}]에서 {nameof(IInteractionSubsystemObject)}를 찾을 수 없습니다: {gameObject.name}"); return; } - - _isGetInteractionSubsystem = true; + + if (_interactionSubsystem?.GetInteractionSubsystemType() != _targetOrderType) + { + Debug.Log($"[{GetType().Name}] 다른 Order Type: {_interactionSubsystem?.GetInteractionSubsystemType()} != {_targetOrderType}"); + return; + } + + _isSubsystemExist = true; } public override TaskStatus OnUpdate() { - if (!_isGetInteractionSubsystem) return TaskStatus.Failure; + if (!_isSubsystemExist) return TaskStatus.Failure; TaskStatus result = CheckToSubsystemStatus(); if (result == TaskStatus.Success) Debug.Log($"[{GetType().Name}] Success"); @@ -58,9 +65,10 @@ public override TaskStatus OnUpdate() private TaskStatus CheckToSubsystemStatus() { - return _interactionSubsystem.GetInteractionSubsystemType() == _targetOrderType - ? TaskStatus.Running - : TaskStatus.Success; + var currentSubsystemType = _interactionSubsystem.GetInteractionSubsystemType(); + if (currentSubsystemType == _nextOrderType) + return TaskStatus.Success; + return TaskStatus.Running; } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals/RestaurantOrderAvailable.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals/RestaurantOrderAvailable.cs index da16bc590..1ee79b586 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals/RestaurantOrderAvailable.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals/RestaurantOrderAvailable.cs @@ -28,13 +28,13 @@ public bool CheckCanInteract public override TaskStatus OnUpdate() { - TaskStatus targetSearchSuccess = FindAvailableOrderInteractable(_checkCanInteract, _targetOrderType, out var + TaskStatus targetSearchSuccess = FindAvailableOrderInteractable(_targetOrderType, out var outInteractable); return targetSearchSuccess; } - public static TaskStatus FindAvailableOrderInteractable(bool checkCanInteract, T targetOrderType, out RestaurantInteractionComponent outInteractable) where T : Enum + public static TaskStatus FindAvailableOrderInteractable(RestaurantOrderType targetOrderType, out IInteractable outInteractable) { outInteractable = null; @@ -45,25 +45,17 @@ public static TaskStatus FindAvailableOrderInteractable(bool checkCanInteract } var interactables = environmentState.GetInteractablesByType(InteractionType.RestaurantOrder); - foreach (var interactable in interactables) { // 서브시스템에서 RestaurantOrderType을 가져와 비교 - outInteractable = interactable as RestaurantInteractionComponent; - if (outInteractable == null) continue; - if (!outInteractable.TryGetSubsystemObject(out var subsystem)) continue; - - if (EqualityComparer.Default.Equals(subsystem.GetInteractionSubsystemType(), targetOrderType)) + if (interactable is not IInteractionSubsystemOwner subsystemOwner) continue; + if (!subsystemOwner.TryGetSubsystemObject(out var subsystem)) continue; + if (subsystem.GetInteractionSubsystemType() == targetOrderType) { - // CheckCanInteract이 false면 타입만 맞으면 성공 - if (!checkCanInteract) - { - return TaskStatus.Success; - } - // CheckCanInteract이 true면 실제 인터랙션 가능 여부까지 확인 if (interactable.CanInteract()) { + outInteractable = interactable; return TaskStatus.Success; } } diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs index 5ec7c67ac..c8352108f 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs @@ -84,7 +84,7 @@ public bool CanSolveInteractionType(InteractionType type) { if (_cachedSolvers.TryGetValue(type, out var cachedSolver)) return cachedSolver != null; - if (RestaurantInteractionEventSolvers.TypeToSolver.TryGetValue(type, out var solverType) == false) return false; + if (!FetchSolverTypeForInteraction(type, out var solverType)) return false; if (transform.TryGetComponent(solverType, out var component) == false) return false; @@ -92,7 +92,12 @@ public bool CanSolveInteractionType(InteractionType type) _cachedSolvers[type] = solver; return solver != null; } - + + protected virtual bool FetchSolverTypeForInteraction(InteractionType type, out Type solverType) + { + return RestaurantInteractionEventSolvers.TypeToSolver.TryGetValue(type, out solverType); + } + public bool CanInteractTo(IInteractable interactable, ScriptableObject payloadSo = null) { if (interactable == null) return false; diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs index ca3bb391b..74966670a 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs @@ -39,14 +39,17 @@ private Task Initialize() public override void InitializeSolvers() { - var typesToSolver = RestaurantInteractionEventSolvers.TypeToSolver; var playerSolver = RestaurantInteractionEventSolvers.TypeToPlayerSolver; - foreach(var pair in playerSolver) + Dictionary typesToSolver = new(); + foreach (var typeToSolver in RestaurantInteractionEventSolvers.TypeToSolver) { - typesToSolver.Remove(pair.Key); + typesToSolver.Add(typeToSolver.Key, typeToSolver.Value); + } + foreach (var typeToSolver in playerSolver) + { + typesToSolver[typeToSolver.Key] = typeToSolver.Value; } InitializeInteractionSolvers(typesToSolver); - InitializeInteractionSolvers(playerSolver); } protected override void OnDestroy() @@ -182,7 +185,7 @@ protected IInteractable GetNearestInteractable() if (col.TryGetComponent(out var interactable) == false) continue; var type = interactable.GetInteractionType(); - if (interactable.IsInteractionHidden()) continue; + if (interactable.IsInteractionHidden(this)) continue; if (CanSolveInteractionType(type) == false) continue; float distance = Vector3.Distance(transform.position, col.transform.position); @@ -195,5 +198,15 @@ protected IInteractable GetNearestInteractable() return closest; } + + protected override bool FetchSolverTypeForInteraction(InteractionType type, out Type solverType) + { + if (RestaurantInteractionEventSolvers.TypeToPlayerSolver.TryGetValue(type, out solverType)) + { + return true; + } + + return base.FetchSolverTypeForInteraction(type, out solverType); + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs index bd99e64be..69d57ccec 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs @@ -6,5 +6,6 @@ namespace DDD public interface IInteractionSubsystemOwner { public bool TryGetSubsystemObject(out IInteractionSubsystemObject subsystemObject) where T : Enum; + public bool TryGetSubsystemEnumType(out T subsystemType) where T : Enum; } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs index fde3d3f3c..968306869 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs @@ -21,13 +21,7 @@ public interface IRestaurantOrderObject public class InteractionSubsystem_Order : MonoBehaviour, IInteractionSubsystemObject, IRestaurantOrderObject { - [FormerlySerializedAs("orderType")] [SerializeField] protected RestaurantOrderType _orderType = RestaurantOrderType.Wait; - private RestaurantOrderType _currentRestaurantOrderType; - - private void Start() - { - _currentRestaurantOrderType = _orderType; - } + [SerializeField] private RestaurantOrderType _currentRestaurantOrderType = RestaurantOrderType.Wait; public bool CanInteract() { @@ -58,7 +52,6 @@ public ScriptableObject GetPayload() public void InitializeSubsystem() { - _currentRestaurantOrderType = _orderType; } public RestaurantOrderType GetInteractionSubsystemType() diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs index 8d6272b14..24006ed2f 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using UnityEngine; using Sirenix.OdinInspector; @@ -157,8 +158,8 @@ private InteractionOutlineType GetCurrentOutlineType() // IInteractable 인터페이스로 캐스팅하여 상태 확인 if (_interactionComponent is not IInteractable interactable) return InteractionOutlineType.None; - - if (_interactionComponent.IsInteractionHidden()) + + if (_interactionComponent.IsInteractionHidden(_interactor)) { return InteractionOutlineType.None; } diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs index b0d08a9c3..c210db321 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs @@ -68,11 +68,26 @@ public virtual bool CanInteract() return isInteractionVisible && hasValidSubsystem; } - public virtual bool IsInteractionHidden() + public virtual bool IsInteractionHidden(IInteractor interactor = null) { var currentGameFlowState = GameFlowManager.Instance.GameFlowDataSo.CurrentGameState; var flowDisabled = (currentGameFlowState & _interactionAvailableFlows) == 0; - return flowDisabled; + if (flowDisabled) + { + return true; + } + + // only check if interactor is valid. if not, pass the check. + if (interactor != null && HasSubsystem(_interactionType)) + { + bool canSolve = interactor.CanSolveInteractionType(_interactionType); + if (!canSolve) + { + return true; + } + } + + return false; } public virtual void OnInteracted(IInteractor interactor, ScriptableObject payload = null) @@ -121,7 +136,7 @@ private bool HasSubsystem(InteractionType interactionType) private IInteractionSubsystemObject GetSubsystem(InteractionType interactionType) { - return _subsystems.GetValueOrDefault(interactionType) as IInteractionSubsystemObject; + return _subsystems.GetValueOrDefault(interactionType); } private bool TryGetSubsystem(InteractionType interactionType, out IInteractionSubsystemObject subsystem) @@ -192,5 +207,20 @@ public bool TryGetSubsystemObject(out IInteractionSubsystemObject subsyste subsystemObject = null; return false; } + + public bool TryGetSubsystemEnumType(out T enumValue) where T : Enum + { + foreach (var interactionSubsystemObject in _subsystems.Values) + { + if (interactionSubsystemObject is IInteractionSubsystemObject subsystem) + { + enumValue = subsystem.GetInteractionSubsystemType(); + return true; + } + } + + enumValue = default; + return false; + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs index 62dc989e4..536232103 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs @@ -7,8 +7,8 @@ public class RestaurantOrderSolver_Wait : MonoBehaviour, IInteractionSubsystemSo { public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null) { - if (CanExecuteInteractionSubsystem(interactor, interactable, payload) == false) return false; - + if (CanExecuteInteractionSubsystem(interactor, interactable, payload) == false) + return false; if (interactable is not IInteractionSubsystemOwner subsystemOwner) return false; if (!subsystemOwner.TryGetSubsystemObject(out var subsystem))