Merge remote-tracking branch 'origin/master' into xjr

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

@@ -353,7 +353,20 @@ public class BattleUI : MonoBehaviour
         //    m_propSelectUi.gameObject.SetActive(true);
         //    BattleCtrl.instance.SelectPropState = true;
         //}
-        if(m_propSelectUi)
+        ShowSelectUI();
+    }
+    //隐藏selectUI
+    public void HideSelectUI()
+    {
+        if (m_propSelectUi)
+        {
+            m_propSelectUi.Hide();
+        }
+    }
+    //显示selectUI
+    public void ShowSelectUI()
+    {
+        if (m_propSelectUi)
         {
             m_propSelectUi.Show();
         }

BoomMaster/Assets/#A2_Scripts/Battle/UI/PropSelectUI.cs

@@ -12,6 +12,7 @@ public class PropSelectUI : MonoBehaviour
     public GameObject m_coinSymbolObj;
     public void Show()
     {
+        gameObject.SetActive(true);
         int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey);
         m_strengthObj.SetActive(varCoin >= 10);
         m_doubleObj.SetActive(varCoin >= 20);
@@ -20,6 +21,10 @@ public class PropSelectUI : MonoBehaviour
         m_doubleSymbolObj.SetActive(false);
         m_coinSymbolObj.SetActive(false);
     }
+    public void Hide()
+    {
+        gameObject.SetActive(false);
+    }
     //点击加强
     public void OnClickStrength()
     {

BoomMaster/Assets/#A2_Scripts/Battle/View/BombStateView.cs

@@ -50,7 +50,7 @@ public class BombStateView : MonoBehaviour
                 m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 2.0f, 0.25f));
                 m_sqFirst.Join(m_strengthUnrealParent.DOScale(Vector3.one * 2.0f, 0.25f));
 
-                m_sqFirst.AppendCallback(delegate() { BattleCtrl.instance.battleUI.OnClickBoomBtn(); });
+                m_sqFirst.AppendCallback(OverAniCB);
 
             }
             else
@@ -60,7 +60,7 @@ public class BombStateView : MonoBehaviour
                 m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 1.2f, 0.5f));
                 m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 0.25f, 0.25f));
                 m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 2.0f, 0.25f));
-                m_sqFirst.AppendCallback(delegate () { BattleCtrl.instance.battleUI.OnClickBoomBtn(); });
+                m_sqFirst.AppendCallback(OverAniCB);
             }
         }
         else
@@ -80,7 +80,7 @@ public class BombStateView : MonoBehaviour
                 m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 2.0f, 0.25f));
                 m_sqFirst.Join(m_unrealParent.transform.DOScale(Vector3.one * 2.0f, 0.25f));
 
-                m_sqFirst.AppendCallback(delegate () { BattleCtrl.instance.battleUI.OnClickBoomBtn(); });
+                m_sqFirst.AppendCallback(OverAniCB);
             }
             else
             {
@@ -89,10 +89,16 @@ public class BombStateView : MonoBehaviour
                 m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 1.2f, 0.5f));
                 m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 0.25f, 0.25f));
                 m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 2.0f, 0.25f));
-                m_sqFirst.AppendCallback(delegate () { BattleCtrl.instance.battleUI.OnClickBoomBtn(); });
+                m_sqFirst.AppendCallback(OverAniCB);
             }
         }
     }
+    //动画播放结束回调
+    void OverAniCB()
+    {
+        BattleCtrl.instance.battleUI.OnClickBoomBtn();
+        BattleCtrl.instance.battleUI.ShowSelectUI();
+    }
     //开始爆破
     public void StartBomb()
     {

BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs

@@ -270,7 +270,8 @@ public class BombView : MonoBehaviour
         {
             if (hit.collider.tag == "Target" && m_bCanBePlace)
             {
-                if(!m_bControlDoubleBomb)
+                BattleCtrl.instance.battleUI.HideSelectUI();
+                if (!m_bControlDoubleBomb)
                 {
                     GameObject go = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.rayfireBombObj);
                     //go.transform.position = hit.point;
@@ -335,6 +336,10 @@ public class BombView : MonoBehaviour
                 m_recordSecondBombPos = hit.point;
                 Invoke("TimeLimitStartBomb", 5.0f);
             }
+            else
+            {
+                RandomCreateAnotherBomb();
+            }
         }
         else
         {

BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab

@@ -5051,7 +5051,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -227.1, y: 75}
+  m_AnchoredPosition: {x: -225.2, y: 75}
   m_SizeDelta: {x: 65, y: 65}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6929955050858487627