From 97ce4d44bed3df19b585f947001e27095e765b84 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期一, 01 七月 2019 15:23:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan

---
 System/WindowBase/OneLevelWin.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/System/WindowBase/OneLevelWin.cs b/System/WindowBase/OneLevelWin.cs
index 89c4c66..25622c9 100644
--- a/System/WindowBase/OneLevelWin.cs
+++ b/System/WindowBase/OneLevelWin.cs
@@ -50,7 +50,7 @@
 
             m_SubWindowContainer = this.GetComponent<RectTransform>("Pivot/Container_SubWindow");
 
-            var name = this.GetType().Name;
+            var name = this.gameObject.name;
             var infos = WindowConfig.GetWindowFunctionInfos(name);
             foreach (var info in infos)
             {

--
Gitblit v1.8.0