Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master

chenxin

2020-10-28 56f231f1f6523d7920cf32f033f9bb6f0015550f

 Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
using TowerDefense.Level;
using UnityEngine.UI;

/**
 * 无尽模式结算界面列表脚本
@@ -40,7 +41,7 @@

                    propIcon.SetIcon(iconSp);
                    propIcon.SetBg(bgSp);
                    item.transform.SetParent(Grid.transform);
                    item.transform.SetParent(Grid.transform, false);
                }
            }
        }