Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2019-01-22 581c0715593a799725e3b59705a870b2e025b57c

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/JadeDynastyBoss/JadeDynastyBossKillRecord.cs

@@ -14,7 +14,7 @@


        public void Display(DateTime time, string playerName)

        {

            m_KillTime.text = time.ToString("hh:mm:ss");

            m_KillTime.text = time.ToString("HH:mm:ss");

            m_PlayerName.text = UIHelper.ServerStringTrim(playerName);

        }

    }


 System/JadeDynastyBoss/JadeDynastyBossWin.cs

@@ -224,6 +224,10 @@
            if (!alive)

            {

                var killRecords = findPreciousModel.GetBossKillRecords(model.selectBossId);

                if (killRecords != null)

                {

                    killRecords.Sort(KillRecordSort);

                }

                m_ContainerExistRecord.gameObject.SetActive(killRecords != null && killRecords.Count > 0);

                m_ContainerNoneRecord.gameObject.SetActive(killRecords == null || killRecords.Count == 0);

                if (killRecords != null && killRecords.Count > 0)

@@ -377,6 +381,11 @@
                model.DisplayErrorTip(error);

            }

        }



        private int KillRecordSort(FindPreciousModel.BossKillRecord lhs, FindPreciousModel.BossKillRecord rhs)

        {

            return -lhs.killTime.CompareTo(rhs.killTime);

        }

    }



}


 System/Tip/PlayerDetailWin.cs

@@ -171,10 +171,6 @@
                    }

                    break;

                case PlayerDetails.OpenType.Fairy:

                    if (IsCrossServerPlayer)

                    {

                        return;

                    }

                    break;

            }