#610 fix some issues

shieldgenerator7 · Sep 12, 2024 · 24c4064 · 24c4064
1 parent 04d939e
commit 24c4064
Show file tree

Hide file tree

Showing 2 changed files with 186 additions and 36 deletions.
diff --git a/Assets/Prefabs/Platforms/rock_balancing.prefab b/Assets/Prefabs/Platforms/rock_balancing.prefab
@@ -104,7 +104,7 @@ Rigidbody2D:
   m_Simulated: 1
   m_UseFullKinematicContacts: 0
   m_UseAutoMass: 0
-  m_Mass: 1
+  m_Mass: 100
   m_LinearDrag: 0
   m_AngularDrag: 0.05
   m_GravityScale: 0

diff --git a/Assets/Scenes/Levels/Desert.unity b/Assets/Scenes/Levels/Desert.unity
@@ -703,19 +703,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 230.219
+      value: 228.965
       objectReference: {fileID: 0}
     - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 233.53
+      value: 231.458
       objectReference: {fileID: 0}
     - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.8925558
+      value: -0.9171998
       objectReference: {fileID: 0}
     - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
       propertyPath: m_LocalRotation.x
@@ -727,7 +727,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0.45093703
+      value: 0.39842764
       objectReference: {fileID: 0}
     - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -739,7 +739,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
-      value: -53.608
+      value: -46.96
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -6459,6 +6459,80 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
   m_PrefabInstance: {fileID: 323774746}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &336421526
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 758428976}
+    m_Modifications:
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.7664
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.7664
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.7664
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 235.584
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 226.886
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.944819
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.327593
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -31.474
+      objectReference: {fileID: 0}
+    - target: {fileID: 1153031762792623910, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_Name
+      value: rock_balancing_0 (5)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+--- !u!4 &336421527 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+  m_PrefabInstance: {fileID: 336421526}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &338792938
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6780,6 +6854,68 @@ SpriteShapeRenderer:
     m_Center: {x: -0.13626707, y: -0.26067543, z: 0}
     m_Extent: {x: 1.2024324, y: 1.1722069, z: 0}
   m_SpriteSortPoint: 0
+--- !u!1001 &345354347
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 758428976}
+    m_Modifications:
+    - target: {fileID: 175384205660589007, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+      propertyPath: m_Name
+      value: rock_balancing_4 (5)
+      objectReference: {fileID: 0}
+    - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 234.83
+      objectReference: {fileID: 0}
+    - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 226.18
+      objectReference: {fileID: 0}
+    - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.36921102
+      objectReference: {fileID: 0}
+    - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.9293456
+      objectReference: {fileID: 0}
+    - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -136.666
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+--- !u!4 &345354348 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1575797974561879327, guid: 2e2e9935047fd6345b06bd7af6a8838b, type: 3}
+  m_PrefabInstance: {fileID: 345354347}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &348344418
 GameObject:
   m_ObjectHideFlags: 0
@@ -9818,11 +9954,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2390737749450958165, guid: 52f37f12592ceae4ebb2bdf4679a9a8b, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 231.1709
+      value: 230.2197
       objectReference: {fileID: 0}
     - target: {fileID: 2390737749450958165, guid: 52f37f12592ceae4ebb2bdf4679a9a8b, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 226.2325
+      value: 227.219
       objectReference: {fileID: 0}
     - target: {fileID: 2390737749450958165, guid: 52f37f12592ceae4ebb2bdf4679a9a8b, type: 3}
       propertyPath: m_LocalPosition.z
@@ -9858,7 +9994,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4336819146217914988, guid: 52f37f12592ceae4ebb2bdf4679a9a8b, type: 3}
       propertyPath: m_Size.x
-      value: 8.023179
+      value: 5.2824335
       objectReference: {fileID: 0}
     - target: {fileID: 7794169456642126795, guid: 52f37f12592ceae4ebb2bdf4679a9a8b, type: 3}
       propertyPath: m_Name
@@ -12537,6 +12673,7 @@ Transform:
   - {fileID: 7185891510996511296}
   - {fileID: 2138185057}
   - {fileID: 894171970}
+  - {fileID: 336421527}
   - {fileID: 323774747}
   - {fileID: 323189137}
   - {fileID: 7101332544968338502}
@@ -12560,6 +12697,7 @@ Transform:
   - {fileID: 7263966}
   - {fileID: 1873523517}
   - {fileID: 66526780}
+  - {fileID: 345354348}
   - {fileID: 1762865070}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -14074,13 +14212,25 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 758428976}
     m_Modifications:
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.7664
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.7664
+      objectReference: {fileID: 0}
+    - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.7664
+      objectReference: {fileID: 0}
     - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 228.54
+      value: 228.61
       objectReference: {fileID: 0}
     - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 231.308
+      value: 231.11
       objectReference: {fileID: 0}
     - target: {fileID: 554268959783277046, guid: 7aa098410779c2849ad2b71ddd52fdbd, type: 3}
       propertyPath: m_LocalPosition.z
@@ -21632,19 +21782,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4416819759681808631, guid: a9c22b454c5cb38499b75ec55bc548e4, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 229.43
+      value: 229.86
       objectReference: {fileID: 0}
     - target: {fileID: 4416819759681808631, guid: a9c22b454c5cb38499b75ec55bc548e4, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 232.48
+      value: 232.38
       objectReference: {fileID: 0}
     - target: {fileID: 4416819759681808631, guid: a9c22b454c5cb38499b75ec55bc548e4, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4416819759681808631, guid: a9c22b454c5cb38499b75ec55bc548e4, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.88699824
+      value: 0.93048126
       objectReference: {fileID: 0}
     - target: {fileID: 4416819759681808631, guid: a9c22b454c5cb38499b75ec55bc548e4, type: 3}
       propertyPath: m_LocalRotation.x
@@ -21656,7 +21806,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4416819759681808631, guid: a9c22b454c5cb38499b75ec55bc548e4, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0.46177283
+      value: 0.36633962
       objectReference: {fileID: 0}
     - target: {fileID: 4416819759681808631, guid: a9c22b454c5cb38499b75ec55bc548e4, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -21668,7 +21818,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4416819759681808631, guid: a9c22b454c5cb38499b75ec55bc548e4, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
-      value: 55.003
+      value: 42.98
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -35627,15 +35777,15 @@ PolygonCollider2D:
       - {x: -16.254486, y: -19.523016}
       - {x: -6.0512, y: -15.149223}
       - {x: -5.920168, y: -15.085875}
-      - {x: -5.304389, y: -15.998397}
-      - {x: -5.17145, y: -16.130512}
-      - {x: -4.9005423, y: -16.039436}
-      - {x: 2.0449398, y: -12.703436}
-      - {x: 2.1366785, y: -12.645949}
-      - {x: 1.7117236, y: -10.878112}
-      - {x: 1.6794174, y: -10.769872}
-      - {x: 2.639694, y: -9.965027}
-      - {x: 6.724085, y: -6.4992766}
+      - {x: -5.303401, y: -15.999843}
+      - {x: -5.171215, y: -16.130856}
+      - {x: -4.9333506, y: -16.057615}
+      - {x: -0.47851586, y: -13.957922}
+      - {x: -0.39373925, y: -13.904586}
+      - {x: -0.66277105, y: -12.1377125}
+      - {x: -0.6854272, y: -12.029509}
+      - {x: 0.168601, y: -11.400577}
+      - {x: 6.7253036, y: -6.498305}
       - {x: 6.7544823, y: -6.4975133}
       - {x: 29.212128, y: -21.46084}
       - {x: 29.292822, y: -21.500069}
@@ -38061,15 +38211,15 @@ MonoBehaviour:
       spriteIndex: 0
       corner: 1
       m_CornerMode: 1
-    - position: {x: 2.1802397, y: -12.666517, z: 0}
+    - position: {x: -0.35244328, y: -13.926469, z: 0}
       leftTangent: {x: 0, y: 0, z: 0}
       rightTangent: {x: 0, y: 0, z: 0}
       mode: 0
       height: 1
       spriteIndex: 0
       corner: 1
       m_CornerMode: 1
-    - position: {x: 1.7163192, y: -10.781723, z: 0}
+    - position: {x: -0.6497285, y: -12.044007, z: 0}
       leftTangent: {x: 0, y: 0, z: 0}
       rightTangent: {x: 0, y: 0, z: 0}
       mode: 0
@@ -39465,15 +39615,15 @@ MonoBehaviour:
   - {x: -16.254486, y: -19.523016}
   - {x: -6.0512, y: -15.149223}
   - {x: -5.920168, y: -15.085875}
-  - {x: -5.304389, y: -15.998397}
-  - {x: -5.17145, y: -16.130512}
-  - {x: -4.9005423, y: -16.039436}
-  - {x: 2.0449398, y: -12.703436}
-  - {x: 2.1366785, y: -12.645949}
-  - {x: 1.7117236, y: -10.878112}
-  - {x: 1.6794174, y: -10.769872}
-  - {x: 2.639694, y: -9.965027}
-  - {x: 6.724085, y: -6.4992766}
+  - {x: -5.303401, y: -15.999843}
+  - {x: -5.171215, y: -16.130856}
+  - {x: -4.9333506, y: -16.057615}
+  - {x: -0.47851586, y: -13.957922}
+  - {x: -0.39373925, y: -13.904586}
+  - {x: -0.66277105, y: -12.1377125}
+  - {x: -0.6854272, y: -12.029509}
+  - {x: 0.168601, y: -11.400577}
+  - {x: 6.7253036, y: -6.498305}
   - {x: 6.7544823, y: -6.4975133}
   - {x: 29.212128, y: -21.46084}
   - {x: 29.292822, y: -21.500069}