diff --git a/GQ_TongXin/Assets/Model/Materials/dz TM.mat b/GQ_TongXin/Assets/Model/Materials/dz TM.mat new file mode 100644 index 000000000..5a59ef857 --- /dev/null +++ b/GQ_TongXin/Assets/Model/Materials/dz TM.mat @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: dz TM + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.505 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0.026032398, g: 0.07933395, b: 0.122641504, a: 0.44705883} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/GQ_TongXin/Assets/Model/Materials/dz TM.mat.meta b/GQ_TongXin/Assets/Model/Materials/dz TM.mat.meta new file mode 100644 index 000000000..e85275886 --- /dev/null +++ b/GQ_TongXin/Assets/Model/Materials/dz TM.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36ed440d6cf3174418e0d6810856e1cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Model/Materials/dz2.mat b/GQ_TongXin/Assets/Model/Materials/dz2.mat new file mode 100644 index 000000000..6a9e7d82a --- /dev/null +++ b/GQ_TongXin/Assets/Model/Materials/dz2.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: dz2 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.076317206, g: 0.3301887, b: 0.23129681, a: 0.5019608} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/GQ_TongXin/Assets/Model/Materials/dz2.mat.meta b/GQ_TongXin/Assets/Model/Materials/dz2.mat.meta new file mode 100644 index 000000000..40c7e0861 --- /dev/null +++ b/GQ_TongXin/Assets/Model/Materials/dz2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 45214b109c739e849bc470f699f6987a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Model/Materials/gq_142.mat b/GQ_TongXin/Assets/Model/Materials/gq_142.mat index 35fd8173a..90903b2c7 100644 --- a/GQ_TongXin/Assets/Model/Materials/gq_142.mat +++ b/GQ_TongXin/Assets/Model/Materials/gq_142.mat @@ -9,9 +9,10 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: gq_142 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -76,5 +77,5 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1.3584905, g: 1.3584905, b: 1.3584905, a: 1} m_BuildTextureStacks: [] diff --git a/GQ_TongXin/Assets/Packages/PostProcessing/Profile/New Post-Processing Profile.asset b/GQ_TongXin/Assets/Packages/PostProcessing/Profile/New Post-Processing Profile.asset index db822f07b..2ee60bcfe 100644 --- a/GQ_TongXin/Assets/Packages/PostProcessing/Profile/New Post-Processing Profile.asset +++ b/GQ_TongXin/Assets/Packages/PostProcessing/Profile/New Post-Processing Profile.asset @@ -121,7 +121,7 @@ MonoBehaviour: neutralWhiteLevel: 6.35 neutralWhiteClip: 10 basic: - postExposure: 0.5 + postExposure: 0.6 temperature: 5 tint: 0 hueShift: 0 @@ -133,15 +133,15 @@ MonoBehaviour: blue: {x: 0, y: 0, z: 1} currentEditingChannel: 2 colorWheels: - mode: 1 + mode: 0 log: slope: {r: 0.91053843, g: 0.9263453, b: 1, a: 0} power: {r: 0.8758687, g: 0.9337855, b: 1, a: 0} offset: {r: 0.91736645, g: 0.9869679, b: 1, a: 0} linear: - lift: {r: 0, g: 0, b: 0, a: 0} - gamma: {r: 0, g: 0, b: 0, a: 0} - gain: {r: 0, g: 0, b: 0, a: 0} + lift: {r: 1, g: 1, b: 1, a: 0} + gamma: {r: 1, g: 1, b: 1, a: 0} + gain: {r: 1, g: 1, b: 1, a: -0.31578946} curves: master: curve: @@ -318,7 +318,7 @@ MonoBehaviour: size: 1 luminanceContribution: 0.431 vignette: - m_Enabled: 1 + m_Enabled: 0 m_Settings: mode: 0 color: {r: 0.4056604, g: 0.4056604, b: 0.4056604, a: 1} diff --git a/GQ_TongXin/Assets/Resources/emission.mat b/GQ_TongXin/Assets/Resources/emission.mat index 25c938a8a..a7bcb44f8 100644 --- a/GQ_TongXin/Assets/Resources/emission.mat +++ b/GQ_TongXin/Assets/Resources/emission.mat @@ -116,7 +116,7 @@ Material: m_Colors: - _BaseColor: {r: 0, g: 0.74509805, b: 1, a: 1} - _Color: {r: 0, g: 0.74509805, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 1.1353015, b: 1.1353015, a: 1} + - _EmissionColor: {r: 0, g: 4.237095, b: 4.237095, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] --- !u!114 &4586313418104410923 diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG.meta b/GQ_TongXin/Assets/Scenes/SampleSceneG.meta new file mode 100644 index 000000000..4fcac90d0 --- /dev/null +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1fc3a553b2b77544a303d70a33b4b7c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity index 5fe42eaa7..1065899d7 100644 --- a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: 7df174532dd61e74d92dbd23bf7740b0, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: 50824fd541b252444aa9c34e1eb9da6f, type: 2} m_LightingSettings: {fileID: 4890085278179872738, guid: 780a9f934420a1b4fb1b1fa2691b50d9, type: 2} --- !u!196 &4 NavMeshSettings: @@ -584,6 +584,100 @@ Transform: m_CorrespondingSourceObject: {fileID: 4107568379614548323, guid: c8f09218a803c944e84c2336104ca2f9, type: 3} m_PrefabInstance: {fileID: 5868017143503836929} m_PrefabAsset: {fileID: 0} +--- !u!1 &58378711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 58378713} + - component: {fileID: 58378712} + m_Layer: 0 + m_Name: Area Light (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &58378712 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58378711} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 3 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1.6 + m_Range: 10 + 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: 9.269749, y: 7.878688} + m_BounceIntensity: 1 + 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!4 &58378713 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58378711} + m_LocalRotation: {x: 0.70710677, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -4.11, y: 5.41, z: -10.88} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 29 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &61400303 GameObject: m_ObjectHideFlags: 0 @@ -800,7 +894,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &137188656 MonoBehaviour: @@ -955,7 +1049,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &140293605 MonoBehaviour: @@ -1966,7 +2060,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &219085156 MonoBehaviour: @@ -2980,7 +3074,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 442675217} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1.71, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2998,7 +3092,7 @@ Light: serializedVersion: 10 m_Type: 2 m_Shape: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9716981, g: 0.9716981, b: 0.9716981, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -3187,7 +3281,7 @@ Transform: - {fileID: 284282834} - {fileID: 1512339843} m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &479205360 GameObject: @@ -3436,7 +3530,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 526364719} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -1.874, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3950,7 +4044,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &698734397 stripped GameObject: @@ -3978,7 +4072,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!108 &705507994 Light: m_ObjectHideFlags: 0 @@ -3991,7 +4085,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 0.8392157, g: 0.93369895, b: 1, a: 1} - m_Intensity: 0.6 + m_Intensity: 0 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -4289,7 +4383,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 739026628} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -1.874, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4439,7 +4533,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 743945423} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -5.7199993, y: 0, z: 0} + m_LocalPosition: {x: -5.7199993, y: 1.71, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4457,7 +4551,7 @@ Light: serializedVersion: 10 m_Type: 2 m_Shape: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9716981, g: 0.9716981, b: 0.9716981, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -4704,7 +4798,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &749989404 MonoBehaviour: @@ -4972,7 +5066,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 844162939} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -1.874, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5186,6 +5280,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 469675410} m_Modifications: + - target: {fileID: 702178166669631502, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 798665752983835385, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: 976c7daa296d8504f860eb6e48b72f56, type: 2} - target: {fileID: 2328099279807547259, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} propertyPath: m_RootOrder value: 3 @@ -5230,10 +5332,42 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2369135805684391221, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 2369135805684391221, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2647823816270787252, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 3099815032951004609, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} propertyPath: m_Name value: "\u673A\u623F\u548C\u84C4\u7535\u6C60\u5BA4" objectReference: {fileID: 0} + - target: {fileID: 7383837988224834467, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8055017360464373780, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8927896662121550122, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 8927896662121550122, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9005732509895341915, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} --- !u!1 &875165849 @@ -5265,7 +5399,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &895883879 stripped GameObject: @@ -5873,7 +6007,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1036835678 MonoBehaviour: @@ -6137,7 +6271,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1056840580 MonoBehaviour: @@ -6800,7 +6934,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1168592495 GameObject: @@ -6928,7 +7062,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1171060990 stripped GameObject: @@ -7506,6 +7640,104 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1367694155} m_CullTransparentMesh: 1 +--- !u!1 &1399501713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1399501717} + - component: {fileID: 1399501716} + - component: {fileID: 1399501715} + - component: {fileID: 1399501714} + m_Layer: 0 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1399501714 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399501713} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1399501715 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399501713} + 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: 45214b109c739e849bc470f699f6987a, 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 &1399501716 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399501713} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1399501717 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399501713} + m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: -0.7071066} + m_LocalPosition: {x: 4.6491, y: -0.118, z: -10.818} + m_LocalScale: {x: 27.716673, y: 8.892455, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 89.98, y: 0, z: 0} --- !u!4 &1405300902 stripped Transform: m_CorrespondingSourceObject: {fileID: 682980093, guid: 23e8bd7687024594392e2d3e244e6b98, type: 3} @@ -7650,7 +7882,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1443979131} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -23.278, y: -0.00399971, z: -2.8530006} + m_LocalPosition: {x: -21.13, y: 1.7060003, z: -2.03} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7668,7 +7900,7 @@ Light: serializedVersion: 10 m_Type: 2 m_Shape: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9716981, g: 0.9716981, b: 0.9716981, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -7753,7 +7985,7 @@ Transform: - {fileID: 743945424} - {fileID: 442675218} m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1500915739 GameObject: @@ -7877,7 +8109,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509728144} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -16.351, y: -0, z: 2.797} + m_LocalPosition: {x: -21.13, y: 1.71, z: 2.46} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7895,7 +8127,7 @@ Light: serializedVersion: 10 m_Type: 2 m_Shape: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9716981, g: 0.9716981, b: 0.9716981, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -8393,7 +8625,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1539081136 GameObject: @@ -8986,7 +9218,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1657098623} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -1.874, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9318,7 +9550,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1706230386 MonoBehaviour: @@ -9767,7 +9999,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1770992398} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -1.874, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -10925,7 +11157,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1859118122 MonoBehaviour: @@ -11187,7 +11419,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1877492179 MonoBehaviour: @@ -12390,7 +12622,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2001446124 stripped GameObject: @@ -12427,7 +12659,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2017627543} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -12.530001, y: 0, z: 0} + m_LocalPosition: {x: -11.72, y: 1.71, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -12445,7 +12677,7 @@ Light: serializedVersion: 10 m_Type: 2 m_Shape: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9716981, g: 0.9716981, b: 0.9716981, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -12496,6 +12728,100 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &2020136225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2020136227} + - component: {fileID: 2020136226} + m_Layer: 0 + m_Name: Area Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &2020136226 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020136225} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 3 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1.6 + m_Range: 10 + 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: 17.014904, y: 7.878688} + m_BounceIntensity: 1 + 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!4 &2020136227 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020136225} + m_LocalRotation: {x: 0.70710677, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 9.59, y: 5.41, z: -10.88} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 25 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &2043277469 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4229042777791998016, guid: c8f09218a803c944e84c2336104ca2f9, type: 3} @@ -12763,7 +13089,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2098930745 MonoBehaviour: @@ -95559,7 +95885,7 @@ Transform: - {fileID: 1332666220984907239} - {fileID: 4362348816139420719} m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4362348816935953891 GameObject: @@ -107570,7 +107896,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &6550617821253441484 MeshRenderer: diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/LightingData.asset b/GQ_TongXin/Assets/Scenes/SampleSceneG/LightingData.asset new file mode 100644 index 000000000..a477c6e32 Binary files /dev/null and b/GQ_TongXin/Assets/Scenes/SampleSceneG/LightingData.asset differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/LightingData.asset.meta b/GQ_TongXin/Assets/Scenes/SampleSceneG/LightingData.asset.meta new file mode 100644 index 000000000..c88a4c9c2 --- /dev/null +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50824fd541b252444aa9c34e1eb9da6f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png new file mode 100644 index 000000000..5c4de367f Binary files /dev/null and b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png.meta b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png.meta new file mode 100644 index 000000000..30e4fe54c --- /dev/null +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: b7fdf0696e1cb9941b7f453fa820e88a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 12 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_light.exr b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_light.exr new file mode 100644 index 000000000..64fa038e2 Binary files /dev/null and b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_light.exr differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_light.exr.meta b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_light.exr.meta new file mode 100644 index 000000000..130a3acf2 --- /dev/null +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_light.exr.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: f4cf148a664040a41b1fadb22cfc0ad0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png new file mode 100644 index 000000000..199d9ed97 Binary files /dev/null and b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png.meta b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png.meta new file mode 100644 index 000000000..ea1a0f8d8 --- /dev/null +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 164a10852d9345947a689f5daa4a4c47 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 12 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_light.exr b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_light.exr new file mode 100644 index 000000000..4412c0012 Binary files /dev/null and b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_light.exr differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_light.exr.meta b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_light.exr.meta new file mode 100644 index 000000000..f21e15292 --- /dev/null +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_light.exr.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 9fe213f52eae7124aaac05bbf1ce4c0f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_dir.png b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_dir.png new file mode 100644 index 000000000..75df4526e Binary files /dev/null and b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_dir.png differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_dir.png.meta b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_dir.png.meta new file mode 100644 index 000000000..0d70affad --- /dev/null +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_dir.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: cbd595bc21744c2488613c6be0c6a874 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 12 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_light.exr b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_light.exr new file mode 100644 index 000000000..43244461f Binary files /dev/null and b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_light.exr differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_light.exr.meta b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_light.exr.meta new file mode 100644 index 000000000..c59f662b6 --- /dev/null +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-2_comp_light.exr.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 2024bf56d05c95142b733da4b31ebc3c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-0.exr b/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-0.exr new file mode 100644 index 000000000..0c99f2a77 Binary files /dev/null and b/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-0.exr differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-0.exr.meta b/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-0.exr.meta new file mode 100644 index 000000000..283c417c5 --- /dev/null +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-0.exr.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 350962e3c46cb994d83c6460c7f3afdc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/Assets/Scenes/test.unity b/GQ_TongXin/Assets/Scenes/test.unity new file mode 100644 index 000000000..d40df303b --- /dev/null +++ b/GQ_TongXin/Assets/Scenes/test.unity @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} diff --git a/GQ_TongXin/Assets/Scenes/test.unity.meta b/GQ_TongXin/Assets/Scenes/test.unity.meta new file mode 100644 index 000000000..c3eb63e21 --- /dev/null +++ b/GQ_TongXin/Assets/Scenes/test.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 63a9fcbdb179bd04cb2bf4c28e69c524 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_TongXin/ProjectSettings/TagManager.asset b/GQ_TongXin/ProjectSettings/TagManager.asset index e141940cb..6681f9354 100644 --- a/GQ_TongXin/ProjectSettings/TagManager.asset +++ b/GQ_TongXin/ProjectSettings/TagManager.asset @@ -19,7 +19,7 @@ TagManager: - "\u706F" - "U\u4F4D" - "\u7AEF\u53E3" - - + - "\u623F\u95F4\u9876\u90E8" - - -