diff --git a/AxibugEmuOnline.Client/Assets/Resources/Materials/XMBBackGround.mat b/AxibugEmuOnline.Client/Assets/Resources/Materials/XMBBackGround.mat index f4174e54..3fb13d4f 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/Materials/XMBBackGround.mat +++ b/AxibugEmuOnline.Client/Assets/Resources/Materials/XMBBackGround.mat @@ -2,20 +2,24 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: XMBBackGround m_Shader: {fileID: 4800000, guid: e14054c41729e9b4cb671e3dde0e7df0, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -23,10 +27,12 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _ColorMask: 15 - _Frequency1: 2 - _Frequency2: 2.1 + - _Gamma: 0.6 - _MaxHeight1: 0.5 - _MaxHeight2: 0.54 - _MidHeight1: 0.4 @@ -51,3 +57,4 @@ Material: - _Color1: {r: 0, g: 0.4, b: 1, a: 1} - _Color2: {r: 0, g: 0.69803923, b: 1, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/AxibugEmuOnline.Client/Assets/Resources/Materials/XMBBackGroundPreview.mat b/AxibugEmuOnline.Client/Assets/Resources/Materials/XMBBackGroundPreview.mat index 4579367f..a414afb8 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/Materials/XMBBackGroundPreview.mat +++ b/AxibugEmuOnline.Client/Assets/Resources/Materials/XMBBackGroundPreview.mat @@ -2,20 +2,24 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: XMBBackGroundPreview - m_Shader: {fileID: 4800000, guid: 424d88aff12857f4aab1911fdb6e02e9, type: 3} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: e14054c41729e9b4cb671e3dde0e7df0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -23,10 +27,12 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _ColorMask: 15 - _Frequency1: 2 - _Frequency2: 2.1 + - _Gamma: 0.6 - _MaxHeight1: 0.5 - _MaxHeight2: 0.54 - _MidHeight1: 0.4 @@ -51,3 +57,4 @@ Material: - _Color1: {r: 0, g: 0.4, b: 1, a: 1} - _Color2: {r: 0, g: 0.69803923, b: 1, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/XMBBackGround.shader b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/XMBBackGround.shader index 3c5de6f2..8491a00d 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/XMBBackGround.shader +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/XMBBackGround.shader @@ -32,6 +32,8 @@ _Power2("Power",Float)=50.0 _Frequency2("Frequency",Float)=2.1 _Speed2("Speed",Float)=0.3 + + _Gamma("GAMMA",float) = 2.2 } SubShader @@ -152,6 +154,8 @@ float _Frequency2; float _Speed2; + float _Gamma; + fixed4 frag(v2f IN) : SV_Target { float2 uv= IN.texcoord; @@ -196,6 +200,8 @@ clip (fragColor.a - 0.001); #endif + fragColor = pow(fragColor,1/_Gamma); + return fragColor; } diff --git a/AxibugEmuOnline.Client/ProjectSettings/ProjectSettings.asset b/AxibugEmuOnline.Client/ProjectSettings/ProjectSettings.asset index 799f3ae3..1a1165fd 100644 --- a/AxibugEmuOnline.Client/ProjectSettings/ProjectSettings.asset +++ b/AxibugEmuOnline.Client/ProjectSettings/ProjectSettings.asset @@ -47,7 +47,7 @@ PlayerSettings: defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 - m_ActiveColorSpace: 0 + m_ActiveColorSpace: 1 unsupportedMSAAFallback: 0 m_SpriteBatchMaxVertexCount: 65535 m_SpriteBatchVertexThreshold: 300