From aaf331c472dde9e818b02bc2fac652eded7adc41 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 23 十一月 2018 21:06:39 +0800
Subject: [PATCH] 4709 【1.3】【前端】魔族法宝副本修改
---
System/Treasure/DemonDungeonLabel.cs | 19 +++++++++++++++++++
System/Treasure/DemonDungeonLabel.cs.meta | 12 ++++++++++++
System/Treasure/TreasureComponent.cs | 20 +++++++++++---------
3 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/System/Treasure/DemonDungeonLabel.cs b/System/Treasure/DemonDungeonLabel.cs
new file mode 100644
index 0000000..55c3d4d
--- /dev/null
+++ b/System/Treasure/DemonDungeonLabel.cs
@@ -0,0 +1,19 @@
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+namespace Snxxz.UI
+{
+ public class DemonDungeonLabel : MonoBehaviour
+ {
+ [SerializeField] TextMesh m_Label1;
+ [SerializeField] TextMesh m_Label2;
+
+ public void Display(string label1, string label2)
+ {
+ m_Label1.text = label1;
+ m_Label2.gameObject.SetActive(!string.IsNullOrEmpty(label2));
+ m_Label2.text = label2;
+ }
+ }
+}
+
diff --git a/System/Treasure/DemonDungeonLabel.cs.meta b/System/Treasure/DemonDungeonLabel.cs.meta
new file mode 100644
index 0000000..564ff50
--- /dev/null
+++ b/System/Treasure/DemonDungeonLabel.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: d116d645948ed0e49942bf7a4a182d8c
+timeCreated: 1542977841
+licenseType: Pro
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/System/Treasure/TreasureComponent.cs b/System/Treasure/TreasureComponent.cs
index d9de4e5..0eec49b 100644
--- a/System/Treasure/TreasureComponent.cs
+++ b/System/Treasure/TreasureComponent.cs
@@ -31,7 +31,7 @@
private Transform bottom;
private Transform name;
private TextMesh condition;
- private TextMesh treasureLabel;
+ private DemonDungeonLabel treasureLabel;
#region 绾㈢偣
private Transform potentialRed;
@@ -705,7 +705,8 @@
return;
}
- string displayStr = string.Empty;
+ string label1 = string.Empty;
+ string label2 = string.Empty;
switch (category)
{
case TreasureCategory.Demon:
@@ -715,14 +716,15 @@
switch (_treasure.state)
{
case TreasureState.Collected:
- displayStr = Language.Get("DemonTreasureHighest");
+ label1 = ":";
break;
case TreasureState.Collecting:
TreasureDungeon treasureDungeon;
if (model.TryGetTreasureDungeon(treasureId, out treasureDungeon))
{
- displayStr = UIHelper.ReplaceNewLine(Language.Get("DemonTreasureChallenge",
- treasureDungeon.currentLevel, treasureDungeon.maxLevel));
+ label1 = "+";
+ label2 = StringUtility.Contact("(", treasureDungeon.currentLevel,
+ "/", treasureDungeon.maxLevel, ")");
}
break;
case TreasureState.Locked:
@@ -732,7 +734,7 @@
break;
}
- if (string.IsNullOrEmpty(displayStr))
+ if (string.IsNullOrEmpty(label1))
{
return;
}
@@ -744,14 +746,14 @@
pool = GameObjectPoolManager.Instance.RequestPool(_prefab);
m_LabelPoolDict.Add(category, pool);
}
- treasureLabel = pool.Request().GetComponent<TextMesh>();
+ treasureLabel = pool.Request().GetComponent<DemonDungeonLabel>();
treasureLabel.gameObject.SetActive(true);
treasureLabel.transform.SetParent(root);
treasureLabel.transform.localPosition = Vector3.zero;
treasureLabel.transform.LookAt(UI3DTreasureSelectStage.Instance.center);
- treasureLabel.transform.localPosition = new Vector3(0, -1.48f, 0f);
+ treasureLabel.transform.localPosition = new Vector3(0, -1.73f, 0f);
treasureLabel.transform.localScale = new Vector3(-1, 1, 1);
- treasureLabel.text = displayStr;
+ treasureLabel.Display(label1, label2);
LayerUtility.SetLayer(treasureLabel.gameObject, LayerUtility.UILayer, true);
}
--
Gitblit v1.8.0