From 97ce02671bbda0ab8a8d342ee67e2b11c0505137 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 五月 2019 14:08:47 +0800
Subject: [PATCH] 6840 优化假掉落表现。

---
 System/KnapSack/BetterItemGetBehaviour.cs |   42 ++++++++++++++++++---
 System/ItemDrop/DropItem.cs               |    9 ++++
 Fight/ClientDropItemUtility.cs            |   48 ++++++++++++++++++++++++
 System/KnapSack/NewItemGetWin.cs          |    2 
 4 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/Fight/ClientDropItemUtility.cs b/Fight/ClientDropItemUtility.cs
index df5c201..d08a978 100644
--- a/Fight/ClientDropItemUtility.cs
+++ b/Fight/ClientDropItemUtility.cs
@@ -67,6 +67,8 @@
                 Release(_item);
             }
         }
+
+        CheckAndRemoveOutdatedFakeDropInfo();
     }
 
     public void ReleaseAll()
@@ -132,6 +134,8 @@
         {
             _time = 3f;
         }
+
+        RecordFakeDrop(itemID, Time.time);
         DropItem.DropFake(itemID, m_DropPos, CameraController.Instance.CameraObject, _time);
     }
 
@@ -214,4 +218,48 @@
             DropNext(itemIds);
         }
     }
+
+    List<FakeDropInfo> fakeDropInfos = new List<FakeDropInfo>();
+
+    void RecordFakeDrop(int itemId, float time)
+    {
+        fakeDropInfos.Add(new FakeDropInfo() { itemId = itemId, dropTime = time });
+    }
+
+    public float GetFakeDropItemShowDelay(float itemId)
+    {
+        if (fakeDropInfos.IsNullOrEmpty())
+        {
+            return 0f;
+        }
+
+        var info = fakeDropInfos.Find(x => { return x.itemId == itemId; });
+        if (info.itemId != 0 && info.dropTime + 2.5f > Time.time)
+        {
+            return info.dropTime + 2.5f - Time.time;
+        }
+        else
+        {
+            return 0f;
+        }
+    }
+
+    void CheckAndRemoveOutdatedFakeDropInfo()
+    {
+        for (var i = fakeDropInfos.Count - 1; i >= 0; i--)
+        {
+            var info = fakeDropInfos[i];
+            if (Time.time - info.dropTime > 5f)
+            {
+                fakeDropInfos.RemoveAt(i);
+            }
+        }
+    }
+
+    public struct FakeDropInfo
+    {
+        public int itemId;
+        public float dropTime;
+    }
+
 }
diff --git a/System/ItemDrop/DropItem.cs b/System/ItemDrop/DropItem.cs
index 49ec9ba..3fd8784 100644
--- a/System/ItemDrop/DropItem.cs
+++ b/System/ItemDrop/DropItem.cs
@@ -1,13 +1,13 @@
 锘縰sing System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-
 using UnityEngine.UI;
 using Snxxz.UI;
 using System;
 
 public class DropItem : HUDBehaviour
 {
+ 
     public static event Action<Vector3> onDropItemDisappear;
 
     public static DropItem Drop(int _id, Vector3 _position, Camera _camera)
@@ -277,4 +277,11 @@
             }
         }
     }
+
+    public struct FakeDropInfo
+    {
+        public int itemId;
+        public float dropTime;
+    }
+
 }
diff --git a/System/KnapSack/BetterItemGetBehaviour.cs b/System/KnapSack/BetterItemGetBehaviour.cs
index 97e0fcf..9eb9081 100644
--- a/System/KnapSack/BetterItemGetBehaviour.cs
+++ b/System/KnapSack/BetterItemGetBehaviour.cs
@@ -26,6 +26,7 @@
         [SerializeField] Button m_Puton;
         [SerializeField] Button m_BetterEquipDetail;
 
+        Clock clock;
         PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
         BetterEquipGetModel model { get { return ModelCenter.Instance.GetModel<BetterEquipGetModel>(); } }
         EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
@@ -40,6 +41,11 @@
 
         private void OnDisable()
         {
+            if (clock != null)
+            {
+                Clock.Stop(clock);
+                clock = null;
+            }
             m_Close.RemoveAllListeners();
             m_Puton.RemoveAllListeners();
             m_BetterEquipDetail.RemoveAllListeners();
@@ -77,10 +83,33 @@
                     DrawBetterEquip(betterEquip);
                     m_ContainerBetterEquip.gameObject.SetActive(true);
 
-                    var coolData = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.currentEquipGuid);
-                    if (model.CheckIsAutoEquip(betterEquip) && coolData == null)
+                    var delayTime = ClientDropItemUtility.Instance.GetFakeDropItemShowDelay(betterEquip.itemId);
+                    if (delayTime > 0f)
                     {
-                        KnapsackTimeCDMgr.Instance.Register(betterEquip.guid, betterEquip.itemId, model.autoEquipCoolTime);
+                        if (clock != null)
+                        {
+                            Clock.Stop(clock);
+                            clock = null;
+                        }
+
+                        m_ContainerBetterEquip.localScale = Vector3.zero;
+                        clock = Clock.AlarmAfter(delayTime, () =>
+                        {
+                            m_ContainerBetterEquip.localScale = Vector3.one;
+                            var coolData = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.currentEquipGuid);
+                            if (model.CheckIsAutoEquip(betterEquip) && coolData == null)
+                            {
+                                KnapsackTimeCDMgr.Instance.Register(betterEquip.guid, betterEquip.itemId, model.autoEquipCoolTime);
+                            }
+                        });
+                    }
+                    else
+                    {
+                        var coolData = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.currentEquipGuid);
+                        if (model.CheckIsAutoEquip(betterEquip) && coolData == null)
+                        {
+                            KnapsackTimeCDMgr.Instance.Register(betterEquip.guid, betterEquip.itemId, model.autoEquipCoolTime);
+                        }
                     }
                 }
             }
@@ -110,7 +139,7 @@
                 WindowCenter.Instance.Close<MainInterfaceWin>();
                 equipModel.SelectSet(betterEquip.config.LV);
                 WindowCenter.Instance.Open<RealmEquipWin>();
-                StartCoroutine(Co_Delay(model.currentEquipGuid));
+                StartCoroutine(Co_OpenRealmEquipDelay(model.currentEquipGuid));
             }
             else
             {
@@ -121,7 +150,7 @@
                     WindowCenter.Instance.Close<MainInterfaceWin>();
                     equipModel.SelectSet(betterEquip.config.LV);
                     WindowCenter.Instance.Open<RealmEquipWin>();
-                    StartCoroutine(Co_Delay(model.currentEquipGuid));
+                    StartCoroutine(Co_OpenRealmEquipDelay(model.currentEquipGuid));
                 }
                 else
                 {
@@ -157,7 +186,7 @@
             UpdateCoolTime(betterModel.guid);
         }
 
-        IEnumerator Co_Delay(string _guid)
+        IEnumerator Co_OpenRealmEquipDelay(string _guid)
         {
             yield return null;
             yield return null;
@@ -166,6 +195,7 @@
             ItemTipUtility.Show(_guid);
             model.ReportConfirmBetterEquip(model.currentEquipGuid);
         }
+
     }
 }
 
diff --git a/System/KnapSack/NewItemGetWin.cs b/System/KnapSack/NewItemGetWin.cs
index 9838533..3c73a82 100644
--- a/System/KnapSack/NewItemGetWin.cs
+++ b/System/KnapSack/NewItemGetWin.cs
@@ -83,7 +83,7 @@
                 }
                 while (model == null && newItemQueue.Count > 0);
 
-                if (model != null)
+                if (model != null && ClientDropItemUtility.Instance.GetFakeDropItemShowDelay(model.itemId) == 0f)
                 {
                     int itemId = model.itemId;
                     var itemBehaviour = RequireBehaviour();

--
Gitblit v1.8.0