修改代码

Storage/Assets/#A2_Scripts/Battle/Trigger/SecondLevelTrigger.cs

@@ -5,27 +5,34 @@ using UnityEngine;
 public class SecondLevelTrigger : MonoBehaviour
 {
     private bool m_bControl = true;
+    private List<Collider> m_lst = new List<Collider>();
     private void OnTriggerEnter(Collider other)
     {
-        if (other.gameObject.CompareTag("Target") && m_bControl)
+        if (other.gameObject.CompareTag("Target"))
         {
-            m_bControl = false;
             StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
             if(varView)
             {
-                varView.EnterTopBox(other.name);
+                if (!m_lst.Contains(other))
+                {
+                    varView.EnterTopBox(other.name);
+                    m_lst.Add(other);
+                }
             }
         }
     }
     private void OnTriggerExit(Collider other)
     {
-        if (other.gameObject.CompareTag("Target") && !m_bControl)
+        if (other.gameObject.CompareTag("Target"))
         {
-            m_bControl = true;
             StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
             if (varView)
             {
-                varView.ExitTopBox(other.name);
+                if (m_lst.Contains(other))
+                {
+                    varView.ExitTopBox(other.name);
+                    m_lst.Remove(other);
+                }
             }
         }
     }

Storage/Assets/#A2_Scripts/Battle/UI/BattleUI.cs

@@ -324,26 +324,26 @@ public class BattleUI : MonoBehaviour
     //take按钮
     public void OnClickTakeBtn()
     {
-        if (m_bResult)
-        {
-            BattleCtrl.instance.OnBattleWin();
-        }
-        else
-        {
-            BattleCtrl.instance.OnBattleFail();
-        }
+        //if (m_bResult)
+        //{
+        //    BattleCtrl.instance.OnBattleWin();
+        //}
+        //else
+        //{
+        //    BattleCtrl.instance.OnBattleFail();
+        //}
         StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
         if(varView)
         {
-            //if(varView.hitTopBoxNum > 0)
-            //{
-            //    BattleCtrl.instance.OnBattleFail();
-            //}
-            //else
-            //{
-            //    BattleCtrl.instance.OnBattleWin();
-            //}
-            varView.SetResultAnimator(m_bResult);
+            if (varView.hitTopBoxNum > 0)
+            {
+                BattleCtrl.instance.OnBattleFail();
+            }
+            else
+            {
+                BattleCtrl.instance.OnBattleWin();
+            }
+            varView.SetResultAnimator(varView.hitTopBoxNum <= 0);
         }
     }
     //设置take按钮状态

Storage/Assets/#A2_Scripts/Battle/View/StorageView.cs

@@ -156,7 +156,7 @@ public class StorageView : MonoBehaviour
             if (string.Equals(m_targetTrans[i].name, name))
             {
                 m_targetTrans[i].GetComponent<MeshRenderer>().sharedMaterial = m_redMat;
-                //m_hitTopBoxNum++;
+                m_hitTopBoxNum++;
                 break;
             }
         }
@@ -169,7 +169,7 @@ public class StorageView : MonoBehaviour
             if (string.Equals(m_targetTrans[i].name, name))
             {
                 m_targetTrans[i].GetComponent<MeshRenderer>().sharedMaterial = m_dicMat[m_targetTrans[i]]; ;
-                //m_hitTopBoxNum--;
+                m_hitTopBoxNum--;
                 break;
             }
         }
@@ -350,8 +350,8 @@ public class StorageView : MonoBehaviour
         m_collisonTargetTrans = null;
         m_bIsCollisonTarget = false;
         BattleCtrl.instance.battleUI.SetSymbolPos(0, 0);
-        CancelDelayMatChangeHandle();
-        Invoke("DelayMatChangeHandle", 0.5f);
+        //CancelDelayMatChangeHandle();
+        //Invoke("DelayMatChangeHandle", 0.5f);
         CancelRotateInvoke();
     }
     void CancelDelayMatChangeHandle()
@@ -457,7 +457,7 @@ public class StorageView : MonoBehaviour
                         m_triggerTopBox.gameObject.SetActive(true);
                         //m_curTargetPosY = m_curTargetTrans.transform.position.y;
                         Invoke("DelayInvokeRigidBody", 0.1f);
-                        CancelDelayMatChangeHandle();
+                        //CancelDelayMatChangeHandle();
                         if (m_dicMat.ContainsKey(m_curTargetTrans))
                         {
                             m_curTargetTrans.GetComponent<MeshRenderer>().sharedMaterial = m_dicMat[m_curTargetTrans];
@@ -494,7 +494,7 @@ public class StorageView : MonoBehaviour
         {
             GameServices.inputService.pad.onTouchUp -= OnTouchUp;
         }
-        CancelDelayMatChangeHandle();
+        //CancelDelayMatChangeHandle();
         CancelRotateInvoke();
     }
 }