Merge commit '5656856fbed4ddea86e83a0c5fed05e8c8041f81'

Author: GREAT1217

Assets/Scripts/Common/MonoSingleton.cs

@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
 
 public class MonoSingleton<T> : MonoBehaviour where T : MonoSingleton<T>
 {

Assets/Scripts/Common/ObjectPool.cs

@@ -1,5 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
 
 public class ObjectPool : MonoSingleton<ObjectPool>
@@ -104,4 +103,20 @@ public void RecycleObj(GameObject obj, Transform parent = null)
         }
     }
 
+    /// <summary>
+    /// 删除对象池
+    /// </summary>
+    /// <param name="poolName"></param>
+    public void DestoryPool(string poolName)
+    {
+        if (!_objectDict.ContainsKey(poolName)) return;
+        List<GameObject> objs = _objectDict[poolName];
+        for (int i = 0; i < objs.Count;)
+        {
+            Destroy(objs[i]);
+            objs.RemoveAt(i);
+        }
+        _objectDict.Remove(poolName);
+    }
+
 }

Assets/Scripts/TestGraph/UILineGraphManager.cs

@@ -135,16 +135,16 @@ private void DrawLine(int index = 0)
         Vector2 curPos = _dots[index].localPosition;
         Vector2 nextPos = _dots[index + 1].localPosition;
         float length = Vector2.Distance(curPos, nextPos);
-        Vector3 dir = (nextPos.y > curPos.y) ? nextPos - curPos : curPos - nextPos;
-        float angle = Vector3.Angle(dir.normalized, Vector3.right);
+        Vector3 dir = curPos - nextPos;
+        float angle = Vector3.Angle(Vector3.up, dir);
         Vector2 center = (curPos + nextPos) / 2;
         Image line = ObjectPool.Instance.GetObject(_linePrefab.name, _lineContent).GetComponent<Image>();
-        line.rectTransform.localEulerAngles = Vector3.forward * (angle + 90);
+        line.rectTransform.localEulerAngles = Vector3.forward * angle;
         line.rectTransform.localPosition = center;
         line.rectTransform.sizeDelta = new Vector2(_lineWidth, length);
         line.gameObject.SetActive(true);
         line.fillAmount = 0;
-        line.fillOrigin = dir.x > 0 ? 1 : 0;
+        line.fillOrigin = dir.x > 0 ? 0 : 1;
         line.DOFillAmount(1, _tweenTime / _lines.Length).OnComplete(() => DrawLine(index + 1));
         _lines[index] = line;
     }