From edc8b361fb45fda2f8b3c4ece22427aba6518061 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 20 十二月 2018 11:31:25 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
Utility/SevenZipUtility.cs | 2 ++
Core/NetworkPackage/DTCFile/ServerPack/HC1_CrossRealm/DTCC102_tagMCCrossRealmPKAwardState.cs | 7 +++++--
System/CrossServerOneVsOne/CrossServerRewardModel.cs | 5 +++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HC1_CrossRealm/DTCC102_tagMCCrossRealmPKAwardState.cs b/Core/NetworkPackage/DTCFile/ServerPack/HC1_CrossRealm/DTCC102_tagMCCrossRealmPKAwardState.cs
index c723c5b..67bbb7b 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HC1_CrossRealm/DTCC102_tagMCCrossRealmPKAwardState.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HC1_CrossRealm/DTCC102_tagMCCrossRealmPKAwardState.cs
@@ -1,8 +1,11 @@
using UnityEngine;
using System.Collections;
+using Snxxz.UI;
-// C1 02 跨服PK玩家奖励记录 #tagMCCrossRealmPKAwardState
-
+// C1 02 跨服PK玩家奖励记录 #tagMCCrossRealmPKAwardState
+
+
+
public class DTCC102_tagMCCrossRealmPKAwardState : DtcBasic {
CrossServerRewardModel m_CrossServerRewardModel;
diff --git a/System/CrossServerOneVsOne/CrossServerRewardModel.cs b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
index 6167a26..68233c7 100644
--- a/System/CrossServerOneVsOne/CrossServerRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -45,6 +45,7 @@
public Dictionary<int, SeasonAwardClass> SegmentRewardDic = new Dictionary<int, SeasonAwardClass>();
public ImpactRankModel.RankAwardItem SeasonRewardDic = new ImpactRankModel.RankAwardItem();
public Dictionary<int, RankingInformationClass> RankInformationDic = new Dictionary<int, RankingInformationClass>();
+ public Action CrossRealmPKAwardStateUpdate;//棰嗗彇濂栧姳鍒锋柊
private uint DayPKCountAwardState; //姣忔棩鍖归厤娆℃暟濂栧姳璁板綍
private uint DayWinCountAwardState; // 姣忔棩鑳滃埄娆℃暟濂栧姳璁板綍
private uint DanLVAwardState; // 娈典綅杈炬爣濂栧姳璁板綍
@@ -140,6 +141,10 @@
DayWinCountAwardState = info.DayWinCountAwardState;
DanLVAwardState = info.DanLVAwardState;
SeasonAwardState = info.SeasonAwardState;
+ if (CrossRealmPKAwardStateUpdate != null)
+ {
+ CrossRealmPKAwardStateUpdate();
+ }
}
private bool IsAwardState(CrossRealmPKAwardStateEnum _cross, int Index)//鏄惁宸查鍙栧鍔�
diff --git a/Utility/SevenZipUtility.cs b/Utility/SevenZipUtility.cs
index 22f5da7..c9b10d1 100644
--- a/Utility/SevenZipUtility.cs
+++ b/Utility/SevenZipUtility.cs
@@ -37,7 +37,9 @@
public static void DeCompress(string from, string to)
{
+#if !(UNITY_IOS || UNITY_IPHONE)
lzma.doDecompress7zip(from, to, false, true);
+#endif
}
}
--
Gitblit v1.8.0