From 1e887f13a6edeb5415b74f6df3e690bc19d6ff5b Mon Sep 17 00:00:00 2001 From: Roman <1325980292@qq.com> Date: Thu, 19 Aug 2021 01:13:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E6=90=AD=E5=BB=BA?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=85=B3=E7=9A=84=E6=A1=86=E6=9E=B6=20?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E3=80=90=E7=AC=AC=E4=B8=80=E5=85=B3=E3=80=91?= =?UTF-8?q?=201.=E5=B8=83=E7=BD=AE=E6=8A=95=E6=8E=B7=E7=89=A9=E5=A0=86=202?= =?UTF-8?q?.=E5=AE=8C=E5=96=84=E6=8A=95=E6=8E=B7=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=BE=97=E6=8A=95=E6=8E=B7=E5=AE=8C=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E5=90=8E=E9=80=80=E5=87=BA=E6=8A=95=E6=8E=B7=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E5=9C=A8?= =?UTF-8?q?=E5=A0=86=E9=87=8C=E6=8B=BE=E5=8F=96=203.=E5=AE=89=E6=8E=92?= =?UTF-8?q?=E4=BA=86=E4=B8=A4=E4=B8=AA=E5=9C=B0=E9=9B=B7=204.=E7=BB=99?= =?UTF-8?q?=E6=8A=95=E6=8E=B7=E7=8A=B6=E6=80=81=E5=AE=89=E6=8E=92=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=80=80=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=BD=A0=E5=92=8C=E6=8A=95=E6=8E=B7=E7=89=A9?= =?UTF-8?q?=E5=A0=86=E4=BA=92=E5=8A=A8=E4=BA=86=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E7=AA=81=E7=84=B6=E4=B8=8D=E6=83=B3=E4=B8=A2=E4=BA=86=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8C=89K=E6=88=96=E8=80=85=E6=89=8B?= =?UTF-8?q?=E6=9F=84B=E9=94=AE=E9=80=80=E5=87=BA=E6=8A=95=E6=8E=B7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E3=80=82=E9=9C=80=E8=A6=81=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=E3=80=82=205.=E8=AE=BE=E8=AE=A1=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E7=9A=84=E6=95=8C=E4=BA=BA=EF=BC=8C=E4=BD=BF=E5=85=B6?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=9B=91=E6=B5=8B=E5=89=8D=E6=96=B9=E4=B8=80?= =?UTF-8?q?=E7=89=87=E5=8C=BA=E5=9F=9F=EF=BC=8C=E5=BD=93=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=B8=AD=E6=9C=89=E7=8E=A9=E5=AE=B6=EF=BC=8C=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E5=B0=84=E5=87=BB=E7=8A=B6=E6=80=81=E3=80=82=206.=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E3=80=90=E6=9C=BA=E6=9E=AA=E6=89=8B=E3=80=91=E4=B8=BA?= =?UTF-8?q?=E9=A2=84=E5=88=B6=E4=BD=93=EF=BC=8C=E7=9B=AE=E5=89=8D=EF=BC=8C?= =?UTF-8?q?=E8=8B=A5=E7=8E=A9=E5=AE=B6=E8=BF=9B=E5=85=A5=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E5=8C=BA=EF=BC=8C=E5=88=99=E5=8F=98=E7=BA=A2=EF=BC=8C=E8=A2=AB?= =?UTF-8?q?=E5=87=BB=E4=B8=AD=E5=90=8E=E5=8F=98=E7=BB=BF=EF=BC=8C=E4=B8=94?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=8F=98=E7=BA=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 下班。目前面对机枪手，视野非常受限，明天我会研究cinemamachine的用法。我明天将完成第一关的搭建。只剩8天了……加油吧。🙏 --- .../Effects/Wave/Attack_Wave/AWM0.mat | 2 +- Assets/Prefabs/敌人.meta | 8 + Assets/Prefabs/敌人/机枪手.prefab | 151 ++++++ Assets/Prefabs/敌人/机枪手.prefab.meta | 7 + Assets/Scenes/各种系统测试与陈列.unity | 184 +++++++- Assets/Scenes/第一关.unity | 442 +++++++++++++++++- Assets/Scripts/M_Player.cs | 53 +-- Assets/Scripts/具象物体/MachineGunner.cs | 48 ++ Assets/Scripts/具象物体/MachineGunner.cs.meta | 11 + UserSettings/EditorUserSettings.asset | 4 +- 10 files changed, 858 insertions(+), 52 deletions(-) create mode 100644 Assets/Prefabs/敌人.meta create mode 100644 Assets/Prefabs/敌人/机枪手.prefab create mode 100644 Assets/Prefabs/敌人/机枪手.prefab.meta create mode 100644 Assets/Scripts/具象物体/MachineGunner.cs create mode 100644 Assets/Scripts/具象物体/MachineGunner.cs.meta diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index 6d28161..0c32080 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.6066498, g: 0.21391696, b: 0, a: 0} + - Center: {r: 0.7582432, g: 0.2246884, b: 0, a: 0} - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/敌人.meta b/Assets/Prefabs/敌人.meta new file mode 100644 index 0000000..c3ad6c8 --- /dev/null +++ b/Assets/Prefabs/敌人.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0df21f9e5ece7064ab8bcb653278a9b9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/敌人/机枪手.prefab b/Assets/Prefabs/敌人/机枪手.prefab new file mode 100644 index 0000000..9209d32 --- /dev/null +++ b/Assets/Prefabs/敌人/机枪手.prefab @@ -0,0 +1,151 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8082445130133277909 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8082445130133277908} + - component: {fileID: 8082445130133277899} + - component: {fileID: 8082445130133277898} + - component: {fileID: 8082445130133277897} + - component: {fileID: 8082445130133277896} + m_Layer: 0 + m_Name: "\u673A\u67AA\u624B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8082445130133277908 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8082445130133277909} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -14.6, y: -1.1, z: 0} + m_LocalScale: {x: 11.589, y: 11.589, z: 11.589} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8082445130133277899 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8082445130133277909} + 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: 10 + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10, y: 10} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &8082445130133277898 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8082445130133277909} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.24, y: 0} + m_SpriteTilingProperty: + border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.16, y: 0.16} + newSize: {x: 10, y: 10} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.3, y: 0.09} + m_EdgeRadius: 0 +--- !u!61 &8082445130133277897 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8082445130133277909} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.16, y: 0.16} + newSize: {x: 10, y: 10} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.16, y: 0.16} + m_EdgeRadius: 0 +--- !u!114 &8082445130133277896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8082445130133277909} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5cdd99633c75ab4293d9cc2cc869bd1, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/敌人/机枪手.prefab.meta b/Assets/Prefabs/敌人/机枪手.prefab.meta new file mode 100644 index 0000000..6de31bc --- /dev/null +++ b/Assets/Prefabs/敌人/机枪手.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fab0acc13c79e5248a20877602bd9007 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/各种系统测试与陈列.unity b/Assets/Scenes/各种系统测试与陈列.unity index 15202e6..8983bec 100644 --- a/Assets/Scenes/各种系统测试与陈列.unity +++ b/Assets/Scenes/各种系统测试与陈列.unity @@ -683,6 +683,11 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!4 &199464879 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + m_PrefabInstance: {fileID: 8082445130261175163} + m_PrefabAsset: {fileID: 0} --- !u!1 &226206386 GameObject: m_ObjectHideFlags: 0 @@ -1179,6 +1184,7 @@ Transform: - {fileID: 381999399} - {fileID: 684400311} - {fileID: 1815998268} + - {fileID: 199464879} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1769,7 +1775,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 604041686} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.0700002, y: -0.86, z: -10} + m_LocalPosition: {x: -8.2, y: -0.86, z: -10} m_LocalScale: {x: 40.825, y: 10.626138, z: 1} m_Children: - {fileID: 2009057140} @@ -2031,7 +2037,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} propertyPath: m_LocalPosition.x - value: -12.81 + value: -21.27 objectReference: {fileID: 0} - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} propertyPath: m_LocalPosition.y @@ -3352,6 +3358,109 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1310739312 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5563886958839055788, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + m_PrefabInstance: {fileID: 1692961901516479215} + m_PrefabAsset: {fileID: 0} +--- !u!120 &1310739313 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1310739312} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 10 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.23611069 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 --- !u!1 &1318196405 GameObject: m_ObjectHideFlags: 0 @@ -3462,7 +3571,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1334261266} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.0700002, y: -0.86, z: -10} + m_LocalPosition: {x: -8.2, y: -0.86, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1894615460} @@ -6010,6 +6119,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1601657821} m_Modifications: + - target: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalPosition.x + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalPosition.y + value: -0.76 + objectReference: {fileID: 0} - target: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: throwOffset value: @@ -6020,7 +6137,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_LocalPosition.x - value: -0.93 + value: -11.2 objectReference: {fileID: 0} - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_LocalPosition.y @@ -6069,6 +6186,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} m_PrefabInstance: {fileID: 1692961901516479215} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8082445130261175163 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 293805376} + m_Modifications: + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalPosition.x + value: -14.6 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalPosition.y + value: -1.1 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277909, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_Name + value: "\u673A\u67AA\u624B" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fab0acc13c79e5248a20877602bd9007, type: 3} --- !u!1001 &8233114534945036262 PrefabInstance: m_ObjectHideFlags: 0 @@ -6150,7 +6324,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8233114533063075529, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_AnchoredPosition.y - value: -3.9000397 + value: -3.9000473 objectReference: {fileID: 0} - target: {fileID: 8233114533063075529, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Scenes/第一关.unity b/Assets/Scenes/第一关.unity index d1b0bcc..3fd8e40 100644 --- a/Assets/Scenes/第一关.unity +++ b/Assets/Scenes/第一关.unity @@ -318,11 +318,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8233114533355190934, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_AnchoredPosition.y - value: -3.9999695 + value: -3.999977 objectReference: {fileID: 0} - target: {fileID: 8233114534707674507, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_AnchoredPosition.y - value: -3.9999695 + value: -3.999977 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} @@ -359,11 +359,15 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 800689920} + - {fileID: 578878689} + - {fileID: 979697028} - {fileID: 308174201} - {fileID: 1253443725} - {fileID: 1224042232} - {fileID: 481019693} - {fileID: 987095759} + - {fileID: 380132184} + - {fileID: 1353699409} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -574,7 +578,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 105534304} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &308174202 PolygonCollider2D: @@ -607,8 +611,9 @@ PolygonCollider2D: - {x: 14.799332, y: -9.331226} - {x: 14.444958, y: -3.976991} - {x: 7.3042297, y: -3.9511564} - - {x: 5.6508026, y: -7.7148743} - - {x: -0.14165115, y: -7.488204} + - {x: 5.8574867, y: -6.419137} + - {x: 5.717598, y: -6.9578714} + - {x: 0.3036461, y: -6.9761133} - {x: -0.8687706, y: -3.3759243} - {x: -57.19724, y: -3.4794416} - {x: -68.73997, y: -9.85104} @@ -680,7 +685,7 @@ MonoBehaviour: shellFallingTime: 1 shellShadowRangeOfChange: 0.1 rateOfChangeOfThrowingAngle: 1 - strengthOfThrowing: 8 + strengthOfThrowing: 10 stageName: CGFadeTime: 2 --- !u!4 &371655832 @@ -697,6 +702,68 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &380132183 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 105534304} + m_Modifications: + - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_LocalPosition.x + value: 15.24 + objectReference: {fileID: 0} + - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_LocalPosition.y + value: -1.82 + objectReference: {fileID: 0} + - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3118168874406839345, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + propertyPath: m_Name + value: "\u6295\u63B7\u7269\u5806\uFF08\u6D4B\u8BD5\u7528" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a33f3ee35358b11469af30e9a746a630, type: 3} +--- !u!4 &380132184 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} + m_PrefabInstance: {fileID: 380132183} + m_PrefabAsset: {fileID: 0} --- !u!1 &476778784 GameObject: m_ObjectHideFlags: 0 @@ -867,7 +934,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} propertyPath: m_LocalPosition.x @@ -1017,6 +1084,68 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1001 &578878688 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 105534304} + m_Modifications: + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalPosition.x + value: 22.24 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalPosition.y + value: -2.15 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalPosition.z + value: 0.40322465 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148206, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_Name + value: "\u5730\u96F71" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} +--- !u!4 &578878689 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + m_PrefabInstance: {fileID: 578878688} + m_PrefabAsset: {fileID: 0} --- !u!1 &643242559 GameObject: m_ObjectHideFlags: 1 @@ -1194,6 +1323,120 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 661557427} m_CullTransparentMesh: 1 +--- !u!1 &778287439 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5563886958839055788, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + m_PrefabInstance: {fileID: 1569292140} + m_PrefabAsset: {fileID: 0} +--- !u!120 &778287440 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 778287439} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2bcc72af9791dfb448148e231fb8c7ee, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 10 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1 + value: 0.13888931 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!114 &778287442 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + m_PrefabInstance: {fileID: 1569292140} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 778287439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e2c1a0de69ef6d468a14db32ebf68fe, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &779433965 GameObject: m_ObjectHideFlags: 0 @@ -1817,6 +2060,68 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &979697027 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 105534304} + m_Modifications: + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalPosition.x + value: 26.07 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalPosition.y + value: -2.15 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalPosition.z + value: 0.40322465 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8083259778992148206, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + propertyPath: m_Name + value: "\u5730\u96F72" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} +--- !u!4 &979697028 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} + m_PrefabInstance: {fileID: 979697027} + m_PrefabAsset: {fileID: 0} --- !u!1 &985766167 GameObject: m_ObjectHideFlags: 0 @@ -1909,7 +2214,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &987095759 Transform: m_ObjectHideFlags: 0 @@ -1922,7 +2227,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 105534304} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &987095760 BoxCollider2D: @@ -2305,7 +2610,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1142437218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 8.9, y: 2.39, z: -10} + m_LocalPosition: {x: 46.37, y: -0.32999998, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1608038909} @@ -2459,7 +2764,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 105534304} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1224042233 BoxCollider2D: @@ -2582,7 +2887,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 105534304} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1253443726 MonoBehaviour: @@ -2765,6 +3070,68 @@ MonoBehaviour: m_EditorClassIdentifier: shell: {fileID: 6293088924721911990, guid: bdd288e4cdf08da45b1a42ced9473872, type: 3} bombingArea: {fileID: 1842116604} +--- !u!1001 &1353699408 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 105534304} + m_Modifications: + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalPosition.x + value: 54.97 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalPosition.y + value: -2.05 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8082445130133277909, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + propertyPath: m_Name + value: "\u673A\u67AA\u624B" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fab0acc13c79e5248a20877602bd9007, type: 3} +--- !u!4 &1353699409 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8082445130133277908, guid: fab0acc13c79e5248a20877602bd9007, type: 3} + m_PrefabInstance: {fileID: 1353699408} + m_PrefabAsset: {fileID: 0} --- !u!1 &1414747976 GameObject: m_ObjectHideFlags: 0 @@ -2950,7 +3317,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1477400527} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 8.9, y: 2.39, z: -10} + m_LocalPosition: {x: 46.37, y: -0.32999998, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 32565896} @@ -3085,17 +3452,57 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1062651719} m_Modifications: + - target: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalPosition.x + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalPosition.y + value: -0.76 + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 778287442} + - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnThrowQuit + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: M_Player, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: throwOffset + value: + objectReference: {fileID: 1569292142} - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_LocalPosition.x - value: 5.81 + value: 43.28 objectReference: {fileID: 0} - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_LocalPosition.y - value: 2.13 + value: -0.59 objectReference: {fileID: 0} - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_LocalPosition.z @@ -3140,6 +3547,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} m_PrefabInstance: {fileID: 1569292140} m_PrefabAsset: {fileID: 0} +--- !u!4 &1569292142 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + m_PrefabInstance: {fileID: 1569292140} + m_PrefabAsset: {fileID: 0} --- !u!1 &1608038908 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/M_Player.cs b/Assets/Scripts/M_Player.cs index d6ddd04..7559f18 100644 --- a/Assets/Scripts/M_Player.cs +++ b/Assets/Scripts/M_Player.cs @@ -4,6 +4,7 @@ using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.InputSystem.Interactions; using UnityEngine.UI; +using Cinemachine; public class M_Player : MonoBehaviour { @@ -12,7 +13,6 @@ public class M_Player : MonoBehaviour private Vector2 velocity;//逻辑速度，通过计算获得，最后加在理论速度上 private Rigidbody2D m_rigidbody;//自身刚体组件 private int inputDir;//输入方向方向,-1\0\1 - //public GameObject bullet;//子弹预制体 private int faceDir;//面部朝向，-1、1 private float runSpeedMultiple = 1f;//速度倍率，在按下和释放跑步后被修改 [Tooltip("所捕捉到的可交互对象,不要手动赋值，这个会自己捕捉")] @@ -37,7 +37,6 @@ public class M_Player : MonoBehaviour //为了解决warming，最后阶段请删除，到那时应该不会再有警告 if(inputDir == 0){} - if(throwingState){} // } @@ -47,15 +46,12 @@ public class M_Player : MonoBehaviour AdjustTheAngle(); } - void FixedUpdate() - { - Move(); - } + void FixedUpdate(){} //调整投掷角度的函数 private void AdjustTheAngle() { - if(canAdjustTheAngle)//如果玩家正在调整角度 + if(canAdjustTheAngle)//如果玩家能调整角度 { throwingAngle += throwingAngleDir//则让现在的抛出角度加上变化的速度 * indexRecoder.rateOfChangeOfThrowingAngle//乘以变化的速率 @@ -95,23 +91,6 @@ public class M_Player : MonoBehaviour transform.localScale.z); } - private void Move() - { - // //指定水平方向的速度 - // m_rigidbody.velocity = new Vector2(indexRecoder.playerMoveSpeed* //记录文件中的玩家速度乘以 - // inputDir*//输入的方向乘以 - // runSpeedMultiple,//速度的倍率，对付跑步时候的需要 - // m_rigidbody.velocity.y//y轴的速度不变 - // ); - } - // void OnAnimatorMove()//Unity的回调函数，这样做能解决模型无法转向的问题，每帧调用一次 - // { - // m_rigidbody.MovePosition(m_rigidbody.position + faceDir*M_Animator.deltaPosition.magnitude*Vector2.right); - // Debug.Log(M_Animator.deltaPosition.magnitude); - // //m_RigidBody.MoveRotation(m_Rotation);//当物体有物理组件rigidbody的时候，再修改位置和旋转信息就不要用transfrom了，用刚体自带的Move等方法 - // } - - //监听投掷按键的函数 public void OnThrow(InputAction.CallbackContext context) { @@ -121,7 +100,7 @@ public class M_Player : MonoBehaviour } if(context.canceled)//如果是刚松开投掷键，表示要丢东西了 { - Throw(); + if(throwingState)Throw();//如果处于投掷阶段，则触发丢 } } @@ -130,6 +109,9 @@ public class M_Player : MonoBehaviour if(context.started) catched.Quit();//如果按下退出按钮，则执行捕捉到物体的退出功能 } + //如果正处于投掷状态，则退出投掷状态的监听函数 + public void OnThrowQuit(InputAction.CallbackContext context){if(throwingState)QuitThrowingsState();} + //监听修改投掷角度的函数 public void OnAdjustTheAngle(InputAction.CallbackContext context) {throwingAngleDir = context.ReadValue();}//把收到的轴的值交给角度变化的大小和方向 @@ -137,11 +119,15 @@ public class M_Player : MonoBehaviour //控制投掷相关的具体函数 private void Throw() { - //Debug.Log("我投出手上拿着的东西了"); - Rigidbody2D rigidbodyOfMissile = - Instantiate(missile,throwOffset.position,Quaternion.identity).GetComponent(); + Rigidbody2D rigidbodyOfMissile = //并且获得这个投掷物身上的刚体组件 + Instantiate(missile,throwOffset.position,Quaternion.identity).GetComponent();//生成一个投掷物 + + //给这个投掷物赋予速度，由目前的角度决定 rigidbodyOfMissile.velocity = new Vector2(indexRecoder.strengthOfThrowing*Mathf.Cos(throwingAngle), indexRecoder.strengthOfThrowing*Mathf.Sin(throwingAngle)); + + //扔完后退出投掷状态并且重置相关参数 + QuitThrowingsState(); } //进入跑步状态的控制代码 @@ -210,13 +196,22 @@ public class M_Player : MonoBehaviour } //等待完善投掷系统 - public void QuitThrowingsState(){} + public void QuitThrowingsState() + { + throwingState = false;//改变自身标记 + playerInput.SwitchCurrentActionMap("PlayerNormal");//修改自身操控地图 + throwingAngle = 45f;//恢复投掷角度到45° + canAdjustTheAngle = false;//可修改角度标记改为false + GetComponent().enabled = false;//别画线了 + + } //绘制投掷曲线的函数，非常🐂 public void DrawPath() { // LineRenderer line = GetComponent();//获取组件 + line.enabled = true; int segmentCount = 15;//定义点数 line.positionCount = segmentCount;//传入点数 float gravity=9.8f;//定义重力常量 diff --git a/Assets/Scripts/具象物体/MachineGunner.cs b/Assets/Scripts/具象物体/MachineGunner.cs new file mode 100644 index 0000000..112f87c --- /dev/null +++ b/Assets/Scripts/具象物体/MachineGunner.cs @@ -0,0 +1,48 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MachineGunner : MonoBehaviour +{ + //机枪手类，控制检测前方一片区域的敌人 + // Start is called before the first frame update + private bool hasBeHit = false;//是否已被打中 + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + //触发器是敌人的前方监测区域，当玩家进入检测区域，机枪手进入射击状态，目前用变红表示 + void OnTriggerEnter2D(Collider2D other) + { + if(other.tag == "Player" && !hasBeHit)//同时需要满足未被击中这个条件 + { + GetComponent().color = Color.red; + } + } + //当玩家退出检测区域，停止射击状态,变为通常状态，现在用白色表示 + void OnTriggerExit2D(Collider2D other) + { + if(other.tag == "Player") + { + GetComponent().color = Color.white; + } + } + //碰撞体是机枪手自身的碰撞体，如果被投掷物砸中，则陷入昏迷状态，目前用绿色表示 + void OnCollisionEnter2D(Collision2D other) + { + if(other.gameObject.tag == "投掷物") + { + hasBeHit = true;//标记自身已被击中 + GetComponent().color = Color.green; + } + } + + +} diff --git a/Assets/Scripts/具象物体/MachineGunner.cs.meta b/Assets/Scripts/具象物体/MachineGunner.cs.meta new file mode 100644 index 0000000..b991db8 --- /dev/null +++ b/Assets/Scripts/具象物体/MachineGunner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e5cdd99633c75ab4293d9cc2cc869bd1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 0d6f91b..5c649bd 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,10 +27,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb + value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb