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/Tip/PlayerDetailWin.cs | 44 +++++++++++++-------------------------------
1 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/System/Tip/PlayerDetailWin.cs b/System/Tip/PlayerDetailWin.cs
index f08bb94..f9639cd 100644
--- a/System/Tip/PlayerDetailWin.cs
+++ b/System/Tip/PlayerDetailWin.cs
@@ -23,41 +23,31 @@
private List<PlayerDetails.DetailType> funcTypes = new List<PlayerDetails.DetailType>();
- FriendsModel m_FriendModel
- {
- get
- {
+ FriendsModel m_FriendModel {
+ get {
return ModelCenter.Instance.GetModel<FriendsModel>();
}
}
- FairyModel m_FairyModel
- {
- get
- {
+ FairyModel m_FairyModel {
+ get {
return ModelCenter.Instance.GetModel<FairyModel>();
}
}
- RoleParticularModel m_RoleParticularModel
- {
- get
- {
+ RoleParticularModel m_RoleParticularModel {
+ get {
return ModelCenter.Instance.GetModel<RoleParticularModel>();
}
}
- TeamModel m_TeamModel
- {
- get
- {
+ TeamModel m_TeamModel {
+ get {
return ModelCenter.Instance.GetModel<TeamModel>();
}
}
private float ratio = 1.0f;
- public bool IsCrossServerPlayer
- {
- get
- {
+ public bool IsCrossServerPlayer {
+ get {
if (PlayerDetails.ServerGroupId == 0)
{
return false;
@@ -106,17 +96,9 @@
public void ShowPlayerDetail()
{
m_ContainerDetail.localPosition = PlayerDetails.targetPos;
- m_PlayerTxt.text = UIHelper.ServerStringTrim(PlayerDetails.PlayerName);
- if (PlayerDetails.LV > GeneralDefine.greatMasterStartLV)
- {
- m_LevelSign.gameObject.SetActive(true);
- m_PlayerLevelTxt.text = (PlayerDetails.LV - GeneralDefine.greatMasterStartLV).ToString();
- }
- else
- {
- m_LevelSign.gameObject.SetActive(false);
- m_PlayerLevelTxt.text = Language.Get("PlayerDetail_Level", PlayerDetails.LV);
- }
+ m_PlayerTxt.text = UIHelper.ServerStringTrim(PlayerDetails.PlayerName);
+ m_LevelSign.gameObject.SetActive(false);
+ m_PlayerLevelTxt.text = Language.Get("PlayerDetail_Level", PlayerDetails.LV);
CheckDetailType();
OnPlayerDetailRefresh();
--
Gitblit v1.8.0