解决冲突

chenxin

2020-10-31 a1f0653ec48d7787e0d57cabef0600b2a07355eb

 Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs

@@ -41,6 +41,10 @@

        public GameObject SettlementUI;

        public GameObject EffectPrefabObject;

        private GameObject effectObj;

        public void Init()
        {
            LazyLoad();
@@ -76,7 +80,24 @@

            RefreshFinalWave();
            RefreshPropList();
            EndlessMaskUI.instance.Show();
            SettlementUI.SetActive(true);
            PlayEffect();
        }

        private void PlayEffect()
        {
            if (effectObj == null)
            {
                effectObj = Instantiate(EffectPrefabObject);
                GameObject particleSystemObject = GameObject.Find("ParticleSystemObject");
                effectObj.transform.SetParent(particleSystemObject.transform, false);
                effectObj.transform.localPosition = new Vector3(0, 0, 36.6f);
                effectObj.transform.localScale = new Vector3(3, 3, 3);
            }

            ParticleSystem ps = effectObj.transform.GetChild(0).GetComponent<ParticleSystem>();
            ps.Play();
        }

        /// <summary>
@@ -147,7 +168,7 @@
            int level = EndlessLevelManager.instance.CurrentLevel;
            int wave = EndlessLevelManager.instance.WaveManager.CurrentWaveIndex;

            FinalWaveText.text = $"最终波次：第{level}关，第{wave}波";
            FinalWaveText.text = $"第{level}关，第{wave}波";
        }

        private void RefreshPropList()