Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 1c4c5c5cb829334303bff98837a69a9653dca714

 System/Treasure/TreasureSoulModel.cs

@@ -284,7 +284,8 @@
                if (beforeFinishCount < special.presentFinishCount && serverInited && special.active

                    && !WindowCenter.Instance.CheckOpen<TreasureSoulActiveWin>()

                    && WindowCenter.Instance.CheckOpen<TreasureSoulWin>()

                    && !WindowCenter.Instance.CheckOpen<RealmPropertyUpWin>())

                    && !WindowCenter.Instance.CheckOpen<RealmPropertyUpWin>()

                    && !NewBieCenter.Instance.inGuiding)

                {

                    ActivateShow.TreasureSoulGetReward((int)_data.PriID, beforeFinishCount, special.presentFinishCount);

                }