From 274c4a7e5cc4a95d435b784bd4abb26167a6ad8f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 03 九月 2018 14:50:41 +0800
Subject: [PATCH] 3197 【前端】法宝快捷入口显示修改
---
System/Treasure/TreasureCollectBriefInfoBehaviour.cs | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/System/Treasure/TreasureCollectBriefInfoBehaviour.cs b/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
index f725b6a..a17e2d5 100644
--- a/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
+++ b/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
@@ -8,6 +8,7 @@
using TableConfig;
using System;
using System.Collections.Generic;
+using LitJson;
namespace Snxxz.UI
{
@@ -28,9 +29,11 @@
bool dirty = false;
int m_DisplayTreasureId = 0;
- int displayTreasureId {
+ int displayTreasureId
+ {
get { return m_DisplayTreasureId; }
- set {
+ set
+ {
if (m_DisplayTreasureId != value)
{
m_DisplayTreasureId = value;
@@ -40,9 +43,11 @@
}
DisplayState m_DisplayState = DisplayState.None;
- DisplayState displayState {
+ DisplayState displayState
+ {
get { return m_DisplayState; }
- set {
+ set
+ {
if (m_DisplayState != value)
{
m_DisplayState = value;
@@ -52,9 +57,11 @@
}
int m_EffectState = 0;
- int effectState {
+ int effectState
+ {
get { return m_EffectState; }
- set {
+ set
+ {
if (m_EffectState != value)
{
m_EffectState = value;
@@ -293,13 +300,7 @@
m_Description.text = Language.Get("FabaoState_Text_3");
break;
case DisplayState.AwakenUnderway:
- var progress = 1f;
- if (treasure != null && config.PreferredStage != 0)
- {
- progress = (float)treasure.stage / config.PreferredStage;
- }
-
- m_Description.text = Language.Get("FabaoState_Text_4", Mathf.RoundToInt(progress * 100f));
+ DisplayTreasureUpStage(treasure.GetStageId(treasure.stage + 1));
break;
case DisplayState.WaitUnLock:
Achievement achievement = null;
@@ -534,6 +535,25 @@
}
}
+ private void DisplayTreasureUpStage(int _stage)
+ {
+ var config = Config.Instance.Get<TreasureUpConfig>(_stage);
+ if (config != null)
+ {
+ var json = JsonMapper.ToObject(config.DescriptionMainWin);
+ var job = PlayerDatas.Instance.baseData.Job;
+
+ if (json.Keys.Contains(job.ToString()))
+ {
+ m_Description.text = json[job.ToString()].ToString();
+ }
+ else
+ {
+ m_Description.text = json["0"].ToString();
+ }
+ }
+ }
+
enum DisplayState
{
None,
--
Gitblit v1.8.0