diff --git a/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset b/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset new file mode 100644 index 0000000..5a84ccc --- /dev/null +++ b/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: Default Local Group_ContentUpdateGroupSchema + m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.ContentUpdateGroupSchema + m_Group: {fileID: 11400000, guid: 7c592a6445170e8379910601b962cb30, type: 2} + m_StaticContent: 0 diff --git a/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta b/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 0000000..6b3f1bb --- /dev/null +++ b/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d6fed27b8c8a3eebb9bc5289b7a6956 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Box.meta b/Game/CourierOld/Assets/Resources/Materials/Box.meta new file mode 100644 index 0000000..ff55584 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Box.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b3f57da60db4444799ca8c7465d471c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Box/Box.mat b/Game/CourierOld/Assets/Resources/Materials/Box/Box.mat new file mode 100644 index 0000000..ccd62b9 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Box/Box.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: Box + 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: f90a581faf2125c499a63b93597653f3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 1eb938e007c23524fa145a6b635bedcc, 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: f90a581faf2125c499a63b93597653f3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: cd6e592d6b2b18546bf8965713f71df3, 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 + - _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 &9055732877677571783 +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/Materials/Box/Box.mat.meta b/Game/CourierOld/Assets/Resources/Materials/Box/Box.mat.meta new file mode 100644 index 0000000..b916d9f --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Box/Box.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c988417585b3ef04ca830cffa85a86bd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Box/box_ALBEDO.png b/Game/CourierOld/Assets/Resources/Materials/Box/box_ALBEDO.png new file mode 100644 index 0000000..c39c76e --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Box/box_ALBEDO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:663334f991f577f60ca35298cede2e13732af05e3e25bb66e523e01ab8046b49 +size 1579365 diff --git a/Game/CourierOld/Assets/Resources/Materials/Box/box_ALBEDO.png.meta b/Game/CourierOld/Assets/Resources/Materials/Box/box_ALBEDO.png.meta new file mode 100644 index 0000000..3b747f2 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Box/box_ALBEDO.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: f90a581faf2125c499a63b93597653f3 +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 + 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/Box/box_NORMALfUCKYOU.png b/Game/CourierOld/Assets/Resources/Materials/Box/box_NORMALfUCKYOU.png new file mode 100644 index 0000000..37b5b58 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Box/box_NORMALfUCKYOU.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc1445f3e49d8187995c0a7fabe1f017e2f8ac9d99cd00385e9749e1fdb172c1 +size 2277436 diff --git a/Game/CourierOld/Assets/Resources/Materials/Box/box_NORMALfUCKYOU.png.meta b/Game/CourierOld/Assets/Resources/Materials/Box/box_NORMALfUCKYOU.png.meta new file mode 100644 index 0000000..033970d --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Box/box_NORMALfUCKYOU.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 1eb938e007c23524fa145a6b635bedcc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + 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: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Box/box_SMOOTHNESSFUCKYOU.png b/Game/CourierOld/Assets/Resources/Materials/Box/box_SMOOTHNESSFUCKYOU.png new file mode 100644 index 0000000..19cc065 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Box/box_SMOOTHNESSFUCKYOU.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f43fce5db9211f09f8c1315466e6ee51ac18cc2e787e4f0ccffe4f52cb43a7f6 +size 71456 diff --git a/Game/CourierOld/Assets/Resources/Materials/Box/box_SMOOTHNESSFUCKYOU.png.meta b/Game/CourierOld/Assets/Resources/Materials/Box/box_SMOOTHNESSFUCKYOU.png.meta new file mode 100644 index 0000000..a42cb7c --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Box/box_SMOOTHNESSFUCKYOU.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: cd6e592d6b2b18546bf8965713f71df3 +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 + 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/PlayerHands/PlayerHandLeft.mat b/Game/CourierOld/Assets/Resources/Materials/PlayerHands/PlayerHandLeft.mat index a710732..f0d0dbf 100644 --- a/Game/CourierOld/Assets/Resources/Materials/PlayerHands/PlayerHandLeft.mat +++ b/Game/CourierOld/Assets/Resources/Materials/PlayerHands/PlayerHandLeft.mat @@ -31,7 +31,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2050 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -119,7 +119,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 0 + - _QueueOffset: 50 - _ReceiveShadows: 1 - _Smoothness: 0.024 - _SmoothnessTextureChannel: 0 diff --git a/Game/CourierOld/Assets/Resources/Materials/PlayerHands/PlayerHandRight.mat b/Game/CourierOld/Assets/Resources/Materials/PlayerHands/PlayerHandRight.mat index b81615d..985969e 100644 --- a/Game/CourierOld/Assets/Resources/Materials/PlayerHands/PlayerHandRight.mat +++ b/Game/CourierOld/Assets/Resources/Materials/PlayerHands/PlayerHandRight.mat @@ -31,7 +31,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2050 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -119,7 +119,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 0 + - _QueueOffset: 50 - _ReceiveShadows: 1 - _Smoothness: 0.024 - _SmoothnessTextureChannel: 0 diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/MetalDoor.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Furniture/MetalDoor.fbx.meta index edef6ad..72ada41 100644 --- a/Game/CourierOld/Assets/Resources/Models/Furniture/MetalDoor.fbx.meta +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/MetalDoor.fbx.meta @@ -94,7 +94,7 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 1 + hasExtraRoot: 0 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/WoodenDoor.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Furniture/WoodenDoor.fbx.meta index 6badda0..69ddf56 100644 --- a/Game/CourierOld/Assets/Resources/Models/Furniture/WoodenDoor.fbx.meta +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/WoodenDoor.fbx.meta @@ -94,7 +94,7 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 1 + hasExtraRoot: 0 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/broken_glass.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Furniture/broken_glass.fbx.meta index f9938b8..0365ed3 100644 --- a/Game/CourierOld/Assets/Resources/Models/Furniture/broken_glass.fbx.meta +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/broken_glass.fbx.meta @@ -94,7 +94,7 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 1 + hasExtraRoot: 0 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/ceiling_light.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Furniture/ceiling_light.fbx.meta index e87993b..af416de 100644 --- a/Game/CourierOld/Assets/Resources/Models/Furniture/ceiling_light.fbx.meta +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/ceiling_light.fbx.meta @@ -94,7 +94,7 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 1 + hasExtraRoot: 0 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/deliverybox.fbx b/Game/CourierOld/Assets/Resources/Models/Furniture/deliverybox.fbx new file mode 100644 index 0000000..088f523 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/deliverybox.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06fee00b2b2d5892942e2998d4d7ad0ddc00a012b637988e7c4f08ed438d512a +size 15120 diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/deliverybox.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Furniture/deliverybox.fbx.meta new file mode 100644 index 0000000..f66d399 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/deliverybox.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: b7a107b007a6ce841bcb2536692830a0 +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 0 + importLights: 0 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/vodka.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Furniture/vodka.fbx.meta index 78bb4fd..35ecdad 100644 --- a/Game/CourierOld/Assets/Resources/Models/Furniture/vodka.fbx.meta +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/vodka.fbx.meta @@ -94,7 +94,7 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 1 + hasExtraRoot: 0 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/стол круглый.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Furniture/стол круглый.fbx.meta index 1174244..5293743 100644 --- a/Game/CourierOld/Assets/Resources/Models/Furniture/стол круглый.fbx.meta +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/стол круглый.fbx.meta @@ -94,7 +94,7 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 1 + hasExtraRoot: 0 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx.meta index c6a53d0..f0bf54d 100644 --- a/Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx.meta +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx.meta @@ -94,7 +94,7 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 1 + hasExtraRoot: 0 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab index fd10600..aa35044 100644 --- a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab +++ b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab @@ -9,8 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3367215396344724721} - - component: {fileID: 6415961798554262282} - - component: {fileID: 2429626066440465031} - component: {fileID: 293730761507338093} - component: {fileID: 5208808394032653931} - component: {fileID: 4338034009071700718} @@ -34,65 +32,10 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 4334624622839117870} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6415961798554262282 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5003489554572672819} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2429626066440465031 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5003489554572672819} - 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 &293730761507338093 BoxCollider: m_ObjectHideFlags: 0 @@ -154,7 +97,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Orders.Tube.OrderBox rigidbody: {fileID: 5208808394032653931} - _pickupMode: 0 --- !u!65 &2620079347338917434 BoxCollider: m_ObjectHideFlags: 0 @@ -176,3 +118,85 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 3, y: 3, z: 3} m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &4300118909828325317 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3367215396344724721} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalPosition.y + value: -0.485 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: c988417585b3ef04ca830cffa85a86bd, type: 2} + - target: {fileID: 919132149155446097, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + propertyPath: m_Name + value: deliverybox + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} +--- !u!4 &4334624622839117870 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b7a107b007a6ce841bcb2536692830a0, type: 3} + m_PrefabInstance: {fileID: 4300118909828325317} + m_PrefabAsset: {fileID: 0} diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab b/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab index f60f213..667569f 100644 --- a/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab @@ -1054,6 +1054,10 @@ PrefabInstance: propertyPath: m_CastShadows value: 0 objectReference: {fileID: 0} + - target: {fileID: 5704806498575513171, guid: cbae1b551f875e24e913964e5358651e, type: 3} + propertyPath: m_RenderingLayerMask + value: 17 + objectReference: {fileID: 0} - target: {fileID: 5705850872871135946, guid: cbae1b551f875e24e913964e5358651e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0.00001525879 diff --git a/Game/CourierOld/ProjectSettings/URPProjectSettings.asset b/Game/CourierOld/ProjectSettings/URPProjectSettings.asset index 64a8674..6ad5631 100644 --- a/Game/CourierOld/ProjectSettings/URPProjectSettings.asset +++ b/Game/CourierOld/ProjectSettings/URPProjectSettings.asset @@ -13,3 +13,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_LastMaterialVersion: 10 + m_ProjectSettingFolderPath: URPDefaultResources