Merge remote-tracking branch 'origin/Yuy'

3D Fruit/Assets/Res/Levels/Level2.prefab

@@ -138,6 +138,85 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_type: 2
+--- !u!1 &784647362303656394
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6884226178545395692}
+  - component: {fileID: 2473626929879106503}
+  - component: {fileID: 3182491866656486099}
+  m_Layer: 0
+  m_Name: Water (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6884226178545395692
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 784647362303656394}
+  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 1.7431096, z: 0}
+  m_LocalScale: {x: 0.90472573, y: 1, z: 0.90472573}
+  m_Children: []
+  m_Father: {fileID: 3512693175049328617}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &2473626929879106503
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 784647362303656394}
+  m_Mesh: {fileID: -6564086670116265437, guid: 89f902003b1d6014db8f7fb8bd89c5ec, type: 3}
+--- !u!23 &3182491866656486099
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 784647362303656394}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 64ccd24a7a024b2408c6aa0f95c6753a, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
 --- !u!1 &1953537195897530660
 GameObject:
   m_ObjectHideFlags: 0
@@ -2763,6 +2842,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_glassView: {fileID: 4533172995854878558}
   m_fruitParent: {fileID: 6546680321722540291}
+  m_highLightEffect: {fileID: 0}
 --- !u!1 &2824403712881052794
 GameObject:
   m_ObjectHideFlags: 0
@@ -4922,6 +5002,11 @@ PrefabInstance:
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: a88f1be7188370541912608016f30f02, type: 2}
+    - target: {fileID: 4199433100912743351, guid: 89f902003b1d6014db8f7fb8bd89c5ec,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 5eb5fa9eac7a48847ac5d0e3127e43a8, type: 2}
     - target: {fileID: 6752566947609992337, guid: 89f902003b1d6014db8f7fb8bd89c5ec,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
@@ -4935,3 +5020,9 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 9071022117346310736}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &3512693175049328617 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5574657383665397177, guid: 89f902003b1d6014db8f7fb8bd89c5ec,
+    type: 3}
+  m_PrefabInstance: {fileID: 9071022117346310736}
+  m_PrefabAsset: {fileID: 0}