Merge branch 'master' into WindowControl

client_Wu Xijin

2019-02-03 1e54ef7e6a1d7c0a4681f243020fddfed9cf3121

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -688,17 +688,6 @@
                }

            }



            if (jadeDynastyTowerModel.specialUnLockFloor > 0 && !IsDungeon())

            {

                if (!WindowCenter.Instance.IsOpen("NewBieWin") && !WindowCenter.Instance.IsOpen("TreasureNewGotWin"))

                {

                    if (!WindowCenter.Instance.IsOpen("JadeDynastyTowerUnLockWin"))

                    {

                        WindowCenter.Instance.Open<JadeDynastyTowerUnLockWin>();

                    }

                }

            }



            if (jadeDynastyTowerModel.openJadeDynastyTower && !IsDungeon())

            {

                if (!WindowCenter.Instance.IsOpen("NewBieWin") && !WindowCenter.Instance.IsOpen("TreasureNewGotWin"))