diff --git a/Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 448461f..adcec6c 100644 --- a/Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetSettings m_DefaultGroup: d447fc60305c17a17bf20948ab295a45 m_currentHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 + serializedVersion: 2 + Hash: a06bce6b3d915f253035db8fc3bad4a5 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms.meta b/Game/CourierOld/Assets/Resources/Materials/Glass.meta similarity index 77% rename from Game/CourierOld/Assets/Resources_moved/Rooms.meta rename to Game/CourierOld/Assets/Resources/Materials/Glass.meta index 749d283..95b901f 100644 --- a/Game/CourierOld/Assets/Resources_moved/Rooms.meta +++ b/Game/CourierOld/Assets/Resources/Materials/Glass.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 19e115a0087cc204c868a54b120839aa +guid: a8eba23bc3e351d4982ba8ff0ab63d32 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Game/CourierOld/Assets/Resources/Materials/Glass/Glass.mat b/Game/CourierOld/Assets/Resources/Materials/Glass/Glass.mat new file mode 100644 index 0000000..24422f2 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Glass/Glass.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Glass + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _METALLICSPECGLOSSMAP + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 65fd108cef058954aa833036894fbdc9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 9a821ef1861cd6741ae9e14addede475, 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: 65fd108cef058954aa833036894fbdc9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: 679da2915ac50974aaeb21b555cc7b28, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &8839468315398433628 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Ladder.prefab.meta b/Game/CourierOld/Assets/Resources/Materials/Glass/Glass.mat.meta similarity index 52% rename from Game/CourierOld/Assets/Resources_moved/Rooms/Ladder.prefab.meta rename to Game/CourierOld/Assets/Resources/Materials/Glass/Glass.mat.meta index 081c11b..fe005df 100644 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Ladder.prefab.meta +++ b/Game/CourierOld/Assets/Resources/Materials/Glass/Glass.mat.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 90a339f078799f146aee5f482db994df -PrefabImporter: +guid: eb47a3d3ca2fcba4b82818f76212d2cb +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass.png b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass.png new file mode 100644 index 0000000..76be7f3 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82ce9030e0577894b091dbbe9661dd493be9baa4dbcd7b69b74b1245140486b3 +size 18489 diff --git a/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass.png.meta b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass.png.meta new file mode 100644 index 0000000..7a87ed7 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 65fd108cef058954aa833036894fbdc9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_Metallic.png b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_Metallic.png new file mode 100644 index 0000000..25543da --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_Metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25a54374d6ec1b15805e4e18643b0665d45c32c504aa14621cfb0decb6434bd0 +size 3178 diff --git a/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_Metallic.png.meta b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_Metallic.png.meta new file mode 100644 index 0000000..5ea2676 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_Metallic.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 679da2915ac50974aaeb21b555cc7b28 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_normal.png b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_normal.png new file mode 100644 index 0000000..3f6cc9f --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3141f8fb64e897cb18e3535c535ffc645db2bb26c7ca41703ff50619d9617029 +size 15731 diff --git a/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_normal.png.meta b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_normal.png.meta new file mode 100644 index 0000000..07b65d8 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Glass/broken_glass_normal.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 9a821ef1861cd6741ae9e14addede475 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/PickUp.prefab.meta b/Game/CourierOld/Assets/Resources/Materials/Tumba.meta similarity index 57% rename from Game/CourierOld/Assets/Resources_moved/Rooms/PickUp.prefab.meta rename to Game/CourierOld/Assets/Resources/Materials/Tumba.meta index 31cd7bc..412ba34 100644 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/PickUp.prefab.meta +++ b/Game/CourierOld/Assets/Resources/Materials/Tumba.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: b9f507af25f113b48a7bafe7c02da64d -PrefabImporter: +guid: 99fa760dd57fc4243b25a5728522de4b +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Base_color.png b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Base_color.png new file mode 100644 index 0000000..b37dbab --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Base_color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93a6563b71eea661d7d75adc09429e406f38cba38de9107833922fa4d6bb83d5 +size 54330 diff --git a/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Base_color.png.meta b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Base_color.png.meta new file mode 100644 index 0000000..fba52b8 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Base_color.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 62d25f359cc109543af6e0d92ccae523 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Normal.png b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Normal.png new file mode 100644 index 0000000..06eda67 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d64c3da89845b1693514bf7f2304e8d476004d66c395a20d2367d30d3a7dcd3d +size 1006 diff --git a/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Normal.png.meta b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Normal.png.meta new file mode 100644 index 0000000..abf6735 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Normal.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 57eeea96ee4015c4e9fd95817e0027a7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Smoothness.png b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Smoothness.png new file mode 100644 index 0000000..5c9699a --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Smoothness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:046c101cdd085f871c4fdb0f1f9ffbb9bf6ebae5b308e5e5200aeb497a895c2b +size 42890 diff --git a/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Smoothness.png.meta b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Smoothness.png.meta new file mode 100644 index 0000000..405f3e6 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Tumba/DefaultMaterial_Smoothness.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 226aa17408f3e014a99321ae257d8209 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Tumba/Tumba.mat b/Game/CourierOld/Assets/Resources/Materials/Tumba/Tumba.mat new file mode 100644 index 0000000..5238967 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Tumba/Tumba.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4447198787268493278 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Tumba + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _METALLICSPECGLOSSMAP + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 62d25f359cc109543af6e0d92ccae523, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 57eeea96ee4015c4e9fd95817e0027a7, 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: 62d25f359cc109543af6e0d92ccae523, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: 226aa17408f3e014a99321ae257d8209, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.52 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Room1.prefab.meta b/Game/CourierOld/Assets/Resources/Materials/Tumba/Tumba.mat.meta similarity index 52% rename from Game/CourierOld/Assets/Resources_moved/Rooms/Room1.prefab.meta rename to Game/CourierOld/Assets/Resources/Materials/Tumba/Tumba.mat.meta index f0fe595..9133aa7 100644 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Room1.prefab.meta +++ b/Game/CourierOld/Assets/Resources/Materials/Tumba/Tumba.mat.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 4472dd84628855c4085cacaec19efa29 -PrefabImporter: +guid: 94065fa89fc0f2d48acb6c359f6df7b6 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/ceiling_light.prefab b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/ceiling_light.prefab index 840db2b..82a724e 100644 --- a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/ceiling_light.prefab +++ b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/ceiling_light.prefab @@ -44,8 +44,8 @@ Light: serializedVersion: 11 m_Type: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 0.86 - m_Range: 4 + m_Intensity: 3.47 + m_Range: 77.29 m_SpotAngle: 179 m_InnerSpotAngle: 176.36958 m_CookieSize: 10 @@ -83,10 +83,10 @@ Light: serializedVersion: 2 m_Bits: 512 m_RenderingLayerMask: 1 - m_Lightmapping: 1 + m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1.9476799} - m_BounceIntensity: 1 + m_BounceIntensity: 0 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.3509887e-38, z: 0.000000001877595, w: 3.413278e+29} @@ -149,23 +149,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4a0d90b2e4ee24d459a7b3ca7919d31d, type: 3} propertyPath: m_LocalPosition.x - value: -0.862 + value: 96.20629 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4a0d90b2e4ee24d459a7b3ca7919d31d, type: 3} propertyPath: m_LocalPosition.y - value: 1.043 + value: 1.82 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4a0d90b2e4ee24d459a7b3ca7919d31d, type: 3} propertyPath: m_LocalPosition.z - value: 0.411 + value: -144.95528 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4a0d90b2e4ee24d459a7b3ca7919d31d, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4a0d90b2e4ee24d459a7b3ca7919d31d, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4a0d90b2e4ee24d459a7b3ca7919d31d, type: 3} propertyPath: m_LocalRotation.y @@ -177,7 +177,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4a0d90b2e4ee24d459a7b3ca7919d31d, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4a0d90b2e4ee24d459a7b3ca7919d31d, type: 3} propertyPath: m_LocalEulerAnglesHint.y diff --git a/Game/CourierOld/Assets/Resources/Prefabs/absolute тумба1.prefab b/Game/CourierOld/Assets/Resources/Prefabs/absolute тумба1.prefab new file mode 100644 index 0000000..3c7652c --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Prefabs/absolute тумба1.prefab @@ -0,0 +1,75 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6149230144786181538 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000037748947 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -678588488315902003, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 94065fa89fc0f2d48acb6c359f6df7b6, type: 2} + - target: {fileID: 919132149155446097, guid: b821eb61211ca1043b252d72aff3f534, type: 3} + propertyPath: m_Name + value: "absolute \u0442\u0443\u043C\u0431\u04301" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b821eb61211ca1043b252d72aff3f534, type: 3} diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Room2.prefab.meta b/Game/CourierOld/Assets/Resources/Prefabs/absolute тумба1.prefab.meta similarity index 74% rename from Game/CourierOld/Assets/Resources_moved/Rooms/Room2.prefab.meta rename to Game/CourierOld/Assets/Resources/Prefabs/absolute тумба1.prefab.meta index ee5097c..7f4726b 100644 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Room2.prefab.meta +++ b/Game/CourierOld/Assets/Resources/Prefabs/absolute тумба1.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3d195945b1fbf114a88457cba466bc2b +guid: 97a2b39c057ffe743bc5ece102569e56 PrefabImporter: externalObjects: {} userData: diff --git a/Game/CourierOld/Assets/Resources/Scenes/Initial.unity b/Game/CourierOld/Assets/Resources/Scenes/Initial.unity index ecfb855..46fcf09 100644 --- a/Game/CourierOld/Assets/Resources/Scenes/Initial.unity +++ b/Game/CourierOld/Assets/Resources/Scenes/Initial.unity @@ -20,19 +20,19 @@ RenderSettings: m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientSkyColor: {r: 0, g: 0, b: 0, 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_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0, g: 0, b: 0, a: 1} + m_SkyboxMaterial: {fileID: 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_DefaultReflectionMode: 1 m_DefaultReflectionResolution: 128 m_ReflectionBounces: 1 m_ReflectionIntensity: 1 diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Box1.prefab b/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Box1.prefab index b13b71d..0fdafb8 100644 --- a/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Box1.prefab +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Box1.prefab @@ -43,6 +43,7 @@ Transform: - {fileID: 3979983528654112753} - {fileID: 5351108812078542921} - {fileID: 3972469469736816512} + - {fileID: 205236066331804860} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1481518050494246612 @@ -499,6 +500,85 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 0} +--- !u!1001 &383822329696953175 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2531220095456698737} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000037748947 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4683669308469848369, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: eb47a3d3ca2fcba4b82818f76212d2cb, type: 2} + - target: {fileID: 919132149155446097, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + propertyPath: m_Name + value: broken_glass + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 5050422055867433376, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} +--- !u!4 &205236066331804860 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 010fc5ad07d2cce429cd5c39a13267bd, type: 3} + m_PrefabInstance: {fileID: 383822329696953175} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2308938991495881226 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level1.prefab b/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level1.prefab index f35d4b7..4aed222 100644 --- a/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level1.prefab +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level1.prefab @@ -154,11 +154,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8162956792271030380} serializedVersion: 2 - m_LocalRotation: {x: -0.000000037748947, y: 0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: + - {fileID: 3037848608909813250} + - {fileID: 8776149766126816549} - {fileID: 7892371237546831779} - {fileID: 7151845401872401167} - {fileID: 5129792664829691973} @@ -306,6 +308,80 @@ Transform: m_Children: [] m_Father: {fileID: 8791999920700461782} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &3880991357925023724 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8791999920700461782} + m_Modifications: + - target: {fileID: 5142257594812254323, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_Name + value: ceiling_light + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalScale.y + value: 43.501244 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalScale.z + value: 2.71374 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalPosition.x + value: 0.19928741 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalPosition.y + value: 0.91000015 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalPosition.z + value: -1.1908187 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 141168b19dd83fa4482a7d8659735154, type: 3} +--- !u!4 &8776149766126816549 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + m_PrefabInstance: {fileID: 3880991357925023724} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6456214855277638633 PrefabInstance: m_ObjectHideFlags: 0 @@ -399,3 +475,77 @@ Transform: m_CorrespondingSourceObject: {fileID: 3755510501817277514, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} m_PrefabInstance: {fileID: 6456214855277638633} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7367804962960405707 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8791999920700461782} + m_Modifications: + - target: {fileID: 5142257594812254323, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_Name + value: ceiling_light (1) + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalScale.y + value: 43.50124 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalScale.z + value: 2.7137399 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalPosition.x + value: 0.19928741 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalPosition.y + value: 0.9100006 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalPosition.z + value: 2.4651794 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 141168b19dd83fa4482a7d8659735154, type: 3} +--- !u!4 &3037848608909813250 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + m_PrefabInstance: {fileID: 7367804962960405707} + m_PrefabAsset: {fileID: 0} diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Save1.prefab b/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Save1.prefab index fda6faa..006eaa5 100644 --- a/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Save1.prefab +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Save1.prefab @@ -59,14 +59,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 985648457316358771} serializedVersion: 2 - m_LocalRotation: {x: -0.000000037748947, y: 0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 8632731698128598945} - {fileID: 481117388686831216} - {fileID: 6472585437694195873} - - {fileID: 6334407996361409298} - {fileID: 2216484122527853994} - {fileID: 6592472370883349996} - {fileID: 4844763084449068440} @@ -413,6 +413,80 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d7b86715f6793ff44ac74af769641c37, type: 3} m_PrefabInstance: {fileID: 1821760945851828801} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4312960911109465448 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 497202044859351241} + m_Modifications: + - target: {fileID: 5142257594812254323, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_Name + value: ceiling_light + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalScale.y + value: 43.501244 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalScale.z + value: 2.71374 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalPosition.x + value: 0.3131485 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalPosition.y + value: 1.7569999 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalPosition.z + value: 1.3462106 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 141168b19dd83fa4482a7d8659735154, type: 3} +--- !u!4 &8632731698128598945 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5482895761436218057, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + m_PrefabInstance: {fileID: 4312960911109465448} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4951346215036801651 PrefabInstance: m_ObjectHideFlags: 0 @@ -517,110 +591,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 0} ---- !u!1001 &5792455951583372537 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 497202044859351241} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalScale.x - value: -7.3066583 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalScale.y - value: -63.569744 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalScale.z - value: -3.9656744 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalPosition.x - value: 0.334 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalPosition.y - value: 1.731 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalPosition.z - value: 1.192 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalRotation.w - value: -0.000000053385076 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalRotation.x - value: 0.000000053385076 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071069 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalRotation.z - value: -0.7071067 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - propertyPath: m_Name - value: ceiling_light - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - insertIndex: -1 - addedObject: {fileID: 4203031338181653045} - m_SourcePrefab: {fileID: 100100000, guid: d06bac8fd3ba656478548c640b9706df, type: 3} ---- !u!4 &6334407996361409298 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - m_PrefabInstance: {fileID: 5792455951583372537} - m_PrefabAsset: {fileID: 0} ---- !u!1 &6675326606685526440 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d06bac8fd3ba656478548c640b9706df, type: 3} - m_PrefabInstance: {fileID: 5792455951583372537} - m_PrefabAsset: {fileID: 0} ---- !u!64 &4203031338181653045 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6675326606685526440} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 2990229381095517677, guid: d06bac8fd3ba656478548c640b9706df, type: 3} --- !u!1001 &6032516912214916936 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Ladder.prefab b/Game/CourierOld/Assets/Resources_moved/Rooms/Ladder.prefab deleted file mode 100644 index 0992a4e..0000000 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Ladder.prefab +++ /dev/null @@ -1,50 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1210510213248623221 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2687956200588076758} - - component: {fileID: 8483856402102076135} - m_Layer: 0 - m_Name: Ladder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2687956200588076758 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1210510213248623221} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8483856402102076135 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1210510213248623221} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ba1a19c534f4401aa287d4b68ce470c, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.Room - roomType: 1 - roomTimer: 0 - enterMarker: {fileID: 0} - exitMarker: {fileID: 0} diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/PickUp.prefab b/Game/CourierOld/Assets/Resources_moved/Rooms/PickUp.prefab deleted file mode 100644 index 941d538..0000000 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/PickUp.prefab +++ /dev/null @@ -1,50 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2465867831840681817 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3769058183323880653} - - component: {fileID: -721043246891927013} - m_Layer: 0 - m_Name: PickUp - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3769058183323880653 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2465867831840681817} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &-721043246891927013 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2465867831840681817} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ba1a19c534f4401aa287d4b68ce470c, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.Room - roomType: 3 - roomTimer: 0 - enterMarker: {fileID: 0} - exitMarker: {fileID: 0} diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Room1.prefab b/Game/CourierOld/Assets/Resources_moved/Rooms/Room1.prefab deleted file mode 100644 index efeb217..0000000 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Room1.prefab +++ /dev/null @@ -1,177 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2612776963572945774 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 688359521346588339} - - component: {fileID: -4180217759986572316} - m_Layer: 0 - m_Name: Room1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &688359521346588339 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2612776963572945774} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4761058503291947116} - - {fileID: 6017131008952297230} - - {fileID: 2778908582827482574} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &-4180217759986572316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2612776963572945774} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ba1a19c534f4401aa287d4b68ce470c, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.Room - roomType: 0 - roomTimer: 10 - enterMarker: {fileID: 4761058503291947116} - exitMarker: {fileID: 6017131008952297230} ---- !u!1 &7080809108028773528 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6017131008952297230} - m_Layer: 0 - m_Name: Exit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6017131008952297230 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7080809108028773528} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -10.21, y: 1.18, z: -1.22} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 688359521346588339} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7527627021930292984 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4761058503291947116} - m_Layer: 0 - m_Name: Enter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4761058503291947116 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7527627021930292984} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 9.9, y: 1.22, z: -1.26} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 688359521346588339} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2385240790407985701 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 688359521346588339} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - propertyPath: m_LocalPosition.x - value: -0.13513851 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - propertyPath: m_LocalPosition.y - value: 0.0499994 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - propertyPath: m_LocalPosition.z - value: -0.2246666 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - propertyPath: m_Name - value: "\u043A\u043E\u043C\u043D\u0430\u0442\u0430" - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} ---- !u!4 &2778908582827482574 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 425e074725c3d964b86e9e7f0bc9b440, type: 3} - m_PrefabInstance: {fileID: 2385240790407985701} - m_PrefabAsset: {fileID: 0} diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Room2.prefab b/Game/CourierOld/Assets/Resources_moved/Rooms/Room2.prefab deleted file mode 100644 index 1f7e20c..0000000 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Room2.prefab +++ /dev/null @@ -1,339 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2844048734692331653 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4080975777362414801} - - component: {fileID: 2129304161763528086} - - component: {fileID: 2913187471620630218} - - component: {fileID: 7030401921609134421} - m_Layer: 0 - m_Name: Plane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4080975777362414801 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2844048734692331653} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2905390824486042784} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2129304161763528086 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2844048734692331653} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2913187471620630218 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2844048734692331653} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &7030401921609134421 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2844048734692331653} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &3668526965028927568 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8037499702566822570} - - component: {fileID: 7354676487926355174} - - component: {fileID: 3750851825442852613} - - component: {fileID: 3071617338620723620} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8037499702566822570 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3668526965028927568} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.14779, y: 0.62, z: 1.29851} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2905390824486042784} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7354676487926355174 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3668526965028927568} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &3750851825442852613 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3668526965028927568} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &3071617338620723620 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3668526965028927568} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &6700464594443362398 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2905390824486042784} - - component: {fileID: 5594930081815856878} - m_Layer: 0 - m_Name: Room2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2905390824486042784 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6700464594443362398} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4080975777362414801} - - {fileID: 8037499702566822570} - - {fileID: 8922805401416243237} - - {fileID: 6126628687386234644} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5594930081815856878 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6700464594443362398} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ba1a19c534f4401aa287d4b68ce470c, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.Room - roomType: 0 - roomTimer: 10 - enterMarker: {fileID: 8922805401416243237} - exitMarker: {fileID: 6126628687386234644} ---- !u!1 &7060958620083535568 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6126628687386234644} - m_Layer: 0 - m_Name: Exit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6126628687386234644 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7060958620083535568} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.19, y: 0.35, z: 1.79851} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2905390824486042784} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8997022377511411462 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8922805401416243237} - m_Layer: 0 - m_Name: Enter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8922805401416243237 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8997022377511411462} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.11, y: 0.35, z: 1.79851} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2905390824486042784} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Room3.prefab b/Game/CourierOld/Assets/Resources_moved/Rooms/Room3.prefab deleted file mode 100644 index b5c079e..0000000 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Room3.prefab +++ /dev/null @@ -1,340 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &91631636032874522 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8298852725102595628} - - component: {fileID: 311554758858355817} - m_Layer: 0 - m_Name: Room3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8298852725102595628 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 91631636032874522} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5573081760817749117} - - {fileID: 8950030837317073613} - - {fileID: 2704130975537298274} - - {fileID: 566688442472555462} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &311554758858355817 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 91631636032874522} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ba1a19c534f4401aa287d4b68ce470c, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.Room - roomTimer: 10 - enterMarker: {fileID: 8950030837317073613} - exitMarker: {fileID: 2704130975537298274} ---- !u!1 &1864435452655265278 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2704130975537298274} - m_Layer: 0 - m_Name: Exit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2704130975537298274 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1864435452655265278} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.02709, y: 0, z: -4.83} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8298852725102595628} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3312949150968131672 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8950030837317073613} - m_Layer: 0 - m_Name: Enter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8950030837317073613 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3312949150968131672} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.02709, y: 0, z: 4.95} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8298852725102595628} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3967028851664673497 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 566688442472555462} - - component: {fileID: 1553669258277308815} - - component: {fileID: 279645629477431518} - - component: {fileID: 1150179053689781633} - m_Layer: 0 - m_Name: Capsule - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &566688442472555462 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3967028851664673497} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.28601, y: 1.33, z: 0.41014} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8298852725102595628} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1553669258277308815 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3967028851664673497} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &279645629477431518 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3967028851664673497} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!136 &1150179053689781633 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3967028851664673497} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &6541624677934916841 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5573081760817749117} - - component: {fileID: 2283755872432599790} - - component: {fileID: 5452250298188334654} - - component: {fileID: 6418878295542214595} - m_Layer: 0 - m_Name: Plane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5573081760817749117 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6541624677934916841} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8298852725102595628} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2283755872432599790 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6541624677934916841} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &5452250298188334654 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6541624677934916841} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &6418878295542214595 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6541624677934916841} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Room3.prefab.meta b/Game/CourierOld/Assets/Resources_moved/Rooms/Room3.prefab.meta deleted file mode 100644 index 16ea4d3..0000000 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Room3.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4f660559d76c3ed42a7c34a0b16487f7 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Room4.prefab b/Game/CourierOld/Assets/Resources_moved/Rooms/Room4.prefab deleted file mode 100644 index dbf637d..0000000 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Room4.prefab +++ /dev/null @@ -1,50 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &352515001007968155 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3783317667698125959} - - component: {fileID: 8644357564221115595} - m_Layer: 0 - m_Name: Room4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3783317667698125959 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 352515001007968155} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8644357564221115595 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 352515001007968155} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ba1a19c534f4401aa287d4b68ce470c, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.Room - roomType: 0 - roomTimer: 30 - enterMarker: {fileID: 0} - exitMarker: {fileID: 0} diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Room4.prefab.meta b/Game/CourierOld/Assets/Resources_moved/Rooms/Room4.prefab.meta deleted file mode 100644 index b09a901..0000000 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Room4.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 18c4fdd9261d275489e459ca70dfbcdc -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Save.prefab b/Game/CourierOld/Assets/Resources_moved/Rooms/Save.prefab deleted file mode 100644 index e769719..0000000 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Save.prefab +++ /dev/null @@ -1,50 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4585225813478361630 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4188259080799622194} - - component: {fileID: -986518061156804144} - m_Layer: 0 - m_Name: Save - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4188259080799622194 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4585225813478361630} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &-986518061156804144 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4585225813478361630} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ba1a19c534f4401aa287d4b68ce470c, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.Room - roomType: 2 - roomTimer: 0 - enterMarker: {fileID: 0} - exitMarker: {fileID: 0} diff --git a/Game/CourierOld/Assets/Resources_moved/Rooms/Save.prefab.meta b/Game/CourierOld/Assets/Resources_moved/Rooms/Save.prefab.meta deleted file mode 100644 index 8660246..0000000 --- a/Game/CourierOld/Assets/Resources_moved/Rooms/Save.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3dc54d945f5468649b66664de9a18b12 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Packages/packages-lock.json b/Game/CourierOld/Packages/packages-lock.json index 15123a9..c352567 100644 --- a/Game/CourierOld/Packages/packages-lock.json +++ b/Game/CourierOld/Packages/packages-lock.json @@ -24,7 +24,7 @@ "hash": "e644f1bb8ea190157aaea9c386f85cee4cd03bd9" }, "com.unity.addressables": { - "version": "2.7.3", + "version": "2.7.2", "depth": 2, "source": "registry", "dependencies": { @@ -34,7 +34,7 @@ "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "2.4.2", + "com.unity.scriptablebuildpipeline": "2.4.1", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" @@ -49,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.25", + "version": "1.8.24", "depth": 2, "source": "registry", "dependencies": { @@ -201,7 +201,7 @@ } }, "com.unity.scriptablebuildpipeline": { - "version": "2.4.2", + "version": "2.4.1", "depth": 3, "source": "registry", "dependencies": { @@ -243,7 +243,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.6.0", + "version": "1.5.1", "depth": 0, "source": "builtin", "dependencies": { @@ -253,7 +253,7 @@ } }, "com.unity.test-framework.performance": { - "version": "3.2.0", + "version": "3.1.0", "depth": 3, "source": "registry", "dependencies": {