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

client_Hale

2019-04-25 ebb2c55c8da014b375d89cdf74f638a19bb6856d

 System/Team/TeamPrepareBehaviour.cs

@@ -59,9 +59,8 @@
                }

                m_Icon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(teammate.job, teammate.jobLevel));
                var isPickLevel = teammate.level > GeneralDefine.greatMasterStartLV;
                m_LevelSign.gameObject.SetActive(isPickLevel);
                m_Level.text = isPickLevel ? (teammate.level - GeneralDefine.greatMasterStartLV).ToString() : teammate.level.ToString();
                m_LevelSign.gameObject.SetActive(false);
                m_Level.text = teammate.level.ToString();
                m_PlayerName.text = teammate.mateName;
            }
            else