1

2024-03-29 00:58:24 +08:00
parent 967ad8eacf
commit 05315ef4a8
232 changed files with 53368 additions and 8539 deletions
--- a/Assets/Artists/Prefabs/Props/Prop
+++ b/Assets/Artists/Prefabs/Props/Prop
@@ -48,64 +48,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 3ea10f3eac02f2441978a201ec1770fd, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  rangeSensor:
-    rid: 806583526086934612
-  vfxTags:
-  - rid: 806583526086934613
-  - rid: 806583526086934614
-  physicsLayer:
-    serializedVersion: 2
-    m_Bits: 8449
-  explosionRadius: 8
-  damageCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 300
-      inSlope: -37.5
-      outSlope: -37.5
-      tangentMode: 34
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    - serializedVersion: 3
-      time: 4
-      value: 150
-      inSlope: -33.5
-      outSlope: -33.5
-      tangentMode: 34
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    - serializedVersion: 3
-      time: 8
-      value: 32
-      inSlope: -29.5
-      outSlope: -29.5
-      tangentMode: 34
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  fuse: 4
-  references:
-    version: 2
-    RefIds:
-    - rid: 806583526086934612
-      type: {class: UnitySensor, ns: BITKit.Sensors, asm: BITKit.Sensor}
-      data:
-        gameObject: {fileID: 751723515638967153}
-    - rid: 806583526086934613
-      type: {class: Reference, ns: BITKit, asm: BITKit}
-      data:
-        value: Explosion
-    - rid: 806583526086934614
-      type: {class: Reference, ns: BITKit, asm: BITKit}
-      data:
-        value: Large
+  fuse: 1
 --- !u!54 &2790648435517538154
 Rigidbody:
  m_ObjectHideFlags: 0
@@ -179,7 +122,7 @@ TrailRenderer:
  m_PreviewTimeScale: 1
  m_Parameters:
    serializedVersion: 3
-    widthMultiplier: 0.1
+    widthMultiplier: 0.01
    widthCurve:
      serializedVersion: 2
      m_Curve:
@@ -245,6 +188,12 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 5322756313667207077}
    m_Modifications:
+    - target: {fileID: 2592293680569191996, guid: 3fb4d614204c5a941a68cea812e8d217,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 13400000, guid: 32c83055040644f4bab72889aab3344a,
+        type: 2}
    - target: {fileID: 6786854117428987787, guid: 3fb4d614204c5a941a68cea812e8d217,
        type: 3}
      propertyPath: m_Name
@@ -315,11 +264,7 @@ PrefabInstance:
    - {fileID: 5564562486419412761, guid: 3fb4d614204c5a941a68cea812e8d217, type: 3}
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 6786854117428987787, guid: 3fb4d614204c5a941a68cea812e8d217,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 6413852522637078568}
+    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 3fb4d614204c5a941a68cea812e8d217, type: 3}
 --- !u!4 &6578672529516370771 stripped
 Transform:
@@ -327,33 +272,6 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 388325602139472120}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &6578672529516660595 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6786854117428987787, guid: 3fb4d614204c5a941a68cea812e8d217,
-    type: 3}
-  m_PrefabInstance: {fileID: 388325602139472120}
-  m_PrefabAsset: {fileID: 0}
--- !u!135 &6413852522637078568
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6578672529516660595}
-  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_Radius: 0.055223584
-  m_Center: {x: -0.00048495643, y: 0.012884719, z: -0.000000009313226}
 --- !u!1001 &4472973466678826780
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -427,12 +345,6 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 2eee2c81784c7f64cbeae852340011e2, type: 3}
--- !u!1 &751723515638967153 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3782347653599493229, guid: 2eee2c81784c7f64cbeae852340011e2,
-    type: 3}
-  m_PrefabInstance: {fileID: 4472973466678826780}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &8051067506009903108 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 5883973352058160920, guid: 2eee2c81784c7f64cbeae852340011e2,
--- a/Assets/Artists/Prefabs/Props/Prop_Flashbang.prefab
+++ b/Assets/Artists/Prefabs/Props/Prop_Flashbang.prefab
@@ -0,0 +1,314 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7317480404738384930
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2149132301750699066}
+  - component: {fileID: 2299210334463273333}
+  - component: {fileID: 1639367433927000008}
+  - component: {fileID: 1101111108614464164}
+  - component: {fileID: 2943975380052445931}
+  - component: {fileID: 754613896342206696}
+  m_Layer: 16
+  m_Name: Prop_Flashbang
+  m_TagString: Untagged
+  m_Icon: {fileID: 2800000, guid: 1d0b2355ee80204459799e5a1a238b77, type: 3}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2149132301750699066
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7317480404738384930}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.09, y: 0, z: 0.75}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1431512314600996854}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!54 &2299210334463273333
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7317480404738384930}
+  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: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 2
+  m_Constraints: 0
+  m_CollisionDetection: 3
+--- !u!114 &1639367433927000008
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7317480404738384930}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f2998625eb59b0b488500dfc4fec57f7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fuse: 1
+  duration: 5
+  light: {fileID: 2943975380052445931}
+  _sensor:
+    rid: 3736623825111744553
+  references:
+    version: 2
+    RefIds:
+    - rid: 3736623825111744553
+      type: {class: SensorMonoProxy, ns: BITKit.Sensors, asm: BITKit.Sensor}
+      data:
+        monoBehaviour: {fileID: 1101111108614464164}
+--- !u!114 &1101111108614464164
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7317480404738384930}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8f305912600022b4c824367828ddc333, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  detectLayer:
+    serializedVersion: 2
+    m_Bits: 64
+  autoUpdate: 0
+  ignoreColliders: []
+  radius: 8
+  fov: 0
+  requireSight: 1
+  blockLayer:
+    serializedVersion: 2
+    m_Bits: 1
+--- !u!108 &2943975380052445931
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7317480404738384930}
+  m_Enabled: 0
+  serializedVersion: 10
+  m_Type: 2
+  m_Shape: 0
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 512
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!114 &754613896342206696
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7317480404738384930}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_UsePipelineSettings: 1
+  m_AdditionalLightsShadowResolutionTier: 2
+  m_LightLayerMask: 1
+  m_RenderingLayers: 1
+  m_CustomShadowLayers: 0
+  m_ShadowLayerMask: 1
+  m_ShadowRenderingLayers: 1
+  m_LightCookieSize: {x: 1, y: 1}
+  m_LightCookieOffset: {x: 0, y: 0}
+  m_SoftShadowQuality: 0
+--- !u!1001 &1426974908427120478
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2149132301750699066}
+    m_Modifications:
+    - target: {fileID: 1292425513312006, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_Name
+      value: flashbang_M-84 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 1292425513312006, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_Layer
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 1716327121127722, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_Layer
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 1760975015368530, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_Layer
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 1903771595640982, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_Layer
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 1989847682504414, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_Layer
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 4612193367756968, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4612193367756968, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4612193367756968, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4612193367756968, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4612193367756968, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4612193367756968, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4612193367756968, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4612193367756968, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4612193367756968, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4612193367756968, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 1292425513312006, guid: 9de02a6a10a4a6944b22698c16058563,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 9185554116789978991}
+  m_SourcePrefab: {fileID: 100100000, guid: 9de02a6a10a4a6944b22698c16058563, type: 3}
+--- !u!1 &1425729487155179608 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1292425513312006, guid: 9de02a6a10a4a6944b22698c16058563,
+    type: 3}
+  m_PrefabInstance: {fileID: 1426974908427120478}
+  m_PrefabAsset: {fileID: 0}
+--- !u!136 &9185554116789978991
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1425729487155179608}
+  m_Material: {fileID: 13400000, guid: 32c83055040644f4bab72889aab3344a, type: 2}
+  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: 2
+  m_Radius: 0.03
+  m_Height: 0.14
+  m_Direction: 1
+  m_Center: {x: 0, y: 0.07, z: 0}
+--- !u!4 &1431512314600996854 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4612193367756968, guid: 9de02a6a10a4a6944b22698c16058563,
+    type: 3}
+  m_PrefabInstance: {fileID: 1426974908427120478}
+  m_PrefabAsset: {fileID: 0}