diff --git a/UOP1_Project/Assets/Prefabs/_SceneChunks/Structures/Structures_Town_Festival.prefab b/UOP1_Project/Assets/Prefabs/_SceneChunks/Structures/Structures_Town_Festival.prefab index 64644838a5..700f110d92 100644 --- a/UOP1_Project/Assets/Prefabs/_SceneChunks/Structures/Structures_Town_Festival.prefab +++ b/UOP1_Project/Assets/Prefabs/_SceneChunks/Structures/Structures_Town_Festival.prefab @@ -47,6 +47,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4454216128710310716 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6132115808795565566} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2.9680004, y: 2.5269194, z: 2.8740427} + m_Center: {x: 0.012406458, y: 1.2334476, z: -0.6499893} --- !u!1001 &179111231350353314 PrefabInstance: m_ObjectHideFlags: 0 @@ -602,6 +615,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2657305610554227554} m_PrefabAsset: {fileID: 0} +--- !u!1 &6132115808795565566 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8212599282573616796, guid: 8bb062f8b66766b46b8e7df2f7a60904, + type: 3} + m_PrefabInstance: {fileID: 2657305610554227554} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2657305611387754630 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UOP1_Project/Assets/Scenes/Locations/Town_Market.unity b/UOP1_Project/Assets/Scenes/Locations/Town_Market.unity index 84be76fa56..0a2160151a 100644 --- a/UOP1_Project/Assets/Scenes/Locations/Town_Market.unity +++ b/UOP1_Project/Assets/Scenes/Locations/Town_Market.unity @@ -329,22 +329,22 @@ PrefabInstance: - target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.w - value: -0.36843097 + value: -0.36113727 objectReference: {fileID: 0} - target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.x - value: 0.0015384462 + value: 0.07296439 objectReference: {fileID: 0} - target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.y - value: 0.8314389 + value: 0.8963117 objectReference: {fileID: 0} - target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.z - value: -0.4158914 + value: -0.24674177 objectReference: {fileID: 0} - target: {fileID: 2678045054851453813, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} @@ -374,22 +374,22 @@ PrefabInstance: - target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.w - value: -0.3680002 + value: -0.36664802 objectReference: {fileID: 0} - target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.x - value: 0.017877137 + value: 0.036236987 objectReference: {fileID: 0} - target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.y - value: 0.84906584 + value: 0.86691785 objectReference: {fileID: 0} - target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.z - value: -0.3786072 + value: -0.33572248 objectReference: {fileID: 0} - target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} @@ -409,22 +409,22 @@ PrefabInstance: - target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.w - value: -0.36832026 + value: -0.36745015 objectReference: {fileID: 0} - target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.x - value: 0.009163656 + value: 0.02691275 objectReference: {fileID: 0} - target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.y - value: 0.8398686 + value: 0.8581111 objectReference: {fileID: 0} - target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.z - value: -0.39859375 + value: -0.35763308 objectReference: {fileID: 0} - target: {fileID: 8745341640208226293, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} @@ -489,12 +489,12 @@ PrefabInstance: - target: {fileID: 8745341641394998850, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalPosition.x - value: 2.0329819 + value: 2.0329857 objectReference: {fileID: 0} - target: {fileID: 8745341641394998850, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8745341641394998850, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} @@ -534,12 +534,12 @@ PrefabInstance: - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalPosition.x - value: 2.0329819 + value: 2.0329857 objectReference: {fileID: 0} - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} @@ -549,22 +549,22 @@ PrefabInstance: - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.w - value: -0.11069169 + value: -0.11361246 objectReference: {fileID: 0} - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.x - value: -0.02589566 + value: -0.0039359494 objectReference: {fileID: 0} - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.y - value: 0.9673973 + value: 0.9929217 objectReference: {fileID: 0} - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} propertyPath: m_LocalRotation.z - value: -0.22631684 + value: -0.034398388 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3} @@ -19788,6 +19788,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4454216128710310716, guid: 807825b115ecf8d419cb20c12cb26dbf, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 807825b115ecf8d419cb20c12cb26dbf, type: 3} --- !u!1001 &2920354319084755143