1.修复了序章-战场父亲会被导弹判定的问题

2.修复了第一关石头被炸开后闪退的问题
3.添加感谢游玩中背景的电码声

Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat

@@ -44,6 +44,6 @@ Material:
     - WaveIntensity_2: 1
     - WaveSpread_Value: 0
     m_Colors:
-    - Center: {r: 0.4698498, g: 0.4159796, b: 0, a: 0}
+    - Center: {r: 0.20614505, g: 0.31337723, b: 0, a: 0}
     - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0}
   m_BuildTextureStacks: []

Assets/Prefabs/轰炸区系统/炮弹.prefab

@@ -194,6 +194,7 @@ MonoBehaviour:
   target: {fileID: 0}
   boomAudio: {fileID: 5312157328831668466}
   boomLight: {fileID: 5805077605378078441}
+  hasBoomPower: 1
 --- !u!61 &7607195361720575763
 BoxCollider2D:
   m_ObjectHideFlags: 0

Assets/Scenes/感谢游玩.unity

@@ -2011,6 +2011,133 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &549262702
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 549262703}
+  - component: {fileID: 549262704}
+  m_Layer: 0
+  m_Name: "\u80CC\u666F\u7535\u7801"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &549262703
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 549262702}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 12.204076, y: 1.501261, z: -0.73053133}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 17
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &549262704
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 549262702}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: a219ca4cb1efdfe4eaf53188efc26d45, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &602020283
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/第一关.unity

@@ -7754,7 +7754,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 367679635}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 200.5, y: -4.1, z: 0}
+  m_LocalPosition: {x: 201.03, y: -4.33, z: 0}
   m_LocalScale: {x: 0.39999998, y: 0.39999998, z: 0.39999998}
   m_Children:
   - {fileID: 1737112887496214201}
@@ -23652,7 +23652,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1142437218}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -29.011776, y: -3.2993822, z: -10}
+  m_LocalPosition: {x: -28.99847, y: -3.2993822, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1608038909}
@@ -25878,7 +25878,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1477400527}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -36.760002, y: -5.249999, z: -10}
+  m_LocalPosition: {x: -36.230003, y: -5.4799995, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 32565896}
@@ -46013,8 +46013,8 @@ MonoBehaviour:
   - {fileID: 2047411004448683759}
   - {fileID: 5695032862028633419}
   m_Bounds:
-    m_Center: {x: 0.0021642447, y: -0.0058801174, z: 0}
+    m_Center: {x: 0.0021871328, y: -0.005881071, z: 0}
-    m_Extent: {x: 1.54779, y: 2.3711, z: 0}
+    m_Extent: {x: 1.54779, y: 2.371099, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
 --- !u!4 &1062080848641781139
@@ -46167,7 +46167,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 4936508675712544306}
   m_Bounds:
-    m_Center: {x: 0.0034165978, y: -0.0018951595, z: 0}
+    m_Center: {x: 0.0034318566, y: -0.0018951595, z: 0}
     m_Extent: {x: 0.68153024, y: 0.4230354, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -46252,7 +46252,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 5437654542896820717}
   m_Bounds:
-    m_Center: {x: 6.3699875, y: -0.002114892, z: 0}
+    m_Center: {x: 6.3700027, y: -0.002114892, z: 0}
     m_Extent: {x: 0.855, y: 1.1198149, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -46335,7 +46335,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 2934879650646324577}
   m_Bounds:
-    m_Center: {x: 0.0007739663, y: -0.0022351146, z: 0}
+    m_Center: {x: 0.0007892251, y: -0.0022351146, z: 0}
     m_Extent: {x: 0.6941651, y: 0.8818251, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -46520,7 +46520,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 7089406931308197820}
   m_Bounds:
-    m_Center: {x: -0.008480251, y: 0.000014662743, z: 0}
+    m_Center: {x: -0.008464992, y: 0.000012755394, z: 0}
     m_Extent: {x: 0.55653495, y: 0.69665515, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -46591,7 +46591,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 2360827735431813924}
   m_Bounds:
-    m_Center: {x: -0.0004426241, y: 0.00431484, z: 0}
+    m_Center: {x: -0.0004273653, y: 0.004316747, z: 0}
     m_Extent: {x: 0.689565, y: 0.9506854, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -47324,7 +47324,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 4718247844144699107}
   m_Bounds:
-    m_Center: {x: 0.0019468069, y: 0, z: 0}
+    m_Center: {x: 0.001969695, y: 0, z: 0}
     m_Extent: {x: 0.57801485, y: 0.9349998, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -47362,7 +47362,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 5215891186772959842}
   m_Bounds:
-    m_Center: {x: -0.000045895576, y: 0.0016950965, z: 0}
+    m_Center: {x: -0.000030636787, y: 0.0016950965, z: 0}
     m_Extent: {x: 1.1549999, y: 0.77910495, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -48238,7 +48238,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 4586288761792830837}
   m_Bounds:
-    m_Center: {x: 0.0021343231, y: 0, z: 0}
+    m_Center: {x: 0.002149582, y: -0.0000019073486, z: 0}
     m_Extent: {x: 0.60282004, y: 0.69500005, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -48442,7 +48442,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 6675447233366868755}
   m_Bounds:
-    m_Center: {x: -0.00008839369, y: 0.00060486794, z: 0}
+    m_Center: {x: -0.0000731349, y: 0.00060486794, z: 0}
     m_Extent: {x: 0.705515, y: 1.2171149, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -48533,7 +48533,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 7263140363742385229}
   m_Bounds:
-    m_Center: {x: -0.004308343, y: 0.0007251501, z: 0}
+    m_Center: {x: -0.004293084, y: 0.0007251501, z: 0}
     m_Extent: {x: 0.8907454, y: 1.2819755, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -48659,7 +48659,7 @@ MonoBehaviour:
   - {fileID: 8355431490900499643}
   - {fileID: 4936508675712544306}
   m_Bounds:
-    m_Center: {x: 0.0022922158, y: -0.0016773343, z: 0}
+    m_Center: {x: 0.0023074746, y: -0.001675427, z: 0}
     m_Extent: {x: 0.68268514, y: 0.4232551, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -48789,7 +48789,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 3397380986102525386}
   m_Bounds:
-    m_Center: {x: 0.0012915134, y: 0, z: 0}
+    m_Center: {x: 0.0013067722, y: 0, z: 0}
     m_Extent: {x: 0.7836551, y: 1.035, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -48860,7 +48860,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 5215891186772959842}
   m_Bounds:
-    m_Center: {x: 0.002978921, y: -0.0026350021, z: 0}
+    m_Center: {x: 0.0029941797, y: -0.0026359558, z: 0}
     m_Extent: {x: 0.9919598, y: 1.2031548, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1
@@ -48896,7 +48896,7 @@ MonoBehaviour:
   m_BoneTransforms:
   - {fileID: 8339351226288312874}
   m_Bounds:
-    m_Center: {x: 0.0016592741, y: -0.00012481213, z: 0}
+    m_Center: {x: 0.0016745329, y: -0.00012671947, z: 0}
     m_Extent: {x: 1.0732954, y: 1.2652456, z: 0}
   m_UseBatching: 1
   m_AlwaysUpdate: 1

Assets/Scripts/具象物体/EndMachine.cs

@@ -25,6 +25,7 @@ public class EndMachine : Interactive
         blackUI.SetActive(true);
         FindObjectOfType<BGMPlayer>().ChangedTheBGM(clip);
         Invoke("ReStart",2f);
+        FindObjectOfType<IndexRecoder>().stageName = "";
     }
 
     private void ReStart(){SceneManager.LoadScene("开始游戏");}

Assets/Scripts/具象物体/Shell.cs

@@ -28,6 +28,7 @@ public class Shell : MonoBehaviour
     public AudioSource boomAudio;//航弹爆炸音效
     public GameObject boomLight;//航弹爆炸光效
     private CinemachineImpulseSource impulseSource;//镜头震动呼出者
+    public bool hasBoomPower;//记录自身是否有炸死玩家能力的变量。在序章中，不应赋予其杀伤力
     
     void Start()
     {
@@ -124,7 +125,7 @@ public class Shell : MonoBehaviour
             case "Player":
                 //玩家被炮弹击中
                 Debug.Log("玩家被炮弹击中");
-                other.GetComponent<M_Player>().YouAreBoomingDead();
+                if(hasBoomPower)other.GetComponent<M_Player>().YouAreBoomingDead();
                 break;
             case "地面":
                 boomAudio.Play();
@@ -171,8 +172,11 @@ public class Shell : MonoBehaviour
         }
         if(amISpecal) //如果自己是特殊炸弹，则要考虑触发目标的死亡动画
         {
-            if(target!=null)target.SetBool("IsBoomDead",true);
+            if(target!=null)
-            Invoke("StopDeadAnimation",0.2f);
+            {
+                target.SetBool("IsBoomDead",true);
+                Invoke("StopDeadAnimation",0.2f);
+            }
         }
         impulseSource.GenerateImpulse();
     }

Assets/音乐/电码.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: a219ca4cb1efdfe4eaf53188efc26d45
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/ProjectSettings.asset

@@ -258,7 +258,14 @@ PlayerSettings:
   AndroidMinifyDebug: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
-  m_BuildTargetIcons: []
+  m_BuildTargetIcons:
+  - m_BuildTarget: 
+    m_Icons:
+    - serializedVersion: 2
+      m_Icon: {fileID: 2800000, guid: 08db6c6c06a7a634ca4bb9f772d29215, type: 3}
+      m_Width: 128
+      m_Height: 128
+      m_Kind: 0
   m_BuildTargetPlatformIcons: []
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsJobs:

UserSettings/EditorUserSettings.asset

@@ -15,14 +15,14 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb
-      flags: 0
-    RecentlyUsedScenePath-4:
       value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
       flags: 0
-    RecentlyUsedScenePath-5:
+    RecentlyUsedScenePath-4:
       value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
       flags: 0
+    RecentlyUsedScenePath-5:
+      value: 22424703114646680e0b0227036cdaccf692dfc1aaf0feb6c5c65326ece92021
+      flags: 0
     RecentlyUsedScenePath-6:
       value: 22424703114646680e0b0227036cd9f4e99fc8e8aaf0feb7c3e05326ece92021
       flags: 0
@@ -30,7 +30,7 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036cdaccf692dfc1aaf0feb6c5c65326ece92021
+      value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
       value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4bae495d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd898d91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969989eacfcc