修改逻辑

BoomMaster/Assembly-CSharp.csproj

@@ -179,11 +179,13 @@
     <Compile Include="Assets\#E1_Plugins\RayFire\Tutorial\Scripts\DemolitionEventScript.cs" />
     <None Include="Assets\#D2_Shaders\CustomLightingToon.shader" />
     <None Include="Assets\#D2_Shaders\Shader\Dissolve.shader" />
+    <None Include="Assets\#D2_Shaders\Planet.shader" />
     <None Include="Assets\#D2_Shaders\RimShader.shader" />
     <None Include="Assets\#D2_Shaders\AlphaRimPro.shader" />
     <None Include="Assets\#D2_Shaders\ShaderFX.shader" />
     <None Include="Assets\#D2_Shaders\OutLine1.shader" />
     <None Include="Assets\#D2_Shaders\Water.shader" />
+    <None Include="Assets\#D2_Shaders\LightShader.shader" />
     <None Include="Assets\#D2_Shaders\Shader\AlphaRimBase.shader" />
     <None Include="Assets\#A2_Scripts\项目文件说明文档.txt" />
     <None Include="Assets\#D2_Shaders\BlockTextrue.shader" />

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

@@ -337,14 +337,18 @@ public class BattleUI : MonoBehaviour
         {
             m_clawMoveSpeed.text = string.Format("系数越小，越快\n{0:f3}", GameServices.configService.playerConfig.ClawMoveSpeed);
         });
-        if(!m_bIsGameStart)
-        {
-            m_bIsGameStart = true;
-        }
-        else
+        //if(!m_bIsGameStart)
+        //{
+        //    m_bIsGameStart = true;
+        //}
+        //else
+        //{
+        //    m_propSelectUi.gameObject.SetActive(true);
+        //    BattleCtrl.instance.SelectPropState = true;
+        //}
+        if(m_propSelectUi)
         {
-            m_propSelectUi.gameObject.SetActive(true);
-            BattleCtrl.instance.SelectPropState = true;
+            m_propSelectUi.Show();
         }
     }
     //设置战斗UI状态
@@ -391,21 +395,25 @@ public class BattleUI : MonoBehaviour
         //m_boomUIS[m_bombIndex].SetActive(false);
         m_bombIndex++;
         m_leftBombNum.text = string.Format("X{0:d}", 3 - m_bombIndex);
-        if(m_isBombDouble)
-        {
-            Invoke("OnClickBoomBtn", 3.4f);
-        }
-        else
+        //if(m_isBombDouble)
+        //{
+        //    Invoke("OnClickBoomBtn", 3.4f);
+        //}
+        //else
+        //{
+        //    Invoke("OnClickBoomBtn", 1.5f);
+        //}
+        if(!m_isBombDouble)
         {
-            Invoke("OnClickBoomBtn", 1.5f);
+            BattleCtrl.instance.levelManager.curLevel.bombView.PlayBombAni();
         }
     }
     void CancelBomb()
     {
-        if(IsInvoking("OnClickBoomBtn"))
-        {
-            CancelInvoke("OnClickBoomBtn");
-        }
+        //if(IsInvoking("OnClickBoomBtn"))
+        //{
+        //    CancelInvoke("OnClickBoomBtn");
+        //}
     }
 
     //点击爆破按钮

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

@@ -10,7 +10,7 @@ public class PropSelectUI : MonoBehaviour
     public GameObject m_strengthSymbolObj;
     public GameObject m_doubleSymbolObj;
     public GameObject m_coinSymbolObj;
-    private void OnEnable()
+    public void Show()
     {
         int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey);
         m_strengthObj.SetActive(varCoin >= 10);

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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using RayFire;
+using DG.Tweening;
 
 public class BombStateView : MonoBehaviour
 {
@@ -23,11 +24,75 @@ public class BombStateView : MonoBehaviour
     private GameObject m_secondBombEffect;
     private Vector3 m_firstBombPos;
     private Vector3 m_secondBombPos;
+    private Sequence m_sqFirst;
     private void Awake()
     {
         m_unrealParent = m_unrealBombState1Obj.transform.parent;
         m_strengthUnrealParent = m_strengthUnrealBombState1Obj.transform.parent;
     }
+    //爆破动画效果
+    public void PlayBombAni()
+    {
+        if (BattleCtrl.instance.battleUI.IsBombStrength)
+        {
+            if (BattleCtrl.instance.battleUI.IsBombDouble)
+            {
+                m_sqFirst = DOTween.Sequence();
+                m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 0.8f, 0.5f));
+                m_sqFirst.Join(m_strengthUnrealParent.DOScale(Vector3.one * 0.8f, 0.5f));
+
+                m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 1.2f, 0.5f));
+                m_sqFirst.Join(m_strengthUnrealParent.DOScale(Vector3.one * 1.2f, 0.5f));
+
+                m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 0.25f, 0.25f));
+                m_sqFirst.Join(m_strengthUnrealParent.DOScale(Vector3.one * 0.25f, 0.25f));
+
+                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(); });
+
+            }
+            else
+            {
+                m_sqFirst = DOTween.Sequence();
+                m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 0.8f, 0.5f));
+                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(); });
+            }
+        }
+        else
+        {
+            if (BattleCtrl.instance.battleUI.IsBombDouble)
+            {
+                m_sqFirst = DOTween.Sequence();
+                m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 0.8f, 0.5f));
+                m_sqFirst.Join(m_unrealParent.transform.DOScale(Vector3.one * 0.8f, 0.5f));
+
+                m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 1.2f, 0.5f));
+                m_sqFirst.Join(m_unrealParent.transform.DOScale(Vector3.one * 1.2f, 0.5f));
+
+                m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 0.25f, 0.25f));
+                m_sqFirst.Join(m_unrealParent.transform.DOScale(Vector3.one * 0.25f, 0.25f));
+
+                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(); });
+            }
+            else
+            {
+                m_sqFirst = DOTween.Sequence();
+                m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 0.8f, 0.5f));
+                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(); });
+            }
+        }
+    }
     //开始爆破
     public void StartBomb()
     {
@@ -162,6 +227,8 @@ public class BombStateView : MonoBehaviour
                 m_unrealBombState1Obj.SetActive(false);
                 m_unrealBombState3Obj.SetActive(true);
             }
+            ClearInvoke();
+            PlayBombAni();
         }
     }
     //设置虚拟模型位置
@@ -191,6 +258,11 @@ public class BombStateView : MonoBehaviour
         m_strengthUnrealBombState2MeshRender.material.SetFloat(m_shaderFloatStr, 1.0f);
         m_strengthUnrealBombState3Obj.SetActive(false);
         m_shaderFloatValue = 0.0f;
+        m_strengthRealBombObj.transform.localScale = Vector3.one;
+        m_strengthUnrealParent.localScale = Vector3.one;
+        m_realBombObj.transform.localScale = Vector3.one;
+        m_unrealParent.localScale = Vector3.one;
+        m_sqFirst.Kill();
         ClearInvoke();
     }
     //清除invoke

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

@@ -93,6 +93,14 @@ public class BombView : MonoBehaviour
         //}
         //m_bCanBePlace = false;
     }
+    //播放动画
+    public void PlayBombAni()
+    {
+        if(m_bombStateView)
+        {
+            m_bombStateView.PlayBombAni();
+        }
+    }
     //画线
     void DrawLine()
     {
@@ -183,7 +191,7 @@ public class BombView : MonoBehaviour
     private void Update()
     {
         if (!BattleCtrl.instance.isStartBattle || BattleCtrl.instance.isEndBattle 
-            || BattleCtrl.instance.SelectPropState)
+            /*|| BattleCtrl.instance.SelectPropState*/)
         {
             return;
         }

BoomMaster/Assets/Res/Prefabs/Levels/Level5.prefab

@@ -3998,7 +3998,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_cameraTrans: {fileID: 4902499387553085372}
-  m_rootTrans: {fileID: 0}
+  m_rootTrans: {fileID: 5413662012429062968}
   lineRenderer: {fileID: 8235209161698779657}
 --- !u!1 &4902499387553085373
 GameObject: