WIP nightly v1.8.0.0 (11/19)

ipodtouch0218 · Nov 19, 2023 · 79595fc · 79595fc
1 parent 1a55e15
commit 79595fc
Show file tree

Hide file tree

Showing 11 changed files with 205 additions and 33 deletions.
diff --git a/Assets/Scenes/Levels/CustomBonus.unity b/Assets/Scenes/Levels/CustomBonus.unity
@@ -213,6 +213,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 1822763726
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -361,6 +366,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 2561
       objectReference: {fileID: 0}
+    - target: {fileID: 2331939488413250953, guid: 8cf8f49ac0882ed44953ea53ff901f11,
+        type: 3}
+      propertyPath: SortKey
+      value: 3977797490
+      objectReference: {fileID: 0}
     - target: {fileID: 2331939488413250953, guid: 8cf8f49ac0882ed44953ea53ff901f11,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -687,6 +697,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 1665211588
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -4473,6 +4488,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 3867191804
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -4583,6 +4603,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 1652288307
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -4840,6 +4865,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 2561
       objectReference: {fileID: 0}
+    - target: {fileID: 3681017443671302445, guid: 52fa37521c30ebb40ab4cac4ef31be57,
+        type: 3}
+      propertyPath: SortKey
+      value: 3852037494
+      objectReference: {fileID: 0}
     - target: {fileID: 3681017443671302445, guid: 52fa37521c30ebb40ab4cac4ef31be57,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -4928,6 +4958,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 2561
       objectReference: {fileID: 0}
+    - target: {fileID: 3681017443671302445, guid: 52fa37521c30ebb40ab4cac4ef31be57,
+        type: 3}
+      propertyPath: SortKey
+      value: 1126986781
+      objectReference: {fileID: 0}
     - target: {fileID: 3681017443671302445, guid: 52fa37521c30ebb40ab4cac4ef31be57,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -5502,6 +5537,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 595481789
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -6969,6 +7009,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 1309251682
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -7191,6 +7236,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 2561
       objectReference: {fileID: 0}
+    - target: {fileID: 3681017443671302445, guid: 52fa37521c30ebb40ab4cac4ef31be57,
+        type: 3}
+      propertyPath: SortKey
+      value: 2986984469
+      objectReference: {fileID: 0}
     - target: {fileID: 3681017443671302445, guid: 52fa37521c30ebb40ab4cac4ef31be57,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -7360,6 +7410,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 3488478761
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -8499,6 +8554,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 294239631
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -17766,6 +17826,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 2561
       objectReference: {fileID: 0}
+    - target: {fileID: 2331939488413250953, guid: 8cf8f49ac0882ed44953ea53ff901f11,
+        type: 3}
+      propertyPath: SortKey
+      value: 2041609668
+      objectReference: {fileID: 0}
     - target: {fileID: 2331939488413250953, guid: 8cf8f49ac0882ed44953ea53ff901f11,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -17941,6 +18006,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 293883414
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -18086,6 +18156,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 2561
       objectReference: {fileID: 0}
+    - target: {fileID: 8059900885248764230, guid: 1ce5864bde999014a92015b065520add,
+        type: 3}
+      propertyPath: SortKey
+      value: 338383290
+      objectReference: {fileID: 0}
     - target: {fileID: 8059900885248764230, guid: 1ce5864bde999014a92015b065520add,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -18120,6 +18195,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 2561
       objectReference: {fileID: 0}
+    - target: {fileID: 3681017443671302445, guid: 52fa37521c30ebb40ab4cac4ef31be57,
+        type: 3}
+      propertyPath: SortKey
+      value: 1013294897
+      objectReference: {fileID: 0}
     - target: {fileID: 3681017443671302445, guid: 52fa37521c30ebb40ab4cac4ef31be57,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -18368,6 +18448,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 2561
       objectReference: {fileID: 0}
+    - target: {fileID: 8059900885248764230, guid: 1ce5864bde999014a92015b065520add,
+        type: 3}
+      propertyPath: SortKey
+      value: 1093048562
+      objectReference: {fileID: 0}
     - target: {fileID: 8059900885248764230, guid: 1ce5864bde999014a92015b065520add,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -18478,6 +18563,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 3202555178
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -18593,6 +18683,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 345431975
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -18703,6 +18798,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 2368767304
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]

diff --git a/Assets/Scenes/Levels/unofficial/DebugLevel.unity b/Assets/Scenes/Levels/unofficial/DebugLevel.unity
@@ -310,6 +310,31 @@ PrefabInstance:
       propertyPath: m_AnchorMin.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 903953614458399358, guid: 43d56bd18d06e9b4abe323618a20a228,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 903953614458399358, guid: 43d56bd18d06e9b4abe323618a20a228,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 903953614458399358, guid: 43d56bd18d06e9b4abe323618a20a228,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284403462586313449, guid: 43d56bd18d06e9b4abe323618a20a228,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1726141835936031342, guid: 43d56bd18d06e9b4abe323618a20a228,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1731295336454021316, guid: 43d56bd18d06e9b4abe323618a20a228,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -391,6 +416,16 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3537434420574305115, guid: 43d56bd18d06e9b4abe323618a20a228,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4269451001951704030, guid: 43d56bd18d06e9b4abe323618a20a228,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228,
         type: 3}
       propertyPath: tilemap
@@ -449,7 +484,7 @@ PrefabInstance:
     - target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228,
         type: 3}
       propertyPath: originalTiles.Array.size
-      value: 512
+      value: 1024
       objectReference: {fileID: 0}
     - target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228,
         type: 3}
@@ -1162,6 +1197,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5713209705635899267, guid: 43d56bd18d06e9b4abe323618a20a228,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5981962928583605274, guid: 43d56bd18d06e9b4abe323618a20a228,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6097373057582557604, guid: 43d56bd18d06e9b4abe323618a20a228,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -1348,6 +1393,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 4157375552812710484, guid: 9d1829544a867764ea85ac4428593208,
+        type: 3}
+      propertyPath: SortKey
+      value: 3249281513
+      objectReference: {fileID: 0}
     - target: {fileID: 4157375552812710484, guid: 9d1829544a867764ea85ac4428593208,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -2925,6 +2975,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 3315481743
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -5833,6 +5888,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
+        type: 3}
+      propertyPath: SortKey
+      value: 1095042120
+      objectReference: {fileID: 0}
     - target: {fileID: 8712797713821691440, guid: 946c21a210ac3094bba96c7e4190a452,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]
@@ -5927,6 +5987,11 @@ PrefabInstance:
       propertyPath: Flags
       value: 68097
       objectReference: {fileID: 0}
+    - target: {fileID: 8633693366087775819, guid: da972f64d20815e4487e3000ae7ce690,
+        type: 3}
+      propertyPath: SortKey
+      value: 3785144485
+      objectReference: {fileID: 0}
     - target: {fileID: 8633693366087775819, guid: da972f64d20815e4487e3000ae7ce690,
         type: 3}
       propertyPath: NetworkGuid.RawGuidValue.Array.data[0]

diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
@@ -29854,7 +29854,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 6, y: 0}
+  m_AnchoredPosition: {x: 6, y: 5.497558e+11}
   m_SizeDelta: {x: -40, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &823064027
@@ -46463,8 +46463,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 47220571}
   m_HandleRect: {fileID: 47220570}
   m_Direction: 2
-  m_Value: 1
-  m_Size: 0
+  m_Value: 0
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

diff --git a/Assets/Scripts/Entity/BigStar.cs b/Assets/Scripts/Entity/BigStar.cs
@@ -94,6 +94,7 @@ public override void Spawned() {
         }
 
         public override void Render() {
+            base.Render();
             if (IsStationary || (GameData.Instance?.GameEnded ?? false))
                 return;
-Original file line number
+Diff line change
@@ Expand Up / @@ -94,6 +94,7 @@ public override void Spawned() { @@
             }
             public override void Render() {
+                base.Render();
                 if (IsStationary || (GameData.Instance?.GameEnded ?? false))
                     return;
@@ Expand Down @@