解决冲突

chenxin

2020-10-31 a1f0653ec48d7787e0d57cabef0600b2a07355eb

 Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs

@@ -141,22 +141,29 @@

            GameObject mainUI = GameObject.Find("MainUI");

            Transform mainUITransform = mainUI.GetComponent<Transform>();
            Transform mainUITransform = mainUI.transform;
            obj.transform.SetParent(mainUITransform, false);

            // Vector3 screenPos = Camera.main.WorldToScreenPoint(worldPos);
            // Vector2 pos;
            // RectTransformUtility.ScreenPointToLocalPointInRectangle(mainUITransform as RectTransform, screenPos, Camera.main, out pos);
            // (obj.transform as RectTransform).anchoredPosition = pos;

            obj.GetComponent<Transform>().SetParent(mainUITransform, true);

            obj.transform.position = worldPos;
            obj.transform.localRotation = Quaternion.identity;
            obj.transform.localScale = Vector3.one;
            // obj.transform.localRotation = Quaternion.identity;
            // obj.transform.localScale = Vector3.one;

            if (isRandom)
            {
                Vector2 p = UnityEngine.Random.insideUnitCircle * DropRadius;
                Vector3 pos1 = p.normalized * p.magnitude;
                Vector3 objPos = obj.transform.position;
                objPos.x += pos1.x;
                objPos.z += pos1.y;
                obj.transform.position = objPos;
            }
            // if (isRandom)
            // {
            //     Vector2 p = UnityEngine.Random.insideUnitCircle * DropRadius;
            //     Vector3 pos1 = p.normalized * p.magnitude;
            //     Vector3 objPos = obj.transform.position;
            //     objPos.x += pos1.x;
            //     objPos.z += pos1.y;
            //     obj.transform.position = objPos;
            // }

            dropReward.PlayParticle();
            DropObjDic.Add(drop.Id, obj);