5 Commits

9 changed files with 76 additions and 63 deletions

View File

@ -335,7 +335,7 @@
{
"type": "CubePortal",
"x": 363.0,
"y": 5.0,
"y": 4.3,
"scaleX": 1.0,
"scaleY": 1.0,
"rotationZ": 0.0
@ -2044,14 +2044,6 @@
"scaleY": 0.10999999940395355,
"rotationZ": 180.0
},
{
"type": "Spike",
"x": 329.8699951171875,
"y": 9.8100004196167,
"scaleX": 0.15000000596046449,
"scaleY": 0.15000000596046449,
"rotationZ": 180.0
},
{
"type": "Spike",
"x": 293.70001220703127,
@ -2059,6 +2051,14 @@
"scaleX": 0.15000000596046449,
"scaleY": 0.15000000596046449,
"rotationZ": 0.0
},
{
"type": "Spike",
"x": 329.8699951171875,
"y": 9.8100004196167,
"scaleX": 0.15000000596046449,
"scaleY": 0.15000000596046449,
"rotationZ": 180.0
}
]
}

View File

@ -17,7 +17,7 @@ public class LevelElement
[System.Serializable]
public class Level
{
public static readonly int LAST_X = 15;
public static readonly int LAST_X = 25;
public string JsonName { get; set; }
public int TotalJumps { get; set; }
public int TotalAttempts { get; set; }
@ -35,13 +35,15 @@ public class Level
{
get
{
LevelElement lastElement = elements[^1];
float lastX = LAST_X;
if (lastElement != null)
float maxX = LAST_X;
foreach (var element in elements)
{
lastX += lastElement.x;
if (element.x > maxX)
{
maxX = element.x;
}
}
return lastX;
return maxX + LAST_X;
}
}

View File

@ -99,8 +99,8 @@ public class LevelEditor : MonoBehaviour
float xOff = -325f + idx * 125f;
var bgRt = bg.GetComponent<RectTransform>();
var icRt = icon.GetComponent<RectTransform>();
bgRt.anchoredPosition = new Vector2(xOff, bgRt.anchoredPosition.y - 70);
icRt.anchoredPosition = new Vector2(xOff, icRt.anchoredPosition.y - 70);
bgRt.anchoredPosition = new Vector2(xOff, bgRt.anchoredPosition.y - 110);
icRt.anchoredPosition = new Vector2(xOff, icRt.anchoredPosition.y - 110);
bg.GetComponent<Image>().sprite = Resources.Load<Sprite>("InGame/ButtonSkin/BlankSquare");
icon.GetComponent<Image>().sprite = prefab.GetComponent<SpriteRenderer>()?.sprite;
icRt.sizeDelta = prefab.name.ToLower().Contains("small")
@ -211,14 +211,14 @@ public class LevelEditor : MonoBehaviour
{
if (IsBlockedBySameTypeInSnapDirection())
{
Debug.LogError("Impossible de poser un spike sur un autre spike !");
Debug.LogError("Impossible de poser un spike sur un autre spike !");
Destroy(currentBlock);
}
else
{
if (!SnapSpikeByRotation())
{
Debug.LogError("Impossible de poser un spike dans le vide !");
Debug.LogError("Impossible de poser un spike dans le vide !");
Destroy(currentBlock);
}
else
@ -231,7 +231,6 @@ public class LevelEditor : MonoBehaviour
{
TrySnapToNearbyBlock();
// 🔧 Réduction du collider du ObstacleKiller si cest un ObstacleBlock
if (name.Contains("obstacleblock"))
{
foreach (Transform child in currentBlock.transform)
@ -244,7 +243,6 @@ public class LevelEditor : MonoBehaviour
Vector2 originalSize = col.size;
col.size = new Vector2(originalSize.x, 1f);
col.offset = new Vector2(col.offset.x, -0.5f);
Debug.Log($"✂️ Collider réduit pour {child.name} → {col.size}");
}
}
}

View File

@ -1,16 +1,16 @@
{
"dependencies": {
"com.unity.collab-proxy": "2.6.0",
"com.unity.collab-proxy": "2.8.1",
"com.unity.feature.2d": "2.0.1",
"com.unity.ide.rider": "3.0.31",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.inputsystem": "1.11.2",
"com.unity.ide.rider": "3.0.36",
"com.unity.ide.visualstudio": "2.0.23",
"com.unity.inputsystem": "1.14.0",
"com.unity.multiplayer.center": "1.0.0",
"com.unity.test-framework": "1.4.5",
"com.unity.test-framework": "1.5.1",
"com.unity.timeline": "1.8.7",
"com.unity.toolchain.linux-x86_64": "2.0.10",
"com.unity.ugui": "2.0.0",
"com.unity.visualscripting": "1.9.4",
"com.unity.visualscripting": "1.9.6",
"com.yasirkula.simplefilebrowser": "https://github.com/yasirkula/UnitySimpleFileBrowser.git",
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.ai": "1.0.0",

View File

@ -1,11 +1,11 @@
{
"dependencies": {
"com.unity.2d.animation": {
"version": "10.1.3",
"version": "10.1.4",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "9.0.6",
"com.unity.2d.common": "9.0.7",
"com.unity.2d.sprite": "1.0.0",
"com.unity.collections": "1.2.4",
"com.unity.modules.animation": "1.0.0",
@ -14,7 +14,7 @@
"url": "https://packages.unity.com"
},
"com.unity.2d.aseprite": {
"version": "1.1.6",
"version": "1.1.9",
"depth": 1,
"source": "registry",
"dependencies": {
@ -26,7 +26,7 @@
"url": "https://packages.unity.com"
},
"com.unity.2d.common": {
"version": "9.0.6",
"version": "9.0.7",
"depth": 2,
"source": "registry",
"dependencies": {
@ -62,11 +62,11 @@
"dependencies": {}
},
"com.unity.2d.spriteshape": {
"version": "10.0.6",
"version": "10.0.7",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "9.0.5",
"com.unity.2d.common": "9.0.7",
"com.unity.mathematics": "1.1.0",
"com.unity.modules.physics2d": "1.0.0"
},
@ -82,11 +82,10 @@
}
},
"com.unity.2d.tilemap.extras": {
"version": "4.0.2",
"version": "4.1.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.modules.tilemap": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
@ -94,7 +93,7 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.8.18",
"version": "1.8.21",
"depth": 3,
"source": "registry",
"dependencies": {
@ -104,7 +103,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.6.0",
"version": "2.8.1",
"depth": 0,
"source": "registry",
"dependencies": {},
@ -125,27 +124,26 @@
"com.unity.ext.nunit": {
"version": "2.0.5",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"source": "builtin",
"dependencies": {}
},
"com.unity.feature.2d": {
"version": "2.0.1",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.2d.animation": "10.1.3",
"com.unity.2d.animation": "10.1.4",
"com.unity.2d.pixel-perfect": "5.0.3",
"com.unity.2d.psdimporter": "9.0.3",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "10.0.6",
"com.unity.2d.spriteshape": "10.0.7",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.2d.tilemap.extras": "4.0.2",
"com.unity.2d.aseprite": "1.1.6"
"com.unity.2d.tilemap.extras": "4.1.0",
"com.unity.2d.aseprite": "1.1.9"
}
},
"com.unity.ide.rider": {
"version": "3.0.31",
"version": "3.0.36",
"depth": 0,
"source": "registry",
"dependencies": {
@ -154,7 +152,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.22",
"version": "2.0.23",
"depth": 0,
"source": "registry",
"dependencies": {
@ -163,7 +161,7 @@
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.11.2",
"version": "1.14.0",
"depth": 0,
"source": "registry",
"dependencies": {
@ -210,22 +208,21 @@
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.4.5",
"version": "1.5.1",
"depth": 0,
"source": "registry",
"source": "builtin",
"dependencies": {
"com.unity.ext.nunit": "2.0.3",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.com"
}
},
"com.unity.test-framework.performance": {
"version": "3.0.3",
"version": "3.1.0",
"depth": 3,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.31",
"com.unity.test-framework": "1.1.33",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.com"
@ -262,7 +259,7 @@
}
},
"com.unity.visualscripting": {
"version": "1.9.4",
"version": "1.9.6",
"depth": 0,
"source": "registry",
"dependencies": {

View File

@ -91,7 +91,7 @@ PlayerSettings:
submitAnalytics: 1
usePlayerLog: 1
dedicatedServerOptimizations: 1
bakeCollisionMeshes: 0
bakeCollisionMeshes: 1
forceSingleInstance: 1
useFlipModelSwapchain: 1
resizableWindow: 0
@ -140,7 +140,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: v1.0.0
bundleVersion: v1.0.2
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
@ -699,7 +699,7 @@ PlayerSettings:
tvOS: 1
incrementalIl2cppBuild: {}
suppressCommonWarnings: 1
allowUnsafeCode: 0
allowUnsafeCode: 1
useDeterministicCompilation: 1
additionalIl2CppArgs:
scriptingRuntimeVersion: 1

View File

@ -1,2 +1,2 @@
m_EditorVersion: 6000.0.25f1
m_EditorVersionWithRevision: 6000.0.25f1 (4859ab7b5a49)
m_EditorVersion: 6000.0.49f1
m_EditorVersionWithRevision: 6000.0.49f1 (840e0a9776d9)

View File

@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 53
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
m_Name:
m_EditorClassIdentifier:
assetDefaultFramerate: 60
m_DefaultFrameRate: 60

View File

@ -6,9 +6,9 @@ Développement d'une reproduction du jeu [Geometry Dash](https://fr.wikipedia.or
Afin de tester le jeu, plusieurs `.zip` avec l'exécutable sont disponibles, généré automatiquement grâce au déploiement continu de [GameCI](https://game.ci/), en fonction du système d'exploitation:
- [Windows (x64)](https://github.com/boudji-ludwig-pett/cnam-geometry-dash/releases/download/v1.0.0/windows.zip)
- [GNU/Linux (x64)](https://github.com/boudji-ludwig-pett/cnam-geometry-dash/releases/download/v1.0.0/linux.zip)
- [macOS (x64)](https://github.com/boudji-ludwig-pett/cnam-geometry-dash/releases/download/v1.0.0/macOS.zip)
- [Windows (x64)](https://github.com/boudji-ludwig-pett/cnam-geometry-dash/releases/download/v1.0.2/windows.zip)
- [GNU/Linux (x64)](https://github.com/boudji-ludwig-pett/cnam-geometry-dash/releases/download/v1.0.2/linux.zip)
- [macOS (x64)](https://github.com/boudji-ludwig-pett/cnam-geometry-dash/releases/download/v1.0.2/macOS.zip)
### Membres du groupe
@ -28,7 +28,7 @@ Afin de tester le jeu, plusieurs `.zip` avec l'exécutable sont disponibles, gé
## Prérequis
[Unity](https://unity.com/) v6000.0.25f1 (LTS)
[Unity](https://unity.com/) v6000.0.49f1 (LTS)
## Installation