1

2023-12-03 17:35:43 +08:00
parent ba342d6627
commit ba9f4eda80
702 changed files with 162078 additions and 21050 deletions
--- a/Assets/PolygonBattleRoyale/Prefabs/Props/SM_Prop_Crate_Large_01.prefab
+++ b/Assets/PolygonBattleRoyale/Prefabs/Props/SM_Prop_Crate_Large_01.prefab
@@ -1,27 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1475137749187476}
-  m_IsPrefabParent: 1
 --- !u!1 &1475137749187476
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
  m_Component:
  - component: {fileID: 4846357125400108}
  - component: {fileID: 33796832975326620}
  - component: {fileID: 23903047285375572}
  - component: {fileID: 64861707321520050}
+  - component: {fileID: 8746573501720502573}
  m_Layer: 0
  m_Name: SM_Prop_Crate_Large_01
  m_TagString: Untagged
@@ -31,30 +22,46 @@ GameObject:
  m_IsActive: 1
 --- !u!4 &4846357125400108
 Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1475137749187476}
+  serializedVersion: 2
  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_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &33796832975326620
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1475137749187476}
+  m_Mesh: {fileID: 4300000, guid: 2f13748cbcb178d4ea78c3a15e2e2960, type: 3}
 --- !u!23 &23903047285375572
 MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1475137749187476}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
  m_Materials:
  - {fileID: 2100000, guid: a74066172cf19cd4bacae3c6600a7217, type: 2}
  m_StaticBatchInfo:
@@ -64,6 +71,7 @@ MeshRenderer:
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
@@ -76,24 +84,42 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
--- !u!33 &33796832975326620
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1475137749187476}
-  m_Mesh: {fileID: 4300000, guid: 2f13748cbcb178d4ea78c3a15e2e2960, type: 3}
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!64 &64861707321520050
 MeshCollider:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1475137749187476}
  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 43489559604759298, guid: ee6040e5abefb6f4183061f5d826c043, type: 2}
+--- !u!208 &8746573501720502573
+NavMeshObstacle:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1475137749187476}
  m_Enabled: 1
  serializedVersion: 3
-  m_Convex: 1
-  m_CookingOptions: 14
-  m_SkinWidth: 0.01
-  m_Mesh: {fileID: 43489559604759298, guid: ee6040e5abefb6f4183061f5d826c043, type: 2}
+  m_Shape: 1
+  m_Extents: {x: 0.404, y: 0.395, z: 0.404}
+  m_MoveThreshold: 0.1
+  m_Carve: 1
+  m_CarveOnlyStationary: 1
+  m_Center: {x: 0, y: 0.395, z: 0}
+  m_TimeToStationary: 0.5
--- a/Assets/PolygonBattleRoyale/Prefabs/Props/SM_Prop_Pallet_Loaded_01.prefab
+++ b/Assets/PolygonBattleRoyale/Prefabs/Props/SM_Prop_Pallet_Loaded_01.prefab
@@ -11,8 +11,11 @@ GameObject:
  - component: {fileID: 4488131106469068}
  - component: {fileID: 33528922367963358}
  - component: {fileID: 23061327545420132}
-  - component: {fileID: 64461948955625124}
  - component: {fileID: 3832814031670145871}
+  - component: {fileID: 389265091468607035}
+  - component: {fileID: 7536656310956730028}
+  - component: {fileID: 5947129228051225866}
+  - component: {fileID: 6046743984089203166}
  m_Layer: 0
  m_Name: SM_Prop_Pallet_Loaded_01
  m_TagString: Untagged
@@ -85,8 +88,23 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &64461948955625124
-MeshCollider:
+--- !u!114 &3832814031670145871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1667268319894246}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a39bc549257f2e94cbb86ae99c0107c4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tags:
+  - Metal
+  addressablePath: 
+--- !u!65 &389265091468607035
+BoxCollider:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -103,22 +121,64 @@ MeshCollider:
  m_IsTrigger: 0
  m_ProvidesContacts: 0
  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 43409599215904758, guid: 9b4f1965af4422e4dbfe65d6b28115fe, type: 2}
--- !u!114 &3832814031670145871
-MonoBehaviour:
+  serializedVersion: 3
+  m_Size: {x: 1.2708893, y: 1.1813606, z: 0.635111}
+  m_Center: {x: 0.043465495, y: 0.5906804, z: -0.36561316}
+--- !u!65 &7536656310956730028
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1667268319894246}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1.2708931, y: 0.780695, z: 0.9627093}
+  m_Center: {x: 0.04724586, y: 0.39034763, z: 0.21946412}
+--- !u!65 &5947129228051225866
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1667268319894246}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1.4409857, y: 0.218297, z: 1.3663368}
+  m_Center: {x: -0.00000029802322, y: 0.10914862, z: -0.0035306215}
+--- !u!208 &6046743984089203166
+NavMeshObstacle:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1667268319894246}
  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a39bc549257f2e94cbb86ae99c0107c4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  tags:
-  - Metal
-  addressablePath: 
+  serializedVersion: 3
+  m_Shape: 1
+  m_Extents: {x: 0.72, y: 0.591, z: 0.76100004}
+  m_MoveThreshold: 0.1
+  m_Carve: 1
+  m_CarveOnlyStationary: 1
+  m_Center: {x: 0, y: 0.591, z: 0}
+  m_TimeToStationary: 0.5
--- a/Assets/PolygonBattleRoyale/Prefabs/Props/SM_Prop_Range_Trable_01.prefab
+++ b/Assets/PolygonBattleRoyale/Prefabs/Props/SM_Prop_Range_Trable_01.prefab
@@ -11,8 +11,7 @@ GameObject:
  - component: {fileID: 4625385457843202}
  - component: {fileID: 33232133518386684}
  - component: {fileID: 23101950492872550}
-  - component: {fileID: 64465570329910252}
-  - component: {fileID: 64066419935363794}
+  - component: {fileID: 7587470965801857186}
  m_Layer: 0
  m_Name: SM_Prop_Range_Trable_01
  m_TagString: Untagged
@@ -85,7 +84,7 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &64465570329910252
+--- !u!64 &7587470965801857186
 MeshCollider:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -104,28 +103,6 @@ MeshCollider:
  m_ProvidesContacts: 0
  m_Enabled: 1
  serializedVersion: 5
-  m_Convex: 1
+  m_Convex: 0
  m_CookingOptions: 30
-  m_Mesh: {fileID: 43167414735397530, guid: 659d10545197bba43bbd08598041f1cc, type: 2}
--- !u!64 &64066419935363794
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1896340912813114}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 43367740098653360, guid: 659d10545197bba43bbd08598041f1cc, type: 2}
+  m_Mesh: {fileID: 4300000, guid: 2e2c2ad958492c04b800304568dad0d3, type: 3}
--- a/Assets/PolygonBattleRoyale/Prefabs/Vehicles/SM_Veh_Truck_01.prefab
+++ b/Assets/PolygonBattleRoyale/Prefabs/Vehicles/SM_Veh_Truck_01.prefab
@@ -1401,7 +1401,8 @@ GameObject:
  - component: {fileID: 6203962180801810822}
  - component: {fileID: 9222647650663840092}
  - component: {fileID: 2581895833772290825}
-  m_Layer: 14
+  - component: {fileID: 4281931620467689115}
+  m_Layer: 0
  m_Name: SM_Veh_Truck_Trailer_01 (1)
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -1505,8 +1506,35 @@ BoxCollider:
  m_ProvidesContacts: 0
  m_Enabled: 1
  serializedVersion: 3
-  m_Size: {x: 2.766371, y: 0.119591236, z: 4.3009825}
-  m_Center: {x: -0.055555344, y: -0.26263133, z: -0.6006897}
+  m_Size: {x: 2.766371, y: 0.13016796, z: 4.3009825}
+  m_Center: {x: -0.055555344, y: -0.25734296, z: -0.6006898}
+--- !u!54 &4281931620467689115
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5826027360169685307}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 66881
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 8192
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 0
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
 --- !u!1 &6207525182934588678
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/PolygonBattleRoyale/Prefabs/Vehicles/Vehicle_Light_Armored_Car.prefab
+++ b/Assets/PolygonBattleRoyale/Prefabs/Vehicles/Vehicle_Light_Armored_Car.prefab
@@ -930,7 +930,7 @@ GameObject:
  - component: {fileID: 8825864253088073851}
  - component: {fileID: 395266564317474115}
  - component: {fileID: 2346217916781133852}
-  m_Layer: 14
+  m_Layer: 0
  m_Name: Collider
  m_TagString: Untagged
  m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0}
@@ -1011,10 +1011,10 @@ Rigidbody:
  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
  m_IncludeLayers:
    serializedVersion: 2
-    m_Bits: 0
+    m_Bits: 65
  m_ExcludeLayers:
    serializedVersion: 2
-    m_Bits: 0
+    m_Bits: 8192
  m_ImplicitCom: 1
  m_ImplicitTensor: 1
  m_UseGravity: 0
@@ -1032,7 +1032,7 @@ GameObject:
  m_Component:
  - component: {fileID: 6721183556840311255}
  - component: {fileID: 9120405572256157191}
-  m_Layer: 14
+  m_Layer: 0
  m_Name: collider
  m_TagString: Untagged
  m_Icon: {fileID: 0}