CLIENT-GAME: Modif how menu builder build entities

MINOR
X-R-G-B · Nov 2, 2023 · d4a3d90 · d4a3d90
1 parent ea0e08f
commit d4a3d90
Show file tree

Hide file tree

Showing 13 changed files with 231 additions and 295 deletions.
diff --git a/assets/Json/createLobby.json b/assets/Json/createLobby.json
@@ -1,10 +1,11 @@
 {
-  "createLobbyMenu": {
-    "goBack": {
+  "createLobbyMenu": [
+    {
       "type": "button",
       "spritePath": "assets/Menu/button.png",
       "width": 1600,
       "height": 1000,
+      "callback": "goToSelectLobby",
       "rect": {
         "x": 0.0,
         "y": 0.0,
@@ -48,7 +49,7 @@
         }
       ]
     },
-    "goBackText": {
+    {
       "type": "text",
       "text": "Go Back",
       "color": "red",
@@ -58,7 +59,7 @@
         "y": 875
       }
     },
-    "name-text" : {
+    {
       "type": "text",
       "color": "red",
       "size": 2,
@@ -68,7 +69,7 @@
         "y": 1700
       }
     },
-    "name": {
+    {
       "name": "name",
       "type": "input",
       "font": "assets/Fonts/soliden/SolidenTrial-Black.otf",
@@ -126,7 +127,7 @@
         }
       ]
     },
-    "maxNb-text" : {
+    {
       "type": "text",
       "color": "red",
       "size": 2,
@@ -136,7 +137,7 @@
         "y": 3700
       }
     },
-    "maxNb": {
+    {
       "name": "maxNb",
       "type": "input",
       "font": "assets/Fonts/soliden/SolidenTrial-Black.otf",
@@ -194,7 +195,7 @@
         }
       ]
     },
-    "createLobby-text" : {
+    {
       "type": "text",
       "color": "red",
       "size": 3,
@@ -204,7 +205,7 @@
         "y": 6500
       }
     },
-    "gametype_normal-text" : {
+    {
       "type": "text",
       "color": "white",
       "size": 2,
@@ -214,9 +215,10 @@
         "y": 7600
       }
     },
-    "gametype_normal": {
+    {
       "type": "button",
       "spritePath": "assets/Menu/button.png",
+      "callback": "onButtonCreateLobbyNormalClicked",
       "width": 2500,
       "height" : 1250,
       "rect": {
@@ -275,5 +277,5 @@
         }
       ]
     }
-  }
+  ]
 }
diff --git a/assets/Json/menu.json b/assets/Json/menu.json
@@ -1,7 +1,8 @@
 {
-    "menu": {
-        "connect": {
+    "menu": [
+        {
             "type": "button",
+            "callback": "initConnection",
             "spritePath": "assets/Menu/button.png",
             "width": 3000,
             "height" : 1500,
@@ -48,7 +49,7 @@
                 }
             ]
         },
-        "ip": {
+        {
             "name": "ip",
             "type": "input",
             "font": "assets/Fonts/soliden/SolidenTrial-Black.otf",
@@ -106,7 +107,7 @@
                 }
             ]
         },
-        "host": {
+        {
             "name": "port",
             "type": "input",
             "font": "assets/Fonts/soliden/SolidenTrial-Black.otf",
@@ -164,7 +165,7 @@
                 }
             ]
         },
-        "ip-text" : {
+        {
             "type": "text",
             "color": "red",
             "size": 2,
@@ -174,7 +175,7 @@
                 "y": 2500
             }
         },
-        "host-text" : {
+        {
             "type": "text",
             "color": "red",
             "size": 2,
@@ -184,7 +185,7 @@
                 "y": 4400
             }
         },
-        "connect-text" : {
+        {
             "type": "text",
             "color": "red",
             "size": 3,
@@ -194,5 +195,5 @@
                 "y": 7000
             }
         }
-    }
+    ]
 }