Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts in...

client_Hale

2018-12-20 edc8b361fb45fda2f8b3c4ece22427aba6518061

Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server

 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;


 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)//是否已领取奖励


 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
    }

}