- Added placeholders for the remaining static Wanted posters.
- Reworked credits display to be more efficient and easy to edit. - Renamed the Wood shader to a more appropriate and genericised name. - Reorganised static Wanted posters into their own folder.
This commit is contained in:
@@ -28,12 +28,12 @@ Material:
|
||||
m_TexEnvs:
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: -0.1, y: -0.18}
|
||||
m_Scale: {x: 1.38, y: 1.38}
|
||||
m_Offset: {x: -0.21, y: -0.36}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 60b125c1d7b06dd439bacc9a3af6b3e0, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: -0.1, y: -0.18}
|
||||
m_Scale: {x: 1.38, y: 1.38}
|
||||
m_Offset: {x: -0.21, y: -0.36}
|
||||
m_Ints: []
|
||||
m_Floats: []
|
||||
m_Colors: []
|
||||
|
||||
+4
-4
@@ -28,12 +28,12 @@ Material:
|
||||
m_TexEnvs:
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Scale: {x: 1.6, y: 1}
|
||||
m_Offset: {x: -0.3, y: -0.09}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: d99fce257e19ba94e9b1d9aea6dbe87f, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Scale: {x: 1.6, y: 1}
|
||||
m_Offset: {x: -0.3, y: -0.09}
|
||||
m_Ints: []
|
||||
m_Floats: []
|
||||
m_Colors: []
|
||||
|
||||
+4
-4
@@ -28,12 +28,12 @@ Material:
|
||||
m_TexEnvs:
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Scale: {x: 1.6, y: 1}
|
||||
m_Offset: {x: -0.3, y: -0.09}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: a93cc070c3a45ed46a5bea72450a816a, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Scale: {x: 1.6, y: 1}
|
||||
m_Offset: {x: -0.3, y: -0.09}
|
||||
m_Ints: []
|
||||
m_Floats: []
|
||||
m_Colors: []
|
||||
|
||||
+4
-4
@@ -28,12 +28,12 @@ Material:
|
||||
m_TexEnvs:
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Scale: {x: 1.6, y: 1}
|
||||
m_Offset: {x: -0.3, y: -0.09}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: d53f63ff95d754e43a90e613d06deda5, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Scale: {x: 1.6, y: 1}
|
||||
m_Offset: {x: -0.3, y: -0.09}
|
||||
m_Ints: []
|
||||
m_Floats: []
|
||||
m_Colors: []
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 492f2a2c7ccbcd847b98435c44057c2a
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
+1
-2
@@ -26,8 +26,7 @@ PrefabInstance:
|
||||
- target: {fileID: 7875515815342178887, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\u2022 CRIMINAL MASTERMIND\n\u2022 ALWAYS ON THE RUN\n\u2022 TASTE
|
||||
FOR THIEVERY"
|
||||
value: "\u2022 LOVE OF LARCENY\n\u2022 FAN OF FELONIES\n\u2022 TASTE FOR THIEVERY"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
+2
-1
@@ -26,7 +26,8 @@ PrefabInstance:
|
||||
- target: {fileID: 7875515815342178887, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\u2022 CYBERCRIMINAL\n\u2022 IP THIEF\n\u2022 A FEW SCREWS LOOSE"
|
||||
value: "\u2022 CYBER CRIMINAL\n\u2022 LACKING IN PRINCIPLE\n\u2022 BIT OF AN
|
||||
IMBECILE"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &8164783184409482174
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3574980439021448294, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_text
|
||||
value: SARAH NADE
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4971836217733468186, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Sarah Nade Static Wanted Poster
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6296875726341290075, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_Materials.Array.data[1]
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2}
|
||||
- target: {fileID: 7875515815342178887, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\u2022 DIRTY PUNK\n\u2022 COLLEGE FLUNK\n\u2022 HER BAND STUNK"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 7b68b414f7f0a9f4299d29d7d06f81df, type: 3}
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 89ff53c45c9fbc9478489821b52cf942
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &8164783184409482174
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3574980439021448294, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_text
|
||||
value: TOP GRUNGE
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4971836217733468186, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Top Grunge Static Wanted Poster
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6296875726341290075, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_Materials.Array.data[1]
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2}
|
||||
- target: {fileID: 7875515815342178887, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\u2022 PARTNER IN CRIME\n\u2022 COVERED IN GRIME\n\u2022 BALL OF SLIME"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 7b68b414f7f0a9f4299d29d7d06f81df, type: 3}
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6994758b57569254993dce3b5f472585
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &8164783184409482174
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3574980439021448294, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_text
|
||||
value: VIC THE SLICK
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4971836217733468186, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Vic The Slick Static Wanted Poster
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6296875726341290075, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_Materials.Array.data[1]
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2}
|
||||
- target: {fileID: 7875515815342178887, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\u2022 SLEAZY SALESMAN\n\u2022 CARMEN'S YESMAN\n\u2022 CATCH HIM IF
|
||||
YOU CAN"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 7b68b414f7f0a9f4299d29d7d06f81df, type: 3}
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f6465ff57588b4940a61b2768a7cbc44
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
+2986
-437
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -4,7 +4,7 @@
|
||||
// - no Main Color
|
||||
// - fully supports only 1 directional light. Other lights can affect it, but it will be per-vertex/SH.
|
||||
|
||||
Shader "Carmen/Wood"
|
||||
Shader "Carmen/Bicolour Noise"
|
||||
{
|
||||
Properties
|
||||
{
|
||||
@@ -3,6 +3,8 @@
|
||||
Properties
|
||||
{
|
||||
_MainTex ("Portrait", 2D) = "white" {}
|
||||
_Text ("Portrait Text", 2D) = "white" {}
|
||||
_TextAlpha ("Portrait Text Alpha", 2D) = "white" {}
|
||||
}
|
||||
SubShader
|
||||
{
|
||||
@@ -15,6 +17,8 @@
|
||||
//#pragma fragment frag
|
||||
|
||||
UNITY_DECLARE_TEX2D(_MainTex);
|
||||
UNITY_DECLARE_TEX2D(_Text);
|
||||
UNITY_DECLARE_TEX2D(_TextAlpha);
|
||||
|
||||
|
||||
// struct Data
|
||||
@@ -32,6 +36,8 @@
|
||||
struct Input
|
||||
{
|
||||
float2 uv_MainTex;
|
||||
float2 uv_Text;
|
||||
float2 uv_TextAlpha;
|
||||
};
|
||||
|
||||
|
||||
@@ -50,7 +56,15 @@
|
||||
|
||||
void surf (Input IN, inout SurfaceOutputStandard o)
|
||||
{
|
||||
o.Albedo = UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex).rgb;
|
||||
float3 MainColour = UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex);
|
||||
float Text = UNITY_SAMPLE_TEX2D(_Text, IN.uv_MainTex).r;
|
||||
float TextAlpha = UNITY_SAMPLE_TEX2D(_TextAlpha, IN.uv_MainTex).r;
|
||||
|
||||
float3 TextColourMix = lerp(float3(1.0, 1.0, 1.0), float3(0.0, 0.0, 0.0), TextAlpha - Text);
|
||||
float3 ImageMix = lerp(MainColour, TextColourMix, TextAlpha);
|
||||
|
||||
o.Albedo = ImageMix;//lerp(MainColour, float3(0.0, 0.0, 0.0), TextAlpha - Text);
|
||||
//o.Albedo = UNITY_SAMPLE_TEX2D(_Text, IN.uv_MainTex).r;
|
||||
}
|
||||
ENDCG
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Shader "Custom/ScreenFill"
|
||||
Shader "Custom/ScreenNoise"
|
||||
{
|
||||
Properties
|
||||
{
|
||||
Reference in New Issue
Block a user