From 6b9d1f14f6706f0417c57847950bf4bb81955caa Mon Sep 17 00:00:00 2001 From: Alexandre <alexandre.novais@universite-paris-saclay.fr> Date: Tue, 29 Mar 2022 12:09:51 +0200 Subject: [PATCH] Affichage score (unfinished) +... --- Assets/Scenes/Hub/Hub.unity | 1980 +++++++++-------- .../Actors/GameTriggerUI.cs | 1 + .../Actors/HighlightObjects.cs | 30 - .../Actors/HighlightObjects.cs.meta | 15 - .../Actors/ScoreTriggerUI.cs | 68 + .../Actors/ScoreTriggerUI.cs.meta} | 2 +- .../Actors/ShowInteractions.cs | 18 - .../Actors/ShowInteractions.cs.meta | 11 - .../GestionScore/LeaderBoard/AfficherScore.cs | 1 + .../Scripts/Hub/PlayerHub/MouvementPlayer.cs | 18 - BrowserAssets/UI/hub.html | 60 + .../com.unity.probuilder/Settings.json | 5 + 12 files changed, 1133 insertions(+), 1076 deletions(-) delete mode 100644 Assets/Scripts/Hub/CollideInteractions/Actors/HighlightObjects.cs delete mode 100644 Assets/Scripts/Hub/CollideInteractions/Actors/HighlightObjects.cs.meta create mode 100644 Assets/Scripts/Hub/CollideInteractions/Actors/ScoreTriggerUI.cs rename Assets/Scripts/Hub/{PlayerHub/MouvementPlayer.cs.meta => CollideInteractions/Actors/ScoreTriggerUI.cs.meta} (83%) delete mode 100644 Assets/Scripts/Hub/CollideInteractions/Actors/ShowInteractions.cs delete mode 100644 Assets/Scripts/Hub/CollideInteractions/Actors/ShowInteractions.cs.meta delete mode 100644 Assets/Scripts/Hub/PlayerHub/MouvementPlayer.cs diff --git a/Assets/Scenes/Hub/Hub.unity b/Assets/Scenes/Hub/Hub.unity index 70eb84a2..bf67c96a 100644 --- a/Assets/Scenes/Hub/Hub.unity +++ b/Assets/Scenes/Hub/Hub.unity @@ -123,341 +123,13 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!43 &12575653 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33198 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0.4777832, y: 0.70597076, z: -15.770264} - m_Extent: {x: 0.47776794, y: 0.70596886, z: 15.770233} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 0000803700000036000000b800000000000000000000803f000080bf0000000000000000000080bf000080b700000036009f743f00000036000000b800000000000000000000803f000080bf0000000000000000000080bf009f74bf000000360000803770bab43f000000b800000000000000000000803f000080bf0000000000000000000080bf000080b770bab43f009f743f70bab43f000000b800000000000000000000803f000080bf0000000000000000000080bf009f74bf70bab43f009f743f00000036000000b80000803f000000000000000000000000000000000000803f000080bf000000b800000036009f743f00000036f052fcc10000803f000000000000000000000000000000000000803f000080bff052fcc100000036009f743f70bab43f000000b80000803f000000000000000000000000000000000000803f000080bf000000b870bab43f009f743f70bab43ff052fcc10000803f000000000000000000000000000000000000803f000080bff052fcc170bab43f009f743f00000036f052fcc10000000000000000000080bf0000803f0000000000000000000080bf009f743f000000360000803700000036f052fcc10000000000000000000080bf0000803f0000000000000000000080bf0000803700000036009f743f70bab43ff052fcc10000000000000000000080bf0000803f0000000000000000000080bf009f743f70bab43f0000803770bab43ff052fcc10000000000000000000080bf0000803f0000000000000000000080bf0000803770bab43f0000803700000036f052fcc1000080bf00000000000000000000000000000000000080bf000080bff052fc41000000360000803700000036000000b8000080bf00000000000000000000000000000000000080bf000080bf00000038000000360000803770bab43ff052fcc1000080bf00000000000000000000000000000000000080bf000080bff052fc4170bab43f0000803770bab43f000000b8000080bf00000000000000000000000000000000000080bf000080bf0000003870bab43f0000803770bab43f000000b8000000000000803f000000000000803f0000000000000000000080bf00008037000000b8009f743f70bab43f000000b8000000000000803f000000000000803f0000000000000000000080bf009f743f000000b80000803770bab43ff052fcc1000000000000803f000000000000803f0000000000000000000080bf00008037f052fcc1009f743f70bab43ff052fcc1000000000000803f000000000000803f0000000000000000000080bf009f743ff052fcc10000803700000036f052fcc100000000000080bf00000000000080bf0000000000000000000080bf000080b7f052fcc1009f743f00000036f052fcc100000000000080bf00000000000080bf0000000000000000000080bf009f74bff052fcc10000803700000036000000b800000000000080bf00000000000080bf0000000000000000000080bf000080b7000000b8009f743f00000036000000b800000000000080bf00000000000080bf0000000000000000000080bf009f74bf000000b8 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0.4777832, y: 0.70597076, z: -15.770264} - m_Extent: {x: 0.47776794, y: 0.70596886, z: 15.770233} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: ---- !u!43 &23790687 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-3538 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: -0.2541504, y: 2.0276566, z: -7.8406377} - m_Extent: {x: 0.2541504, y: 2.0276566, z: 8.904179} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 002002bf000000001822883f00000000000000000000803f000080bf0000000000000000000080bf0020023f0000000000000000000000001822883f00000000000000000000803f000080bf0000000000000000000080bf0000000000000000002002bf20c581401822883f00000000000000000000803f000080bf0000000000000000000080bf0020023f20c581400000000020c581401822883f00000000000000000000803f000080bf0000000000000000000080bf0000000020c5814000000000000000001822883f0000803f000000000000000000000000000000000000803f000080bf1822883f00000000000000000000000062f585c10000803f000000000000000000000000000000000000803f000080bf62f585c1000000000000000020c581401822883f0000803f000000000000000000000000000000000000803f000080bf1822883f20c581400000000020c5814062f585c10000803f000000000000000000000000000000000000803f000080bf62f585c120c58140000000000000000062f585c10000000000000000000080bf0000803f0000000000000000000080bf0000000000000000002002bf0000000062f585c10000000000000000000080bf0000803f0000000000000000000080bf002002bf000000000000000020c5814062f585c10000000000000000000080bf0000803f0000000000000000000080bf0000000020c58140002002bf20c5814062f585c10000000000000000000080bf0000803f0000000000000000000080bf002002bf20c58140002002bf0000000062f585c1000080bf00000000000000000000000000000000000080bf000080bf62f5854100000000002002bf000000001822883f000080bf00000000000000000000000000000000000080bf000080bf182288bf00000000002002bf20c5814062f585c1000080bf00000000000000000000000000000000000080bf000080bf62f5854120c58140002002bf20c581401822883f000080bf00000000000000000000000000000000000080bf000080bf182288bf20c58140002002bf20c581401822883f000000000000803f000000000000803f0000000000000000000080bf002002bf1822883f0000000020c581401822883f000000000000803f000000000000803f0000000000000000000080bf000000001822883f002002bf20c5814062f585c1000000000000803f000000000000803f0000000000000000000080bf002002bf62f585c10000000020c5814062f585c1000000000000803f000000000000803f0000000000000000000080bf0000000062f585c1002002bf0000000062f585c100000000000080bf00000000000080bf0000000000000000000080bf0020023f62f585c1000000000000000062f585c100000000000080bf00000000000080bf0000000000000000000080bf0000000062f585c1002002bf000000001822883f00000000000080bf00000000000080bf0000000000000000000080bf0020023f1822883f00000000000000001822883f00000000000080bf00000000000080bf0000000000000000000080bf000000001822883f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: -0.2541504, y: 2.0276566, z: -7.8406377} - m_Extent: {x: 0.2541504, y: 2.0276566, z: 8.904179} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!43 &39758160 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33482 + m_Name: pb_Mesh32914 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -975,7 +647,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33392 + m_Name: pb_Mesh32822 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -1200,7 +872,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-3686 + m_Name: pb_Mesh-2942 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2336,7 +2008,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-4250 + m_Name: pb_Mesh-3206 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -7868,7 +7540,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33228 + m_Name: pb_Mesh32658 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -8099,6 +7771,7 @@ GameObject: - component: {fileID: 323755123} - component: {fileID: 323755122} - component: {fileID: 323755121} + - component: {fileID: 323755124} - component: {fileID: 323755120} m_Layer: 0 m_Name: Cube (1) @@ -8115,10 +7788,10 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 323755119} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} + m_Size: {x: 1.85, y: 3.01, z: 2.56} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &323755121 MeshRenderer: @@ -8185,6 +7858,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &323755124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323755119} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64785d3233bf8d24abe886f74fa48bac, type: 3} + m_Name: + m_EditorClassIdentifier: + GameName: tmp --- !u!1 &332479716 GameObject: m_ObjectHideFlags: 0 @@ -8617,13 +8303,13 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &376873185 +--- !u!43 &373594340 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-3430 + m_Name: pb_Mesh-2686 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -8787,7 +8473,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-3524 + m_Name: pb_Mesh-2780 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -8951,7 +8637,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33456 + m_Name: pb_Mesh32888 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9120,7 +8806,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33806 + m_Name: pb_Mesh33232 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9341,7 +9027,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33650 + m_Name: pb_Mesh33072 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9505,7 +9191,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33248 + m_Name: pb_Mesh32682 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9726,7 +9412,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33296 + m_Name: pb_Mesh32728 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9884,6 +9570,170 @@ Mesh: offset: 0 size: 0 path: +--- !u!43 &446655654 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh33150 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 20.64096, y: 0.69890976, z: -0.5965576} + m_Extent: {x: 21.882645, y: 0.69890976, z: 0.5965576} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 80ef9ebf000000000000000000000000000000000000803f000080bf0000000000000000000080bf80ef9e3f000000002c182a42000000000000000000000000000000000000803f000080bf0000000000000000000080bf2c182ac20000000080ef9ebfc0ebb23f0000000000000000000000000000803f000080bf0000000000000000000080bf80ef9e3fc0ebb23f2c182a42c0ebb23f0000000000000000000000000000803f000080bf0000000000000000000080bf2c182ac2c0ebb23f2c182a4200000000000000000000803f000000000000000000000000000000000000803f000080bf00000000000000002c182a420000000000b898bf0000803f000000000000000000000000000000000000803f000080bf00b898bf000000002c182a42c0ebb23f000000000000803f000000000000000000000000000000000000803f000080bf00000000c0ebb23f2c182a42c0ebb23f00b898bf0000803f000000000000000000000000000000000000803f000080bf00b898bfc0ebb23f2c182a420000000000b898bf0000000000000000000080bf0000803f0000000000000000000080bf2c182a420000000080ef9ebf0000000000b898bf0000000000000000000080bf0000803f0000000000000000000080bf80ef9ebf000000002c182a42c0ebb23f00b898bf0000000000000000000080bf0000803f0000000000000000000080bf2c182a42c0ebb23f80ef9ebfc0ebb23f00b898bf0000000000000000000080bf0000803f0000000000000000000080bf80ef9ebfc0ebb23f80ef9ebf0000000000b898bf000080bf00000000000000000000000000000000000080bf000080bf00b8983f0000000080ef9ebf0000000000000000000080bf00000000000000000000000000000000000080bf000080bf000000000000000080ef9ebfc0ebb23f00b898bf000080bf00000000000000000000000000000000000080bf000080bf00b8983fc0ebb23f80ef9ebfc0ebb23f00000000000080bf00000000000000000000000000000000000080bf000080bf00000000c0ebb23f80ef9ebfc0ebb23f00000000000000000000803f000000000000803f0000000000000000000080bf80ef9ebf000000002c182a42c0ebb23f00000000000000000000803f000000000000803f0000000000000000000080bf2c182a420000000080ef9ebfc0ebb23f00b898bf000000000000803f000000000000803f0000000000000000000080bf80ef9ebf00b898bf2c182a42c0ebb23f00b898bf000000000000803f000000000000803f0000000000000000000080bf2c182a4200b898bf80ef9ebf0000000000b898bf00000000000080bf00000000000080bf0000000000000000000080bf80ef9e3f00b898bf2c182a420000000000b898bf00000000000080bf00000000000080bf0000000000000000000080bf2c182ac200b898bf80ef9ebf000000000000000000000000000080bf00000000000080bf0000000000000000000080bf80ef9e3f000000002c182a42000000000000000000000000000080bf00000000000080bf0000000000000000000080bf2c182ac200000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 20.64096, y: 0.69890976, z: -0.5965576} + m_Extent: {x: 21.882645, y: 0.69890976, z: 0.5965576} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!4 &448839775 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: b01f0c67f6b532b44ac04f7d2392dab5, type: 3} @@ -9895,7 +9745,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33310 + m_Name: pb_Mesh32742 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10064,7 +9914,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33820 + m_Name: pb_Mesh33246 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -12220,6 +12070,170 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &527708463 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh33184 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 1.3053894, y: 3.2843094, z: -1.2774963} + m_Extent: {x: 1.3053894, y: 3.2843075, z: 1.2774963} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 00000000000000360000000000000000000000000000803f000080bf0000000000000000000080bf000000000000003600172740000000360000000000000000000000000000803f000080bf0000000000000000000080bf001727c000000036000000001c32d2400000000000000000000000000000803f000080bf0000000000000000000080bf000000001c32d240001727401c32d2400000000000000000000000000000803f000080bf0000000000000000000080bf001727c01c32d2400017274000000036000000000000803f000000000000000000000000000000000000803f000080bf00000000000000360017274000000036008523c00000803f000000000000000000000000000000000000803f000080bf008523c000000036001727401c32d240000000000000803f000000000000000000000000000000000000803f000080bf000000001c32d240001727401c32d240008523c00000803f000000000000000000000000000000000000803f000080bf008523c01c32d2400017274000000036008523c00000000000000000000080bf0000803f0000000000000000000080bf00172740000000360000000000000036008523c00000000000000000000080bf0000803f0000000000000000000080bf0000000000000036001727401c32d240008523c00000000000000000000080bf0000803f0000000000000000000080bf001727401c32d240000000001c32d240008523c00000000000000000000080bf0000803f0000000000000000000080bf000000001c32d2400000000000000036008523c0000080bf00000000000000000000000000000000000080bf000080bf0085234000000036000000000000003600000000000080bf00000000000000000000000000000000000080bf000080bf0000000000000036000000001c32d240008523c0000080bf00000000000000000000000000000000000080bf000080bf008523401c32d240000000001c32d24000000000000080bf00000000000000000000000000000000000080bf000080bf000000001c32d240000000001c32d24000000000000000000000803f000000000000803f0000000000000000000080bf0000000000000000001727401c32d24000000000000000000000803f000000000000803f0000000000000000000080bf0017274000000000000000001c32d240008523c0000000000000803f000000000000803f0000000000000000000080bf00000000008523c0001727401c32d240008523c0000000000000803f000000000000803f0000000000000000000080bf00172740008523c00000000000000036008523c000000000000080bf00000000000080bf0000000000000000000080bf00000000008523c00017274000000036008523c000000000000080bf00000000000080bf0000000000000000000080bf001727c0008523c000000000000000360000000000000000000080bf00000000000080bf0000000000000000000080bf000000000000000000172740000000360000000000000000000080bf00000000000080bf0000000000000000000080bf001727c000000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 1.3053894, y: 3.2843094, z: -1.2774963} + m_Extent: {x: 1.3053894, y: 3.2843075, z: 1.2774963} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &531920124 GameObject: m_ObjectHideFlags: 0 @@ -12901,7 +12915,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33792 + m_Name: pb_Mesh33218 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -13161,7 +13175,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-4278 + m_Name: pb_Mesh-3234 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14382,6 +14396,170 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b9a200fc20bd2b54392b467e9411a431, type: 3} +--- !u!43 &718448882 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh32632 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0.4777832, y: 0.70597076, z: -15.770264} + m_Extent: {x: 0.47776794, y: 0.70596886, z: 15.770233} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 0000803700000036000000b800000000000000000000803f000080bf0000000000000000000080bf000080b700000036009f743f00000036000000b800000000000000000000803f000080bf0000000000000000000080bf009f74bf000000360000803770bab43f000000b800000000000000000000803f000080bf0000000000000000000080bf000080b770bab43f009f743f70bab43f000000b800000000000000000000803f000080bf0000000000000000000080bf009f74bf70bab43f009f743f00000036000000b80000803f000000000000000000000000000000000000803f000080bf000000b800000036009f743f00000036f052fcc10000803f000000000000000000000000000000000000803f000080bff052fcc100000036009f743f70bab43f000000b80000803f000000000000000000000000000000000000803f000080bf000000b870bab43f009f743f70bab43ff052fcc10000803f000000000000000000000000000000000000803f000080bff052fcc170bab43f009f743f00000036f052fcc10000000000000000000080bf0000803f0000000000000000000080bf009f743f000000360000803700000036f052fcc10000000000000000000080bf0000803f0000000000000000000080bf0000803700000036009f743f70bab43ff052fcc10000000000000000000080bf0000803f0000000000000000000080bf009f743f70bab43f0000803770bab43ff052fcc10000000000000000000080bf0000803f0000000000000000000080bf0000803770bab43f0000803700000036f052fcc1000080bf00000000000000000000000000000000000080bf000080bff052fc41000000360000803700000036000000b8000080bf00000000000000000000000000000000000080bf000080bf00000038000000360000803770bab43ff052fcc1000080bf00000000000000000000000000000000000080bf000080bff052fc4170bab43f0000803770bab43f000000b8000080bf00000000000000000000000000000000000080bf000080bf0000003870bab43f0000803770bab43f000000b8000000000000803f000000000000803f0000000000000000000080bf00008037000000b8009f743f70bab43f000000b8000000000000803f000000000000803f0000000000000000000080bf009f743f000000b80000803770bab43ff052fcc1000000000000803f000000000000803f0000000000000000000080bf00008037f052fcc1009f743f70bab43ff052fcc1000000000000803f000000000000803f0000000000000000000080bf009f743ff052fcc10000803700000036f052fcc100000000000080bf00000000000080bf0000000000000000000080bf000080b7f052fcc1009f743f00000036f052fcc100000000000080bf00000000000080bf0000000000000000000080bf009f74bff052fcc10000803700000036000000b800000000000080bf00000000000080bf0000000000000000000080bf000080b7000000b8009f743f00000036000000b800000000000080bf00000000000080bf0000000000000000000080bf009f74bf000000b8 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.4777832, y: 0.70597076, z: -15.770264} + m_Extent: {x: 0.47776794, y: 0.70596886, z: 15.770233} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &742354070 GameObject: m_ObjectHideFlags: 0 @@ -14893,7 +15071,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32958 + m_Name: pb_Mesh32410 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -20552,15 +20730,15 @@ PrefabInstance: - target: {fileID: 610425754884390778, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 376873185} + objectReference: {fileID: 373594340} - target: {fileID: 610425754884390778, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_VersionIndex - value: 1975 + value: 1978 objectReference: {fileID: 0} - target: {fileID: 1683092441577873159, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 2097389909} + objectReference: {fileID: 1876316759} - target: {fileID: 2512878766108564020, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: @@ -20580,7 +20758,7 @@ PrefabInstance: - target: {fileID: 3700073160429544082, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 376873185} + objectReference: {fileID: 373594340} - target: {fileID: 4921102833454450592, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: @@ -20588,7 +20766,7 @@ PrefabInstance: - target: {fileID: 5045897890414139668, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 2097389909} + objectReference: {fileID: 1876316759} - target: {fileID: 6122444005935792859, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_LocalPosition.x value: -4.02 @@ -20648,7 +20826,7 @@ PrefabInstance: - target: {fileID: 7897281346272303051, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 376873185} + objectReference: {fileID: 373594340} - target: {fileID: 8111365893079556126, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_LocalPosition.x value: -4.79245 @@ -20664,10 +20842,10 @@ PrefabInstance: - target: {fileID: 8786257416604325589, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 2097389909} + objectReference: {fileID: 1876316759} - target: {fileID: 8786257416604325589, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_VersionIndex - value: 2511 + value: 2514 objectReference: {fileID: 0} - target: {fileID: 9039585160154944975, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh @@ -20679,25 +20857,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} ---- !u!43 &804367889 +--- !u!43 &804135286 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33406 + m_Name: pb_Mesh-2766 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 firstByte: 0 - indexCount: 36 + indexCount: 72 topology: 0 baseVertex: 0 firstVertex: 0 - vertexCount: 24 + vertexCount: 36 localAABB: - m_Center: {x: 7.597992, y: 1.0635071, z: 0.15203857} - m_Extent: {x: 7.5979767, y: 1.0635071, z: 0.15203857} + m_Center: {x: 0.51342773, y: 5.71719, z: -0.6862183} + m_Extent: {x: 0.5133972, y: 5.71719, z: 0.59428257} m_Shapes: vertices: [] shapes: [] @@ -20714,10 +20892,10 @@ Mesh: m_KeepVertices: 1 m_KeepIndices: 1 m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000a000b000c000b000d000c000e000f0010000f00110010001200130014001300150014001600170018001900170016001a00170019001b0017001a001c0017001b00180017001c001d001e001f001f001e00200020001e00210021001e00220022001e00230023001e001d00 m_VertexData: serializedVersion: 3 - m_VertexCount: 24 + m_VertexCount: 36 m_Channels: - stream: 0 offset: 0 @@ -20775,8 +20953,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 1152 - _typelessdata: 000080370000000000b09b3e00000000000000000000803f000080bf0000000000000000000080bf000080b700000000b02273410000000000b09b3e00000000000000000000803f000080bf0000000000000000000080bfb02273c100000000000080370021084000b09b3e00000000000000000000803f000080bf0000000000000000000080bf000080b700210840b02273410021084000b09b3e00000000000000000000803f000080bf0000000000000000000080bfb02273c100210840b02273410000000000b09b3e0000803f000000000000000000000000000000000000803f000080bf00b09b3e00000000b022734100000000000000000000803f000000000000000000000000000000000000803f000080bf0000000000000000b02273410021084000b09b3e0000803f000000000000000000000000000000000000803f000080bf00b09b3e00210840b022734100210840000000000000803f000000000000000000000000000000000000803f000080bf0000000000210840b022734100000000000000000000000000000000000080bf0000803f0000000000000000000080bfb0227341000000000000803700000000000000000000000000000000000080bf0000803f0000000000000000000080bf0000803700000000b022734100210840000000000000000000000000000080bf0000803f0000000000000000000080bfb0227341002108400000803700210840000000000000000000000000000080bf0000803f0000000000000000000080bf0000803700210840000080370000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000000000000000000080370000000000b09b3e000080bf00000000000000000000000000000000000080bf000080bf00b09bbe00000000000080370021084000000000000080bf00000000000000000000000000000000000080bf000080bf0000000000210840000080370021084000b09b3e000080bf00000000000000000000000000000000000080bf000080bf00b09bbe00210840000080370021084000b09b3e000000000000803f000000000000803f0000000000000000000080bf0000803700b09b3eb02273410021084000b09b3e000000000000803f000000000000803f0000000000000000000080bfb022734100b09b3e000080370021084000000000000000000000803f000000000000803f0000000000000000000080bf0000803700000000b02273410021084000000000000000000000803f000000000000803f0000000000000000000080bfb02273410000000000008037000000000000000000000000000080bf00000000000080bf0000000000000000000080bf000080b700000000b0227341000000000000000000000000000080bf00000000000080bf0000000000000000000080bfb02273c100000000000080370000000000b09b3e00000000000080bf00000000000080bf0000000000000000000080bf000080b700b09b3eb02273410000000000b09b3e00000000000080bf00000000000080bf0000000000000000000080bfb02273c100b09b3e + m_DataSize: 1728 + _typelessdata: 006f833f0000000000ac2fbf0000803f000000003d6e8bb200000000000000000000803f000080bfd2c084bf00000000006f833f38f3364100ac2fbf0000803f000000003d6e8bb200000000000000000000803f000080bfd2c084bf38f336410027453f00000000d048bcbd059f0c3f0000000079eb553f79eb55bf00000000049f0c3f000080bf6e91c7be000000000027453f38f33641d048bcbd059f0c3f0000000079eb553f79eb55bf00000000049f0c3f000080bf6e91c7be38f336410027453f00000000d048bcbd059f0c3f0000000079eb553f79eb55bf00000000069f0c3f000080bf002745bf000000000027453f38f33641d048bcbd059f0c3f0000000079eb553f79eb55bf00000000069f0c3f000080bf002745bf38f33641ff71833e00000000d848bcbd079f0cbf0000000078eb553f78eb55bf00000000079f0cbf000080bfff7183be00000000ff71833e38f33641d848bcbd079f0cbf0000000078eb553f78eb55bf00000000079f0cbf000080bfff7183be38f33641ff71833e00000000d848bcbd079f0cbf0000000078eb553f78eb55bf00000000069f0cbf000080bf97918ebc00000000ff71833e38f33641d848bcbd079f0cbf0000000078eb553f78eb55bf00000000069f0cbf000080bf97918ebc38f33641000000380000000001ac2fbf000080bf000000005c2551b33e6e0b3300000000000080bf000080bf6044213f000000000000003838f3364101ac2fbf000080bf000000005c2551b33e6e0b3300000000000080bf000080bf6044213f38f336410272833e0000000074e7a3bf059f0cbf0000000079eb55bf7aeb553f00000000049f0cbf000080bf727fa33f000000000272833e38f3364174e7a3bf059f0cbf0000000079eb55bf7aeb553f00000000049f0cbf000080bf727fa33f38f336410272833e0000000074e7a3bf059f0cbf0000000079eb55bf79eb553f00000000049f0cbf000080bf0272833e000000000272833e38f3364174e7a3bf059f0cbf0000000079eb55bf79eb553f00000000049f0cbf000080bf0272833e38f33641ff26453f0000000074e7a3bf059f0c3f0000000078eb55bf79eb553f00000000069f0c3f000080bfff26453f00000000ff26453f38f3364174e7a3bf059f0c3f0000000078eb55bf79eb553f00000000069f0c3f000080bfff26453f38f33641ff26453f0000000074e7a3bf059f0c3f0000000078eb55bf79eb553f00000000059f0c3f000080bf9ec15ebf00000000ff26453f38f3364174e7a3bf059f0c3f0000000078eb55bf79eb553f00000000059f0c3f000080bf9ec15ebf38f33641006f833f0000000000ac2fbf0000803f000000003d6e8bb23d6e0b33000000000000803f000080bfbd2264be00000000006f833f38f3364100ac2fbf0000803f000000003d6e8bb23d6e0b33000000000000803f000080bfbd2264be38f336410027453f00000000d048bcbd00000000000080bf00000000000080bf0000000000000000000080bf002745bfd048bcbd0070033f0000000000ac2fbf00000000000080bf00000000000080bf0000000000000000000080bf007003bf00ac2fbf006f833f0000000000ac2fbf00000000000080bf00000000000080bf0000000000000000000080bf006f83bf00ac2fbfff71833e00000000d848bcbd00000000000080bf00000000000080bf0000000000000000000080bfff7183bed848bcbd000000380000000001ac2fbf00000000000080bf00000000000080bf0000000000000000000080bf000000b801ac2fbf0272833e0000000074e7a3bf00000000000080bf00000000000080bf0000000000000000000080bf027283be74e7a3bfff26453f0000000074e7a3bf00000000000080bf00000000000080bf0000000000000000000080bfff2645bf74e7a3bf006f833f38f3364100ac2fbf000000000000803f000000000000803f0000000000000000000080bf006f833f00ac2fbf0070033f38f3364100ac2fbf000000000000803f000000000000803f0000000000000000000080bf0070033f00ac2fbf0027453f38f33641d048bcbd000000000000803f000000000000803f0000000000000000000080bf0027453fd048bcbdff71833e38f33641d848bcbd000000000000803f000000000000803f0000000000000000000080bfff71833ed848bcbd0000003838f3364101ac2fbf000000000000803f000000000000803f0000000000000000000080bf0000003801ac2fbf0272833e38f3364174e7a3bf000000000000803f000000000000803f0000000000000000000080bf0272833e74e7a3bfff26453f38f3364174e7a3bf000000000000803f000000000000803f0000000000000000000080bfff26453f74e7a3bf m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -20830,8 +21008,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 7.597992, y: 1.0635071, z: 0.15203857} - m_Extent: {x: 7.5979767, y: 1.0635071, z: 0.15203857} + m_Center: {x: 0.51342773, y: 5.71719, z: -0.6862183} + m_Extent: {x: 0.5133972, y: 5.71719, z: 0.59428257} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -20843,74 +21021,13 @@ Mesh: offset: 0 size: 0 path: ---- !u!1001 &804966318 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1257936511} - m_Modifications: - - target: {fileID: 155934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_Name - value: PalmTreeTrioOneSided (1) - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_RootOrder - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_LocalScale.x - value: 1.32 - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_LocalPosition.x - value: -9.854675 - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_LocalPosition.y - value: -10.174141 - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_LocalPosition.z - value: 16.892395 - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} ---- !u!43 &805703754 +--- !u!43 &804367889 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33728 + m_Name: pb_Mesh32836 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -20921,8 +21038,8 @@ Mesh: firstVertex: 0 vertexCount: 24 localAABB: - m_Center: {x: 20.64096, y: 0.69890976, z: -0.5965576} - m_Extent: {x: 21.882645, y: 0.69890976, z: 0.5965576} + m_Center: {x: 7.597992, y: 1.0635071, z: 0.15203857} + m_Extent: {x: 7.5979767, y: 1.0635071, z: 0.15203857} m_Shapes: vertices: [] shapes: [] @@ -21001,7 +21118,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 1152 - _typelessdata: 80ef9ebf000000000000000000000000000000000000803f000080bf0000000000000000000080bf80ef9e3f000000002c182a42000000000000000000000000000000000000803f000080bf0000000000000000000080bf2c182ac20000000080ef9ebfc0ebb23f0000000000000000000000000000803f000080bf0000000000000000000080bf80ef9e3fc0ebb23f2c182a42c0ebb23f0000000000000000000000000000803f000080bf0000000000000000000080bf2c182ac2c0ebb23f2c182a4200000000000000000000803f000000000000000000000000000000000000803f000080bf00000000000000002c182a420000000000b898bf0000803f000000000000000000000000000000000000803f000080bf00b898bf000000002c182a42c0ebb23f000000000000803f000000000000000000000000000000000000803f000080bf00000000c0ebb23f2c182a42c0ebb23f00b898bf0000803f000000000000000000000000000000000000803f000080bf00b898bfc0ebb23f2c182a420000000000b898bf0000000000000000000080bf0000803f0000000000000000000080bf2c182a420000000080ef9ebf0000000000b898bf0000000000000000000080bf0000803f0000000000000000000080bf80ef9ebf000000002c182a42c0ebb23f00b898bf0000000000000000000080bf0000803f0000000000000000000080bf2c182a42c0ebb23f80ef9ebfc0ebb23f00b898bf0000000000000000000080bf0000803f0000000000000000000080bf80ef9ebfc0ebb23f80ef9ebf0000000000b898bf000080bf00000000000000000000000000000000000080bf000080bf00b8983f0000000080ef9ebf0000000000000000000080bf00000000000000000000000000000000000080bf000080bf000000000000000080ef9ebfc0ebb23f00b898bf000080bf00000000000000000000000000000000000080bf000080bf00b8983fc0ebb23f80ef9ebfc0ebb23f00000000000080bf00000000000000000000000000000000000080bf000080bf00000000c0ebb23f80ef9ebfc0ebb23f00000000000000000000803f000000000000803f0000000000000000000080bf80ef9ebf000000002c182a42c0ebb23f00000000000000000000803f000000000000803f0000000000000000000080bf2c182a420000000080ef9ebfc0ebb23f00b898bf000000000000803f000000000000803f0000000000000000000080bf80ef9ebf00b898bf2c182a42c0ebb23f00b898bf000000000000803f000000000000803f0000000000000000000080bf2c182a4200b898bf80ef9ebf0000000000b898bf00000000000080bf00000000000080bf0000000000000000000080bf80ef9e3f00b898bf2c182a420000000000b898bf00000000000080bf00000000000080bf0000000000000000000080bf2c182ac200b898bf80ef9ebf000000000000000000000000000080bf00000000000080bf0000000000000000000080bf80ef9e3f000000002c182a42000000000000000000000000000080bf00000000000080bf0000000000000000000080bf2c182ac200000000 + _typelessdata: 000080370000000000b09b3e00000000000000000000803f000080bf0000000000000000000080bf000080b700000000b02273410000000000b09b3e00000000000000000000803f000080bf0000000000000000000080bfb02273c100000000000080370021084000b09b3e00000000000000000000803f000080bf0000000000000000000080bf000080b700210840b02273410021084000b09b3e00000000000000000000803f000080bf0000000000000000000080bfb02273c100210840b02273410000000000b09b3e0000803f000000000000000000000000000000000000803f000080bf00b09b3e00000000b022734100000000000000000000803f000000000000000000000000000000000000803f000080bf0000000000000000b02273410021084000b09b3e0000803f000000000000000000000000000000000000803f000080bf00b09b3e00210840b022734100210840000000000000803f000000000000000000000000000000000000803f000080bf0000000000210840b022734100000000000000000000000000000000000080bf0000803f0000000000000000000080bfb0227341000000000000803700000000000000000000000000000000000080bf0000803f0000000000000000000080bf0000803700000000b022734100210840000000000000000000000000000080bf0000803f0000000000000000000080bfb0227341002108400000803700210840000000000000000000000000000080bf0000803f0000000000000000000080bf0000803700210840000080370000000000000000000080bf00000000000000000000000000000000000080bf000080bf0000000000000000000080370000000000b09b3e000080bf00000000000000000000000000000000000080bf000080bf00b09bbe00000000000080370021084000000000000080bf00000000000000000000000000000000000080bf000080bf0000000000210840000080370021084000b09b3e000080bf00000000000000000000000000000000000080bf000080bf00b09bbe00210840000080370021084000b09b3e000000000000803f000000000000803f0000000000000000000080bf0000803700b09b3eb02273410021084000b09b3e000000000000803f000000000000803f0000000000000000000080bfb022734100b09b3e000080370021084000000000000000000000803f000000000000803f0000000000000000000080bf0000803700000000b02273410021084000000000000000000000803f000000000000803f0000000000000000000080bfb02273410000000000008037000000000000000000000000000080bf00000000000080bf0000000000000000000080bf000080b700000000b0227341000000000000000000000000000080bf00000000000080bf0000000000000000000080bfb02273c100000000000080370000000000b09b3e00000000000080bf00000000000080bf0000000000000000000080bf000080b700b09b3eb02273410000000000b09b3e00000000000080bf00000000000080bf0000000000000000000080bfb02273c100b09b3e m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -21055,8 +21172,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 20.64096, y: 0.69890976, z: -0.5965576} - m_Extent: {x: 21.882645, y: 0.69890976, z: 0.5965576} + m_Center: {x: 7.597992, y: 1.0635071, z: 0.15203857} + m_Extent: {x: 7.5979767, y: 1.0635071, z: 0.15203857} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -21068,13 +21185,74 @@ Mesh: offset: 0 size: 0 path: +--- !u!1001 &804966318 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1257936511} + m_Modifications: + - target: {fileID: 155934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_Name + value: PalmTreeTrioOneSided (1) + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_RootOrder + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_LocalScale.x + value: 1.32 + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_LocalPosition.x + value: -9.854675 + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_LocalPosition.y + value: -10.174141 + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_LocalPosition.z + value: 16.892395 + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 455934, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2ed7cc7e3c944414d8f3fabb4d533018, type: 3} --- !u!43 &809712676 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33666 + m_Name: pb_Mesh33088 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21248,7 +21426,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33376 + m_Name: pb_Mesh32806 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21412,7 +21590,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-3444 + m_Name: pb_Mesh-2700 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21677,7 +21855,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33530 + m_Name: pb_Mesh32962 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21851,7 +22029,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33032 + m_Name: pb_Mesh32476 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -22398,7 +22576,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32926 + m_Name: pb_Mesh32368 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -22567,7 +22745,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-3672 + m_Name: pb_Mesh-2928 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -22749,15 +22927,15 @@ PrefabInstance: - target: {fileID: 610425754884390778, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1666973225} + objectReference: {fileID: 804135286} - target: {fileID: 610425754884390778, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_VersionIndex - value: 1972 + value: 1975 objectReference: {fileID: 0} - target: {fileID: 1683092441577873159, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 23790687} + objectReference: {fileID: 1559003499} - target: {fileID: 2512878766108564020, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: @@ -22777,7 +22955,7 @@ PrefabInstance: - target: {fileID: 3700073160429544082, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1666973225} + objectReference: {fileID: 804135286} - target: {fileID: 4921102833454450592, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: @@ -22785,7 +22963,7 @@ PrefabInstance: - target: {fileID: 5045897890414139668, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 23790687} + objectReference: {fileID: 1559003499} - target: {fileID: 6122444005935792859, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_LocalPosition.x value: 21.502441 @@ -22845,7 +23023,7 @@ PrefabInstance: - target: {fileID: 7897281346272303051, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1666973225} + objectReference: {fileID: 804135286} - target: {fileID: 8111365893079556126, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_LocalPosition.x value: 20.72998 @@ -22861,10 +23039,10 @@ PrefabInstance: - target: {fileID: 8786257416604325589, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 23790687} + objectReference: {fileID: 1559003499} - target: {fileID: 8786257416604325589, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_VersionIndex - value: 2514 + value: 2517 objectReference: {fileID: 0} - target: {fileID: 9039585160154944975, guid: b429d12ac3bdbad41a40d443d200393a, type: 3} propertyPath: m_Mesh @@ -23397,7 +23575,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33544 + m_Name: pb_Mesh32976 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -23661,7 +23839,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 12575653} + m_Mesh: {fileID: 718448882} --- !u!33 &1043895536 MeshFilter: m_ObjectHideFlags: 10 @@ -23669,7 +23847,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1043895533} - m_Mesh: {fileID: 12575653} + m_Mesh: {fileID: 718448882} --- !u!23 &1043895537 MeshRenderer: m_ObjectHideFlags: 0 @@ -23950,8 +24128,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: - m_Mesh: {fileID: 12575653} - m_VersionIndex: 4833 + m_Mesh: {fileID: 718448882} + m_VersionIndex: 4836 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -24829,7 +25007,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33690 + m_Name: pb_Mesh33112 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -25216,7 +25394,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32858 + m_Name: pb_Mesh32288 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -25380,7 +25558,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33618 + m_Name: pb_Mesh33040 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -25544,7 +25722,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33590 + m_Name: pb_Mesh33012 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -26396,7 +26574,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-4264 + m_Name: pb_Mesh-3220 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -26781,7 +26959,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33708 + m_Name: pb_Mesh33128 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -27695,7 +27873,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33018 + m_Name: pb_Mesh32462 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -28335,7 +28513,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33516 + m_Name: pb_Mesh32948 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -29187,7 +29365,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33180 + m_Name: pb_Mesh32614 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -29351,7 +29529,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33496 + m_Name: pb_Mesh32928 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -29859,7 +30037,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32776 + m_Name: pb_Mesh32214 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -31683,7 +31861,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32878 + m_Name: pb_Mesh32320 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -32879,7 +33057,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32798 + m_Name: pb_Mesh32234 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -33048,7 +33226,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33634 + m_Name: pb_Mesh33056 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -33212,7 +33390,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33062 + m_Name: pb_Mesh32504 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -33447,13 +33625,177 @@ Transform: m_CorrespondingSourceObject: {fileID: 437888, guid: ecc2762d91d3584429565bde5fbede9e, type: 3} m_PrefabInstance: {fileID: 1940024379} m_PrefabAsset: {fileID: 0} +--- !u!43 &1559003499 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh-2794 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: -0.2541504, y: 2.0276566, z: -7.8406377} + m_Extent: {x: 0.2541504, y: 2.0276566, z: 8.904179} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 002002bf000000001822883f00000000000000000000803f000080bf0000000000000000000080bf0020023f0000000000000000000000001822883f00000000000000000000803f000080bf0000000000000000000080bf0000000000000000002002bf20c581401822883f00000000000000000000803f000080bf0000000000000000000080bf0020023f20c581400000000020c581401822883f00000000000000000000803f000080bf0000000000000000000080bf0000000020c5814000000000000000001822883f0000803f000000000000000000000000000000000000803f000080bf1822883f00000000000000000000000062f585c10000803f000000000000000000000000000000000000803f000080bf62f585c1000000000000000020c581401822883f0000803f000000000000000000000000000000000000803f000080bf1822883f20c581400000000020c5814062f585c10000803f000000000000000000000000000000000000803f000080bf62f585c120c58140000000000000000062f585c10000000000000000000080bf0000803f0000000000000000000080bf0000000000000000002002bf0000000062f585c10000000000000000000080bf0000803f0000000000000000000080bf002002bf000000000000000020c5814062f585c10000000000000000000080bf0000803f0000000000000000000080bf0000000020c58140002002bf20c5814062f585c10000000000000000000080bf0000803f0000000000000000000080bf002002bf20c58140002002bf0000000062f585c1000080bf00000000000000000000000000000000000080bf000080bf62f5854100000000002002bf000000001822883f000080bf00000000000000000000000000000000000080bf000080bf182288bf00000000002002bf20c5814062f585c1000080bf00000000000000000000000000000000000080bf000080bf62f5854120c58140002002bf20c581401822883f000080bf00000000000000000000000000000000000080bf000080bf182288bf20c58140002002bf20c581401822883f000000000000803f000000000000803f0000000000000000000080bf002002bf1822883f0000000020c581401822883f000000000000803f000000000000803f0000000000000000000080bf000000001822883f002002bf20c5814062f585c1000000000000803f000000000000803f0000000000000000000080bf002002bf62f585c10000000020c5814062f585c1000000000000803f000000000000803f0000000000000000000080bf0000000062f585c1002002bf0000000062f585c100000000000080bf00000000000080bf0000000000000000000080bf0020023f62f585c1000000000000000062f585c100000000000080bf00000000000080bf0000000000000000000080bf0000000062f585c1002002bf000000001822883f00000000000080bf00000000000080bf0000000000000000000080bf0020023f1822883f00000000000000001822883f00000000000080bf00000000000080bf0000000000000000000080bf000000001822883f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: -0.2541504, y: 2.0276566, z: -7.8406377} + m_Extent: {x: 0.2541504, y: 2.0276566, z: 8.904179} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!43 &1584553874 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33876 + m_Name: pb_Mesh33286 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -34996,7 +35338,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33340 + m_Name: pb_Mesh32772 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -35907,170 +36249,6 @@ MonoBehaviour: m_SelectedFaces: m_SelectedEdges: [] m_SelectedVertices: ---- !u!43 &1666973225 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-3510 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 72 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 36 - localAABB: - m_Center: {x: 0.51342773, y: 5.71719, z: -0.6862183} - m_Extent: {x: 0.5133972, y: 5.71719, z: 0.59428257} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000a000b000c000b000d000c000e000f0010000f00110010001200130014001300150014001600170018001900170016001a00170019001b0017001a001c0017001b00180017001c001d001e001f001f001e00200020001e00210021001e00220022001e00230023001e001d00 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 36 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1728 - _typelessdata: 006f833f0000000000ac2fbf0000803f000000003d6e8bb200000000000000000000803f000080bfd2c084bf00000000006f833f38f3364100ac2fbf0000803f000000003d6e8bb200000000000000000000803f000080bfd2c084bf38f336410027453f00000000d048bcbd059f0c3f0000000079eb553f79eb55bf00000000049f0c3f000080bf6e91c7be000000000027453f38f33641d048bcbd059f0c3f0000000079eb553f79eb55bf00000000049f0c3f000080bf6e91c7be38f336410027453f00000000d048bcbd059f0c3f0000000079eb553f79eb55bf00000000069f0c3f000080bf002745bf000000000027453f38f33641d048bcbd059f0c3f0000000079eb553f79eb55bf00000000069f0c3f000080bf002745bf38f33641ff71833e00000000d848bcbd079f0cbf0000000078eb553f78eb55bf00000000079f0cbf000080bfff7183be00000000ff71833e38f33641d848bcbd079f0cbf0000000078eb553f78eb55bf00000000079f0cbf000080bfff7183be38f33641ff71833e00000000d848bcbd079f0cbf0000000078eb553f78eb55bf00000000069f0cbf000080bf97918ebc00000000ff71833e38f33641d848bcbd079f0cbf0000000078eb553f78eb55bf00000000069f0cbf000080bf97918ebc38f33641000000380000000001ac2fbf000080bf000000005c2551b33e6e0b3300000000000080bf000080bf6044213f000000000000003838f3364101ac2fbf000080bf000000005c2551b33e6e0b3300000000000080bf000080bf6044213f38f336410272833e0000000074e7a3bf059f0cbf0000000079eb55bf7aeb553f00000000049f0cbf000080bf727fa33f000000000272833e38f3364174e7a3bf059f0cbf0000000079eb55bf7aeb553f00000000049f0cbf000080bf727fa33f38f336410272833e0000000074e7a3bf059f0cbf0000000079eb55bf79eb553f00000000049f0cbf000080bf0272833e000000000272833e38f3364174e7a3bf059f0cbf0000000079eb55bf79eb553f00000000049f0cbf000080bf0272833e38f33641ff26453f0000000074e7a3bf059f0c3f0000000078eb55bf79eb553f00000000069f0c3f000080bfff26453f00000000ff26453f38f3364174e7a3bf059f0c3f0000000078eb55bf79eb553f00000000069f0c3f000080bfff26453f38f33641ff26453f0000000074e7a3bf059f0c3f0000000078eb55bf79eb553f00000000059f0c3f000080bf9ec15ebf00000000ff26453f38f3364174e7a3bf059f0c3f0000000078eb55bf79eb553f00000000059f0c3f000080bf9ec15ebf38f33641006f833f0000000000ac2fbf0000803f000000003d6e8bb23d6e0b33000000000000803f000080bfbd2264be00000000006f833f38f3364100ac2fbf0000803f000000003d6e8bb23d6e0b33000000000000803f000080bfbd2264be38f336410027453f00000000d048bcbd00000000000080bf00000000000080bf0000000000000000000080bf002745bfd048bcbd0070033f0000000000ac2fbf00000000000080bf00000000000080bf0000000000000000000080bf007003bf00ac2fbf006f833f0000000000ac2fbf00000000000080bf00000000000080bf0000000000000000000080bf006f83bf00ac2fbfff71833e00000000d848bcbd00000000000080bf00000000000080bf0000000000000000000080bfff7183bed848bcbd000000380000000001ac2fbf00000000000080bf00000000000080bf0000000000000000000080bf000000b801ac2fbf0272833e0000000074e7a3bf00000000000080bf00000000000080bf0000000000000000000080bf027283be74e7a3bfff26453f0000000074e7a3bf00000000000080bf00000000000080bf0000000000000000000080bfff2645bf74e7a3bf006f833f38f3364100ac2fbf000000000000803f000000000000803f0000000000000000000080bf006f833f00ac2fbf0070033f38f3364100ac2fbf000000000000803f000000000000803f0000000000000000000080bf0070033f00ac2fbf0027453f38f33641d048bcbd000000000000803f000000000000803f0000000000000000000080bf0027453fd048bcbdff71833e38f33641d848bcbd000000000000803f000000000000803f0000000000000000000080bfff71833ed848bcbd0000003838f3364101ac2fbf000000000000803f000000000000803f0000000000000000000080bf0000003801ac2fbf0272833e38f3364174e7a3bf000000000000803f000000000000803f0000000000000000000080bf0272833e74e7a3bfff26453f38f3364174e7a3bf000000000000803f000000000000803f0000000000000000000080bfff26453f74e7a3bf - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0.51342773, y: 5.71719, z: -0.6862183} - m_Extent: {x: 0.5133972, y: 5.71719, z: 0.59428257} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!4 &1676810763 stripped Transform: m_CorrespondingSourceObject: {fileID: 437888, guid: ecc2762d91d3584429565bde5fbede9e, type: 3} @@ -36087,7 +36265,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33604 + m_Name: pb_Mesh33026 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -36652,7 +36830,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33082 + m_Name: pb_Mesh32524 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -37192,7 +37370,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32818 + m_Name: pb_Mesh32252 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -37399,7 +37577,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 805703754} + m_Mesh: {fileID: 446655654} --- !u!33 &1810297148 MeshFilter: m_ObjectHideFlags: 10 @@ -37407,7 +37585,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1810297145} - m_Mesh: {fileID: 805703754} + m_Mesh: {fileID: 446655654} --- !u!23 &1810297149 MeshRenderer: m_ObjectHideFlags: 0 @@ -37688,8 +37866,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: - m_Mesh: {fileID: 805703754} - m_VersionIndex: 3792 + m_Mesh: {fileID: 446655654} + m_VersionIndex: 3795 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -37700,7 +37878,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-3658 + m_Name: pb_Mesh-2914 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -37926,7 +38104,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33862 + m_Name: pb_Mesh33272 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -38147,7 +38325,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33140 + m_Name: pb_Mesh32576 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -38362,6 +38540,170 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ecc2762d91d3584429565bde5fbede9e, type: 3} +--- !u!43 &1876316759 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh-2714 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: -0.2541504, y: 2.0276566, z: -7.8406377} + m_Extent: {x: 0.2541504, y: 2.0276566, z: 8.904179} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 002002bf000000001822883f00000000000000000000803f000080bf0000000000000000000080bf0020023f0000000000000000000000001822883f00000000000000000000803f000080bf0000000000000000000080bf0000000000000000002002bf20c581401822883f00000000000000000000803f000080bf0000000000000000000080bf0020023f20c581400000000020c581401822883f00000000000000000000803f000080bf0000000000000000000080bf0000000020c5814000000000000000001822883f0000803f000000000000000000000000000000000000803f000080bf1822883f00000000000000000000000062f585c10000803f000000000000000000000000000000000000803f000080bf62f585c1000000000000000020c581401822883f0000803f000000000000000000000000000000000000803f000080bf1822883f20c581400000000020c5814062f585c10000803f000000000000000000000000000000000000803f000080bf62f585c120c58140000000000000000062f585c10000000000000000000080bf0000803f0000000000000000000080bf0000000000000000002002bf0000000062f585c10000000000000000000080bf0000803f0000000000000000000080bf002002bf000000000000000020c5814062f585c10000000000000000000080bf0000803f0000000000000000000080bf0000000020c58140002002bf20c5814062f585c10000000000000000000080bf0000803f0000000000000000000080bf002002bf20c58140002002bf0000000062f585c1000080bf00000000000000000000000000000000000080bf000080bf62f5854100000000002002bf000000001822883f000080bf00000000000000000000000000000000000080bf000080bf182288bf00000000002002bf20c5814062f585c1000080bf00000000000000000000000000000000000080bf000080bf62f5854120c58140002002bf20c581401822883f000080bf00000000000000000000000000000000000080bf000080bf182288bf20c58140002002bf20c581401822883f000000000000803f000000000000803f0000000000000000000080bf002002bf1822883f0000000020c581401822883f000000000000803f000000000000803f0000000000000000000080bf000000001822883f002002bf20c5814062f585c1000000000000803f000000000000803f0000000000000000000080bf002002bf62f585c10000000020c5814062f585c1000000000000803f000000000000803f0000000000000000000080bf0000000062f585c1002002bf0000000062f585c100000000000080bf00000000000080bf0000000000000000000080bf0020023f62f585c1000000000000000062f585c100000000000080bf00000000000080bf0000000000000000000080bf0000000062f585c1002002bf000000001822883f00000000000080bf00000000000080bf0000000000000000000080bf0020023f1822883f00000000000000001822883f00000000000080bf00000000000080bf0000000000000000000080bf000000001822883f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: -0.2541504, y: 2.0276566, z: -7.8406377} + m_Extent: {x: 0.2541504, y: 2.0276566, z: 8.904179} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!4 &1879926889 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 65f95ab4159aa2341881e997d622b2a7, type: 3} @@ -38411,7 +38753,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1924322372} + m_Mesh: {fileID: 527708463} --- !u!33 &1900122149 MeshFilter: m_ObjectHideFlags: 10 @@ -38419,7 +38761,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1900122147} - m_Mesh: {fileID: 1924322372} + m_Mesh: {fileID: 527708463} --- !u!23 &1900122150 MeshRenderer: m_ObjectHideFlags: 0 @@ -38700,8 +39042,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: - m_Mesh: {fileID: 1924322372} - m_VersionIndex: 1510 + m_Mesh: {fileID: 527708463} + m_VersionIndex: 1513 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -38745,170 +39087,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 663163284123156094, guid: b96d414b5a6bfee459eebb8ff55625ba, type: 3} ---- !u!43 &1924322372 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33758 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 1.3053894, y: 3.2843094, z: -1.2774963} - m_Extent: {x: 1.3053894, y: 3.2843075, z: 1.2774963} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 00000000000000360000000000000000000000000000803f000080bf0000000000000000000080bf000000000000003600172740000000360000000000000000000000000000803f000080bf0000000000000000000080bf001727c000000036000000001c32d2400000000000000000000000000000803f000080bf0000000000000000000080bf000000001c32d240001727401c32d2400000000000000000000000000000803f000080bf0000000000000000000080bf001727c01c32d2400017274000000036000000000000803f000000000000000000000000000000000000803f000080bf00000000000000360017274000000036008523c00000803f000000000000000000000000000000000000803f000080bf008523c000000036001727401c32d240000000000000803f000000000000000000000000000000000000803f000080bf000000001c32d240001727401c32d240008523c00000803f000000000000000000000000000000000000803f000080bf008523c01c32d2400017274000000036008523c00000000000000000000080bf0000803f0000000000000000000080bf00172740000000360000000000000036008523c00000000000000000000080bf0000803f0000000000000000000080bf0000000000000036001727401c32d240008523c00000000000000000000080bf0000803f0000000000000000000080bf001727401c32d240000000001c32d240008523c00000000000000000000080bf0000803f0000000000000000000080bf000000001c32d2400000000000000036008523c0000080bf00000000000000000000000000000000000080bf000080bf0085234000000036000000000000003600000000000080bf00000000000000000000000000000000000080bf000080bf0000000000000036000000001c32d240008523c0000080bf00000000000000000000000000000000000080bf000080bf008523401c32d240000000001c32d24000000000000080bf00000000000000000000000000000000000080bf000080bf000000001c32d240000000001c32d24000000000000000000000803f000000000000803f0000000000000000000080bf0000000000000000001727401c32d24000000000000000000000803f000000000000803f0000000000000000000080bf0017274000000000000000001c32d240008523c0000000000000803f000000000000803f0000000000000000000080bf00000000008523c0001727401c32d240008523c0000000000000803f000000000000803f0000000000000000000080bf00172740008523c00000000000000036008523c000000000000080bf00000000000080bf0000000000000000000080bf00000000008523c00017274000000036008523c000000000000080bf00000000000080bf0000000000000000000080bf001727c0008523c000000000000000360000000000000000000080bf00000000000080bf0000000000000000000080bf000000000000000000172740000000360000000000000000000080bf00000000000080bf0000000000000000000080bf001727c000000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 1.3053894, y: 3.2843094, z: -1.2774963} - m_Extent: {x: 1.3053894, y: 3.2843075, z: 1.2774963} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1936177801 PrefabInstance: m_ObjectHideFlags: 0 @@ -39091,7 +39269,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33354 + m_Name: pb_Mesh32786 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -40473,7 +40651,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32942 + m_Name: pb_Mesh32394 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -41319,177 +41497,13 @@ MonoBehaviour: m_SelectedFaces: m_SelectedEdges: [] m_SelectedVertices: ---- !u!43 &2097389909 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-3458 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: -0.2541504, y: 2.0276566, z: -7.8406377} - m_Extent: {x: 0.2541504, y: 2.0276566, z: 8.904179} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 002002bf000000001822883f00000000000000000000803f000080bf0000000000000000000080bf0020023f0000000000000000000000001822883f00000000000000000000803f000080bf0000000000000000000080bf0000000000000000002002bf20c581401822883f00000000000000000000803f000080bf0000000000000000000080bf0020023f20c581400000000020c581401822883f00000000000000000000803f000080bf0000000000000000000080bf0000000020c5814000000000000000001822883f0000803f000000000000000000000000000000000000803f000080bf1822883f00000000000000000000000062f585c10000803f000000000000000000000000000000000000803f000080bf62f585c1000000000000000020c581401822883f0000803f000000000000000000000000000000000000803f000080bf1822883f20c581400000000020c5814062f585c10000803f000000000000000000000000000000000000803f000080bf62f585c120c58140000000000000000062f585c10000000000000000000080bf0000803f0000000000000000000080bf0000000000000000002002bf0000000062f585c10000000000000000000080bf0000803f0000000000000000000080bf002002bf000000000000000020c5814062f585c10000000000000000000080bf0000803f0000000000000000000080bf0000000020c58140002002bf20c5814062f585c10000000000000000000080bf0000803f0000000000000000000080bf002002bf20c58140002002bf0000000062f585c1000080bf00000000000000000000000000000000000080bf000080bf62f5854100000000002002bf000000001822883f000080bf00000000000000000000000000000000000080bf000080bf182288bf00000000002002bf20c5814062f585c1000080bf00000000000000000000000000000000000080bf000080bf62f5854120c58140002002bf20c581401822883f000080bf00000000000000000000000000000000000080bf000080bf182288bf20c58140002002bf20c581401822883f000000000000803f000000000000803f0000000000000000000080bf002002bf1822883f0000000020c581401822883f000000000000803f000000000000803f0000000000000000000080bf000000001822883f002002bf20c5814062f585c1000000000000803f000000000000803f0000000000000000000080bf002002bf62f585c10000000020c5814062f585c1000000000000803f000000000000803f0000000000000000000080bf0000000062f585c1002002bf0000000062f585c100000000000080bf00000000000080bf0000000000000000000080bf0020023f62f585c1000000000000000062f585c100000000000080bf00000000000080bf0000000000000000000080bf0000000062f585c1002002bf000000001822883f00000000000080bf00000000000080bf0000000000000000000080bf0020023f1822883f00000000000000001822883f00000000000080bf00000000000080bf0000000000000000000080bf000000001822883f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: -0.2541504, y: 2.0276566, z: -7.8406377} - m_Extent: {x: 0.2541504, y: 2.0276566, z: 8.904179} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!43 &2103172151 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33438 + m_Name: pb_Mesh32870 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -41658,7 +41672,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33422 + m_Name: pb_Mesh32854 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 diff --git a/Assets/Scripts/Hub/CollideInteractions/Actors/GameTriggerUI.cs b/Assets/Scripts/Hub/CollideInteractions/Actors/GameTriggerUI.cs index ae5ac31f..45e0f887 100644 --- a/Assets/Scripts/Hub/CollideInteractions/Actors/GameTriggerUI.cs +++ b/Assets/Scripts/Hub/CollideInteractions/Actors/GameTriggerUI.cs @@ -19,6 +19,7 @@ public class GameTriggerUI : MonoBehaviour if (Input.GetKeyDown(KeyCode.F) && isTrigger) { OnInteract(); + isTrigger = false; } } public void OnTriggerEnter(Collider obj) diff --git a/Assets/Scripts/Hub/CollideInteractions/Actors/HighlightObjects.cs b/Assets/Scripts/Hub/CollideInteractions/Actors/HighlightObjects.cs deleted file mode 100644 index 033d87a6..00000000 --- a/Assets/Scripts/Hub/CollideInteractions/Actors/HighlightObjects.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class HighlightObjects : MonoBehaviour -{ - - GameObject actor; - - private void Start() - { - actor = GameObject.Find("Skate"); - } - - public void OnTriggerEnter(Collider obj) - { - if (obj.CompareTag("Player")) - { - - } - - } - public void OnTriggerExit(Collider obj) - { - if (obj.CompareTag("Player")) - { - } - - } -} diff --git a/Assets/Scripts/Hub/CollideInteractions/Actors/HighlightObjects.cs.meta b/Assets/Scripts/Hub/CollideInteractions/Actors/HighlightObjects.cs.meta deleted file mode 100644 index f3cf3357..00000000 --- a/Assets/Scripts/Hub/CollideInteractions/Actors/HighlightObjects.cs.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -<<<<<<< HEAD:Assets/Scripts/Hub/CollideInteractions/Actors/HighlightObjects.cs.meta -guid: 98fa2f1d676970e48804e9188c8330f9 -======= -guid: 8341553bb1880664081df3448313fd99 ->>>>>>> 17d292e3d5c542de57855d3822bd951f71bd38e4:Assets/Scripts/CourseAPieds/TerrainGeneratorCourseApied.cs.meta -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Hub/CollideInteractions/Actors/ScoreTriggerUI.cs b/Assets/Scripts/Hub/CollideInteractions/Actors/ScoreTriggerUI.cs new file mode 100644 index 00000000..fef1323b --- /dev/null +++ b/Assets/Scripts/Hub/CollideInteractions/Actors/ScoreTriggerUI.cs @@ -0,0 +1,68 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ScoreTriggerUI : MonoBehaviour +{ + + List<ScoreTemp> dataTab = new List<ScoreTemp>(); + private string concatScore = ""; + + private UI UIScript; + public string GameName; + private bool isTrigger = false; + + private void Start(){ + UIScript = GameObject.Find("MainCamera").GetComponent<UI>(); + GameName = GameName.ToLower(); + } + + private void LateUpdate() + { + if (Input.GetKeyDown(KeyCode.F) && isTrigger) + { + OnInteract(); + isTrigger = false; + } + } + public void OnTriggerEnter(Collider obj) + { + if (obj.CompareTag("Player")) + { + isTrigger = true; + UIScript.CallFunction("showGameTextInfo", GameName); + } + } + + public void OnInteract() + { + // SceneManager.LoadSceneAsync("SampleScene", LoadSceneMode.Additive); + // SceneManager.MoveGameObjectToScene(GameObject.FindGameObjectWithTag("Player"), SceneManager.GetSceneByName("SampleScene")); + // SceneManager.UnloadSceneAsync(SceneManager.GetActiveScene()); + + dataTab = FileHandler.LireJSON<ScoreTemp>("tempScene.json"); // Lire les données du JSON associé à filename + + //dataTab = dataTab.sort(); + foreach(ScoreTemp score in dataTab) + { + concatScore += score.value.ToString() +","; + } + concatScore += "tmp"; + + // On va chercher le joueur pour désactiver sa gestion de la souris + GameObject.Find("PlayerArmature").GetComponent<StarterAssets.StarterAssetsInputs>().cursorLocked = false; + UIScript.EnableInputs(); + + + UIScript.CallFunction("showScoreWindowTmp", concatScore); + } + + public void OnTriggerExit(Collider obj) + { + if (obj.CompareTag("Player")) + { + isTrigger = false; + UIScript.CallFunction("hideGameTextInfo", ""); + } + } +} diff --git a/Assets/Scripts/Hub/PlayerHub/MouvementPlayer.cs.meta b/Assets/Scripts/Hub/CollideInteractions/Actors/ScoreTriggerUI.cs.meta similarity index 83% rename from Assets/Scripts/Hub/PlayerHub/MouvementPlayer.cs.meta rename to Assets/Scripts/Hub/CollideInteractions/Actors/ScoreTriggerUI.cs.meta index 6b03be6e..abd6c243 100644 --- a/Assets/Scripts/Hub/PlayerHub/MouvementPlayer.cs.meta +++ b/Assets/Scripts/Hub/CollideInteractions/Actors/ScoreTriggerUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4f21fd09d279c6545972ece97c2a7d3d +guid: 64785d3233bf8d24abe886f74fa48bac MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Hub/CollideInteractions/Actors/ShowInteractions.cs b/Assets/Scripts/Hub/CollideInteractions/Actors/ShowInteractions.cs deleted file mode 100644 index 22430696..00000000 --- a/Assets/Scripts/Hub/CollideInteractions/Actors/ShowInteractions.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ShowInteractions : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Hub/CollideInteractions/Actors/ShowInteractions.cs.meta b/Assets/Scripts/Hub/CollideInteractions/Actors/ShowInteractions.cs.meta deleted file mode 100644 index 3d14a112..00000000 --- a/Assets/Scripts/Hub/CollideInteractions/Actors/ShowInteractions.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a63f39b06a0a31749b5933b110d0511e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Hub/GestionScore/LeaderBoard/AfficherScore.cs b/Assets/Scripts/Hub/GestionScore/LeaderBoard/AfficherScore.cs index 78bdc12a..63a0d97b 100644 --- a/Assets/Scripts/Hub/GestionScore/LeaderBoard/AfficherScore.cs +++ b/Assets/Scripts/Hub/GestionScore/LeaderBoard/AfficherScore.cs @@ -21,6 +21,7 @@ public class AfficherScore : MonoBehaviour } } } + public void OnTriggerEnter(Collider obj) { if (obj.CompareTag("Player")) diff --git a/Assets/Scripts/Hub/PlayerHub/MouvementPlayer.cs b/Assets/Scripts/Hub/PlayerHub/MouvementPlayer.cs deleted file mode 100644 index 9da7c2ed..00000000 --- a/Assets/Scripts/Hub/PlayerHub/MouvementPlayer.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MouvementPlayer : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/BrowserAssets/UI/hub.html b/BrowserAssets/UI/hub.html index 4b4a2c4e..1a36f070 100644 --- a/BrowserAssets/UI/hub.html +++ b/BrowserAssets/UI/hub.html @@ -60,6 +60,66 @@ uiWindowGameList.show(); } } + + //---------AFFICHAGE DES CLASSEMENTS + function showScoreWindowTmp(str){ + var scores = str.split(","); + let textAfficher = "\tJoueur \tScore"; + + if(scores[scores.length-1] == ("tmp")){ + scores.pop(); + console.log(scores); + // On créé la fenêtre pour la liste des parties + var uiWindowGameList = new UIWindow(); + + // On défini quelques paramètres + uiWindowGameList.showAnimation = "animate__zoomIn"; + //uiWindowGameList.hideAnimation = "animate__zoomOut"; + uiWindowGameList.debug = false; + uiWindowGameList.preferHide = true; // Pemet de ne pas supprimer le code html au moment de la fermeture de la fenêtre + uiWindowGameList.closeAction = "reEnableHubInput();"; // Fonction créée au runtime par UI.cs + + // Puis on l'initialise (pour la créer et prendre en compte les paramètres) + uiWindowGameList.init(); + + // On ajoute les éléments à la fenêtre + uiWindowGameList.addElement("title", "LeaderBoard temporaire", null); + // Récupérer les données du JSON et les concaténer + scores.sort(); + scores.forEach(score => { + textAfficher += "<br>\tAnonyme \t" + score; + }); + + //Ajouter les données à la fenetres + var scoresElem = uiWindowGameList.addElement("textBox", textAfficher, null); + document.getElementById(scoresElem).style.overflowY = "auto"; + // var container = uiWindow.addHTMLElement(new HTMLUIElement("div", { + // id: "scoreContainer" + // }, ""), null); + // var containerElement = document.getElementById("scoreContainer"); + + // var scoresElem = uiWindowGameList.addElement("table", tableCreate, null); + // var elementTable = document.getElementById(scoresElem); + + // elementTable.style.overflowY = "auto"; + // elementTable.insertRow(); + // elementTable.insertCell("Joueur"); + // elementTable.insertCell("Score"); + // scores.forEach(score => { + // elementTable.insertRow(); + // elementTable.insertCell("Anonyme"); + // elementTable.insertCell(score); + // }); + + + uiWindowGameList.show(); + } + } + + function removeElement(str) + { + + } </script> </body> </html> \ No newline at end of file diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 74b767bd..5b959127 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -42,6 +42,11 @@ "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "ShapeComponent.ResetSettings", "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.autoRecalculateCollisions", + "value": "{\"m_Value\":false}" } ] } -- GitLab