From 6e633b31ace861a3ac8098ee1df0a5ebf4ca6dd4 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 09:55:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Treasure/TreasureSoulModel.cs | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/System/Treasure/TreasureSoulModel.cs b/System/Treasure/TreasureSoulModel.cs
index f3fda0d..92f74e3 100644
--- a/System/Treasure/TreasureSoulModel.cs
+++ b/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,14 @@
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>())
+ {
+ ActivateShow.TreasureSoulGetReward((int)_data.PriID, beforeFinishCount, special.presentFinishCount);
}
}
}
@@ -290,13 +301,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);
}
+
}
}
}
--
Gitblit v1.8.0