修改代码

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

@@ -324,24 +324,26 @@ public class BattleUI : MonoBehaviour
     //take按钮
     public void OnClickTakeBtn()
     {
-        //if(m_bResult)
-        //{
-        //}
-        //else
-        //{
-        //}
-        StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
-        if(varView)
-        {
-            if(varView.hitTopBoxNum > 0)
+        if (m_bResult)
         {
-                BattleCtrl.instance.OnBattleFail();
+            BattleCtrl.instance.OnBattleWin();
         }
         else
         {
-                BattleCtrl.instance.OnBattleWin();
+            BattleCtrl.instance.OnBattleFail();
         }
-            varView.SetResultAnimator(varView.hitTopBoxNum <= 0);
+        StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
+        if(varView)
+        {
+            //if(varView.hitTopBoxNum > 0)
+            //{
+            //    BattleCtrl.instance.OnBattleFail();
+            //}
+            //else
+            //{
+            //    BattleCtrl.instance.OnBattleWin();
+            //}
+            varView.SetResultAnimator(m_bResult);
         }
     }
     //设置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()
@@ -364,6 +364,16 @@ public class StorageView : MonoBehaviour
     //延时判断是否需要变化材质球
     void DelayMatChangeHandle()
     {
+        bool varBool_ = true;
+        for (int i = 0; i < m_targetTrans.Length; i++)
+        {
+            if(m_targetTrans[i].GetComponent<MeshRenderer>().sharedMaterial == m_redMat)
+            {
+                varBool_ = false;
+                break;
+            }
+        }
+        BattleCtrl.instance.battleUI.SetResultState(varBool_);
         //bool varBool_ = true;
         //for (int i = 0; i < m_targetTrans.Length; i++)
         //{
@@ -446,8 +456,8 @@ public class StorageView : MonoBehaviour
                         m_triggerBox.gameObject.SetActive(true);
                         m_triggerTopBox.gameObject.SetActive(true);
                         //m_curTargetPosY = m_curTargetTrans.transform.position.y;
-                        //Invoke("DelayInvokeRigidBody", 0.1f);
-                        //CancelDelayMatChangeHandle();
+                        Invoke("DelayInvokeRigidBody", 0.1f);
+                        CancelDelayMatChangeHandle();
                         if (m_dicMat.ContainsKey(m_curTargetTrans))
                         {
                             m_curTargetTrans.GetComponent<MeshRenderer>().sharedMaterial = m_dicMat[m_curTargetTrans];
@@ -484,7 +494,7 @@ public class StorageView : MonoBehaviour
         {
             GameServices.inputService.pad.onTouchUp -= OnTouchUp;
         }
-        //CancelDelayMatChangeHandle();
+        CancelDelayMatChangeHandle();
         CancelRotateInvoke();
     }
 }