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

client_Hale

2019-04-25 ebb2c55c8da014b375d89cdf74f638a19bb6856d

 System/Team/TeamBriefInfoBehaviour.cs

@@ -12,31 +12,17 @@

    public class TeamBriefInfoBehaviour : ScrollItem
    {
        [SerializeField]
        Image m_Realm;
        [SerializeField]
        Text m_PlayerName;

        [SerializeField]
        Text m_MemberCount;

        [SerializeField]
        Image m_LevelMinSign;
        [SerializeField]
        Text m_LevelMin;

        [SerializeField]
        Image m_LevelMaxSign;
        [SerializeField]
        Text m_LevelMax;

        [SerializeField]
        Button m_ApplyFor;
        [SerializeField] Image m_Realm;
        [SerializeField] Text m_PlayerName;
        [SerializeField] Text m_MemberCount;
        [SerializeField] Image m_LevelMinSign;
        [SerializeField] Text m_LevelMin;
        [SerializeField] Image m_LevelMaxSign;
        [SerializeField] Text m_LevelMax;
        [SerializeField] Button m_ApplyFor;

        TheirTeam teamInfo;

        TeamModel m_Model;
        TeamModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TeamModel>()); } }
        TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }

        public override void Display(object _data)
        {
@@ -58,12 +44,10 @@

            m_ApplyFor.gameObject.SetActive(!(model.myTeam.inTeam && model.myTeam.GetIndexOfMember(teamInfo.captainer) != -1));

            var isMinPickLevel = teamInfo.levelMin >= GeneralDefine.greatMasterStartLV;
            m_LevelMinSign.gameObject.SetActive(isMinPickLevel);
            m_LevelMin.text = (isMinPickLevel ? (teamInfo.levelMin - GeneralDefine.greatMasterStartLV) : teamInfo.levelMin).ToString();
            var isMaxPickLevel = teamInfo.levelMax >= GeneralDefine.greatMasterStartLV;
            m_LevelMaxSign.gameObject.SetActive(isMaxPickLevel);
            m_LevelMax.text = (isMaxPickLevel ? (teamInfo.levelMax - GeneralDefine.greatMasterStartLV) : teamInfo.levelMax).ToString();
            m_LevelMinSign.gameObject.SetActive(false);
            m_LevelMin.text = teamInfo.levelMin.ToString();
            m_LevelMaxSign.gameObject.SetActive(false);
            m_LevelMax.text = teamInfo.levelMax.ToString();
        }

        public override void Dispose()