Leahnaya/Splatoon-Ink
1
0
Fork 0
mirror of https://github.com/mixandjam/Splatoon-Ink.git synced 2026-03-21 17:25:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

bit more adjustments

Browse Source
This commit is contained in:
André Cardoso 2021-03-03 00:12:18 +01:00
parent d249534263
commit 06e1f7fc70
8 changed files with 5120 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
Assets/ParticleMaterial 1.mat Normal file
View File

@ -0,0 +1,125 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ParticleMaterial 1
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 0.5, y: 0.5}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 35add2fc28f438c4da2c9a3a720ac55e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 0.5, y: 0.5}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 0.5
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0
- _SmoothnessTextureChannel: 1
- _SpecularHighlights: 1
- _SrcBlend: 5
- _Surface: 1
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 1, g: 0.2407765, b: 0.11792451, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 59.714115, g: 0, b: 3.044249, a: 1}
- _SpecColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
--- !u!114 &5268476566877677707
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4

8
Assets/ParticleMaterial 1.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4bdfd49a249c4834c9d6a7a591023bb2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

19
Assets/ParticleMaterial.mat
View File

@ -9,14 +9,15 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: ParticleMaterial
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _NORMALMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
m_ShaderKeywords: _NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -86,7 +87,7 @@ Material:
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlend: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
@ -99,12 +100,12 @@ Material:
- _Smoothness: 0
- _SmoothnessTextureChannel: 1
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _SrcBlend: 5
- _Surface: 1
- _WorkflowMode: 1
- _ZWrite: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 1, b: 0.5988023, a: 1}
- _BaseColor: {r: 1, g: 0.22339156, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 445.72195, g: 445.72195, b: 445.72195, a: 1}
- _SpecColor: {r: 0.103773594, g: 0.103773594, b: 0.103773594, a: 1}

5028
Assets/Scenes/MixAndJam.unity
View File

File diff suppressed because it is too large Load Diff

6
Assets/Scripts/ParticlesController.cs
View File

@ -16,9 +16,9 @@ public class ParticlesController: MonoBehaviour{
void Start(){
part = GetComponent<ParticleSystem>();
collisionEvents = new List<ParticleCollisionEvent>();
var pr = part.GetComponent<ParticleSystemRenderer>();
Color c = new Color(pr.material.color.r, pr.material.color.g, pr.material.color.b, .8f);
paintColor = c;
//var pr = part.GetComponent<ParticleSystemRenderer>();
//Color c = new Color(pr.material.color.r, pr.material.color.g, pr.material.color.b, .8f);
//paintColor = c;
}
void OnParticleCollision(GameObject other) {

2
Assets/Settings/CustomForwardRendererData.asset
View File

@ -101,7 +101,7 @@ MonoBehaviour:
passTag: RenderMetaballsScreenSpace
Event: 400
filterSettings:
RenderQueueType: 0
RenderQueueType: 1
LayerMask:
serializedVersion: 2
m_Bits: 16

2
Assets/Settings/SampleSceneProfile.asset
View File

@ -123,7 +123,7 @@ MonoBehaviour:
max: 180
saturation:
m_OverrideState: 1
m_Value: 10
m_Value: 15
min: -100
max: 100
--- !u!114 &11400000

1
Assets/ShootingSystem.cs
View File

@ -48,6 +48,7 @@ public class ShootingSystem : MonoBehaviour
}
if (Input.GetMouseButtonDown(0))
{
inkParticle.Clear();
inkParticle.Play();
extraParticle.Play();
}