Pasha/U10-MobileGame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

[Refactor] Reimplemented changing object sizes

Browse Source
This commit is contained in:
Pasha Bibko
2025-12-02 11:26:37 +00:00
parent 9265cbbf99
commit 933bf758d4
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Scenes/SampleScene.unity
View File

@@ -536,9 +536,9 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1158970873} m_Father: {fileID: 1158970873}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 100, y: -35} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 30} m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1227804579 --- !u!114 &1227804579
@@ -568,7 +568,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 3
m_MaxSize: 50 m_MaxSize: 50
m_Alignment: 0 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1

8
Assets/Scripts/GlobalOrbitalManager.cs
View File

@@ -214,9 +214,11 @@ public partial class OrbitalBehaviour
Vector2 a = orbital.TranslateToVector3(); Vector2 a = orbital.TranslateToVector3();
Vector2 b = m_PlayerInstance.TranslateToVector3(); Vector2 b = m_PlayerInstance.TranslateToVector3();
float distance = (a - b).magnitude; float d = (a - b).magnitude;
float radii = orbital.m_ObjectRadius + m_PlayerInstance.m_ObjectRadius;
if (distance > radii) float r1 = m_PlayerInstance.m_ObjectRadius * m_PlayerInstance.ObjectRadiusMultiplier;
float r2 = orbital.m_ObjectRadius * orbital.ObjectRadiusMultiplier;
if (d > (r1 + r2))
continue; continue;
m_PlayerInstance.OnOrbitalCollision(orbital); m_PlayerInstance.OnOrbitalCollision(orbital);

1
Assets/Scripts/OrbitalPosition.cs
View File

@@ -10,6 +10,7 @@ public partial class OrbitalBehaviour : MonoBehaviour
[SerializeField] private float m_DistanceFromCentre; [SerializeField] private float m_DistanceFromCentre;
[field: SerializeField] protected float ObjectRadiusMultiplier { get; set; } = 1.0f;
[field: SerializeField] protected bool IsAttachedToRings { get; set; } = true; [field: SerializeField] protected bool IsAttachedToRings { get; set; } = true;
protected void RegisterObject(OrbitalInitializer init) protected void RegisterObject(OrbitalInitializer init)

8
Assets/Scripts/PlayerController.cs
View File

@@ -63,23 +63,23 @@ public class PlayerController : OrbitalBehaviour
private IEnumerator OnGrowPlayerModifier() private IEnumerator OnGrowPlayerModifier()
{ {
transform.localScale *= 1.5f; transform.localScale *= 1.5f;
//m_OrbitalPosition.m_ObjectRadius *= 1.5f; ObjectRadiusMultiplier = 1.5f;
yield return new WaitForSecondsRealtime(15f); yield return new WaitForSecondsRealtime(15f);
transform.localScale /= 1.5f; transform.localScale /= 1.5f;
//m_OrbitalPosition.m_ObjectRadius /= 1.5f; ObjectRadiusMultiplier = 1.0f;
} }
private IEnumerator OnShrinkPlayerModifier() private IEnumerator OnShrinkPlayerModifier()
{ {
transform.localScale *= 0.6f; transform.localScale *= 0.6f;
//m_OrbitalPosition.m_ObjectRadius *= 0.6f; ObjectRadiusMultiplier = 0.6f;
yield return new WaitForSecondsRealtime(15f); yield return new WaitForSecondsRealtime(15f);
transform.localScale /= 0.6f; transform.localScale /= 0.6f;
//m_OrbitalPosition.m_ObjectRadius /= 0.6f; ObjectRadiusMultiplier = 1.0f;
} }
private IEnumerator TriggerInvincibility() private IEnumerator TriggerInvincibility()