少年修仙传客户端代码仓库
client_Zxw
2018-08-27 6380e0cf41712a7270bf602ea98e474be058c6ee
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
5个文件已修改
26 ■■■■■ 已修改文件
System/LoginAd/LoginAdModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/ImpactRankWin.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/EquipSuit/PlayerSuitModel.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/EquipSuitTips.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/EnhancedScroller/EnhancedScroller.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/LoginAd/LoginAdModel.cs
@@ -115,7 +115,7 @@
                            }
                            break;
                        case LoginAdCondition.ImpactRank:
                            if (TimeUtility.OpenDay >= impactRankModel.openServerActivityDays || !FuncOpen.Instance.IsFuncOpen(125))
                            if (!OpenServerActivityCenter.Instance.IsActivityOpen(0))
                            {
                                continue;
                            }
System/OpenServerActivity/ImpactRankWin.cs
@@ -245,9 +245,9 @@
            switch (model.GetRankType(model.presentSelectType))
            {
                case PlayerRankData.RankType.OpenServerRealm:
                    m_TargetImg.gameObject.SetActive(_hasData && _playerData.value > 0);
                    m_TotalTargetValue.gameObject.SetActive(!_hasData || _playerData.value == 0);
                    if(_hasData && _playerData.value > 0)
                    m_TargetImg.gameObject.SetActive(_hasData && _playerData.value >= 0);
                    m_TotalTargetValue.gameObject.SetActive(!_hasData);
                    if (_hasData && _playerData.value >= 0)
                    {
                        var _realmConfig = Config.Instance.Get<RealmConfig>(_playerData.value);
                        m_TargetImg.SetSprite(_realmConfig == null ? string.Empty : _realmConfig.Img);
System/Strengthening/EquipSuit/PlayerSuitModel.cs
@@ -137,11 +137,10 @@
        /// <summary>
        /// 获取排序后的装备位顺序
        /// </summary>
        List<int> orderlist = new List<int>();
        Dictionary<int, ItemModel> equipDict;
        public List<int> GetEquipOrderlist(SuitType type)
        {
            orderlist.Clear();
            List<int> orderlist = new List<int>();
            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptEquip);
            if (singlePack == null)
            {
@@ -772,8 +771,7 @@
                return;
            redSuitType = EquipSuitTips.E_SuitType;
            List<int> orderPlacelist = new List<int>();
            orderPlacelist.AddRange(orderlist);
            List<int> orderPlacelist = GetEquipOrderlist(redSuitType);
            orderPlacelist.Sort(CompareSuitLV);
            for (int i = 0; i < orderPlacelist.Count; i++)
@@ -809,9 +807,7 @@
                    break;
            }
            List<int> orderPlacelist = new List<int>();
            GetEquipOrderlist(redSuitType);
            orderPlacelist.AddRange(orderlist);
            List<int> orderPlacelist = GetEquipOrderlist(redSuitType);
            orderPlacelist.Sort(CompareSuitLV);
            for (int i = 0; i < orderPlacelist.Count; i++)
System/Strengthening/EquipSuitTips.cs
@@ -42,7 +42,7 @@
    #endregion
    #region 数据
    private List<int> equipPartlist = new List<int>();
    private List<int> equipPartlist;
    private EquipSuitAttrConfig _equipSuitProModel;
    private EquipSuitCompoundConfig _equipSuitMatModel;
    private List<Transform> _materialPoslist = new List<Transform>();
@@ -153,7 +153,7 @@
                E_SuitType = SuitType.HighSuit;
            }
        }
        equipPartlist.AddRange(SuitModel.GetEquipOrderlist(E_SuitType));
        equipPartlist = SuitModel.GetEquipOrderlist(E_SuitType);
        CreateEquipSuitCell();
        StartCoroutine(SetOffestPos());
    }
@@ -786,7 +786,7 @@
    {
        int curSelect = equipPartlist[presentIndex];
        E_SuitType = E_SuitType == SuitType.LowSuit ? SuitType.HighSuit : SuitType.LowSuit;
        equipPartlist.AddRange(SuitModel.GetEquipOrderlist(E_SuitType));
        equipPartlist = SuitModel.GetEquipOrderlist(E_SuitType);
        for (int i = 0; i < equipPartlist.Count; i++)
        {
            if (equipPartlist[i] == curSelect)
UI/EnhancedScroller/EnhancedScroller.cs
@@ -810,7 +810,7 @@
            if (NumberOfCells == 0) return 0;//如果scroll没有子物体直接返回
            if (cellViewIndex == 0 && insertPosition == CellViewPositionEnum.Before)
            if (cellViewIndex <= 0 && insertPosition == CellViewPositionEnum.Before)
            {
                return 0;//如果是第一个子物体且要得到它的上方位置,直接返回0
            }