From 665666a0bdbb0fdec0a24db40375293ad79fa7ff Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 04 一月 2019 14:59:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Utility/EnumHelper.cs | 4 +++-
UI/HUD/PopUpNum.cs | 4 ++++
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs | 6 ++++++
System/Vip/VipInvest/WheelOfFortuneWin.cs | 11 ++++++-----
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
index 1e116eb..98343ce 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
@@ -222,6 +222,12 @@
private void ClickBuyTimes()
{
+ if(!CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch)
+ {
+ SysNotifyMgr.Instance.ShowTip("CrossMatching21");
+ return;
+ }
+
int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();
if (remainNum >= crossServerModel.freeMaxMatchNum)
{
diff --git a/System/Vip/VipInvest/WheelOfFortuneWin.cs b/System/Vip/VipInvest/WheelOfFortuneWin.cs
index d4c18e9..b7f6799 100644
--- a/System/Vip/VipInvest/WheelOfFortuneWin.cs
+++ b/System/Vip/VipInvest/WheelOfFortuneWin.cs
@@ -129,15 +129,16 @@
}
protected override void LateUpdate()
{
- base.LateUpdate();
- }
- protected override void OnAfterClose()
- {
timeType += Time.deltaTime;
if (timeType >= Second && !IsSend)
{
+ timeType = 0;
IsSend = true;
- }
+ }
+ }
+ protected override void OnAfterClose()
+ {
+
}
private void OnClickButton()
diff --git a/UI/HUD/PopUpNum.cs b/UI/HUD/PopUpNum.cs
index 865fe74..d216585 100644
--- a/UI/HUD/PopUpNum.cs
+++ b/UI/HUD/PopUpNum.cs
@@ -315,6 +315,10 @@
PetImmune = 29, //瀹犵墿鍏嶇柅
EnemyImmune = 30, //鏁屼汉鍏嶇柅
+ PlayerZhanSha = 34, //鐜╁鏂╂潃
+ PetZhanSha = 35, //瀹犵墿鏂╂潃
+ EnemyZhanSha = 36, //鏁屼汉鏂╂潃
+
BuffAddDefense = 101,//+闃插尽buff
BuffAddAttack = 102,//+鏀诲嚮buff
BuffAddAttackSpeed = 103,//+鏀婚�焍uff
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index 3fec7ce..b2ffcb3 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -1352,7 +1352,9 @@
/** 鍏嶇柅 */
Immune,
/** 鍘嬪埗 */
- Suppress
+ Suppress,
+ /**鏂╂潃**/
+ ZhanSha,
}
public enum E_PlayerState
--
Gitblit v1.8.0