Push

2023-01-22 21:31:11 +01:00
parent 1b1e28097c
commit 131f3e8c53
6 changed files with 130 additions and 146 deletions
@@ -893,8 +893,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
 --- !u!4 &543450652514961522 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-  m_PrefabInstance: {fileID: 4670608318754873142}
+  m_CorrespondingSourceObject: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+  m_PrefabInstance: {fileID: 6706216140347310323}
  m_PrefabAsset: {fileID: 0}
 --- !u!4 &543450652542075647 stripped
 Transform:
@@ -1769,79 +1769,6 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 616c4d7a7df3216439e209b540a24966, type: 3}
--- !u!1001 &4670608318754873142
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 523664306}
-    m_Modifications:
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_RootOrder
-      value: 28
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.29999998
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.29999998
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -47.71566
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 38.70792
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -1.8189621
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071067
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5480947081188593150, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_Name
-      value: Barrel
-      objectReference: {fileID: 0}
-    - target: {fileID: 6273725544066083883, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 77bbde00f4a260347930f843de26cb12, type: 2}
-    - target: {fileID: 6273725544066083883, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 726cdcd398ce6cb459dc589edfc170ba, type: 2}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
 --- !u!1001 &4818382688961611579
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -2196,6 +2123,63 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 42ff4322cd19e9f428c4bb2b9d6d3bb7, type: 3}
+--- !u!1001 &6706216140347310323
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 523664306}
+    m_Modifications:
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_RootOrder
+      value: 28
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -47.71566
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 38.70792
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1.8189621
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071067
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6706216140314994276, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_Name
+      value: Barrel
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
 --- !u!1001 &6828052402524322104
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -2475,7 +2459,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -40.733
+      value: -40.81
      objectReference: {fileID: 0}
    - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
      propertyPath: m_LocalPosition.y