修改逻辑

BoomMaster/Assembly-CSharp.csproj

@@ -89,6 +89,7 @@
     <Compile Include="Assets\#A2_Scripts\Battle\UI\SelectLevelUI.cs" />
     <Compile Include="Assets\#A2_Scripts\Battle\UI\SettingPanel.cs" />
     <Compile Include="Assets\#A2_Scripts\Battle\UI\TestGestureAround.cs" />
+    <Compile Include="Assets\#A2_Scripts\Battle\View\BombState1View.cs" />
     <Compile Include="Assets\#A2_Scripts\Battle\View\BombStateView.cs" />
     <Compile Include="Assets\#A2_Scripts\Battle\View\BombView.cs" />
     <Compile Include="Assets\#A2_Scripts\Battle\View\ChainDragView.cs" />

BoomMaster/Assets/#A1_Scenes/DemoScenes.unity

@@ -171,7 +171,6 @@ MonoBehaviour:
   - {fileID: 945570835972455969, guid: af2db092e9ac9a24b81ec302ad910588, type: 3}
   - {fileID: 4014335436679012073, guid: 16d73164b8f5c7744892dd5fa4284980, type: 3}
   - {fileID: 4176077394338190956, guid: 96ed4cec24368ce4bbc8b31c32895485, type: 3}
-  - {fileID: 916316864684617039, guid: ae5208ef0dc122d4db2463688f2bbb7b, type: 3}
 --- !u!1 &543166196
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -79,6 +79,7 @@ public class BattleUI : MonoBehaviour
     public bool IsBombDouble { get { return m_isBombDouble; } }//是否double
     public bool IsLeftEmtryBomb { get { return m_bombIndex >= 3; } }//是否不剩炸弹了
     public bool IsBombButtonCanInteractable { get { return m_boomBtn.interactable; } }
+    public bool IsActivitySelectLevelUi { get { return m_selectLevelObj.activeSelf; } }
     void Awake()
     {
         m_dragBtn.onClick.AddListener(SetDragMode);

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

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BombState1View : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

BoomMaster/Assets/#A2_Scripts/Battle/View/BombState1View.cs.meta

+fileFormatVersion: 2
+guid: 15a8391ec7ac4464aa379a73cf9f4f6c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -190,7 +190,8 @@ public class BombView : MonoBehaviour
     }
     private void Update()
     {
-        if (!BattleCtrl.instance.isStartBattle || BattleCtrl.instance.isEndBattle)
+        if (!BattleCtrl.instance.isStartBattle || BattleCtrl.instance.isEndBattle
+            || BattleCtrl.instance.battleUI.IsActivitySelectLevelUi)
         {
             return;
         }

BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab

@@ -2768,7 +2768,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -20, y: 48}
+  m_AnchoredPosition: {x: 0, y: 40}
   m_SizeDelta: {x: 200, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2029299192137830124
@@ -2805,13 +2805,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 4
     m_MaxSize: 55
-    m_Alignment: 5
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: -10
+  m_Text: 10
 --- !u!114 &5286020103012890794
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5297,7 +5297,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 7
+  m_Text: '?'
 --- !u!1 &2651623156184077912
 GameObject:
   m_ObjectHideFlags: 0
@@ -9291,7 +9291,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 0.50980395}
   m_RaycastTarget: 1
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -9609,7 +9609,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -20, y: 48}
+  m_AnchoredPosition: {x: 0, y: 40}
   m_SizeDelta: {x: 200, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2692341914754087206
@@ -9646,13 +9646,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 4
     m_MaxSize: 55
-    m_Alignment: 5
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: -20
+  m_Text: 20
 --- !u!114 &5255824844789364141
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10068,7 +10068,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -20, y: 48}
+  m_AnchoredPosition: {x: 0, y: 40}
   m_SizeDelta: {x: 200, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6865291128806665095
@@ -10105,13 +10105,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 4
     m_MaxSize: 55
-    m_Alignment: 5
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: -10
+  m_Text: 10
 --- !u!114 &3669034589733594892
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -11268,7 +11268,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -11345,7 +11345,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -14938,7 +14938,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -14955,7 +14955,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6064464677866441003}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
@@ -15009,7 +15009,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6064464677866441003}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
   m_Name: