diff --git a/Assets/Bakery/ftGlobalStorage.asset b/Assets/Bakery/ftGlobalStorage.asset index d9f3ef9..de540af 100644 --- a/Assets/Bakery/ftGlobalStorage.asset +++ b/Assets/Bakery/ftGlobalStorage.asset @@ -448,7 +448,15 @@ MonoBehaviour: - Assets/Models/AprelevkaDepo/wheel_pair_single_decal_1.fbx - Assets/Models/AprelevkaDepo/wheel_pair_single.fbx - Assets/Models/AprelevkaDepo/wheel_pair_single_decal_2.fbx - uvOverlapAssetList: 00000000ffffffff0101000000000000000000000000000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000000000000010100000101000001010000000000000101000000000000010100000000000001010000000000000000000001010000000000000000000000000000 + - Assets/Models/IvolgaWagon/Textures/ivolga2_wagon.fbx + - Assets/Models/IvolgaWagon/Textures/ivolga2_wagon_decals.fbx + - Assets/Models/IvolgaWagon/ivolga2_wagon_decals.fbx + - Assets/Models/Ivolga2/ivolga2_wagon.fbx + - Assets/Models/Ivolga2/ivolga2_wagon_decals.fbx + - Assets/Models/Ivolga2/ivolga_2_wagon_decals.fbx + - Assets/Models/Ivolga2/ivolga_2_wagon.fbx + - Assets/Models/Ivolga2/ivolga_2_locomoto_decals.fbx + uvOverlapAssetList: 00000000ffffffff01010000000000000000000000000000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000000000000101000001010000010100000000000001010000000000000101000000000000010100000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 xatlasWarningShown: 0 foundCompatibleSetup: 1 gpuName: NVIDIA GeForce RTX 3070 diff --git a/Assets/Models/EP2D/Materials/ep2d_locomotor_decal_mat.mat b/Assets/Models/EP2D/Materials/ep2d_locomotor_decal_mat.mat index 138b07c..8e4cd37 100644 --- a/Assets/Models/EP2D/Materials/ep2d_locomotor_decal_mat.mat +++ b/Assets/Models/EP2D/Materials/ep2d_locomotor_decal_mat.mat @@ -21,24 +21,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ep2d_locomotor_decal_mat - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ValidKeywords: - - _SURFACE_TYPE_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: ee027b77d6bc4fb43a0febe0bb710865, type: 3} + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: aee630ba2dc3c744193b8b825d304d08, type: 3} + m_Texture: {fileID: 2800000, guid: c1c340356cf50e946ab23ff4114db0d8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -77,6 +73,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SampleTexture2D_0b2e223a5c1149889a32f32164f4bd06_Texture_1: + m_Texture: {fileID: 2800000, guid: 0888f02bace701e4e92cb9263de65f13, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -97,6 +97,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BumpMapStrength: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -105,7 +106,9 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _EffectPosition: 2 - _EnvironmentReflections: 1 + - _GlobalAlpha: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -113,9 +116,10 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 @@ -124,8 +128,9 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 0} - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EffectColor: {r: 0, g: 13.76295, b: 63.99999, 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: [] diff --git a/Assets/Models/EP2D/Materials/glass.mat b/Assets/Models/EP2D/Materials/glass.mat index 7d9534d..d4cec47 100644 --- a/Assets/Models/EP2D/Materials/glass.mat +++ b/Assets/Models/EP2D/Materials/glass.mat @@ -84,7 +84,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 - - _BumpMapStrength: 1 + - _BumpMapStrength: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 diff --git a/Assets/Models/EP2D/Textures/AO_1.png.meta b/Assets/Models/EP2D/Textures/AO_1.png.meta index 42e66e4..6b6aa91 100644 --- a/Assets/Models/EP2D/Textures/AO_1.png.meta +++ b/Assets/Models/EP2D/Textures/AO_1.png.meta @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Models/EP2D/Textures/decals.jpg b/Assets/Models/EP2D/Textures/decals.jpg deleted file mode 100644 index 3c4bca4..0000000 Binary files a/Assets/Models/EP2D/Textures/decals.jpg and /dev/null differ diff --git a/Assets/Models/EP2D/Textures/decals.png b/Assets/Models/EP2D/Textures/decals.png new file mode 100644 index 0000000..34e9614 Binary files /dev/null and b/Assets/Models/EP2D/Textures/decals.png differ diff --git a/Assets/Models/EP2D/Textures/decals.jpg.meta b/Assets/Models/EP2D/Textures/decals.png.meta similarity index 97% rename from Assets/Models/EP2D/Textures/decals.jpg.meta rename to Assets/Models/EP2D/Textures/decals.png.meta index 75b3e34..6cd2df8 100644 --- a/Assets/Models/EP2D/Textures/decals.jpg.meta +++ b/Assets/Models/EP2D/Textures/decals.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aee630ba2dc3c744193b8b825d304d08 +guid: c1c340356cf50e946ab23ff4114db0d8 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -103,14 +103,14 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 1024 + maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 50 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 diff --git a/Assets/Models/EP2D/Textures/decals_opacity.jpg b/Assets/Models/EP2D/Textures/decals_opacity.jpg new file mode 100644 index 0000000..75a5bc3 Binary files /dev/null and b/Assets/Models/EP2D/Textures/decals_opacity.jpg differ diff --git a/Assets/Models/EP2DWagon/Textures/decals.jpg.meta b/Assets/Models/EP2D/Textures/decals_opacity.jpg.meta similarity index 97% rename from Assets/Models/EP2DWagon/Textures/decals.jpg.meta rename to Assets/Models/EP2D/Textures/decals_opacity.jpg.meta index 3c45fe0..5c6dfc2 100644 --- a/Assets/Models/EP2DWagon/Textures/decals.jpg.meta +++ b/Assets/Models/EP2D/Textures/decals_opacity.jpg.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: dc02523f842e34144b5ab11989d1b82a +guid: 336125182df47ea459fdb30de505bb4f TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -103,14 +103,14 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 1024 + maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 50 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 diff --git a/Assets/Models/EP2D/Textures/locomation_wagon3_AlbedoTransparency.png.meta b/Assets/Models/EP2D/Textures/locomation_wagon3_AlbedoTransparency.png.meta index 1dbeb1b..cc9ba8d 100644 --- a/Assets/Models/EP2D/Textures/locomation_wagon3_AlbedoTransparency.png.meta +++ b/Assets/Models/EP2D/Textures/locomation_wagon3_AlbedoTransparency.png.meta @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Models/EP2D/Textures/locomation_wagon3_MetallicSmoothness.png.meta b/Assets/Models/EP2D/Textures/locomation_wagon3_MetallicSmoothness.png.meta index 12979c0..b57a8f9 100644 --- a/Assets/Models/EP2D/Textures/locomation_wagon3_MetallicSmoothness.png.meta +++ b/Assets/Models/EP2D/Textures/locomation_wagon3_MetallicSmoothness.png.meta @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Models/EP2D/Textures/locomation_wagon3_Normal.png.meta b/Assets/Models/EP2D/Textures/locomation_wagon3_Normal.png.meta index 28bc0cd..1be3484 100644 --- a/Assets/Models/EP2D/Textures/locomation_wagon3_Normal.png.meta +++ b/Assets/Models/EP2D/Textures/locomation_wagon3_Normal.png.meta @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Models/EP2D/ep2d_locomotor_decal.fbx b/Assets/Models/EP2D/ep2d_locomotor_decal.fbx index 20d0968..2c1a498 100644 Binary files a/Assets/Models/EP2D/ep2d_locomotor_decal.fbx and b/Assets/Models/EP2D/ep2d_locomotor_decal.fbx differ diff --git a/Assets/Models/EP2D/ep2d_locomotor_decal.fbx.meta b/Assets/Models/EP2D/ep2d_locomotor_decal.fbx.meta index 324450a..62178ae 100644 --- a/Assets/Models/EP2D/ep2d_locomotor_decal.fbx.meta +++ b/Assets/Models/EP2D/ep2d_locomotor_decal.fbx.meta @@ -8,10 +8,10 @@ ModelImporter: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: ep2d_locomotor_decal_mat - second: {fileID: 2100000, guid: 2cff1febaf5403e438543bf523c0d727, type: 2} + second: {fileID: 2100000, guid: ac15ca0ce72da4348a8af8ad29e61a7a, type: 2} materials: materialImportMode: 2 - materialName: 1 + materialName: 0 materialSearch: 1 materialLocation: 1 animations: diff --git a/Assets/Models/EP2DWagon/Materials/ep2d_decal_mat.mat b/Assets/Models/EP2DWagon/Materials/ep2d_decal_mat.mat index 772455d..f1024c6 100644 --- a/Assets/Models/EP2DWagon/Materials/ep2d_decal_mat.mat +++ b/Assets/Models/EP2DWagon/Materials/ep2d_decal_mat.mat @@ -8,21 +8,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ep2d_decal_mat - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: ee027b77d6bc4fb43a0febe0bb710865, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: dc02523f842e34144b5ab11989d1b82a, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -46,7 +45,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: dc02523f842e34144b5ab11989d1b82a, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -61,6 +60,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SampleTexture2D_0b2e223a5c1149889a32f32164f4bd06_Texture_1: + m_Texture: {fileID: 2800000, guid: 0888f02bace701e4e92cb9263de65f13, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -81,6 +84,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BumpMapStrength: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,7 +93,9 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EffectPosition: 2 - _EnvironmentReflections: 1 + - _GlobalAlpha: 1 - _GlossMapScale: 1 - _Glossiness: 1.8379177 - _GlossyReflections: 1 @@ -97,6 +103,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 1.8379177 @@ -110,6 +117,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EffectColor: {r: 0, g: 13.76295, b: 63.99999, 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: [] diff --git a/Assets/Models/EP2DWagon/Textures/decals.jpg b/Assets/Models/EP2DWagon/Textures/decals.jpg deleted file mode 100644 index 3c4bca4..0000000 Binary files a/Assets/Models/EP2DWagon/Textures/decals.jpg and /dev/null differ diff --git a/Assets/Models/EP2DWagon/Textures/decals.png b/Assets/Models/EP2DWagon/Textures/decals.png new file mode 100644 index 0000000..86902c1 Binary files /dev/null and b/Assets/Models/EP2DWagon/Textures/decals.png differ diff --git a/Assets/Models/EP2DWagon/Textures/decals.png.meta b/Assets/Models/EP2DWagon/Textures/decals.png.meta new file mode 100644 index 0000000..66ca511 --- /dev/null +++ b/Assets/Models/EP2DWagon/Textures/decals.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 7f6c0590e36aa3d40b763742f792138e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Ivolga2/Materials/ep2d_locomotor_decal_mat.mat b/Assets/Models/Ivolga2/Materials/ep2d_locomotor_decal_mat.mat index 30b09fb..8f991e9 100644 --- a/Assets/Models/Ivolga2/Materials/ep2d_locomotor_decal_mat.mat +++ b/Assets/Models/Ivolga2/Materials/ep2d_locomotor_decal_mat.mat @@ -21,19 +21,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ep2d_locomotor_decal_mat - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ValidKeywords: - - _SURFACE_TYPE_TRANSPARENT + m_Shader: {fileID: -6465566751694194690, guid: ee027b77d6bc4fb43a0febe0bb710865, type: 3} + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -77,6 +73,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SampleTexture2D_0b2e223a5c1149889a32f32164f4bd06_Texture_1: + m_Texture: {fileID: 2800000, guid: 0888f02bace701e4e92cb9263de65f13, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -97,6 +97,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BumpMapStrength: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -104,8 +105,10 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 0 + - _EffectPosition: 2 - _EnvironmentReflections: 1 + - _GlobalAlpha: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -113,19 +116,21 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _Surface: 1 + - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EffectColor: {r: 0, g: 13.76295, b: 63.99999, 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: [] diff --git a/Assets/Models/Ivolga2/Materials/ivolga2_locomotor_decal_mat.mat b/Assets/Models/Ivolga2/Materials/ivolga2_locomotor_decal_mat.mat new file mode 100644 index 0000000..eb38a07 --- /dev/null +++ b/Assets/Models/Ivolga2/Materials/ivolga2_locomotor_decal_mat.mat @@ -0,0 +1,136 @@ +%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: ivolga2_locomotor_decal_mat + m_Shader: {fileID: -6465566751694194690, guid: ee027b77d6bc4fb43a0febe0bb710865, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 36d1fa2964f24a343af9be2d924960d0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + 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: 36d1fa2964f24a343af9be2d924960d0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SampleTexture2D_0b2e223a5c1149889a32f32164f4bd06_Texture_1: + m_Texture: {fileID: 2800000, guid: 0888f02bace701e4e92cb9263de65f13, type: 3} + 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: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpMapStrength: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EffectPosition: 2 + - _EnvironmentReflections: 1 + - _GlobalAlpha: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EffectColor: {r: 0, g: 13.76295, b: 63.99999, 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: [] +--- !u!114 &3963920408490153858 +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: + version: 5 diff --git a/Assets/Models/Ivolga2/Materials/ivolga2_locomotor_decal_mat.mat.meta b/Assets/Models/Ivolga2/Materials/ivolga2_locomotor_decal_mat.mat.meta new file mode 100644 index 0000000..2889b2a --- /dev/null +++ b/Assets/Models/Ivolga2/Materials/ivolga2_locomotor_decal_mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03c4dee021d4cbd4d9553e9f25cf4ac0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Ivolga2/Textures/ivolga_2_mat_AlbedoTransparency.png.meta b/Assets/Models/Ivolga2/Textures/ivolga_2_mat_AlbedoTransparency.png.meta index 69b8591..f5b7826 100644 --- a/Assets/Models/Ivolga2/Textures/ivolga_2_mat_AlbedoTransparency.png.meta +++ b/Assets/Models/Ivolga2/Textures/ivolga_2_mat_AlbedoTransparency.png.meta @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Models/Ivolga2/Textures/ivolga_2_mat_MetallicSmoothness.png.meta b/Assets/Models/Ivolga2/Textures/ivolga_2_mat_MetallicSmoothness.png.meta index ffc7e79..360fb16 100644 --- a/Assets/Models/Ivolga2/Textures/ivolga_2_mat_MetallicSmoothness.png.meta +++ b/Assets/Models/Ivolga2/Textures/ivolga_2_mat_MetallicSmoothness.png.meta @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Models/Ivolga2/Textures/ivolga_2_mat_Normal.png.meta b/Assets/Models/Ivolga2/Textures/ivolga_2_mat_Normal.png.meta index 8a53da0..a88cce2 100644 --- a/Assets/Models/Ivolga2/Textures/ivolga_2_mat_Normal.png.meta +++ b/Assets/Models/Ivolga2/Textures/ivolga_2_mat_Normal.png.meta @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Models/Ivolga2/Textures/ivolga_decals.png b/Assets/Models/Ivolga2/Textures/ivolga_decals.png index 0d8d0d8..d138ed4 100644 Binary files a/Assets/Models/Ivolga2/Textures/ivolga_decals.png and b/Assets/Models/Ivolga2/Textures/ivolga_decals.png differ diff --git a/Assets/Models/Ivolga2/Textures/ivolga_decals.png.meta b/Assets/Models/Ivolga2/Textures/ivolga_decals.png.meta index 2761cde..debcdd9 100644 --- a/Assets/Models/Ivolga2/Textures/ivolga_decals.png.meta +++ b/Assets/Models/Ivolga2/Textures/ivolga_decals.png.meta @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Models/Ivolga2/Textures/ivolga_decals_alphas.png.meta b/Assets/Models/Ivolga2/Textures/ivolga_decals_alphas.png.meta index e82710e..fac67d8 100644 --- a/Assets/Models/Ivolga2/Textures/ivolga_decals_alphas.png.meta +++ b/Assets/Models/Ivolga2/Textures/ivolga_decals_alphas.png.meta @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Models/Ivolga2/ivolga_2_decals.fbx b/Assets/Models/Ivolga2/ivolga_2_decals.fbx deleted file mode 100644 index 3653e13..0000000 Binary files a/Assets/Models/Ivolga2/ivolga_2_decals.fbx and /dev/null differ diff --git a/Assets/Models/Ivolga2/ivolga_2_locomoto_decals.fbx b/Assets/Models/Ivolga2/ivolga_2_locomoto_decals.fbx new file mode 100644 index 0000000..234eebf Binary files /dev/null and b/Assets/Models/Ivolga2/ivolga_2_locomoto_decals.fbx differ diff --git a/Assets/Models/Ivolga2/ivolga_2_decals.fbx.meta b/Assets/Models/Ivolga2/ivolga_2_locomoto_decals.fbx.meta similarity index 94% rename from Assets/Models/Ivolga2/ivolga_2_decals.fbx.meta rename to Assets/Models/Ivolga2/ivolga_2_locomoto_decals.fbx.meta index 5d576dc..614780d 100644 --- a/Assets/Models/Ivolga2/ivolga_2_decals.fbx.meta +++ b/Assets/Models/Ivolga2/ivolga_2_locomoto_decals.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 584b6424da72a4b478a362f7745841c8 +guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9 ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] @@ -7,8 +7,8 @@ ModelImporter: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: ep2d_locomotor_decal_mat - second: {fileID: 2100000, guid: 829feae670cf3bd4b85f0b680d12841e, type: 2} + name: ivolga2_locomotor_decal_mat + second: {fileID: 2100000, guid: 03c4dee021d4cbd4d9553e9f25cf4ac0, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/Ivolga2/ivolga_2_locomotor.fbx b/Assets/Models/Ivolga2/ivolga_2_locomotor.fbx index aff14ca..676cecc 100644 Binary files a/Assets/Models/Ivolga2/ivolga_2_locomotor.fbx and b/Assets/Models/Ivolga2/ivolga_2_locomotor.fbx differ diff --git a/Assets/Models/Ivolga2/ivolga_2_locomotor.fbx.meta b/Assets/Models/Ivolga2/ivolga_2_locomotor.fbx.meta index 79e4e8f..dabff5c 100644 --- a/Assets/Models/Ivolga2/ivolga_2_locomotor.fbx.meta +++ b/Assets/Models/Ivolga2/ivolga_2_locomotor.fbx.meta @@ -3,17 +3,7 @@ guid: 34da511097725ff41b441f0557dcd9b6 ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: glass_mat - second: {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: ivolga_2_mat - second: {fileID: 2100000, guid: 1fed4b14ba77d0542bcccd71fe227c7d, type: 2} + externalObjects: {} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/Ivolga3/Materials/ep2d_locomotor_decal_mat.mat b/Assets/Models/Ivolga3/Materials/ep2d_locomotor_decal_mat.mat index 08660e0..80f99b4 100644 --- a/Assets/Models/Ivolga3/Materials/ep2d_locomotor_decal_mat.mat +++ b/Assets/Models/Ivolga3/Materials/ep2d_locomotor_decal_mat.mat @@ -21,15 +21,14 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ep2d_locomotor_decal_mat - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: ee027b77d6bc4fb43a0febe0bb710865, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -74,6 +73,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SampleTexture2D_0b2e223a5c1149889a32f32164f4bd06_Texture_1: + m_Texture: {fileID: 2800000, guid: 0888f02bace701e4e92cb9263de65f13, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -94,6 +97,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BumpMapStrength: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,7 +106,9 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EffectPosition: 3 - _EnvironmentReflections: 1 + - _GlobalAlpha: 1 - _GlossMapScale: 1 - _Glossiness: 0.4472136 - _GlossyReflections: 1 @@ -110,9 +116,10 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.4472136 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -123,6 +130,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EffectColor: {r: 0, g: 13.76295, b: 63.99999, 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: [] diff --git a/Assets/Models/Ivolga3/Materials/ivolga_3_mat.mat b/Assets/Models/Ivolga3/Materials/ivolga_3_mat.mat index 7791839..adb892e 100644 --- a/Assets/Models/Ivolga3/Materials/ivolga_3_mat.mat +++ b/Assets/Models/Ivolga3/Materials/ivolga_3_mat.mat @@ -21,11 +21,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 9417fc6e537cdb74d8fa64a28375fcdb, type: 3} + m_Texture: {fileID: 2800000, guid: 576f44b7fd1c6a84baa4417536937511, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 2800000, guid: 34d7f18c8a4d2484fb0533a5d5b3414e, type: 3} + m_Texture: {fileID: 2800000, guid: 2b76cb8bd6e90024c92a4c8b73a636ec, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 2800000, guid: f7fcadbf424d5ec459c28aa71d38bff6, type: 3} + m_Texture: {fileID: 2800000, guid: 622b09086f6578645b51bf0bd4f12967, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -93,7 +93,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _EffectPosition: 5 + - _EffectPosition: 3 - _EnvironmentReflections: 1 - _GlobalAlpha: 1 - _GlossMapScale: 1 diff --git a/Assets/Models/Ivolga3/SM_ivolga_3.fbx b/Assets/Models/Ivolga3/SM_ivolga_3.fbx new file mode 100644 index 0000000..ebd13ec Binary files /dev/null and b/Assets/Models/Ivolga3/SM_ivolga_3.fbx differ diff --git a/Assets/Models/Ivolga3/SM_ivolga_3_locomotor.fbx.meta b/Assets/Models/Ivolga3/SM_ivolga_3.fbx.meta similarity index 86% rename from Assets/Models/Ivolga3/SM_ivolga_3_locomotor.fbx.meta rename to Assets/Models/Ivolga3/SM_ivolga_3.fbx.meta index 639503a..a127821 100644 --- a/Assets/Models/Ivolga3/SM_ivolga_3_locomotor.fbx.meta +++ b/Assets/Models/Ivolga3/SM_ivolga_3.fbx.meta @@ -1,19 +1,9 @@ fileFormatVersion: 2 -guid: e601d4fafbeb37749a4d284e8720b745 +guid: 867ae6f31c1866d47adafa169c913a87 ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: glass_mat - second: {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: ivolga_3_mat - second: {fileID: 2100000, guid: 486cf7a3e566a5c479bdf59bb4576cba, type: 2} + externalObjects: {} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/Ivolga3/SM_ivolga_3_locomotor.fbx b/Assets/Models/Ivolga3/SM_ivolga_3_locomotor.fbx deleted file mode 100644 index 725001e..0000000 Binary files a/Assets/Models/Ivolga3/SM_ivolga_3_locomotor.fbx and /dev/null differ diff --git a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_AlbedoTransparency.png b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_AlbedoTransparency.png new file mode 100644 index 0000000..aab5f57 Binary files /dev/null and b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_AlbedoTransparency.png differ diff --git a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Albedo.png.meta b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_AlbedoTransparency.png.meta similarity index 97% rename from Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Albedo.png.meta rename to Assets/Models/Ivolga3/Textures/T_Ivolga_3_AlbedoTransparency.png.meta index 35f4025..e51d892 100644 --- a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Albedo.png.meta +++ b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_AlbedoTransparency.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9417fc6e537cdb74d8fa64a28375fcdb +guid: 576f44b7fd1c6a84baa4417536937511 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -103,14 +103,14 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 1024 + maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 50 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 diff --git a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_MetallicSmoothness.png b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_MetallicSmoothness.png new file mode 100644 index 0000000..55c0140 Binary files /dev/null and b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_MetallicSmoothness.png differ diff --git a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_MetallicSmoothness.png.meta b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_MetallicSmoothness.png.meta similarity index 97% rename from Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_MetallicSmoothness.png.meta rename to Assets/Models/Ivolga3/Textures/T_Ivolga_3_MetallicSmoothness.png.meta index 83f185d..ee7fce8 100644 --- a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_MetallicSmoothness.png.meta +++ b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_MetallicSmoothness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f7fcadbf424d5ec459c28aa71d38bff6 +guid: 622b09086f6578645b51bf0bd4f12967 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -103,14 +103,14 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 1024 + maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 50 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 diff --git a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_Normal.png b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_Normal.png new file mode 100644 index 0000000..13941a5 Binary files /dev/null and b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_Normal.png differ diff --git a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Normal.png.meta b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_Normal.png.meta similarity index 96% rename from Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Normal.png.meta rename to Assets/Models/Ivolga3/Textures/T_Ivolga_3_Normal.png.meta index 87cf341..020ae73 100644 --- a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Normal.png.meta +++ b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_Normal.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 34d7f18c8a4d2484fb0533a5d5b3414e +guid: 2b76cb8bd6e90024c92a4c8b73a636ec TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 0 linearTexture: 0 fadeOut: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -103,14 +103,14 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 512 + maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 50 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 diff --git a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Albedo.png b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Albedo.png deleted file mode 100644 index 68e9d0f..0000000 Binary files a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Albedo.png and /dev/null differ diff --git a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_MetallicSmoothness.png b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_MetallicSmoothness.png deleted file mode 100644 index 47c6a85..0000000 Binary files a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_MetallicSmoothness.png and /dev/null differ diff --git a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Normal.png b/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Normal.png deleted file mode 100644 index e630116..0000000 Binary files a/Assets/Models/Ivolga3/Textures/T_Ivolga_3_loomotor_Normal.png and /dev/null differ diff --git a/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon.fbx b/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon.fbx new file mode 100644 index 0000000..e752769 Binary files /dev/null and b/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon.fbx differ diff --git a/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon.fbx.meta b/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon.fbx.meta new file mode 100644 index 0000000..a23c37a --- /dev/null +++ b/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon.fbx.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: c2a16656227aa4c4e85d00debe4e877d +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + 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 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + 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 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + 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: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon_decals.fbx b/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon_decals.fbx new file mode 100644 index 0000000..c808fe3 Binary files /dev/null and b/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon_decals.fbx differ diff --git a/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon_decals.fbx.meta b/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon_decals.fbx.meta new file mode 100644 index 0000000..7a308e2 --- /dev/null +++ b/Assets/Models/IvolgaWagon/Textures/ivolga2_wagon_decals.fbx.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 26616f251d57de342819800e2cb9c59e +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + 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 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + 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 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + 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: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/IvolgaWagon/ivolga2_wagon.fbx b/Assets/Models/IvolgaWagon/ivolga2_wagon.fbx index 60afdcf..e752769 100644 Binary files a/Assets/Models/IvolgaWagon/ivolga2_wagon.fbx and b/Assets/Models/IvolgaWagon/ivolga2_wagon.fbx differ diff --git a/Assets/Models/IvolgaWagon/ivolga2_wagon.fbx.meta b/Assets/Models/IvolgaWagon/ivolga2_wagon.fbx.meta index 11f0aa2..fbd6e1f 100644 --- a/Assets/Models/IvolgaWagon/ivolga2_wagon.fbx.meta +++ b/Assets/Models/IvolgaWagon/ivolga2_wagon.fbx.meta @@ -3,17 +3,7 @@ guid: 30b10058af370a3499ad3be55c52657d ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: glass_mat - second: {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: ivolga_2_wagon_mat - second: {fileID: 2100000, guid: c680a497a41b2d3428f4ad5c37e5e4e1, type: 2} + externalObjects: {} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/IvolgaWagon/ivolga2_wagon_decals.fbx b/Assets/Models/IvolgaWagon/ivolga2_wagon_decals.fbx index 0d4aef7..c808fe3 100644 Binary files a/Assets/Models/IvolgaWagon/ivolga2_wagon_decals.fbx and b/Assets/Models/IvolgaWagon/ivolga2_wagon_decals.fbx differ diff --git a/Assets/Models/IvolgaWagon/ivolga2_wagon_decals.fbx.meta b/Assets/Models/IvolgaWagon/ivolga2_wagon_decals.fbx.meta index b5b6c92..65f0402 100644 --- a/Assets/Models/IvolgaWagon/ivolga2_wagon_decals.fbx.meta +++ b/Assets/Models/IvolgaWagon/ivolga2_wagon_decals.fbx.meta @@ -3,12 +3,7 @@ guid: 8fef920967c1d7444ba914a22e9d658f ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: ep2d_locomotor_decal_mat - second: {fileID: 2100000, guid: 345d237aa65f2a24cbda0368ffb55045, type: 2} + externalObjects: {} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Prefabs/CanvasHelpTrains.prefab b/Assets/Prefabs/CanvasHelpTrains.prefab index 5d21e7f..9ce6a26 100644 --- a/Assets/Prefabs/CanvasHelpTrains.prefab +++ b/Assets/Prefabs/CanvasHelpTrains.prefab @@ -143,7 +143,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 1 + m_SortingOrder: 100 m_TargetDisplay: 0 --- !u!114 &4284305579273994875 MonoBehaviour: diff --git a/Assets/Prefabs/[LOCOMOTIVE HANDLER].prefab b/Assets/Prefabs/[LOCOMOTIVE HANDLER].prefab index 7cc7e52..bb08205 100644 --- a/Assets/Prefabs/[LOCOMOTIVE HANDLER].prefab +++ b/Assets/Prefabs/[LOCOMOTIVE HANDLER].prefab @@ -1,5 +1,257 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1359530322183073698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7768985316742033997} + - component: {fileID: 3977355338711903200} + - component: {fileID: 6991310192724945379} + m_Layer: 0 + m_Name: CARRIAGE (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7768985316742033997 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359530322183073698} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.8999746, y: 0.057226002, z: -88.46753} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6477381185575815983} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3977355338711903200 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359530322183073698} + m_Mesh: {fileID: -1192115147257310395, guid: 6028a2bd9d842cd42a03c89181edf724, type: 3} +--- !u!23 &6991310192724945379 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359530322183073698} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0298e53b929d77349b6ff668500b79bd, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1699236525269740107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8526968284144352793} + - component: {fileID: 3702681155906565361} + - component: {fileID: 2258707431285124469} + m_Layer: 0 + m_Name: CARRIAGE (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8526968284144352793 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699236525269740107} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.89997286, y: 0.05722612, z: -44.59559} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6477381185575815983} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3702681155906565361 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699236525269740107} + m_Mesh: {fileID: -1192115147257310395, guid: 6028a2bd9d842cd42a03c89181edf724, type: 3} +--- !u!23 &2258707431285124469 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699236525269740107} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0298e53b929d77349b6ff668500b79bd, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1740891170408935011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4625699135606237861} + - component: {fileID: 5244900955008645997} + - component: {fileID: 1106993298563344070} + m_Layer: 0 + m_Name: IVOLGA3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4625699135606237861 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1740891170408935011} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 95.77646, y: -0.0000009536743, z: -0.012058735} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2870708440658277367} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!33 &5244900955008645997 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1740891170408935011} + m_Mesh: {fileID: -1518180410007932866, guid: 867ae6f31c1866d47adafa169c913a87, type: 3} +--- !u!23 &1106993298563344070 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1740891170408935011} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 486cf7a3e566a5c479bdf59bb4576cba, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1869512676988420391 GameObject: m_ObjectHideFlags: 0 @@ -31,7 +283,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6477381185575815983} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2672284835292337208 MeshFilter: @@ -84,6 +336,90 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2273732234357514715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8554108480915266679} + - component: {fileID: 1133277958194527385} + - component: {fileID: 3884022643955130155} + m_Layer: 0 + m_Name: CARRIAGE (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8554108480915266679 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2273732234357514715} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 75.148186, y: 0.023711205, z: -0.020600814} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2870708440658277367} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!33 &1133277958194527385 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2273732234357514715} + m_Mesh: {fileID: -7034937500160788296, guid: 30b10058af370a3499ad3be55c52657d, type: 3} +--- !u!23 &3884022643955130155 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2273732234357514715} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1948425ed2cb96b408bb1bacea3dccfb, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &3214759456207710541 GameObject: m_ObjectHideFlags: 0 @@ -115,7 +451,12 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5716656523707776401} - {fileID: 6804656066916660095} + - {fileID: 1546213165268255487} + - {fileID: 1455542637126706826} + - {fileID: 8554108480915266679} + - {fileID: 4625699135606237861} m_Father: {fileID: 6804656066269272005} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} @@ -126,7 +467,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3214759456207710541} - m_Mesh: {fileID: -1518180410007932866, guid: e601d4fafbeb37749a4d284e8720b745, type: 3} + m_Mesh: {fileID: -1518180410007932866, guid: 867ae6f31c1866d47adafa169c913a87, type: 3} --- !u!23 &4007608563449530520 MeshRenderer: m_ObjectHideFlags: 0 @@ -184,6 +525,426 @@ MonoBehaviour: m_EditorClassIdentifier: type: 2 useEffect: 0 +--- !u!1 &4091429740051468194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1700834214575213334} + - component: {fileID: 7546143990266698448} + - component: {fileID: 1733786001863394178} + m_Layer: 0 + m_Name: EP2D + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1700834214575213334 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4091429740051468194} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 1.7999475, y: 0.00000023841858, z: -111.127144} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6477381185575815983} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!33 &7546143990266698448 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4091429740051468194} + m_Mesh: {fileID: -3223530238007622850, guid: 2ee8a7ca310487b4bbaaa714603d0d1f, type: 3} +--- !u!23 &1733786001863394178 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4091429740051468194} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + - {fileID: 2100000, guid: ae63975a33b59b74cbc7cc22bfa7d00d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4502479284750274104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9218220390836550574} + - component: {fileID: 3429804391255441065} + - component: {fileID: 1707398529067475705} + m_Layer: 0 + m_Name: CARRIAGE (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9218220390836550574 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4502479284750274104} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.008548269, y: -0.00000047683716, z: -75.18262} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7241138577998217479} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3429804391255441065 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4502479284750274104} + m_Mesh: {fileID: -7034937500160788296, guid: 30b10058af370a3499ad3be55c52657d, type: 3} +--- !u!23 &1707398529067475705 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4502479284750274104} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1948425ed2cb96b408bb1bacea3dccfb, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5399079518120264048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7366395895285174934} + - component: {fileID: 1478133752114716657} + - component: {fileID: 6505821468964974869} + m_Layer: 0 + m_Name: CARRIAGE (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7366395895285174934 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5399079518120264048} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.8999738, y: 0.057225943, z: -66.531555} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6477381185575815983} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1478133752114716657 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5399079518120264048} + m_Mesh: {fileID: -1192115147257310395, guid: 6028a2bd9d842cd42a03c89181edf724, type: 3} +--- !u!23 &6505821468964974869 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5399079518120264048} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0298e53b929d77349b6ff668500b79bd, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5666133074085425961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1600923829674651965} + - component: {fileID: 7780675960207870114} + - component: {fileID: 5367210467528759248} + m_Layer: 0 + m_Name: IVOLGA2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1600923829674651965 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5666133074085425961} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: -95.78126} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7241138577998217479} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!33 &7780675960207870114 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5666133074085425961} + m_Mesh: {fileID: -1023738328267384362, guid: 34da511097725ff41b441f0557dcd9b6, type: 3} +--- !u!23 &5367210467528759248 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5666133074085425961} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1fed4b14ba77d0542bcccd71fe227c7d, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5956552727800182854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5352580149863361473} + - component: {fileID: 2104516025302310404} + - component: {fileID: 5475131548485357119} + m_Layer: 0 + m_Name: CARRIAGE (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5352580149863361473 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5956552727800182854} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.008545042, y: -0.00000047683716, z: -56.99784} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7241138577998217479} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2104516025302310404 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5956552727800182854} + m_Mesh: {fileID: -7034937500160788296, guid: 30b10058af370a3499ad3be55c52657d, type: 3} +--- !u!23 &5475131548485357119 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5956552727800182854} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1948425ed2cb96b408bb1bacea3dccfb, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &5958147348918686101 GameObject: m_ObjectHideFlags: 0 @@ -202,7 +963,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &6477381185575815983 Transform: m_ObjectHideFlags: 0 @@ -215,7 +976,12 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7822110718252705170} - {fileID: 1349399230938897309} + - {fileID: 8526968284144352793} + - {fileID: 7366395895285174934} + - {fileID: 7768985316742033997} + - {fileID: 1700834214575213334} m_Father: {fileID: 6804656066269272005} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} @@ -310,7 +1076,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6377260749122220698} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 20.634499, y: -0.023712158, z: 0.0000007748604} + m_LocalPosition: {x: 0.008541466, y: -0.00000047683716, z: -20.628279} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -346,7 +1112,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 1948425ed2cb96b408bb1bacea3dccfb, type: 2} - - {fileID: 2100000, guid: 1948425ed2cb96b408bb1bacea3dccfb, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -447,14 +1213,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6804656066916660088} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 20.63451, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 20.598621, y: 0.023711205, z: -0.020596981} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2870708440658277367} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &6804656066916660093 MeshFilter: m_ObjectHideFlags: 0 @@ -484,7 +1250,259 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 1948425ed2cb96b408bb1bacea3dccfb, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6917792348619506842 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8220357606417076791} + - component: {fileID: 8554583542092260208} + - component: {fileID: 2094297705670501141} + m_Layer: 0 + m_Name: CARRIAGE (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8220357606417076791 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6917792348619506842} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.008542594, y: -0.00000047683716, z: -38.81306} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7241138577998217479} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8554583542092260208 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6917792348619506842} + m_Mesh: {fileID: -7034937500160788296, guid: 30b10058af370a3499ad3be55c52657d, type: 3} +--- !u!23 &2094297705670501141 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6917792348619506842} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: - {fileID: 2100000, guid: 1948425ed2cb96b408bb1bacea3dccfb, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7783067553888300158 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1546213165268255487} + - component: {fileID: 773063542468241031} + - component: {fileID: 1319734642066539557} + m_Layer: 0 + m_Name: CARRIAGE (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1546213165268255487 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7783067553888300158} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 38.783405, y: 0.023711205, z: -0.020598907} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2870708440658277367} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!33 &773063542468241031 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7783067553888300158} + m_Mesh: {fileID: -7034937500160788296, guid: 30b10058af370a3499ad3be55c52657d, type: 3} +--- !u!23 &1319734642066539557 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7783067553888300158} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1948425ed2cb96b408bb1bacea3dccfb, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &8004269223023641807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1455542637126706826} + - component: {fileID: 6413138694713389241} + - component: {fileID: 3172976660983702859} + m_Layer: 0 + m_Name: CARRIAGE (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1455542637126706826 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004269223023641807} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 56.96818, y: 0.023711205, z: -0.020596046} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2870708440658277367} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!33 &6413138694713389241 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004269223023641807} + m_Mesh: {fileID: -7034937500160788296, guid: 30b10058af370a3499ad3be55c52657d, type: 3} +--- !u!23 &3172976660983702859 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004269223023641807} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1948425ed2cb96b408bb1bacea3dccfb, type: 2} + - {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -532,15 +1550,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8013699821485841341} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.79929894, y: 0.02371192, z: -0.7212754} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6037994975089190944} + - {fileID: 2438603590968329703} + - {fileID: 8220357606417076791} + - {fileID: 5352580149863361473} + - {fileID: 9218220390836550574} + - {fileID: 1600923829674651965} m_Father: {fileID: 6804656066269272005} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6040007417234263714 MeshFilter: m_ObjectHideFlags: 0 @@ -606,3 +1629,217 @@ MonoBehaviour: m_EditorClassIdentifier: type: 1 useEffect: 0 +--- !u!1001 &2764383848708284940 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7241138577998217479} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_LocalPosition.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_LocalPosition.y + value: 0.11 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_LocalPosition.z + value: -0.06 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 03c4dee021d4cbd4d9553e9f25cf4ac0, type: 2} + - target: {fileID: 919132149155446097, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + propertyPath: m_Name + value: ivolga_2_locomoto_decals + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} +--- !u!4 &2438603590968329703 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + m_PrefabInstance: {fileID: 2764383848708284940} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5250948317394246266 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2870708440658277367} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalPosition.x + value: 0.08 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalPosition.y + value: 0.11 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5754084199372789682, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 3914384981697792285, guid: 7fcfbbc4cd6b58842a4e8cf0e8a563a9, type: 3} + - target: {fileID: 919132149155446097, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + propertyPath: m_Name + value: SM_ivolga_3_locomotor_decal + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c2396b3e98776ed4695286941c7466d6, type: 3} +--- !u!4 &5716656523707776401 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c2396b3e98776ed4695286941c7466d6, type: 3} + m_PrefabInstance: {fileID: 5250948317394246266} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7712134245137187449 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6477381185575815983} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2cff1febaf5403e438543bf523c0d727, type: 2} + - target: {fileID: 919132149155446097, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + propertyPath: m_Name + value: ep2d_locomotor_decal + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} +--- !u!4 &7822110718252705170 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0b0a49ff096169c4b8c3badc47126328, type: 3} + m_PrefabInstance: {fileID: 7712134245137187449} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Logo.unity b/Assets/Scenes/Logo.unity index 9bc6469..1355d57 100644 --- a/Assets/Scenes/Logo.unity +++ b/Assets/Scenes/Logo.unity @@ -255,7 +255,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 64, y: 0} - m_SizeDelta: {x: 509, y: 144} + m_SizeDelta: {x: 509.1169, y: 144} m_Pivot: {x: 0, y: 0.5} --- !u!114 &20493964 MonoBehaviour: @@ -1021,7 +1021,7 @@ RectTransform: - {fileID: 1267533525} - {fileID: 769162902} m_Father: {fileID: 1542940258} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1787,6 +1787,7 @@ MonoBehaviour: m_EditorClassIdentifier: trainType: 1 selectedColor: {r: 0.6431373, g: 0.7411765, b: 0.89411765, a: 1} + ableToUse: 1 --- !u!114 &190991809 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2035,7 +2036,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 791bba48f0a3e424482e2ff0ec39553f, type: 3} + m_Sprite: {fileID: 21300000, guid: 9729ba3811f43be4cb360b14f35d3a5a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2995,7 +2996,7 @@ RectTransform: m_Children: - {fileID: 2112922670} m_Father: {fileID: 1542940258} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3995,7 +3996,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 64, y: 0} - m_SizeDelta: {x: 514, y: 144} + m_SizeDelta: {x: 514.77374, y: 144} m_Pivot: {x: 0, y: 0.5} --- !u!114 &511545651 MonoBehaviour: @@ -4641,6 +4642,7 @@ MonoBehaviour: m_EditorClassIdentifier: trainType: 0 selectedColor: {r: 0.6431373, g: 0.7411765, b: 0.89411765, a: 1} + ableToUse: 1 --- !u!114 &605317164 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5013,6 +5015,7 @@ MonoBehaviour: m_EditorClassIdentifier: trainType: 2 selectedColor: {r: 0.6431373, g: 0.7411765, b: 0.89411765, a: 1} + ableToUse: 1 --- !u!114 &616666422 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5088,7 +5091,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 64, y: 0} - m_SizeDelta: {x: 521, y: 144} + m_SizeDelta: {x: 521.3734, y: 144} m_Pivot: {x: 0, y: 0.5} --- !u!114 &617888194 MonoBehaviour: @@ -5575,7 +5578,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 64, y: 0} - m_SizeDelta: {x: 429, y: 144} + m_SizeDelta: {x: 428.97812, y: 144} m_Pivot: {x: 0, y: 0.5} --- !u!114 &723616916 MonoBehaviour: @@ -5670,7 +5673,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 64, y: 0} - m_SizeDelta: {x: 525, y: 144} + m_SizeDelta: {x: 524.20184, y: 144} m_Pivot: {x: 0, y: 0.5} --- !u!114 &729876728 MonoBehaviour: @@ -5763,7 +5766,7 @@ RectTransform: m_Children: - {fileID: 1145629135} m_Father: {fileID: 1542940258} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -6937,7 +6940,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 64, y: 0} - m_SizeDelta: {x: 534, y: 144} + m_SizeDelta: {x: 533.62994, y: 144} m_Pivot: {x: 0, y: 0.5} --- !u!114 &900436717 MonoBehaviour: @@ -9524,7 +9527,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 50, y: 50} - m_SizeDelta: {x: 705, y: 128} + m_SizeDelta: {x: 697.6787, y: 128} m_Pivot: {x: 0, y: 0} --- !u!114 &1374821245 MonoBehaviour: @@ -9679,8 +9682,8 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 849269843} - m_TargetAssemblyTypeName: UICanvas, Assembly-CSharp - m_MethodName: Hide + m_TargetAssemblyTypeName: UIMainMenu, Assembly-CSharp + m_MethodName: ResetButtons m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -9691,8 +9694,8 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 849269843} - m_TargetAssemblyTypeName: UIMainMenu, Assembly-CSharp - m_MethodName: ResetButtons + m_TargetAssemblyTypeName: UICanvas, Assembly-CSharp + m_MethodName: Hide m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -10462,7 +10465,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 50, y: 50} - m_SizeDelta: {x: 671, y: 128} + m_SizeDelta: {x: 668.45166, y: 128} m_Pivot: {x: 0, y: 0} --- !u!114 &1487216771 MonoBehaviour: @@ -11149,7 +11152,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 2 + m_SortingOrder: 3 m_TargetDisplay: 0 --- !u!224 &1542940258 RectTransform: @@ -11163,9 +11166,9 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 77396892} - {fileID: 391066469} - {fileID: 749220665} + - {fileID: 77396892} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12633,10 +12636,10 @@ RectTransform: m_Father: {fileID: 1206826300} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 72, y: 686} - m_SizeDelta: {x: 794.8551, y: 94} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 72, y: -290} + m_SizeDelta: {x: 794.8551, y: 93.338135} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1780847367 MonoBehaviour: @@ -12949,7 +12952,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1795561655} - m_LocalRotation: {x: -0, 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: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 @@ -13109,8 +13112,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -476, y: 0} - m_SizeDelta: {x: 415.2459, y: 260.8596} + m_AnchoredPosition: {x: -476, y: -0} + m_SizeDelta: {x: 421.5168, y: 316.1376} m_Pivot: {x: 0, y: 1} --- !u!114 &1814565118 MonoBehaviour: @@ -13132,7 +13135,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a19ba7e3197faa342bc5b78f159cde07, type: 3} + m_Sprite: {fileID: 21300000, guid: 5a5e7d41e6a8bbe49bc71ed475fb4c42, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -13490,7 +13493,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 72, y: -165} - m_SizeDelta: {x: 443, y: 128} + m_SizeDelta: {x: 440.29184, y: 128} m_Pivot: {x: 0, y: 1} --- !u!114 &1868162423 MonoBehaviour: @@ -14059,7 +14062,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 200, y: 0} - m_SizeDelta: {x: 564, y: 128} + m_SizeDelta: {x: 559.0858, y: 128} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1926802916 MonoBehaviour: diff --git a/Assets/Scenes/StationPechatnici.unity b/Assets/Scenes/StationPechatnici.unity index 81cef45..a1438e0 100644 --- a/Assets/Scenes/StationPechatnici.unity +++ b/Assets/Scenes/StationPechatnici.unity @@ -2794,7 +2794,7 @@ ReflectionProbe: m_Mode: 0 m_RefreshMode: 0 m_TimeSlicingMode: 0 - m_Resolution: 128 + m_Resolution: 512 m_UpdateFrequency: 0 m_BoxSize: {x: 172.2535, y: 23.911007, z: 39.490513} m_BoxOffset: {x: 0.8447037, y: 6.9555035, z: -6.015032} @@ -15800,6 +15800,50 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2438603590968329703, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2438603590968329703, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3214759456207710541, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4864002688755897167, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: f84fc045ac445a949bfd992bf998ca03, type: 2} + - target: {fileID: 5958147348918686101, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6037994975089190944, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalPosition.x + value: 0.008542061 + objectReference: {fileID: 0} + - target: {fileID: 6037994975089190944, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalPosition.y + value: -0.00000023841858 + objectReference: {fileID: 0} + - target: {fileID: 6037994975089190944, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalPosition.z + value: -20.634493 + objectReference: {fileID: 0} + - target: {fileID: 6037994975089190944, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6037994975089190944, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6037994975089190944, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6804656066269272005, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_RootOrder value: 9 @@ -15848,6 +15892,46 @@ PrefabInstance: propertyPath: m_Name value: '[LOCOMOTIVE HANDLER]' objectReference: {fileID: 0} + - target: {fileID: 6804656066916660095, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6804656066916660095, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6804656066916660095, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6804656066916660095, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6804656066916660095, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7241138577998217479, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7241138577998217479, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7241138577998217479, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7477779602061541160, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8013699821485841341, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} --- !u!33 &6997017394709609377 diff --git a/Assets/Scenes/StationPechatnici/ReflectionProbe-0.exr b/Assets/Scenes/StationPechatnici/ReflectionProbe-0.exr index a5828de..6795575 100644 Binary files a/Assets/Scenes/StationPechatnici/ReflectionProbe-0.exr and b/Assets/Scenes/StationPechatnici/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/StationSherbinka.unity b/Assets/Scenes/StationSherbinka.unity index 75c698d..3553976 100644 --- a/Assets/Scenes/StationSherbinka.unity +++ b/Assets/Scenes/StationSherbinka.unity @@ -11619,6 +11619,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6804656066269272006, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: pullUpPositionBefore + value: -300 + objectReference: {fileID: 0} - target: {fileID: 6804656066269272007, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_Name value: '[LOCOMOTIVE HANDLER]' diff --git a/Assets/Scenes/StationSolnechnaya.unity b/Assets/Scenes/StationSolnechnaya.unity index 8a529f6..258c1f4 100644 --- a/Assets/Scenes/StationSolnechnaya.unity +++ b/Assets/Scenes/StationSolnechnaya.unity @@ -18712,11 +18712,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6804656066269272006, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: pullUpPositionAfter - value: 100 + value: 400 objectReference: {fileID: 0} - target: {fileID: 6804656066269272006, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: pullUpPositionBefore - value: -100 + value: -160 objectReference: {fileID: 0} - target: {fileID: 6804656066269272007, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_Name diff --git a/Assets/Scripts/GameSystem.cs b/Assets/Scripts/GameSystem.cs index b4e2a98..eb65a40 100644 --- a/Assets/Scripts/GameSystem.cs +++ b/Assets/Scripts/GameSystem.cs @@ -43,6 +43,9 @@ public class GameSystem : MonoBehaviour public async void LoadScene(string sceneName) { + if(mainMenu.gameObject.activeSelf) + mainMenu.Hide(); + mainMenu.UpdateLocationMenu(locationsName[sceneName]); try diff --git a/Assets/Scripts/QRCodeReader.cs b/Assets/Scripts/QRCodeReader.cs index 8edb6a5..5e6a9f8 100644 --- a/Assets/Scripts/QRCodeReader.cs +++ b/Assets/Scripts/QRCodeReader.cs @@ -69,7 +69,7 @@ public class QRCodeReader : MonoBehaviour scaleY = camTexture.videoVerticallyMirrored ? -1f : 1f; rawImage.rectTransform.localScale = new Vector3(1f, scaleY, 1f); } - else if(Application.platform == RuntimePlatform.IPhonePlayer) + else { ratio = (float)camTexture.height / (float)camTexture.width; rawImage.rectTransform.localScale = new Vector3(1f, -1f, 1f); diff --git a/Assets/Scripts/Train.cs b/Assets/Scripts/Train.cs index 4688a1c..7997688 100644 --- a/Assets/Scripts/Train.cs +++ b/Assets/Scripts/Train.cs @@ -15,23 +15,37 @@ public class Train : MonoBehaviour private List materials = new(); private float effectDuration = .4f; + public Tween anim; + void OnEnable() { var uiMenu = FindObjectOfType(); uiMenu.currentTrain = this; + uiMenu.AbleToUseTrainButtons(false); if(materials.Count == 0) { materials = GetComponent().materials.ToList(); - var materialsInChildren = gameObject.transform - .GetChild(0) - .GetComponent() - .materials.ToList(); + var materialsInChildren = new List(); + for(int i = 0; i < transform.childCount; i++) + { + var childMaterials = transform.GetChild(i) + .GetComponent() + .materials; + + foreach(var item in childMaterials) + { + materials.Add(item); + } + } foreach(var mat in materialsInChildren) materials.Add(mat); } + foreach(var mat in materials) + mat.SetFloat("_EffectPosition", -5); + if(!useEffect) { SetEffect(true); @@ -46,10 +60,18 @@ public class Train : MonoBehaviour transform.localPosition.y, startPosition); - transform.DOLocalMoveZ(-16, speed) - .SetEase(Ease.OutSine); + anim = transform.DOLocalMoveZ(-16, speed) + .SetEase(Ease.OutSine) + .OnComplete(() => + { + Debug.Log("tut now"); + uiMenu.AbleToUseTrainButtons(true); + }); + } + else + { + SetEffect(true); } - else SetEffect(true); } public async void Hide() @@ -82,11 +104,11 @@ public class Train : MonoBehaviour IEnumerator SetEffectRoutine(bool isShow) { - float startPosition = isShow ? -5 : 3; + float startPosition = isShow ? -5 : 4; float currentValue = startPosition; float endPosition = 0; - if(isShow) endPosition = 3; + if(isShow) endPosition = 4; else endPosition = -5; float progress = 0; @@ -112,6 +134,12 @@ public class Train : MonoBehaviour .SetFloat("_EffectPosition", endPosition); } + if(isShow && useEffect) + { + FindObjectOfType() + .AbleToUseTrainButtons(true); + } + if(!isShow && useEffect) gameObject.SetActive(false); } diff --git a/Assets/Scripts/UIMainMenu.cs b/Assets/Scripts/UIMainMenu.cs index f29d45a..4dadcfa 100644 --- a/Assets/Scripts/UIMainMenu.cs +++ b/Assets/Scripts/UIMainMenu.cs @@ -13,11 +13,13 @@ public class UIMainMenu : UICanvas public Image aboutTrainButton; public Train currentTrain { get; set; } + Tween tween; + public void ShowAboutTrainButton() { aboutTrainButton.gameObject.SetActive(true); aboutTrainButton.color = new Color(1, 1, 1, 0); - aboutTrainButton.DOFade(.7f, 10f); + tween = aboutTrainButton.DOFade(.7f, 10f); } void Update() @@ -29,6 +31,8 @@ public class UIMainMenu : UICanvas public void UpdateLocationMenu(Location location) { + ResetButtons(); + switch(location) { case(Location.AprelevkaDepo): @@ -57,12 +61,24 @@ public class UIMainMenu : UICanvas } } + public void AbleToUseTrainButtons(bool isAbleToUse) + { + Debug.Log("tut: " + isAbleToUse); + + foreach(var button in trainButtons) + button.ableToUse = isAbleToUse; + } + public void ResetButtons() { foreach(var button in trainButtons) - button.Unselect(); + button.Reset(); aboutTrainButton.gameObject.SetActive(false); + + if(currentTrain == null) return; + + currentTrain.anim.Kill(); currentTrain = null; } } diff --git a/Assets/Scripts/UITrainButton.cs b/Assets/Scripts/UITrainButton.cs index 427a2d8..1e085e4 100644 --- a/Assets/Scripts/UITrainButton.cs +++ b/Assets/Scripts/UITrainButton.cs @@ -16,8 +16,9 @@ public class UITrainButton : MonoBehaviour, IPointerClickHandler public bool isSelected { get; private set; } LocomotionHandler locomotionHandler; + public bool ableToUse = true; - void Start() + void Awake() { buttonBase = GetComponent(); unselectedColor = buttonBase.color; @@ -25,7 +26,7 @@ public class UITrainButton : MonoBehaviour, IPointerClickHandler public void Select() { - if(isSelected) return; + if(isSelected || !ableToUse) return; if(locomotionHandler == null) locomotionHandler = FindObjectOfType(); @@ -42,11 +43,26 @@ public class UITrainButton : MonoBehaviour, IPointerClickHandler locomotionHandler.ShowTrain(trainType); buttonBase.DOColor(selectedColor, .2f); + isSelected = true; } + public void Reset() + { + isSelected = false; + ableToUse = true; + + try + { + buttonBase.color = unselectedColor; + } + catch {} + } + public void Unselect() { + if(!isSelected) return; + buttonBase.DOColor(Color.white, .2f); isSelected = false; } diff --git a/Assets/Textures/UI/TrainsPhoto/014_0500960.jpg b/Assets/Textures/UI/TrainsPhoto/014_0500960.jpg new file mode 100644 index 0000000..229aafd Binary files /dev/null and b/Assets/Textures/UI/TrainsPhoto/014_0500960.jpg differ diff --git a/Assets/Textures/UI/TrainsPhoto/trainEP2D.png.meta b/Assets/Textures/UI/TrainsPhoto/014_0500960.jpg.meta similarity index 97% rename from Assets/Textures/UI/TrainsPhoto/trainEP2D.png.meta rename to Assets/Textures/UI/TrainsPhoto/014_0500960.jpg.meta index 15f0820..0ce04d3 100644 --- a/Assets/Textures/UI/TrainsPhoto/trainEP2D.png.meta +++ b/Assets/Textures/UI/TrainsPhoto/014_0500960.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 791bba48f0a3e424482e2ff0ec39553f +guid: 5a5e7d41e6a8bbe49bc71ed475fb4c42 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -49,7 +49,7 @@ TextureImporter: spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 diff --git a/Assets/Textures/UI/TrainsPhoto/_DSC03835.jpg b/Assets/Textures/UI/TrainsPhoto/_DSC03835.jpg new file mode 100644 index 0000000..c95590b Binary files /dev/null and b/Assets/Textures/UI/TrainsPhoto/_DSC03835.jpg differ diff --git a/Assets/Textures/UI/TrainsPhoto/_DSC03835.jpg.meta b/Assets/Textures/UI/TrainsPhoto/_DSC03835.jpg.meta new file mode 100644 index 0000000..64504a3 --- /dev/null +++ b/Assets/Textures/UI/TrainsPhoto/_DSC03835.jpg.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 9729ba3811f43be4cb360b14f35d3a5a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/UI/TrainsPhoto/trainEP2D.png b/Assets/Textures/UI/TrainsPhoto/trainEP2D.png deleted file mode 100644 index d962c1a..0000000 Binary files a/Assets/Textures/UI/TrainsPhoto/trainEP2D.png and /dev/null differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index fffa5a7..bf21bbf 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.5 + bundleVersion: 0.6 preloadedAssets: - {fileID: 11400000, guid: 31cae119f440ee64ba43351a4dacc12b, type: 2} metroInputSource: 0 @@ -163,7 +163,7 @@ PlayerSettings: iPhone: 3 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 5 + AndroidBundleVersionCode: 6 AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 31 AndroidPreferredInstallLocation: 1 diff --git a/user.keystore b/user.keystore index 76c615e..da286c6 100644 Binary files a/user.keystore and b/user.keystore differ