From fbc4b84abfa40d912f67cc17bca244967d1881bb Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 25 四月 2019 14:39:10 +0800
Subject: [PATCH] 3335 法宝章节界面
---
System/Treasure/TreasureCollectBriefInfoBehaviour.cs | 13 ++++++++++++-
Core/GameEngine/Model/Config/TreasureChapterConfig.cs | 9 ++++++---
Core/GameEngine/Model/Config/TreasureChapterConfig.cs.meta | 2 +-
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Core/GameEngine/Model/Config/TreasureChapterConfig.cs b/Core/GameEngine/Model/Config/TreasureChapterConfig.cs
index 2b50055..e7fb8c2 100644
--- a/Core/GameEngine/Model/Config/TreasureChapterConfig.cs
+++ b/Core/GameEngine/Model/Config/TreasureChapterConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: Fish
-// [ Date ]: Wednesday, April 24, 2019
+// [ Date ]: Thursday, April 25, 2019
//--------------------------------------------------------
using System.Collections.Generic;
@@ -18,7 +18,8 @@
public readonly string taskTitle;
public readonly int chapterIndex;
public readonly string description;
- public readonly string condition;
+ public readonly string condition;
+ public readonly string unknown;
public TreasureChapterConfig()
{
@@ -40,7 +41,9 @@
description = tables[4];
- condition = tables[5];
+ condition = tables[5];
+
+ unknown = tables[6];
}
catch (Exception ex)
{
diff --git a/Core/GameEngine/Model/Config/TreasureChapterConfig.cs.meta b/Core/GameEngine/Model/Config/TreasureChapterConfig.cs.meta
index d5c434d..9077ad6 100644
--- a/Core/GameEngine/Model/Config/TreasureChapterConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/TreasureChapterConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: ba38325a271f27842bd40cb84858a5e3
-timeCreated: 1556094710
+timeCreated: 1556174251
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/System/Treasure/TreasureCollectBriefInfoBehaviour.cs b/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
index 821b332..fea1ffb 100644
--- a/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
+++ b/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
@@ -18,6 +18,7 @@
[SerializeField] Transform m_ContainerDisplay;
[SerializeField] Transform m_ContainerUnknown;
+ [SerializeField] Text m_UnknownDescription;
[SerializeField] Transform m_ContainerCollect;
[SerializeField] Image m_Icon;
@@ -120,6 +121,15 @@
DisplayTreasureInfo();
DisplayProgress();
}
+ else
+ {
+ var id = GetLostTreasure();
+ var chapterConfig = TreasureChapterConfig.Get(id);
+ if (chapterConfig != null)
+ {
+ m_UnknownDescription.text = chapterConfig.unknown;
+ }
+ }
}
void DisplayTreasureInfo()
@@ -193,7 +203,8 @@
List<int> tasks;
if (model.TryGetTreasureTasks(id, out tasks))
{
- if (latestTask < tasks[0])
+ var lastTask = tasks[tasks.Count - 1];
+ if (latestTask <= lastTask)
{
return id;
}
--
Gitblit v1.8.0