feat: Main shader alpha & Samyaza character texture fix
This commit is contained in:
Binary file not shown.
@@ -52,7 +52,7 @@ TextureImporter:
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 0
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
@@ -119,6 +119,19 @@ TextureImporter:
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
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: []
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:54613baa69707e3ec9b096c0176c7b0cda81626fc5e7afecbbd96a3305709215
|
||||
size 31185
|
||||
@@ -1,143 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2555f2318cdcc10429437241e69ecfaf
|
||||
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: 4
|
||||
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: 4
|
||||
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
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
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: 4
|
||||
buildTarget: iOS
|
||||
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: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -203,6 +203,9 @@
|
||||
},
|
||||
{
|
||||
"m_Id": "669d3deb37c84ae484edecd241a15524"
|
||||
},
|
||||
{
|
||||
"m_Id": "eb49a515d11f469aa87bb563411b22b8"
|
||||
}
|
||||
],
|
||||
"m_GroupDatas": [],
|
||||
@@ -273,9 +276,9 @@
|
||||
},
|
||||
"m_InputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "1035dda04278422b988336d6984e2045"
|
||||
"m_Id": "eb49a515d11f469aa87bb563411b22b8"
|
||||
},
|
||||
"m_SlotId": 0
|
||||
"m_SlotId": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -572,6 +575,20 @@
|
||||
"m_SlotId": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "c5d342277052409f87283f2c60ccf3a1"
|
||||
},
|
||||
"m_SlotId": 19
|
||||
},
|
||||
"m_InputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "eb49a515d11f469aa87bb563411b22b8"
|
||||
},
|
||||
"m_SlotId": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
@@ -627,12 +644,26 @@
|
||||
},
|
||||
"m_SlotId": 2
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "eb49a515d11f469aa87bb563411b22b8"
|
||||
},
|
||||
"m_SlotId": 2
|
||||
},
|
||||
"m_InputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "1035dda04278422b988336d6984e2045"
|
||||
},
|
||||
"m_SlotId": 0
|
||||
}
|
||||
}
|
||||
],
|
||||
"m_VertexContext": {
|
||||
"m_Position": {
|
||||
"x": 1352.0,
|
||||
"y": 319.9999694824219
|
||||
"x": 1384.9998779296875,
|
||||
"y": 297.9999694824219
|
||||
},
|
||||
"m_Blocks": [
|
||||
{
|
||||
@@ -648,8 +679,8 @@
|
||||
},
|
||||
"m_FragmentContext": {
|
||||
"m_Position": {
|
||||
"x": 1351.0,
|
||||
"y": 523.0
|
||||
"x": 1383.9998779296875,
|
||||
"y": 501.0
|
||||
},
|
||||
"m_Blocks": [
|
||||
{
|
||||
@@ -909,6 +940,54 @@
|
||||
"m_SerializedDescriptor": "SurfaceDescription.Alpha"
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
|
||||
"m_ObjectId": "10b2463e781e4ab39d4385c1919b404f",
|
||||
"m_Id": 2,
|
||||
"m_DisplayName": "Out",
|
||||
"m_SlotType": 1,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "Out",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": {
|
||||
"e00": 0.0,
|
||||
"e01": 0.0,
|
||||
"e02": 0.0,
|
||||
"e03": 0.0,
|
||||
"e10": 0.0,
|
||||
"e11": 0.0,
|
||||
"e12": 0.0,
|
||||
"e13": 0.0,
|
||||
"e20": 0.0,
|
||||
"e21": 0.0,
|
||||
"e22": 0.0,
|
||||
"e23": 0.0,
|
||||
"e30": 0.0,
|
||||
"e31": 0.0,
|
||||
"e32": 0.0,
|
||||
"e33": 0.0
|
||||
},
|
||||
"m_DefaultValue": {
|
||||
"e00": 1.0,
|
||||
"e01": 0.0,
|
||||
"e02": 0.0,
|
||||
"e03": 0.0,
|
||||
"e10": 0.0,
|
||||
"e11": 1.0,
|
||||
"e12": 0.0,
|
||||
"e13": 0.0,
|
||||
"e20": 0.0,
|
||||
"e21": 0.0,
|
||||
"e22": 1.0,
|
||||
"e23": 0.0,
|
||||
"e30": 0.0,
|
||||
"e31": 0.0,
|
||||
"e32": 0.0,
|
||||
"e33": 1.0
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
@@ -1143,8 +1222,8 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 848.0,
|
||||
"y": 1114.0,
|
||||
"x": 826.0000610351563,
|
||||
"y": 1141.0001220703125,
|
||||
"width": 116.0,
|
||||
"height": 34.0
|
||||
}
|
||||
@@ -1389,9 +1468,9 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 1005.0,
|
||||
"y": 1031.0,
|
||||
"width": 185.0,
|
||||
"x": 983.0000610351563,
|
||||
"y": 1058.0001220703125,
|
||||
"width": 185.00006103515626,
|
||||
"height": 190.0
|
||||
}
|
||||
},
|
||||
@@ -1774,6 +1853,22 @@
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "47f83090b78a47a2915fa8ba5c1ca123",
|
||||
"m_Id": 19,
|
||||
"m_DisplayName": "Alpha",
|
||||
"m_SlotType": 1,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "Alpha",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 1,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Matrix4ShaderProperty",
|
||||
@@ -2692,8 +2787,8 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 848.0,
|
||||
"y": 1148.0,
|
||||
"x": 826.0000610351563,
|
||||
"y": 1175.0001220703125,
|
||||
"width": 115.0,
|
||||
"height": 34.0
|
||||
}
|
||||
@@ -2776,6 +2871,54 @@
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
|
||||
"m_ObjectId": "799ecdb97f704c82b54824c05c053477",
|
||||
"m_Id": 1,
|
||||
"m_DisplayName": "B",
|
||||
"m_SlotType": 0,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "B",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": {
|
||||
"e00": 2.0,
|
||||
"e01": 2.0,
|
||||
"e02": 2.0,
|
||||
"e03": 2.0,
|
||||
"e10": 2.0,
|
||||
"e11": 2.0,
|
||||
"e12": 2.0,
|
||||
"e13": 2.0,
|
||||
"e20": 2.0,
|
||||
"e21": 2.0,
|
||||
"e22": 2.0,
|
||||
"e23": 2.0,
|
||||
"e30": 2.0,
|
||||
"e31": 2.0,
|
||||
"e32": 2.0,
|
||||
"e33": 2.0
|
||||
},
|
||||
"m_DefaultValue": {
|
||||
"e00": 1.0,
|
||||
"e01": 0.0,
|
||||
"e02": 0.0,
|
||||
"e03": 0.0,
|
||||
"e10": 0.0,
|
||||
"e11": 1.0,
|
||||
"e12": 0.0,
|
||||
"e13": 0.0,
|
||||
"e20": 0.0,
|
||||
"e21": 0.0,
|
||||
"e22": 1.0,
|
||||
"e23": 0.0,
|
||||
"e30": 0.0,
|
||||
"e31": 0.0,
|
||||
"e32": 0.0,
|
||||
"e33": 1.0
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Matrix4MaterialSlot",
|
||||
@@ -2873,6 +3016,54 @@
|
||||
"m_LiteralMode": true
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
|
||||
"m_ObjectId": "7de09bfd28c94c45a5e68425d1742d4d",
|
||||
"m_Id": 0,
|
||||
"m_DisplayName": "A",
|
||||
"m_SlotType": 0,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "A",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": {
|
||||
"e00": 0.0,
|
||||
"e01": 0.0,
|
||||
"e02": 0.0,
|
||||
"e03": 0.0,
|
||||
"e10": 0.0,
|
||||
"e11": 0.0,
|
||||
"e12": 0.0,
|
||||
"e13": 0.0,
|
||||
"e20": 0.0,
|
||||
"e21": 0.0,
|
||||
"e22": 0.0,
|
||||
"e23": 0.0,
|
||||
"e30": 0.0,
|
||||
"e31": 0.0,
|
||||
"e32": 0.0,
|
||||
"e33": 0.0
|
||||
},
|
||||
"m_DefaultValue": {
|
||||
"e00": 1.0,
|
||||
"e01": 0.0,
|
||||
"e02": 0.0,
|
||||
"e03": 0.0,
|
||||
"e10": 0.0,
|
||||
"e11": 1.0,
|
||||
"e12": 0.0,
|
||||
"e13": 0.0,
|
||||
"e20": 0.0,
|
||||
"e21": 0.0,
|
||||
"e22": 1.0,
|
||||
"e23": 0.0,
|
||||
"e30": 0.0,
|
||||
"e31": 0.0,
|
||||
"e32": 0.0,
|
||||
"e33": 1.0
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
|
||||
@@ -2903,8 +3094,8 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 847.0,
|
||||
"y": 1182.0,
|
||||
"x": 825.0000610351563,
|
||||
"y": 1209.0001220703125,
|
||||
"width": 116.0,
|
||||
"height": 34.0
|
||||
}
|
||||
@@ -3659,8 +3850,8 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 844.0,
|
||||
"y": 1080.0,
|
||||
"x": 822.0000610351563,
|
||||
"y": 1107.0001220703125,
|
||||
"width": 114.0,
|
||||
"height": 34.0
|
||||
}
|
||||
@@ -4185,6 +4376,9 @@
|
||||
},
|
||||
{
|
||||
"m_Id": "8ead54ba7a8d487ea3f55e930101215f"
|
||||
},
|
||||
{
|
||||
"m_Id": "47f83090b78a47a2915fa8ba5c1ca123"
|
||||
}
|
||||
],
|
||||
"synonyms": [
|
||||
@@ -4707,6 +4901,49 @@
|
||||
"m_Space": 2
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
|
||||
"m_ObjectId": "eb49a515d11f469aa87bb563411b22b8",
|
||||
"m_Group": {
|
||||
"m_Id": ""
|
||||
},
|
||||
"m_Name": "Multiply",
|
||||
"m_DrawState": {
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 1227.8455810546875,
|
||||
"y": 876.8455810546875,
|
||||
"width": 208.0,
|
||||
"height": 302.0
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
{
|
||||
"m_Id": "7de09bfd28c94c45a5e68425d1742d4d"
|
||||
},
|
||||
{
|
||||
"m_Id": "799ecdb97f704c82b54824c05c053477"
|
||||
},
|
||||
{
|
||||
"m_Id": "10b2463e781e4ab39d4385c1919b404f"
|
||||
}
|
||||
],
|
||||
"synonyms": [
|
||||
"multiplication",
|
||||
"times",
|
||||
"x"
|
||||
],
|
||||
"m_Precision": 0,
|
||||
"m_PreviewExpanded": false,
|
||||
"m_DismissedVersion": 0,
|
||||
"m_PreviewMode": 0,
|
||||
"m_CustomColors": {
|
||||
"m_SerializableColors": []
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
|
||||
@@ -271,7 +271,8 @@ void EnkiBillal_float
|
||||
float4 FogColor,
|
||||
float FogMin,
|
||||
float FogMax,
|
||||
out float3 Output
|
||||
out float3 Output,
|
||||
out float Alpha
|
||||
)
|
||||
{
|
||||
// Common
|
||||
@@ -317,6 +318,8 @@ void EnkiBillal_float
|
||||
{
|
||||
Output = lerp(Output.rgb, FogColor.rgb, smoothstep(FogMin, FogMax, depth) * FogColor.a);
|
||||
}
|
||||
|
||||
Alpha = Color.a;
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user