From ebb2c55c8da014b375d89cdf74f638a19bb6856d Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 25 四月 2019 10:27:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Team/TeamBriefInfoBehaviour.cs | 42 +++++++++++++-----------------------------
1 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/System/Team/TeamBriefInfoBehaviour.cs b/System/Team/TeamBriefInfoBehaviour.cs
index 076f332..f58dee2 100644
--- a/System/Team/TeamBriefInfoBehaviour.cs
+++ b/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()
--
Gitblit v1.8.0