diff --git a/GQ_URP/GQ/Assets/Resources/emission.mat b/GQ_URP/GQ/Assets/Resources/emission.mat index cd3ab34ff..e293b2117 100644 --- a/GQ_URP/GQ/Assets/Resources/emission.mat +++ b/GQ_URP/GQ/Assets/Resources/emission.mat @@ -8,11 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: emission - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} m_ValidKeywords: - - _NORMALMAP + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 6 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -23,11 +23,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 5d1e403ec32411148b5be46975b16836, type: 3} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: 489ce2ae134015c4abd28e453cf24ca3, type: 3} + m_Scale: {x: 2.44, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 2800000, guid: 1e4acd4b855768e4580e1573e3cd3cf7, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -47,8 +47,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 5d1e403ec32411148b5be46975b16836, type: 3} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: 489ce2ae134015c4abd28e453cf24ca3, type: 3} + m_Scale: {x: 2.44, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -82,6 +82,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 3 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -94,6 +95,7 @@ Material: - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 + - _GlossinessSource: 0 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -101,8 +103,12 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0 - _Smoothness: 0 + - _SmoothnessSource: 0 - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _Stencil: 0 @@ -117,7 +123,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.6037736, g: 0.5945529, b: 0.05980776, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] --- !u!114 &4586313418104410923 diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity index 3eed8f040..7c36d5525 100644 --- a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity @@ -19263,8 +19263,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 59510595} m_HandleRect: {fileID: 59510594} m_Direction: 2 - m_Value: -0.051282052 - m_Size: 0.99999195 + m_Value: -0.008403362 + m_Size: 0.99999183 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -20470,7 +20470,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -5.315857, y: 0.0038296916} + m_AnchoredPosition: {x: 0.0625, y: 0.003611418} m_SizeDelta: {x: 318.95, y: 443.74} m_Pivot: {x: 0.5, y: 1} --- !u!114 &413199003 @@ -50177,7 +50177,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 162051362} m_HandleRect: {fileID: 162051361} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -83445,7 +83445,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1327205619} m_HandleRect: {fileID: 1327205618} m_Direction: 0 - m_Value: 1935.95 + m_Value: -22.255556 m_Size: 0.9999914 m_NumberOfSteps: 0 m_OnValueChanged: @@ -148985,7 +148985,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -52.999207, y: 445} + m_AnchoredPosition: {x: -52.999084, y: 445} m_SizeDelta: {x: -1303.1125, y: -1040} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1332666221008315399 @@ -190614,7 +190614,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2126159576946552610 RectTransform: m_ObjectHideFlags: 0 diff --git a/GQ_URP/GQ/Assets/UI/Line2.jpg b/GQ_URP/GQ/Assets/UI/Line2.jpg new file mode 100644 index 000000000..f59f029df Binary files /dev/null and b/GQ_URP/GQ/Assets/UI/Line2.jpg differ diff --git a/GQ_URP/GQ/Assets/UI/Line2.jpg.meta b/GQ_URP/GQ/Assets/UI/Line2.jpg.meta new file mode 100644 index 000000000..d08d295d2 --- /dev/null +++ b/GQ_URP/GQ/Assets/UI/Line2.jpg.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 489ce2ae134015c4abd28e453cf24ca3 +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: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: