修改逻辑

BoomMaster/Assets/#A1_Scenes/DemoScenes.unity

@@ -282,7 +282,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: eac3ab1cd8d56dc4fb10ca3966649e25, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  battleUI: {fileID: 2163652508806551532}
+  battleUI: {fileID: 6833933616594028096}
   m_levelManager: {fileID: 186647396}
 --- !u!1 &1872965180
 GameObject:
@@ -329,7 +329,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 65d718b4fac224944ad7728793e3fdc7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  pad: {fileID: 2163652508018123187}
+  pad: {fileID: 6833933617919537183}
 --- !u!114 &1872965183
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -358,7 +358,7 @@ MonoBehaviour:
     type: 3}
   m_rayfireBombObj: {fileID: 7079061562166580387, guid: 4a54442bb4207004c9595cc36ec83f59,
     type: 3}
---- !u!1001 &792154237216420726
+--- !u!1001 &2551918300351401871
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -482,27 +482,27 @@ PrefabInstance:
       objectReference: {fileID: 9100000, guid: 014ad115100000000a4ad11510000000, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
---- !u!114 &2163652508018123187 stripped
+--- !u!114 &6833933616594028096 stripped
 MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 6064464676810081129, guid: 919382978f5e2684ba83e6daf6491458,
+  m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458,
     type: 3}
-  m_PrefabInstance: {fileID: 792154237216420726}
+  m_PrefabInstance: {fileID: 2551918300351401871}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e3ca8d9f66bfdf4da1bfb54682c658b, type: 3}
+  m_Script: {fileID: 11500000, guid: 719c0ad6d83af074a83455f6c88d41e0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &2163652508806551532 stripped
+--- !u!114 &6833933617919537183 stripped
 MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458,
+  m_CorrespondingSourceObject: {fileID: 6064464676810081129, guid: 919382978f5e2684ba83e6daf6491458,
     type: 3}
-  m_PrefabInstance: {fileID: 792154237216420726}
+  m_PrefabInstance: {fileID: 2551918300351401871}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 719c0ad6d83af074a83455f6c88d41e0, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e3ca8d9f66bfdf4da1bfb54682c658b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 

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

@@ -49,6 +49,10 @@ public class BattleUI : MonoBehaviour
     public PropSelectUI m_propSelectUi;//道具选择ui
     public Text m_totalCoinText;//总的金币
     public Text m_levelCoinText;//通关金币
+    public GameObject m_normalBombIcon;//普通炸弹图标
+    public GameObject m_normalDoubleBombIcon;//double炸弹图标
+    public GameObject m_strengthBombIcon;//加强炸弹图标
+    public GameObject m_strengDoubleBombIcon;//加强double炸弹图标
     public Action onStartBtn;
     public Action onPosUpBtn;
     public Action onPosDownBtn;
@@ -315,6 +319,11 @@ public class BattleUI : MonoBehaviour
         m_isBombStrength = false;
         m_isBombDouble = false;
         m_isCoinDouble = false;
+        m_normalBombIcon.SetActive(true);
+        m_normalDoubleBombIcon.SetActive(false);
+        m_strengthBombIcon.SetActive(false);
+        m_strengDoubleBombIcon.SetActive(false);
+        CancelBomb();
 
         m_levelText.text = string.Format("Level {0:D}", BattleCtrl.instance.levelManager.CurLevelIndex + 1);
 
@@ -391,6 +400,13 @@ public class BattleUI : MonoBehaviour
             Invoke("OnClickBoomBtn", 1.5f);
         }
     }
+    void CancelBomb()
+    {
+        if(IsInvoking("OnClickBoomBtn"))
+        {
+            CancelInvoke("OnClickBoomBtn");
+        }
+    }
 
     //点击爆破按钮
     public void OnClickBoomBtn()
@@ -445,11 +461,29 @@ public class BattleUI : MonoBehaviour
     //点击加强
     public void SetBombStrength()
     {
+        HideBombIcon();
+        if (m_isBombDouble)
+        {
+            m_strengDoubleBombIcon.SetActive(true);
+        }
+        else
+        {
+            m_strengthBombIcon.SetActive(true);
+        }
         m_isBombStrength = true;
     }
     //点击double
     public void SetBombDouble()
     {
+        HideBombIcon();
+        if (m_isBombStrength)
+        {
+            m_strengDoubleBombIcon.SetActive(true);
+        }
+        else
+        {
+            m_normalDoubleBombIcon.SetActive(true);
+        }
         m_isBombDouble = true;
     }
     //点击金币double
@@ -457,6 +491,14 @@ public class BattleUI : MonoBehaviour
     {
         m_isCoinDouble = true;
     }
+    //隐藏所有炸弹图标
+    void HideBombIcon()
+    {
+        m_normalBombIcon.SetActive(false);
+        m_normalDoubleBombIcon.SetActive(false);
+        m_strengthBombIcon.SetActive(false);
+        m_strengDoubleBombIcon.SetActive(false);
+    }
     //------------------关卡选择炸弹---------------------end
     //设置金币数量
     public void SetCoin(int coin)

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

@@ -102,6 +102,7 @@ public class BombView : MonoBehaviour
         m_lineIndex++;
         if (m_lineIndex >= 5)
         {
+            m_lineIndex = 0;
             CancelInvoke("DrawLine");
         }
     }
@@ -150,10 +151,10 @@ public class BombView : MonoBehaviour
         {
             m_bombStateView.ClearState();
         }
-        //if (m_curBomb)
-        //{
-        //    PoolManager.Instance.ReturnObjectToPool(m_curBomb);
-        //}
+        if (m_curBomb)
+        {
+            PoolManager.Instance.ReturnObjectToPool(m_curBomb);
+        }
         //if(m_curBombEffect)
         //{
         //    PoolManager.Instance.ReturnObjectToPool(m_curBombEffect);

BoomMaster/Assets/#Z4_Icons/icon.png.meta

+fileFormatVersion: 2
+guid: 092e28d43a840e643af06d219b5d7283
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BoomMaster/ProjectSettings/ProjectSettings.asset

@@ -258,7 +258,14 @@ PlayerSettings:
   androidGamepadSupportLevel: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
-  m_BuildTargetIcons: []
+  m_BuildTargetIcons:
+  - m_BuildTarget: 
+    m_Icons:
+    - serializedVersion: 2
+      m_Icon: {fileID: 2800000, guid: 092e28d43a840e643af06d219b5d7283, type: 3}
+      m_Width: 128
+      m_Height: 128
+      m_Kind: 0
   m_BuildTargetPlatformIcons:
   - m_BuildTarget: Android
     m_Icons: