re-enable ABs
This commit is contained in:
parent
1284852311
commit
aeea3bd80f
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ctrpillow/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
8
Assets/Resources/Sprites/Games/PajamaParty/Material.meta
Normal file
8
Assets/Resources/Sprites/Games/PajamaParty/Material.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6ddd6e416cd063440b59da912f257d72
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName: ctrpillow/common
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -8,7 +8,7 @@ Material:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: BalloonMaterial
|
m_Name: BalloonMaterial
|
||||||
m_Shader: {fileID: 4800000, guid: f8af2663bd6590d48bd968ceba6cf28d, type: 3}
|
m_Shader: {fileID: 4800000, guid: d92af55b6015e0048bce25489a1c1749, type: 3}
|
||||||
m_ValidKeywords: []
|
m_ValidKeywords: []
|
||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 0
|
m_LightmapFlags: 0
|
||||||
|
|
@ -0,0 +1,92 @@
|
||||||
|
Shader "Sprites/ctrpajama_balloon"
|
||||||
|
{
|
||||||
|
Properties
|
||||||
|
{
|
||||||
|
[PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {}
|
||||||
|
_Color ("Tint", Color) = (1,1,1,1)
|
||||||
|
_OutlineColor ("Outline Color", Color) = (0,0,0,0)
|
||||||
|
[MaterialToggle] PixelSnap ("Pixel snap", Float) = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
SubShader
|
||||||
|
{
|
||||||
|
Tags
|
||||||
|
{
|
||||||
|
"Queue"="Transparent"
|
||||||
|
"IgnoreProjector"="True"
|
||||||
|
"RenderType"="Transparent"
|
||||||
|
"PreviewType"="Plane"
|
||||||
|
"CanUseSpriteAtlas"="True"
|
||||||
|
}
|
||||||
|
|
||||||
|
Cull Off
|
||||||
|
Lighting Off
|
||||||
|
ZWrite Off
|
||||||
|
Blend One OneMinusSrcAlpha
|
||||||
|
|
||||||
|
Pass
|
||||||
|
{
|
||||||
|
CGPROGRAM
|
||||||
|
#pragma vertex vert
|
||||||
|
#pragma fragment frag
|
||||||
|
#pragma multi_compile _ PIXELSNAP_ON
|
||||||
|
#include "UnityCG.cginc"
|
||||||
|
|
||||||
|
struct appdata_t
|
||||||
|
{
|
||||||
|
float4 vertex : POSITION;
|
||||||
|
float4 color : COLOR;
|
||||||
|
float2 texcoord : TEXCOORD0;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct v2f
|
||||||
|
{
|
||||||
|
float4 vertex : SV_POSITION;
|
||||||
|
fixed4 color : COLOR;
|
||||||
|
float2 texcoord : TEXCOORD0;
|
||||||
|
};
|
||||||
|
|
||||||
|
fixed4 _Color;
|
||||||
|
fixed4 _OutlineColor;
|
||||||
|
|
||||||
|
v2f vert(appdata_t IN)
|
||||||
|
{
|
||||||
|
v2f OUT;
|
||||||
|
OUT.vertex = UnityObjectToClipPos(IN.vertex);
|
||||||
|
OUT.texcoord = IN.texcoord;
|
||||||
|
OUT.color = IN.color * _Color;
|
||||||
|
#ifdef PIXELSNAP_ON
|
||||||
|
OUT.vertex = UnityPixelSnap (OUT.vertex);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return OUT;
|
||||||
|
}
|
||||||
|
|
||||||
|
sampler2D _MainTex;
|
||||||
|
sampler2D _AlphaTex;
|
||||||
|
float _AlphaSplitEnabled;
|
||||||
|
|
||||||
|
fixed4 SampleSpriteTexture (float2 uv)
|
||||||
|
{
|
||||||
|
fixed4 color = tex2D (_MainTex, uv);
|
||||||
|
|
||||||
|
#if UNITY_TEXTURE_ALPHASPLIT_ALLOWED
|
||||||
|
if (_AlphaSplitEnabled)
|
||||||
|
color.a = tex2D (_AlphaTex, uv).r;
|
||||||
|
#endif //UNITY_TEXTURE_ALPHASPLIT_ALLOWED
|
||||||
|
|
||||||
|
return color;
|
||||||
|
}
|
||||||
|
|
||||||
|
fixed4 frag(v2f IN) : SV_Target
|
||||||
|
{
|
||||||
|
fixed4 c = SampleSpriteTexture (IN.texcoord);
|
||||||
|
float3 outlinedRGB = lerp(IN.color.rgb, _OutlineColor.rgb, 1 - c.r);
|
||||||
|
c = fixed4(outlinedRGB.r, outlinedRGB.g, outlinedRGB.b, c.a);
|
||||||
|
c.rgb *= c.a;
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d92af55b6015e0048bce25489a1c1749
|
||||||
|
ShaderImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
defaultTextures: []
|
||||||
|
nonModifiableTextures: []
|
||||||
|
preprocessorOverride: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -2,14 +2,15 @@
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!21 &2100000
|
--- !u!21 &2100000
|
||||||
Material:
|
Material:
|
||||||
serializedVersion: 6
|
serializedVersion: 8
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pillow_objMapped
|
m_Name: pillow_objMapped
|
||||||
m_Shader: {fileID: 4800000, guid: af40ea27225ac294189e15c2851fcc90, type: 3}
|
m_Shader: {fileID: 4800000, guid: af40ea27225ac294189e15c2851fcc90, type: 3}
|
||||||
m_ShaderKeywords:
|
m_ValidKeywords: []
|
||||||
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
|
|
@ -55,6 +56,7 @@ Material:
|
||||||
m_Texture: {fileID: 0}
|
m_Texture: {fileID: 0}
|
||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 1, y: 1}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
m_Floats:
|
m_Floats:
|
||||||
- _BumpScale: 1
|
- _BumpScale: 1
|
||||||
- _ColorMask: 15
|
- _ColorMask: 15
|
||||||
|
|
@ -82,7 +84,7 @@ Material:
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
|
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
- _ColorAlpha: {r: 0.91372555, g: 0.9176471, b: 0.07450981, a: 1}
|
- _ColorAlpha: {r: 0.9137255, g: 0.91764706, b: 0.07450981, a: 1}
|
||||||
- _ColorBravo: {r: 1, g: 0.8117648, b: 0.70980394, a: 1}
|
- _ColorBravo: {r: 1, g: 0.8117648, b: 0.70980394, a: 1}
|
||||||
- _ColorDelta: {r: 0.6666667, g: 0.9843138, b: 1, a: 1}
|
- _ColorDelta: {r: 0.6666667, g: 0.9843138, b: 1, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
|
@ -103,9 +103,9 @@ namespace HeavenStudio.Games.Loaders
|
||||||
// background stuff
|
// background stuff
|
||||||
// do shit with mako's face? (talking?)
|
// do shit with mako's face? (talking?)
|
||||||
},
|
},
|
||||||
new List<string>() { "ctr", "normal" }
|
new List<string>() { "ctr", "normal" },
|
||||||
// "ctrpillow", "jp",
|
"ctrpillow", "en",
|
||||||
// new List<string>() {"en", "jp", "ko"}
|
new List<string>() {"en", "jp", "ko"}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue