胜利特效上传

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

@@ -236,6 +236,7 @@ public class BattleUI : MonoBehaviour
         {
             m_boomUIS[i].SetActive(true);
         }
+        m_boomBtn.interactable = false;
 
         m_levelText.text = string.Format("Level {0:D}", BattleCtrl.instance.levelManager.CurLevelIndex + 1);
 

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

@@ -10,6 +10,7 @@ public class BombView : MonoBehaviour
     public RayfireBomb m_rayfireBomb;//炸弹预设
 
     private RayfireBomb m_curBomb;//当前的炸弹
+    private GameObject m_curBombEffect;//当前炸弹特效
     private bool m_bCanBePlace = true;//是否能放置炸弹
     //设置炸弹
     void SetBomb(RayfireBomb rayfireBomb)
@@ -27,18 +28,28 @@ public class BombView : MonoBehaviour
     //开始炸
     public void StartBomb()
     {
-        GameObject fx = PoolManager.Instance.GetObjectFromPool(m_bombEffectObj);
-        fx.transform.position = m_curBomb.transform.position;
+        m_curBombEffect = PoolManager.Instance.GetObjectFromPool(m_bombEffectObj);
+        m_curBombEffect.transform.position = m_curBomb.transform.position;
         m_curBomb?.Explode(0);
         m_curBomb.gameObject.SetActive(false);
         //回收
         PoolManager.Instance.ReturnObjectToPool(m_curBomb.gameObject);
         GameServices.timerServices.Push(this, 1.0f, delegate
         {
-            PoolManager.Instance.ReturnObjectToPool(fx);
+            PoolManager.Instance.ReturnObjectToPool(m_curBombEffect);
         });
     }
-
+    private void OnDestroy()
+    {
+        if(m_curBomb)
+        {
+            PoolManager.Instance.ReturnObjectToPool(m_curBomb.gameObject);
+        }
+        if(m_curBombEffect)
+        {
+            PoolManager.Instance.ReturnObjectToPool(m_curBombEffect);
+        }
+    }
     private void Update()
     {
         if (!BattleCtrl.instance.isStartBattle)

BoomMaster/Assets/#C2_Animations/UI.meta

+fileFormatVersion: 2
+guid: b36d432674715fd47ba10adbe57238ef
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BoomMaster/Assets/#C2_Animations/UI/Game Winning.anim.meta

+fileFormatVersion: 2
+guid: 9017b9d232de4a847870e3854d2bcb0e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BoomMaster/Assets/#C2_Animations/UI/Try Again.anim.meta

+fileFormatVersion: 2
+guid: cc6d3e858bd8c0749a48d2ccb01089ef
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BoomMaster/Assets/#C2_Animations/UI/失败UI.controller

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-6205728937490845373
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 8912397566251227239}
+    m_Position: {x: 200, y: 0, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 6186347300636811094}
+    m_Position: {x: 235, y: 65, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 6186347300636811094}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u5931\u8D25UI"
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -6205728937490845373}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &6186347300636811094
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Try Again
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: cc6d3e858bd8c0749a48d2ccb01089ef, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &8912397566251227239
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Game Winning
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 9017b9d232de4a847870e3854d2bcb0e, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

BoomMaster/Assets/#C2_Animations/UI/失败UI.controller.meta

+fileFormatVersion: 2
+guid: 7d6fba3e77762b54e83cfd3e497562dc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BoomMaster/Assets/#C2_Animations/UI/胜利UI.controller

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-6205728937490845373
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 8912397566251227239}
+    m_Position: {x: 200, y: 0, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 8912397566251227239}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u80DC\u5229UI"
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -6205728937490845373}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &8912397566251227239
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Game Winning
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 9017b9d232de4a847870e3854d2bcb0e, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

BoomMaster/Assets/#C2_Animations/UI/胜利UI.controller.meta

+fileFormatVersion: 2
+guid: bb389cc2efde9ef4ba6b88a34ad44400
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: