jonas/flufflparty-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Push

Browse Source
This commit is contained in:
brausjonas
2023-01-22 21:31:11 +01:00
parent 1b1e28097c
commit 131f3e8c53
6 changed files with 130 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/Assets/Prefabs/Barrel.prefab
+15 -15
View File
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5480947081188593150
--- !u!1 &6706216140314994276
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,9 +8,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5141963950078138180}
- component: {fileID: 8139191369505347809}
- component: {fileID: 6273725544066083883}
- component: {fileID: 6529090747793098881}
- component: {fileID: 6529090747793098887}
- component: {fileID: 6529090747793098880}
m_Layer: 0
m_Name: Barrel
m_TagString: Untagged
@@ -18,36 +18,36 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_IsActive: 1
--- !u!4 &5141963950078138180
--- !u!4 &6529090747793098881
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5480947081188593150}
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: 85.26, y: 0.0000052452087, z: 96.17}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_GameObject: {fileID: 6706216140314994276}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067}
m_LocalPosition: {x: -47.71566, y: 38.70792, z: -1.8189621}
m_LocalScale: {x: 0.3, y: 0.29999998, z: 0.29999998}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8139191369505347809
--- !u!33 &6529090747793098887
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5480947081188593150}
m_GameObject: {fileID: 6706216140314994276}
m_Mesh: {fileID: 2534964839176971238, guid: b58b9b5d4a4bda1429d937027c43b3c2, type: 3}
--- !u!23 &6273725544066083883
--- !u!23 &6529090747793098880
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5480947081188593150}
m_GameObject: {fileID: 6706216140314994276}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -61,8 +61,8 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: e7bf391985dce0743af9240059d69c2c, type: 2}
- {fileID: 2100000, guid: e04f02a1966cc0c4faf61fc89b39c0cd, type: 2}
- {fileID: 2100000, guid: 77bbde00f4a260347930f843de26cb12, type: 2}
- {fileID: 2100000, guid: 726cdcd398ce6cb459dc589edfc170ba, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
FlufflParty/Assets/Scenes/Test.unity
+60 -76
View File
@@ -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