diff --git a/FlufflParty/Assets/New Terrain.asset b/FlufflParty/Assets/New Terrain.asset index 7367eee..51fdd31 100644 Binary files a/FlufflParty/Assets/New Terrain.asset and b/FlufflParty/Assets/New Terrain.asset differ diff --git a/FlufflParty/Assets/Prefabs/Fence_2.prefab b/FlufflParty/Assets/Prefabs/Fence_2.prefab index 0506572..60c2c49 100644 --- a/FlufflParty/Assets/Prefabs/Fence_2.prefab +++ b/FlufflParty/Assets/Prefabs/Fence_2.prefab @@ -61,7 +61,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 77bbde00f4a260347930f843de26cb12, type: 2} + - {fileID: 2100000, guid: c75857cda83d08b42bed510090aaf1a1, type: 2} - {fileID: 2100000, guid: d27b8480a59e4f946a060160bd36a176, type: 2} - {fileID: 2100000, guid: 09ed5fd5442429e41a85a6c6f9315b98, type: 2} m_StaticBatchInfo: diff --git a/FlufflParty/Assets/Prefabs/PalmTree.prefab b/FlufflParty/Assets/Prefabs/PalmTree.prefab index 23457f4..046aaaa 100644 --- a/FlufflParty/Assets/Prefabs/PalmTree.prefab +++ b/FlufflParty/Assets/Prefabs/PalmTree.prefab @@ -61,8 +61,8 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b6c4494d86ad85845a7c1957f96623c8, type: 2} - - {fileID: 2100000, guid: 0c56efe1da0734e4d92ed0f239266c79, type: 2} + - {fileID: 2100000, guid: c75857cda83d08b42bed510090aaf1a1, type: 2} + - {fileID: 2100000, guid: 15020cefcc07f6840987f34f2a56ca4c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 661f5f2..f787735 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -2265,6 +2265,68 @@ Mesh: offset: 0 size: 0 path: +--- !u!1001 &193876038 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1584314260} + m_Modifications: + - target: {fileID: 306078162806012731, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_Name + value: Fence_2 (1) + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_RootOrder + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.x + value: 81.94 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.y + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.z + value: 114.1 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.60233265 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.x + value: -0.6023328 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.y + value: -0.3703989 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.z + value: -0.3703989 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -63.178 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} +--- !u!4 &193876039 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + m_PrefabInstance: {fileID: 193876038} + m_PrefabAsset: {fileID: 0} --- !u!1001 &197106417 PrefabInstance: m_ObjectHideFlags: 0 @@ -6327,6 +6389,76 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 593795847} m_CullTransparentMesh: 1 +--- !u!1001 &600144141 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1584314260} + m_Modifications: + - target: {fileID: 306078162806012731, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_Name + value: Fence_2 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_RootOrder + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalScale.z + value: 0.7354019 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.x + value: 88.95812 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.y + value: 1.0071421 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.z + value: 123.90367 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2251681098929134318, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c75857cda83d08b42bed510090aaf1a1, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} +--- !u!4 &600144142 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + m_PrefabInstance: {fileID: 600144141} + m_PrefabAsset: {fileID: 0} --- !u!1001 &619344560 PrefabInstance: m_ObjectHideFlags: 0 @@ -7693,6 +7825,68 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 719608961} m_CullTransparentMesh: 1 +--- !u!1001 &732611594 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1584314260} + m_Modifications: + - target: {fileID: 306078162806012731, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_Name + value: Fence_2 (9) + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.x + value: 88.250854 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.y + value: 1.0071402 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.z + value: 109.647446 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5639732 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5639733 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.y + value: -0.42653742 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.z + value: -0.4265374 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -74.201 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} +--- !u!4 &732611595 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + m_PrefabInstance: {fileID: 732611594} + m_PrefabAsset: {fileID: 0} --- !u!1 &734282268 GameObject: m_ObjectHideFlags: 0 @@ -8727,6 +8921,68 @@ RectTransform: m_AnchoredPosition: {x: 94.61594, y: -119.219986} m_SizeDelta: {x: 130.3399, y: 40.658} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &829673166 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1584314260} + m_Modifications: + - target: {fileID: 306078162806012731, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_Name + value: Fence_2 (8) + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.x + value: 104.22264 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.y + value: 1.0071421 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.z + value: 114.89243 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.6139637 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.x + value: -0.61396384 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.y + value: 0.3507827 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.z + value: 0.35078266 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 59.482 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} +--- !u!4 &829673167 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + m_PrefabInstance: {fileID: 829673166} + m_PrefabAsset: {fileID: 0} --- !u!1 &857407152 GameObject: m_ObjectHideFlags: 0 @@ -10277,6 +10533,68 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1021992536} m_CullTransparentMesh: 1 +--- !u!1001 &1028744961 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1584314260} + m_Modifications: + - target: {fileID: 306078162806012731, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_Name + value: Fence_2 (5) + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.x + value: 102.43431 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.y + value: 1.007144 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.z + value: 94.00838 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.6702152 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.x + value: -0.67021525 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.y + value: -0.22541419 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.z + value: -0.22541417 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -37.179 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} +--- !u!4 &1028744962 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + m_PrefabInstance: {fileID: 1028744961} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1051861186 PrefabInstance: m_ObjectHideFlags: 0 @@ -11578,6 +11896,72 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1139560683} m_CullTransparentMesh: 1 +--- !u!1001 &1143210915 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1584314260} + m_Modifications: + - target: {fileID: 306078162806012731, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_Name + value: Fence_2 (4) + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalScale.z + value: 0.7354019 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.x + value: 95.42656 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.y + value: 1.0071459 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.z + value: 98.142334 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} +--- !u!4 &1143210916 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + m_PrefabInstance: {fileID: 1143210915} + m_PrefabAsset: {fileID: 0} --- !u!1 &1146155450 GameObject: m_ObjectHideFlags: 0 @@ -13292,6 +13676,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3} m_PrefabInstance: {fileID: 1293309486} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1302006243 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1584314260} + m_Modifications: + - target: {fileID: 306078162806012731, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_Name + value: Fence_2 (7) + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.x + value: 109.95513 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.y + value: 1.0071383 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.z + value: 107.38612 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.66678286 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.x + value: -0.666783 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.y + value: 0.23537324 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.z + value: 0.23537321 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 38.886 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} +--- !u!4 &1302006244 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + m_PrefabInstance: {fileID: 1302006243} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1309058663 PrefabInstance: m_ObjectHideFlags: 0 @@ -14148,6 +14594,72 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1415218406} m_CullTransparentMesh: 1 +--- !u!1001 &1428547902 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1584314260} + m_Modifications: + - target: {fileID: 306078162806012731, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_Name + value: Fence_2 (2) + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalScale.z + value: 0.7354019 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.x + value: 79.74097 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.y + value: 1.0071411 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.z + value: 103.53362 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} +--- !u!4 &1428547903 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + m_PrefabInstance: {fileID: 1428547902} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1434234012 PrefabInstance: m_ObjectHideFlags: 0 @@ -14590,6 +15102,68 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c29627ef6f4e70e4b98cf9075b20afe3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1483600280 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1584314260} + m_Modifications: + - target: {fileID: 306078162806012731, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_Name + value: Fence_2 (3) + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.x + value: 81.852554 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.y + value: 1.0071392 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.z + value: 99.508255 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.63237983 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.x + value: -0.6323799 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.y + value: -0.3163791 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.z + value: -0.31637907 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -53.158 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} +--- !u!4 &1483600281 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + m_PrefabInstance: {fileID: 1483600280} + m_PrefabAsset: {fileID: 0} --- !u!1 &1489303324 GameObject: m_ObjectHideFlags: 0 @@ -15058,6 +15632,16 @@ Transform: - {fileID: 55786171} - {fileID: 292259956} - {fileID: 203184820} + - {fileID: 732611595} + - {fileID: 829673167} + - {fileID: 1302006244} + - {fileID: 1908477170} + - {fileID: 1028744962} + - {fileID: 1143210916} + - {fileID: 1483600281} + - {fileID: 1428547903} + - {fileID: 193876039} + - {fileID: 600144142} m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19229,6 +19813,68 @@ RectTransform: m_AnchoredPosition: {x: 0.13464355, y: -0.23825073} m_SizeDelta: {x: -0.17651, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1908477169 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1584314260} + m_Modifications: + - target: {fileID: 306078162806012731, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_Name + value: Fence_2 (6) + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.x + value: 97.03598 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.y + value: 1.0071383 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalPosition.z + value: 89.92749 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.6925037 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.x + value: -0.69250387 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.y + value: 0.14296341 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalRotation.z + value: 0.14296342 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 23.329 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} +--- !u!4 &1908477170 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} + m_PrefabInstance: {fileID: 1908477169} + m_PrefabAsset: {fileID: 0} --- !u!1 &1912330177 GameObject: m_ObjectHideFlags: 0 diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index e767941..df99f39 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -137,9 +137,7 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.14 - preloadedAssets: - - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} - - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1