diff --git a/Assets/Settings/URP-HighFidelity-Renderer.asset b/Assets/Settings/URP-HighFidelity-Renderer.asset index e5f20bf..934d3ae 100644 --- a/Assets/Settings/URP-HighFidelity-Renderer.asset +++ b/Assets/Settings/URP-HighFidelity-Renderer.asset @@ -51,7 +51,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 664b8d886da2cfe468694b5db616d688, type: 3} m_Name: VolumeLight m_EditorClassIdentifier: - m_Active: 1 + m_Active: 0 space_sigma: 1 range_sigma: 0.5 Precision: 10 diff --git a/Assets/_Scenes/JingMaiLiuZhiZhen/New Lighting Settings.lighting b/Assets/_Scenes/JingMaiLiuZhiZhen/New Lighting Settings.lighting new file mode 100644 index 0000000..1d54be0 --- /dev/null +++ b/Assets/_Scenes/JingMaiLiuZhiZhen/New Lighting Settings.lighting @@ -0,0 +1,64 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Lighting Settings + serializedVersion: 4 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 2 + m_LightmapMaxSize: 2048 + m_BakeResolution: 80 + m_Padding: 3 + m_LightmapCompression: 2 + m_AO: 1 + m_AOMaxDistance: 0.5 + m_CompAOExponent: 0.5 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 12 + m_PVRBounces: 8 + m_PVRMinBounces: 6 + m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 diff --git a/Assets/_Scenes/JingMaiLiuZhiZhen/New Lighting Settings.lighting.meta b/Assets/_Scenes/JingMaiLiuZhiZhen/New Lighting Settings.lighting.meta new file mode 100644 index 0000000..295b92a --- /dev/null +++ b/Assets/_Scenes/JingMaiLiuZhiZhen/New Lighting Settings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c5ec63af6dcba04dad13b3bf36cf2c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scenes/daoNiaoShu.meta b/Assets/_Scenes/daoNiaoShu.meta new file mode 100644 index 0000000..057de86 --- /dev/null +++ b/Assets/_Scenes/daoNiaoShu.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04c7a7d1455ab3547b5701029bad0afa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scenes/daoNiaoShu.unity b/Assets/_Scenes/daoNiaoShu.unity index e68090d..a0e99c2 100644 --- a/Assets/_Scenes/daoNiaoShu.unity +++ b/Assets/_Scenes/daoNiaoShu.unity @@ -97,9 +97,9 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: 8c6e752d5d40e554aa5828989af29638, + m_LightingDataAsset: {fileID: 112000000, guid: e972a05a858cd6c46b1c26abec3062f2, type: 2} - m_LightingSettings: {fileID: 4890085278179872738, guid: 4dcaefa7c07ae194296f7ff165b7be8a, + m_LightingSettings: {fileID: 4890085278179872738, guid: 3c5ec63af6dcba04dad13b3bf36cf2c6, type: 2} --- !u!196 &4 NavMeshSettings: @@ -67334,6 +67334,11 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: -3600770182790785616, guid: 0aefcd580a0895d49976c3aa69f02b18, + type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 0aefcd580a0895d49976c3aa69f02b18, type: 3} propertyPath: m_Name @@ -67349,6 +67354,11 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3846281551576968327, guid: 0aefcd580a0895d49976c3aa69f02b18, + type: 3} + propertyPath: m_StaticEditorFlags + value: 65 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0aefcd580a0895d49976c3aa69f02b18, type: 3} --- !u!4 &655653610 stripped @@ -82201,6 +82211,11 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: -2764411142653097398, guid: 1ea7e35e894fafa4f881574e5107f031, + type: 3} + propertyPath: m_StaticEditorFlags + value: 65 + objectReference: {fileID: 0} - target: {fileID: -2183476348864223597, guid: 1ea7e35e894fafa4f881574e5107f031, type: 3} propertyPath: m_Layer @@ -292774,6 +292789,11 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 151557344795257451, guid: d7bdbad2770b55647b8a922f4e09904c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 170605816575485400, guid: d7bdbad2770b55647b8a922f4e09904c, type: 3} propertyPath: m_Layer @@ -292892,7 +292912,7 @@ PrefabInstance: - target: {fileID: 1642884053311069288, guid: d7bdbad2770b55647b8a922f4e09904c, type: 3} propertyPath: m_LocalPosition.z - value: 1.33 + value: 1.46 objectReference: {fileID: 0} - target: {fileID: 1643546834150985030, guid: d7bdbad2770b55647b8a922f4e09904c, type: 3} @@ -292977,7 +292997,7 @@ PrefabInstance: - target: {fileID: 2449617006917224324, guid: d7bdbad2770b55647b8a922f4e09904c, type: 3} propertyPath: m_Shadows.m_Type - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2449617006917224324, guid: d7bdbad2770b55647b8a922f4e09904c, type: 3} @@ -293459,6 +293479,11 @@ PrefabInstance: propertyPath: m_Shadows.m_Strength value: 0.9 objectReference: {fileID: 0} + - target: {fileID: 7965814953384102678, guid: d7bdbad2770b55647b8a922f4e09904c, + type: 3} + propertyPath: m_ScaleInLightmap + value: 3 + objectReference: {fileID: 0} - target: {fileID: 8040218624075451194, guid: d7bdbad2770b55647b8a922f4e09904c, type: 3} propertyPath: m_Layer @@ -293509,6 +293534,11 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 8519009959135616765, guid: d7bdbad2770b55647b8a922f4e09904c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8640583720924963014, guid: d7bdbad2770b55647b8a922f4e09904c, type: 3} propertyPath: m_Layer @@ -293574,6 +293604,11 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 9047988851313190320, guid: d7bdbad2770b55647b8a922f4e09904c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9056469683997549396, guid: d7bdbad2770b55647b8a922f4e09904c, type: 3} propertyPath: m_Layer @@ -327398,7 +327433,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &8343209867940129228 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/犬导尿术/daoNiaoShu/LightingData.asset b/Assets/_Scenes/daoNiaoShu/LightingData.asset similarity index 65% rename from Assets/犬导尿术/daoNiaoShu/LightingData.asset rename to Assets/_Scenes/daoNiaoShu/LightingData.asset index edcfca9..91d8dc7 100644 Binary files a/Assets/犬导尿术/daoNiaoShu/LightingData.asset and b/Assets/_Scenes/daoNiaoShu/LightingData.asset differ diff --git a/Assets/犬导尿术/daoNiaoShu/LightingData.asset.meta b/Assets/_Scenes/daoNiaoShu/LightingData.asset.meta similarity index 79% rename from Assets/犬导尿术/daoNiaoShu/LightingData.asset.meta rename to Assets/_Scenes/daoNiaoShu/LightingData.asset.meta index 42df78f..0d9a0b8 100644 --- a/Assets/犬导尿术/daoNiaoShu/LightingData.asset.meta +++ b/Assets/_Scenes/daoNiaoShu/LightingData.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8c6e752d5d40e554aa5828989af29638 +guid: e972a05a858cd6c46b1c26abec3062f2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 112000000 diff --git a/Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_dir.png b/Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_dir.png new file mode 100644 index 0000000..a600154 Binary files /dev/null and b/Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_dir.png differ diff --git a/Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_dir.png.meta b/Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_dir.png.meta similarity index 78% rename from Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_dir.png.meta rename to Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_dir.png.meta index 0c03c77..cdc4bae 100644 --- a/Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_dir.png.meta +++ b/Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_dir.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 24f5878c8559b7d42bd937851ddd51aa +guid: c81442d561d90b645b9401ef4fc5e696 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,8 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -77,20 +74,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -107,8 +90,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_light.exr b/Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_light.exr new file mode 100644 index 0000000..23b17c9 Binary files /dev/null and b/Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_light.exr differ diff --git a/Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_light.exr.meta b/Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_light.exr.meta similarity index 78% rename from Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_light.exr.meta rename to Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_light.exr.meta index 02af50a..42ce976 100644 --- a/Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_light.exr.meta +++ b/Assets/_Scenes/daoNiaoShu/Lightmap-0_comp_light.exr.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 0e00da30baef4fc49be8a33f2c9cfb2b +guid: fccbf230ed63df749b88af746229e453 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,8 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -77,20 +74,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -107,8 +90,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_dir.png b/Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_dir.png new file mode 100644 index 0000000..529e872 Binary files /dev/null and b/Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_dir.png differ diff --git a/Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_dir.png.meta b/Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_dir.png.meta similarity index 78% rename from Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_dir.png.meta rename to Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_dir.png.meta index c952b9c..84cade3 100644 --- a/Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_dir.png.meta +++ b/Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_dir.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 7ad99e666f11b8e41aa5e8cb959d6dc1 +guid: b13814e6ddc31644d8ae44866a74e814 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,8 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -77,20 +74,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -107,8 +90,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_light.exr b/Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_light.exr new file mode 100644 index 0000000..975b1a6 Binary files /dev/null and b/Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_light.exr differ diff --git a/Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_light.exr.meta b/Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_light.exr.meta similarity index 78% rename from Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_light.exr.meta rename to Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_light.exr.meta index 2044813..b95364f 100644 --- a/Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_light.exr.meta +++ b/Assets/_Scenes/daoNiaoShu/Lightmap-1_comp_light.exr.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 988128d5cc6422c489e34600adfe5874 +guid: 4c79014481dab044183b47f92c435c5c TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,8 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -77,20 +74,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -107,8 +90,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/_Scenes/daoNiaoShu/ReflectionProbe-0.exr b/Assets/_Scenes/daoNiaoShu/ReflectionProbe-0.exr new file mode 100644 index 0000000..6655798 Binary files /dev/null and b/Assets/_Scenes/daoNiaoShu/ReflectionProbe-0.exr differ diff --git a/Assets/犬导尿术/daoNiaoShu/ReflectionProbe-0.exr.meta b/Assets/_Scenes/daoNiaoShu/ReflectionProbe-0.exr.meta similarity index 78% rename from Assets/犬导尿术/daoNiaoShu/ReflectionProbe-0.exr.meta rename to Assets/_Scenes/daoNiaoShu/ReflectionProbe-0.exr.meta index c887ffb..9c0616b 100644 --- a/Assets/犬导尿术/daoNiaoShu/ReflectionProbe-0.exr.meta +++ b/Assets/_Scenes/daoNiaoShu/ReflectionProbe-0.exr.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 8be9b43726789b44ca43b6767ace6a12 +guid: 1f0859856ced9d848aa9fd07ad77fd80 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 1 @@ -64,8 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -77,20 +74,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -107,8 +90,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/_Scenes/daoNiaoShu/ReflectionProbe-1.exr b/Assets/_Scenes/daoNiaoShu/ReflectionProbe-1.exr new file mode 100644 index 0000000..0d310ee Binary files /dev/null and b/Assets/_Scenes/daoNiaoShu/ReflectionProbe-1.exr differ diff --git a/Assets/犬导尿术/daoNiaoShu/ReflectionProbe-1.exr.meta b/Assets/_Scenes/daoNiaoShu/ReflectionProbe-1.exr.meta similarity index 78% rename from Assets/犬导尿术/daoNiaoShu/ReflectionProbe-1.exr.meta rename to Assets/_Scenes/daoNiaoShu/ReflectionProbe-1.exr.meta index 07af217..cc83abc 100644 --- a/Assets/犬导尿术/daoNiaoShu/ReflectionProbe-1.exr.meta +++ b/Assets/_Scenes/daoNiaoShu/ReflectionProbe-1.exr.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: bf4eeb0eb249a1447951b83386d090bf +guid: fc3323b04cd2dea42a05f2f9548c99da TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 13 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 1 @@ -64,8 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -77,20 +74,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -107,8 +90,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/犬导尿术/Materials/M_BoLi.mat b/Assets/犬导尿术/Materials/M_BoLi.mat index 5c34cec..a63c5c1 100644 --- a/Assets/犬导尿术/Materials/M_BoLi.mat +++ b/Assets/犬导尿术/Materials/M_BoLi.mat @@ -107,7 +107,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.88 + - _Smoothness: 0.95 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 0 - _SrcBlend: 5 @@ -117,10 +117,10 @@ Material: - _WorkflowMode: 0 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 0.12941177} - - _Color: {r: 1, g: 1, b: 1, a: 0.12941177} + - _BaseColor: {r: 1, g: 1, b: 1, a: 0.24705882} + - _Color: {r: 1, g: 1, b: 1, a: 0.24705882} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.46417764, g: 0.5087151, b: 0.5754717, a: 1} + - _SpecColor: {r: 0.6037736, g: 0.57119745, b: 0.54909223, a: 1} m_BuildTextureStacks: [] --- !u!114 &5070175455685360862 MonoBehaviour: diff --git a/Assets/犬导尿术/Materials/M_GuiZi.mat b/Assets/犬导尿术/Materials/M_GuiZi.mat index 8281d75..132b6c1 100644 --- a/Assets/犬导尿术/Materials/M_GuiZi.mat +++ b/Assets/犬导尿术/Materials/M_GuiZi.mat @@ -22,7 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_GuiZi m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - _OCCLUSIONMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -35,7 +36,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: fd90738bbe04c8648bba0aee5bda10d5, type: 3} + m_Texture: {fileID: 2800000, guid: e2999178a0dc7b64998bf0a359d429e9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -59,7 +60,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e2999178a0dc7b64998bf0a359d429e9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -67,7 +68,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 2800000, guid: 0ada48ac44bb5ac4cb05c839544acb25, type: 3} + m_Texture: {fileID: 2800000, guid: 394f8421ba140e942aed75c134e030bb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: @@ -109,13 +110,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Metallic: 0.6 + - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 0.2 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.3 + - _Smoothness: 0.65 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/犬导尿术/Materials/M_baiseshuliao.mat b/Assets/犬导尿术/Materials/M_baiseshuliao.mat index 5365189..fcd6b20 100644 --- a/Assets/犬导尿术/Materials/M_baiseshuliao.mat +++ b/Assets/犬导尿术/Materials/M_baiseshuliao.mat @@ -9,8 +9,6 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_baiseshuliao m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _NORMALMAP - _OCCLUSIONMAP @@ -22,7 +20,6 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -107,7 +104,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.355 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/犬导尿术/Materials/M_guizi_jinshu.mat b/Assets/犬导尿术/Materials/M_guizi_jinshu.mat index 89d5d90..29b5ba3 100644 --- a/Assets/犬导尿术/Materials/M_guizi_jinshu.mat +++ b/Assets/犬导尿术/Materials/M_guizi_jinshu.mat @@ -9,12 +9,9 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_guizi_jinshu m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _NORMALMAP - _OCCLUSIONMAP - - _SPECULAR_SETUP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -23,7 +20,6 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -102,24 +98,24 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Metallic: 0.4 + - _Metallic: 0.7 - _Mode: 0 - - _OcclusionStrength: 0.2 + - _OcclusionStrength: 0.1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.75 + - _Smoothness: 0.8 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - - _WorkflowMode: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.7264151, g: 0.7264151, b: 0.7264151, a: 1} - - _Color: {r: 0.7264151, g: 0.7264151, b: 0.7264151, 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.7169812, g: 0.7169812, b: 0.7169812, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/犬导尿术/Materials/M_longzi.mat b/Assets/犬导尿术/Materials/M_longzi.mat index 4313ee2..8cb31cb 100644 --- a/Assets/犬导尿术/Materials/M_longzi.mat +++ b/Assets/犬导尿术/Materials/M_longzi.mat @@ -9,8 +9,6 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_longzi m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _NORMALMAP - _OCCLUSIONMAP @@ -22,7 +20,6 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -101,13 +98,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.4472136 - _GlossyReflections: 1 - - _Metallic: 0.6 + - _Metallic: 0.8 - _Mode: 0 - _OcclusionStrength: 0.1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.7 + - _Smoothness: 0.75 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/犬导尿术/Materials/M_pingmu.mat b/Assets/犬导尿术/Materials/M_pingmu.mat index 162ec28..8bb4e3f 100644 --- a/Assets/犬导尿术/Materials/M_pingmu.mat +++ b/Assets/犬导尿术/Materials/M_pingmu.mat @@ -22,8 +22,6 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_pingmu m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _NORMALMAP - _OCCLUSIONMAP @@ -35,7 +33,6 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -114,7 +111,7 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.4472136 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 1 - _Mode: 0 - _OcclusionStrength: 0 - _Parallax: 0.02 diff --git a/Assets/犬导尿术/Materials/M_zhiliaotai.mat b/Assets/犬导尿术/Materials/M_zhiliaotai.mat index 25551c2..093b9f1 100644 --- a/Assets/犬导尿术/Materials/M_zhiliaotai.mat +++ b/Assets/犬导尿术/Materials/M_zhiliaotai.mat @@ -9,12 +9,9 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_zhiliaotai m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _NORMALMAP - _OCCLUSIONMAP - - _SPECULAR_SETUP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -23,7 +20,6 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -102,26 +98,26 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.4472136 - _GlossyReflections: 1 - - _Metallic: 0.6 + - _Metallic: 0.8 - _Mode: 0 - _OcclusionStrength: 0.1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.75 + - _Smoothness: 0.8 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - - _WorkflowMode: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 1} - - _Color: {r: 0.5660378, g: 0.5660378, b: 0.5660378, 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.7735849, g: 0.7735849, b: 0.7735849, a: 1} + - _SpecColor: {r: 0.6792453, g: 0.6792453, b: 0.6792453, a: 1} m_BuildTextureStacks: [] --- !u!114 &7488472699714210220 MonoBehaviour: diff --git a/Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_dir.png b/Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_dir.png deleted file mode 100644 index 766f5ad..0000000 Binary files a/Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_dir.png and /dev/null differ diff --git a/Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_light.exr b/Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_light.exr deleted file mode 100644 index 2ad6709..0000000 Binary files a/Assets/犬导尿术/daoNiaoShu/Lightmap-0_comp_light.exr and /dev/null differ diff --git a/Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_dir.png b/Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_dir.png deleted file mode 100644 index d40b226..0000000 Binary files a/Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_dir.png and /dev/null differ diff --git a/Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_light.exr b/Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_light.exr deleted file mode 100644 index 3591546..0000000 Binary files a/Assets/犬导尿术/daoNiaoShu/Lightmap-1_comp_light.exr and /dev/null differ diff --git a/Assets/犬导尿术/daoNiaoShu/ReflectionProbe-0.exr b/Assets/犬导尿术/daoNiaoShu/ReflectionProbe-0.exr deleted file mode 100644 index 9d30fa6..0000000 Binary files a/Assets/犬导尿术/daoNiaoShu/ReflectionProbe-0.exr and /dev/null differ diff --git a/Assets/犬导尿术/daoNiaoShu/ReflectionProbe-1.exr b/Assets/犬导尿术/daoNiaoShu/ReflectionProbe-1.exr deleted file mode 100644 index 969005f..0000000 Binary files a/Assets/犬导尿术/daoNiaoShu/ReflectionProbe-1.exr and /dev/null differ diff --git a/Assets/犬导尿术/daoNiaoShu/SampleSceneProfile 1.asset b/Assets/犬导尿术/daoNiaoShu/SampleSceneProfile 1.asset index 09ac0fd..f5a0787 100644 --- a/Assets/犬导尿术/daoNiaoShu/SampleSceneProfile 1.asset +++ b/Assets/犬导尿术/daoNiaoShu/SampleSceneProfile 1.asset @@ -13,9 +13,6 @@ MonoBehaviour: m_Name: Bloom m_EditorClassIdentifier: active: 1 - skipIterations: - m_OverrideState: 0 - m_Value: 1 threshold: m_OverrideState: 1 m_Value: 1 @@ -34,12 +31,9 @@ MonoBehaviour: highQualityFiltering: m_OverrideState: 0 m_Value: 0 - downscale: + skipIterations: m_OverrideState: 0 - m_Value: 0 - maxIterations: - m_OverrideState: 0 - m_Value: 6 + m_Value: 1 dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} @@ -90,7 +84,7 @@ MonoBehaviour: active: 1 postExposure: m_OverrideState: 1 - m_Value: 1.1 + m_Value: 0.7 contrast: m_OverrideState: 1 m_Value: 15 @@ -136,27 +130,3 @@ MonoBehaviour: mode: m_OverrideState: 1 m_Value: 2 - neutralHDRRangeReductionMode: - m_OverrideState: 0 - m_Value: 2 - acesPreset: - m_OverrideState: 0 - m_Value: 3 - hueShiftAmount: - m_OverrideState: 0 - m_Value: 0 - detectPaperWhite: - m_OverrideState: 0 - m_Value: 0 - paperWhite: - m_OverrideState: 0 - m_Value: 300 - detectBrightnessLimits: - m_OverrideState: 0 - m_Value: 1 - minNits: - m_OverrideState: 0 - m_Value: 0.005 - maxNits: - m_OverrideState: 0 - m_Value: 1000 diff --git a/Assets/犬导尿术/狗/Materials/pasted__lambert2.mat b/Assets/犬导尿术/狗/Materials/pasted__lambert2.mat index 00a27ed..96b819f 100644 --- a/Assets/犬导尿术/狗/Materials/pasted__lambert2.mat +++ b/Assets/犬导尿术/狗/Materials/pasted__lambert2.mat @@ -22,8 +22,6 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: pasted__lambert2 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -33,7 +31,6 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -128,8 +125,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} - - _Color: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} + - _BaseColor: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} + - _Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, 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: []