Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

209 #225

Merged
merged 12 commits into from
Jun 29, 2022
Merged

209 #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8fcc08a
feat: new sprites for lifes
Jumalita Jun 28, 2022
3ab49d7
feat: game object to save gain lifes added
Jumalita Jun 28, 2022
37973e1
feat: totem behaviour for save game
Jumalita Jun 28, 2022
436822c
feat: treasure object created and now makes gain player 1 new life
Jumalita Jun 28, 2022
3364810
feat: change particle effect too not be the same of the future ray
Jumalita Jun 28, 2022
c5ca893
Merge branch 'master' into 209
Jumalita Jun 28, 2022
c43b071
feat: merge master
Jumalita Jun 29, 2022
0f7aa23
feat: little retouches
Jumalita Jun 29, 2022
f325224
feat: commenting code
Jumalita Jun 29, 2022
00f34b2
fix: tutorial was dificult to see when dark background
Jumalita Jun 29, 2022
07395a8
fix: little things
Jumalita Jun 29, 2022
ec616f2
perf: uses existing code
wilberquito Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,893 changes: 1,596 additions & 297 deletions Erlang-Legacy/Assets/3rdParty/2DGamekit/Prefabs/VFX/Interactables/HealingEffect.prefab
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Erlang-Legacy/Assets/3rdParty/EffectExamples/Misc Effects/Materials/SparkParticle.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Material:
- _WorkflowMode: 0
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
- _BaseColor: {r: 1, g: 0.98602635, b: 0.2924528, a: 1}
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 4, g: 3.059635, b: 2.2058823, a: 1}
- _SpecColor: {r: 0, g: 0, b: 0, a: 1}
Expand Down
6 changes: 3 additions & 3 deletions Erlang-Legacy/Assets/3rdParty/EffectExamples/WeaponEffects/Materials/BulletFleshDecal.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: BulletFleshDecal
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _EMISSION _NORMALMAP _SPECULAR_SETUP
m_LightmapFlags: 1
m_ShaderKeywords: _NORMALMAP _SPECULAR_SETUP
m_LightmapFlags: 6
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
Expand Down Expand Up @@ -92,7 +92,7 @@ Material:
- _WorkflowMode: 0
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0.8308824, g: 0.540579, b: 0.43376943, a: 1}
- _BaseColor: {r: 0.10546456, g: 0.745283, b: 0.5231747, a: 1}
- _Color: {r: 0.8308824, g: 0.540579, b: 0.43376946, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.27357265, g: 0.36109942, b: 0.40441176, a: 1}
Expand Down
126 changes: 36 additions & 90 deletions Erlang-Legacy/Assets/3rdParty/EffectExamples/WeaponEffects/Textures/BloodMist.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,130 +4,76 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BloodMist
m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 2
serializedVersion: 3
m_TexEnvs:
- first:
name: _BumpMap
second:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailAlbedoMap
second:
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailMask
second:
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailNormalMap
second:
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _EmissionMap
second:
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 1c1f5fdffb8c5a944a978e8debb8fdfe, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
second:
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _OcclusionMap
second:
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParallaxMap
second:
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _BumpScale
second: 1
- first:
name: _Cutoff
second: 0.5
- first:
name: _DetailNormalMapScale
second: 1
- first:
name: _DstBlend
second: 0
- first:
name: _GlossMapScale
second: 1
- first:
name: _Glossiness
second: 0.5
- first:
name: _GlossyReflections
second: 1
- first:
name: _InvFade
second: 3
- first:
name: _Metallic
second: 0
- first:
name: _Mode
second: 0
- first:
name: _OcclusionStrength
second: 1
- first:
name: _Parallax
second: 0.02
- first:
name: _SmoothnessTextureChannel
second: 0
- first:
name: _SpecularHighlights
second: 1
- first:
name: _SrcBlend
second: 1
- first:
name: _UVSec
second: 0
- first:
name: _ZWrite
second: 1
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 3
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
- first:
name: _TintColor
second: {r: 0.2205882, g: 0.063256904, b: 0.063256904, a: 0.894}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _TintColor: {r: 0.026343895, g: 0.3490566, b: 0.1927851, a: 0.894}
134 changes: 38 additions & 96 deletions Erlang-Legacy/Assets/3rdParty/EffectExamples/WeaponEffects/Textures/BloodSplat2.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,139 +4,81 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BloodSplat2
m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHABLEND_ON _EMISSION _NORMALMAP
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 2
serializedVersion: 3
m_TexEnvs:
- first:
name: _BumpMap
second:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 4b403858fefaded4bb58c22aa41b8769, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailAlbedoMap
second:
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailMask
second:
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailNormalMap
second:
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _EmissionMap
second:
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 3f4abfb4beaba874db09889251c0f146, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
second:
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _OcclusionMap
second:
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParallaxMap
second:
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _SpecGlossMap
second:
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _BumpScale
second: 1
- first:
name: _Cutoff
second: 0.66
- first:
name: _DetailNormalMapScale
second: 1
- first:
name: _DstBlend
second: 10
- first:
name: _GlossMapScale
second: 1
- first:
name: _Glossiness
second: 1
- first:
name: _GlossyReflections
second: 1
- first:
name: _InvFade
second: 1
- first:
name: _Metallic
second: 0
- first:
name: _Mode
second: 2
- first:
name: _OcclusionStrength
second: 1
- first:
name: _Parallax
second: 0.02
- first:
name: _SmoothnessTextureChannel
second: 0
- first:
name: _SpecularHighlights
second: 1
- first:
name: _SrcBlend
second: 5
- first:
name: _UVSec
second: 0
- first:
name: _ZWrite
second: 0
- _BumpScale: 1
- _Cutoff: 0.66
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 1
- _GlossyReflections: 1
- _InvFade: 1
- _Metallic: 0
- _Mode: 2
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- first:
name: _Color
second: {r: 0.41176468, g: 0, b: 0, a: 1}
- first:
name: _EmissionColor
second: {r: 0.1397059, g: 0, b: 0, a: 1}
- first:
name: _SpecColor
second: {r: 0.19117647, g: 0.19117647, b: 0.19117647, a: 1}
- first:
name: _TintColor
second: {r: 0.2205882, g: 0, b: 0, a: 0.5}
- _Color: {r: 0.41176468, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0.1397059, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19117647, g: 0.19117647, b: 0.19117647, a: 1}
- _TintColor: {r: 0.010145951, g: 0.5377358, b: 0.3180717, a: 0.5}
Loading