From b8865b414916b7f1d89b51394425c0df13e1a24d Mon Sep 17 00:00:00 2001 From: brausjonas Date: Mon, 3 Apr 2023 19:07:02 +0200 Subject: [PATCH] sdfadfdsf --- FlufflParty/Assets/New Terrain.asset | Bin 2085264 -> 2085228 bytes FlufflParty/Assets/Scenes/WesternMap.unity | 85 +++++++++++++++++---- 2 files changed, 71 insertions(+), 14 deletions(-) diff --git a/FlufflParty/Assets/New Terrain.asset b/FlufflParty/Assets/New Terrain.asset index 51fdd317560b7bb03ea729c2e28bac5a46404b72..f59b7f61c1a59cecd692d0d0819e5c73dda5c552 100644 GIT binary patch delta 159 zcmWN=yA6Us0D$3~Z&6fUp5gvhm`fvOH zw0$D#AuW^`JFSdXf-}y!;F2q@x#5-$cihwEfk&R`(PzMr5zkgD`6@+ae~s*1lN-qk QuZ(%)oew^3Zj$Uh0WN1Ve diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 72a6f6b..f0e58cb 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -341,7 +341,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &34779300 GameObject: @@ -620,7 +620,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &47812148 MonoBehaviour: @@ -2076,7 +2076,7 @@ Transform: - {fileID: 1736008288} - {fileID: 1406090858} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &179390189 GameObject: @@ -2184,7 +2184,7 @@ Transform: m_Children: - {fileID: 1202275724} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &191235143 Mesh: @@ -3111,7 +3111,7 @@ Transform: - {fileID: 52894757} - {fileID: 314972567} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &250767830 GameObject: @@ -4175,7 +4175,7 @@ RectTransform: - {fileID: 1370614408} - {fileID: 1903920336} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7431,7 +7431,7 @@ Transform: - {fileID: 1017709783} - {fileID: 2106570837} m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &675727855 MonoBehaviour: @@ -8215,7 +8215,7 @@ Transform: - {fileID: 431546227} - {fileID: 1740517987} m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &782948711 GameObject: @@ -11449,7 +11449,7 @@ Transform: - {fileID: 657595552} - {fileID: 253183257} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1108023622 GameObject: @@ -13350,6 +13350,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265286964} m_CullTransparentMesh: 1 +--- !u!1001 &1266518888 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7476016153201905786, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7476016153201905786, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_LocalPosition.x + value: 104.9 + objectReference: {fileID: 0} + - target: {fileID: 7476016153201905786, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_LocalPosition.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 7476016153201905786, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_LocalPosition.z + value: 96.77 + objectReference: {fileID: 0} + - target: {fileID: 7476016153201905786, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_LocalRotation.w + value: 0.103451066 + objectReference: {fileID: 0} + - target: {fileID: 7476016153201905786, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_LocalRotation.x + value: -0.0008734216 + objectReference: {fileID: 0} + - target: {fileID: 7476016153201905786, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9945988 + objectReference: {fileID: 0} + - target: {fileID: 7476016153201905786, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_LocalRotation.z + value: 0.008397245 + objectReference: {fileID: 0} + - target: {fileID: 7476016153201905786, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.967 + objectReference: {fileID: 0} + - target: {fileID: 7476016153201905786, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 168.124 + objectReference: {fileID: 0} + - target: {fileID: 7476016153201905786, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7821615350362852032, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} + propertyPath: m_Name + value: NewPalm + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3fd9000fb7829c742a2dff4963410a18, type: 3} --- !u!1 &1267775367 GameObject: m_ObjectHideFlags: 0 @@ -13770,7 +13827,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 50.61, y: 151.873, z: 2.915} --- !u!114 &1328561028 MonoBehaviour: @@ -15210,7 +15267,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1547369677 GameObject: @@ -15388,7 +15445,7 @@ Transform: - {fileID: 203184820} - {fileID: 1357405425} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1585901470 PrefabInstance: @@ -18604,7 +18661,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1805722634 GameObject: @@ -21334,7 +21391,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2092590529 PrefabInstance: