From cab3902c30974c491d145375741fd48ec6b86003 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 28 十二月 2018 20:04:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerRewardModel.cs | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerRewardModel.cs b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
index c31bdef..d34929e 100644
--- a/System/CrossServerOneVsOne/CrossServerRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -77,6 +77,8 @@
public Redpoint redPointStre2 = new Redpoint(21301, Redpoint_key2);
private int MianOpenLV = 0;//璺ㄦ湇鎸夐挳寮�鍚潯浠�
+
+ public string ZoneName = string.Empty;//璧涘尯鍚�
public override void Init()
{
GetSeasonAward();
@@ -98,11 +100,29 @@
{
crossServerModel.UpdatePkResultEvent += UpdatePkResultEvent;
CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfoEvent;
+ GetZoneName();
RedPointSeg();
RedPointSea();
+ bool isbool = IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1);
+ if (CrossServerOneVsOnePKSeason.Instance.SeasonState == 2)
+ {
+ ViewCrossPKBillboard(CrossServerOneVsOnePKSeason.Instance.ZoneID, CrossServerOneVsOnePKSeason.Instance.SeasonID);//鍏充簬璧涘鏌ヨ
+ }
}
+ private void GetZoneName()
+ {
+ for (int i = 0; i < CrossServerOneVsOnePKSeason.Instance.ZoneCount; i++)
+ {
+ if (CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].ZoneID == CrossServerOneVsOnePKSeason.Instance.ZoneID)
+ {
+ ZoneName = UIHelper.ServerStringTrim(CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].ZoneName);
+ }
+ }
+
+
+ }
public override void UnInit()
{
@@ -126,7 +146,7 @@
private void UpdatePkResultEvent()
{
- if (GameNetSystem.Instance.crossServerConnected_Loigc)//鍓湰缁撶畻鐣岄潰
+ if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//鍓湰缁撶畻鐣岄潰
{
if (WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())
{
@@ -384,9 +404,14 @@
bool Isbool = false;
int Danlv = CrossServerOneVsOnePlayerInfo.Instance.DanLV;
bool isbool = IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1);
+ int Number = 0;
+ foreach (var key in SeasonRewardDic.AwardDic.Keys)
+ {
+ Number = key;
+ }
if (CrossServerOneVsOnePKSeason.Instance.SeasonState == 2 && !isbool)
{
- if ((MyRank > -1 && MyRank < 100) || SeasonRewardConfigDic.ContainsKey(Danlv))
+ if ((MyRank > -1 && MyRank < Number) || SeasonRewardConfigDic.ContainsKey(Danlv))
{
Isbool = true;
}
--
Gitblit v1.8.0