From 56f231f1f6523d7920cf32f033f9bb6f0015550f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 28 Oct 2020 18:05:11 +0800
Subject: [PATCH] Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master

---
 Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs
index fff7f20..e7e7729 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs
+++ b/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);
                 }
             }
         }

--
Gitblit v1.9.1