Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master

chenxin

2020-12-25 adb0dae8a82a7eabb4e686bc0e83c8859bf6445f

 Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs

@@ -22,7 +22,7 @@
        private string iconPath = "UI/Props/";

        private string bgPath = "UI/Props/Di/";
        private float slowTime = 0.3f;//物品挨个出现频率
        private float slowTime = 0.1f;//物品挨个出现频率

        //private float parentHeight;//父物体高度
        GridLayoutGroup myGroup;
@@ -45,7 +45,7 @@
        /// </summary>
        public void RefreshList()
        {
            Invoke("StartLater", slowTime);
            Invoke("StartLater", 0.1f);

            // if (Application.platform == RuntimePlatform.WindowsEditor)
            // {
@@ -54,26 +54,28 @@
            // }

            return;
            List<EndlessDrop> list = EndlessDropManager.instance.GetAllObtainedDrop();
            // List<EndlessDrop> list = EndlessDropManager.instance.GetAllObtainedDrop();

            for (int i = 0; i < list.Count; ++i)
            {
                if (list[i].Reward.type == CURRENCY.Gold)
                {
                    AddItem($"{(int)list[i].Reward.type}");
                }
                else
                {
                    for (int j = 0; j < list[i].Reward.count; ++j)
                    {
                        AddItem($"{(int)list[i].Reward.type}_{list[i].Reward.id}");
                    }
                }
            }
            // for (int i = 0; i < list.Count; ++i)
            // {
            //     if (list[i].Reward.type == CURRENCY.Gold)
            //     {
            //         AddItem($"{(int)list[i].Reward.type}");
            //     }
            //     else
            //     {
            //         for (int j = 0; j < list[i].Reward.count; ++j)
            //         {
            //             AddItem($"{(int)list[i].Reward.type}_{list[i].Reward.id}");
            //         }
            //     }
            // }
        }

        private void StartLater()
        {
            AudioSourceManager.Ins.Play(AudioEnum.End);

            StartCoroutine(ShowSlow());
        }