Merge branch 'master' of http://8.134.150.210:3000/xgan/2025TapTapGameJam

Assets/Prefab/Gameplay/ConnectionLine.prefab

@@ -42,7 +42,11 @@ LineRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2140853775088731430}
   m_Enabled: 1
+<<<<<<< HEAD
   m_CastShadows: 1
+=======
+  m_CastShadows: 0
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -54,7 +58,11 @@ LineRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
+<<<<<<< HEAD
   - {fileID: 2100000, guid: fd7b6ef1c8d01724683c1f9dc2114f9e, type: 2}
+=======
+  - {fileID: 2100000, guid: e96f7d97b7194c548bcfc2a18e277891, type: 2}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -85,8 +93,13 @@ LineRenderer:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
+<<<<<<< HEAD
         time: 0.48411998
         value: 0.018180847
+=======
+        time: 0.6359602
+        value: 0.052467346
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
         inSlope: 0
         outSlope: 0
         tangentMode: 0
@@ -132,7 +145,11 @@ LineRenderer:
     textureMode: 0
     textureScale: {x: 1, y: 1}
     shadowBias: 0.5
+<<<<<<< HEAD
     generateLightingData: 0
+=======
+    generateLightingData: 1
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
   m_MaskInteraction: 0
   m_UseWorldSpace: 1
   m_Loop: 0
@@ -149,5 +166,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 73c8f3d3a6144dc780b46b6c363b8ca6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
   monoSource: {fileID: 0}
   monoTarget: {fileID: 0}
+=======
+  monoPointA: {fileID: 0}
+  monoPointB: {fileID: 0}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138