Berry-Dash/source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix game player not working with custom icons

Browse Source
This commit is contained in:
Travis
2026-01-24 16:31:36 -07:00
parent 42b67e9e06
commit 8480bbc0f7
5 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scenes/CustomGamePlayer.unity
View File

@@ -3891,7 +3891,7 @@ SpriteRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_MaskInteraction: 0 m_MaskInteraction: 0
m_Sprite: {fileID: 6534417478244952628, guid: dbf71fe5f2caad1409da64bdbb781eb5, type: 3} m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0

2
Assets/Scenes/GamePlayer.unity
View File

@@ -4567,7 +4567,7 @@ SpriteRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_MaskInteraction: 0 m_MaskInteraction: 0
m_Sprite: {fileID: 6534417478244952628, guid: dbf71fe5f2caad1409da64bdbb781eb5, type: 3} m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0

44
Assets/Scripts/CustomGamePlayer.cs
View File

@@ -70,7 +70,7 @@ public class CustomGamePlayer : MonoBehaviour
); );
var customIconData = BazookaManager.Instance.GetCustomBirdIconData(); var customIconData = BazookaManager.Instance.GetCustomBirdIconData();
SpriteRenderer component = bird.GetComponent<SpriteRenderer>(); SpriteRenderer birdRender = bird.GetComponent<SpriteRenderer>();
if (customIconData.Selected == null) if (customIconData.Selected == null)
{ {
var birdColor = BazookaManager.Instance.GetColorSettingIcon(); var birdColor = BazookaManager.Instance.GetColorSettingIcon();
@@ -86,51 +86,55 @@ public class CustomGamePlayer : MonoBehaviour
int.Parse(overlayColor[2].ToString()) / 255f int.Parse(overlayColor[2].ToString()) / 255f
); );
int num = BazookaManager.Instance.GetBirdIcon(); int icon = BazookaManager.Instance.GetBirdIcon();
int num2 = BazookaManager.Instance.GetBirdOverlay(); int iconOverlay = BazookaManager.Instance.GetBirdOverlay();
if (num == 1) if (icon == 1)
{ {
component.sprite = Tools.GetIconForUser(BazookaManager.Instance.GetAccountID() ?? 0); birdRender.sprite = Tools.GetIconForUser(BazookaManager.Instance.GetAccountID() ?? 0);
} }
else else
{ {
component.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + num); birdRender.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + icon);
} }
if (num2 == 8) if (iconOverlay == 8)
{ {
overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + num2); overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + iconOverlay);
overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.37f, 0.32f, 0f); overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.37f, 0.32f, 0f);
} }
else if (num2 == 11) else if (iconOverlay == 11)
{ {
overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + num2); overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + iconOverlay);
overlayRender.transform.localScale = new UnityEngine.Vector3(1.1f, 1.1f, 1.1f); //yea i didnt feel like doing it for all lmao overlayRender.transform.localScale = new UnityEngine.Vector3(1.1f, 1.1f, 1.1f); //yea i didnt feel like doing it for all lmao
overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.3141809f, 0.4324968f, 0f); overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.3141809f, 0.4324968f, 0f);
} }
else if (num2 == 13) else if (iconOverlay == 13)
{ {
overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + num2); overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + iconOverlay);
overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.3559977f, 0.3179995f, 0f); overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.3559977f, 0.3179995f, 0f);
} }
else else
{ {
overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + num2); overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + iconOverlay);
} }
if (component.sprite == null) if (birdRender.sprite == null)
{ {
component.sprite = Resources.Load<Sprite>("Icons/Icons/bird_1"); birdRender.sprite = Resources.Load<Sprite>("Icons/Icons/bird_1");
BazookaManager.Instance.SetBirdIcon(1); BazookaManager.Instance.SetBirdIcon(1);
} }
if (overlayRender.sprite == null && num2 != 0) if (overlayRender.sprite == null && iconOverlay != 0)
{ {
overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_1"); overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_1");
BazookaManager.Instance.SetBirdOverlay(1); BazookaManager.Instance.SetBirdOverlay(1);
} }
} }
// else if (customIconData.Selected != null) else if (customIconData.Selected != null)
// foreach (var icon in customIconData.Purchased) foreach (var icon in customIconData.Purchased)
// if (icon == customIconData.Selected) if (icon == customIconData.Selected)
// Tools.RenderFromBase64(icon, component); {
var waitingForCustomIcon = birdRender.gameObject.AddComponent<WaitingForCustomIcon>();
waitingForCustomIcon.ID = customIconData.Selected;
CustomIconLoader.Init(new[] { waitingForCustomIcon });
}
lastMoveTime = Time.time; lastMoveTime = Time.time;
UnityEngine.InputSystem.EnhancedTouch.EnhancedTouchSupport.Enable(); UnityEngine.InputSystem.EnhancedTouch.EnhancedTouchSupport.Enable();

3
Assets/Scripts/CustomIconLoader.cs
View File

@@ -40,7 +40,8 @@ public class CustomIconLoader : MonoBehaviour
var cachedIcon = BazookaManager.Instance.iconCache.FirstOrDefault(icon => icon.ID == obj.ID); var cachedIcon = BazookaManager.Instance.iconCache.FirstOrDefault(icon => icon.ID == obj.ID);
if (cachedIcon != null) if (cachedIcon != null)
{ {
Tools.RenderFromBase64(Tools.FixIconData(cachedIcon.Data).Item1, obj.GetComponent<Image>()); try { Tools.RenderFromBase64(Tools.FixIconData(cachedIcon.Data).Item1, obj.GetComponent<Image>()); }
catch { Tools.RenderFromBase64(Tools.FixIconData(cachedIcon.Data).Item1, obj.GetComponent<SpriteRenderer>()); }
} }
Destroy(obj); Destroy(obj);
} }

44
Assets/Scripts/GamePlayer.cs
View File

@@ -58,7 +58,7 @@ public class GamePlayer : MonoBehaviour
); );
var customIconData = BazookaManager.Instance.GetCustomBirdIconData(); var customIconData = BazookaManager.Instance.GetCustomBirdIconData();
SpriteRenderer component = bird.GetComponent<SpriteRenderer>(); SpriteRenderer birdRender = bird.GetComponent<SpriteRenderer>();
if (customIconData.Selected == null) if (customIconData.Selected == null)
{ {
var birdColor = BazookaManager.Instance.GetColorSettingIcon(); var birdColor = BazookaManager.Instance.GetColorSettingIcon();
@@ -74,51 +74,55 @@ public class GamePlayer : MonoBehaviour
int.Parse(overlayColor[2].ToString()) / 255f int.Parse(overlayColor[2].ToString()) / 255f
); );
int num = BazookaManager.Instance.GetBirdIcon(); int icon = BazookaManager.Instance.GetBirdIcon();
int num2 = BazookaManager.Instance.GetBirdOverlay(); int iconOverlay = BazookaManager.Instance.GetBirdOverlay();
if (num == 1) if (icon == 1)
{ {
component.sprite = Tools.GetIconForUser(BazookaManager.Instance.GetAccountID() ?? 0); birdRender.sprite = Tools.GetIconForUser(BazookaManager.Instance.GetAccountID() ?? 0);
} }
else else
{ {
component.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + num); birdRender.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + icon);
} }
if (num2 == 8) if (iconOverlay == 8)
{ {
overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + num2); overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + iconOverlay);
overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.37f, 0.32f, 0f); overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.37f, 0.32f, 0f);
} }
else if (num2 == 11) else if (iconOverlay == 11)
{ {
overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + num2); overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + iconOverlay);
overlayRender.transform.localScale = new UnityEngine.Vector3(1.1f, 1.1f, 1.1f); //yea i didnt feel like doing it for all lmao overlayRender.transform.localScale = new UnityEngine.Vector3(1.1f, 1.1f, 1.1f); //yea i didnt feel like doing it for all lmao
overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.3141809f, 0.4324968f, 0f); overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.3141809f, 0.4324968f, 0f);
} }
else if (num2 == 13) else if (iconOverlay == 13)
{ {
overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + num2); overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + iconOverlay);
overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.3559977f, 0.3179995f, 0f); overlayRender.transform.localPosition = new UnityEngine.Vector3(-0.3559977f, 0.3179995f, 0f);
} }
else else
{ {
overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + num2); overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + iconOverlay);
} }
if (component.sprite == null) if (birdRender.sprite == null)
{ {
component.sprite = Resources.Load<Sprite>("Icons/Icons/bird_1"); birdRender.sprite = Resources.Load<Sprite>("Icons/Icons/bird_1");
BazookaManager.Instance.SetBirdIcon(1); BazookaManager.Instance.SetBirdIcon(1);
} }
if (overlayRender.sprite == null && num2 != 0) if (overlayRender.sprite == null && iconOverlay != 0)
{ {
overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_1"); overlayRender.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_1");
BazookaManager.Instance.SetBirdOverlay(1); BazookaManager.Instance.SetBirdOverlay(1);
} }
} }
// else if (customIconData.Selected != null) else if (customIconData.Selected != null)
// foreach (var icon in customIconData.Purchased) foreach (var icon in customIconData.Purchased)
// if (icon == customIconData.Selected) if (icon == customIconData.Selected)
// Tools.RenderFromBase64(icon, component); {
var waitingForCustomIcon = birdRender.gameObject.AddComponent<WaitingForCustomIcon>();
waitingForCustomIcon.ID = customIconData.Selected;
CustomIconLoader.Init(new[] { waitingForCustomIcon });
}
lastMoveTime = Time.time; lastMoveTime = Time.time;
UnityEngine.InputSystem.EnhancedTouch.EnhancedTouchSupport.Enable(); UnityEngine.InputSystem.EnhancedTouch.EnhancedTouchSupport.Enable();