From 24df8c59fb536e763ca0333eba3ef112547daa9b Mon Sep 17 00:00:00 2001 From: Roman <1325980292@qq.com> Date: Fri, 3 Sep 2021 19:11:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E7=8E=B0=E6=9C=89=E7=BE=8E=E6=9C=AF=E7=B4=A0=E6=9D=90=E5=92=8C?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=E3=80=81=E5=AE=8C=E5=96=84=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E7=9A=84=E6=B5=81=E7=A8=8B=E5=8C=96=20=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E3=80=90=E5=BA=8F=E7=AB=A0-=E5=AE=B6=E4=B8=AD=E3=80=91=201.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E8=AF=9D=E8=A7=92=E8=89=B2=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E3=80=90=E7=88=B6=E4=BA=B2=E3=80=91=E7=9A=84=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E6=94=B9=E4=B8=BA=E7=88=B6=E4=BA=B2=202.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=B9=E8=AF=9D=E8=A7=92=E8=89=B2=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E3=80=90=E4=B8=BB=E8=A7=92=E3=80=91=E7=9A=84=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E4=B8=BA=E2=80=9C=E6=88=91=E2=80=9D=20=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E3=80=90=E5=BA=8F=E7=AB=A0-=E6=88=98=E5=9C=BA=E3=80=91=201.?= =?UTF-8?q?=E4=BD=BF=E5=AF=BC=E5=BC=B9=E7=94=9F=E6=88=90=E4=B8=8E=E8=BF=9C?= =?UTF-8?q?=E5=A4=84=EF=BC=8C=E6=97=A0=E4=BC=A4=E5=AE=B3=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=BC=B9=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=EF=BC=8C=E9=81=BF=E5=85=8D=E5=85=B6=E9=9C=B2?= =?UTF-8?q?=E5=87=BA=E4=B8=AA=E5=A4=B4=E6=9D=A5=203.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=88=B6=E4=BA=B2=E9=AA=A8=E9=AA=BC=EF=BC=8C=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E5=85=B6=E6=89=8B=E9=83=A8=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E5=9C=BA=E6=99=AF=E3=80=90=E7=AC=AC=E4=B8=80=E5=85=B3?= =?UTF-8?q?=E3=80=91=201.=E8=B0=83=E6=95=B4=E5=9B=BE=E5=B1=82=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E9=81=AE=E6=8C=A1=E9=97=AE=E9=A2=98=202.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=BC=E5=BC=B9=E7=94=9F=E6=88=90=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=85=B6=E9=9C=B2=E5=87=BA=E4=B8=AA?= =?UTF-8?q?=E5=A4=B4=E6=9D=A5=203.=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=A2=91=E7=8E=87=20=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E3=80=90=E7=AC=AC=E4=BA=8C=E5=85=B3=E3=80=91=201.=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E4=BA=86=E6=AD=BB=E4=BA=A1=202.=E8=B0=83=E8=8A=82?= =?UTF-8?q?=E4=BA=86=E8=A7=92=E8=89=B2=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Effects/Wave/Attack_Wave/AWM0.mat | 2 +- .../炮弹（底层级，用在序章战场）.prefab | 246 ++++++++++++++++++ .../炮弹（底层级，用在序章战场）.prefab.meta | 7 + .../Prefabs/轰炸区系统/阴影（低层级）.prefab | 84 ++++++ .../轰炸区系统/阴影（低层级）.prefab.meta | 7 + Assets/Scenes/序章-家中.unity | 17 +- Assets/Scenes/序章-战场.unity | 24 +- Assets/Scenes/第一关.unity | 17 +- Assets/Scenes/第二关.unity | 14 +- Assets/Scripts/具象物体/Patrolman.cs | 2 +- Assets/Scripts/具象物体/Shell.cs | 2 + Logs/ApiUpdaterCheck.txt | 60 +++++ ProjectSettings/ProjectSettings.asset | 3 +- UserSettings/EditorUserSettings.asset | 18 +- 14 files changed, 463 insertions(+), 40 deletions(-) create mode 100644 Assets/Prefabs/轰炸区系统/炮弹（底层级，用在序章战场）.prefab create mode 100644 Assets/Prefabs/轰炸区系统/炮弹（底层级，用在序章战场）.prefab.meta create mode 100644 Assets/Prefabs/轰炸区系统/阴影（低层级）.prefab create mode 100644 Assets/Prefabs/轰炸区系统/阴影（低层级）.prefab.meta diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index 04d8805..f720c97 100644 --- a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat +++ b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat @@ -44,6 +44,6 @@ Material: - WaveIntensity_2: 1 - WaveSpread_Value: 0 m_Colors: - - Center: {r: -0.3152043, g: 0.2512528, b: 0, a: 0} + - Center: {r: 0.43595243, g: 0.25134057, b: 0, a: 0} - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/轰炸区系统/炮弹（底层级，用在序章战场）.prefab b/Assets/Prefabs/轰炸区系统/炮弹（底层级，用在序章战场）.prefab new file mode 100644 index 0000000..65abc96 --- /dev/null +++ b/Assets/Prefabs/轰炸区系统/炮弹（底层级，用在序章战场）.prefab @@ -0,0 +1,246 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7931162725081391912 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7931162725081391914} + - component: {fileID: 7931162725081391913} + - component: {fileID: 4800546485021964337} + - component: {fileID: 5824986734411095181} + - component: {fileID: 4876319062084765790} + - component: {fileID: 8141452048895499116} + m_Layer: 0 + m_Name: "\u70AE\u5F39\uFF08\u5E95\u5C42\u7EA7\uFF0C\u7528\u5728\u5E8F\u7AE0\u6218\u573A\uFF09" + m_TagString: "\u70AE\u5F39" + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7931162725081391914 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7931162725081391912} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.35, y: 3.85, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7931162725081391913 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7931162725081391912} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -1 + m_Sprite: {fileID: 21300000, guid: dcb387599efee8040907b50b83625078, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &4800546485021964337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7931162725081391912} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f52e8e7ae8128004eba1db328b38a417, type: 3} + m_Name: + m_EditorClassIdentifier: + shadow: {fileID: 2058102616730576593, guid: b29fbc7e4328a714882ec73c6b97cc5f, type: 3} + boomObj: {fileID: 7911349319489194765, guid: 299f21a72c405984780245234d765a50, type: 3} + M_BombingArea: {fileID: 0} + MaxShadowSize: 1.7 + MinShadowSize: 1.3 +--- !u!61 &5824986734411095181 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7931162725081391912} + m_Enabled: 0 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.04, y: -0.55} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.71, y: 2.17} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.51, y: 1} + m_EdgeRadius: 0 +--- !u!95 &4876319062084765790 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7931162725081391912} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6c79b0d669df6a945a085ad512287fd1, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!82 &8141452048895499116 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7931162725081391912} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 7f206a742a5826146b49eb6f30f622ce, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 2.0293834 + 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: 1 + 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 diff --git a/Assets/Prefabs/轰炸区系统/炮弹（底层级，用在序章战场）.prefab.meta b/Assets/Prefabs/轰炸区系统/炮弹（底层级，用在序章战场）.prefab.meta new file mode 100644 index 0000000..e207cca --- /dev/null +++ b/Assets/Prefabs/轰炸区系统/炮弹（底层级，用在序章战场）.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc612d75e8981e74a95779eb0a0661b3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/轰炸区系统/阴影（低层级）.prefab b/Assets/Prefabs/轰炸区系统/阴影（低层级）.prefab new file mode 100644 index 0000000..1e52749 --- /dev/null +++ b/Assets/Prefabs/轰炸区系统/阴影（低层级）.prefab @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2058102616730576593 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2058102616730576595} + - component: {fileID: 2058102616730576594} + m_Layer: 0 + m_Name: "\u9634\u5F71\uFF08\u4F4E\u5C42\u7EA7\uFF09" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2058102616730576595 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2058102616730576593} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -12.152791, y: -2.24, z: 0} + m_LocalScale: {x: 1.5, y: 0.24, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2058102616730576594 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2058102616730576593} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -1 + m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 0.5882353} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/轰炸区系统/阴影（低层级）.prefab.meta b/Assets/Prefabs/轰炸区系统/阴影（低层级）.prefab.meta new file mode 100644 index 0000000..12c5d1d --- /dev/null +++ b/Assets/Prefabs/轰炸区系统/阴影（低层级）.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b29fbc7e4328a714882ec73c6b97cc5f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/序章-家中.unity b/Assets/Scenes/序章-家中.unity index f2feae9..7f53e69 100644 --- a/Assets/Scenes/序章-家中.unity +++ b/Assets/Scenes/序章-家中.unity @@ -648,7 +648,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.13324745, y: 0.172} m_AnchorMax: {x: 0.565, y: 0.41035822} - m_AnchoredPosition: {x: 0.80000305, y: -1.9000168} + m_AnchoredPosition: {x: 0.80000305, y: -1.9000092} m_SizeDelta: {x: -8, y: -12} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &144076822 @@ -1800,7 +1800,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -2102267203 - m_SortingLayer: 2 + m_SortingLayer: 3 m_SortingOrder: 101 m_Sprite: {fileID: 21300000, guid: ef62174db7455b54eb10187274c6c487, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -3145,6 +3145,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: catched: {fileID: 0} + throwingAngle: 45 missile: {fileID: 0} throwOffset: {fileID: 0} machineAudio: {fileID: 891250825} @@ -4563,7 +4564,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 25fb867d2049d41f597aefdd6b19f598, type: 3} m_Name: m_EditorClassIdentifier: - nameText: "\u4E3B\u89D2" + nameText: "\u6211" nameColor: {r: 1, g: 1, b: 1, a: 1} soundEffect: {fileID: 0} portraits: @@ -4628,7 +4629,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 25fb867d2049d41f597aefdd6b19f598, type: 3} m_Name: m_EditorClassIdentifier: - nameText: "\u4E3B\u89D2" + nameText: "\u6211" nameColor: {r: 1, g: 1, b: 1, a: 1} soundEffect: {fileID: 0} portraits: @@ -7427,7 +7428,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 25fb867d2049d41f597aefdd6b19f598, type: 3} m_Name: m_EditorClassIdentifier: - nameText: Father + nameText: "\u7236\u4EB2" nameColor: {r: 1, g: 1, b: 1, a: 1} soundEffect: {fileID: 0} portraits: @@ -7602,7 +7603,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -2102267203 - m_SortingLayer: 2 + m_SortingLayer: 3 m_SortingOrder: 100 m_Sprite: {fileID: 21300000, guid: 4860efe03218f35409057848102eb931, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -7761,7 +7762,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1861856986} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -10.189724, y: -0.6184256, z: -10} + m_LocalPosition: {x: -10.870555, y: -0.61863947, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 716192431} @@ -8801,7 +8802,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.028, y: 0.8655201} m_AnchorMax: {x: 0.2527861, y: 0.95120806} - m_AnchoredPosition: {x: 1.0006409, y: -0.1533966} + m_AnchoredPosition: {x: 1.0006256, y: -0.1533966} m_SizeDelta: {x: -6.6341, y: -3.6931992} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2083069445 diff --git a/Assets/Scenes/序章-战场.unity b/Assets/Scenes/序章-战场.unity index 290f72d..85d2cb9 100644 --- a/Assets/Scenes/序章-战场.unity +++ b/Assets/Scenes/序章-战场.unity @@ -284,7 +284,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 56435766} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.8480358, y: 0.4515488, z: -10} + m_LocalPosition: {x: -6.4981613, y: 1.6167873, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1049093360} @@ -594,6 +594,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1506938805} m_Modifications: + - target: {fileID: -6762193768233601706, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -919386973632262436, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} propertyPath: m_Name value: "\u4ED6\u7238" @@ -650,6 +654,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8362882774665735019, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 7769891390202795144, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} --- !u!4 &318330976 stripped @@ -694,8 +702,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: catched: {fileID: 0} + throwingAngle: 45 missile: {fileID: 4018427281142380165, guid: 628f0c1ef857ddd4687c94b8ba9b1aa6, type: 3} throwOffset: {fileID: 918764316} + machineAudio: {fileID: 0} --- !u!114 &318330980 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11650,7 +11660,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3945938556576538517, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} propertyPath: OKCount - value: 3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} propertyPath: m_RootOrder @@ -16742,7 +16752,7 @@ MonoBehaviour: bombingAreaMinimumTimeInterval: 1 bombingAreaMaximumTimeInterval: 3 bombingAreaMaxOffSetOfShell: 10 - bombingAreaShellHeight: 6 + bombingAreaShellHeight: 10 shellSpeed: 8 shellFallingTime: 1.5 shellShadowRangeOfChange: 0.05 @@ -16842,7 +16852,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373134508} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.13, y: 0.45000005, z: -10} + m_LocalPosition: {x: -7.95, y: 1.57, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 963972581} @@ -21759,7 +21769,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1506938804} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.57, y: -0.7, z: 0} + m_LocalPosition: {x: -3.51, y: 0.42, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: - {fileID: 318330976} @@ -32227,6 +32237,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3166212250367666326, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: shell + value: + objectReference: {fileID: 7931162725081391912, guid: cc612d75e8981e74a95779eb0a0661b3, type: 3} - target: {fileID: 3166212250367666326, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} propertyPath: shellShadowYOffset value: -1 diff --git a/Assets/Scenes/第一关.unity b/Assets/Scenes/第一关.unity index a16bced..7c0ba34 100644 --- a/Assets/Scenes/第一关.unity +++ b/Assets/Scenes/第一关.unity @@ -157,7 +157,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.13324745, y: 0.172} m_AnchorMax: {x: 0.565, y: 0.41035822} - m_AnchoredPosition: {x: 0.80000305, y: -1.8999939} + m_AnchoredPosition: {x: 0.80000305, y: -1.8999863} m_SizeDelta: {x: -8, y: -12} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &14316730 @@ -568,6 +568,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: catched: {fileID: 0} + throwingAngle: 45 missile: {fileID: 4018427281142380165, guid: 628f0c1ef857ddd4687c94b8ba9b1aa6, type: 3} throwOffset: {fileID: 674795379} machineAudio: {fileID: 1153818346} @@ -976,11 +977,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8233114533355190934, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_AnchoredPosition.y - value: -4 + value: -3.9999924 objectReference: {fileID: 0} - target: {fileID: 8233114534707674507, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_AnchoredPosition.y - value: -4 + value: -3.9999924 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} @@ -2236,10 +2237,10 @@ MonoBehaviour: runSpeedMultiple: 1.5 dotRoLineTime: 0.2 TelephoneNeedTime: 2 - bombingAreaMinimumTimeInterval: 2 - bombingAreaMaximumTimeInterval: 5 + bombingAreaMinimumTimeInterval: 1 + bombingAreaMaximumTimeInterval: 3 bombingAreaMaxOffSetOfShell: 10 - bombingAreaShellHeight: 11 + bombingAreaShellHeight: 15 shellSpeed: 10 shellFallingTime: 1 shellShadowRangeOfChange: 0.1 @@ -16436,7 +16437,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1142437218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -28.843811, y: -5.299382, z: -10} + m_LocalPosition: {x: -32.56149, y: -5.299382, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1608038909} @@ -31109,7 +31110,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 15 + m_SortingOrder: 16 m_Sprite: {fileID: -2487037875835679971, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Scenes/第二关.unity b/Assets/Scenes/第二关.unity index 3a299e7..83b65b7 100644 --- a/Assets/Scenes/第二关.unity +++ b/Assets/Scenes/第二关.unity @@ -1884,7 +1884,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 4 m_Sprite: {fileID: 4971675893652678071, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5803,7 +5803,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8233114533063075529, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_AnchoredPosition.y - value: -3.9001083 + value: -3.9001007 objectReference: {fileID: 0} - target: {fileID: 8233114533063075529, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5819,11 +5819,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8233114533355190934, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_AnchoredPosition.y - value: -3.9999657 + value: -3.9999695 objectReference: {fileID: 0} - target: {fileID: 8233114534707674507, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_AnchoredPosition.y - value: -3.9999657 + value: -3.9999695 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} @@ -8773,7 +8773,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 4 m_Sprite: {fileID: -3194961725106474587, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -11112,7 +11112,7 @@ MonoBehaviour: m_ActionName: PlayerInMissionBook/Quit[/Keyboard/k] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: Player - m_DefaultActionMap: PlayerNormal + m_DefaultActionMap: NullMap m_SplitScreenIndex: -1 m_Camera: {fileID: 0} --- !u!95 &1720952669 @@ -11964,7 +11964,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1791259307} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -32.297318, y: -5.0929832, z: -10} + m_LocalPosition: {x: -32.300373, y: -5.0929832, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1031032740} diff --git a/Assets/Scripts/具象物体/Patrolman.cs b/Assets/Scripts/具象物体/Patrolman.cs index ae5039f..03e1bbb 100644 --- a/Assets/Scripts/具象物体/Patrolman.cs +++ b/Assets/Scripts/具象物体/Patrolman.cs @@ -142,7 +142,7 @@ public class Patrolman : MonoBehaviour //开枪动画中调用，告诉玩家你被射死了 public void OnShoot() { - FindObjectOfType().YouAreShooting(); + //FindObjectOfType().YouAreShooting(); } void OnTriggerStay2D(Collider2D other) diff --git a/Assets/Scripts/具象物体/Shell.cs b/Assets/Scripts/具象物体/Shell.cs index 37a6d62..6a225a9 100644 --- a/Assets/Scripts/具象物体/Shell.cs +++ b/Assets/Scripts/具象物体/Shell.cs @@ -40,6 +40,7 @@ public class Shell : MonoBehaviour .transform; } Invoke("Drop",fallingTime); + Invoke("DestroySelf",10f); animator = GetComponent(); } @@ -104,6 +105,7 @@ public class Shell : MonoBehaviour { case "Player": //玩家被炮弹击中 + Debug.Log("玩家被炮弹击中"); break; case "地面": //Destroy(m_shadow.gameObject); diff --git a/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt index 3d66f60..29468d5 100644 --- a/Logs/ApiUpdaterCheck.txt +++ b/Logs/ApiUpdaterCheck.txt @@ -368,3 +368,63 @@ C# parse time : 185ms candidates check time : 43ms console write time : 0ms +[api-updater (non-obsolete-error-filter)] 2021/9/3 19:04:57 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 677.8239ms +moved types parse time: 55ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms + +[api-updater (non-obsolete-error-filter)] 2021/9/3 19:04:57 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 73.8044ms +moved types parse time: 52ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms + +[api-updater (non-obsolete-error-filter)] 2021/9/3 19:06:53 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 78.7895ms +moved types parse time: 51ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms + +[api-updater (non-obsolete-error-filter)] 2021/9/3 19:06:53 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 66.8477ms +moved types parse time: 47ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms + +[api-updater (non-obsolete-error-filter)] 2021/9/3 19:09:58 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 71.3955ms +moved types parse time: 47ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms + +[api-updater (non-obsolete-error-filter)] 2021/9/3 19:09:59 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 68.7913ms +moved types parse time: 49ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms + diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5d76452..b527594 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -128,7 +128,8 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 1.0 - preloadedAssets: [] + preloadedAssets: + - {fileID: 11400000, guid: 5b0ac5f58f6660143aa0c32c9a8b5cd6, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 17b1ab0..bab2413 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,25 +15,25 @@ EditorUserSettings: value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb + value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb + value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb flags: 0 RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 - flags: 0 - RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb + flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb + value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba95e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b1968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7