diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-12.jpg.meta b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-12.jpg.meta index 926d4cf..1306f95 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-12.jpg.meta +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-12.jpg.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-15.jpg.meta b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-15.jpg.meta index b2be601..4410618 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-15.jpg.meta +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-15.jpg.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-2.jpg.meta b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-2.jpg.meta index 21efa38..157e3df 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-2.jpg.meta +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-2.jpg.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-21.jpg.meta b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-21.jpg.meta index bc14e72..d44d359 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-21.jpg.meta +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-21.jpg.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-24.png.meta b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-24.png.meta index b3b4eb5..189a548 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-24.png.meta +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-24.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-3.jpg.meta b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-3.jpg.meta index b984225..4a2783b 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-3.jpg.meta +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-3.jpg.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-31.png.meta b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-31.png.meta index 1bdaf10..56dfc00 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-31.png.meta +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-31.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-33.png.meta b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-33.png.meta index 46256f7..65ddf95 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-33.png.meta +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-33.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-36.png.meta b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-36.png.meta index f0be446..58b44dc 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-36.png.meta +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-36.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-4.jpg.meta b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-4.jpg.meta index 43d92ae..42117c4 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-4.jpg.meta +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-4.jpg.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-47.jpg.meta b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-47.jpg.meta index a74a4c7..ac5e771 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-47.jpg.meta +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_TongQiFaQing/SM_Niu_TongQiFaQing01(1).fbm/3d66Model-10582850-files-47.jpg.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/room_xishou/Materials/GuiZi.mat b/Assets/Art/Models/LouDi/A_QvanChangJing/room_xishou/Materials/GuiZi.mat index e3af0e8..b75bf2e 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/room_xishou/Materials/GuiZi.mat +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/room_xishou/Materials/GuiZi.mat @@ -113,12 +113,12 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _Metallic: 1 - - _OcclusionStrength: 0.6 + - _Metallic: 0.6 + - _OcclusionStrength: 0.1 - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.7 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_jiazi.mat b/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_jiazi.mat index b7694de..af0b6c5 100644 --- a/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_jiazi.mat +++ b/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_jiazi.mat @@ -107,7 +107,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.14142135 + - _Smoothness: 0.559 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -117,8 +117,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} - - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_jingye.mat b/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_jingye.mat index 1d23b7e..76a9c4b 100644 --- a/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_jingye.mat +++ b/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_jingye.mat @@ -111,7 +111,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.14142135 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -121,8 +121,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} - - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_shiguan.mat b/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_shiguan.mat index ba12081..c90b5b0 100644 --- a/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_shiguan.mat +++ b/Assets/Art/Models/LouDi/JingYeYangBen/materials/M_shiguan.mat @@ -13,7 +13,6 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - - _METALLICSPECGLOSSMAP - _NORMALMAP - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -59,7 +58,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 2800000, guid: 1e4986c09871b8342880b224abfee0dc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -105,13 +104,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.14142135 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.14142135 + - _Smoothness: 0.326 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -121,8 +120,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} - - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/SM_ChangJing/Materials/M_Niupeng_gangguan.mat b/Assets/Art/Models/LouDi/SM_ChangJing/Materials/M_Niupeng_gangguan.mat index b861e8c..b020151 100644 --- a/Assets/Art/Models/LouDi/SM_ChangJing/Materials/M_Niupeng_gangguan.mat +++ b/Assets/Art/Models/LouDi/SM_ChangJing/Materials/M_Niupeng_gangguan.mat @@ -112,13 +112,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.14142135 - _GlossyReflections: 1 - - _Metallic: 0.78 + - _Metallic: 0.3 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.6 + - _Smoothness: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128568675.mat b/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128568675.mat index ee57f9f..57addd2 100644 --- a/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128568675.mat +++ b/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128568675.mat @@ -112,12 +112,12 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _Metallic: 1 + - _Metallic: 0.6 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0.7 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/05 - Default.mat b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/05 - Default.mat index 2d98dc9..5ebd37e 100644 --- a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/05 - Default.mat +++ b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/05 - Default.mat @@ -112,13 +112,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.14142135 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 0.05 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -128,8 +128,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.95560306, g: 0.95560306, b: 0.95560306, a: 1} - - _Color: {r: 0.95560306, g: 0.95560306, b: 0.95560306, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/M_KaiZhiQi.mat b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/M_KaiZhiQi.mat index 7aa27c8..0c387f7 100644 --- a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/M_KaiZhiQi.mat +++ b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/M_KaiZhiQi.mat @@ -116,7 +116,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.3458689, g: 0.3458689, b: 0.3458689, a: 1} - - _Color: {r: 0.3458689, g: 0.3458689, b: 0.3458689, a: 1} + - _Color: {r: 0.34586886, g: 0.34586886, b: 0.34586886, 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/Art/Models/LouDi/SM_ShiYanShi/Materials/M_ShuJingQiang_01.mat b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/M_ShuJingQiang_01.mat index 8b96f29..722c329 100644 --- a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/M_ShuJingQiang_01.mat +++ b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/M_ShuJingQiang_01.mat @@ -116,7 +116,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.19435313, g: 0.19435313, b: 0.19435313, a: 1} - - _Color: {r: 0.19435313, g: 0.19435313, b: 0.19435313, a: 1} + - _Color: {r: 0.1943531, g: 0.1943531, b: 0.1943531, 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/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23 1.mat b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23 1.mat index 43043ba..1398911 100644 --- a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23 1.mat +++ b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23 1.mat @@ -24,19 +24,15 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - - _SURFACE_TYPE_TRANSPARENT + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 2000 stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER + RenderType: Opaque + disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -110,8 +106,8 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _DstBlendAlpha: 10 + - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.14142135 @@ -127,10 +123,10 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 1 + - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Art/Models/LouDi/SM_ShiYanShi/Qiang.mat b/Assets/Art/Models/LouDi/SM_ShiYanShi/Qiang.mat new file mode 100644 index 0000000..472c77a --- /dev/null +++ b/Assets/Art/Models/LouDi/SM_ShiYanShi/Qiang.mat @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2421211562839995159 +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: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Qiang + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + 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: 0} + 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} + - _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 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BlendOp: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.254717, g: 0.25008264, b: 0.24390353, a: 1} + - _Color: {r: 0.25471696, g: 0.2500826, b: 0.24390349, 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/Art/Models/LouDi/SM_ShiYanShi/Qiang.mat.meta b/Assets/Art/Models/LouDi/SM_ShiYanShi/Qiang.mat.meta new file mode 100644 index 0000000..f6b03bb --- /dev/null +++ b/Assets/Art/Models/LouDi/SM_ShiYanShi/Qiang.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d43c3ac0e79db64a89e34ed3d684349 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/LouDi/SM_YeDanGuan/Materials/M_Yedanguan 1.mat b/Assets/Art/Models/LouDi/SM_YeDanGuan/Materials/M_Yedanguan 1.mat index 5dc1c33..554efb0 100644 --- a/Assets/Art/Models/LouDi/SM_YeDanGuan/Materials/M_Yedanguan 1.mat +++ b/Assets/Art/Models/LouDi/SM_YeDanGuan/Materials/M_Yedanguan 1.mat @@ -25,7 +25,6 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _METALLICSPECGLOSSMAP - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -68,7 +67,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 2800000, guid: b783f8f6adb4de249870fde69e0b14b9, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -114,13 +113,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.14142135 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 0.1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.14142135 + - _Smoothness: 0.452 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -130,8 +129,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} - - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/SM_YeDanGuan/Materials/M_jingyexiguan 1.mat b/Assets/Art/Models/LouDi/SM_YeDanGuan/Materials/M_jingyexiguan 1.mat index 48afa57..b942121 100644 --- a/Assets/Art/Models/LouDi/SM_YeDanGuan/Materials/M_jingyexiguan 1.mat +++ b/Assets/Art/Models/LouDi/SM_YeDanGuan/Materials/M_jingyexiguan 1.mat @@ -130,8 +130,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} - - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/wenduji/materials/M_wenduji.mat b/Assets/Art/Models/LouDi/wenduji/materials/M_wenduji.mat index 392a77e..c1098f0 100644 --- a/Assets/Art/Models/LouDi/wenduji/materials/M_wenduji.mat +++ b/Assets/Art/Models/LouDi/wenduji/materials/M_wenduji.mat @@ -120,7 +120,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.14142135 + - _Smoothness: 0.779 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -130,8 +130,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} - - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + - _BaseColor: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 1} + - _Color: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/SampleSceneProfile.asset index 44d2891..2c6edad 100644 --- a/Assets/Settings/SampleSceneProfile.asset +++ b/Assets/Settings/SampleSceneProfile.asset @@ -62,10 +62,10 @@ MonoBehaviour: active: 1 postExposure: m_OverrideState: 1 - m_Value: 2 + m_Value: 3.5 contrast: m_OverrideState: 1 - m_Value: 10 + m_Value: 15 colorFilter: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} @@ -74,7 +74,7 @@ MonoBehaviour: m_Value: 0 saturation: m_OverrideState: 1 - m_Value: 20 + m_Value: 40 --- !u!114 &-7011558710299706105 MonoBehaviour: m_ObjectHideFlags: 3 @@ -135,7 +135,7 @@ MonoBehaviour: active: 1 mode: m_OverrideState: 1 - m_Value: 1 + m_Value: 2 neutralHDRRangeReductionMode: m_OverrideState: 0 m_Value: 2 diff --git a/Assets/Settings/URP-HighFidelity-Renderer.asset b/Assets/Settings/URP-HighFidelity-Renderer.asset index 3c76948..844322d 100644 --- a/Assets/Settings/URP-HighFidelity-Renderer.asset +++ b/Assets/Settings/URP-HighFidelity-Renderer.asset @@ -21,7 +21,7 @@ MonoBehaviour: NormalSamples: 1 Intensity: 1 DirectLightingStrength: 0.25 - Radius: 0.25 + Radius: 0.2 Samples: 0 BlurQuality: 0 Falloff: 100 diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index bbba207..28c66dc 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -20,12 +20,12 @@ RenderSettings: m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientSkyColor: {r: 0.6320754, g: 0.6320754, b: 0.6320754, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.7264151, g: 0.7264151, b: 0.7264151, a: 1} m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 203844588} - m_IndirectSpecularColor: {r: 0.16788226, g: 0.21073678, b: 0.28994098, a: 1} + m_IndirectSpecularColor: {r: 0.1802854, g: 0.22571693, b: 0.30692482, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -280,7 +280,7 @@ Light: m_Type: 3 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 + m_Intensity: 0.8 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -1262,7 +1262,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &76167725 Transform: m_ObjectHideFlags: 0 @@ -1272,7 +1272,7 @@ Transform: m_GameObject: {fileID: 76167724} serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: -0.45, y: -0.57, z: 2.684} + m_LocalPosition: {x: -0.45, y: -0.57, z: 2.822} m_LocalScale: {x: 1, y: 1.1079, z: 1.5004} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4670,7 +4670,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 + m_Intensity: 0.6 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -5048,7 +5048,7 @@ Transform: m_GameObject: {fileID: 233570579} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} - m_LocalPosition: {x: -1.33, y: -0.89, z: 8.65} + m_LocalPosition: {x: -1.33, y: -0.03, z: 8.65} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5089,7 +5089,7 @@ Light: m_Type: 3 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 + m_Intensity: 0.2 m_Range: 40 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -9579,6 +9579,125 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 416603169} m_PrefabAsset: {fileID: 0} +--- !u!1001 &420978795 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1099926480} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalScale.x + value: 0.017079342 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.244 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.007 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.5604 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 21706d6ab0c1f4145a727a8b290588a8, type: 2} + - target: {fileID: -7511558181221131132, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: dad9a3ff134e76c4085e810e535be7e6, type: 2} + - target: {fileID: -7511558181221131132, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 712b948c5fa7b2d4fa44eed5ef2ca97a, type: 2} + - target: {fileID: 919132149155446097, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_Name + value: SM_Qiang2 (1) + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + propertyPath: m_StaticEditorFlags + value: 65 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 535cb80b23ea14242891d8d17c3d5ea7, type: 3} +--- !u!4 &420978796 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + m_PrefabInstance: {fileID: 420978795} + m_PrefabAsset: {fileID: 0} --- !u!1 &421689834 stripped GameObject: m_CorrespondingSourceObject: {fileID: -2654796312878097123, guid: be7f28f8b62754942a777770653e1620, @@ -11673,17 +11792,17 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: cd58f9f88afbca441a6faf01b6adf131, type: 3} propertyPath: m_LocalPosition.x - value: 0.0005746139 + value: 0.28 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cd58f9f88afbca441a6faf01b6adf131, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.872 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cd58f9f88afbca441a6faf01b6adf131, type: 3} propertyPath: m_LocalPosition.z - value: -0.008872267 + value: -0.598 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cd58f9f88afbca441a6faf01b6adf131, type: 3} @@ -15431,7 +15550,7 @@ GameObject: m_TagString: nohide m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!4 &673468293 Transform: @@ -16648,6 +16767,111 @@ Transform: - {fileID: 697457527} m_Father: {fileID: 2099670982} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &722441458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 722441459} + - component: {fileID: 722441462} + - component: {fileID: 722441461} + - component: {fileID: 722441460} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 65 + m_IsActive: 1 +--- !u!4 &722441459 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722441458} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 2.1833768, y: 0.004215002, z: 0.02034378} + m_LocalScale: {x: 0.12143, y: 5.554515, z: 3.1955087} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1099926480} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &722441460 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722441458} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &722441461 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722441458} + 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: 92d3ac886f9b42446bce4a850f763e03, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &722441462 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722441458} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &731547136 GameObject: m_ObjectHideFlags: 0 @@ -17543,6 +17767,124 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &777699610 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 777699611} + - component: {fileID: 777699613} + - component: {fileID: 777699612} + m_Layer: 0 + m_Name: Area Light (16) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &777699611 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 777699610} + serializedVersion: 2 + m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} + m_LocalPosition: {x: -1.561, y: -3.52, z: 8.65} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5542032951193892033} + m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} +--- !u!114 &777699612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 777699610} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!108 &777699613 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 777699610} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 3 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 0.5 + m_Range: 40 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 2 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 18.974136, y: 3.4874792} + m_BounceIntensity: 2 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 --- !u!1 &778533313 GameObject: m_ObjectHideFlags: 0 @@ -22249,8 +22591,8 @@ Transform: m_GameObject: {fileID: 955662771} serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 2.315, y: -0.57, z: 0.020342102} - m_LocalScale: {x: 1, y: 1.1079, z: 1} + m_LocalPosition: {x: 2.315, y: -0.56964, z: 2.073} + m_LocalScale: {x: 1, y: 1.8844271, z: 1.463} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1099926480} @@ -25145,6 +25487,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 65 objectReference: {fileID: 0} + - target: {fileID: 909533460901087810, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} - target: {fileID: 1019950470097217603, guid: 91cd557b6f1a77747a3e874f80172a64, type: 3} propertyPath: m_StaticEditorFlags @@ -25720,6 +26067,26 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 65 objectReference: {fileID: 0} + - target: {fileID: 4172171706363267232, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + propertyPath: m_LocalScale.x + value: 0.12143 + objectReference: {fileID: 0} + - target: {fileID: 4172171706363267232, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + propertyPath: m_LocalScale.y + value: 5.5545154 + objectReference: {fileID: 0} + - target: {fileID: 4172171706363267232, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + propertyPath: m_LocalScale.z + value: 3.1955085 + objectReference: {fileID: 0} + - target: {fileID: 4172171706363267232, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.004215 + objectReference: {fileID: 0} - target: {fileID: 4181110366092950324, guid: 91cd557b6f1a77747a3e874f80172a64, type: 3} propertyPath: m_IsActive @@ -25820,6 +26187,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 65 objectReference: {fileID: 0} + - target: {fileID: 5143655959369022897, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5143655959369022897, guid: 91cd557b6f1a77747a3e874f80172a64, type: 3} propertyPath: m_StaticEditorFlags @@ -25965,6 +26337,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 65 objectReference: {fileID: 0} + - target: {fileID: 6106638895074620134, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + propertyPath: m_LocalScale.y + value: 1.051 + objectReference: {fileID: 0} - target: {fileID: 6329718584284995091, guid: 91cd557b6f1a77747a3e874f80172a64, type: 3} propertyPath: m_LocalScale.x @@ -26497,17 +26874,25 @@ PrefabInstance: type: 3} insertIndex: 57 addedObject: {fileID: 1450726274} + - targetCorrespondingSourceObject: {fileID: 9068538860655477781, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + insertIndex: 58 + addedObject: {fileID: 420978796} - targetCorrespondingSourceObject: {fileID: 9068538860655477781, guid: 91cd557b6f1a77747a3e874f80172a64, type: 3} insertIndex: 114 + addedObject: {fileID: 722441459} + - targetCorrespondingSourceObject: {fileID: 9068538860655477781, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + insertIndex: 116 addedObject: {fileID: 955662772} - targetCorrespondingSourceObject: {fileID: 9068538860655477781, guid: 91cd557b6f1a77747a3e874f80172a64, type: 3} - insertIndex: 115 + insertIndex: 117 addedObject: {fileID: 76167725} - targetCorrespondingSourceObject: {fileID: 9068538860655477781, guid: 91cd557b6f1a77747a3e874f80172a64, type: 3} - insertIndex: 178 + insertIndex: 180 addedObject: {fileID: 245494940} - targetCorrespondingSourceObject: {fileID: 9068538860655477781, guid: 91cd557b6f1a77747a3e874f80172a64, type: 3} @@ -31121,7 +31506,7 @@ GameObject: m_TagString: nohide m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!4 &1343255435 Transform: @@ -33041,7 +33426,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, type: 3} propertyPath: m_LocalPosition.x - value: -0.022 + value: -0.023 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, type: 3} @@ -33051,7 +33436,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, type: 3} propertyPath: m_LocalPosition.z - value: 2.578 + value: 2.589 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, type: 3} @@ -33125,7 +33510,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1724175222} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 535cb80b23ea14242891d8d17c3d5ea7, type: 3} --- !u!4 &1450726274 stripped @@ -37680,6 +38069,112 @@ Transform: - {fileID: 360084158} m_Father: {fileID: 2093904158} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1724175221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1724175222} + - component: {fileID: 1724175225} + - component: {fileID: 1724175224} + - component: {fileID: 1724175223} + m_Layer: 0 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1724175222 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724175221} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.20389803, z: 0, w: 0.9789921} + m_LocalPosition: {x: 2.141, y: 0, z: 0.0545} + m_LocalScale: {x: 0.071059, y: 4.805, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1450726274} + m_LocalEulerAnglesHint: {x: 0, y: 23.53, z: 0} +--- !u!64 &1724175223 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724175221} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1724175224 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724175221} + 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: 3d43c3ac0e79db64a89e34ed3d684349, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1724175225 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724175221} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1727900764 PrefabInstance: m_ObjectHideFlags: 0 @@ -42379,7 +42874,7 @@ Transform: m_GameObject: {fileID: 1938133023} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.39, y: -2.03, z: 6.13} + m_LocalPosition: {x: 0.39, y: -2.64, z: 6.13} m_LocalScale: {x: 1, y: 1, z: 1.785} m_ConstrainProportionsScale: 0 m_Children: [] @@ -42436,24 +42931,24 @@ LightProbeGroup: - {x: -4.172764, y: -3.076672, z: 3.566364} - {x: 1, y: 3.376367, z: 6.6042566} - {x: 1, y: 3.376367, z: -8.610243} - - {x: 0.8151355, y: -2.861638, z: 6.6042566} - - {x: 1, y: -3.076672, z: -8.610243} + - {x: -0.21787047, y: -1.8462601, z: 6.6042566} + - {x: -0.033005953, y: -2.061294, z: -8.610243} - {x: 1, y: 3.376367, z: -1} - - {x: 0.8692155, y: -2.6023412, z: -1} + - {x: -0.16379046, y: -1.5869632, z: -1} - {x: 1, y: 3.376367, z: -8.610243} - - {x: 1, y: -3.076672, z: -8.610243} + - {x: 0.723037, y: -2.4611235, z: -8.610243} - {x: 1, y: 3.376367, z: -3.4053755} - - {x: 1, y: -3.076672, z: -3.4053755} + - {x: -0.033005953, y: -2.061294, z: -3.4053755} - {x: 1, y: 3.376367, z: -3.4053755} - - {x: 1, y: -3.076672, z: -3.4053755} + - {x: 0.69479656, y: -2.3503585, z: -3.4053755} - {x: 1, y: 3.376367, z: -5.6739855} - - {x: 1, y: -3.076672, z: -5.6739855} + - {x: -0.033005953, y: -2.061294, z: -5.6739855} - {x: 1, y: 3.376367, z: -5.6739855} - - {x: 1, y: -3.076672, z: -5.6739855} + - {x: 0.6550715, y: -2.5356832, z: -5.6739855} - {x: 1, y: 3.376367, z: 1} - - {x: 0.83767843, y: -2.9873676, z: 1} + - {x: -0.19532752, y: -1.9719896, z: 1} - {x: 1, y: 3.376367, z: 3.566364} - - {x: 0.8006959, y: -2.941895, z: 3.566364} + - {x: -0.23231006, y: -1.926517, z: 3.566364} - {x: -1, y: 3.376367, z: 6.6042566} - {x: -1, y: 3.376367, z: -8.610243} - {x: -1, y: -3.076672, z: 6.6042566} @@ -47155,7 +47650,7 @@ Transform: m_GameObject: {fileID: 919132148120946374} serializedVersion: 2 m_LocalRotation: {x: 0.000000015401293, y: 0.70952624, z: -0.000000015507181, w: 0.7046791} - m_LocalPosition: {x: -0.02938464, y: -0.5797912, z: 1.4602126} + m_LocalPosition: {x: -0.029, y: 0.379, z: 0.786} m_LocalScale: {x: 1.08, y: 1.08, z: 1.08} m_ConstrainProportionsScale: 1 m_Children: @@ -48049,7 +48544,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!114 &824406976513533503 MonoBehaviour: @@ -48355,7 +48850,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!65 &919132148120946375 BoxCollider: m_ObjectHideFlags: 0 @@ -51594,7 +52089,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!4 &1884036776332563461 Transform: @@ -52370,7 +52865,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!23 &2197821132554225592 MeshRenderer: @@ -59097,7 +59592,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!23 &2770811259122021839 MeshRenderer: @@ -63929,7 +64424,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!23 &4204714998994253397 MeshRenderer: @@ -68484,6 +68979,7 @@ Transform: - {fileID: 996279405} - {fileID: 821546389} - {fileID: 233570580} + - {fileID: 777699611} - {fileID: 744546791} - {fileID: 1280541676} - {fileID: 349432248} @@ -69927,7 +70423,7 @@ Transform: m_GameObject: {fileID: 2194363048888443518} serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.0057675783, y: -0.021741211, z: 0.0061340337} + m_LocalPosition: {x: 0.0057675783, y: -0.045, z: 0.0061340337} m_LocalScale: {x: 10.006898, y: 10.006898, z: 10.006898} m_ConstrainProportionsScale: 0 m_Children: @@ -76082,7 +76578,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!33 &7774840468221249772 MeshFilter: @@ -81850,7 +82346,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!33 &8211823104304942046 MeshFilter: diff --git a/Assets/_Scenes/TrainExam/LightingData.asset b/Assets/_Scenes/TrainExam/LightingData.asset index 1b077d8..7df4242 100644 Binary files a/Assets/_Scenes/TrainExam/LightingData.asset and b/Assets/_Scenes/TrainExam/LightingData.asset differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-0_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-0_comp_dir.png index 2116b19..a8e14ca 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-0_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-0_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-0_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-0_comp_light.exr index c7a4198..5a0d12a 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-0_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-0_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-1_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-1_comp_dir.png index 1c61f42..3645f17 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-1_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-1_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-1_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-1_comp_light.exr index e49c924..b88e325 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-1_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-1_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-2_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-2_comp_dir.png index f89e3a1..5e68be7 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-2_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-2_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-2_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-2_comp_light.exr index 99e3ffa..45f6e9b 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-2_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-2_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-3_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-3_comp_dir.png index 9ed14fd..6b6635b 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-3_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-3_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-3_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-3_comp_light.exr index fd0755c..5d05aea 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-3_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-3_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-4_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-4_comp_dir.png index 39013ce..acd30fb 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-4_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-4_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-4_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-4_comp_light.exr index e46e6ea..7bad91f 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-4_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-4_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-5_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-5_comp_dir.png index 02f909f..62a5986 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-5_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-5_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-5_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-5_comp_light.exr index 25dc62b..5881460 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-5_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-5_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-6_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-6_comp_dir.png index 243f314..d1e6a5b 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-6_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-6_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-6_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-6_comp_light.exr index 20ded3f..f230987 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-6_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-6_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/ReflectionProbe-0.exr b/Assets/_Scenes/TrainExam/ReflectionProbe-0.exr index f243b9b..248b2ee 100644 Binary files a/Assets/_Scenes/TrainExam/ReflectionProbe-0.exr and b/Assets/_Scenes/TrainExam/ReflectionProbe-0.exr differ diff --git a/Assets/_Scenes/TrainExam/ReflectionProbe-1.exr b/Assets/_Scenes/TrainExam/ReflectionProbe-1.exr index b8265e2..aaf59cc 100644 Binary files a/Assets/_Scenes/TrainExam/ReflectionProbe-1.exr and b/Assets/_Scenes/TrainExam/ReflectionProbe-1.exr differ diff --git a/Assets/_Scenes/TrainExam/ReflectionProbe-2.exr b/Assets/_Scenes/TrainExam/ReflectionProbe-2.exr index 07aa81f..35b1413 100644 Binary files a/Assets/_Scenes/TrainExam/ReflectionProbe-2.exr and b/Assets/_Scenes/TrainExam/ReflectionProbe-2.exr differ diff --git a/Assets/_Scenes/TrainExam/ReflectionProbe-3.exr b/Assets/_Scenes/TrainExam/ReflectionProbe-3.exr index 5a278d6..ef1d15f 100644 Binary files a/Assets/_Scenes/TrainExam/ReflectionProbe-3.exr and b/Assets/_Scenes/TrainExam/ReflectionProbe-3.exr differ diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 4ec7b03..64e09b7 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,22 +12,22 @@ EditorUserSettings: value: 5150005250050d0b0c585527417a5e44454f1973797a7e347e7b4e32e1b4613d flags: 0 RecentlyUsedSceneGuid-2: - value: 5707515e06045e030e5b0d7615770f44104e1a7c797b75697d781b67e0e3636a - flags: 0 - RecentlyUsedSceneGuid-3: value: 5a070c555353580f0c5a097041200844464f4b7c792c2464797f4f61e1b96c3a flags: 0 - RecentlyUsedSceneGuid-4: + RecentlyUsedSceneGuid-3: value: 5b0051575d545a0a5a5c547716720f44434f4a28282b24697d2b4b60b3b5666f flags: 0 - RecentlyUsedSceneGuid-5: + RecentlyUsedSceneGuid-4: value: 5754050501560c5a0e595e7a49770c44444e4e787c717435297e1e6ab0b66c39 flags: 0 + RecentlyUsedSceneGuid-5: + value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + flags: 0 RecentlyUsedSceneGuid-6: - value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a + value: 5707515e06045e030e5b0d7615770f44104e1a7c797b75697d781b67e0e3636a flags: 0 RecentlyUsedSceneGuid-7: - value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c968797a7cf