Skip to content

Commit 8428bc1

Browse files
committed
feat: minimap fading
1 parent 3ad831d commit 8428bc1

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

Assets/Scenes/Reparation.unity

+4
Original file line numberDiff line numberDiff line change
@@ -16055,6 +16055,10 @@ PrefabInstance:
1605516055
serializedVersion: 3
1605616056
m_TransformParent: {fileID: 0}
1605716057
m_Modifications:
16058+
- target: {fileID: 1285577524151521393, guid: 6bacecc4f3df9584198879c73a6b6c36, type: 3}
16059+
propertyPath: minimap
16060+
value:
16061+
objectReference: {fileID: 1521861653}
1605816062
- target: {fileID: 1285577524151521393, guid: 6bacecc4f3df9584198879c73a6b6c36, type: 3}
1605916063
propertyPath: maxOxygen
1606016064
value: 50

Assets/Scripts/WaterLogic.cs

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public class WaterLogic : MonoBehaviour
1919
public AudioClip oxygenWarning2;
2020
public AudioClip oxygenWarning3;
2121
public Image blackFadeImage;
22+
public Image minimap;
2223
public TextMeshProUGUI oxygenWarningText;
2324
public AudioClip enterWaterSound;
2425

@@ -40,6 +41,7 @@ private void Start()
4041
_audioSource = GetComponent<AudioSource>();
4142
blackFadeImage.color = new Color(0f, 0f, 0f, 0f);
4243
_audioSource.volume = 1.0f;
44+
minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, 1f);
4345
}
4446

4547
private void Update()
@@ -190,10 +192,12 @@ private IEnumerator FadeInBlackCanvas()
190192
timeElapsed += Time.deltaTime;
191193
var alpha = Mathf.Clamp01(timeElapsed / duration);
192194
blackFadeImage.color = new Color(0, 0, 0, alpha);
195+
minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, 1 - alpha);
193196
yield return null;
194197
}
195198

196199
blackFadeImage.color = new Color(0, 0, 0, 1);
200+
minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, 0);
197201
_isFadingIn = false;
198202
}
199203

@@ -204,16 +208,19 @@ private IEnumerator FadeOutBlackCanvas()
204208
var timeElapsed = 0f;
205209

206210
blackFadeImage.color = new Color(0, 0, 0, 1);
211+
minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, 0);
207212

208213
while (timeElapsed < duration)
209214
{
210215
timeElapsed += Time.deltaTime;
211216
var alpha = Mathf.Clamp01(1 - (timeElapsed / duration));
212217
blackFadeImage.color = new Color(0, 0, 0, alpha);
218+
minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, alpha);
213219
yield return null;
214220
}
215221

216222
blackFadeImage.color = new Color(0, 0, 0, 0);
223+
minimap.color = new Color(minimap.color.r, minimap.color.g, minimap.color.b, 1);
217224
_isFadingIn = false;
218225
}
219226

0 commit comments

Comments
 (0)