1

2023-10-29 15:27:13 +08:00
parent c5f638d9d2
commit c7b6ddbf70
73 changed files with 2158 additions and 494 deletions
--- a/Assets/LowPolyWeapons/Prefabs/AssaultRifle/AssaultRifle4_02.prefab
+++ b/Assets/LowPolyWeapons/Prefabs/AssaultRifle/AssaultRifle4_02.prefab
@@ -33,6 +33,7 @@ Transform:
  m_Children:
  - {fileID: 5824457780679868934}
  - {fileID: 4316118497711393265}
+  - {fileID: 8098435069078192609}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &285318316677895407
@@ -85,6 +86,37 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &4781878446384759127
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8098435069078192609}
+  m_Layer: 10
+  m_Name: FirePoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8098435069078192609
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4781878446384759127}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.021532295, y: -0.70677847, z: -0.0215317, w: 0.7067793}
+  m_LocalPosition: {x: -0.658, y: 0.084, z: -0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 285318316674503887}
+  m_LocalEulerAnglesHint: {x: 0, y: -90, z: -3.49}
 --- !u!1001 &4316118497711264625
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/Assets/LowPolyWeapons/Prefabs/Pistols/Pistol4_02.prefab
+++ b/Assets/LowPolyWeapons/Prefabs/Pistols/Pistol4_02.prefab
@@ -1,19 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!64 &4412805659928910459
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2088938590677247059}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 14
-  m_Mesh: {fileID: 4300000, guid: 661ec4eae843be3459327dc9fcf69a92, type: 3}
 --- !u!1 &4877693905175751852
 GameObject:
  m_ObjectHideFlags: 0
@@ -25,7 +11,6 @@ GameObject:
  - component: {fileID: 4877693905175392396}
  - component: {fileID: 4877693905176719532}
  - component: {fileID: 4877693905177686636}
-  - component: {fileID: 3267094196586430519}
  m_Layer: 0
  m_Name: Pistol4_02
  m_TagString: Untagged
@@ -40,15 +25,16 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4877693905175751852}
+  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:
  - {fileID: 8353621443291457325}
  - {fileID: 8010641801069542431}
  - {fileID: 2088938590677219443}
  m_Father: {fileID: 0}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &4877693905176719532
 MeshFilter:
@@ -69,9 +55,12 @@ MeshRenderer:
  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:
@@ -83,6 +72,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
@@ -95,59 +85,23 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
--- !u!64 &3267094196586430519
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4877693905175751852}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 14
-  m_Mesh: {fileID: 4300000, guid: 89512c38742bf2e4386daa601c4e23be, type: 3}
--- !u!64 &4239393123459653888
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8010641801069371455}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 14
-  m_Mesh: {fileID: 4300000, guid: 8c6d9d1ab92f5b247861d64f7e31f755, type: 3}
--- !u!64 &6663174663519179083
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8353621443291822861}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 14
-  m_Mesh: {fileID: 4300000, guid: 7b3cced378bc9ef44a297c0f0cba7393, type: 3}
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1001 &2088938590677345011
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
+    serializedVersion: 3
    m_TransformParent: {fileID: 4877693905175392396}
    m_Modifications:
    - target: {fileID: 100000, guid: 661ec4eae843be3459327dc9fcf69a92, type: 3}
      propertyPath: m_Name
      value: Pistol4_02_2
      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 661ec4eae843be3459327dc9fcf69a92, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 661ec4eae843be3459327dc9fcf69a92, type: 3}
      propertyPath: m_LocalPosition.x
      value: -0.0745
@@ -160,6 +114,10 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 661ec4eae843be3459327dc9fcf69a92, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 661ec4eae843be3459327dc9fcf69a92, type: 3}
      propertyPath: m_LocalRotation.x
      value: -0
@@ -172,14 +130,6 @@ PrefabInstance:
      propertyPath: m_LocalRotation.z
      value: -0
      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 661ec4eae843be3459327dc9fcf69a92, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 661ec4eae843be3459327dc9fcf69a92, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 661ec4eae843be3459327dc9fcf69a92, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
@@ -197,13 +147,10 @@ PrefabInstance:
      value: 
      objectReference: {fileID: 2100000, guid: 28af8aa4e6bad69439ee2d4d6d11939a, type: 2}
    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 661ec4eae843be3459327dc9fcf69a92, type: 3}
--- !u!1 &2088938590677247059 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: 661ec4eae843be3459327dc9fcf69a92,
-    type: 3}
-  m_PrefabInstance: {fileID: 2088938590677345011}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &2088938590677219443 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 400000, guid: 661ec4eae843be3459327dc9fcf69a92,
@@ -215,12 +162,17 @@ PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
+    serializedVersion: 3
    m_TransformParent: {fileID: 4877693905175392396}
    m_Modifications:
    - target: {fileID: 100000, guid: 8c6d9d1ab92f5b247861d64f7e31f755, type: 3}
      propertyPath: m_Name
      value: Pistol4_02_3
      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 8c6d9d1ab92f5b247861d64f7e31f755, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 8c6d9d1ab92f5b247861d64f7e31f755, type: 3}
      propertyPath: m_LocalPosition.x
      value: -0.0578
@@ -233,6 +185,10 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 8c6d9d1ab92f5b247861d64f7e31f755, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 8c6d9d1ab92f5b247861d64f7e31f755, type: 3}
      propertyPath: m_LocalRotation.x
      value: -0
@@ -245,14 +201,6 @@ PrefabInstance:
      propertyPath: m_LocalRotation.z
      value: -0
      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 8c6d9d1ab92f5b247861d64f7e31f755, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 8c6d9d1ab92f5b247861d64f7e31f755, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 8c6d9d1ab92f5b247861d64f7e31f755, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
@@ -270,13 +218,10 @@ PrefabInstance:
      value: 
      objectReference: {fileID: 2100000, guid: 28af8aa4e6bad69439ee2d4d6d11939a, type: 2}
    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 8c6d9d1ab92f5b247861d64f7e31f755, type: 3}
--- !u!1 &8010641801069371455 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: 8c6d9d1ab92f5b247861d64f7e31f755,
-    type: 3}
-  m_PrefabInstance: {fileID: 8010641801069405855}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &8010641801069542431 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 400000, guid: 8c6d9d1ab92f5b247861d64f7e31f755,
@@ -288,12 +233,17 @@ PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
+    serializedVersion: 3
    m_TransformParent: {fileID: 4877693905175392396}
    m_Modifications:
    - target: {fileID: 100000, guid: 7b3cced378bc9ef44a297c0f0cba7393, type: 3}
      propertyPath: m_Name
      value: Pistol4_02_4
      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 7b3cced378bc9ef44a297c0f0cba7393, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 7b3cced378bc9ef44a297c0f0cba7393, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
@@ -306,6 +256,10 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 7b3cced378bc9ef44a297c0f0cba7393, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 7b3cced378bc9ef44a297c0f0cba7393, type: 3}
      propertyPath: m_LocalRotation.x
      value: -0
@@ -318,14 +272,6 @@ PrefabInstance:
      propertyPath: m_LocalRotation.z
      value: -0
      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 7b3cced378bc9ef44a297c0f0cba7393, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 7b3cced378bc9ef44a297c0f0cba7393, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 7b3cced378bc9ef44a297c0f0cba7393, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
@@ -343,13 +289,10 @@ PrefabInstance:
      value: 
      objectReference: {fileID: 2100000, guid: 28af8aa4e6bad69439ee2d4d6d11939a, type: 2}
    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 7b3cced378bc9ef44a297c0f0cba7393, type: 3}
--- !u!1 &8353621443291822861 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: 7b3cced378bc9ef44a297c0f0cba7393,
-    type: 3}
-  m_PrefabInstance: {fileID: 8353621443291856301}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &8353621443291457325 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 400000, guid: 7b3cced378bc9ef44a297c0f0cba7393,