Skip to content

Commit 8c494d9

Browse files
UnscriptedLogicUnscriptedLogic
committed
Damage Flashing, Minor Adjustments
1 parent de13265 commit 8c494d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+6514
-26
lines changed

‎.erp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<resetOnSceneChange>false</resetOnSceneChange>
66
<debugMode>false</debugMode>
77
<EditorClosed>true</EditorClosed>
8-
<LastTimestamp>1650715756</LastTimestamp>
9-
<LastSessionID>7314879301116524469</LastSessionID>
8+
<LastTimestamp>1650946801</LastTimestamp>
9+
<LastSessionID>2468553608610315847</LastSessionID>
1010
<Errored>false</Errored>
1111
</ERPSettings>

‎Assets/AddressableAssetsData/WebGL/addressables_content_state.bin‎

0 Bytes
Binary file not shown.

‎Assets/AddressableAssetsData/Windows/addressables_content_state.bin‎

0 Bytes
Binary file not shown.

‎Assets/AddressableAssetsData/link.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<linker>
2+
<assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
3+
<type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
4+
</assembly>
5+
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
6+
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
7+
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
8+
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
9+
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
10+
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
11+
</assembly>
12+
<assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
13+
<type fullname="UnityEngine.GameObject" preserve="all" />
14+
<type fullname="UnityEngine.Material" preserve="all" />
15+
<type fullname="UnityEngine.MeshFilter" preserve="all" />
16+
<type fullname="UnityEngine.MeshRenderer" preserve="all" />
17+
<type fullname="UnityEngine.Shader" preserve="all" />
18+
<type fullname="UnityEngine.Texture2D" preserve="all" />
19+
<type fullname="UnityEngine.Transform" preserve="all" />
20+
</assembly>
21+
</linker>

‎Assets/AddressableAssetsData/link.xml.meta‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/DamageFlash.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/DamageFlash/DamageFlash.cs‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
using System;
2+
using System.Collections;
3+
using System.Collections.Generic;
4+
using UnityEngine;
5+
using UnityEngine.Events;
6+
using DG.Tweening;
7+
8+
namespace Assets.Scripts.DamageFlash
9+
{
10+
public class DamageFlash : MonoBehaviour
11+
{
12+
[SerializeField] private Material flashMat;
13+
[SerializeField] private MeshRenderer meshRenderer;
14+
[SerializeField] private float blinkDuration = 0.075f;
15+
16+
private List<Material> materials = new List<Material>();
17+
private List<Material> flashMats = new List<Material>();
18+
19+
private void Start()
20+
{
21+
for (int i = 0; i < meshRenderer.materials.Length; i++)
22+
{
23+
materials.Add(meshRenderer.materials[i]);
24+
flashMats.Add(flashMat);
25+
}
26+
}
27+
28+
private void Update()
29+
{
30+
if (Input.GetKeyDown(KeyCode.Space))
31+
{
32+
Flash();
33+
}
34+
}
35+
36+
public void Flash()
37+
{
38+
meshRenderer.materials = flashMats.ToArray();
39+
40+
StartCoroutine(FadeDelay());
41+
}
42+
43+
private IEnumerator FadeDelay()
44+
{
45+
yield return new WaitForSeconds(blinkDuration);
46+
for (int i = 0; i < meshRenderer.materials.Length; i++)
47+
{
48+
meshRenderer.materials = materials.ToArray();
49+
}
50+
}
51+
}
52+
}

‎Assets/DamageFlash/DamageFlash.cs.meta‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/DamageFlash/DamageFlash.mat‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-5413977820377261128
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 5
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 6
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: DamageFlash
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_ShaderKeywords: _EMISSION
26+
m_LightmapFlags: 2
27+
m_EnableInstancingVariants: 0
28+
m_DoubleSidedGI: 0
29+
m_CustomRenderQueue: -1
30+
stringTagMap:
31+
RenderType: Opaque
32+
disabledShaderPasses: []
33+
m_SavedProperties:
34+
serializedVersion: 3
35+
m_TexEnvs:
36+
- _BaseMap:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _BumpMap:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _DetailAlbedoMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _DetailMask:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _DetailNormalMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _EmissionMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _MainTex:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _MetallicGlossMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _OcclusionMap:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- _ParallaxMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- _SpecGlossMap:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- unity_Lightmaps:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- unity_LightmapsInd:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- unity_ShadowMasks:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
m_Ints: []
93+
m_Floats:
94+
- _AlphaClip: 0
95+
- _Blend: 0
96+
- _BumpScale: 1
97+
- _ClearCoatMask: 0
98+
- _ClearCoatSmoothness: 0
99+
- _Cull: 2
100+
- _Cutoff: 0.5
101+
- _DetailAlbedoMapScale: 1
102+
- _DetailNormalMapScale: 1
103+
- _DstBlend: 0
104+
- _EnvironmentReflections: 1
105+
- _GlossMapScale: 0
106+
- _Glossiness: 0
107+
- _GlossyReflections: 0
108+
- _Metallic: 0
109+
- _OcclusionStrength: 1
110+
- _Parallax: 0.005
111+
- _QueueOffset: 0
112+
- _ReceiveShadows: 1
113+
- _Smoothness: 0.5
114+
- _SmoothnessTextureChannel: 0
115+
- _SpecularHighlights: 1
116+
- _SrcBlend: 1
117+
- _Surface: 0
118+
- _WorkflowMode: 1
119+
- _ZWrite: 1
120+
m_Colors:
121+
- _BaseColor: {r: 1, g: 0.759434, b: 0.759434, a: 1}
122+
- _Color: {r: 1, g: 0.759434, b: 0.759434, a: 1}
123+
- _EmissionColor: {r: 1, g: 0.5990566, b: 0.5990566, a: 1}
124+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
125+
m_BuildTextureStacks: []

‎Assets/DamageFlash/DamageFlash.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)