Merge branch 'master' of https://github.com/devedse/LD54

devedse · Oct 2, 2023 · fe95288 · fe95288
2 parents 4206c50 + e7202a6
commit fe95288
Show file tree

Hide file tree

Showing 10 changed files with 182 additions and 17 deletions.
diff --git a/ImagesEnzo/Menus/MainMenu.png b/ImagesEnzo/Menus/MainMenu.png
diff --git a/ImagesEnzo/Menus/MainMenu_640x512.png b/ImagesEnzo/Menus/MainMenu_640x512.png
diff --git a/UnityGame/Assets/Materials/Textures/Textures UI/Titel.png b/UnityGame/Assets/Materials/Textures/Textures UI/Titel.png
diff --git a/UnityGame/Assets/Materials/Textures/Tutorials/cheezy.png.meta b/UnityGame/Assets/Materials/Textures/Tutorials/cheezy.png.meta
diff --git a/UnityGame/Assets/Materials/Textures/Tutorials/diamondigger.png.meta b/UnityGame/Assets/Materials/Textures/Tutorials/diamondigger.png.meta
diff --git a/UnityGame/Assets/Materials/Textures/Tutorials/flipflap.png.meta b/UnityGame/Assets/Materials/Textures/Tutorials/flipflap.png.meta
diff --git a/UnityGame/Assets/MiniGames/1_Cheezy/1_Cheezy.unity b/UnityGame/Assets/MiniGames/1_Cheezy/1_Cheezy.unity
@@ -630,11 +630,16 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2510609710808850875, guid: aa218cfa86e7252448101129d0700ecf,
+        type: 3}
+      propertyPath: duration
+      value: 10
+      objectReference: {fileID: 0}
     - target: {fileID: 3771529780342604794, guid: aa218cfa86e7252448101129d0700ecf,
         type: 3}
       propertyPath: m_Sprite
       value: 
-      objectReference: {fileID: 21300000, guid: ea8b404b2df57a74490a51a1446bfca4,
+      objectReference: {fileID: 21300000, guid: b5701d63234684a4a85207b46cb8f553,
         type: 3}
     - target: {fileID: 5165146769304598287, guid: aa218cfa86e7252448101129d0700ecf,
         type: 3}

diff --git a/UnityGame/Assets/MiniGames/2_Flappy/2_Flappy.unity b/UnityGame/Assets/MiniGames/2_Flappy/2_Flappy.unity
@@ -372,6 +372,17 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2510609710808850875, guid: aa218cfa86e7252448101129d0700ecf,
+        type: 3}
+      propertyPath: duration
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3771529780342604794, guid: aa218cfa86e7252448101129d0700ecf,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: ccf2d56fe77583040802dfb1cead01f5,
+        type: 3}
     - target: {fileID: 5165146769304598287, guid: aa218cfa86e7252448101129d0700ecf,
         type: 3}
       propertyPath: StartGame.m_PersistentCalls.m_Calls.Array.size

diff --git a/UnityGame/Assets/MiniGames/Diggerino/Diggerino.unity b/UnityGame/Assets/MiniGames/Diggerino/Diggerino.unity
@@ -285,6 +285,7 @@ MonoBehaviour:
   totalDiamonds: 0
   GridSize: 16
   Players: []
+  IsReady: 0
 --- !u!4 &785887604
 Transform:
   m_ObjectHideFlags: 0
@@ -308,6 +309,17 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2510609710808850875, guid: aa218cfa86e7252448101129d0700ecf,
+        type: 3}
+      propertyPath: duration
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3771529780342604794, guid: aa218cfa86e7252448101129d0700ecf,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 43006b28b225c2142be821c1207fd12b,
+        type: 3}
     - target: {fileID: 5165146769304598287, guid: aa218cfa86e7252448101129d0700ecf,
         type: 3}
       propertyPath: StartCountdown.m_PersistentCalls.m_Calls.Array.size

diff --git a/UnityGame/Assets/Scenes/MainMenu.unity b/UnityGame/Assets/Scenes/MainMenu.unity
@@ -4429,6 +4429,7 @@ MonoBehaviour:
   PlayerColors: {fileID: 11400000, guid: 5482207a01491234893771505d4b799e, type: 2}
   AllModules: {fileID: 11400000, guid: d84441201f129b948830c709d2b71d39, type: 2}
   NextModuleReward: {fileID: 0}
+  CurrentMinigame: {fileID: 0}
   SignalR: {fileID: 1595624814}
   Games: {fileID: 11400000, guid: d23a8f37d71b5e54bbfcfec848ba3417, type: 2}
   GameIndex: -1