Merge branch 'develop' of github.com:boudji-ludwig-pett/cnam-geometry-dash into develop

This commit is contained in:
Vincent PETT 2025-05-17 20:21:50 +02:00
commit 699ba78ae4
2 changed files with 7 additions and 7 deletions

View File

@ -5559,7 +5559,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -359.836} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -359.836}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -498, y: 257.98} m_AnchoredPosition: {x: -568, y: 293}
m_SizeDelta: {x: 78.3177, y: 71.7616} m_SizeDelta: {x: 78.3177, y: 71.7616}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &590020933 --- !u!114 &590020933
@ -5854,7 +5854,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 480.93127, y: 252.93127} m_AnchoredPosition: {x: 579, y: 290}
m_SizeDelta: {x: 81.8625, y: 81.8625} m_SizeDelta: {x: 81.8625, y: 81.8625}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &678214374 --- !u!114 &678214374
@ -6157,7 +6157,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 357, y: -266} m_AnchoredPosition: {x: -431, y: -307}
m_SizeDelta: {x: 50, y: 50} m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &740715252 --- !u!114 &740715252
@ -7342,7 +7342,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -437, y: -263} m_AnchoredPosition: {x: -569, y: -306}
m_SizeDelta: {x: 75, y: 75} m_SizeDelta: {x: 75, y: 75}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1561821049 --- !u!114 &1561821049
@ -7650,7 +7650,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 419, y: -266} m_AnchoredPosition: {x: 150, y: -306}
m_SizeDelta: {x: 50, y: 50} m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1628925094 --- !u!114 &1628925094

View File

@ -99,8 +99,8 @@ public class LevelEditor : MonoBehaviour
float xOff = -325f + idx * 125f; float xOff = -325f + idx * 125f;
var bgRt = bg.GetComponent<RectTransform>(); var bgRt = bg.GetComponent<RectTransform>();
var icRt = icon.GetComponent<RectTransform>(); var icRt = icon.GetComponent<RectTransform>();
bgRt.anchoredPosition = new Vector2(xOff, bgRt.anchoredPosition.y - 70); bgRt.anchoredPosition = new Vector2(xOff, bgRt.anchoredPosition.y - 110);
icRt.anchoredPosition = new Vector2(xOff, icRt.anchoredPosition.y - 70); icRt.anchoredPosition = new Vector2(xOff, icRt.anchoredPosition.y - 110);
bg.GetComponent<Image>().sprite = Resources.Load<Sprite>("InGame/ButtonSkin/BlankSquare"); bg.GetComponent<Image>().sprite = Resources.Load<Sprite>("InGame/ButtonSkin/BlankSquare");
icon.GetComponent<Image>().sprite = prefab.GetComponent<SpriteRenderer>()?.sprite; icon.GetComponent<Image>().sprite = prefab.GetComponent<SpriteRenderer>()?.sprite;
icRt.sizeDelta = prefab.name.ToLower().Contains("small") icRt.sizeDelta = prefab.name.ToLower().Contains("small")