From 7cc84329c52b6e39cd979eb33a126e059b9bf36c Mon Sep 17 00:00:00 2001
From: leonard Wu <364452445@qq.com>
Date: 星期五, 03 八月 2018 21:07:11 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Team/TeammateBriefInfoBehaviour.cs | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/System/Team/TeammateBriefInfoBehaviour.cs b/System/Team/TeammateBriefInfoBehaviour.cs
index a1ed100..a5f1c4c 100644
--- a/System/Team/TeammateBriefInfoBehaviour.cs
+++ b/System/Team/TeammateBriefInfoBehaviour.cs
@@ -16,8 +16,7 @@
[SerializeField] TextEx m_Level;
[SerializeField] Transform m_Matching;
- TeamModel m_Model;
- TeamModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TeamModel>()); } }
+ TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
Teammate teammate = null;
public void Display(Teammate _mate)
--
Gitblit v1.8.0