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

UnityGame/Assets/MiniGames/2_Flappy/MG2.cs

@@ -77,7 +77,7 @@ public bool PlayerButtonPress(int player, int button, bool pressed)
         {
             var curFlap = Flappers[player];
             var rigidBody = curFlap.GetComponent<Rigidbody>();
-            if (button == 1 && pressed)
+            if (button == 1 && pressed && rigidBody.transform.localPosition.y < 7)
             {
                 rigidBody.velocity = new Vector3(0, 15, 0);
                 SoundManager.PlaySound(SoundManager.Instance.Sounds.FlappyFlap);

UnityGame/Assets/MiniGames/FinalSpaceGame/FinalSpaceGame.unity

@@ -644,8 +644,14 @@ PrefabInstance:
     - target: {fileID: 2510609710808850875, guid: aa218cfa86e7252448101129d0700ecf,
         type: 3}
       propertyPath: duration
-      value: 1
+      value: 10
       objectReference: {fileID: 0}
+    - target: {fileID: 3771529780342604794, guid: aa218cfa86e7252448101129d0700ecf,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: a604bb0f154747a4a81aac3fb0192dae,
+        type: 3}
     - target: {fileID: 5165146769304598287, guid: aa218cfa86e7252448101129d0700ecf,
         type: 3}
       propertyPath: StartGame.m_PersistentCalls.m_Calls.Array.size

UnityGame/Assets/Scenes/ClaimRewardScene.unity

@@ -935,16 +935,16 @@ RectTransform:
   m_GameObject: {fileID: 1275317123}
   m_LocalRotation: {x: 0, y: 0, z: -0.87952405, w: 0.47585452}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.45, y: 0.45, z: 0.45}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 638792738}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -123.17}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -726, y: 393}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: -60.3, y: 16.3}
   m_SizeDelta: {x: 623, y: 991}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1275317125
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1163,16 +1163,16 @@ RectTransform:
   m_GameObject: {fileID: 1425858923}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.23, y: 0.23, z: 0.23}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 1810930640}
   m_Father: {fileID: 638792738}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 48}
-  m_SizeDelta: {x: 256, y: 100}
+  m_SizeDelta: {x: 1011, y: 643}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1425858925
 MonoBehaviour:
@@ -1404,16 +1404,16 @@ RectTransform:
   m_GameObject: {fileID: 1590179769}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.23, y: 0.23, z: 0.23}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 1554886820}
   m_Father: {fileID: 638792738}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: -300, y: 48}
-  m_SizeDelta: {x: 256, y: 100}
+  m_SizeDelta: {x: 1011, y: 643}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1590179771
 MonoBehaviour:
@@ -1548,16 +1548,16 @@ RectTransform:
   m_GameObject: {fileID: 1622956916}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.23, y: 0.23, z: 0.23}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 1368078918}
   m_Father: {fileID: 638792738}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 300, y: 48}
-  m_SizeDelta: {x: 256, y: 100}
+  m_SizeDelta: {x: 1011, y: 643}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1622956918
 MonoBehaviour:

UnityGame/Assets/Scenes/MainMenu.unity

@@ -2337,7 +2337,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &720387300
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4455,8 +4455,8 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 755598333}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.7, y: 0}
+  m_AnchorMax: {x: 0.7, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -5192,7 +5192,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -24.3, y: -5.299988}
+  m_AnchoredPosition: {x: -46.7, y: -5.299988}
   m_SizeDelta: {x: 800, y: 50}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1781111280
@@ -5215,7 +5215,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Join at https://ld54.devedse.duckdns.org/
+  m_text: Join at https://frib.itch.io/bimbis-cosmo-party
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -5581,7 +5581,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1862655536
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5977,7 +5977,7 @@ RectTransform:
   m_Father: {fileID: 690110155}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0.7, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}