diff --git a/Assets/Free.meta b/Assets/Free.meta new file mode 100644 index 0000000..5b63abb --- /dev/null +++ b/Assets/Free.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 233578ac1c5bdc84690e5c38bc227db4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock.meta b/Assets/Free/Desert Rock.meta new file mode 100644 index 0000000..eec31b6 --- /dev/null +++ b/Assets/Free/Desert Rock.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f67a3cb2e33aa484a9d489ba6aabf340 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Demo.meta b/Assets/Free/Desert Rock/Demo.meta new file mode 100644 index 0000000..5cc29f7 --- /dev/null +++ b/Assets/Free/Desert Rock/Demo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ad8ebbcfd678ef4b9c8a6e922936fa8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Demo/Demo Test.unity b/Assets/Free/Desert Rock/Demo/Demo Test.unity new file mode 100644 index 0000000..b4e1dcd --- /dev/null +++ b/Assets/Free/Desert Rock/Demo/Demo Test.unity @@ -0,0 +1,406 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &166330497 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 166330501} + - component: {fileID: 166330500} + - component: {fileID: 166330499} + - component: {fileID: 166330498} + m_Layer: 0 + m_Name: Plane (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &166330498 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 166330497} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + 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 +--- !u!64 &166330499 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 166330497} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &166330500 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 166330497} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &166330501 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 166330497} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 20, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1043754523 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1043754525} + - component: {fileID: 1043754524} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1043754524 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043754523} + m_Enabled: 1 + serializedVersion: 9 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 0.8 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1043754525 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043754523} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1736544084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1736544089} + - component: {fileID: 1736544088} + - component: {fileID: 1736544087} + - component: {fileID: 1736544086} + - component: {fileID: 1736544085} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1736544085 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736544084} + m_Enabled: 1 +--- !u!124 &1736544086 +Behaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736544084} + m_Enabled: 1 +--- !u!92 &1736544087 +Behaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736544084} + m_Enabled: 1 +--- !u!20 &1736544088 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736544084} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1736544089 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736544084} + m_LocalRotation: {x: -0.12972593, y: 0.86852646, z: -0.36650229, w: -0.3074234} + m_LocalPosition: {x: 26.637083, y: 9.425651, z: 6.6619616} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 17.796001, y: 0, z: 0} diff --git a/Assets/Free/Desert Rock/Demo/Demo Test.unity.meta b/Assets/Free/Desert Rock/Demo/Demo Test.unity.meta new file mode 100644 index 0000000..90f057f --- /dev/null +++ b/Assets/Free/Desert Rock/Demo/Demo Test.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 962e45442db9ac04b9204a021b6a62fc +timeCreated: 1551921273 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Materials.meta b/Assets/Free/Desert Rock/Materials.meta new file mode 100644 index 0000000..488f6e1 --- /dev/null +++ b/Assets/Free/Desert Rock/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f343e42388e0fb45b550b4891e1a255 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Materials/DesertRock4K Displacement.mat b/Assets/Free/Desert Rock/Materials/DesertRock4K Displacement.mat new file mode 100644 index 0000000..a4f0520 --- /dev/null +++ b/Assets/Free/Desert Rock/Materials/DesertRock4K Displacement.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DesertRock4K Displacement + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _NORMALMAP _PARALLAXMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 07dc7b673a3039a4193e918bcdbd5a9f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 4f7dc9bd0d3c14340a40f9455beeeee9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 2800000, guid: b22b3eb525c96ed4f981e71a39ad8810, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 0.5 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.08 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 0.7245983, b: 0.21226418, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Free/Desert Rock/Materials/DesertRock4K Displacement.mat.meta b/Assets/Free/Desert Rock/Materials/DesertRock4K Displacement.mat.meta new file mode 100644 index 0000000..1701090 --- /dev/null +++ b/Assets/Free/Desert Rock/Materials/DesertRock4K Displacement.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7843873bd9c3b8043a0ee72ad1c16c27 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Materials/DesertRock512 Displacement.mat b/Assets/Free/Desert Rock/Materials/DesertRock512 Displacement.mat new file mode 100644 index 0000000..0ac6d4a --- /dev/null +++ b/Assets/Free/Desert Rock/Materials/DesertRock512 Displacement.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DesertRock512 Displacement + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _NORMALMAP _PARALLAXMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 3e6389f7d0efad6499b532f60e04a9cd, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 1c57985b1706ab1479cc79b226bd6b26, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 2800000, guid: b22b3eb525c96ed4f981e71a39ad8810, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 0.5 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.08 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 0.7245983, b: 0.21226418, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Free/Desert Rock/Materials/DesertRock512 Displacement.mat.meta b/Assets/Free/Desert Rock/Materials/DesertRock512 Displacement.mat.meta new file mode 100644 index 0000000..56fee0b --- /dev/null +++ b/Assets/Free/Desert Rock/Materials/DesertRock512 Displacement.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 382cda4fd75cc1043bb28f8256028de0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Textures.meta b/Assets/Free/Desert Rock/Textures.meta new file mode 100644 index 0000000..7af17ea --- /dev/null +++ b/Assets/Free/Desert Rock/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 814af07fd55acd64d9666006e91d8d04 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Albedo.tga b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Albedo.tga new file mode 100644 index 0000000..d13ec7a Binary files /dev/null and b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Albedo.tga differ diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Albedo.tga.meta b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Albedo.tga.meta new file mode 100644 index 0000000..48b4d28 --- /dev/null +++ b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Albedo.tga.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 4f7dc9bd0d3c14340a40f9455beeeee9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Displacement.tga b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Displacement.tga new file mode 100644 index 0000000..3180a4b Binary files /dev/null and b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Displacement.tga differ diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Displacement.tga.meta b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Displacement.tga.meta new file mode 100644 index 0000000..5355468 --- /dev/null +++ b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Displacement.tga.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 2baa4c2bbaf67094f986362b01e7e57b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Normal.tga b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Normal.tga new file mode 100644 index 0000000..3e7e85b Binary files /dev/null and b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Normal.tga differ diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Normal.tga.meta b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Normal.tga.meta new file mode 100644 index 0000000..563264f --- /dev/null +++ b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Normal.tga.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 07dc7b673a3039a4193e918bcdbd5a9f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Roughness.tga b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Roughness.tga new file mode 100644 index 0000000..f881b32 Binary files /dev/null and b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Roughness.tga differ diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Roughness.tga.meta b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Roughness.tga.meta new file mode 100644 index 0000000..a3be94d --- /dev/null +++ b/Assets/Free/Desert Rock/Textures/Desert Rock_4K_Roughness.tga.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: b7fa6c3d79d12744bab1f8f1246eb624 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_512_Albedo.tga b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Albedo.tga new file mode 100644 index 0000000..84bb9b5 Binary files /dev/null and b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Albedo.tga differ diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_512_Albedo.tga.meta b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Albedo.tga.meta new file mode 100644 index 0000000..9df729a --- /dev/null +++ b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Albedo.tga.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 1c57985b1706ab1479cc79b226bd6b26 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_512_Displacement.tga b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Displacement.tga new file mode 100644 index 0000000..ba369d8 Binary files /dev/null and b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Displacement.tga differ diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_512_Displacement.tga.meta b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Displacement.tga.meta new file mode 100644 index 0000000..33292b7 --- /dev/null +++ b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Displacement.tga.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: b22b3eb525c96ed4f981e71a39ad8810 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_512_Normal.tga b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Normal.tga new file mode 100644 index 0000000..c4cdccc Binary files /dev/null and b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Normal.tga differ diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_512_Normal.tga.meta b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Normal.tga.meta new file mode 100644 index 0000000..7bbba39 --- /dev/null +++ b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Normal.tga.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 3e6389f7d0efad6499b532f60e04a9cd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_512_Roughness.tga b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Roughness.tga new file mode 100644 index 0000000..385f94f Binary files /dev/null and b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Roughness.tga differ diff --git a/Assets/Free/Desert Rock/Textures/Desert Rock_512_Roughness.tga.meta b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Roughness.tga.meta new file mode 100644 index 0000000..508eec7 --- /dev/null +++ b/Assets/Free/Desert Rock/Textures/Desert Rock_512_Roughness.tga.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 2bb89817dd84f564f89a8371f51645e0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Levels/Level 2.unity b/Assets/Scenes/Levels/Level 2.unity index 6716d9f..f06b59b 100644 --- a/Assets/Scenes/Levels/Level 2.unity +++ b/Assets/Scenes/Levels/Level 2.unity @@ -1418,21 +1418,9 @@ MeshFilter: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 2.unity - m_GameObject: {fileID: 524780037} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: -28.226, y: -7.7633, z: 0.12349} - m_LocalScale: {x: 0.60841376, y: 0.22818352, z: 0.5722176} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &634512922 -======= m_GameObject: {fileID: 347176587} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &374808084 ->>>>>>> Stashed changes:Assets/Scenes/Level 2.unity GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3324,51 +3312,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 2.unity - m_GameObject: {fileID: 634512922} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -75.973, y: -8.6658, z: 0.80012} - m_LocalScale: {x: 0.60841376, y: 0.5722176, z: 0.22818352} - m_Children: - - {fileID: 1607730470} - - {fileID: 1947623627} - - {fileID: 1465368453} - - {fileID: 1243663661} - - {fileID: 74065431} - - {fileID: 671579729} - - {fileID: 177556038} - - {fileID: 917283733} - - {fileID: 1137349463} - - {fileID: 1912568331} - - {fileID: 332046440} - - {fileID: 1966543287} - - {fileID: 1912263650} - - {fileID: 2045778763} - - {fileID: 374808085} - - {fileID: 1514262525} - - {fileID: 38944352} - - {fileID: 1457297065} - - {fileID: 347176588} - - {fileID: 1887722733} - - {fileID: 1173872922} - - {fileID: 1957061674} - - {fileID: 1901446079} - - {fileID: 430559830} - - {fileID: 253993661} - - {fileID: 704587944} - - {fileID: 1755661395} - - {fileID: 277750316} - - {fileID: 983484907} - - {fileID: 1315051493} - - {fileID: 1014318556} - - {fileID: 1094437957} - - {fileID: 308319555} - - {fileID: 1713558595} - - {fileID: 1847264396} - - {fileID: 1187500894} - m_Father: {fileID: 0} - m_RootOrder: 2 -======= m_GameObject: {fileID: 1094437956} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -6.0359, y: -15.719, z: -2.8053} @@ -3469,7 +3412,6 @@ Transform: m_Children: [] m_Father: {fileID: 634512923} m_RootOrder: 8 ->>>>>>> Stashed changes:Assets/Scenes/Level 2.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1137349464 BoxCollider: @@ -4972,17 +4914,10 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 2.unity - m_GameObject: {fileID: 1514262524} - m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: -70.5, y: -33.297, z: -2.8053167} - m_LocalScale: {x: 36.006565, y: 1.0000011, z: 11.656721} -======= m_GameObject: {fileID: 1708615056} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -173.333, y: -16.6, z: -2.8053} m_LocalScale: {x: 3.294363, y: 0.71362835, z: 7.333479} ->>>>>>> Stashed changes:Assets/Scenes/Level 2.unity m_Children: [] m_Father: {fileID: 634512923} m_RootOrder: 47 @@ -6206,38 +6141,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 2.unity - - target: {fileID: 7801516489716195989, guid: 4f1a4eb0e633f7740b9c4928cf54ce35, - type: 3} - propertyPath: field of view - value: 12.431462 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LocalScale.x - value: 0.60841376 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LocalScale.y - value: 0.5722176 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LocalScale.z - value: 0.22818352 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LocalPosition.x - value: -28.226 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LocalPosition.y - value: -9.4791 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LocalPosition.z - value: 0.12349 - objectReference: {fileID: 0} -======= ->>>>>>> Stashed changes:Assets/Scenes/Level 2.unity m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} --- !u!1 &2045778762 diff --git a/Assets/Scenes/Levels/Level 3.unity b/Assets/Scenes/Levels/Level 3.unity index f122747..b33d2f3 100644 --- a/Assets/Scenes/Levels/Level 3.unity +++ b/Assets/Scenes/Levels/Level 3.unity @@ -152,11 +152,7 @@ Transform: m_LocalScale: {x: 3.4940033, y: 1.5813276, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 92 -======= - m_RootOrder: 93 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2780677 BoxCollider: @@ -189,11 +185,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - {fileID: 1010212748793951612, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -253,11 +245,7 @@ Transform: m_LocalScale: {x: 3.4940033, y: 4.907025, z: 1.9802314} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 124 -======= - m_RootOrder: 125 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &7887053 BoxCollider: @@ -290,11 +278,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 1010212748793951612, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -354,7 +338,7 @@ Transform: m_LocalScale: {x: 1.0938134, y: 32.499134, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 210 + m_RootOrder: 209 m_LocalEulerAnglesHint: {x: 0.81200004, y: 0, z: 0} --- !u!65 &9027389 BoxCollider: @@ -387,7 +371,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -480,11 +464,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -544,11 +524,7 @@ Transform: m_LocalScale: {x: 8.448245, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 151 -======= - m_RootOrder: 152 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 18.467001} --- !u!65 &18803155 BoxCollider: @@ -581,11 +557,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: bf4d0317d916c494f869f9d8d88aa680, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -645,11 +617,7 @@ Transform: m_LocalScale: {x: 4.717254, y: 3.4400165, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 156 -======= - m_RootOrder: 157 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &39673380 BoxCollider: @@ -682,11 +650,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -746,15 +710,9 @@ Transform: m_LocalScale: {x: 62.721085, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 219 - m_LocalEulerAnglesHint: {x: -2.8370001, y: 0.671, z: -32.63} ---- !u!65 &42994066 -======= m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 1.9790001, y: 1.348, z: 5.7300005} --- !u!65 &49122470 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -785,7 +743,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 0a366e5a36fbbc849ba636dde51beea3, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -845,7 +803,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 140 + m_RootOrder: 139 m_LocalEulerAnglesHint: {x: 0, y: -44.898003, z: 0} --- !u!65 &62518285 BoxCollider: @@ -938,15 +896,9 @@ Transform: m_LocalScale: {x: 1.0904166, y: 28.31168, z: 1.3431108} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 139 - m_LocalEulerAnglesHint: {x: 0, y: -44.898003, z: 0} ---- !u!65 &62518285 -======= - m_RootOrder: 150 + m_RootOrder: 149 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15.805} --- !u!65 &63873525 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -977,11 +929,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1041,15 +989,9 @@ Transform: m_LocalScale: {x: 13.418659, y: 0.51622707, z: 1.2713741} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 149 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15.805} ---- !u!65 &63873525 -======= - m_RootOrder: 113 + m_RootOrder: 112 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 37.078003} --- !u!65 &64935557 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1080,11 +1022,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1144,15 +1082,9 @@ Transform: m_LocalScale: {x: 0.23837596, y: 12.901637, z: 0.5817405} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 112 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 37.078003} ---- !u!65 &64935557 -======= - m_RootOrder: 223 + m_RootOrder: 222 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &70960976 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1183,11 +1115,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1247,11 +1175,7 @@ Transform: m_LocalScale: {x: 11.729179, y: 31.383411, z: 11.656727} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 94 -======= - m_RootOrder: 95 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &76950500 BoxCollider: @@ -1284,11 +1208,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: d4dd9fc72c1015443979ccf1617ed3f1, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1322,7 +1242,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -1332,22 +1252,22 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.x - value: -338.47812 + value: -176.78392 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.y - value: 11.791905 + value: 20.866135 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.z - value: 1.017565 + value: 10.634233 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -1357,17 +1277,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -1386,6 +1306,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!4 &87252405 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, + type: 3} + m_PrefabInstance: {fileID: 87252404} + m_PrefabAsset: {fileID: 0} --- !u!1 &90622618 GameObject: m_ObjectHideFlags: 0 @@ -1417,11 +1343,7 @@ Transform: m_LocalScale: {x: 6.738126, y: 3.4400165, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 170 -======= - m_RootOrder: 171 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &90622620 BoxCollider: @@ -1454,7 +1376,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1488,7 +1410,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 2445808756126767684, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -1498,22 +1420,22 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.x - value: -326.71 + value: -165.0158 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.y - value: 12.085315 + value: 21.159542 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.z - value: 1.3559744 + value: 10.972643 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -1523,17 +1445,17 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -1552,6 +1474,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} +--- !u!4 &97606664 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, + type: 3} + m_PrefabInstance: {fileID: 97606663} + m_PrefabAsset: {fileID: 0} --- !u!1 &102107358 GameObject: m_ObjectHideFlags: 0 @@ -1583,11 +1511,7 @@ Transform: m_LocalScale: {x: 36.09229, y: 0.9715841, z: 11.325438} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 66 -======= - m_RootOrder: 67 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &102107360 BoxCollider: @@ -1620,7 +1544,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 2d1d538e5671f6246bcec75bb22fb572, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1680,7 +1604,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 8.262577, z: 0.8252942} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 190 + m_RootOrder: 189 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &106340410 BoxCollider: @@ -1713,7 +1637,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1806,11 +1730,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: f4caa11616ecb9041b459a020c575a12, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1870,11 +1790,7 @@ Transform: m_LocalScale: {x: 22.135443, y: 1.3878114, z: 11.325438} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 173 -======= - m_RootOrder: 174 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &133307849 BoxCollider: @@ -1907,7 +1823,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b5554106d0493a44db3e767036d87a1b, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1967,7 +1883,7 @@ Transform: m_LocalScale: {x: 2.4621658, y: 1.4284023, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 184 + m_RootOrder: 183 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &140331617 BoxCollider: @@ -2000,7 +1916,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2056,19 +1972,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 150542555} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: 50.18, y: -9.409, z: 1.7} - m_LocalScale: {x: 1.0904166, y: 12.901637, z: 1.9791805} - m_Children: [] - m_Father: {fileID: 1699353165} - m_RootOrder: 90 -======= m_LocalPosition: {x: 50.18, y: -9.409, z: 1.54} m_LocalScale: {x: 1.0904166, y: 12.901637, z: 1.9791805} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 91 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + m_RootOrder: 90 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &150542557 BoxCollider: @@ -2194,11 +2102,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2258,11 +2162,7 @@ Transform: m_LocalScale: {x: 1.0904166, y: 26.585146, z: 2.1357627} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 83 -======= - m_RootOrder: 84 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &195960870 BoxCollider: @@ -2295,7 +2195,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2355,11 +2255,7 @@ Transform: m_LocalScale: {x: 1.0103455, y: 6.351495, z: 1} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 99 -======= - m_RootOrder: 100 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &212974554 BoxCollider: @@ -2452,11 +2348,7 @@ Transform: m_LocalScale: {x: 17.552914, y: 0.51622707, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 111 -======= - m_RootOrder: 112 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 37.078003} --- !u!65 &217673605 BoxCollider: @@ -2489,11 +2381,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 84f36545290558b4999deaf40861d198, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2549,11 +2437,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 235691594} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: 62.64, y: -54.506, z: -7} -======= m_LocalPosition: {x: 62.64, y: -54.506, z: -7.16} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalScale: {x: 1.0904166, y: 10.26324, z: 3.1472132} m_Children: [] m_Father: {fileID: 1699353165} @@ -2650,11 +2534,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 140 -======= - m_RootOrder: 141 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: -65.979004, z: 0} --- !u!65 &270321655 BoxCollider: @@ -2836,13 +2716,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 321736897} m_LocalRotation: {x: -0, y: -0, z: 0.11579816, w: 0.9932728} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: 26.12, y: -10.15, z: -2.8053167} - m_LocalScale: {x: 0.8332354, y: 1, z: 11.656721} -======= m_LocalPosition: {x: 25.23, y: -8.56, z: -2.8053167} m_LocalScale: {x: 1.3865072, y: 1, z: 11.656721} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_Children: [] m_Father: {fileID: 1699353165} m_RootOrder: 54 @@ -2878,11 +2753,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2942,11 +2813,7 @@ Transform: m_LocalScale: {x: 13.418659, y: 0.51622707, z: 1.2713741} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 108 -======= - m_RootOrder: 109 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -42.108} --- !u!65 &331377559 BoxCollider: @@ -2979,11 +2846,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3043,15 +2906,9 @@ Transform: m_LocalScale: {x: 1.0904166, y: 13.437381, z: 2.1357627} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 165 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} ---- !u!65 &338822541 -======= - m_RootOrder: 213 + m_RootOrder: 212 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &333693311 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3136,27 +2993,15 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_GameObject: {fileID: 342201279} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -20.039, y: -26.26, z: 2.04} - m_LocalScale: {x: 12.542824, y: 2.088486, z: 1} - m_Children: [] - m_Father: {fileID: 1699353165} - m_RootOrder: 97 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &342201281 -======= m_GameObject: {fileID: 338822539} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -131.3, y: -77.22, z: -2.8053167} m_LocalScale: {x: 74.12243, y: 2.479683, z: 11.325438} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 166 + m_RootOrder: 165 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &338822541 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3187,11 +3032,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 6ba5b71cd3a2ff44ea97364fdf9e0dbd, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 382cda4fd75cc1043bb28f8256028de0, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3251,7 +3092,7 @@ Transform: m_LocalScale: {x: 12.542824, y: 2.088486, z: 1} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 98 + m_RootOrder: 97 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &342201281 BoxCollider: @@ -3284,11 +3125,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3441,15 +3278,9 @@ Transform: m_LocalScale: {x: 17.594893, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 211 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 35.174} ---- !u!65 &355338786 -======= m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &353830968 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3480,7 +3311,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f088e83810086dd47ab9a9718144ed37, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3540,7 +3371,7 @@ Transform: m_LocalScale: {x: 1.0319846, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 201 + m_RootOrder: 200 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &365587919 BoxCollider: @@ -3633,11 +3464,7 @@ Transform: m_LocalScale: {x: 1.0904166, y: 16.524212, z: 1.3431108} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 128 -======= - m_RootOrder: 129 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &366762995 BoxCollider: @@ -3670,7 +3497,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 2100000, guid: 382cda4fd75cc1043bb28f8256028de0, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3730,11 +3557,7 @@ Transform: m_LocalScale: {x: 1.0319846, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 167 -======= - m_RootOrder: 168 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &368231051 BoxCollider: @@ -3767,7 +3590,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 6ba5b71cd3a2ff44ea97364fdf9e0dbd, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3827,11 +3650,7 @@ Transform: m_LocalScale: {x: 7.40885, y: 1, z: 1.6395642} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 119 -======= - m_RootOrder: 120 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 26.709002} --- !u!65 &368911422 BoxCollider: @@ -3864,11 +3683,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3928,11 +3743,7 @@ Transform: m_LocalScale: {x: 17.594893, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 176 -======= - m_RootOrder: 177 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &388487070 BoxCollider: @@ -3965,7 +3776,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b5554106d0493a44db3e767036d87a1b, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4058,11 +3869,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4155,7 +3962,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4189,7 +3996,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -4199,22 +4006,22 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.x - value: -185.1 + value: -23.405807 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.y - value: -35.88 + value: -26.805773 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.z - value: 0.26 + value: 9.876669 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -4224,17 +4031,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -4253,6 +4060,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!4 &399012020 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, + type: 3} + m_PrefabInstance: {fileID: 399012019} + m_PrefabAsset: {fileID: 0} --- !u!1 &421216871 GameObject: m_ObjectHideFlags: 0 @@ -4284,7 +4097,7 @@ Transform: m_LocalScale: {x: 0.23837596, y: 12.901637, z: 0.5817405} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 226 + m_RootOrder: 225 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &421216873 BoxCollider: @@ -4317,7 +4130,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4377,11 +4190,7 @@ Transform: m_LocalScale: {x: 17.307434, y: 45.526173, z: 11.656727} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 129 -======= - m_RootOrder: 130 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &424524579 BoxCollider: @@ -4414,7 +4223,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b5554106d0493a44db3e767036d87a1b, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4474,11 +4283,7 @@ Transform: m_LocalScale: {x: 1.0904166, y: 13.437381, z: 1.9791795} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 64 -======= - m_RootOrder: 65 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &428044346 BoxCollider: @@ -4697,11 +4502,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - {fileID: 1010212748793951612, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4761,15 +4562,9 @@ Transform: m_LocalScale: {x: 52.470932, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 109 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -42.108} ---- !u!65 &466942334 -======= - m_RootOrder: 229 + m_RootOrder: 228 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &458634898 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4800,11 +4595,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0a366e5a36fbbc849ba636dde51beea3, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4858,15 +4649,13 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity -======= m_GameObject: {fileID: 466942332} m_LocalRotation: {x: -0, y: -0, z: -0.35924655, w: 0.93324274} m_LocalPosition: {x: 6.09, y: 15.52, z: -6.89} m_LocalScale: {x: 13.418659, y: 0.51622707, z: 1.2713741} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 110 + m_RootOrder: 109 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -42.108} --- !u!65 &466942334 BoxCollider: @@ -4899,7 +4688,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4953,18 +4742,13 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_GameObject: {fileID: 468019235} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 7, y: 3.1, z: -2.8053167} m_LocalScale: {x: 5.7279882, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 104 -======= - m_RootOrder: 105 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &468019237 BoxCollider: @@ -4997,11 +4781,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 84f36545290558b4999deaf40861d198, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5061,7 +4841,7 @@ Transform: m_LocalScale: {x: 0.23837596, y: 12.901637, z: 0.5817405} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 222 + m_RootOrder: 238 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &480224381 BoxCollider: @@ -5094,7 +4874,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5150,19 +4930,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 493666411} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: 62.75, y: -9.409, z: -7.08} - m_LocalScale: {x: 1.0904166, y: 12.901637, z: 3.147216} - m_Children: [] - m_Father: {fileID: 1699353165} - m_RootOrder: 87 -======= m_LocalPosition: {x: 62.75, y: -9.409, z: -7.252} m_LocalScale: {x: 1.0904166, y: 12.901637, z: 3.147216} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 88 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + m_RootOrder: 87 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &493666413 BoxCollider: @@ -5288,11 +5060,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - {fileID: 1010212748793951612, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5385,7 +5153,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f088e83810086dd47ab9a9718144ed37, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5445,11 +5213,7 @@ Transform: m_LocalScale: {x: 4.717254, y: 3.4400165, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 155 -======= - m_RootOrder: 156 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &524695864 BoxCollider: @@ -5482,11 +5246,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5546,7 +5306,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 9.753048, z: 0.8252946} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 193 + m_RootOrder: 192 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 23.029001} --- !u!65 &541898945 BoxCollider: @@ -5579,11 +5339,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5643,11 +5399,7 @@ Transform: m_LocalScale: {x: 1.0904166, y: 13.437381, z: 1.3431108} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 68 -======= - m_RootOrder: 69 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &542758887 BoxCollider: @@ -5680,7 +5432,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 2100000, guid: 382cda4fd75cc1043bb28f8256028de0, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5714,7 +5466,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -5724,22 +5476,22 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 13 + value: 14 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.x - value: -118.385895 + value: 43.308304 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.y - value: -17.793945 + value: -8.719717 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.z - value: 2.0873797 + value: 11.704048 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -5749,17 +5501,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -5778,6 +5530,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!4 &546980533 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, + type: 3} + m_PrefabInstance: {fileID: 546980532} + m_PrefabAsset: {fileID: 0} --- !u!1 &554564391 GameObject: m_ObjectHideFlags: 0 @@ -5809,11 +5567,7 @@ Transform: m_LocalScale: {x: 1.0904166, y: 13.437381, z: 3.1472147} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 63 -======= - m_RootOrder: 64 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &554564393 BoxCollider: @@ -5846,7 +5600,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5875,78 +5629,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 554564391} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity ---- !u!1001 &556639215 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2445808756126767684, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_Name - value: HideSpikes (1) - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalPosition.x - value: -78.42531 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalPosition.y - value: -15.052668 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.2292879 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} ---- !u!1 &573290906 -======= --- !u!1 &573290906 GameObject: m_ObjectHideFlags: 0 @@ -5978,7 +5660,7 @@ Transform: m_LocalScale: {x: 47.23936, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 80 + m_RootOrder: 79 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &573290908 BoxCollider: @@ -6011,7 +5693,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b87dc3dede67df143a45b6bc35d1979a, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6041,7 +5723,6 @@ MeshFilter: m_GameObject: {fileID: 573290906} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &578242389 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6072,15 +5753,9 @@ Transform: m_LocalScale: {x: 4.6055837, y: 4.5365934, z: 5.4146056} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 79 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &573290908 -======= - m_RootOrder: 87 + m_RootOrder: 86 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -121.435005} --- !u!65 &578242391 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6111,7 +5786,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: bef0a68cde57f9446973c9f63186f13d, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6171,15 +5846,9 @@ Transform: m_LocalScale: {x: 0.23837596, y: 12.901637, z: 0.5817405} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 86 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -121.435005} ---- !u!65 &578242391 -======= - m_RootOrder: 221 + m_RootOrder: 220 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &593631742 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6210,7 +5879,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6363,11 +6032,7 @@ Transform: m_LocalScale: {x: 11.422647, y: 0.99999994, z: 7.7861905} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 126 -======= - m_RootOrder: 127 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &606139895 BoxCollider: @@ -6400,11 +6065,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: f4caa11616ecb9041b459a020c575a12, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6464,7 +6125,7 @@ Transform: m_LocalScale: {x: 0.23837596, y: 12.901637, z: 0.5817405} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 225 + m_RootOrder: 224 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &612833766 BoxCollider: @@ -6497,7 +6158,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6557,11 +6218,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 5.023269, z: 11.656738} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 103 -======= - m_RootOrder: 104 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &613340163 BoxCollider: @@ -6594,11 +6251,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 9b7535e1ed5c95141ae45579896325ab, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6632,7 +6285,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -6642,22 +6295,22 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.x - value: -131.5335 + value: 30.160706 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.y - value: -2.3670373 + value: 6.707191 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.z - value: 1.9661849 + value: 11.582853 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -6667,17 +6320,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -6696,6 +6349,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!4 &614063896 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, + type: 3} + m_PrefabInstance: {fileID: 614063895} + m_PrefabAsset: {fileID: 0} --- !u!1 &621775058 GameObject: m_ObjectHideFlags: 0 @@ -6727,7 +6386,7 @@ Transform: m_LocalScale: {x: 0.23837596, y: 12.901637, z: 0.5817405} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 224 + m_RootOrder: 223 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &621775060 BoxCollider: @@ -6760,7 +6419,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6820,11 +6479,7 @@ Transform: m_LocalScale: {x: 1.4972903, y: 1.15, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 115 -======= - m_RootOrder: 116 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &628934863 BoxCollider: @@ -6857,11 +6512,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca6a2771d00019e4eba3d3b1386215a3, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6954,11 +6605,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7018,7 +6665,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 8.262577, z: 0.8252942} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 189 + m_RootOrder: 188 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &634919469 BoxCollider: @@ -7111,11 +6758,7 @@ Transform: m_LocalScale: {x: 4.6055837, y: 3.931166, z: 4.9407444} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 85 -======= - m_RootOrder: 86 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -109.775} --- !u!65 &635358546 BoxCollider: @@ -7148,7 +6791,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: bef0a68cde57f9446973c9f63186f13d, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7208,7 +6851,7 @@ Transform: m_LocalScale: {x: 28.742737, y: 1.4284023, z: 1.8818667} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 182 + m_RootOrder: 181 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &660153413 BoxCollider: @@ -7241,7 +6884,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7301,11 +6944,7 @@ Transform: m_LocalScale: {x: 10.431892, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 152 -======= - m_RootOrder: 153 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -18.27} --- !u!65 &661292308 BoxCollider: @@ -7338,11 +6977,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: bf4d0317d916c494f869f9d8d88aa680, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7402,11 +7037,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 18.079956, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 146 -======= - m_RootOrder: 147 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &665547929 BoxCollider: @@ -7499,11 +7130,7 @@ Transform: m_LocalScale: {x: 3.4940033, y: 4.0032887, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 123 -======= - m_RootOrder: 124 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &687007485 BoxCollider: @@ -7536,11 +7163,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 1010212748793951612, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7574,7 +7197,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -7584,22 +7207,22 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.x - value: -190.60606 + value: -28.911865 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.y - value: -3.170082 + value: 5.904146 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.z - value: 0.69977975 + value: 10.316448 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -7609,17 +7232,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -7638,6 +7261,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!4 &694958663 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, + type: 3} + m_PrefabInstance: {fileID: 694958662} + m_PrefabAsset: {fileID: 0} --- !u!1 &695994788 GameObject: m_ObjectHideFlags: 0 @@ -7669,11 +7298,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 136 -======= - m_RootOrder: 137 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: -31.882002, z: 0} --- !u!65 &695994790 BoxCollider: @@ -7766,11 +7391,7 @@ Transform: m_LocalScale: {x: 4.6055837, y: 4.5365934, z: 9.229389} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 75 -======= - m_RootOrder: 76 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -67.719} --- !u!65 &696210988 BoxCollider: @@ -7803,11 +7424,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 521403030cac0b84e8740f04dc03b26a, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7867,11 +7484,7 @@ Transform: m_LocalScale: {x: 0.7961567, y: 2.0835536, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 60 -======= - m_RootOrder: 61 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -13.768001} --- !u!65 &709845116 BoxCollider: @@ -7904,11 +7517,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: c29d4d79c18e3284e8d85d2266d72b27, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7968,11 +7577,7 @@ Transform: m_LocalScale: {x: 22.135443, y: 1.3878114, z: 11.325438} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 175 -======= - m_RootOrder: 176 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &713722723 BoxCollider: @@ -8005,7 +7610,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b5554106d0493a44db3e767036d87a1b, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8065,15 +7670,9 @@ Transform: m_LocalScale: {x: 14.776495, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 215 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 23.29} ---- !u!65 &720269537 -======= m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &725376870 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8197,11 +7796,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8255,20 +7850,13 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_GameObject: {fileID: 729414427} - m_LocalRotation: {x: -0, y: -0, z: 0.11579816, w: 0.9932728} - m_LocalPosition: {x: 28.217997, y: -9.349999, z: -2.8053167} - m_LocalScale: {x: 0.8332354, y: 1, z: 11.656721} -======= m_GameObject: {fileID: 731627015} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -438.6, y: 64.2, z: -2.8053167} m_LocalScale: {x: 52.470932, y: 1, z: 11.656721} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 234 + m_RootOrder: 233 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &731627017 BoxCollider: @@ -8301,11 +7889,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: b87dc3dede67df143a45b6bc35d1979a, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8365,11 +7949,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 141 -======= - m_RootOrder: 142 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0.11800001, y: -38.949, z: -0.126} --- !u!65 &742108804 BoxCollider: @@ -8458,11 +8038,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 745197142} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: 53.45, y: -54.506, z: -7} -======= m_LocalPosition: {x: 53.45, y: -54.506, z: -7.16} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalScale: {x: 1.0904166, y: 10.26324, z: 3.1472132} m_Children: [] m_Father: {fileID: 1699353165} @@ -8559,11 +8135,7 @@ Transform: m_LocalScale: {x: 22.135443, y: 1.3878114, z: 11.325438} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 179 -======= - m_RootOrder: 180 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &748163528 BoxCollider: @@ -8596,7 +8168,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b5554106d0493a44db3e767036d87a1b, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8652,11 +8224,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 753125771} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: 53.45, y: -54.506, z: 1.7919996} -======= m_LocalPosition: {x: 53.45, y: -54.506, z: 1.632} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalScale: {x: 1.0904166, y: 10.26324, z: 1.9791785} m_Children: [] m_Father: {fileID: 1699353165} @@ -8753,11 +8321,7 @@ Transform: m_LocalScale: {x: 0.7961567, y: 2.0835536, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 61 -======= - m_RootOrder: 62 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5.9360003} --- !u!65 &755030868 BoxCollider: @@ -8790,11 +8354,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: c29d4d79c18e3284e8d85d2266d72b27, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9073,11 +8633,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9137,11 +8693,7 @@ Transform: m_LocalScale: {x: 1.0319846, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 166 -======= - m_RootOrder: 167 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &793882800 BoxCollider: @@ -9174,7 +8726,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 6ba5b71cd3a2ff44ea97364fdf9e0dbd, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9234,11 +8786,7 @@ Transform: m_LocalScale: {x: 1.0103455, y: 6.351495, z: 1} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 101 -======= - m_RootOrder: 102 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &794517839 BoxCollider: @@ -9331,11 +8879,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 18.684061, z: 0.8588612} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 159 -======= - m_RootOrder: 160 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 10.846001, y: -0.65900004, z: -4.8320003} --- !u!65 &811656800 BoxCollider: @@ -9368,11 +8912,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9401,102 +8941,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 811656798} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity ---- !u!1 &818200652 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 818200653} - - component: {fileID: 818200656} - - component: {fileID: 818200655} - - component: {fileID: 818200654} - m_Layer: 0 - m_Name: Cube (229) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &818200653 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 818200652} - m_LocalRotation: {x: 0.0117639555, y: 0.002433206, z: -0.20253374, w: 0.9792017} - m_LocalPosition: {x: -221.57, y: 10.84, z: -7.06} - m_LocalScale: {x: 0.76576126, y: 40.544384, z: 0.8252938} - m_Children: [] - m_Father: {fileID: 1699353165} - m_RootOrder: 214 - m_LocalEulerAnglesHint: {x: 1.3770001, y: 0, z: -23.372002} ---- !u!65 &818200654 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 818200652} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &818200655 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 818200652} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &818200656 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 818200652} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} -======= ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity --- !u!1 &823716095 GameObject: m_ObjectHideFlags: 0 @@ -9528,11 +8972,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 144 -======= - m_RootOrder: 145 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: -81.853004, z: 0} --- !u!65 &823716097 BoxCollider: @@ -9625,7 +9065,7 @@ Transform: m_LocalScale: {x: 1.0319846, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 202 + m_RootOrder: 201 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &837299595 BoxCollider: @@ -9692,7 +9132,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 2445808756126767684, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -9702,22 +9142,22 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.x - value: -77.88 + value: 83.8142 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.y - value: -15.052668 + value: -5.9784393 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.z - value: 0.17 + value: 9.786669 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -9727,17 +9167,17 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -9756,6 +9196,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} +--- !u!4 &844479886 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, + type: 3} + m_PrefabInstance: {fileID: 844479885} + m_PrefabAsset: {fileID: 0} --- !u!1 &854829796 GameObject: m_ObjectHideFlags: 0 @@ -9787,11 +9233,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 38.122925, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 161 -======= - m_RootOrder: 162 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: -3.6880002, y: 0, z: 0} --- !u!65 &854829798 BoxCollider: @@ -9824,11 +9266,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9888,11 +9326,7 @@ Transform: m_LocalScale: {x: 32.303875, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 130 -======= - m_RootOrder: 131 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &865282257 BoxCollider: @@ -9925,7 +9359,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5f3f1bb388690874fbed5485250640dc, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9985,11 +9419,7 @@ Transform: m_LocalScale: {x: 0.7961567, y: 2.0885198, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 59 -======= - m_RootOrder: 60 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -22.890001} --- !u!65 &882348909 BoxCollider: @@ -10022,11 +9452,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: c29d4d79c18e3284e8d85d2266d72b27, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10086,7 +9512,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 8.262577, z: 0.8252942} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 188 + m_RootOrder: 187 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &889788998 BoxCollider: @@ -10119,7 +9545,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10179,7 +9605,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 18.079956, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 198 + m_RootOrder: 197 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &914139127 BoxCollider: @@ -10212,7 +9638,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10246,7 +9672,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -10256,22 +9682,22 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.x - value: -206.556 + value: -44.8618 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.y - value: 2.2652612 + value: 11.339489 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.z - value: 1.1492922 + value: 10.765961 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -10281,17 +9707,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -10310,6 +9736,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!4 &925293788 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, + type: 3} + m_PrefabInstance: {fileID: 925293787} + m_PrefabAsset: {fileID: 0} --- !u!1 &928864764 GameObject: m_ObjectHideFlags: 0 @@ -10374,11 +9806,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 5f3f1bb388690874fbed5485250640dc, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10438,11 +9866,7 @@ Transform: m_LocalScale: {x: 17.528688, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 93 -======= - m_RootOrder: 94 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &955359644 BoxCollider: @@ -10475,11 +9899,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 5d027e838ac6db348980898c93402db5, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10539,11 +9959,7 @@ Transform: m_LocalScale: {x: 22.135443, y: 1.3878114, z: 11.325438} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 177 -======= - m_RootOrder: 178 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &959019795 BoxCollider: @@ -10576,7 +9992,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b5554106d0493a44db3e767036d87a1b, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10636,11 +10052,7 @@ Transform: m_LocalScale: {x: 1.0103455, y: 6.351495, z: 1} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 100 -======= - m_RootOrder: 101 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &965939622 BoxCollider: @@ -10707,7 +10119,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 6364420394033728395, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} @@ -10717,22 +10129,22 @@ PrefabInstance: - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_RootOrder - value: 15 + value: 16 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_LocalPosition.x - value: -130.31 + value: 31.384201 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_LocalPosition.y - value: -8.737585 + value: 0.33664322 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_LocalPosition.z - value: 3.238444 + value: 12.855113 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} @@ -10771,6 +10183,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} +--- !u!4 &981711606 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, + type: 3} + m_PrefabInstance: {fileID: 981711605} + m_PrefabAsset: {fileID: 0} --- !u!1 &989186526 GameObject: m_ObjectHideFlags: 0 @@ -10802,11 +10220,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 18.079956, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 147 -======= - m_RootOrder: 148 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &989186528 BoxCollider: @@ -10839,11 +10253,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10903,11 +10313,7 @@ Transform: m_LocalScale: {x: 36.013542, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 172 -======= - m_RootOrder: 173 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &995957770 BoxCollider: @@ -10940,7 +10346,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b5554106d0493a44db3e767036d87a1b, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11000,11 +10406,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 142 -======= - m_RootOrder: 143 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: -89.549, z: 0} --- !u!65 &997469295 BoxCollider: @@ -11130,11 +10532,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 5f3f1bb388690874fbed5485250640dc, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11194,11 +10592,7 @@ Transform: m_LocalScale: {x: 24.97008, y: 0.51622707, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 95 -======= - m_RootOrder: 96 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 180.00002, z: 32.655003} --- !u!65 &1027239511 BoxCollider: @@ -11231,11 +10625,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 84f36545290558b4999deaf40861d198, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11269,7 +10659,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -11279,22 +10669,22 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.x - value: -172.282 + value: -10.587799 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.y - value: 2.061 + value: 11.135228 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.z - value: -0.54 + value: 9.076669 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -11304,17 +10694,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -11333,12 +10723,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!4 &1028844683 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, + type: 3} + m_PrefabInstance: {fileID: 1028844682} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1029242147 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -11348,22 +10744,22 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.x - value: -158.55562 + value: 3.1385803 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.y - value: -4.6530023 + value: 4.421226 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.z - value: 1.9406302 + value: 11.557299 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -11373,17 +10769,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -11402,6 +10798,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!4 &1029242148 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, + type: 3} + m_PrefabInstance: {fileID: 1029242147} + m_PrefabAsset: {fileID: 0} --- !u!1 &1037826044 GameObject: m_ObjectHideFlags: 0 @@ -11433,15 +10835,9 @@ Transform: m_LocalScale: {x: 21.509415, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 220 - m_LocalEulerAnglesHint: {x: 2.479, y: 0.671, z: -32.568} ---- !u!65 &1032446207 -======= m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1037826046 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11532,104 +10928,6 @@ Transform: m_LocalScale: {x: 1.0904166, y: 26.585146, z: 1.3431108} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 83 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1049894895 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1049894893} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1049894896 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1049894893} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity - 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 ---- !u!33 &1049894897 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1049894893} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1051683314 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1051683315} - - component: {fileID: 1051683318} - - component: {fileID: 1051683317} - - component: {fileID: 1051683316} - m_Layer: 0 - m_Name: Cube (210) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity ---- !u!4 &1049894894 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1049894893} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 30.699999, y: -67.31, z: 1.4074} - m_LocalScale: {x: 1.0904166, y: 13.437381, z: 1.3431108} - m_Children: [] - m_Father: {fileID: 1699353165} m_RootOrder: 82 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1049894895 @@ -11711,8 +11009,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 -======= ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity --- !u!4 &1051683315 Transform: m_ObjectHideFlags: 0 @@ -11725,7 +11021,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 20.348637, z: 0.8252946} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 194 + m_RootOrder: 193 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -34.061} --- !u!65 &1051683316 BoxCollider: @@ -11758,11 +11054,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11796,7 +11088,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 2445808756126767684, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -11811,17 +11103,17 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.x - value: -78.9142 + value: 82.78 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.y - value: -15.052668 + value: -5.9784393 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.z - value: 0.21902111 + value: 9.83569 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -11831,17 +11123,17 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -11860,6 +11152,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} +--- !u!4 &1057999565 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, + type: 3} + m_PrefabInstance: {fileID: 1057999564} + m_PrefabAsset: {fileID: 0} --- !u!1 &1066981949 GameObject: m_ObjectHideFlags: 0 @@ -11891,11 +11189,7 @@ Transform: m_LocalScale: {x: 6.738126, y: 3.4400165, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 171 -======= - m_RootOrder: 172 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1066981951 BoxCollider: @@ -11928,7 +11222,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12021,11 +11315,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12085,7 +11375,7 @@ Transform: m_LocalScale: {x: 1.0319846, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 203 + m_RootOrder: 202 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1085099760 BoxCollider: @@ -12178,11 +11468,7 @@ Transform: m_LocalScale: {x: 13.418659, y: 0.51622707, z: 1.2713741} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 113 -======= - m_RootOrder: 114 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 37.078003} --- !u!65 &1100637806 BoxCollider: @@ -12215,11 +11501,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12279,7 +11561,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 18.079956, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 185 + m_RootOrder: 184 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1107486762 BoxCollider: @@ -12372,15 +11654,9 @@ Transform: m_LocalScale: {x: 0.23837596, y: 12.901637, z: 0.5817405} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 212 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 35.174} ---- !u!65 &1128369351 -======= - m_RootOrder: 227 + m_RootOrder: 226 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1114592408 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -12411,7 +11687,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12471,11 +11747,7 @@ Transform: m_LocalScale: {x: 13.418659, y: 0.51622707, z: 1.2713741} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 107 -======= - m_RootOrder: 108 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -42.108} --- !u!65 &1134114487 BoxCollider: @@ -12508,11 +11780,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12572,11 +11840,7 @@ Transform: m_LocalScale: {x: 1.0904166, y: 13.437381, z: 2.1357627} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 67 -======= - m_RootOrder: 68 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1143352603 BoxCollider: @@ -12609,7 +11873,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 2100000, guid: 382cda4fd75cc1043bb28f8256028de0, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12669,15 +11933,9 @@ Transform: m_LocalScale: {x: 13.667625, y: 1, z: -1.8347678} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 78 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -20.004002} ---- !u!65 &1153409524 -======= - m_RootOrder: 216 + m_RootOrder: 215 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 13.299001} --- !u!65 &1147414356 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -12708,11 +11966,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12746,7 +12000,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 2445808756126767684, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -12761,17 +12015,17 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.x - value: -106.36 + value: 55.334198 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.y - value: -15.85147 + value: -6.7772417 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.z - value: 2.078065 + value: 11.694734 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -12781,17 +12035,17 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -12810,6 +12064,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} +--- !u!4 &1150536735 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, + type: 3} + m_PrefabInstance: {fileID: 1150536734} + m_PrefabAsset: {fileID: 0} --- !u!1 &1153409522 GameObject: m_ObjectHideFlags: 0 @@ -12841,15 +12101,9 @@ Transform: m_LocalScale: {x: 4.6055837, y: 4.5365934, z: 9.229389} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 186 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1157646381 -======= - m_RootOrder: 79 + m_RootOrder: 78 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -20.004002} --- !u!65 &1153409524 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -12880,11 +12134,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 521403030cac0b84e8740f04dc03b26a, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12944,11 +12194,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 8.262577, z: 0.8252942} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 208 -======= - m_RootOrder: 186 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + m_RootOrder: 185 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1157646381 BoxCollider: @@ -13041,11 +12287,7 @@ Transform: m_LocalScale: {x: 1.0938134, y: 74.23106, z: 0.8252942} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 181 -======= - m_RootOrder: 208 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + m_RootOrder: 207 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1171835745 BoxCollider: @@ -13078,7 +12320,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13171,11 +12413,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13204,8 +12442,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1173853106} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity -======= --- !u!1 &1192718710 GameObject: m_ObjectHideFlags: 0 @@ -13237,7 +12473,7 @@ Transform: m_LocalScale: {x: 33.560455, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 233 + m_RootOrder: 232 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1192718712 BoxCollider: @@ -13270,7 +12506,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b87dc3dede67df143a45b6bc35d1979a, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13299,7 +12535,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1192718710} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity --- !u!1 &1214022750 GameObject: m_ObjectHideFlags: 0 @@ -13331,11 +12566,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 135 -======= - m_RootOrder: 136 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0.11800001, y: 18.718, z: -0.126} --- !u!65 &1214022752 BoxCollider: @@ -13397,6 +12628,57 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1214022750} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1231093624 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1231093625} + m_Layer: 0 + m_Name: level + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1231093625 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231093624} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -161.6942, y: -9.074228, z: -9.616669} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2023980960} + - {fileID: 1057999565} + - {fileID: 1998900514} + - {fileID: 1860112949} + - {fileID: 844479886} + - {fileID: 97606664} + - {fileID: 87252405} + - {fileID: 925293788} + - {fileID: 399012020} + - {fileID: 1506086143} + - {fileID: 614063896} + - {fileID: 1029242148} + - {fileID: 1028844683} + - {fileID: 694958663} + - {fileID: 546980533} + - {fileID: 1452666469} + - {fileID: 981711606} + - {fileID: 1150536735} + - {fileID: 1726859945} + - {fileID: 1438190387} + - {fileID: 1699353165} + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1245632002 GameObject: m_ObjectHideFlags: 0 @@ -13428,11 +12710,7 @@ Transform: m_LocalScale: {x: 52.470932, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 180 -======= - m_RootOrder: 181 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1245632004 BoxCollider: @@ -13465,7 +12743,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 0a366e5a36fbbc849ba636dde51beea3, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13525,11 +12803,7 @@ Transform: m_LocalScale: {x: 1.0103455, y: 6.351495, z: 1} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 98 -======= - m_RootOrder: 99 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1252323437 BoxCollider: @@ -13622,11 +12896,7 @@ Transform: m_LocalScale: {x: 0.7961567, y: 2.0835536, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 57 -======= - m_RootOrder: 58 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5.9360003} --- !u!65 &1259764335 BoxCollider: @@ -13659,11 +12929,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: c29d4d79c18e3284e8d85d2266d72b27, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13723,11 +12989,7 @@ Transform: m_LocalScale: {x: 6.738126, y: 3.4400165, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 169 -======= - m_RootOrder: 170 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1262750886 BoxCollider: @@ -13760,7 +13022,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13820,7 +13082,7 @@ Transform: m_LocalScale: {x: 0.7961567, y: 8.754367, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 55 + m_RootOrder: 239 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1271107586 BoxCollider: @@ -13853,11 +13115,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: c29d4d79c18e3284e8d85d2266d72b27, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13917,11 +13175,7 @@ Transform: m_LocalScale: {x: 12.1985855, y: 2.088486, z: 1} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 96 -======= - m_RootOrder: 97 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1276460910 BoxCollider: @@ -14014,7 +13268,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 94.15576, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 200 + m_RootOrder: 199 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1277725226 BoxCollider: @@ -14047,7 +13301,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14107,11 +13361,7 @@ Transform: m_LocalScale: {x: 1.0938134, y: 34.28944, z: 0.8252938} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 217 -======= - m_RootOrder: 211 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + m_RootOrder: 210 m_LocalEulerAnglesHint: {x: -2.1650002, y: -0.55600005, z: -8.961} --- !u!65 &1291140638 BoxCollider: @@ -14144,7 +13394,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14204,11 +13454,7 @@ Transform: m_LocalScale: {x: 17.460373, y: 0.51622707, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 106 -======= - m_RootOrder: 107 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -42.108} --- !u!65 &1299655753 BoxCollider: @@ -14241,11 +13487,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 84f36545290558b4999deaf40861d198, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14305,11 +13547,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 38.122925, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 158 -======= - m_RootOrder: 159 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 3.571, y: 0, z: 0} --- !u!65 &1309102683 BoxCollider: @@ -14342,11 +13580,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14406,7 +13640,7 @@ Transform: m_LocalScale: {x: 1.0938134, y: 32.499134, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 209 + m_RootOrder: 208 m_LocalEulerAnglesHint: {x: -2.312, y: 0, z: 0} --- !u!65 &1315904883 BoxCollider: @@ -14439,7 +13673,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14532,7 +13766,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f088e83810086dd47ab9a9718144ed37, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14592,7 +13826,7 @@ Transform: m_LocalScale: {x: 7.912705, y: 1.3878114, z: 11.325438} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 232 + m_RootOrder: 231 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &1340399031 BoxCollider: @@ -14625,7 +13859,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14685,11 +13919,7 @@ Transform: m_LocalScale: {x: 4.6055837, y: 3.931166, z: 4.9407444} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 71 -======= - m_RootOrder: 72 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -26.053001} --- !u!65 &1340523929 BoxCollider: @@ -14722,11 +13952,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 521403030cac0b84e8740f04dc03b26a, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14786,11 +14012,7 @@ Transform: m_LocalScale: {x: 3.4940033, y: 4.907025, z: 1.9802314} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 125 -======= - m_RootOrder: 126 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1368390228 BoxCollider: @@ -14823,11 +14045,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 1010212748793951612, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14887,11 +14105,7 @@ Transform: m_LocalScale: {x: 1.0904166, y: 12.762881, z: 2.1357627} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 81 -======= - m_RootOrder: 82 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1376762084 BoxCollider: @@ -14953,75 +14167,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1376762082} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1380562906 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7094923891560833857, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_RootOrder - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_LocalPosition.x - value: -127.2 - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_LocalPosition.y - value: -7.61 - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_LocalPosition.z - value: 1.1485789 - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} --- !u!1 &1382854192 GameObject: m_ObjectHideFlags: 0 @@ -15053,7 +14198,7 @@ Transform: m_LocalScale: {x: 3.3077164, y: 1.4284023, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 183 + m_RootOrder: 182 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &1382854194 BoxCollider: @@ -15086,7 +14231,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -15146,15 +14291,9 @@ Transform: m_LocalScale: {x: 0.7961567, y: 13.723271, z: 3.1472147} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 213 - m_LocalEulerAnglesHint: {x: -2.2350001, y: 0, z: -23.372002} ---- !u!65 &1398176867 -======= m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1405594778 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -15245,7 +14384,7 @@ Transform: m_LocalScale: {x: 21.446028, y: 1.3878114, z: 11.325438} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 238 + m_RootOrder: 237 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &1420828805 BoxCollider: @@ -15278,11 +14417,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0a366e5a36fbbc849ba636dde51beea3, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -15342,11 +14477,7 @@ Transform: m_LocalScale: {x: 13.418659, y: 0.51622707, z: 1.2713741} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 110 -======= - m_RootOrder: 111 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 37.078003} --- !u!65 &1422236266 BoxCollider: @@ -15379,11 +14510,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -15536,11 +14663,7 @@ Transform: m_LocalScale: {x: 18.117708, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 131 -======= - m_RootOrder: 132 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1430111152 BoxCollider: @@ -15573,7 +14696,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 7c471337ec1659946ab9cc546d0dfb3c, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -15633,11 +14756,7 @@ Transform: m_LocalScale: {x: 13.418659, y: 0.51622707, z: 1.2713741} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 114 -======= - m_RootOrder: 115 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 37.078003} --- !u!65 &1432614255 BoxCollider: @@ -15670,11 +14789,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -15708,7 +14823,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 2445808756126767684, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -15723,17 +14838,17 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.x - value: -327.33 + value: -165.63579 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.y - value: 12.085315 + value: 21.159542 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.z - value: 1.3559744 + value: 10.972643 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -15743,17 +14858,17 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -15772,6 +14887,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} +--- !u!4 &1438190387 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, + type: 3} + m_PrefabInstance: {fileID: 1438190386} + m_PrefabAsset: {fileID: 0} --- !u!1 &1449963168 GameObject: m_ObjectHideFlags: 0 @@ -15803,11 +14924,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 134 -======= - m_RootOrder: 135 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: -8.312, z: 0} --- !u!65 &1449963170 BoxCollider: @@ -15874,7 +14991,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 2445808756126767684, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -15884,22 +15001,22 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_RootOrder - value: 14 + value: 15 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.x - value: -105.87 + value: 55.824196 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.y - value: -15.85147 + value: -6.7772417 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.z - value: 2.078065 + value: 11.694734 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -15909,17 +15026,17 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -15938,6 +15055,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} +--- !u!4 &1452666469 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, + type: 3} + m_PrefabInstance: {fileID: 1452666468} + m_PrefabAsset: {fileID: 0} --- !u!1 &1453029479 GameObject: m_ObjectHideFlags: 0 @@ -16002,7 +15125,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9188b3e8b3ae59b46a111e8a47a13a00, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16095,11 +15218,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 5d027e838ac6db348980898c93402db5, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16159,7 +15278,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 21.088005, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 206 + m_RootOrder: 205 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1457295053 BoxCollider: @@ -16192,7 +15311,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16252,11 +15371,7 @@ Transform: m_LocalScale: {x: 0.7064708, y: 27.597578, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 160 -======= - m_RootOrder: 161 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: -4.393, y: 0, z: -8.464001} --- !u!65 &1461211160 BoxCollider: @@ -16289,11 +15404,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16353,11 +15464,7 @@ Transform: m_LocalScale: {x: 4.6055837, y: 3.931166, z: 4.9407444} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 84 -======= - m_RootOrder: 85 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -79.768005} --- !u!65 &1468495949 BoxCollider: @@ -16390,7 +15497,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: bef0a68cde57f9446973c9f63186f13d, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16450,7 +15557,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 8.262577, z: 0.8252942} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 187 + m_RootOrder: 186 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1472856782 BoxCollider: @@ -16636,11 +15743,7 @@ Transform: m_LocalScale: {x: 8.467903, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 102 -======= - m_RootOrder: 103 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.433001} --- !u!65 &1492569517 BoxCollider: @@ -16673,11 +15776,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 9b7535e1ed5c95141ae45579896325ab, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16737,11 +15836,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 143 -======= - m_RootOrder: 144 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: -105.40501, z: 0} --- !u!65 &1496510718 BoxCollider: @@ -16834,11 +15929,7 @@ Transform: m_LocalScale: {x: 1.4972903, y: 1.15, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 116 -======= - m_RootOrder: 117 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1500240539 BoxCollider: @@ -16871,11 +15962,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16909,7 +15996,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -16919,22 +16006,22 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.x - value: -182.19987 + value: -20.505676 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.y - value: -36.108997 + value: -27.03477 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.z - value: 1.0340502 + value: 10.650719 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -16944,17 +16031,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -16973,6 +16060,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!4 &1506086143 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, + type: 3} + m_PrefabInstance: {fileID: 1506086142} + m_PrefabAsset: {fileID: 0} --- !u!1 &1509405222 GameObject: m_ObjectHideFlags: 0 @@ -17004,11 +16097,7 @@ Transform: m_LocalScale: {x: 1.0904164, y: 2.0728517, z: -6.360933} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 65 -======= - m_RootOrder: 66 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1509405224 BoxCollider: @@ -17041,11 +16130,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 5f3f1bb388690874fbed5485250640dc, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17105,15 +16190,9 @@ Transform: m_LocalScale: {x: 1.3865072, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 216 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 23.29} ---- !u!65 &1512502940 -======= m_RootOrder: 53 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 13.299001} --- !u!65 &1514423668 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -17144,7 +16223,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17193,111 +16272,6 @@ GameObject: m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &1515622405 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_GameObject: {fileID: 1514423666} - m_LocalRotation: {x: -0, y: -0, z: 0.11579816, w: 0.9932728} - m_LocalPosition: {x: 23.661997, y: -11.13, z: -2.8053167} - m_LocalScale: {x: 0.8332354, y: 1, z: 11.656721} -======= - m_GameObject: {fileID: 1515622404} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -37.7, y: -17.53, z: -2.8053167} - m_LocalScale: {x: 4.717254, y: 3.4400165, z: 11.656721} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity - m_Children: [] - m_Father: {fileID: 1699353165} - m_RootOrder: 122 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1515622406 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1515622404} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1515622407 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1515622404} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity - 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 ---- !u!33 &1515622408 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1515622404} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1517599588 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - component: {fileID: 1515622405} - - component: {fileID: 1515622408} - - component: {fileID: 1515622407} - - component: {fileID: 1515622406} - m_Layer: 0 - m_Name: Cube (134) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1515622405 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -17342,7 +16316,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17379,8 +16353,6 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: -======= ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity - component: {fileID: 1517599589} - component: {fileID: 1517599592} - component: {fileID: 1517599591} @@ -17404,11 +16376,7 @@ Transform: m_LocalScale: {x: 5.7279882, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 91 -======= - m_RootOrder: 92 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1517599590 BoxCollider: @@ -17441,11 +16409,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 84f36545290558b4999deaf40861d198, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17538,11 +16502,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 84f36545290558b4999deaf40861d198, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17635,11 +16595,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - {fileID: 1010212748793951612, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17699,11 +16655,7 @@ Transform: m_LocalScale: {x: 4.6055837, y: 4.5365934, z: 9.229389} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 77 -======= - m_RootOrder: 78 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -67.719} --- !u!65 &1536367600 BoxCollider: @@ -17736,11 +16688,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 521403030cac0b84e8740f04dc03b26a, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17833,11 +16781,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: c29d4d79c18e3284e8d85d2266d72b27, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17897,11 +16841,7 @@ Transform: m_LocalScale: {x: 4.6055837, y: 4.5365934, z: 9.229389} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 74 -======= - m_RootOrder: 75 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -67.719} --- !u!65 &1558858366 BoxCollider: @@ -17934,11 +16874,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 521403030cac0b84e8740f04dc03b26a, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17998,11 +16934,7 @@ Transform: m_LocalScale: {x: 7.40885, y: 1, z: 1.6395642} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 118 -======= - m_RootOrder: 119 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 26.709002} --- !u!65 &1565178279 BoxCollider: @@ -18035,11 +16967,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18099,7 +17027,7 @@ Transform: m_LocalScale: {x: 1.0904166, y: 13.437381, z: 1.3431108} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 214 + m_RootOrder: 213 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1570792793 BoxCollider: @@ -18161,9 +17089,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570792791} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity ---- !u!1 &1578203810 -======= --- !u!1 &1571909033 GameObject: m_ObjectHideFlags: 0 @@ -18195,7 +17120,7 @@ Transform: m_LocalScale: {x: 0.23837596, y: 12.901637, z: 0.5817405} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 228 + m_RootOrder: 227 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1571909035 BoxCollider: @@ -18228,7 +17153,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18258,7 +17183,6 @@ MeshFilter: m_GameObject: {fileID: 1571909033} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1573624174 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -18289,15 +17213,9 @@ Transform: m_LocalScale: {x: 15.305815, y: 1.0000023, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 62 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -13.768001} ---- !u!65 &1578203812 -======= m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &1573624176 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -18328,11 +17246,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - {fileID: 1010212748793951612, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18425,7 +17339,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18485,7 +17399,7 @@ Transform: m_LocalScale: {x: 0.7961567, y: 2.0835536, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 63 + m_RootOrder: 62 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -13.768001} --- !u!65 &1578203812 BoxCollider: @@ -18518,7 +17432,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: c29d4d79c18e3284e8d85d2266d72b27, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18633,13 +17547,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1590551166} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: -79.753, y: -4.7444, z: -0.1245} - m_LocalScale: {x: 0.5572268, y: 0.28737563, z: 0.25102955} -======= m_LocalPosition: {x: -107.5, y: -4.1838, z: 0} m_LocalScale: {x: 0.47207206, y: 1, z: 0.28177} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -18675,11 +17584,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 38.148808, z: 0.8588612} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 164 -======= - m_RootOrder: 165 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 3.0180001, y: -0.648, z: -4.742} --- !u!65 &1590855091 BoxCollider: @@ -18712,7 +17617,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18772,11 +17677,7 @@ Transform: m_LocalScale: {x: 1.0904166, y: 28.31168, z: 1.3431108} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 150 -======= - m_RootOrder: 151 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -19.496} --- !u!65 &1591363218 BoxCollider: @@ -18809,11 +17710,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18873,11 +17770,7 @@ Transform: m_LocalScale: {x: 4.6055837, y: 4.5365934, z: 9.229389} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 76 -======= - m_RootOrder: 77 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -67.719} --- !u!65 &1593074836 BoxCollider: @@ -18910,7 +17803,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19003,11 +17896,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 5f3f1bb388690874fbed5485250640dc, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19100,11 +17989,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19164,11 +18049,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 133 -======= - m_RootOrder: 134 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 12.769001, z: 0} --- !u!65 &1617209218 BoxCollider: @@ -19261,7 +18142,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 16.69565, z: 0.8252946} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 196 + m_RootOrder: 195 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 12.853001} --- !u!65 &1622244751 BoxCollider: @@ -19294,11 +18175,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19358,7 +18235,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 21.088005, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 199 + m_RootOrder: 198 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1634477490 BoxCollider: @@ -19391,7 +18268,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19451,7 +18328,7 @@ Transform: m_LocalScale: {x: 5.946398, y: 9.169718, z: 11.325438} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 237 + m_RootOrder: 236 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &1636442153 BoxCollider: @@ -19484,7 +18361,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19577,7 +18454,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f088e83810086dd47ab9a9718144ed37, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19637,11 +18514,7 @@ Transform: m_LocalScale: {x: 4.717254, y: 3.4400165, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 154 -======= - m_RootOrder: 155 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1666442123 BoxCollider: @@ -19674,11 +18547,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19734,19 +18603,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1667497428} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: 62.75, y: -9.409, z: 1.7119994} - m_LocalScale: {x: 1.0904166, y: 12.901637, z: 1.9791805} - m_Children: [] - m_Father: {fileID: 1699353165} - m_RootOrder: 88 -======= m_LocalPosition: {x: 62.75, y: -9.409, z: 1.54} m_LocalScale: {x: 1.0904166, y: 12.901637, z: 1.9791805} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 89 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + m_RootOrder: 88 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1667497430 BoxCollider: @@ -19839,7 +18700,7 @@ Transform: m_LocalScale: {x: 13.407579, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 236 + m_RootOrder: 235 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1682241487 BoxCollider: @@ -19872,7 +18733,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b87dc3dede67df143a45b6bc35d1979a, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19932,11 +18793,7 @@ Transform: m_LocalScale: {x: 4.717254, y: 3.4400165, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 162 -======= - m_RootOrder: 163 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1683181004 BoxCollider: @@ -19969,7 +18826,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -20025,11 +18882,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1685734059} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: 62.64, y: -54.506, z: 1.7919996} -======= m_LocalPosition: {x: 62.64, y: -54.506, z: 1.632} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalScale: {x: 1.0904166, y: 10.26324, z: 1.9791785} m_Children: [] m_Father: {fileID: 1699353165} @@ -20159,11 +19012,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: f4caa11616ecb9041b459a020c575a12, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -20215,14 +19064,9 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1699353164} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: -123.48, y: -5.1403, z: 0.72766} - m_LocalScale: {x: 0.5572268, y: 0.25102955, z: 0.28737563} -======= - m_LocalPosition: {x: -144.55, y: -4.6281, z: 2.9653168} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 17.144196, y: 4.4461284, z: 12.581985} m_LocalScale: {x: 0.47207206, y: 0.28177, z: 1} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_Children: - {fileID: 1037826045} - {fileID: 1910873182} @@ -20279,7 +19123,7 @@ Transform: - {fileID: 729414428} - {fileID: 1514423667} - {fileID: 321736898} - - {fileID: 1271107585} + - {fileID: 1576017274} - {fileID: 1538944338} - {fileID: 1259764334} - {fileID: 1817682907} @@ -20436,13 +19280,6 @@ Transform: - {fileID: 9027388} - {fileID: 1291140637} - {fileID: 2085579131} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 42994065} - - {fileID: 1032446206} - - {fileID: 1920623301} - m_Father: {fileID: 0} - m_RootOrder: 4 -======= - {fileID: 333693310} - {fileID: 1570792792} - {fileID: 1938559162} @@ -20452,7 +19289,7 @@ Transform: - {fileID: 1711560394} - {fileID: 2028127326} - {fileID: 593631741} - - {fileID: 480224380} + - {fileID: 1920623301} - {fileID: 70960975} - {fileID: 621775059} - {fileID: 612833765} @@ -20469,9 +19306,10 @@ Transform: - {fileID: 1682241486} - {fileID: 1636442152} - {fileID: 1420828804} - m_Father: {fileID: 0} + - {fileID: 480224380} + - {fileID: 1271107585} + m_Father: {fileID: 1231093625} m_RootOrder: 20 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1705335453 GameObject: @@ -20504,15 +19342,9 @@ Transform: m_LocalScale: {x: 1.0938134, y: 72.60498, z: 0.82529545} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 197 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 12.853001} ---- !u!65 &1709443932 -======= - m_RootOrder: 230 + m_RootOrder: 229 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1705335455 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -20543,11 +19375,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -20607,15 +19435,9 @@ Transform: m_LocalScale: {x: 0.76576126, y: 16.69565, z: 0.8252946} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 73 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -56.06} ---- !u!65 &1711930620 -======= - m_RootOrder: 197 + m_RootOrder: 196 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 12.853001} --- !u!65 &1709443932 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -20646,11 +19468,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -20710,7 +19528,7 @@ Transform: m_LocalScale: {x: 0.4861077, y: 8.435878, z: 1.9791785} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 219 + m_RootOrder: 218 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 13.058001} --- !u!65 &1711560395 BoxCollider: @@ -20803,7 +19621,7 @@ Transform: m_LocalScale: {x: 4.6055837, y: 3.931166, z: 4.9407444} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 74 + m_RootOrder: 73 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -56.06} --- !u!65 &1711930620 BoxCollider: @@ -20836,7 +19654,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 521403030cac0b84e8740f04dc03b26a, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -20870,7 +19688,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 2445808756126767684, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -20885,17 +19703,17 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.x - value: -106.840004 + value: 54.854195 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.y - value: -15.85147 + value: -6.7772417 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalPosition.z - value: 2.078065 + value: 11.694734 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -20905,17 +19723,17 @@ PrefabInstance: - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} @@ -20934,6 +19752,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} +--- !u!4 &1726859945 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, + type: 3} + m_PrefabInstance: {fileID: 1726859944} + m_PrefabAsset: {fileID: 0} --- !u!1 &1733785515 GameObject: m_ObjectHideFlags: 0 @@ -20998,7 +19822,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 84f36545290558b4999deaf40861d198, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21091,11 +19915,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 5f3f1bb388690874fbed5485250640dc, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21155,7 +19975,7 @@ Transform: m_LocalScale: {x: 0.4861077, y: 8.435878, z: 1.9791785} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 218 + m_RootOrder: 217 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 13.058001} --- !u!65 &1752780582 BoxCollider: @@ -21188,7 +20008,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21248,11 +20068,7 @@ Transform: m_LocalScale: {x: 3.1912892, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 153 -======= - m_RootOrder: 154 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1752816877 BoxCollider: @@ -21285,11 +20101,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21349,11 +20161,7 @@ Transform: m_LocalScale: {x: 17.594893, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 178 -======= - m_RootOrder: 179 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1758857122 BoxCollider: @@ -21386,7 +20194,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b5554106d0493a44db3e767036d87a1b, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21446,11 +20254,7 @@ Transform: m_LocalScale: {x: 12.392303, y: 1, z: 11.633055} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 105 -======= - m_RootOrder: 106 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1765592979 BoxCollider: @@ -21483,11 +20287,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 5d027e838ac6db348980898c93402db5, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21547,11 +20347,7 @@ Transform: m_LocalScale: {x: 8.467903, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 132 -======= - m_RootOrder: 133 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.433001} --- !u!65 &1775169630 BoxCollider: @@ -21584,7 +20380,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5f3f1bb388690874fbed5485250640dc, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21644,7 +20440,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 8.262577, z: 0.8252942} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 191 + m_RootOrder: 190 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1810544623 BoxCollider: @@ -21677,7 +20473,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21770,11 +20566,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21834,11 +20626,7 @@ Transform: m_LocalScale: {x: 0.7961567, y: 1.4942421, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 58 -======= - m_RootOrder: 59 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 22.815} --- !u!65 &1817682908 BoxCollider: @@ -21871,11 +20659,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: c29d4d79c18e3284e8d85d2266d72b27, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21935,11 +20719,7 @@ Transform: m_LocalScale: {x: 4.717254, y: 3.4400165, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 122 -======= - m_RootOrder: 123 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1831676445 BoxCollider: @@ -21972,11 +20752,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22036,11 +20812,7 @@ Transform: m_LocalScale: {x: 22.26841, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 174 -======= - m_RootOrder: 175 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1834271286 BoxCollider: @@ -22073,7 +20845,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b5554106d0493a44db3e767036d87a1b, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22133,11 +20905,7 @@ Transform: m_LocalScale: {x: 17.785982, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 69 -======= - m_RootOrder: 70 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1847939687 BoxCollider: @@ -22170,11 +20938,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: f4caa11616ecb9041b459a020c575a12, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22234,11 +20998,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 145 -======= - m_RootOrder: 146 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: -81.853004, z: 0} --- !u!65 &1851761553 BoxCollider: @@ -22305,7 +21065,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -22320,17 +21080,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.x - value: -329.29453 + value: -167.60033 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.y - value: 11.791905 + value: 20.866135 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.z - value: 0.82558084 + value: 10.442249 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -22340,17 +21100,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -22369,6 +21129,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!4 &1860112949 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, + type: 3} + m_PrefabInstance: {fileID: 1860112948} + m_PrefabAsset: {fileID: 0} --- !u!1 &1866076162 GameObject: m_ObjectHideFlags: 0 @@ -22400,7 +21166,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 20.348637, z: 0.8252946} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 195 + m_RootOrder: 194 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -34.061} --- !u!65 &1866076164 BoxCollider: @@ -22433,11 +21199,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22493,19 +21255,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1870943589} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: -6.13, y: -18.63, z: -2.941} - m_LocalScale: {x: 0.7943497, y: 4.1600776, z: 9.60959} - m_Children: [] - m_Father: {fileID: 1699353165} - m_RootOrder: 148 -======= m_LocalPosition: {x: -6.13, y: -18.63, z: -3.39} m_LocalScale: {x: 0.7943497, y: 4.1600776, z: 10.545476} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 149 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + m_RootOrder: 148 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1870943591 BoxCollider: @@ -22538,11 +21292,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 5f3f1bb388690874fbed5485250640dc, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22602,11 +21352,7 @@ Transform: m_LocalScale: {x: 1.0319846, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 168 -======= - m_RootOrder: 169 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1876066066 BoxCollider: @@ -22639,7 +21385,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 6ba5b71cd3a2ff44ea97364fdf9e0dbd, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22699,7 +21445,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 21.088005, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 205 + m_RootOrder: 204 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1879180114 BoxCollider: @@ -22732,7 +21478,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22792,11 +21538,7 @@ Transform: m_LocalScale: {x: 0.88492846, y: 3.1645775, z: 11.656727} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 117 -======= - m_RootOrder: 118 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1880214625 BoxCollider: @@ -22829,11 +21571,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22986,7 +21724,7 @@ Transform: m_LocalScale: {x: 7.912705, y: 1.3878114, z: 11.325438} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 235 + m_RootOrder: 234 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &1920465586 BoxCollider: @@ -23019,11 +21757,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23176,11 +21910,7 @@ Transform: m_LocalScale: {x: 6.6586995, y: 0.99999994, z: 9.702206} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 127 -======= - m_RootOrder: 128 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1922746367 BoxCollider: @@ -23213,11 +21943,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: f4caa11616ecb9041b459a020c575a12, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23277,11 +22003,7 @@ Transform: m_LocalScale: {x: 4.6055837, y: 7.56317, z: 7.774311} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 72 -======= - m_RootOrder: 73 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: -69.428} --- !u!65 &1924268199 BoxCollider: @@ -23314,11 +22036,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 521403030cac0b84e8740f04dc03b26a, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23411,11 +22129,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 8935d128230deb944bfbe7b1fdf560a4, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23508,11 +22222,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - {fileID: 1010212748793951612, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23572,11 +22282,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 138 -======= - m_RootOrder: 139 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: -24.186, z: 0} --- !u!65 &1935110319 BoxCollider: @@ -23669,7 +22375,7 @@ Transform: m_LocalScale: {x: 1.0938134, y: 74.23106, z: 0.8252942} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 207 + m_RootOrder: 206 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1937150922 BoxCollider: @@ -23702,7 +22408,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23762,7 +22468,7 @@ Transform: m_LocalScale: {x: 13.667625, y: 1, z: -1.8347678} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 215 + m_RootOrder: 214 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 13.299001} --- !u!65 &1938559163 BoxCollider: @@ -23795,7 +22501,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 33e524b2c7c45cb4598e3eb143efc76f, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23888,11 +22594,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 5d027e838ac6db348980898c93402db5, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23922,8 +22624,6 @@ MeshFilter: m_GameObject: {fileID: 1950921625} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1970827489 -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity -======= GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -23954,7 +22654,7 @@ Transform: m_LocalScale: {x: 44.115814, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 81 + m_RootOrder: 80 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 50.966003} --- !u!65 &1970827491 BoxCollider: @@ -24047,7 +22747,7 @@ Transform: m_LocalScale: {x: 0.7943497, y: 0.8580432, z: 1.6502445} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 138 + m_RootOrder: 137 m_LocalEulerAnglesHint: {x: 0, y: -47.738003, z: 0} --- !u!65 &1972675358 BoxCollider: @@ -24110,7 +22810,6 @@ MeshFilter: m_GameObject: {fileID: 1972675356} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1980297670 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -24141,15 +22840,9 @@ Transform: m_LocalScale: {x: 0.7064708, y: 27.597578, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 80 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 53.606003} ---- !u!65 &1970827491 -======= - m_RootOrder: 158 + m_RootOrder: 157 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -8.464001} --- !u!65 &1980297672 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -24180,7 +22873,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -24240,15 +22933,9 @@ Transform: m_LocalScale: {x: 17.528688, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 137 - m_LocalEulerAnglesHint: {x: 0, y: -47.738003, z: 0} ---- !u!65 &1972675358 -======= - m_RootOrder: 164 + m_RootOrder: 163 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1986569324 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -24279,11 +22966,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - - {fileID: 2100000, guid: 5d027e838ac6db348980898c93402db5, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -24343,15 +23026,9 @@ Transform: m_LocalScale: {x: 0.7961567, y: 2.5842433, z: 6.490334} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 157 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -8.464001} ---- !u!65 &1980297672 -======= - m_RootOrder: 217 + m_RootOrder: 216 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1989387632 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -24442,15 +23119,9 @@ Transform: m_LocalScale: {x: 58.072674, y: 0.9715844, z: 11.325438} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 163 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1986569324 -======= m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &1992212033 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -24515,7 +23186,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} @@ -24525,17 +23196,17 @@ PrefabInstance: - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} propertyPath: m_LocalPosition.x - value: -333.51007 + value: -171.81587 objectReference: {fileID: 0} - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} propertyPath: m_LocalPosition.y - value: 13.31 + value: 22.384228 objectReference: {fileID: 0} - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} propertyPath: m_LocalPosition.z - value: 1.4112856 + value: 11.027954 objectReference: {fileID: 0} - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} @@ -24545,17 +23216,17 @@ PrefabInstance: - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} @@ -24579,6 +23250,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} +--- !u!4 &1998900514 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, + type: 3} + m_PrefabInstance: {fileID: 1998900513} + m_PrefabAsset: {fileID: 0} --- !u!1 &2023268707 GameObject: m_ObjectHideFlags: 0 @@ -24643,11 +23320,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} -======= - {fileID: 1125239065207877241, guid: 8f528d04933af024398be82cbc1d5cac, type: 3} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -24681,7 +23354,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1231093625} m_Modifications: - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -24691,22 +23364,22 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.x - value: -335.4469 + value: -173.7527 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.y - value: 13.679765 + value: 22.753994 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalPosition.z - value: 1.1733649 + value: 10.790033 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -24716,17 +23389,17 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -24745,6 +23418,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!4 &2023980960 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, + type: 3} + m_PrefabInstance: {fileID: 2023980959} + m_PrefabAsset: {fileID: 0} --- !u!1 &2028127325 GameObject: m_ObjectHideFlags: 0 @@ -24776,7 +23455,7 @@ Transform: m_LocalScale: {x: 0.23837596, y: 12.901637, z: 0.5817405} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 220 + m_RootOrder: 219 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2028127327 BoxCollider: @@ -24809,11 +23488,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -24873,11 +23548,7 @@ Transform: m_LocalScale: {x: 10.950608, y: 1, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 70 -======= - m_RootOrder: 71 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2030384893 BoxCollider: @@ -24910,11 +23581,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 2d1d538e5671f6246bcec75bb22fb572, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -24974,7 +23641,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 9.753048, z: 0.8252946} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 192 + m_RootOrder: 191 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 23.029001} --- !u!65 &2033325719 BoxCollider: @@ -25007,11 +23674,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -25067,19 +23730,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2043160810} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_LocalPosition: {x: 50.18, y: -9.409, z: -7.092} - m_LocalScale: {x: 1.0904166, y: 12.901637, z: 3.147216} - m_Children: [] - m_Father: {fileID: 1699353165} - m_RootOrder: 89 -======= m_LocalPosition: {x: 50.18, y: -9.409, z: -7.252} m_LocalScale: {x: 1.0904166, y: 12.901637, z: 3.147216} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 90 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + m_RootOrder: 89 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2043160812 BoxCollider: @@ -25172,11 +23827,7 @@ Transform: m_LocalScale: {x: 1.0938134, y: 34.28944, z: 0.8252938} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - m_RootOrder: 218 -======= - m_RootOrder: 212 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + m_RootOrder: 211 m_LocalEulerAnglesHint: {x: -2.1650002, y: -0.55600005, z: -8.961} --- !u!65 &2085579132 BoxCollider: @@ -25209,7 +23860,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -25269,7 +23920,7 @@ Transform: m_LocalScale: {x: 1.0938134, y: 72.60498, z: 0.82529545} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 231 + m_RootOrder: 230 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2096404161 BoxCollider: @@ -25302,7 +23953,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -25362,11 +24013,7 @@ Transform: m_LocalScale: {x: 4.717254, y: 3.4400165, z: 11.656721} m_Children: [] m_Father: {fileID: 1699353165} -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity m_RootOrder: 120 -======= - m_RootOrder: 121 ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2102661867 BoxCollider: @@ -25399,11 +24046,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 5d027e838ac6db348980898c93402db5, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -25496,11 +24139,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: -<<<<<<< Updated upstream:Assets/Scenes/Levels/Level 3.unity - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} -======= - - {fileID: 2100000, guid: 0f3f7bfbfc24fd245971f1b42199cff2, type: 2} ->>>>>>> Stashed changes:Assets/Scenes/Level 3.unity m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -25560,7 +24199,7 @@ Transform: m_LocalScale: {x: 0.76576126, y: 94.15576, z: 0.82529336} m_Children: [] m_Father: {fileID: 1699353165} - m_RootOrder: 204 + m_RootOrder: 203 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2127775759 BoxCollider: @@ -25593,7 +24232,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ca309c5926d65b34ab5267404b8debd8, type: 2} + - {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -25686,7 +24325,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2} + - {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0