于:碰撞盒修改

ebbdcf20 · Yuyang · 27c15ab9 · ebbdcf20 · ebbdcf20
Commit ebbdcf20 authored Apr 02, 2021 by Yuyang
Show whitespace changes
Inline Side-by-side

Showing with 299 additions and 152 deletions

Level8.prefab Storage/Assets/Res/Levels/Level8.prefab +122 -24

Level9.prefab Storage/Assets/Res/Levels/Level9.prefab +177 -128

No files found.
--- a/Storage/Assets/Res/Levels/Level8.prefab
+++ b/Storage/Assets/Res/Levels/Level8.prefab
@@ -19399,6 +19399,50 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 112
  m_CollisionDetection: 3
+--- !u!64 &7622553654982787809
+MeshCollider:
+  m_ObjectHideFlags: 10
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1836285497934110341}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 5673484455713311591, guid: 93a0efc913d12ac46b7c21c9b953d386, type: 2}
+--- !u!114 &1280124243718460286
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1836285497934110341}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 824b6f25573464a1f9fbc2ebe0229e83, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Params:
+    maxConvexHulls: 32
+    resolution: 50000
+    concavity: 0.0025
+    planeDownsampling: 4
+    convexhullApproximation: 4
+    alpha: 0.05
+    beta: 0.05
+    pca: 1
+    mode: 0
+    maxNumVerticesPerCH: 64
+    minVolumePerCH: 0.0001
+  m_colliders:
+  - {fileID: 7622553654982787809}
+  m_isTrigger: 0
+  m_material: {fileID: 0}
+  m_showColliders: 0
+  m_colliderAsset: {fileID: 11400000, guid: 93a0efc913d12ac46b7c21c9b953d386, type: 2}
 --- !u!114 &1441938100223409250
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -67235,6 +67279,20 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 112
  m_CollisionDetection: 3
+--- !u!64 &585418178803923603
+MeshCollider:
+  m_ObjectHideFlags: 10
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4838169749583274747}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 7554385752148729925, guid: e1a06ba52681e2b4e8a5ff37f6b9d5ee, type: 2}
 --- !u!114 &1883188377313786124
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -67247,6 +67305,36 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!114 &6927159883203103267
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4838169749583274747}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 824b6f25573464a1f9fbc2ebe0229e83, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Params:
+    maxConvexHulls: 32
+    resolution: 50000
+    concavity: 0.0025
+    planeDownsampling: 4
+    convexhullApproximation: 4
+    alpha: 0.05
+    beta: 0.05
+    pca: 1
+    mode: 0
+    maxNumVerticesPerCH: 64
+    minVolumePerCH: 0.0001
+  m_colliders:
+  - {fileID: 585418178803923603}
+  m_isTrigger: 0
+  m_material: {fileID: 0}
+  m_showColliders: 0
+  m_colliderAsset: {fileID: 11400000, guid: e1a06ba52681e2b4e8a5ff37f6b9d5ee, type: 2}
 --- !u!1 &5036803459208687269
 GameObject:
  m_ObjectHideFlags: 0
@@ -117401,20 +117489,25 @@ PrefabInstance:
      propertyPath: m_Convex
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 8267413534687462486, guid: 76028ca93ec1247489ae29f7fe3029de,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 76028ca93ec1247489ae29f7fe3029de, type: 3}
--- !u!1 &1836285497934110341 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1888780293517499212, guid: 76028ca93ec1247489ae29f7fe3029de,
-    type: 3}
-  m_PrefabInstance: {fileID: 237987389686810057}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &3395874881895050390 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 3201235197849282911, guid: 76028ca93ec1247489ae29f7fe3029de,
    type: 3}
  m_PrefabInstance: {fileID: 237987389686810057}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1836285497934110341 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1888780293517499212, guid: 76028ca93ec1247489ae29f7fe3029de,
+    type: 3}
+  m_PrefabInstance: {fileID: 237987389686810057}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &340499475665421680
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -117500,18 +117593,18 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5cf58c6137fac2d4694d7c32c4b1b4be, type: 3}
--- !u!4 &4738638614171692650 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 5cf58c6137fac2d4694d7c32c4b1b4be,
-    type: 3}
-  m_PrefabInstance: {fileID: 340499475665421680}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8617742815091350649 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 5cf58c6137fac2d4694d7c32c4b1b4be,
    type: 3}
  m_PrefabInstance: {fileID: 340499475665421680}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4738638614171692650 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 5cf58c6137fac2d4694d7c32c4b1b4be,
+    type: 3}
+  m_PrefabInstance: {fileID: 340499475665421680}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1089322000926158514
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -117722,18 +117815,18 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: f02e3b0696312e249866fffcc4058aed, type: 3}
--- !u!4 &4568849355707287727 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3529744534045466093, guid: f02e3b0696312e249866fffcc4058aed,
-    type: 3}
-  m_PrefabInstance: {fileID: 1124769316640429378}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &665558100012595900 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 479477414955511806, guid: f02e3b0696312e249866fffcc4058aed,
    type: 3}
  m_PrefabInstance: {fileID: 1124769316640429378}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4568849355707287727 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3529744534045466093, guid: f02e3b0696312e249866fffcc4058aed,
+    type: 3}
+  m_PrefabInstance: {fileID: 1124769316640429378}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2611390625657414477
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -117833,18 +117926,18 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 73fc888352243184782b63bf95b35683, type: 3}
--- !u!4 &7658111560065861755 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 5654997292614265654, guid: 73fc888352243184782b63bf95b35683,
-    type: 3}
-  m_PrefabInstance: {fileID: 2611390625657414477}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6637261569637956200 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 8656428431439255845, guid: 73fc888352243184782b63bf95b35683,
    type: 3}
  m_PrefabInstance: {fileID: 2611390625657414477}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &7658111560065861755 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5654997292614265654, guid: 73fc888352243184782b63bf95b35683,
+    type: 3}
+  m_PrefabInstance: {fileID: 2611390625657414477}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4024749520147572384
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -118123,6 +118216,11 @@ PrefabInstance:
      propertyPath: m_Convex
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 4069251918964216807, guid: 73b913978f53cb3468f3f518e86f8f73,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 73b913978f53cb3468f3f518e86f8f73, type: 3}
 --- !u!4 &8466758606600360168 stripped
--- a/Storage/Assets/Res/Levels/Level9.prefab
+++ b/Storage/Assets/Res/Levels/Level9.prefab
@@ -23757,18 +23757,20 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 112
  m_CollisionDetection: 3
--- !u!114 &6896323018819108284
-MonoBehaviour:
-  m_ObjectHideFlags: 0
+--- !u!64 &2738989211538391472
+MeshCollider:
+  m_ObjectHideFlags: 10
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1900196058222094690}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -9190241891968969046, guid: 1110a73bf7a0cb14a8d231e38c3f87a7, type: 2}
 --- !u!114 &2911362429279696909
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -23799,20 +23801,18 @@ MonoBehaviour:
  m_material: {fileID: 0}
  m_showColliders: 0
  m_colliderAsset: {fileID: 11400000, guid: 1110a73bf7a0cb14a8d231e38c3f87a7, type: 2}
--- !u!64 &2738989211538391472
-MeshCollider:
-  m_ObjectHideFlags: 10
+--- !u!114 &6896323018819108284
+MonoBehaviour:
+  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1900196058222094690}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -9190241891968969046, guid: 1110a73bf7a0cb14a8d231e38c3f87a7, type: 2}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1967474494517161565
 GameObject:
  m_ObjectHideFlags: 0
@@ -48129,6 +48129,20 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 112
  m_CollisionDetection: 3
+--- !u!64 &7481850427872920027
+MeshCollider:
+  m_ObjectHideFlags: 10
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4247836945817865428}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 6260430599160533620, guid: 00db0ef1b0c02a4468362b8a776c76b6, type: 2}
 --- !u!114 &2663520904326828313
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -48171,20 +48185,6 @@ MonoBehaviour:
  m_material: {fileID: 0}
  m_showColliders: 0
  m_colliderAsset: {fileID: 11400000, guid: 00db0ef1b0c02a4468362b8a776c76b6, type: 2}
--- !u!64 &7481850427872920027
-MeshCollider:
-  m_ObjectHideFlags: 10
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4247836945817865428}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 6260430599160533620, guid: 00db0ef1b0c02a4468362b8a776c76b6, type: 2}
 --- !u!1 &4367437363668762897
 GameObject:
  m_ObjectHideFlags: 0
@@ -57800,6 +57800,20 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 112
  m_CollisionDetection: 3
+--- !u!64 &2917211334095300289
+MeshCollider:
+  m_ObjectHideFlags: 10
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4869330585920949664}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 7554385752148729925, guid: e1a06ba52681e2b4e8a5ff37f6b9d5ee, type: 2}
 --- !u!114 &7395948471543289605
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -57812,6 +57826,36 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!114 &8488171610764588559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4869330585920949664}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 824b6f25573464a1f9fbc2ebe0229e83, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Params:
+    maxConvexHulls: 32
+    resolution: 50000
+    concavity: 0.0025
+    planeDownsampling: 4
+    convexhullApproximation: 4
+    alpha: 0.05
+    beta: 0.05
+    pca: 1
+    mode: 0
+    maxNumVerticesPerCH: 64
+    minVolumePerCH: 0.0001
+  m_colliders:
+  - {fileID: 2917211334095300289}
+  m_isTrigger: 0
+  m_material: {fileID: 0}
+  m_showColliders: 0
+  m_colliderAsset: {fileID: 11400000, guid: e1a06ba52681e2b4e8a5ff37f6b9d5ee, type: 2}
 --- !u!1 &4940665392295981882
 GameObject:
  m_ObjectHideFlags: 0
@@ -78727,6 +78771,34 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 112
  m_CollisionDetection: 3
+--- !u!64 &1138017287812997269
+MeshCollider:
+  m_ObjectHideFlags: 10
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6047328683334856628}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 4651808341663380191, guid: a478660e65494c04cb7317944165ca53, type: 2}
+--- !u!64 &3183541009431062159
+MeshCollider:
+  m_ObjectHideFlags: 10
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6047328683334856628}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 9179751675358539082, guid: a478660e65494c04cb7317944165ca53, type: 2}
 --- !u!114 &1885501553753791894
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -78770,34 +78842,6 @@ MonoBehaviour:
  m_material: {fileID: 0}
  m_showColliders: 0
  m_colliderAsset: {fileID: 11400000, guid: a478660e65494c04cb7317944165ca53, type: 2}
--- !u!64 &1138017287812997269
-MeshCollider:
-  m_ObjectHideFlags: 10
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6047328683334856628}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 4651808341663380191, guid: a478660e65494c04cb7317944165ca53, type: 2}
--- !u!64 &3183541009431062159
-MeshCollider:
-  m_ObjectHideFlags: 10
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6047328683334856628}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 9179751675358539082, guid: a478660e65494c04cb7317944165ca53, type: 2}
 --- !u!1 &6463489484242499081
 GameObject:
  m_ObjectHideFlags: 0
@@ -93114,18 +93158,34 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 112
  m_CollisionDetection: 3
--- !u!114 &2110733077624515787
-MonoBehaviour:
-  m_ObjectHideFlags: 0
+--- !u!64 &2154842315408777657
+MeshCollider:
+  m_ObjectHideFlags: 10
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6918611504877657115}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -8173590255786266977, guid: 83ff3a498b5eccf4682bf36a84344906, type: 2}
+--- !u!64 &5470400440288310384
+MeshCollider:
+  m_ObjectHideFlags: 10
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6918611504877657115}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 7723785592825764798, guid: 83ff3a498b5eccf4682bf36a84344906, type: 2}
 --- !u!114 &451123115186192080
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -93157,34 +93217,18 @@ MonoBehaviour:
  m_material: {fileID: 0}
  m_showColliders: 0
  m_colliderAsset: {fileID: 11400000, guid: 83ff3a498b5eccf4682bf36a84344906, type: 2}
--- !u!64 &5470400440288310384
-MeshCollider:
-  m_ObjectHideFlags: 10
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6918611504877657115}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 7723785592825764798, guid: 83ff3a498b5eccf4682bf36a84344906, type: 2}
--- !u!64 &2154842315408777657
-MeshCollider:
-  m_ObjectHideFlags: 10
+--- !u!114 &2110733077624515787
+MonoBehaviour:
+  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6918611504877657115}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -8173590255786266977, guid: 83ff3a498b5eccf4682bf36a84344906, type: 2}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7049737719329670764
 GameObject:
  m_ObjectHideFlags: 0
@@ -103079,18 +103123,20 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 112
  m_CollisionDetection: 3
--- !u!114 &5040234108185819826
-MonoBehaviour:
-  m_ObjectHideFlags: 0
+--- !u!64 &166506014804444706
+MeshCollider:
+  m_ObjectHideFlags: 10
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8683647550707153159}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 6056195401739524731, guid: f8af8b3339fbe0547a36f85301c2e7d9, type: 2}
 --- !u!114 &722717060509972501
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -103121,20 +103167,18 @@ MonoBehaviour:
  m_material: {fileID: 0}
  m_showColliders: 0
  m_colliderAsset: {fileID: 11400000, guid: f8af8b3339fbe0547a36f85301c2e7d9, type: 2}
--- !u!64 &166506014804444706
-MeshCollider:
-  m_ObjectHideFlags: 10
+--- !u!114 &5040234108185819826
+MonoBehaviour:
+  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8683647550707153159}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 6056195401739524731, guid: f8af8b3339fbe0547a36f85301c2e7d9, type: 2}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &8893496920644426831
 GameObject:
  m_ObjectHideFlags: 0
@@ -117989,18 +118033,18 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 12483245eada61746b6f5e7f36eb0c84, type: 3}
--- !u!4 &3172086543438977905 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2104312745476564078, guid: 12483245eada61746b6f5e7f36eb0c84,
-    type: 3}
-  m_PrefabInstance: {fileID: 3544762460782149407}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1900196058222094690 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 3129822048548017789, guid: 12483245eada61746b6f5e7f36eb0c84,
    type: 3}
  m_PrefabInstance: {fileID: 3544762460782149407}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &3172086543438977905 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2104312745476564078, guid: 12483245eada61746b6f5e7f36eb0c84,
+    type: 3}
+  m_PrefabInstance: {fileID: 3544762460782149407}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5593826100313029215
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -118100,18 +118144,18 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 4f5930e3d2b45ea468a44ae2a3a1eb3a, type: 3}
--- !u!1 &4247836945817865428 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8597963231664174731, guid: 4f5930e3d2b45ea468a44ae2a3a1eb3a,
-    type: 3}
-  m_PrefabInstance: {fileID: 5593826100313029215}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &911979933135797959 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 4686351489640203416, guid: 4f5930e3d2b45ea468a44ae2a3a1eb3a,
    type: 3}
  m_PrefabInstance: {fileID: 5593826100313029215}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4247836945817865428 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8597963231664174731, guid: 4f5930e3d2b45ea468a44ae2a3a1eb3a,
+    type: 3}
+  m_PrefabInstance: {fileID: 5593826100313029215}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7205855507840749794
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -118204,20 +118248,25 @@ PrefabInstance:
      propertyPath: m_Convex
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 4069251918964216807, guid: 73b913978f53cb3468f3f518e86f8f73,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 73b913978f53cb3468f3f518e86f8f73, type: 3}
--- !u!1 &4869330585920949664 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2851624335735561538, guid: 73b913978f53cb3468f3f518e86f8f73,
-    type: 3}
-  m_PrefabInstance: {fileID: 7205855507840749794}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &8487050568468381619 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 1281371819054886737, guid: 73b913978f53cb3468f3f518e86f8f73,
    type: 3}
  m_PrefabInstance: {fileID: 7205855507840749794}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4869330585920949664 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2851624335735561538, guid: 73b913978f53cb3468f3f518e86f8f73,
+    type: 3}
+  m_PrefabInstance: {fileID: 7205855507840749794}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7260636655278884988
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -118307,15 +118356,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: dbb25f7d15be558439323549ff89b555, type: 3}
--- !u!4 &4120856330011441476 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6769700163642749240, guid: dbb25f7d15be558439323549ff89b555,
-    type: 3}
-  m_PrefabInstance: {fileID: 7260636655278884988}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1111088554673867607 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 7757898643717391147, guid: dbb25f7d15be558439323549ff89b555,
    type: 3}
  m_PrefabInstance: {fileID: 7260636655278884988}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4120856330011441476 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6769700163642749240, guid: dbb25f7d15be558439323549ff89b555,
+    type: 3}
+  m_PrefabInstance: {fileID: 7260636655278884988}
+  m_PrefabAsset: {fileID: 0}