From f237dce65b7eb454dfc9e2fe6c8efdebca085b4e Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 11 九月 2018 14:13:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Team/TeamInvitationBehaviour.cs | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/System/Team/TeamInvitationBehaviour.cs b/System/Team/TeamInvitationBehaviour.cs
index 1c35ac0..43e98a3 100644
--- a/System/Team/TeamInvitationBehaviour.cs
+++ b/System/Team/TeamInvitationBehaviour.cs
@@ -8,26 +8,18 @@
{
public class TeamInvitationBehaviour : ScrollItem
{
- [SerializeField]
- Image m_Realm;
- [SerializeField]
- Text m_PlayerName;
- [SerializeField]
- Text m_Job;
- [SerializeField]
- Image m_LevelSign;
- [SerializeField]
- Text m_Level;
+ [SerializeField] Image m_Realm;
+ [SerializeField] Text m_PlayerName;
+ [SerializeField] Text m_Job;
+ [SerializeField] Text m_Mission;
+ [SerializeField] Image m_LevelSign;
+ [SerializeField] Text m_Level;
+ [SerializeField] Button m_Select;
+ [SerializeField] Image m_Selected;
- [SerializeField]
- Button m_Select;
-
- [SerializeField]
- Image m_Selected;
-
- TeamModel m_Model;
- TeamModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TeamModel>()); } }
+ TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
+ DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
TeamInvitation invitation;
public override void Display(object _data)
@@ -51,6 +43,19 @@
m_LevelSign.gameObject.SetActive(isNirvanaLevel);
m_Level.text = isNirvanaLevel ? (invitation.level - GeneralConfig.Instance.greatMasterStartLV).ToString() : invitation.level.ToString();
+ var mission = invitation.mission;
+ var targetConfig = Config.Instance.Get<TeamTargetConfig>(mission.mapId);
+ if (targetConfig != null)
+ {
+ var dungeonId = dungeonModel.GetDungeonId(mission.mapId, mission.mapEx);
+ var config = Config.Instance.Get<DungeonConfig>(dungeonId);
+ m_Mission.text = config.FBName;
+ }
+ else
+ {
+ m_Mission.text = Language.Get("RightHereMap");
+ }
+
m_Selected.gameObject.SetActive(invitation.playerId == model.currentSelectedInvitation);
m_Select.RemoveAllListeners();
--
Gitblit v1.8.0