少年修仙传客户端代码仓库
client_Wu Xijin
2018-12-28 77e6c89aedfe6ac2e6e1e7d270b4b9e3924320c7
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
7个文件已修改
75 ■■■■ 已修改文件
System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerRewardModel.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/RankCellCtrl.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/SeasonRewardCell.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/SeasonRewardWin.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FriendSystem/MailPanel.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GatheringSoul/GatheringSoulModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs
@@ -48,17 +48,12 @@
        protected override void OnPreOpen()
        {
            SetDisplay();
            SetZoneIDAndSeasonID();
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += UpdatePlayerData;
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfo;
        }
        protected override void OnActived()
        {
            bool isbool = crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1);
            if (CrossServerOneVsOnePKSeason.Instance.SeasonState == 2 && !isbool)
            {
                crossServerRewardModel.ViewCrossPKBillboard(crossServerRewardModel.ZoneID, crossServerRewardModel.SeasonID);//关于赛季查询
            }
            
        }
        protected override void OnAfterOpen()
@@ -227,17 +222,6 @@
            rankAward_SelectImg.SetActive(false);
            seasonAward_SelectImg.SetActive(false);
            honorStore_SelectImg.SetActive(false);
        }
        private void SetZoneIDAndSeasonID()//设置赛区和ID
        {
            if (crossServerRewardModel.ZoneID == 0)
            {
                crossServerRewardModel.ZoneID = CrossServerOneVsOnePKSeason.Instance.ZoneID;
            }
            if (crossServerRewardModel.SeasonID == 0)
            {
                crossServerRewardModel.SeasonID = CrossServerOneVsOnePKSeason.Instance.SeasonID;
            }
        }
    }
}
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()
    {
@@ -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;
            }
System/CrossServerOneVsOne/RankCellCtrl.cs
@@ -98,6 +98,7 @@
               // m_RankWhatTxt.color = UIHelper.GetUIColor(TextColType.NavyBrown);
                m_SegmentTxt.color = UIHelper.GetUIColor(TextColType.NavyBrown);
                m_SegmentTxt.color = UIHelper.GetUIColor(TextColType.NavyBrown);
                m_RankButton.RemoveAllListeners();
            }
        }
System/CrossServerOneVsOne/SeasonRewardCell.cs
@@ -279,7 +279,13 @@
        private bool IsOnTheList()
        {
            bool Isbool = false;
            if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)
            int Number = 0;
            var keyList = crossServerRewardModel.SeasonRewardDic.AwardDic.Keys.ToList();
            for (int i = 0; i < keyList.Count; i++)
            {
                Number = keyList[i];
            }
            if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < Number)
            {
                Isbool = true;
            }
System/CrossServerOneVsOne/SeasonRewardWin.cs
@@ -105,7 +105,12 @@
            {
                return Index;
            }
            if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)//存在世界排名
            int Number = 0;
            foreach (var key in crossServerRewardModel.SeasonRewardDic.AwardDic.Keys)
            {
                Number = key;
            }
            if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < Number)//存在世界排名
            {
                int Type = 0;
                foreach (var key in crossServerRewardModel.SeasonRewardDic.AwardDic.Keys)
System/FriendSystem/MailPanel.cs
@@ -95,6 +95,7 @@
    }
    DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
    VirtualPackModel virtualPackModel { get { return ModelCenter.Instance.GetModel<VirtualPackModel>(); } }
    private void Awake()
    {
@@ -629,6 +630,7 @@
        int getBagItemCount = 0;
        int getRuneCount = 0;
        int getDogzCount = 0;
        int getSoulCount = 0;
        ItemConfig tagChinItem = null;
        for (i = 0; i < mailInfo.Count; i++)
        {
@@ -648,6 +650,11 @@
                    case (int)ItemType.DogzEquipType4:
                    case (int)ItemType.DogzEquipType5:
                        getDogzCount += 1;
                        break;
                    case GatheringSoulModel.GATHERSOUL_CORE_TYPE:
                    case GatheringSoulModel.GATHERSOUL_ESSENCE_TYPE:
                    case GatheringSoulModel.GATHERSOUL_SOUL_TYPE:
                        getSoulCount += 1;
                        break;
                    default:
                        getBagItemCount += 1;
@@ -672,6 +679,11 @@
            SysNotifyMgr.Instance.ShowTip("DogzBagFull");
            return;
        }
        else if(getSoulCount > virtualPackModel.GetPackRemainCount(PackType.rptGatherSoul))
        {
            SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165",PackType.rptGatherSoul);
            return;
        }
        CA53B_tagCMRequestCompensation askRecive = new CA53B_tagCMRequestCompensation();
        askRecive.GUID = id;
System/GatheringSoul/GatheringSoulModel.cs
@@ -890,7 +890,7 @@
            {
                if (virtualPack.GetPackRemainCount(PackType.rptGatherSoul) < 1)
                {
                    SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165");
                    SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165", (int)PackType.rptGatherSoul);
                    return;
                }
                SendEquipPack((int)PackType.rptInterimPack, item.index, (int)PackType.rptGatherSoul, 0);