Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 System/WindowBase/WindowCenter.cs

@@ -71,7 +71,7 @@
                }

                else

                {

                    DesignDebug.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                    DebugEx.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                }

            }

            else

@@ -145,7 +145,7 @@
                }

                else

                {

                    DesignDebug.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                    DebugEx.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                }



                return (T)win;

@@ -171,7 +171,7 @@
            }

            else

            {

                DesignDebug.LogFormat("没有找到窗口:{0}", typeof(T).Name);

                DebugEx.LogFormat("没有找到窗口:{0}", typeof(T).Name);

                return null;

            }



@@ -200,13 +200,13 @@
                }

                else

                {

                    DesignDebug.Log(string.Format("{0} 窗口已经关闭！", typeof(T)));

                    DebugEx.Log(string.Format("{0} 窗口已经关闭！", typeof(T)));

                }

            }

            else

            {

                asyncLoad.StopTask(typeof(T).Name);

                DesignDebug.Log(string.Format("{0} 窗口无法获得！", typeof(T)));

                DebugEx.Log(string.Format("{0} 窗口无法获得！", typeof(T)));

            }



            return win;

@@ -223,13 +223,13 @@
                }

                else

                {

                    DesignDebug.Log(string.Format("{0} 窗口已经关闭！", typeof(T)));

                    DebugEx.Log(string.Format("{0} 窗口已经关闭！", typeof(T)));

                }

            }

            else

            {

                asyncLoad.StopTask(typeof(T).Name);

                DesignDebug.Log(string.Format("{0} 窗口无法获得！", typeof(T)));

                DebugEx.Log(string.Format("{0} 窗口无法获得！", typeof(T)));

            }



            return win;

@@ -384,7 +384,7 @@
            }

            else

            {

                DesignDebug.Log(string.Format("{0} 窗口无法获得！", typeof(T)));

                DebugEx.Log(string.Format("{0} 窗口无法获得！", typeof(T)));

            }

        }



@@ -543,7 +543,7 @@
                }

                else

                {

                    DesignDebug.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                    DebugEx.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                }



                return (T)win;

@@ -576,7 +576,7 @@
                            }

                            else

                            {

                                DesignDebug.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                                DebugEx.Log(string.Format("{0} 窗口已经打开！", typeof(T)));

                            }

                        }

                    }

@@ -642,7 +642,7 @@
                }

                else

                {

                    DesignDebug.LogFormat("无法获得  {0}  的资源！", prefabName);

                    DebugEx.LogFormat("无法获得  {0}  的资源！", prefabName);

                }



                return window;