Browse Source

修改武器预设

灯芯 1 week ago
parent
commit
c28d53092d

+ 13 - 129
snipershooting/ShootSniper/Assets/Resources_moved/Weapon/WeaponInventory/1.prefab

@@ -65,7 +65,6 @@ Transform:
   - {fileID: 1267506374288619710}
   - {fileID: 4635862689034352580}
   - {fileID: 6154434655968588685}
-  - {fileID: 4579521305920330386}
   m_Father: {fileID: 1267506374288619696}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1267506374288581780
@@ -476,7 +475,7 @@ MonoBehaviour:
   parts:
   - partType: 5
     weaponPart: {fileID: 6972252785665157549}
-  - partType: 2
+  - partType: 4
     weaponPart: {fileID: 4688482354085170770}
   hologramMat: {fileID: 2100000, guid: 955061dc565ec364a8beaedb2661505e, type: 2}
   oldScope: {fileID: 0}
@@ -484,38 +483,6 @@ MonoBehaviour:
     isNeedSet: 1
     newPosition: {x: -0.0166, y: -26, z: -0.093}
     newRotation: {x: 0, y: 90, z: 0}
---- !u!1 &5740570621892985691
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4579521305920330386}
-  m_Layer: 21
-  m_Name: mag_02
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &4579521305920330386
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5740570621892985691}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.6885212, y: -0.022427076, z: -0.7245179, w: -0.022568012}
-  m_LocalPosition: {x: 0.00245, y: -0.01438, z: -0.00423}
-  m_LocalScale: {x: 0.09337631, y: 0.12752609, z: 0.09337635}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8288768387792111250}
-  m_Father: {fileID: 1267506374288619698}
-  m_LocalEulerAnglesHint: {x: -2.795, y: -269.166, z: 71.332}
 --- !u!1 &8067879753473180788
 GameObject:
   m_ObjectHideFlags: 0
@@ -596,6 +563,10 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 10
       objectReference: {fileID: 0}
+    - target: {fileID: 100000, guid: 77035568ca8ba3f47845deaa9d3c5e9c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 77035568ca8ba3f47845deaa9d3c5e9c, type: 3}
       propertyPath: m_RootOrder
       value: 0
@@ -659,14 +630,12 @@ PrefabInstance:
   m_SourcePrefab: {fileID: 100100000, guid: 77035568ca8ba3f47845deaa9d3c5e9c, type: 3}
 --- !u!4 &4688482354084745842 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 400000, guid: 77035568ca8ba3f47845deaa9d3c5e9c,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 400000, guid: 77035568ca8ba3f47845deaa9d3c5e9c, type: 3}
   m_PrefabInstance: {fileID: 4688482354085136626}
   m_PrefabAsset: {fileID: 0}
 --- !u!1 &4688482354085170770 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: 77035568ca8ba3f47845deaa9d3c5e9c,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 100000, guid: 77035568ca8ba3f47845deaa9d3c5e9c, type: 3}
   m_PrefabInstance: {fileID: 4688482354085136626}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6972252785665191693
@@ -685,6 +654,10 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 21
       objectReference: {fileID: 0}
+    - target: {fileID: 100000, guid: 6884254e800265241b88202053a6fda8, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 6884254e800265241b88202053a6fda8, type: 3}
       propertyPath: m_RootOrder
       value: 0
@@ -752,100 +725,11 @@ PrefabInstance:
   m_SourcePrefab: {fileID: 100100000, guid: 6884254e800265241b88202053a6fda8, type: 3}
 --- !u!4 &6972252785665062285 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 400000, guid: 6884254e800265241b88202053a6fda8,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 400000, guid: 6884254e800265241b88202053a6fda8, type: 3}
   m_PrefabInstance: {fileID: 6972252785665191693}
   m_PrefabAsset: {fileID: 0}
 --- !u!1 &6972252785665157549 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: 6884254e800265241b88202053a6fda8,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 100000, guid: 6884254e800265241b88202053a6fda8, type: 3}
   m_PrefabInstance: {fileID: 6972252785665191693}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8288768387791723538
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 4579521305920330386}
-    m_Modifications:
-    - target: {fileID: 100000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_Name
-      value: mag_02
-      objectReference: {fileID: 0}
-    - target: {fileID: 100000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_Layer
-      value: 21
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2300000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: f17e41f55a04e6345910a19b8702be95, type: 2}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 58e4f5973263b934dbc95f58360d8176, type: 3}
---- !u!4 &8288768387792111250 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 400000, guid: 58e4f5973263b934dbc95f58360d8176,
-    type: 3}
-  m_PrefabInstance: {fileID: 8288768387791723538}
-  m_PrefabAsset: {fileID: 0}

+ 3 - 5
snipershooting/ShootSniper/Assets/Resources_moved/Weapon/WeaponInventory/16.prefab

@@ -159,7 +159,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parts:
-  - partType: 4
+  - partType: 1
     weaponPart: {fileID: 8289116718511153689}
   - partType: 3
     weaponPart: {fileID: 8799660252963293558}
@@ -813,13 +813,11 @@ PrefabInstance:
   m_SourcePrefab: {fileID: 100100000, guid: ccbb5773aff9c784e9368a70ffa15010, type: 3}
 --- !u!1 &8799660252963293558 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: ccbb5773aff9c784e9368a70ffa15010,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 100000, guid: ccbb5773aff9c784e9368a70ffa15010, type: 3}
   m_PrefabInstance: {fileID: 8799660252963393494}
   m_PrefabAsset: {fileID: 0}
 --- !u!4 &8799660252963788118 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 400000, guid: ccbb5773aff9c784e9368a70ffa15010,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 400000, guid: ccbb5773aff9c784e9368a70ffa15010, type: 3}
   m_PrefabInstance: {fileID: 8799660252963393494}
   m_PrefabAsset: {fileID: 0}

+ 100 - 49
snipershooting/ShootSniper/Assets/Resources_moved/Weapon/WeaponInventory/2.prefab

@@ -23,12 +23,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1919460408972897625}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.0045424094, y: 0.00000016975854, z: -0.00000006359737, w: 0.99998975}
   m_LocalPosition: {x: -0.0058, y: 0.0104, z: -0.0066}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6534897319878562720}
-  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0.521, y: 0, z: 0}
 --- !u!1 &2148390450281187104
 GameObject:
@@ -53,13 +54,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2148390450281187104}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.0045424094, y: 0.00000016975854, z: -0.00000006359737, w: 0.99998975}
   m_LocalPosition: {x: 0.0012, y: -0.165, z: -0.0043}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1417382611658027799}
   m_Father: {fileID: 6534897319878562720}
-  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0.521, y: 0, z: 0}
 --- !u!1 &2884887723630349669
 GameObject:
@@ -84,12 +86,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2884887723630349669}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.0045424094, y: 0.00000016975854, z: -0.00000006359737, w: 0.99998975}
   m_LocalPosition: {x: -0, y: -0.0161, z: 0.0071}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6534897319878562720}
-  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0.521, y: 0, z: 0}
 --- !u!1 &5096378459258851937
 GameObject:
@@ -114,13 +117,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5096378459258851937}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.0045424094, y: 0.00000016975854, z: -0.00000006359737, w: 0.99998975}
   m_LocalPosition: {x: 0.0003, y: 0.1023, z: -0.0243}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2975841226267438273}
   m_Father: {fileID: 6534897319878562720}
-  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0.521, y: 0, z: 0}
 --- !u!1 &6537025498586302700
 GameObject:
@@ -145,13 +149,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6537025498586302700}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.0045424094, y: 0.00000016975854, z: -0.00000006359737, w: 0.99998975}
   m_LocalPosition: {x: -0, y: -0.0586, z: -0.0118}
   m_LocalScale: {x: 0.5146958, y: 0.5146958, z: 0.5146958}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6534891748098403696}
   m_Father: {fileID: 6534897319878562720}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0.521, y: 0, z: 0}
 --- !u!1 &6537196751153788486
 GameObject:
@@ -176,14 +181,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6537196751153788486}
-  m_LocalRotation: {x: -0.05389588, y: -0.000000022351733, z: -0.000000038714344,
-    w: 0.99854666}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.05389588, y: -0.000000022351733, z: -0.000000038714344, w: 0.99854666}
   m_LocalPosition: {x: -0, y: -0.1232, z: -0.016}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6535065899452116190}
   m_Father: {fileID: 6534897319878562720}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: -6.1790004, y: 0, z: 0}
 --- !u!1 &6537697131907856814
 GameObject:
@@ -208,9 +213,11 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6537697131907856814}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0.49999994, z: -0.86602545, w: 0}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 82, y: 82, z: 82}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6535082551933721640}
   - {fileID: 6534240321256862844}
@@ -222,7 +229,6 @@ Transform:
   - {fileID: 5657863540553382012}
   - {fileID: 7247136924326510601}
   m_Father: {fileID: 6535235985275841546}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: -120, y: -180, z: 0}
 --- !u!1 &6537812336362281772
 GameObject:
@@ -249,12 +255,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6537812336362281772}
+  serializedVersion: 2
   m_LocalRotation: {x: -0.0000000028229579, y: -0.000000025406619, z: 0.7071068, w: 0.7071067}
   m_LocalPosition: {x: 0.00076566305, y: 0.07195763, z: -0.02434655}
   m_LocalScale: {x: 0.058320437, y: 0.058320437, z: 0.058320437}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6534884935543263986}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6541077364274280538
 MeshFilter:
@@ -275,9 +282,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: 4294967295
   m_RendererPriority: 0
   m_Materials:
@@ -289,6 +299,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
@@ -301,6 +312,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &6537869543791472954
 GameObject:
   m_ObjectHideFlags: 0
@@ -324,13 +336,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6537869543791472954}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.0045424094, y: 0.00000016975854, z: -0.00000006359737, w: 0.99998975}
   m_LocalPosition: {x: -0.0006, y: 0.0041, z: -0.0016}
   m_LocalScale: {x: 0.7890944, y: 0.7890944, z: 0.7890944}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6535120734695773698}
   m_Father: {fileID: 6534897319878562720}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0.521, y: 0, z: 0}
 --- !u!1 &6537927138027353894
 GameObject:
@@ -357,13 +370,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6537927138027353894}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.70710677}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6534897319878562720}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 90.00001, z: 0}
 --- !u!114 &5313367905422904284
 MonoBehaviour:
@@ -426,12 +440,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6537964504514696200}
+  serializedVersion: 2
   m_LocalRotation: {x: -0.70710653, y: -0.00069660274, z: 0.0006969353, w: 0.70710635}
   m_LocalPosition: {x: 0.03354747, y: -0.014740797, z: -0.000041179657}
   m_LocalScale: {x: 0.046020325, y: 0.046020325, z: 0.04602033}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6534240321256862844}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6541978393547778034
 MeshFilter:
@@ -452,9 +467,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: 4294967295
   m_RendererPriority: 0
   m_Materials:
@@ -466,6 +484,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
@@ -478,6 +497,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &6538384224025247364
 GameObject:
   m_ObjectHideFlags: 0
@@ -503,12 +523,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6538384224025247364}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.000000003682613, y: 0.0000000036826135, z: 0.7071068, w: 0.7071067}
   m_LocalPosition: {x: -0.00000019378662, y: 0.2324197, z: -0.01840411}
   m_LocalScale: {x: 0.08941266, y: 0.08941266, z: 0.08941266}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6534382940120943116}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6542468497391721410
 MeshFilter:
@@ -529,9 +550,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: 4294967295
   m_RendererPriority: 0
   m_Materials:
@@ -543,6 +567,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
@@ -555,6 +580,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &6538436315220779580
 GameObject:
   m_ObjectHideFlags: 0
@@ -580,12 +606,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6538436315220779580}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.00000010016904, y: -0.00000005723943, z: 0.7071069, w: 0.70710665}
   m_LocalPosition: {x: -0.000000012111664, y: 0.18432678, z: -0.0058958367}
   m_LocalScale: {x: 0.046020325, y: 0.046020336, z: 0.04602033}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6535082551933721640}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6541827703835407408
 MeshFilter:
@@ -606,9 +633,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: 4294967295
   m_RendererPriority: 0
   m_Materials:
@@ -620,6 +650,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
@@ -632,6 +663,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &6538467762048310250
 GameObject:
   m_ObjectHideFlags: 0
@@ -655,13 +687,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6538467762048310250}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.69103336, y: 0.14990914, z: 0.6910338, w: 0.14990883}
   m_LocalPosition: {x: -0, y: 0.0275, z: -0.0058}
   m_LocalScale: {x: 1, y: 0.9999999, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6534425019625541288}
   m_Father: {fileID: 6534897319878562720}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 90.00001, z: 155.52}
 --- !u!1 &6538514622449646988
 GameObject:
@@ -688,12 +721,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6538514622449646988}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.003211736, y: -0.003211885, z: 0.7070996, w: 0.7070994}
   m_LocalPosition: {x: -0, y: 0.0612, z: -0.0203}
   m_LocalScale: {x: 0.04602032, y: 0.04602032, z: 0.04602032}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6534897319878562720}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0.52000004, y: 0, z: 90.00001}
 --- !u!33 &6541917932035964614
 MeshFilter:
@@ -714,9 +748,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: 4294967295
   m_RendererPriority: 0
   m_Materials:
@@ -728,6 +765,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
@@ -740,11 +778,13 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1001 &1417382611658418583
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 9140123885719338836}
     m_Modifications:
     - target: {fileID: 100000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
@@ -755,6 +795,14 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 21
       objectReference: {fileID: 0}
+    - target: {fileID: 100000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -767,6 +815,10 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
@@ -779,14 +831,6 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
@@ -800,17 +844,18 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
---- !u!1 &1417382611658387255 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: ba002a96c330ffa439f91ede81eb3cf7,
-    type: 3}
-  m_PrefabInstance: {fileID: 1417382611658418583}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &1417382611658027799 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 400000, guid: ba002a96c330ffa439f91ede81eb3cf7,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 400000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
+  m_PrefabInstance: {fileID: 1417382611658418583}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1417382611658387255 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 100000, guid: ba002a96c330ffa439f91ede81eb3cf7, type: 3}
   m_PrefabInstance: {fileID: 1417382611658418583}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2975841226267571777
@@ -818,6 +863,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 7247136924326510601}
     m_Modifications:
     - target: {fileID: 100000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
@@ -828,6 +874,14 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 21
       objectReference: {fileID: 0}
+    - target: {fileID: 100000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -840,6 +894,10 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
@@ -852,14 +910,6 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
@@ -873,16 +923,17 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
---- !u!1 &2975841226267668705 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: f60bee627621c8c4aae25841a1b517c5,
-    type: 3}
-  m_PrefabInstance: {fileID: 2975841226267571777}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &2975841226267438273 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 400000, guid: f60bee627621c8c4aae25841a1b517c5,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 400000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
+  m_PrefabInstance: {fileID: 2975841226267571777}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2975841226267668705 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 100000, guid: f60bee627621c8c4aae25841a1b517c5, type: 3}
   m_PrefabInstance: {fileID: 2975841226267571777}
   m_PrefabAsset: {fileID: 0}

+ 18 - 20
snipershooting/ShootSniper/Assets/Resources_moved/Weapon/WeaponInventory/7.prefab

@@ -118,8 +118,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7064854102461579123}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.007932021, y: 0.0000000038567034, z: -0.000000014393415,
-    w: 0.9999686}
+  m_LocalRotation: {x: -0.007932021, y: 0.0000000038567034, z: -0.000000014393415, w: 0.9999686}
   m_LocalPosition: {x: -0.0004, y: -0.0042, z: 0.0065}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -313,28 +312,23 @@ PrefabInstance:
     - {fileID: 9500000, guid: bccfe775356cbf0429d7057cddf59b03, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 400092, guid: bccfe775356cbf0429d7057cddf59b03,
-        type: 3}
+    - targetCorrespondingSourceObject: {fileID: 400092, guid: bccfe775356cbf0429d7057cddf59b03, type: 3}
       insertIndex: -1
       addedObject: {fileID: 8256690615328789762}
-    - targetCorrespondingSourceObject: {fileID: 400092, guid: bccfe775356cbf0429d7057cddf59b03,
-        type: 3}
+    - targetCorrespondingSourceObject: {fileID: 400092, guid: bccfe775356cbf0429d7057cddf59b03, type: 3}
       insertIndex: -1
       addedObject: {fileID: 7278592493251583540}
-    - targetCorrespondingSourceObject: {fileID: 400092, guid: bccfe775356cbf0429d7057cddf59b03,
-        type: 3}
+    - targetCorrespondingSourceObject: {fileID: 400092, guid: bccfe775356cbf0429d7057cddf59b03, type: 3}
       insertIndex: -1
       addedObject: {fileID: 8672181094493111046}
-    - targetCorrespondingSourceObject: {fileID: 400092, guid: bccfe775356cbf0429d7057cddf59b03,
-        type: 3}
+    - targetCorrespondingSourceObject: {fileID: 400092, guid: bccfe775356cbf0429d7057cddf59b03, type: 3}
       insertIndex: -1
       addedObject: {fileID: 4801243924945618716}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: bccfe775356cbf0429d7057cddf59b03, type: 3}
 --- !u!4 &2283873867483338245 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 400092, guid: bccfe775356cbf0429d7057cddf59b03,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 400092, guid: bccfe775356cbf0429d7057cddf59b03, type: 3}
   m_PrefabInstance: {fileID: 2283873867483204825}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5227269674781872832
@@ -353,6 +347,10 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 21
       objectReference: {fileID: 0}
+    - target: {fileID: 100000, guid: 057ea863a7b998d409dc6efcff89ce74, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 057ea863a7b998d409dc6efcff89ce74, type: 3}
       propertyPath: m_RootOrder
       value: 0
@@ -408,14 +406,12 @@ PrefabInstance:
   m_SourcePrefab: {fileID: 100100000, guid: 057ea863a7b998d409dc6efcff89ce74, type: 3}
 --- !u!1 &5227269674781774944 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: 057ea863a7b998d409dc6efcff89ce74,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 100000, guid: 057ea863a7b998d409dc6efcff89ce74, type: 3}
   m_PrefabInstance: {fileID: 5227269674781872832}
   m_PrefabAsset: {fileID: 0}
 --- !u!4 &5227269674782001216 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 400000, guid: 057ea863a7b998d409dc6efcff89ce74,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 400000, guid: 057ea863a7b998d409dc6efcff89ce74, type: 3}
   m_PrefabInstance: {fileID: 5227269674781872832}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7874753963350886898
@@ -434,6 +430,10 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 21
       objectReference: {fileID: 0}
+    - target: {fileID: 100000, guid: e3cdf9fb1e0f57f43b90f9602ec32941, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: e3cdf9fb1e0f57f43b90f9602ec32941, type: 3}
       propertyPath: m_RootOrder
       value: 0
@@ -489,13 +489,11 @@ PrefabInstance:
   m_SourcePrefab: {fileID: 100100000, guid: e3cdf9fb1e0f57f43b90f9602ec32941, type: 3}
 --- !u!1 &7874753963350855506 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: e3cdf9fb1e0f57f43b90f9602ec32941,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 100000, guid: e3cdf9fb1e0f57f43b90f9602ec32941, type: 3}
   m_PrefabInstance: {fileID: 7874753963350886898}
   m_PrefabAsset: {fileID: 0}
 --- !u!4 &7874753963351282546 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 400000, guid: e3cdf9fb1e0f57f43b90f9602ec32941,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 400000, guid: e3cdf9fb1e0f57f43b90f9602ec32941, type: 3}
   m_PrefabInstance: {fileID: 7874753963350886898}
   m_PrefabAsset: {fileID: 0}