Merge pull request #139 from project-fika/dev

Update bundles to support extended ASCII
project-fika · Aug 17, 2024 · 710a429 · 710a429
2 parents f35c067 + 7374ea9
commit 710a429
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/Fika.Core/Bundles/Files/newmatchmakerui.bundle b/Fika.Core/Bundles/Files/newmatchmakerui.bundle
diff --git a/Fika.Core/Bundles/Files/playerui.bundle b/Fika.Core/Bundles/Files/playerui.bundle
diff --git a/Fika.Core/Bundles/Files/senditemmenu.bundle b/Fika.Core/Bundles/Files/senditemmenu.bundle
diff --git a/Fika.Core/FikaPlugin.cs b/Fika.Core/FikaPlugin.cs
@@ -49,7 +49,7 @@ namespace Fika.Core
 	/// Originally by: Paulov <br/>
 	/// Re-written by: Lacyway
 	/// </summary>
-	[BepInPlugin("com.fika.core", "Fika.Core", "0.9.8994")]
+	[BepInPlugin("com.fika.core", "Fika.Core", "0.9.8995")]
 	[BepInProcess("EscapeFromTarkov.exe")]
 	[BepInDependency("com.SPT.custom", BepInDependency.DependencyFlags.HardDependency)] // This is used so that we guarantee to load after spt-custom, that way we can disable its patches
 	[BepInDependency("com.SPT.singleplayer", BepInDependency.DependencyFlags.HardDependency)] // This is used so that we guarantee to load after spt-singleplayer, that way we can disable its patches

diff --git a/Fika.Core/UI/Custom/ButtonHandler.cs b/Fika.Core/UI/Custom/ButtonHandler.cs
@@ -1,5 +1,4 @@
-#pragma warning disable CS0169
-using System.Collections;
+using System.Collections;
 using TMPro;
 using UnityEngine;
 using UnityEngine.EventSystems;
@@ -24,13 +23,13 @@ private IEnumerator FadeButton()
 		while (handleImage.color.a > 0)
 		{
 			yield return new WaitForFixedUpdate();
-			handleImage.color = new Color(255, 255, 255, handleImage.color.a - 0.15f);
+			handleImage.color = new Color(0.9059f, 0.898f, 0.8314f, handleImage.color.a - 0.15f);
 			handleText.color = new Color(0, 0, 0, handleText.color.a - 0.15f);
 		}
 		while (handleText.color.a < 1)
 		{
 			yield return new WaitForFixedUpdate();
-			handleText.color = new Color(255, 255, 255, handleText.color.a + 0.15f);
+			handleText.color = new Color(0.9059f, 0.898f, 0.8314f, handleText.color.a + 0.15f);
 		}
 	}
 
@@ -39,12 +38,12 @@ private IEnumerator ShowButton()
 		while (handleText.color.a > 0)
 		{
 			yield return new WaitForFixedUpdate();
-			handleText.color = new Color(255, 255, 255, handleText.color.a - 0.15f);
+			handleText.color = new Color(0.9059f, 0.898f, 0.8314f, handleText.color.a - 0.15f);
 		}
 		while (handleImage.color.a < 1)
 		{
 			yield return new WaitForFixedUpdate();
-			handleImage.color = new Color(255, 255, 255, handleImage.color.a + 0.15f);
+			handleImage.color = new Color(0.9059f, 0.898f, 0.8314f, handleImage.color.a + 0.15f);
 			handleText.color = new Color(0, 0, 0, handleText.color.a + 0.15f);
 		}
 	}