少年修仙传客户端代码仓库
client_Wu Xijin
2018-12-28 6e278dd72b02018c8bade68d9cc6210c31c377db
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
6个文件已修改
71 ■■■■■ 已修改文件
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/KingThreeDimensionsBehaviour.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/KingTreasureModel.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/KingTreasureWin.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/UI3DTreasureSelectStage.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -435,6 +435,7 @@
                    division = data.DanLV,
                    order = data.Order,
                    rewardLevel = data.AwardLV,
                    score = (int)data.Score
                };
            }
            if (oneVsOneHistoryRefresh != null)
System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
@@ -151,6 +151,14 @@
            this.SeasonState = pKSeasonState.SeasonState;
            this.MatchState = pKSeasonState.MatchState;
            
            if(this.SeasonState != 1 || this.MatchState != 1)
            {
                if(crossServerModel.IsMatching)
                {
                    crossServerModel.IsMatching = false;
                }
            }
            if(updateSelfSeasonEvent != null)
            {
                updateSelfSeasonEvent();
System/Treasure/KingThreeDimensionsBehaviour.cs
@@ -49,15 +49,11 @@
            if (model.TryGetSeason(treasureId, out season)
                && treasureModel.TryGetTreasure(treasureId, out treasure))
            {
                var seasonNotStart = season > CrossServerOneVsOnePKSeason.Instance.SeasonID
                    || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
                    && CrossServerOneVsOnePKSeason.Instance.SeasonState == 0);
                var seasonNotStart = model.GetSeasonState(treasureId) == 0;
                m_ContainerSeasonNotStart.gameObject.SetActive(seasonNotStart);
                m_ContainerSeasonStartOrEnd.gameObject.SetActive(!seasonNotStart);
                bool seasonEnd = season < CrossServerOneVsOnePKSeason.Instance.SeasonID
                    || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
                    && CrossServerOneVsOnePKSeason.Instance.SeasonState == 2);
                bool seasonEnd = model.GetSeasonState(treasureId) == 2;
                if (!seasonNotStart)
                {
                    m_EndState.gameObject.SetActive(seasonEnd);
System/Treasure/KingTreasureModel.cs
@@ -254,6 +254,32 @@
            }
        }
        public int GetSeasonState(int treasureId)
        {
            var season = 0;
            if (TryGetSeason(treasureId, out season))
            {
                if (season < CrossServerOneVsOnePKSeason.Instance.SeasonID
                    || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
                 && CrossServerOneVsOnePKSeason.Instance.SeasonState == 2))
                {
                    return 2;
                }
                if((season == CrossServerOneVsOnePKSeason.Instance.SeasonID
                 && CrossServerOneVsOnePKSeason.Instance.SeasonState == 1))
                {
                    return 1;
                }
                if (season > CrossServerOneVsOnePKSeason.Instance.SeasonID
                    || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
                 && CrossServerOneVsOnePKSeason.Instance.SeasonState == 0))
                {
                    return 0;
                }
            }
            return 0;
        }
        public struct Division
        {
            public int division;
System/Treasure/KingTreasureWin.cs
@@ -128,9 +128,7 @@
                {
                    DisplayGot();
                }
                else if (season < CrossServerOneVsOnePKSeason.Instance.SeasonID
                    || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
                    && CrossServerOneVsOnePKSeason.Instance.SeasonState == 2))
                else if (kingTreasureModel.GetSeasonState(model.selectedTreasure) == 2)
                {
                    DisplayEnd();
                }
@@ -231,16 +229,10 @@
        private bool AllowSelectTreasure(int id)
        {
            var list = kingTreasureModel.GetDisplayList();
            var season = 0;
            if (kingTreasureModel.TryGetSeason(id, out season))
            if (kingTreasureModel.GetSeasonState(id) == 0)
            {
                if (season > CrossServerOneVsOnePKSeason.Instance.SeasonID
                    || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
                    && CrossServerOneVsOnePKSeason.Instance.SeasonState == 0))
                {
                    SysNotifyMgr.Instance.ShowTip("TreasureOneVsOneSeasonNotStart");
                    return false;
                }
                SysNotifyMgr.Instance.ShowTip("TreasureOneVsOneSeasonNotStart");
                return false;
            }
            return list.Contains(id);
        }
System/Treasure/UI3DTreasureSelectStage.cs
@@ -709,16 +709,10 @@
                case TreasureCategory.King:
                    {
                        var model = ModelCenter.Instance.GetModel<KingTreasureModel>();
                        var season = 0;
                        if (model.TryGetSeason(_treasureId, out season))
                        if (model.GetSeasonState(_treasureId) == 0)
                        {
                            if (season > CrossServerOneVsOnePKSeason.Instance.SeasonID
                             || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
                             && CrossServerOneVsOnePKSeason.Instance.SeasonState == 0))
                            {
                                SysNotifyMgr.Instance.ShowTip("TreasureOneVsOneSeasonNotStart");
                                return;
                            }
                            SysNotifyMgr.Instance.ShowTip("TreasureOneVsOneSeasonNotStart");
                            return;
                        }
                    }
                    break;