Merge branch '美术优化3.10晚上春' into 'develop'

美术优化3.10晚上春

See merge request aibis-dream/aibis-dream!308

Assets/Scripts/Clue/FavoritesManager.cs

@@ -52,7 +52,7 @@ public class FavoritesManager : MonoBehaviour
     private void Start()
     {
         favoritesUIRectTransform = favoritesUI.GetComponent<RectTransform>();
-        hiddenPosition = new Vector2(favoritesUIRectTransform.anchoredPosition.x, -Screen.height);
+        hiddenPosition = new Vector2(favoritesUIRectTransform.anchoredPosition.x*2, favoritesUIRectTransform.anchoredPosition.y);
         visiblePosition = new Vector2(favoritesUIRectTransform.anchoredPosition.x, 0);
         // // 设置收藏夹的初始位置为隐藏
         favoritesUIRectTransform.anchoredPosition = hiddenPosition;

Assets/Scripts/FixSystem/DraggableUI.cs

@@ -8,7 +8,7 @@ public class DraggableUI : MonoBehaviour, IDragHandler, IPointerDownHandler
     private Canvas canvas;
 
     public RectTransform target;
-    public GameObject button;
+    public Button button;
     public bool isDone = false;
     private bool isLocked = false;
 
@@ -41,11 +41,11 @@ public class DraggableUI : MonoBehaviour, IDragHandler, IPointerDownHandler
 
         if (distance <= 1 && !isDone)
         {
-            button.SetActive(true);
+            button.interactable=true;
         }
         else
         {
-            button.SetActive(false);
+            button.interactable=false;
         }
     }
 

Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs

@@ -68,13 +68,14 @@ public class HeatMapController : MonoBehaviour
     private IEnumerator ShowHeatMapCoroutine()
     {
         // 初始化Heatmap位置
+
         heatmapGameobject.transform.localPosition = outPos;
         heatmapGameobject.SetActive(true);
         heatmapGameobject.transform.DOLocalMove(inPos, 1f);
         heatmapGameobject.GetComponent<DraggableUI>().isDone = false;
         yield return new WaitForSeconds(1f); // 等待动画完成
         heatmapGameobject.GetComponent<DraggableUI>().UnlockDrag();
-        coolingButton.interactable = true;
+        coolingButton.interactable = false;
     }
 
     public void HideHeatMap()
@@ -100,7 +101,7 @@ public class HeatMapController : MonoBehaviour
 
         // 移动和旋转动画
         imageToMove.DOLocalMoveX(imageInitialPos.x + 3.5f, 1f);
-        var rotationTween = imageToRotate.DORotate(new Vector3(0, 0, 360), 1f, RotateMode.FastBeyond360)
+        var rotationTween = imageToRotate.DORotate(new Vector3(0, 0, 360), 0.2f, RotateMode.FastBeyond360)
             .SetLoops(-1, LoopType.Restart)
             .SetEase(Ease.Linear);