少年修仙传客户端代码仓库
client_Wu Xijin
2019-01-22 81b967d2b009b6b30945a3c95501d75cf2062b3d
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
4个文件已修改
29 ■■■■ 已修改文件
System/CrossServerOneVsOne/RankingWin.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/FairyFeastTransmitShow.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Realm/RealmBossShow.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/UI3DShowHero.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/RankingWin.cs
@@ -106,7 +106,9 @@
        {
            SetZoneAndSeasonNum();
            OnCreateGridLineCell(m_ScrollerController);
            OnCreateGridLineCell_S(m_ScrollerController2);
            SetTextMyRank();
            ZoneAndSeasonpanel();
            m_ScrollerController.JumpIndex(0);
        }
@@ -322,8 +324,21 @@
            else
            {
                m_DivisionObj.gameObject.SetActive(false);
            }
            if (CrossServerOneVsOnePKSeason.Instance.SeasonID > 1)//赛季
            bool isBool = false;
            for (int i = 0; i < CrossServerOneVsOnePKSeason.Instance.ZoneCount; i++)
            {
                if (CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].ZoneID == crossServerRewardModel.ZoneID)
                {
                    var list = CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].SeasonList;
                    if (list.Count > 1)
                    {
                        isBool = true;
                    }
                }
            }
            if (isBool)//赛季
            {
                m_SeasonObj.gameObject.SetActive(true);
                if (m_ClickScreenOtherSpace2.activeSelf)
System/FairyAu/FairyFeastTransmitShow.cs
@@ -410,7 +410,9 @@
                        }
                    }
                    if (secondaryResId == 0 || (data.fashionClothesId != 0 && data.fashionSecondaryId > 0))
                    if (secondaryResId == 0
                    || (data.fashionClothesId != 0 && data.fashionSecondaryId > 0)
                    || (data.fashionClothesId == 0 && data.fashionSecondaryId > 0))
                    {
                        PutOnExtraSecondary(job, extraSecondaryId);
                    }
System/Realm/RealmBossShow.cs
@@ -272,7 +272,9 @@
                    }
                }
                if (secondaryResId == 0 || (fashionClothesId != 0 && fashionSecondaryId > 0))
                if (secondaryResId == 0
                || (fashionClothesId != 0 && fashionSecondaryId > 0)
                || (fashionClothesId == 0 && fashionSecondaryId > 0))
                {
                    PutOnExtraSecondary(job, extraSecondaryId);
                }
UI/Common/UI3DShowHero.cs
@@ -116,7 +116,9 @@
                    }
                }
                if (secondaryResId == 0 || (data.fashionClothesId != 0 && data.fashionSecondaryId > 0))
                if (secondaryResId == 0
                 || (data.fashionClothesId != 0 && data.fashionSecondaryId > 0)
                 || (data.fashionClothesId == 0 && data.fashionSecondaryId > 0))
                {
                    PutOnExtraSecondary(job, extraSecondaryId);
                }