Browse Source

7.17场景还原,以及云碰撞删减

banlong 1 year ago
parent
commit
02f8445445

+ 0 - 14
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_1.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 7841905692351573761}
   - component: {fileID: 6592091421018529956}
   - component: {fileID: 8979939550409610350}
-  - component: {fileID: -4015546745386656297}
   m_Layer: 0
   m_Name: cloud_1
   m_TagString: Untagged
@@ -84,16 +83,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &-4015546745386656297
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7466927505753699771}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 4.13451, y: 3.1456985, z: 3.1059663}
-  m_Center: {x: 0.18713397, y: 1.5728493, z: -0.16104126}

+ 0 - 14
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_2.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 7162166240999711619}
   - component: {fileID: 6109972554713803814}
   - component: {fileID: 8299585334351157484}
-  - component: {fileID: 8626564017944816260}
   m_Layer: 0
   m_Name: cloud_2
   m_TagString: Untagged
@@ -84,16 +83,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &8626564017944816260
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7507202144158972217}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 8.356229, y: 3.4017286, z: 3.3757787}
-  m_Center: {x: 0.4305278, y: 1.7008638, z: 0.12112099}

+ 0 - 14
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_3.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 4785843228268735533}
   - component: {fileID: 8486295287485539208}
   - component: {fileID: 5918178321857075010}
-  - component: {fileID: 8933996526361217230}
   m_Layer: 0
   m_Name: cloud_3
   m_TagString: Untagged
@@ -84,16 +83,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &8933996526361217230
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5269611390466455191}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 9.873388, y: 3.9865644, z: 3.9709995}
-  m_Center: {x: 0.38003063, y: 1.9932817, z: 0.024820924}

+ 0 - 14
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_4.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 4409201092410581473}
   - component: {fileID: 765465276915035716}
   - component: {fileID: 3277369099616410254}
-  - component: {fileID: -1635607891957112969}
   m_Layer: 0
   m_Name: cloud_4
   m_TagString: Untagged
@@ -84,16 +83,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &-1635607891957112969
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3925856452640897883}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 11.0684, y: 5.4874983, z: 5.142867}
-  m_Center: {x: 0.36211252, y: 2.7437491, z: 0.0036354065}

+ 0 - 14
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_5.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 212998111576199000}
   - component: {fileID: 3844775774034526461}
   - component: {fileID: 1350961672563192887}
-  - component: {fileID: 5034284850122400413}
   m_Layer: 0
   m_Name: cloud_5
   m_TagString: Untagged
@@ -84,16 +83,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &5034284850122400413
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 702394467388511714}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 12.246605, y: 6.112235, z: 5.3431926}
-  m_Center: {x: -0.0044953823, y: 3.0561185, z: 0.39518213}

+ 0 - 14
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_6.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 3408856295713324369}
   - component: {fileID: 1792831947057640180}
   - component: {fileID: 4541207743327323710}
-  - component: {fileID: 7511391362340176720}
   m_Layer: 0
   m_Name: cloud_6
   m_TagString: Untagged
@@ -84,16 +83,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &7511391362340176720
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2595586390387910635}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 15.758208, y: 7.295079, z: 7.9887056}
-  m_Center: {x: -0.2525468, y: 3.6475396, z: 0.08521068}

+ 0 - 14
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_7.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 3685823928488140796}
   - component: {fileID: 326923018928689241}
   - component: {fileID: 2552838989303538835}
-  - component: {fileID: -6905592796322795534}
   m_Layer: 0
   m_Name: cloud_7
   m_TagString: Untagged
@@ -84,16 +83,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &-6905592796322795534
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4066044547801269574}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 20.453377, y: 8.280939, z: 10.461131}
-  m_Center: {x: 0.07074642, y: 4.1404705, z: -0.2354474}

+ 0 - 14
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_8.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 1581192095611995560}
   - component: {fileID: 2476520474517228045}
   - component: {fileID: 412828176012820167}
-  - component: {fileID: -7287081501916830368}
   m_Layer: 0
   m_Name: cloud_8
   m_TagString: Untagged
@@ -84,16 +83,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &-7287081501916830368
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2214176148310171410}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 34.0968, y: 14.645113, z: 10.479699}
-  m_Center: {x: -0.33599758, y: 7.3225565, z: -0.71248245}

+ 99 - 84
Assets/Scenes/MapTiktok.unity

@@ -6318,7 +6318,7 @@ PrefabInstance:
     - target: {fileID: 3408856295713324369, guid: 6089706c4e43d42b1b9d4304e7066f16,
         type: 3}
       propertyPath: m_RootOrder
-      value: 12
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 3408856295713324369, guid: 6089706c4e43d42b1b9d4304e7066f16,
         type: 3}
@@ -6984,10 +6984,10 @@ Transform:
   - {fileID: 1461347706}
   - {fileID: 740566490}
   - {fileID: 972241720}
+  - {fileID: 1280697824}
   - {fileID: 378716231}
   - {fileID: 1581602238}
   - {fileID: 1769919377}
-  - {fileID: 1317173300}
   - {fileID: 1083521927}
   - {fileID: 255821499}
   m_Father: {fileID: 0}
@@ -19038,6 +19038,101 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1274422251}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1280697823
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 392036429}
+    m_Modifications:
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.6144634
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.6144634
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.6144634
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 273.33
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 9.140001
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 255.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 702394467388511714, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_Name
+      value: cloud_5 (3)
+      objectReference: {fileID: 0}
+    - target: {fileID: 702394467388511714, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6fd033adec21c4dbbab4fa659a0b5a20, type: 3}
+--- !u!4 &1280697824 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 212998111576199000, guid: 6fd033adec21c4dbbab4fa659a0b5a20,
+    type: 3}
+  m_PrefabInstance: {fileID: 1280697823}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1289114678
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -19409,86 +19504,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1309042245}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &1317173299
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 392036429}
-    m_Modifications:
-    - target: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 15
-      objectReference: {fileID: 0}
-    - target: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 273
-      objectReference: {fileID: 0}
-    - target: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 9.140001
-      objectReference: {fileID: 0}
-    - target: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 256.77002
-      objectReference: {fileID: 0}
-    - target: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4066044547801269574, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_Name
-      value: cloud_7
-      objectReference: {fileID: 0}
-    - target: {fileID: 4066044547801269574, guid: 6c44ee9bdd3714c39a7f843d67670994,
-        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 4
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 6c44ee9bdd3714c39a7f843d67670994, type: 3}
---- !u!4 &1317173300 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3685823928488140796, guid: 6c44ee9bdd3714c39a7f843d67670994,
-    type: 3}
-  m_PrefabInstance: {fileID: 1317173299}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1328604373
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -22789,7 +22804,7 @@ PrefabInstance:
     - target: {fileID: 3408856295713324369, guid: 6089706c4e43d42b1b9d4304e7066f16,
         type: 3}
       propertyPath: m_RootOrder
-      value: 13
+      value: 14
       objectReference: {fileID: 0}
     - target: {fileID: 3408856295713324369, guid: 6089706c4e43d42b1b9d4304e7066f16,
         type: 3}
@@ -25369,7 +25384,7 @@ PrefabInstance:
     - target: {fileID: 3408856295713324369, guid: 6089706c4e43d42b1b9d4304e7066f16,
         type: 3}
       propertyPath: m_RootOrder
-      value: 14
+      value: 15
       objectReference: {fileID: 0}
     - target: {fileID: 3408856295713324369, guid: 6089706c4e43d42b1b9d4304e7066f16,
         type: 3}