diff --git a/Assets/Scenes/Start.unity b/Assets/Scenes/Start.unity index 68fc4d6..e5e0155 100644 --- a/Assets/Scenes/Start.unity +++ b/Assets/Scenes/Start.unity @@ -806,8 +806,8 @@ ParticleSystemRenderer: m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 - m_VertexStreams: 00010304 + m_UseCustomVertexStreams: 1 + m_VertexStreams: 000103041f m_UseCustomTrailVertexStreams: 0 m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} @@ -827,7 +827,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1446505801} serializedVersion: 8 - lengthInSec: 5 + lengthInSec: 1.2 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -902,7 +902,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 5 + scalar: 2 minScalar: 5 maxCurve: serializedVersion: 2 @@ -5031,8 +5031,8 @@ ParticleSystem: m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: - enabled: 0 - mode0: 0 + enabled: 1 + mode0: 1 vectorComponentCount0: 4 color0: serializedVersion: 2 @@ -5102,8 +5102,8 @@ ParticleSystem: colorLabel0: Color vector0_0: serializedVersion: 2 - minMaxState: 0 - scalar: 0 + minMaxState: 1 + scalar: 1 minScalar: 0 maxCurve: serializedVersion: 2 @@ -5111,18 +5111,18 @@ ParticleSystem: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 + inSlope: 35.363636 + outSlope: 1 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0 outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0 - inSlope: 0 + value: 1 + inSlope: 1 outSlope: 0 - tangentMode: 0 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 diff --git a/Assets/Shaders/Editor/UIMaskDrawers.cs b/Assets/Shaders/Editor/UIMaskDrawers.cs index b7805ae..db7194a 100644 --- a/Assets/Shaders/Editor/UIMaskDrawers.cs +++ b/Assets/Shaders/Editor/UIMaskDrawers.cs @@ -99,3 +99,105 @@ public class UIMaskChannel : UIMaskEnumDrawer // 下拉框的值本身就是要采样的通道号，无需同步到别的属性 } } + +// 通用模块：粒子自定义数据通道下拉框（shader 里写 [CustomDataChannel]） +// 选项 9 项：null / Custom1.xyzw / Custom2.xyzw；值 0=null，1~4=Custom1，5~8=Custom2 +// 右侧会提示该通道是否已被同一材质上的其它参数占用 +//（约定：属性名里含 "CustomChannel" 的都会被统计，以后新增参数只要按这个命名即可自动纳入） +// shader 侧配套函数：CustomDataChannelValue(custom1, custom2, channel) → 取对应通道的值 +public class CustomDataChannel : MaterialPropertyDrawer +{ + private static readonly string[] Items = + { + "null", + "Custom1.x", "Custom1.y", "Custom1.z", "Custom1.w", + "Custom2.x", "Custom2.y", "Custom2.z", "Custom2.w" + }; + + private const float HintWidth = 150f; + + public override float GetPropertyHeight(MaterialProperty prop, string label, MaterialEditor editor) + { + return EditorGUIUtility.singleLineHeight; + } + + public override void OnGUI(Rect position, MaterialProperty prop, string label, MaterialEditor editor) + { + Rect popupRect = new Rect(position.x, position.y, Mathf.Max(60f, position.width - HintWidth - 4f), position.height); + Rect hintRect = new Rect(position.xMax - HintWidth, position.y, HintWidth, position.height); + + int index = Mathf.Clamp(Mathf.RoundToInt(prop.floatValue), 0, Items.Length - 1); + + EditorGUI.BeginChangeCheck(); + EditorGUI.showMixedValue = prop.hasMixedValue; + index = EditorGUI.Popup(popupRect, label, index, Items); + EditorGUI.showMixedValue = false; + if (EditorGUI.EndChangeCheck()) + { + prop.floatValue = index; + } + + bool occupied; + string hint = DescribeOccupation(editor, prop, index, out occupied); + var hintContent = new GUIContent(hint, "数据来自粒子系统的「自定义数据」模块；" + + "还需要在粒子渲染器的「自定义顶点流」里按 UV、Custom1.xyzw、Custom2.xyzw 的顺序勾选对应通道。"); + + Color oldColor = GUI.color; + if (index == 0) + { + GUI.color = new Color(0.7f, 0.7f, 0.7f); + } + else + { + GUI.color = occupied ? new Color(1f, 0.72f, 0.25f) : new Color(0.55f, 0.85f, 0.55f); + } + EditorGUI.LabelField(hintRect, hintContent, EditorStyles.miniLabel); + GUI.color = oldColor; + } + + private static string DescribeOccupation(MaterialEditor editor, MaterialProperty prop, int index, out bool occupied) + { + occupied = false; + + if (index == 0) + { + return "未使用"; + } + + var material = editor.targets.Length > 0 ? editor.targets[0] as Material : null; + if (material == null) + { + return string.Empty; + } + + Shader shader = material.shader; + int count = ShaderUtil.GetPropertyCount(shader); + var owners = new System.Collections.Generic.List(); + + for (int i = 0; i < count; i++) + { + string name = ShaderUtil.GetPropertyName(shader, i); + if (name == prop.name || !name.Contains("CustomChannel")) + { + continue; + } + if (!material.HasProperty(name) || Mathf.RoundToInt(material.GetFloat(name)) != index) + { + continue; + } + + string description = ShaderUtil.GetPropertyDescription(shader, i); + owners.Add(string.IsNullOrEmpty(description) ? name : description); + } + + if (owners.Count == 0) + { + return "未占用"; + } + + occupied = true; + return owners.Count == 1 + ? "已被 " + owners[0] + " 占用" + : "已被 " + owners[0] + " 等 " + owners.Count + " 处占用"; + } +} diff --git a/Assets/Shaders/Editor/UIMaskShaderGUI.cs b/Assets/Shaders/Editor/UIMaskShaderGUI.cs index c8b2d65..8e676da 100644 --- a/Assets/Shaders/Editor/UIMaskShaderGUI.cs +++ b/Assets/Shaders/Editor/UIMaskShaderGUI.cs @@ -55,6 +55,7 @@ public class UIMaskShaderGUI : ShaderGUI "_DissolveChannel", "_Dissolve", "_DissolveWidth", + "_DissolveCustomChannel", "_DissolveEdgeColor", "_DissolveEdgeSharpness", "_DissolveHighlightColor", diff --git a/Assets/Shaders/VFX.shader b/Assets/Shaders/VFX.shader index 881a5fe..f87bddd 100644 --- a/Assets/Shaders/VFX.shader +++ b/Assets/Shaders/VFX.shader @@ -38,6 +38,7 @@ Properties { [UIMaskChannel] _DissolveChannel("通道", Float) = 3 _Dissolve ("溶解进度", Range(0, 1.01)) = 0 _DissolveWidth ("溶解宽度", Range(0, 1)) = 0 + [CustomDataChannel] _DissolveCustomChannel ("自定义数据通道", Float) = 0 // 默认黑色 = 不叠加任何颜色，保证新参数不影响原有溶解效果 [HDR]_DissolveEdgeColor ("溶解边缘颜色", Color) = (0, 0, 0, 1) _DissolveEdgeSharpness ("边缘锐度 (越大越细)", Range(0.001, 8)) = 2 @@ -130,6 +131,7 @@ Category { float _DissolveChannel; fixed _Dissolve; fixed _DissolveWidth; + float _DissolveCustomChannel; fixed4 _DissolveEdgeColor; fixed _DissolveEdgeSharpness; fixed4 _DissolveHighlightColor; @@ -144,6 +146,15 @@ Category { return dot(c, w); } + // 通用模块：按通道号取粒子自定义数据（供"自定义数据通道"下拉框使用） + // channel: 0 = null（返回 0），1~4 = Custom1.xyzw，5~8 = Custom2.xyzw + inline float CustomDataChannelValue(float4 custom1, float4 custom2, float channel) + { + float4 w1 = 1.0 - saturate(abs(channel - float4(1.0, 2.0, 3.0, 4.0))); + float4 w2 = 1.0 - saturate(abs(channel - float4(5.0, 6.0, 7.0, 8.0))); + return dot(custom1, w1) + dot(custom2, w2); + } + #if _USEUIMASKCLIP_ON fixed4 _ClipRect; #endif @@ -156,7 +167,10 @@ Category { struct appdata_t { float4 vertex : POSITION; fixed4 color : COLOR; - fixed4 texcoord : TEXCOORD0; + // 顶点流约定（渲染器 → 自定义顶点流，按此顺序）：UV, Custom1.xyzw, Custom2.xyzw + float4 texcoord : TEXCOORD0; // UV.xy + Custom1.xy + float4 texcoord1 : TEXCOORD1; // Custom1.zw + Custom2.xy + float4 texcoord2 : TEXCOORD2; // Custom2.zw UNITY_VERTEX_INPUT_INSTANCE_ID }; @@ -165,6 +179,9 @@ Category { fixed4 color : COLOR; fixed4 texcoord : TEXCOORD0; + float4 customData : TEXCOORD1; // Custom1.xyzw + float4 customData2 : TEXCOORD6; // Custom2.xyzw + #if _USEMASK_ON fixed2 texcoordMask : TEXCOORD2; #endif @@ -202,6 +219,10 @@ Category { o.texcoord.xy = TRANSFORM_TEX(v.texcoord,_MainTex); o.texcoord.zw = v.texcoord.zw; + // 把打包在各 texcoord 里的粒子自定义数据还原成 Custom1.xyzw / Custom2.xyzw + o.customData = float4(v.texcoord.z, v.texcoord.w, v.texcoord1.x, v.texcoord1.y); + o.customData2 = float4(v.texcoord1.z, v.texcoord1.w, v.texcoord2.x, v.texcoord2.y); + #if _USEMASK_ON o.texcoordMask = TRANSFORM_TEX(v.texcoord,_Mask); #endif @@ -250,7 +271,11 @@ Category { #endif #if _USEDISSOLVE_ON - fixed DissolveWithParticle =(_Dissolve*(1-i.texcoord.z)*(1+_DissolveWidth)-_DissolveWidth) ; + // 溶解进度 = 滑条 × 选中的自定义数据通道；通道 = null 时完全用滑条（保持原行为） + fixed customProgress = CustomDataChannelValue(i.customData, i.customData2, _DissolveCustomChannel); + fixed useCustom = step(0.5, _DissolveCustomChannel); + fixed dissolveProgress = _Dissolve * lerp(1.0, customProgress, useCustom); + fixed DissolveWithParticle =(dissolveProgress*(1+_DissolveWidth)-_DissolveWidth) ; fixed dissolveMap = UIMaskSampleChannel(_DissolveTex, i.texcoordDissolve, _DissolveChannel); fixed dissolveAlpha = saturate(smoothstep( DissolveWithParticle, (DissolveWithParticle+_DissolveWidth), dissolveMap)); col.a *= dissolveAlpha; diff --git a/Assets/Shaders/particle.mat b/Assets/Shaders/particle.mat index cc6901a..9818d38 100644 --- a/Assets/Shaders/particle.mat +++ b/Assets/Shaders/particle.mat @@ -47,8 +47,8 @@ Material: m_Offset: {x: 0, y: 0} - _DissolveTex: m_Texture: {fileID: 2800000, guid: 94c4ffff470a043f68f9d388161c3b2a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + m_Scale: {x: 0.5, y: 0.5} + m_Offset: {x: -2.91, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -113,8 +113,10 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _Dissolve: 0.4 + - _Dissolve: 1 - _DissolveChannel: 0 + - _DissolveCustomChannel: 1 + - _DissolveCustomData: 1 - _DissolveEdgeSharpness: 0.001 - _DissolveHighlightWidth: 0.203 - _DissolveWidth: 0.174 diff --git a/Assets/Textures/Square1.png b/Assets/Textures/Square1.png new file mode 100644 index 0000000..2613bf0 Binary files /dev/null and b/Assets/Textures/Square1.png differ diff --git a/Assets/Textures/Square1.png.meta b/Assets/Textures/Square1.png.meta new file mode 100644 index 0000000..330e020 --- /dev/null +++ b/Assets/Textures/Square1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: d9727e1906dfa4caa8302f7d2d99c032 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + 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: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Trail_23.png b/Assets/Textures/Trail_23.png new file mode 100644 index 0000000..f0bb58b Binary files /dev/null and b/Assets/Textures/Trail_23.png differ diff --git a/Assets/Textures/Trail_23.png.meta b/Assets/Textures/Trail_23.png.meta new file mode 100644 index 0000000..ab63d78 --- /dev/null +++ b/Assets/Textures/Trail_23.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: fe467eea04cc142d48966324aecbfa84 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + 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: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/spark_tail_material.png b/Assets/Textures/spark_tail_material.png new file mode 100644 index 0000000..ed2fa8a Binary files /dev/null and b/Assets/Textures/spark_tail_material.png differ diff --git a/Assets/Textures/spark_tail_material.png.meta b/Assets/Textures/spark_tail_material.png.meta new file mode 100644 index 0000000..b369133 --- /dev/null +++ b/Assets/Textures/spark_tail_material.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 9568a99d360954274bc36564e1889835 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + 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: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/spell_lighting_dc.png b/Assets/Textures/spell_lighting_dc.png new file mode 100644 index 0000000..5b88630 Binary files /dev/null and b/Assets/Textures/spell_lighting_dc.png differ diff --git a/Assets/Textures/spell_lighting_dc.png.meta b/Assets/Textures/spell_lighting_dc.png.meta new file mode 100644 index 0000000..fd99480 --- /dev/null +++ b/Assets/Textures/spell_lighting_dc.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 2bfaefa73861d4610817e7bcbd61868e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + 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: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/texture2.png.meta b/Assets/Textures/texture2.png.meta index 574d04a..a0b0454 100644 --- a/Assets/Textures/texture2.png.meta +++ b/Assets/Textures/texture2.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,8 +37,8 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 nPOTScale: 0 lightmap: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 diff --git a/Assets/Textures/water2.png b/Assets/Textures/water2.png new file mode 100644 index 0000000..93359e9 Binary files /dev/null and b/Assets/Textures/water2.png differ diff --git a/Assets/Textures/water2.png.meta b/Assets/Textures/water2.png.meta new file mode 100644 index 0000000..db3ed92 --- /dev/null +++ b/Assets/Textures/water2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 8904d3b152a964bc98dbf9e83f98cc31 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + 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: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: