diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index aa303772b..fa21f6423 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -1,5 +1,47 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8459026560591830105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3} + m_Name: Prop + m_EditorClassIdentifier: + m_Active: 1 + settings: + passTag: Prop + Event: 300 + filterSettings: + RenderQueueType: 0 + LayerMask: + serializedVersion: 2 + m_Bits: 128 + PassNames: [] + overrideMaterial: {fileID: 0} + overrideMaterialPassIndex: 0 + overrideShader: {fileID: 0} + overrideShaderPassIndex: 0 + overrideMode: 1 + overrideDepthState: 1 + depthCompareFunction: 4 + enableWrite: 1 + stencilSettings: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 + cameraSettings: + overrideCamera: 0 + restoreCamera: 1 + offset: {x: 0, y: 0, z: 0, w: 0} + cameraFieldOfView: 60 --- !u!114 &-5955598209606857498 MonoBehaviour: m_ObjectHideFlags: 0 @@ -69,15 +111,15 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 7833122117494664109} - {fileID: -5955598209606857498} - - {fileID: 8114344887006765490} - m_RendererFeatureMap: ad6b866f10d7b46ce64c6e83fb7659adb2a10bdfaef19b70 + - {fileID: -8459026560591830105} + m_RendererFeatureMap: ad6b866f10d7b46ce64c6e83fb7659ada763543629809b8a m_UseNativeRenderPass: 1 xrSystemData: {fileID: 0} postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 - m_Bits: 63 + m_Bits: 895 m_TransparentLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -122,45 +164,3 @@ MonoBehaviour: BlurQuality: 0 Falloff: 100 SampleCount: -1 ---- !u!114 &8114344887006765490 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3} - m_Name: Props - m_EditorClassIdentifier: - m_Active: 1 - settings: - passTag: Props - Event: 300 - filterSettings: - RenderQueueType: 0 - LayerMask: - serializedVersion: 2 - m_Bits: 128 - PassNames: [] - overrideMaterial: {fileID: 0} - overrideMaterialPassIndex: 0 - overrideShader: {fileID: 0} - overrideShaderPassIndex: 0 - overrideMode: 1 - overrideDepthState: 1 - depthCompareFunction: 4 - enableWrite: 1 - stencilSettings: - overrideStencilState: 0 - stencilReference: 0 - stencilCompareFunction: 8 - passOperation: 0 - failOperation: 0 - zFailOperation: 0 - cameraSettings: - overrideCamera: 0 - restoreCamera: 1 - offset: {x: 0, y: 0, z: 0, w: 0} - cameraFieldOfView: 60 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab index 461fca7fb..2efe67176 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3584601016550470090} - component: {fileID: 2205281512296162324} - component: {fileID: 4264345854791674296} - m_Layer: 0 + m_Layer: 8 m_Name: VisualLook_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -97,7 +97,7 @@ GameObject: - component: {fileID: 198424867830454824} - component: {fileID: 8393754865671344288} - component: {fileID: 674230866569998463} - m_Layer: 0 + m_Layer: 8 m_Name: VisualLook_002 m_TagString: Untagged m_Icon: {fileID: 0} @@ -180,6 +180,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8881739536043914635} m_Modifications: + - target: {fileID: 469687031743160198, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalScale.x value: 0.19592836 @@ -240,6 +244,22 @@ PrefabInstance: propertyPath: m_Name value: PropLantern_001 objectReference: {fileID: 0} + - target: {fileID: 4581555104234214369, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8142201499108093331, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -322,6 +342,18 @@ PrefabInstance: propertyPath: m_Name value: Prop_WallColumn01 objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -360,6 +392,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8881739536043914635} m_Modifications: + - target: {fileID: 469687031743160198, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalScale.x value: 0.19592836 @@ -420,6 +456,22 @@ PrefabInstance: propertyPath: m_Name value: PropLantern objectReference: {fileID: 0} + - target: {fileID: 4581555104234214369, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8142201499108093331, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 3dfaf2b54..92ad89b14 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -864,7 +864,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -884,7 +884,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1626,7 +1626,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1646,7 +1646,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2159,7 +2159,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2179,7 +2179,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2191,136 +2191,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &157063458 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 157063459} - - component: {fileID: 157063462} - - component: {fileID: 157063461} - - component: {fileID: 157063460} - m_Layer: 0 - m_Name: Spine GameObject (MainCharacter)_001 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &157063459 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157063458} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 1.877, y: -0.004, z: 0.698} - m_LocalScale: {x: 0.09642556, y: 0.09642556, z: 0.09642556} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1428769370} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &157063460 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157063458} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 4d691a101b81b6349b339e7d81c4c326, type: 2} - initialSkinName: Lilith - 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: Making/CookingFried - loop: 1 - timeScale: 1 ---- !u!23 &157063461 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157063458} - 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: b1b4ead2fa2180d4082b676dbc940b17, 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 &157063462 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157063458} - m_Mesh: {fileID: 0} --- !u!114 &158499841 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2457,7 +2327,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2477,7 +2347,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3119,139 +2989,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04cb72fe661fd534b950283199ac4a83, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &224255294 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224255295} - - component: {fileID: 224255298} - - component: {fileID: 224255297} - - component: {fileID: 224255296} - m_Layer: 0 - m_Name: Spine GameObject (Guest)_004 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &224255295 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 224255294} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 2.66, y: 0.026, z: -4.582} - m_LocalScale: {x: 1.08, y: 1.08, z: 1.08} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1428769370} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &224255296 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 224255294} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} - initialSkinName: Casper - 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 &224255297 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 224255294} - 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: b5430080246bbb048b939d6a0a5621cd, type: 2} - - {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2} - - {fileID: 2100000, guid: 0bc9c8216989ef64ab468d6aa08cca35, type: 2} - - {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, 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: 8 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &224255298 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 224255294} - m_Mesh: {fileID: 0} --- !u!114 &224889321 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4010,7 +3747,7 @@ GameObject: - component: {fileID: 314916199} - component: {fileID: 314916198} - component: {fileID: 314916197} - m_Layer: 0 + m_Layer: 7 m_Name: Spine GameObject (Trashcan) m_TagString: Untagged m_Icon: {fileID: 0} @@ -4183,7 +3920,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4203,7 +3940,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -4270,7 +4007,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4290,7 +4027,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0858cb2d56f738e4f876e153f4ef4b06, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -4831,7 +4568,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 70aebc98d60422b4fa30aa5da1fe3623, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4851,7 +4588,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5068,7 +4805,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5088,7 +4825,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5167,7 +4904,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5187,7 +4924,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5738,7 +5475,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5758,7 +5495,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -6256,7 +5993,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6276,7 +6013,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -7757,7 +7494,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7777,7 +7514,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -8337,7 +8074,7 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 8 + m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &714455158 MeshFilter: @@ -8486,7 +8223,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8506,7 +8243,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -9668,7 +9405,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9688,7 +9425,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -9767,7 +9504,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9787,7 +9524,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: db1263fa7c3044d478d0b88d23c9a23b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -9931,7 +9668,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9951,7 +9688,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -10128,7 +9865,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10148,7 +9885,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -10765,7 +10502,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10785,7 +10522,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -10869,7 +10606,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10889,7 +10626,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -11064,7 +10801,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11084,7 +10821,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -11242,7 +10979,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11262,7 +10999,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -11985,7 +11722,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!64 &1056730800 MeshCollider: m_ObjectHideFlags: 0 @@ -12131,7 +11868,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12151,7 +11888,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -12203,8 +11940,7 @@ Transform: m_LocalPosition: {x: 6.1570196, y: 0.373, z: -2.4997606} m_LocalScale: {x: 0.080729276, y: 0.080729276, z: 0.080729276} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1221496215} + m_Children: [] m_Father: {fileID: 1428769370} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1063045323 @@ -13653,7 +13389,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 70aebc98d60422b4fa30aa5da1fe3623, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13673,7 +13409,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -13806,93 +13542,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} ---- !u!1 &1221496214 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1221496215} - - component: {fileID: 1221496216} - m_Layer: 0 - m_Name: Stew3_001 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1221496215 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1221496214} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0, z: -0, w: 1} - m_LocalPosition: {x: -82.57, y: 10.55, z: 11.02} - m_LocalScale: {x: 1.1292076, y: 1.1292077, z: 1.1292077} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1062284734} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &1221496216 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1221496214} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 8 - m_Sprite: {fileID: 21300000, guid: 5f572c0ca086aa146aef39a4f9da9876, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 5.12, y: 5.12} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1001 &1223259091 PrefabInstance: m_ObjectHideFlags: 0 @@ -14332,7 +13981,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14352,7 +14001,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -14445,136 +14094,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3} ---- !u!1 &1292172181 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1292172182} - - component: {fileID: 1292172185} - - component: {fileID: 1292172184} - - component: {fileID: 1292172183} - m_Layer: 0 - m_Name: Spine GameObject (MainCharacter) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1292172182 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1292172181} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 4.242, y: -0.004, z: -0.34587} - m_LocalScale: {x: 0.09642556, y: 0.09642556, z: 0.09642556} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1428769370} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &1292172183 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1292172181} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 4d691a101b81b6349b339e7d81c4c326, type: 2} - initialSkinName: Lyn - 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: Making/CookingStew - loop: 1 - timeScale: 1 ---- !u!23 &1292172184 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1292172181} - 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: b1b4ead2fa2180d4082b676dbc940b17, 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 &1292172185 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1292172181} - m_Mesh: {fileID: 0} --- !u!114 &1296355881 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14647,7 +14166,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14667,7 +14186,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -15728,7 +15247,6 @@ Transform: - {fileID: 1274985998} - {fileID: 950683492} - {fileID: 1677408599} - - {fileID: 224255295} - {fileID: 314916196} - {fileID: 34818738} - {fileID: 37524689} @@ -15748,9 +15266,6 @@ Transform: - {fileID: 1186848502} - {fileID: 2055697647} - {fileID: 727345922} - - {fileID: 1292172182} - - {fileID: 157063459} - - {fileID: 1930150291} - {fileID: 1905033301} - {fileID: 966865359} - {fileID: 1970167660} @@ -16339,7 +15854,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16359,7 +15874,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -16606,7 +16121,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16626,7 +16141,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -16864,7 +16379,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16884,7 +16399,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -17161,7 +16676,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17181,7 +16696,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -17780,7 +17295,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17800,7 +17315,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -17896,7 +17411,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17916,7 +17431,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -18688,7 +18203,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18708,7 +18223,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -18922,7 +18437,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18942,7 +18457,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -19154,7 +18669,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19174,7 +18689,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -19968,136 +19483,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04cb72fe661fd534b950283199ac4a83, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1930150290 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1930150291} - - component: {fileID: 1930150294} - - component: {fileID: 1930150293} - - component: {fileID: 1930150292} - m_Layer: 0 - m_Name: Spine GameObject (MainCharacter)_002 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1930150291 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1930150290} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -0.939, y: 1.28, z: 2.224} - m_LocalScale: {x: -0.09642556, y: 0.09642556, z: 0.09642556} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1428769370} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!114 &1930150292 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1930150290} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 4d691a101b81b6349b339e7d81c4c326, type: 2} - initialSkinName: Chai - 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: Making/MakingBeer - loop: 1 - timeScale: 1 ---- !u!23 &1930150293 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1930150290} - 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: b1b4ead2fa2180d4082b676dbc940b17, 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 &1930150294 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1930150290} - m_Mesh: {fileID: 0} --- !u!114 &1931322896 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20350,7 +19735,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -20370,7 +19755,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -21439,7 +20824,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21459,7 +20844,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -22907,7 +22292,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22927,7 +22312,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -25425,7 +24810,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -27385,7 +26770,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -27405,7 +26790,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -33878,7 +33263,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -33898,7 +33283,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -42057,7 +41442,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -42077,7 +41462,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0858cb2d56f738e4f876e153f4ef4b06, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -43648,7 +43033,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -43668,7 +43053,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -50924,7 +50309,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -50944,7 +50329,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0858cb2d56f738e4f876e153f4ef4b06, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -51851,7 +51236,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -51871,7 +51256,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: d63a8017daee99546a808b887393dbca, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -52549,7 +51934,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -52569,7 +51954,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -52677,7 +52062,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -52697,7 +52082,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -55920,7 +55305,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -55940,7 +55325,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -57183,7 +56568,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -57203,7 +56588,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0858cb2d56f738e4f876e153f4ef4b06, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -58920,7 +58305,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -58940,7 +58325,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -59485,7 +58870,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -59505,7 +58890,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -63436,7 +62821,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -63456,7 +62841,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: db1263fa7c3044d478d0b88d23c9a23b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -71570,7 +70955,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -71590,7 +70975,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -77026,7 +76411,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -77046,7 +76431,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0858cb2d56f738e4f876e153f4ef4b06, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -77683,7 +77068,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -77703,7 +77088,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -78447,7 +77832,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -78467,7 +77852,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: c76284932c3abd144a8034f18b3e6c4b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -85062,7 +84447,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -85082,7 +84467,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -87563,7 +86948,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -87583,7 +86968,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -90220,7 +89605,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -91695,7 +91080,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -91715,7 +91100,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -92116,7 +91501,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -92136,7 +91521,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 0e6fdb3cea45a46449b185f0baab7cc3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -94090,7 +93475,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -94110,7 +93495,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: db1263fa7c3044d478d0b88d23c9a23b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -94838,7 +94223,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + - {fileID: -876546973899608171, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -94858,7 +94243,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: c76284932c3abd144a8034f18b3e6c4b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -95074,8 +94459,8 @@ SceneRoots: - {fileID: 1784799559} - {fileID: 1626794891} - {fileID: 8099270} - - {fileID: 34646278} - {fileID: 1486721497} + - {fileID: 34646278} - {fileID: 1175363660} - {fileID: 483290172} - {fileID: 376355241} diff --git a/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab b/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab new file mode 100644 index 000000000..754abd45c --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8949086991938714667 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1063320636771556828, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1241020487330251412, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_Name + value: Env_Mesh_Geometry + objectReference: {fileID: 0} + - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} diff --git a/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab.meta b/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab.meta new file mode 100644 index 000000000..2d8184ca2 --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5b92de080ada94a51853bbc4570a6c12 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab b/Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab index 16be1c6a0..bd2841217 100644 --- a/Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab +++ b/Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab @@ -8,10 +8,22 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1063320636771556828, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1241020487330251412, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_Name value: Env_Mesh_Prop objectReference: {fileID: 0} + - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab b/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab index 995e24a44..aa93e3c3d 100644 --- a/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab +++ b/Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2034852835707859355, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 2084900895006646920, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -48,6 +52,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2657423305549939101, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3463077198689503016, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -56,6 +64,10 @@ PrefabInstance: propertyPath: m_Name value: Env_Unlit_Food objectReference: {fileID: 0} + - target: {fileID: 6022500804847150892, guid: 536180d2161f3479e8f24b85cda06fd2, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_DDD/_Raw/Environments/Geometries.meta b/Assets/_DDD/_Raw/Environments/Geometries.meta new file mode 100644 index 000000000..bbf4173aa --- /dev/null +++ b/Assets/_DDD/_Raw/Environments/Geometries.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 56e9e7f8bf44849788ca7f287589030c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs index 2a9c9f18f..20881ec13 100644 --- a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorEnvironment.cs @@ -13,8 +13,10 @@ public static class AssetPostprocessorEnvironment private static readonly HashSet TileTargetPaths = new(); private static readonly HashSet PropTargetPaths = new(); private static readonly HashSet FoodTargetPaths = new(); + private static readonly HashSet GeometryTargetPaths = new(); private const string BasePrefabPath_Prop = "Assets/_DDD/_Raw/Environments/Env_Mesh_Prop.prefab"; + private const string BasePrefabPath_Geometry = "Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab"; private const string BasePrefabPath_Tile = "Assets/_DDD/_Raw/Environments/Env_Sprite_Background.prefab"; private const string BasePrefabPath_Food = "Assets/_DDD/_Raw/Environments/Env_Unlit_Food.prefab"; private const string ShaderName = "Universal Render Pipeline/LitEnvironment"; @@ -26,7 +28,8 @@ public enum EnvPrefabType { Tile, Prop, - Food + Food, + Geometry } public static void OnPreprocessTexture(TextureImporter importer) @@ -82,6 +85,15 @@ private static void AddTargetPath(string path) { FoodTargetPaths.Add(path); } + else if(upperPath.Contains(PathConstants.RawEnvPathUpper_Geometry) && + upperPath.Contains(ExtenstionConstants.PngExtensionUpper)) + { + GeometryTargetPaths.Add(path); + } + else + { + return; + } } public static void BuildMaterialAndPrefab(string path, EnvPrefabType prefabType) @@ -248,6 +260,7 @@ private static string GetBasePrefabPath(EnvPrefabType prefabType) EnvPrefabType.Prop => BasePrefabPath_Prop, EnvPrefabType.Tile => BasePrefabPath_Tile, EnvPrefabType.Food => BasePrefabPath_Food, + EnvPrefabType.Geometry => BasePrefabPath_Geometry, _ => BasePrefabPath_Prop }; } @@ -269,9 +282,15 @@ public static void BuildTarget() BuildMaterialAndPrefab(Utils.FolderPath(path), EnvPrefabType.Food); } + foreach (var path in GeometryTargetPaths) + { + BuildMaterialAndPrefab(Utils.FolderPath(path), EnvPrefabType.Geometry); + } + TileTargetPaths.Clear(); PropTargetPaths.Clear(); FoodTargetPaths.Clear(); + GeometryTargetPaths.Clear(); } } } diff --git a/Assets/_DDD/_Scripts/Utilities/Constants.cs b/Assets/_DDD/_Scripts/Utilities/Constants.cs index 6a8bf72e1..55e564616 100644 --- a/Assets/_DDD/_Scripts/Utilities/Constants.cs +++ b/Assets/_DDD/_Scripts/Utilities/Constants.cs @@ -47,6 +47,7 @@ public static class PathConstants public const string RawEnvPathUpper_Tile = "ASSETS/_DDD/_RAW/ENVIRONMENTS/TILES/"; public const string RawEnvPathUpper_Prop = "ASSETS/_DDD/_RAW/ENVIRONMENTS/PROPS/"; public const string RawEnvPathUpper_Food = "ASSETS/_DDD/_RAW/ENVIRONMENTS/FOODS/"; + public const string RawEnvPathUpper_Geometry = "ASSETS/_DDD/_RAW/ENVIRONMENTS/GEOMETRIES/"; } public static class ExtenstionConstants diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index d87b23cb2..6ccba0cf2 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,8 +13,8 @@ TagManager: - UI - Player - Prop - - - - + - Geometry + - Item - - -