1
0
mirror of https://github.com/boudji-ludwig-pett/cnam-geometry-dash.git synced 2025-04-07 21:53:50 +02:00

fix: prefabs repository

This commit is contained in:
Vincent PETT 2025-03-31 18:27:00 +02:00
parent a8194fbe5c
commit fb89b825e1
26 changed files with 214 additions and 116 deletions

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 3833dfe1496771446b75d5cd094772f6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: a92ad937ccaadf0498fdf7b295d45306
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 7571d32f9472d2c43afeeab883152b28
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: d5bc1f9732ed1994dbafab6dc73651e2
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -194,37 +194,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 48961998}
m_CullTransparentMesh: 1
--- !u!1 &388989105
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 388989106}
m_Layer: 0
m_Name: PortalGroup
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &388989106
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 388989105}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.9290543, y: 0.2814547, z: 0.0022875525}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &394350960
GameObject:
m_ObjectHideFlags: 0
@ -267,7 +236,7 @@ GameObject:
- component: {fileID: 626596276}
- component: {fileID: 626596275}
m_Layer: 0
m_Name: Low
m_Name: Next
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -319,7 +288,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 746393165}
m_TargetAssemblyTypeName: LevelEditor, Assembly-CSharp
m_MethodName: ToggleButtonGroup
m_MethodName: NextPage
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -328,7 +297,7 @@ MonoBehaviour:
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_CallState: 1
--- !u!4 &626596276
Transform:
m_ObjectHideFlags: 0
@ -338,7 +307,7 @@ Transform:
m_GameObject: {fileID: 626596274}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.9290543, y: 0.2814547, z: 0.0022875525}
m_LocalPosition: {x: 425, y: 200, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -523,6 +492,81 @@ Canvas:
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!1 &740715250
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 740715251}
- component: {fileID: 740715253}
- component: {fileID: 740715252}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &740715251
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 740715250}
m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 938472361}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 350, y: 200}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &740715252
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 740715250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -2614270113051161491, guid: 1a4b9963b2ecc314094fb85c0b9c147a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &740715253
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 740715250}
m_CullTransparentMesh: 1
--- !u!1 &746393161
GameObject:
m_ObjectHideFlags: 0
@ -630,7 +674,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
mapParent: {fileID: 0}
blockGroupContainer: {fileID: 394350961}
portalGroupContainer: {fileID: 388989106}
buttonPrefabTemplate: {fileID: 1993500743}
--- !u!1 &782585331
GameObject:
@ -707,6 +750,108 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 782585331}
m_CullTransparentMesh: 1
--- !u!1 &938472360
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 938472361}
- component: {fileID: 938472364}
- component: {fileID: 938472363}
- component: {fileID: 938472362}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &938472361
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 938472360}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 740715251}
m_Father: {fileID: 1152618754}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &938472362
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 938472360}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &938472363
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 938472360}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &938472364
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 938472360}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!1 &1031094285
GameObject:
m_ObjectHideFlags: 0
@ -818,15 +963,31 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1152618754}
- component: {fileID: 1152618753}
- component: {fileID: 1152618755}
m_Layer: 0
m_Name: High
m_Name: Previous
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1152618753
--- !u!4 &1152618754
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1152618752}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 350, y: 200, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 938472361}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1152618755
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -872,7 +1033,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 746393165}
m_TargetAssemblyTypeName: LevelEditor, Assembly-CSharp
m_MethodName: ToggleButtonGroup
m_MethodName: PreviousPage
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -882,21 +1043,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!4 &1152618754
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1152618752}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.9290543, y: 0.2814547, z: 0.0022875525}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1198906144
GameObject:
m_ObjectHideFlags: 0
@ -1682,16 +1828,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2136442822}
m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
m_LocalRotation: {x: 1, y: 0, z: 0, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1572318264}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 180}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 400, y: -200}
m_AnchoredPosition: {x: 425, y: 200}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2136442824
@ -1745,4 +1891,3 @@ SceneRoots:
- {fileID: 1152618754}
- {fileID: 1993500746}
- {fileID: 394350961}
- {fileID: 388989106}

@ -13,15 +13,12 @@ public class LevelEditor : MonoBehaviour
[Header("UI")]
public Transform blockGroupContainer;
public Transform portalGroupContainer;
public GameObject buttonPrefabTemplate;
private bool showingBlocks = true;
private int currentPage = 0;
private const int buttonsPerPage = 8;
private const int buttonsPerPage = 4;
private List<GameObject> blockPrefabs = new();
private List<GameObject> portalPrefabs = new();
private List<GameObject> currentButtons = new();
private GameObject resizingTarget = null;
@ -40,19 +37,14 @@ public class LevelEditor : MonoBehaviour
void LoadPrefabs()
{
blockPrefabs.AddRange(Resources.LoadAll<GameObject>("Prefabs/Block"));
blockPrefabs.AddRange(Resources.LoadAll<GameObject>("Prefabs/Spike"));
portalPrefabs.AddRange(Resources.LoadAll<GameObject>("Prefabs/Portals"));
portalPrefabs.AddRange(Resources.LoadAll<GameObject>("Prefabs/Bonus"));
blockPrefabs.AddRange(Resources.LoadAll<GameObject>("Prefabs"));
}
void GenerateButtons()
{
ClearCurrentButtons();
List<GameObject> source = showingBlocks ? blockPrefabs : portalPrefabs;
Transform container = showingBlocks ? blockGroupContainer : portalGroupContainer;
Transform container = blockGroupContainer;
if (container == null || buttonPrefabTemplate == null)
{
@ -61,7 +53,7 @@ public class LevelEditor : MonoBehaviour
}
int start = currentPage * buttonsPerPage;
int end = Mathf.Min(start + buttonsPerPage, source.Count);
int end = Mathf.Min(start + buttonsPerPage, blockPrefabs.Count);
for (int i = start; i < end; i++)
{
@ -86,15 +78,15 @@ public class LevelEditor : MonoBehaviour
Image iconImage = icon.GetComponent<Image>();
bgImage.sprite = Resources.Load<Sprite>("InGame/ButtonSkin/BlankSquare");
iconImage.sprite = source[i].GetComponent<SpriteRenderer>()?.sprite;
iconImage.sprite = blockPrefabs[i].GetComponent<SpriteRenderer>()?.sprite;
string prefabName = source[i].name.ToLower();
string prefabName = blockPrefabs[i].name.ToLower();
if (prefabName.Contains("smallspike") || prefabName.Contains("smallobstacle"))
icon.GetComponent<RectTransform>().sizeDelta = new Vector2(50, 25);
else
icon.GetComponent<RectTransform>().sizeDelta = new Vector2(50, 50);
GameObject prefab = source[i];
GameObject prefab = blockPrefabs[i];
button.GetComponent<Button>().onClick.AddListener(() => SelectPrefab(prefab));
currentButtons.Add(button);
}
@ -108,16 +100,10 @@ public class LevelEditor : MonoBehaviour
currentButtons.Clear();
}
public void ToggleButtonGroup()
{
showingBlocks = !showingBlocks;
currentPage = 0;
GenerateButtons();
}
public void NextPage()
{
int maxPage = Mathf.CeilToInt((showingBlocks ? blockPrefabs.Count : portalPrefabs.Count) / (float)buttonsPerPage);
int maxPage = 3;
Debug.Log(currentPage);
if (currentPage < maxPage - 1)
{
currentPage++;
@ -127,6 +113,7 @@ public class LevelEditor : MonoBehaviour
public void PreviousPage()
{
Debug.Log(currentPage);
if (currentPage > 0)
{
currentPage--;
@ -192,7 +179,6 @@ public class LevelEditor : MonoBehaviour
}
}
// Sélection pour redimensionnement
if (Input.GetMouseButtonDown(0) && !isPlacingBlock)
{
Vector2 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
@ -216,7 +202,6 @@ public class LevelEditor : MonoBehaviour
}
}
// Étirement en cours
if (isResizing && resizingTarget != null)
{
Vector3 currentMousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);