Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-20 21a1542f9d99466b2aedd0992a1032b37b4154a3

 System/Treasure/TreasureSoulModel.cs

@@ -268,6 +268,9 @@
                    }

                    continue;

                }



                int beforeFinishCount = special.presentFinishCount;



                special.presentFinishCount = (int)_data.GotValue;

                special.presentGetCount = (int)_data.CurValue;

                special.itemGet = _data.ItemAwardState == 1;

@@ -276,6 +279,15 @@
                if (treasureSoulEvent != null)

                {

                    treasureSoulEvent((int)_data.PriID);

                }



                if (beforeFinishCount < special.presentFinishCount && serverInited && special.active

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

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

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

                    && !NewBieCenter.Instance.inGuiding)

                {

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

                }

            }

        }

@@ -290,13 +302,23 @@
                    if (treasureSoulDict.ContainsKey((int)TreasurePrivilege.StrengthenAdd))

                    {

                        var _specialData = treasureSoulDict[(int)TreasurePrivilege.StrengthenAdd];

                        int beforeFinishCount = _specialData.presentFinishCount;

                        _specialData.presentFinishCount = (int)_data.Cnt;

                        UpdateRedpoint((int)TreasurePrivilege.StrengthenAdd);

                        if (beforeFinishCount < _specialData.presentFinishCount && serverInited && _specialData.active

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

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

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

                        {

                            ActivateShow.TreasureSoulGetReward((int)TreasurePrivilege.StrengthenAdd, 
                                beforeFinishCount, _specialData.presentFinishCount);

                        }

                    }

                    if (treasureSoulEvent != null)

                    {

                        treasureSoulEvent((int)TreasurePrivilege.StrengthenAdd);

                    }



                }

            }

        }