修改代码

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

@@ -7,9 +7,18 @@ public class PropSelectUI : MonoBehaviour
     public GameObject m_strengthObj;
     public GameObject m_doubleObj;
     public GameObject m_coinObj;
+    public GameObject m_strengthSymbolObj;
+    public GameObject m_doubleSymbolObj;
+    public GameObject m_coinSymbolObj;
     private void OnEnable()
     {
-        SetOpenState();
+        int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey);
+        m_strengthObj.SetActive(varCoin >= 10);
+        m_doubleObj.SetActive(varCoin >= 20);
+        m_coinObj.SetActive(varCoin >= 10);
+        m_strengthSymbolObj.SetActive(false);
+        m_doubleSymbolObj.SetActive(false);
+        m_coinSymbolObj.SetActive(false);
     }
     //点击加强
     public void OnClickStrength()
@@ -17,6 +26,8 @@ public class PropSelectUI : MonoBehaviour
         BattleCtrl.instance.battleUI.SetBombStrength();
         BattleCtrl.instance.battleUI.SetCoin(-10);
         SetOpenState();
+        m_strengthObj.SetActive(false);
+        m_strengthSymbolObj.SetActive(true);
     }
     //点击double
     public void OnClickDouble()
@@ -24,6 +35,8 @@ public class PropSelectUI : MonoBehaviour
         BattleCtrl.instance.battleUI.SetBombDouble();
         BattleCtrl.instance.battleUI.SetCoin(-20);
         SetOpenState();
+        m_doubleObj.SetActive(false);
+        m_doubleSymbolObj.SetActive(true);
     }
     //点击金币
     public void OnClickCoin()
@@ -31,6 +44,8 @@ public class PropSelectUI : MonoBehaviour
         BattleCtrl.instance.battleUI.SetCoinDouble();
         BattleCtrl.instance.battleUI.SetCoin(-10);
         SetOpenState();
+        m_coinObj.SetActive(false);
+        m_coinSymbolObj.SetActive(true);
     }
     //开始
     public void OnClickStart()
@@ -46,8 +61,17 @@ public class PropSelectUI : MonoBehaviour
     void SetOpenState()
     {
         int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey);
-        m_strengthObj.SetActive(varCoin >= 10);
-        m_doubleObj.SetActive(varCoin >= 20);
-        m_coinObj.SetActive(varCoin >= 10);
+        if(m_strengthObj.activeSelf)
+        {
+            m_strengthObj.SetActive(varCoin >= 10);
+        }
+        if(m_doubleObj.activeSelf)
+        {
+            m_doubleObj.SetActive(varCoin >= 20);
+        }
+        if(m_coinObj.activeSelf)
+        {
+            m_coinObj.SetActive(varCoin >= 10);
+        }
     }
 }

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

@@ -136,6 +136,10 @@ public class BombStateView : MonoBehaviour
             m_unrealBombState1Obj.SetActive(true);
             m_curMat = m_unrealBombState2MeshRender.material;
         }
+    }
+    //shader开始变化
+    public void StartShaderChange()
+    {
         InvokeRepeating("SetShaderChange", 1.0f, Time.deltaTime);
     }
     //shader参数变化

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

@@ -29,6 +29,8 @@ public class BombView : MonoBehaviour
     private Vector2 m_lastInputPos = Vector2.zero;
     private Vector3 m_firstBombPos;//第一个炸弹位置
     private Vector3 m_secondBombPos;//第二个炸弹位置
+    private bool m_bControlDoubleBomb = false;//控制第二个炸弹的位置
+    private Vector3 m_recordSecondBombPos;//位置记录
     private void Awake()
     {
         m_totalChildNum = m_rootTrans.childCount - 1;
@@ -171,6 +173,10 @@ public class BombView : MonoBehaviour
         {
             CancelInvoke("DrawLine");
         }
+        if (IsInvoking("TimeLimitStartBomb"))
+        {
+            CancelInvoke("TimeLimitStartBomb");
+        }
         m_lstDamage.Clear();
         m_lstDamage = null;
     }
@@ -256,23 +262,44 @@ public class BombView : MonoBehaviour
         {
             if (hit.collider.tag == "Target" && m_bCanBePlace)
             {
-                GameObject go = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.rayfireBombObj);
-                //go.transform.position = hit.point;
-                SetBomb(go);
-                m_bombStateView.SetBombModelPos(hit.point);
-                BattleCtrl.instance.battleUI.SetBomb();
-                m_lastInputPos = Input.mousePosition;
-                Vector3 varVec3 = hit.point;
-                varVec3.x += 0.1f;
-                m_firstBombPos = varVec3;
-                //是否生成double
-                if (BattleCtrl.instance.battleUI.IsBombDouble)
+                if(!m_bControlDoubleBomb)
                 {
-                    RandomCreateAnotherBomb();
+                    GameObject go = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.rayfireBombObj);
+                    //go.transform.position = hit.point;
+                    SetBomb(go);
+                    m_bombStateView.SetBombModelPos(hit.point);
+                    m_lastInputPos = Input.mousePosition;
+                    Vector3 varVec3 = hit.point;
+                    varVec3.x += 0.1f;
+                    m_firstBombPos = varVec3;
+                    //是否生成double
+                    if (BattleCtrl.instance.battleUI.IsBombDouble)
+                    {
+                        RandomCreateAnotherBomb();
+                        m_bControlDoubleBomb = true;
+                    }
+                    else
+                    {
+                        m_bCanBePlace = false;
+                        BattleCtrl.instance.battleUI.SetBomb();
+                    }
                 }
                 else
                 {
+                    m_bControlDoubleBomb = false;
                     m_bCanBePlace = false;
+                    BattleCtrl.instance.battleUI.SetBomb();//指定位置后开始炸
+                    m_bombStateView.SetUnrealBombModelPos(hit.point);
+                    m_bombStateView.StartShaderChange();
+                    InvokeRepeating("DrawLine", 0.1f, 0.3f);
+                    Vector3 varPoint = hit.point;
+                    varPoint.x += 0.1f;
+                    m_secondBombPos = varPoint;
+                    //指定后要取消判定
+                    if(IsInvoking("TimeLimitStartBomb"))
+                    {
+                        CancelInvoke("TimeLimitStartBomb");
+                    }
                 }
             }
         }
@@ -295,13 +322,10 @@ public class BombView : MonoBehaviour
         {
             if (hit.collider.tag == "Target" && m_bCanBePlace)
             {
-                m_bCanBePlace = false;
                 m_bombStateView.SetUnrealBombModelPos(hit.point);
                 m_bombStateView.SetUnrealBombModel();
-                InvokeRepeating("DrawLine", 0.1f, 0.3f);
-                Vector3 varPoint = hit.point;
-                varPoint.x += 0.1f;
-                m_secondBombPos = varPoint;
+                m_recordSecondBombPos = hit.point;
+                Invoke("TimeLimitStartBomb", 5.0f);
             }
         }
         else
@@ -309,4 +333,16 @@ public class BombView : MonoBehaviour
             RandomCreateAnotherBomb();
         }
     }
+    //过5秒自己开始炸,如果玩家没有指定位置
+    void TimeLimitStartBomb()
+    {
+        m_bControlDoubleBomb = false;
+        m_bCanBePlace = false;
+        BattleCtrl.instance.battleUI.SetBomb();//指定位置后开始炸
+        m_bombStateView.StartShaderChange();
+        InvokeRepeating("DrawLine", 0.1f, 0.3f);
+        Vector3 varPoint = m_recordSecondBombPos;
+        varPoint.x += 0.1f;
+        m_secondBombPos = varPoint;
+    }
 }

BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab

@@ -16690,6 +16690,9 @@ MonoBehaviour:
   m_strengthObj: {fileID: 935220169814444094}
   m_doubleObj: {fileID: 7970116045404573728}
   m_coinObj: {fileID: 8702548051435287562}
+  m_strengthSymbolObj: {fileID: 2810314833097530004}
+  m_doubleSymbolObj: {fileID: 5021344926088393427}
+  m_coinSymbolObj: {fileID: 859530928958322986}
 --- !u!1 &7863706443067258471
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 1341474242516034023}
   m_Layer: 0
   m_Name: ClockTower_sh_71
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -93,7 +93,7 @@ GameObject:
   - component: {fileID: 8012697572125779969}
   m_Layer: 0
   m_Name: ClockTower_sh_16
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -173,7 +173,7 @@ GameObject:
   - component: {fileID: 4409735930787703622}
   m_Layer: 0
   m_Name: ClockTower_sh_78
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -253,7 +253,7 @@ GameObject:
   - component: {fileID: 3624120680638054332}
   m_Layer: 0
   m_Name: ClockTower_sh_44
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -827,7 +827,7 @@ GameObject:
   - component: {fileID: 2683526323016517623}
   m_Layer: 0
   m_Name: ClockTower_sh_3
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -939,7 +939,7 @@ GameObject:
   - component: {fileID: 6145572013689183036}
   m_Layer: 0
   m_Name: ClockTower_sh_27
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1147,7 +1147,7 @@ GameObject:
   - component: {fileID: 2279462045422323971}
   m_Layer: 0
   m_Name: ClockTower_sh_37
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1227,7 +1227,7 @@ GameObject:
   - component: {fileID: 7655466834116733300}
   m_Layer: 0
   m_Name: ClockTower_sh_41
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1307,7 +1307,7 @@ GameObject:
   - component: {fileID: 3779765504493622657}
   m_Layer: 0
   m_Name: ClockTower_sh_32
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1387,7 +1387,7 @@ GameObject:
   - component: {fileID: 3383859347852483220}
   m_Layer: 0
   m_Name: ClockTower_sh_39
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1467,7 +1467,7 @@ GameObject:
   - component: {fileID: 3283132253134512973}
   m_Layer: 0
   m_Name: ClockTower_sh_54
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1547,7 +1547,7 @@ GameObject:
   - component: {fileID: 5103802950256639335}
   m_Layer: 0
   m_Name: ClockTower_sh_45
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1627,7 +1627,7 @@ GameObject:
   - component: {fileID: 7666307552109734271}
   m_Layer: 0
   m_Name: ClockTower_sh_76
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1707,7 +1707,7 @@ GameObject:
   - component: {fileID: 7860187338400005954}
   m_Layer: 0
   m_Name: ClockTower_sh_17
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1787,7 +1787,7 @@ GameObject:
   - component: {fileID: 7886752287693654845}
   m_Layer: 0
   m_Name: ClockTower_sh_22
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1867,7 +1867,7 @@ GameObject:
   - component: {fileID: 2333570197235104936}
   m_Layer: 0
   m_Name: ClockTower_sh_29
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1947,7 +1947,7 @@ GameObject:
   - component: {fileID: 4671938358228514705}
   m_Layer: 0
   m_Name: ClockTower_sh_24
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2027,7 +2027,7 @@ GameObject:
   - component: {fileID: 823619386688876104}
   m_Layer: 0
   m_Name: ClockTower_sh_55
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2107,7 +2107,7 @@ GameObject:
   - component: {fileID: 6197766477569865698}
   m_Layer: 0
   m_Name: ClockTower_sh_31
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2187,7 +2187,7 @@ GameObject:
   - component: {fileID: 3366602370536200783}
   m_Layer: 0
   m_Name: ClockTower_sh_7
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2267,7 +2267,7 @@ GameObject:
   - component: {fileID: 1598909006425431774}
   m_Layer: 0
   m_Name: ClockTower_sh_35
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2347,7 +2347,7 @@ GameObject:
   - component: {fileID: 3990915996024583495}
   m_Layer: 0
   m_Name: ClockTower_sh_6
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2427,7 +2427,7 @@ GameObject:
   - component: {fileID: 2173725032908306988}
   m_Layer: 0
   m_Name: ClockTower_sh_57
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2507,7 +2507,7 @@ GameObject:
   - component: {fileID: 9152490820504174865}
   m_Layer: 0
   m_Name: ClockTower_sh_65
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2587,7 +2587,7 @@ GameObject:
   - component: {fileID: 4706201906388576721}
   m_Layer: 0
   m_Name: ClockTower_sh_61
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2667,7 +2667,7 @@ GameObject:
   - component: {fileID: 6529823907201185245}
   m_Layer: 0
   m_Name: ClockTower_sh_75
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2747,7 +2747,7 @@ GameObject:
   - component: {fileID: 1411992320863070931}
   m_Layer: 0
   m_Name: ClockTower_sh_79
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2827,7 +2827,7 @@ GameObject:
   - component: {fileID: 2268711750578491079}
   m_Layer: 0
   m_Name: ClockTower_sh_9
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2907,7 +2907,7 @@ GameObject:
   - component: {fileID: 298589635062852336}
   m_Layer: 0
   m_Name: ClockTower_sh_4
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2987,7 +2987,7 @@ GameObject:
   - component: {fileID: 3999360833872507590}
   m_Layer: 0
   m_Name: ClockTower_sh_51
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3067,7 +3067,7 @@ GameObject:
   - component: {fileID: 7602760878792175492}
   m_Layer: 0
   m_Name: ClockTower_sh_13
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3147,7 +3147,7 @@ GameObject:
   - component: {fileID: 4936348606242940686}
   m_Layer: 0
   m_Name: ClockTower_sh_14
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3227,7 +3227,7 @@ GameObject:
   - component: {fileID: 6732002973676858743}
   m_Layer: 0
   m_Name: ClockTower_sh_68
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3307,7 +3307,7 @@ GameObject:
   - component: {fileID: 2657674942909649778}
   m_Layer: 0
   m_Name: ClockTower_sh_18
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3387,7 +3387,7 @@ GameObject:
   - component: {fileID: 6673627670390153354}
   m_Layer: 0
   m_Name: ClockTower_sh_70
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3467,7 +3467,7 @@ GameObject:
   - component: {fileID: 2723374063940432776}
   m_Layer: 0
   m_Name: ClockTower_sh_74
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3547,7 +3547,7 @@ GameObject:
   - component: {fileID: 8622673041155503427}
   m_Layer: 0
   m_Name: ClockTower_sh_56
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3627,7 +3627,7 @@ GameObject:
   - component: {fileID: 1956717405483286043}
   m_Layer: 0
   m_Name: ClockTower_sh_5
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3707,7 +3707,7 @@ GameObject:
   - component: {fileID: 9117807920345548776}
   m_Layer: 0
   m_Name: ClockTower_sh_53
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3787,7 +3787,7 @@ GameObject:
   - component: {fileID: 5202669191143655319}
   m_Layer: 0
   m_Name: ClockTower_sh_15
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3867,7 +3867,7 @@ GameObject:
   - component: {fileID: 9221054825614171542}
   m_Layer: 0
   m_Name: ClockTower_sh_34
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3947,7 +3947,7 @@ GameObject:
   - component: {fileID: 2853282899468905534}
   m_Layer: 0
   m_Name: ClockTower_sh_10
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4027,7 +4027,7 @@ GameObject:
   - component: {fileID: 9197533805307907353}
   m_Layer: 0
   m_Name: ClockTower_sh_26
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4538,7 +4538,7 @@ GameObject:
   - component: {fileID: 7742931622899942114}
   m_Layer: 0
   m_Name: ClockTower_sh_73
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4618,7 +4618,7 @@ GameObject:
   - component: {fileID: 6222131416173848924}
   m_Layer: 0
   m_Name: ClockTower_sh_49
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4698,7 +4698,7 @@ GameObject:
   - component: {fileID: 3687800338813977596}
   m_Layer: 0
   m_Name: ClockTower_sh_77
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4778,7 +4778,7 @@ GameObject:
   - component: {fileID: 8497862653460444272}
   m_Layer: 0
   m_Name: ClockTower_sh_21
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4858,7 +4858,7 @@ GameObject:
   - component: {fileID: 5180683890753152281}
   m_Layer: 0
   m_Name: ClockTower_sh_2
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4938,7 +4938,7 @@ GameObject:
   - component: {fileID: 8558726344051848103}
   m_Layer: 0
   m_Name: ClockTower_sh_20
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5018,7 +5018,7 @@ GameObject:
   - component: {fileID: 2012653017511225525}
   m_Layer: 0
   m_Name: ClockTower_sh_80
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5098,7 +5098,7 @@ GameObject:
   - component: {fileID: 8221355664949309356}
   m_Layer: 0
   m_Name: ClockTower_sh_52
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5178,7 +5178,7 @@ GameObject:
   - component: {fileID: 4663570950266626898}
   m_Layer: 0
   m_Name: ClockTower_sh_50
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5289,7 +5289,7 @@ GameObject:
   - component: {fileID: 4942268640318432151}
   m_Layer: 0
   m_Name: ClockTower_sh_47
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5369,7 +5369,7 @@ GameObject:
   - component: {fileID: 1286135939588527449}
   m_Layer: 0
   m_Name: ClockTower_sh_63
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5449,7 +5449,7 @@ GameObject:
   - component: {fileID: 1463566539161902324}
   m_Layer: 0
   m_Name: ClockTower_sh_19
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5529,7 +5529,7 @@ GameObject:
   - component: {fileID: 6359641884823309591}
   m_Layer: 0
   m_Name: ClockTower_sh_46
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5609,7 +5609,7 @@ GameObject:
   - component: {fileID: 3594201737636774594}
   m_Layer: 0
   m_Name: ClockTower_sh_66
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5689,7 +5689,7 @@ GameObject:
   - component: {fileID: 7119949687044600593}
   m_Layer: 0
   m_Name: ClockTower_sh_67
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5769,7 +5769,7 @@ GameObject:
   - component: {fileID: 7677080914410227481}
   m_Layer: 0
   m_Name: ClockTower_sh_40
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5849,7 +5849,7 @@ GameObject:
   - component: {fileID: 8367434220099990950}
   m_Layer: 0
   m_Name: ClockTower_sh_33
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5928,7 +5928,7 @@ GameObject:
   - component: {fileID: 1409151056004789808}
   m_Layer: 0
   m_Name: ClockTower_sh_60
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -6008,7 +6008,7 @@ GameObject:
   - component: {fileID: 8393496075010974511}
   m_Layer: 0
   m_Name: ClockTower_sh_1
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -6088,7 +6088,7 @@ GameObject:
   - component: {fileID: 6562634280851549237}
   m_Layer: 0
   m_Name: ClockTower_sh_64
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -6168,7 +6168,7 @@ GameObject:
   - component: {fileID: 5771517447721833095}
   m_Layer: 0
   m_Name: ClockTower_sh_11
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -6248,7 +6248,7 @@ GameObject:
   - component: {fileID: 4930249501424674882}
   m_Layer: 0
   m_Name: ClockTower_sh_69
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -6328,7 +6328,7 @@ GameObject:
   - component: {fileID: 3913649996445335069}
   m_Layer: 0
   m_Name: ClockTower_sh_30
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -6408,7 +6408,7 @@ GameObject:
   - component: {fileID: 5974650377773092493}
   m_Layer: 0
   m_Name: ClockTower_sh_8
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -6759,7 +6759,7 @@ GameObject:
   - component: {fileID: 5778184691032312806}
   m_Layer: 0
   m_Name: ClockTower_sh_38
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -6839,7 +6839,7 @@ GameObject:
   - component: {fileID: 7542894408735530809}
   m_Layer: 0
   m_Name: ClockTower_sh_36
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -6919,7 +6919,7 @@ GameObject:
   - component: {fileID: 2723669628906797943}
   m_Layer: 0
   m_Name: ClockTower_sh_62
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -6999,7 +6999,7 @@ GameObject:
   - component: {fileID: 7698665506561882074}
   m_Layer: 0
   m_Name: ClockTower_sh_58
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -7079,7 +7079,7 @@ GameObject:
   - component: {fileID: 734128978198284859}
   m_Layer: 0
   m_Name: ClockTower_sh_12
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -7159,7 +7159,7 @@ GameObject:
   - component: {fileID: 7925055656643623809}
   m_Layer: 0
   m_Name: ClockTower_sh_23
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -7239,7 +7239,7 @@ GameObject:
   - component: {fileID: 1172468161111378098}
   m_Layer: 0
   m_Name: ClockTower_sh_43
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -7319,7 +7319,7 @@ GameObject:
   - component: {fileID: 2966167760463990988}
   m_Layer: 0
   m_Name: ClockTower_sh_48
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -7399,7 +7399,7 @@ GameObject:
   - component: {fileID: 2619004437857616644}
   m_Layer: 0
   m_Name: ClockTower_sh_72
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -7479,7 +7479,7 @@ GameObject:
   - component: {fileID: 4005472064597461236}
   m_Layer: 0
   m_Name: ClockTower_sh_25
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -7559,7 +7559,7 @@ GameObject:
   - component: {fileID: 6479572231724189398}
   m_Layer: 0
   m_Name: ClockTower_sh_28
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -7639,7 +7639,7 @@ GameObject:
   - component: {fileID: 1392480041590586899}
   m_Layer: 0
   m_Name: ClockTower_sh_59
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -7719,7 +7719,7 @@ GameObject:
   - component: {fileID: 2169488218417519421}
   m_Layer: 0
   m_Name: ClockTower_sh_42
-  m_TagString: Untagged
+  m_TagString: Target
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0