From daec525d92e4ce2d72dfd3f114f6e839af256fe0 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 27 十二月 2018 14:04:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs | 3 +
System/DailyQuest/DailyQuestData.cs | 1
System/Activity/ActivityModel.cs | 8 ++++
System/Treasure/KingTreasureModel.cs | 15 ++++---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 8 +++
System/Treasure/KingThreeDimensionsBehaviour.cs | 22 ++++++-----
System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs | 11 +++++
7 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/System/Activity/ActivityModel.cs b/System/Activity/ActivityModel.cs
index 7742222..66bd754 100644
--- a/System/Activity/ActivityModel.cs
+++ b/System/Activity/ActivityModel.cs
@@ -271,6 +271,14 @@
}
}
break;
+ case DailyQuestType.CrossServerPk:
+ {
+ if(TimeUtility.OpenDay < ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>().afterOpenDayOpenCross)
+ {
+ return true;
+ }
+ }
+ break;
}
if (config.UnLockFuncID != 0)
{
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 0c04cdc..3907e95 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -59,6 +59,8 @@
{
SendCrossMatch(1);
}
+
+ UpdateCrossArenaRedpoint();
}
public override void UnInit()
@@ -110,6 +112,8 @@
{
UpdateDayAwardsEvent();
}
+
+ UpdateCrossArenaRedpoint();
}
private void UpdateFBHelp()
@@ -458,8 +462,10 @@
#endregion
#region 绾㈢偣
+ public const int CrossOneVsOneRedKey = 21301;
+ public Redpoint crossOneVsOneRedpoint = new Redpoint(CrossOneVsOneRedKey);
public const int CrossArenaRedKey = 2130101;
- public Redpoint crossArenaRedpoint = new Redpoint(CrossArenaRedKey);
+ public Redpoint crossArenaRedpoint = new Redpoint(CrossOneVsOneRedKey, CrossArenaRedKey);
public const int CrossDayAwardsRedKey = 21301011;
public Redpoint crossDayAwardsRedpoint = new Redpoint(CrossArenaRedKey,CrossDayAwardsRedKey);
public const int CrossMatchRedKey = 21301012;
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs b/System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
index b66dca5..da52a5e 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
@@ -242,7 +242,16 @@
DailyQuestOpenTime _openTime = null;
dailyQuestModel.TryGetOpenTime((int)DailyQuestType.CrossServerPk, out _openTime);
var dayOfWeek = (int)TimeUtility.ServerNow.DayOfWeek;
- return _openTime != null ? _openTime.GetHourMinuteByWeek(dayOfWeek) : null;
+ Dictionary<int, List<HourMinute>> keyValues = null;
+ if(_openTime != null)
+ {
+ keyValues = _openTime.NormalOpenTimes;
+ if(keyValues.ContainsKey(dayOfWeek))
+ {
+ return keyValues[dayOfWeek];
+ }
+ }
+ return null;
}
public int IndexOfDays(DateTime time)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs b/System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs
index eaa4b9f..73c8257 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs
@@ -50,7 +50,8 @@
this.DayPKCount = playerInfo.DayPKCount;
this.DayBuyCount = playerInfo.DayBuyCount;
this.DayWinCount = playerInfo.DayWinCount;
- if(UpdatePlayerInfoEvent != null)
+ crossServerModel.UpdateCrossArenaRedpoint();
+ if (UpdatePlayerInfoEvent != null)
{
UpdatePlayerInfoEvent();
}
diff --git a/System/DailyQuest/DailyQuestData.cs b/System/DailyQuest/DailyQuestData.cs
index 238097e..6393d40 100644
--- a/System/DailyQuest/DailyQuestData.cs
+++ b/System/DailyQuest/DailyQuestData.cs
@@ -56,6 +56,7 @@
//甯歌鐨勬椿鍔ㄦ椂闂达紝key鏄槦鏈焫
Dictionary<int, List<HourMinute>> openTimes = new Dictionary<int, List<HourMinute>>();
+ public Dictionary<int, List<HourMinute>> NormalOpenTimes { get { return openTimes; }}
//寮�鏈嶅墠2鍛ㄧ殑娲诲姩鏃堕棿,key1鏄紑鏈嶆棩鐨勬槦鏈燂紝key2鏄紑鏈嶇鍑犲ぉ
Dictionary<int, Dictionary<int, List<HourMinute>>> specialOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>();
diff --git a/System/Treasure/KingThreeDimensionsBehaviour.cs b/System/Treasure/KingThreeDimensionsBehaviour.cs
index db8c493..05bce62 100644
--- a/System/Treasure/KingThreeDimensionsBehaviour.cs
+++ b/System/Treasure/KingThreeDimensionsBehaviour.cs
@@ -78,19 +78,24 @@
}
}
+ DisplayWear();
+
+ model.treasureWearRefresh -= TreasureWearRefresh;
+ model.treasureWearRefresh += TreasureWearRefresh;
+ }
+
+ void DisplayWear()
+ {
Treasure treasure;
- if(treasureModel.TryGetTreasure(treasureId, out treasure))
+ if (treasureModel.TryGetTreasure(displayTreasureId, out treasure))
{
m_ContainerWearToggle.gameObject.SetActive(treasure.state == TreasureState.Collected);
- m_WearCheck.gameObject.SetActive(model.IsWear(treasureId));
+ m_WearCheck.gameObject.SetActive(model.IsWear(displayTreasureId));
}
else
{
m_ContainerWearToggle.gameObject.SetActive(false);
}
-
- model.treasureWearRefresh -= TreasureWearRefresh;
- model.treasureWearRefresh += TreasureWearRefresh;
}
public void OnWear()
@@ -101,12 +106,9 @@
}
}
- private void TreasureWearRefresh(int id)
+ private void TreasureWearRefresh()
{
- if (id == displayTreasureId)
- {
- Display(id);
- }
+ DisplayWear();
}
public void Dispose()
diff --git a/System/Treasure/KingTreasureModel.cs b/System/Treasure/KingTreasureModel.cs
index af9e289..bcd8abf 100644
--- a/System/Treasure/KingTreasureModel.cs
+++ b/System/Treasure/KingTreasureModel.cs
@@ -11,7 +11,7 @@
Dictionary<int, Dictionary<int, Division>> treasureDivisionDict = new Dictionary<int, Dictionary<int, Division>>();
Dictionary<int, int> treasureSeasonDict = new Dictionary<int, int>();
- public event Action<int> treasureWearRefresh;
+ public event Action treasureWearRefresh;
public int wearCountLimit { get; private set; }
public string scoreFormula { get; private set; }
@@ -38,7 +38,10 @@
public void OnPlayerLoginOk()
{
-
+ if (treasureWearRefresh != null)
+ {
+ treasureWearRefresh();
+ }
}
public override void UnInit()
@@ -221,10 +224,10 @@
continue;
}
treasureWearDict[(int)data.MWID] = data.IsWear == 1;
- if (treasureWearRefresh != null)
- {
- treasureWearRefresh((int)data.MWID);
- }
+ }
+ if (treasureWearRefresh != null)
+ {
+ treasureWearRefresh();
}
}
--
Gitblit v1.8.0