From 64ff9d0995edc36bf176ff26789b0cfb26be19e7 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 14 一月 2019 21:29:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs b/System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs
index 1120f81..c6cfe5e 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs
@@ -25,11 +25,16 @@
public int DayBuyCount { get; private set; } // 褰撴棩宸茶喘涔版鏁�
+ public int DayItemAddCount { get; private set; } // 褰撴棩鐗╁搧澧炲姞娆℃暟
+
+ private int preDayPkCount;
CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
public event Action UpdatePlayerInfoEvent;
+ public event Action UpdateMatchNumEvent;
public void InitData()
{
+ preDayPkCount = 0;
Score = 0;
DanLV = 0;
PKCount = 0;
@@ -47,9 +52,20 @@
this.PKCount = playerInfo.PKCount;
this.WinCount = playerInfo.WinCount;
this.CWinCount = playerInfo.CWinCount;
- this.DayPKCount = playerInfo.DayPKCount;
this.DayBuyCount = playerInfo.DayBuyCount;
this.DayWinCount = playerInfo.DayWinCount;
+ this.DayItemAddCount = playerInfo.DayItemAddCount;
+ this.DayPKCount = playerInfo.DayPKCount;
+
+ if (this.preDayPkCount != playerInfo.DayPKCount)
+ {
+ this.preDayPkCount = playerInfo.DayPKCount;
+ if (UpdateMatchNumEvent != null)
+ {
+ UpdateMatchNumEvent();
+ }
+ }
+
if (UpdatePlayerInfoEvent != null)
{
UpdatePlayerInfoEvent();
@@ -76,7 +92,7 @@
public int GetDayRemainNum()
{
- int remainNum = DayBuyCount + crossServerModel.freeMaxMatchNum - DayPKCount;
+ int remainNum = DayBuyCount + DayItemAddCount + crossServerModel.freeMaxMatchNum - DayPKCount;
return remainNum > 0 ? remainNum : 0;
}
--
Gitblit v1.8.0