From 4bd6a2160dfe31b653cb39c8f2ffa02470c1dc91 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 27 三月 2019 17:24:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Treasure/UI3DTreasureSelectStage.cs |    4 ++--
 System/Treasure/HumanTreasureWin.cs        |   31 +++++++++++++++++++------------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/System/Treasure/HumanTreasureWin.cs b/System/Treasure/HumanTreasureWin.cs
index 88301c4..2549932 100644
--- a/System/Treasure/HumanTreasureWin.cs
+++ b/System/Treasure/HumanTreasureWin.cs
@@ -16,18 +16,20 @@
     [XLua.Hotfix]
     public class HumanTreasureWin : Window
     {
-        [SerializeField] PositionTween m_PositionTween;
+        [SerializeField] Transform m_Container;
         [SerializeField] Image m_TreasureName;
+        [SerializeField] Text m_Remind;
+        [SerializeField] Text m_TaskTitle;
         [SerializeField] Text m_TreasureStory;
         [SerializeField] Image m_SkillIcon;
         [SerializeField] Text m_SkillName;
-        [SerializeField] Text m_SkillType;
+        [SerializeField] Text m_SkillCoolDown;
         [SerializeField] Text m_SkillDescription;
         [SerializeField] Transform m_ContainerCollect;
         [SerializeField] Button m_Challenge;
         [SerializeField] Button m_Goto;
         [SerializeField] Slider m_TaskSlider;
-        [SerializeField] Text m_TaskCount;
+        [SerializeField] Text m_TaskProgress;
         [SerializeField] Transform m_ContainerCollected;
         [SerializeField] Transform m_ContainerUnknown;
 
@@ -89,6 +91,14 @@
             var config = TreasureConfig.Get(model.selectedTreasure);
             m_TreasureName.SetSprite(config.TreasureNameIcon);
             m_TreasureStory.text = config.Story;
+            m_Remind.text = string.Format("閫氬叧鏈緛閫斿彲婵�娲粄0}", config.Name);
+
+            List<int> tasks = null;
+            if (model.TryGetTreasureTasks(model.selectedTreasure, out tasks))
+            {
+                var taskConfig = TaskListConfig.Get(tasks[0]);
+                m_TaskTitle.text = taskConfig.ChapterName;
+            }
 
             Treasure treasure;
             if (model.TryGetTreasure(model.selectedTreasure, out treasure))
@@ -98,7 +108,8 @@
                 m_SkillIcon.SetSprite(skillConfig.IconName);
                 m_SkillName.text = skillConfig.SkillName;
                 m_SkillDescription.text = skillConfig.Description;
-                m_SkillType.text = skillConfig.HurtType == 1 ? "PVP" : "PVE";// skillConfig.HurtType == 2 ? "PVE" : string.Empty;
+                m_SkillCoolDown.text = skillConfig.CoolDownTime == 0 ? string.Empty :
+                    Language.Get("L1065", skillConfig.CoolDownTime / 1000);
             }
         }
 
@@ -107,7 +118,7 @@
             Treasure treasure;
             if (model.TryGetTreasure(model.selectedTreasure, out treasure))
             {
-                m_ContainerCollect.gameObject.SetActive(treasure.state != TreasureState.Collected);
+                m_ContainerCollect.gameObject.SetActive(treasure.state == TreasureState.Collecting);
                 m_ContainerCollected.gameObject.SetActive(treasure.state == TreasureState.Collected);
                 m_ContainerUnknown.gameObject.SetActive(treasure.state == TreasureState.Locked);
 
@@ -118,7 +129,6 @@
                     m_Goto.gameObject.SetActive(!satisfyChallenge);
                     m_Challenge.gameObject.SetActive(satisfyChallenge);
 
-                    m_TaskCount.gameObject.SetActive(false);
                     var progress = 1f;
 
                     List<int> tasks = null;
@@ -126,8 +136,7 @@
                     {
                         var count = model.GetCompleteTaskCount(model.selectedTreasure);
                         progress = Mathf.Clamp01((float)count / tasks.Count);
-                        m_TaskCount.gameObject.SetActive(true);
-                        m_TaskCount.text = StringUtility.Contact(count, "/", tasks.Count);
+                        m_TaskProgress.text = StringUtility.Contact((int)(progress * 100), "%");
                     }
 
                     m_TaskSlider.value = progress;
@@ -137,17 +146,15 @@
 
         void DisplayAnimation()
         {
+            m_Container.gameObject.SetActive(false);
             animationStep = true;
-            m_ContainerCollect.gameObject.SetActive(false);
-            m_ContainerCollected.gameObject.SetActive(false);
-            m_PositionTween.Play();
             UI3DTreasureSelectStage.Instance.Tween(OnTreasureTweenComplete);
         }
 
         private void OnTreasureTweenComplete()
         {
             animationStep = false;
-            DisplayProgress();
+            m_Container.gameObject.SetActive(true);
         }
 
         private void TreasureSelectedEvent(int obj)
diff --git a/System/Treasure/UI3DTreasureSelectStage.cs b/System/Treasure/UI3DTreasureSelectStage.cs
index 667b5f3..90cd8d4 100644
--- a/System/Treasure/UI3DTreasureSelectStage.cs
+++ b/System/Treasure/UI3DTreasureSelectStage.cs
@@ -1038,7 +1038,7 @@
             var _timer = 0f;
             while (_timer < _duration && IsOpen && IsCloser)
             {
-                var offset = currentCategory == TreasureCategory.Human ? 0.3f : -0.62f;
+                var offset = currentCategory == TreasureCategory.Human ? -0.4f : -0.62f;
                 var _target = offset * _timer / _duration;
                 renderCamera.rect = new Rect(_target, 0, 1, 1);
                 yield return null;
@@ -1060,7 +1060,7 @@
 
         public void SetEndState()
         {
-            var offset = currentCategory == TreasureCategory.Human ? 0.3f : -0.62f;
+            var offset = currentCategory == TreasureCategory.Human ? -0.4f : -0.62f;
             renderCamera.rect = new Rect(offset, 0, 1, 1);
             var config = ScriptableObjectLoader.LoadSoTreasure3DConfig(selectTreasure);
             renderCamera.transform.localPosition = config.renderCameraParam.position;

--
Gitblit v1.8.0