From 1cfe5ef4c096464e71c06ff86bb181696bda5578 Mon Sep 17 00:00:00 2001 From: Roman <1325980292@qq.com> Date: Wed, 15 Dec 2021 00:07:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E6=90=AD=E5=BB=BA?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E7=9A=84=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.替换和适配地藏关卡美术资源 2.编写玩家被敲钟攻击逻辑 （1.当钟抬起到落下期间，中幅度震动手柄和屏幕 （2.当撞钟能攻击到玩家，触发玩家annoying事件，当不能，且玩家正处于annoying状态，则触发玩家Outannoying事件。annoying事件中修改玩家beannoying标记，并编写减速减益状态，Outannoying事件中修改标记，并还原减益。Update中，若处于beannoying状态，则减少受击CDLeft，若CDLeft降到0以下则受击并击飞，并重置受击CDLeft。 （3.当撞钟攻击结束时玩家任然处于被干扰状态，触发玩家的脱离干扰事件 3.修改震动管理员类，新建一种无法被覆盖的震动 4.伸手的时候中幅度震动手柄和屏幕 5.修改敲钟攻击逻辑，使得敲钟时玩家无论在何处都要减速 6.手被攻击的时候中幅度震动手柄和屏幕 --- Assets/Prefabs/硬币.prefab | 12 +- Assets/RawSignal/撞钟震动源 Raw Signal.asset | 28 ++ .../撞钟震动源 Raw Signal.asset.meta | 8 + Assets/Scenes/DiZangStageTest.unity | 413 ++++++++++++++++-- Assets/Scenes/TeLuoYiStageTest.unity | 11 +- Assets/Scenes/test.unity | 9 +- Assets/Scripts/Bell.cs | 55 ++- Assets/Scripts/DiZang.cs | 16 +- Assets/Scripts/DiZangsHadn.cs | 15 + Assets/Scripts/MoneyBox.cs | 19 +- Assets/Scripts/MyPlayer.cs | 26 ++ Assets/Scripts/TrojanHorse.cs | 4 +- Assets/Scripts/VibrationManager.cs | 58 ++- Assets/Shader/闪光效果/Custom_Flash.mat | 10 +- Assets/Sprites/早期临时混乱/1关boss地面.png | Bin 0 -> 3522 bytes .../Sprites/早期临时混乱/1关boss地面.png.meta | 96 ++++ Assets/Sprites/早期临时混乱/手.png | Bin 0 -> 11040 bytes Assets/Sprites/早期临时混乱/手.png.meta | 96 ++++ Assets/Sprites/早期临时混乱/装钱箱子.png | Bin 0 -> 3409 bytes Assets/Sprites/早期临时混乱/装钱箱子.png.meta | 132 ++++++ Assets/Sprites/早期临时混乱/钱.png | Bin 0 -> 406 bytes Assets/Sprites/早期临时混乱/钱.png.meta | 96 ++++ ProjectSettings/EditorBuildSettings.asset | 6 + ProjectSettings/Physics2DSettings.asset | 2 +- UserSettings/EditorUserSettings.asset | 4 +- 25 files changed, 1033 insertions(+), 83 deletions(-) create mode 100644 Assets/RawSignal/撞钟震动源 Raw Signal.asset create mode 100644 Assets/RawSignal/撞钟震动源 Raw Signal.asset.meta create mode 100644 Assets/Sprites/早期临时混乱/1关boss地面.png create mode 100644 Assets/Sprites/早期临时混乱/1关boss地面.png.meta create mode 100644 Assets/Sprites/早期临时混乱/手.png create mode 100644 Assets/Sprites/早期临时混乱/手.png.meta create mode 100644 Assets/Sprites/早期临时混乱/装钱箱子.png create mode 100644 Assets/Sprites/早期临时混乱/装钱箱子.png.meta create mode 100644 Assets/Sprites/早期临时混乱/钱.png create mode 100644 Assets/Sprites/早期临时混乱/钱.png.meta diff --git a/Assets/Prefabs/硬币.prefab b/Assets/Prefabs/硬币.prefab index 8e76184..c7f9211 100644 --- a/Assets/Prefabs/硬币.prefab +++ b/Assets/Prefabs/硬币.prefab @@ -87,7 +87,7 @@ Transform: m_GameObject: {fileID: 2312258847787666435} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.01860857, y: -2.61, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 830885187} m_Father: {fileID: 0} @@ -112,7 +112,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + - {fileID: 2100000, guid: dd84cc2fc2c79654d964910278d4d10a, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -133,7 +133,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Sprite: {fileID: 21300000, guid: 90659c9dccda1794e98995e196dd510f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -161,14 +161,14 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} + oldSize: {x: 0.36, y: 0.36} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.4, y: 0.4} m_EdgeRadius: 0 --- !u!50 &2312258847787666432 Rigidbody2D: @@ -221,7 +221,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} + oldSize: {x: 0.36, y: 0.36} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 diff --git a/Assets/RawSignal/撞钟震动源 Raw Signal.asset b/Assets/RawSignal/撞钟震动源 Raw Signal.asset new file mode 100644 index 0000000..290e645 --- /dev/null +++ b/Assets/RawSignal/撞钟震动源 Raw Signal.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7f59e54f2bfd184b9dd451a678d089b, type: 3} + m_Name: "\u649E\u949F\u9707\u52A8\u6E90 Raw Signal" + m_EditorClassIdentifier: + PositionNoise: + - X: + Frequency: 4 + Amplitude: 4 + Constant: 1 + Y: + Frequency: 4 + Amplitude: 4 + Constant: 1 + Z: + Frequency: 0 + Amplitude: 0 + Constant: 0 + OrientationNoise: [] diff --git a/Assets/RawSignal/撞钟震动源 Raw Signal.asset.meta b/Assets/RawSignal/撞钟震动源 Raw Signal.asset.meta new file mode 100644 index 0000000..0658888 --- /dev/null +++ b/Assets/RawSignal/撞钟震动源 Raw Signal.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52892e5895052394eadd2063f0423a2d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/DiZangStageTest.unity b/Assets/Scenes/DiZangStageTest.unity index d9f2e4c..6169a5e 100644 --- a/Assets/Scenes/DiZangStageTest.unity +++ b/Assets/Scenes/DiZangStageTest.unity @@ -152,7 +152,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &28312535 MonoBehaviour: @@ -168,6 +168,88 @@ MonoBehaviour: m_EditorClassIdentifier: strength: 3 dir: {x: 1, y: 1} +--- !u!1 &236152271 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 236152272} + - component: {fileID: 236152273} + m_Layer: 0 + m_Name: "\u684C\u4E0A\u786C\u5E01" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &236152272 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236152271} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.327, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 295389548} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &236152273 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236152271} + 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: dd84cc2fc2c79654d964910278d4d10a, 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: 2 + m_Sprite: {fileID: 21300000, guid: 90659c9dccda1794e98995e196dd510f, 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!1 &295389546 GameObject: m_ObjectHideFlags: 0 @@ -227,7 +309,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 2 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Sprite: {fileID: 21300000, guid: c7c81f7fd74d1a243b3310e0dc2b471d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -246,9 +328,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 295389546} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.125, y: -0.072, z: 0} + m_LocalPosition: {x: 0.125, y: -0.388, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 236152272} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -283,7 +366,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} + oldSize: {x: 1.12, y: 0.36} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -292,6 +375,63 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1 &403283579 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 403283581} + - component: {fileID: 403283580} + m_Layer: 2 + m_Name: "\u7A7A\u6C14\u5899\uFF08\u9876" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &403283580 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 403283579} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: e9fe73f08a54f52478fbf9f9b31e0da7, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 5.13, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 14.92} + m_EdgeRadius: 0 +--- !u!4 &403283581 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 403283579} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0.28590712, y: 0.27, z: -0.74948484} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!1 &525554315 GameObject: m_ObjectHideFlags: 0 @@ -407,7 +547,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: 21300000, guid: b8b57f76f2603f74e9538916f1a1f4ad, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -434,7 +574,7 @@ Transform: - {fileID: 575347545} - {fileID: 2086773092} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &552131610 MonoBehaviour: @@ -455,7 +595,7 @@ MonoBehaviour: canBeHit: 1 state: 0 HPLeft: 0 - timeBetweenAttacks: 5 + timeBetweenAttacks: 1 aiYuPinBuildLimit: 0 aiYuPin: {fileID: 7746389308535175434, guid: 6d2fc6e5da22cf748b7c6730494b0460, type: 3} throwingPointGroupUp: @@ -464,8 +604,10 @@ MonoBehaviour: throwingPointGroupDown: - {fileID: 28312535} - {fileID: 2059592404} - CallAiYuPinEndTime: 5 + CallAiYuPinEndTime: 10 throwingPointGroupUse: [] + vibrationManager: {fileID: 0} + inBell: 0 --- !u!61 &552131611 BoxCollider2D: m_ObjectHideFlags: 0 @@ -535,7 +677,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &575347544 GameObject: @@ -565,8 +707,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 575347544} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 10, z: 0} - m_LocalScale: {x: 1, y: 10.01, z: 1} + m_LocalPosition: {x: 0, y: 9.41, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 552131609} m_RootOrder: 1 @@ -611,7 +753,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 3 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Sprite: {fileID: 21300000, guid: 73d8e32736352c2428a25a492d1c3472, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -655,14 +797,14 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} + oldSize: {x: 1.68, y: 8.28} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1} + m_Size: {x: 1, y: 8.09} m_EdgeRadius: 0 --- !u!50 &575347549 Rigidbody2D: @@ -968,6 +1110,7 @@ MonoBehaviour: catingAiYuPin: {fileID: 0} catching: {fileID: 0} specialMoneyCount: 0 + isAnnoying: 0 inputDir: 0 isLanding: 0 hammerCDLeft: 0 @@ -1080,7 +1223,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 761593102} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.35, y: -3.48, z: 0} + m_LocalPosition: {x: -3.35, y: -3.76, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 861291080} @@ -1323,7 +1466,7 @@ Transform: m_LocalScale: {x: 3.6625, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!251 &1025813219 PlatformEffector2D: @@ -1452,7 +1595,7 @@ Transform: m_LocalScale: {x: 3.6625, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1052484726 BoxCollider2D: @@ -1581,7 +1724,7 @@ Transform: m_LocalScale: {x: 3.6625, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1170153513 BoxCollider2D: @@ -1707,7 +1850,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1226109627} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.037861586, y: -1.6225245, z: -10} + m_LocalPosition: {x: 0.034162283, y: -1.6232591, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -1861,7 +2004,7 @@ Transform: m_LocalScale: {x: 3.6625, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1297453558 BoxCollider2D: @@ -2092,7 +2235,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1612227040} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.0400002, y: -2.78, z: -10} + m_LocalPosition: {x: 0.0400002, y: -3.06, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1633348943} @@ -2377,7 +2520,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1678223708 GameObject: @@ -2538,6 +2681,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8552cc6ae4e3ee6439c72af8eff091ff, type: 3} m_Name: m_EditorClassIdentifier: + doNotStopShakeNum: + itemNow: 0 + inHorseStage: 0 --- !u!114 &1763428732 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2626,7 +2772,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 4.8626485, y: 0.5469756, z: -2.6886199} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1872531583} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2701,7 +2848,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 42cc7748065ae884da1c46ee1245dd05, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2725,11 +2872,120 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eb1ead91b6d7c9949b86dadd3704ba8d, type: 3} m_Name: m_EditorClassIdentifier: - upDistance: 2 - atkTime: 5 + upDistance: 3 + atkTime: 4 owner: {fileID: 0} - upTime: 2 + upTime: 1.5 + annoyingToHitTime: 0.5 isAtking: 0 + isAnnoyingPlayer: 0 +--- !u!1 &1872531582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1872531583} + - component: {fileID: 1872531585} + - component: {fileID: 1872531584} + m_Layer: 0 + m_Name: "\u649E\u949F\u9707\u52A8\u6E90" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1872531583 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872531582} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.85, y: -0.82, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1763428733} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1872531584 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872531582} + 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, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!114 &1872531585 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872531582} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd438dd108a0f284aa931a2da434f1d3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ImpulseDefinition: + m_ImpulseChannel: 1 + m_RawSignal: {fileID: 11400000, guid: 52892e5895052394eadd2063f0423a2d, type: 2} + m_AmplitudeGain: 0.01 + m_FrequencyGain: 2.5 + m_RepeatMode: 0 + m_Randomize: 1 + m_TimeEnvelope: + m_AttackShape: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_DecayShape: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_AttackTime: 0 + m_SustainTime: 6 + m_DecayTime: 0.7 + m_ScaleWithImpact: 1 + m_HoldForever: 0 + m_ImpactRadius: 100 + m_DirectionMode: 0 + m_DissipationMode: 2 + m_DissipationDistance: 1000 + m_PropagationSpeed: 343 + m_LayerMask: + serializedVersion: 2 + m_Bits: 1 + m_IgnoreTag: + m_UseImpactDirection: 0 + m_ScaleImpactWithMass: 0 + m_ScaleImpactWithSpeed: 0 --- !u!1 &1954591986 GameObject: m_ObjectHideFlags: 0 @@ -2817,7 +3073,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -1 + m_SortingOrder: -2 m_Sprite: {fileID: 21300000, guid: 45468251348e26f44b5c7755ea556758, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2838,8 +3094,9 @@ Transform: m_GameObject: {fileID: 1963485813} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} + m_Children: + - {fileID: 2057861409} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2951,7 +3208,7 @@ Transform: m_LocalScale: {x: 3.6625, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &2021758233 BoxCollider2D: @@ -2998,6 +3255,88 @@ PlatformEffector2D: m_UseSideFriction: 0 m_UseSideBounce: 0 m_SideArc: 1 +--- !u!1 &2057861408 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2057861409} + - component: {fileID: 2057861410} + m_Layer: 0 + m_Name: "1\u5173boss\u5730\u9762" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2057861409 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057861408} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -4.05, z: 0} + m_LocalScale: {x: 0.90909094, y: 0.90909094, z: 0.90909094} + m_Children: [] + m_Father: {fileID: 1963485815} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2057861410 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057861408} + 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: 68f8e3f156be0f64c86685a3acb253e6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12.44, y: 0.76} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2059592403 GameObject: m_ObjectHideFlags: 0 @@ -3041,7 +3380,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2086773091 GameObject: @@ -3067,7 +3406,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2086773091} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.12, y: 4.8, z: 0} + m_LocalPosition: {x: 0.12, y: 4.07, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 552131609} @@ -3115,9 +3454,9 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 4.9903784, y: 5.8128557} - - {x: -4.955195, y: 5.792516} - - {x: -4.986419, y: -2.840673} + - - {x: 4.840126, y: 5.3620996} + - {x: -4.744842, y: 5.431912} + - {x: -4.8061175, y: -2.900774} - {x: 4.936577, y: -2.8223462} --- !u!4 &2132302663 Transform: diff --git a/Assets/Scenes/TeLuoYiStageTest.unity b/Assets/Scenes/TeLuoYiStageTest.unity index fdbe875..8e00ff4 100644 --- a/Assets/Scenes/TeLuoYiStageTest.unity +++ b/Assets/Scenes/TeLuoYiStageTest.unity @@ -387,6 +387,7 @@ MonoBehaviour: catingAiYuPin: {fileID: 0} catching: {fileID: 0} specialMoneyCount: 0 + isAnnoying: 0 inputDir: 0 isLanding: 0 hammerCDLeft: 0 @@ -1313,12 +1314,12 @@ MonoBehaviour: canBeHit: 1 state: 0 HPLeft: 0 - timeBetweenAttacks: 3 + timeBetweenAttacks: 1 yiSiLan: {fileID: 4312721376048571783, guid: fbfdd225dbb0dfe4ca6246532e0ec9cb, type: 3} yiSiLanMinTime: 1 yiSiLanMaxTime: 3 sprayBoomer: {fileID: 7438740031623559657, guid: 6f425457493cafb409f540876c51609c, type: 3} - sprayBoomerTime: 1 + sprayBoomerTime: 0.5 sprayBoomerDir: {x: 2, y: 1.5} sprayBoomerMultiple: 1.3 callBoomStartVelocity: {x: -5, y: -20} @@ -1585,7 +1586,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305025512} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.59000015, y: -0.32, z: -10} + m_LocalPosition: {x: -0.59000015, y: -0.35653356, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -2091,7 +2092,7 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 m_AttackTime: 0 - m_SustainTime: 60 + m_SustainTime: 6000 m_DecayTime: 0.7 m_ScaleWithImpact: 1 m_HoldForever: 0 @@ -2130,6 +2131,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8552cc6ae4e3ee6439c72af8eff091ff, type: 3} m_Name: m_EditorClassIdentifier: + doNotStopShakeNum: + itemNow: 0 inHorseStage: 1 --- !u!114 &1760984411 MonoBehaviour: diff --git a/Assets/Scenes/test.unity b/Assets/Scenes/test.unity index 5f69d11..4ed1843 100644 --- a/Assets/Scenes/test.unity +++ b/Assets/Scenes/test.unity @@ -2171,6 +2171,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8552cc6ae4e3ee6439c72af8eff091ff, type: 3} m_Name: m_EditorClassIdentifier: + itemNow: 0 inHorseStage: 0 --- !u!1 &2098309882 GameObject: @@ -2307,11 +2308,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4312721376048571778, guid: fbfdd225dbb0dfe4ca6246532e0ec9cb, type: 3} propertyPath: m_LocalPosition.x - value: 8.33 + value: 15.94 objectReference: {fileID: 0} - target: {fileID: 4312721376048571778, guid: fbfdd225dbb0dfe4ca6246532e0ec9cb, type: 3} propertyPath: m_LocalPosition.y - value: 0.37 + value: 0.84 objectReference: {fileID: 0} - target: {fileID: 4312721376048571778, guid: fbfdd225dbb0dfe4ca6246532e0ec9cb, type: 3} propertyPath: m_LocalPosition.z @@ -2367,7 +2368,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4312721376048571783, guid: fbfdd225dbb0dfe4ca6246532e0ec9cb, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbfdd225dbb0dfe4ca6246532e0ec9cb, type: 3} @@ -2384,7 +2385,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7746389308535175434, guid: 6d2fc6e5da22cf748b7c6730494b0460, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7746389308535175438, guid: 6d2fc6e5da22cf748b7c6730494b0460, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Scripts/Bell.cs b/Assets/Scripts/Bell.cs index ae6ccb9..76f7ff9 100644 --- a/Assets/Scripts/Bell.cs +++ b/Assets/Scripts/Bell.cs @@ -36,6 +36,11 @@ public class Bell : MonoBehaviour /// [Header("钟飞上去将要花费多少时间（降下来也是这个值）")] public float upTime; + /// + /// 干扰多长时间能造成伤害和击飞? + /// + [Header("干扰多长时间能造成伤害和击飞?")] + public float annoyingToHitTime; // _____ _ _ // | __ \ (_) | | @@ -54,6 +59,16 @@ public class Bell : MonoBehaviour /// 浮动动画,用来重启浮动动画解决Tween的一些局限性问题 /// private Tweener floatTweener; + private float annoyingToHitTimeLeft; + /// + /// 此时是否在干扰玩家 + /// + [SerializeField] + private bool isAnnoyingPlayer; + /// + /// 钟的初始位置 + /// + private Vector3 startPositon; // _____ _ _ ____ _ // / ____| | | | _ \ | | @@ -63,6 +78,8 @@ public class Bell : MonoBehaviour // \_____\__,_|_|_|____/ \__,_|\___|_|\_\ void Start(){ + annoyingToHitTimeLeft = annoyingToHitTime; + startPositon = transform.position; //启动浮动动画 RestartFloat(); } @@ -70,10 +87,13 @@ public class Bell : MonoBehaviour void Update(){ //如果钟正在攻击 if(isAtking){ + if(!player.isAnnoying){ + player.OnInAnnoying(); + } //创建一条从钟射向玩家的射线 Ray2D ray = new Ray2D( (Vector2)transform.position, - (Vector2)( player.transform.position - transform.position) + (Vector2)(player.transform.position - transform.position) ); Debug.DrawRay(ray.origin,ray.direction * 1500,Color.red); //获取射线的碰撞结果 @@ -82,6 +102,30 @@ public class Bell : MonoBehaviour if(hit2D){ Debug.Log(hit2D.collider.name); } + //如果射线击中玩家并且玩家未处于被攻击状态,说明刚被击中,触发玩家的被干扰事件 + if(hit2D.collider.TryGetComponent(out MyPlayer trash) ){ + // player.OnInAnnoying(); + isAnnoyingPlayer = true; + } + + //如果没有击中玩家,但是玩家处于被攻击状态,说明玩家脱离了攻击,触发玩家解除干扰事件 + else if(!hit2D.collider.TryGetComponent(out MyPlayer trash1)){ + //player.OnOutAnnoying(); + isAnnoyingPlayer = false; + annoyingToHitTimeLeft = annoyingToHitTime; + } + } + if(isAnnoyingPlayer){ + annoyingToHitTimeLeft -= Time.deltaTime; + if(annoyingToHitTimeLeft <= 0){ + //告诉玩家，你被攻击了 + player.OnBeHit(owner.ATK, + ((transform.position.x - + player.transform.position.x) + > 0) ? 1 : -1);//通过自身位置和玩家位置的比较来返回玩家本次的受击方向 + //恢复CD + annoyingToHitTimeLeft = annoyingToHitTime; + } } } @@ -100,7 +144,7 @@ public class Bell : MonoBehaviour if(floatTweener != null){ floatTweener.Kill(); } - Tweener tweener = transform.DOShakePosition(5f,0.3f,1,150,false,false); + Tweener tweener = transform.DOShakePosition(5f,0.3f,1,90,false,false); tweener.SetLoops(-1); tweener.SetEase(Ease.InQuad); floatTweener = tweener; @@ -153,9 +197,14 @@ public class Bell : MonoBehaviour /// 攻击结束的时候触发 /// private void ATKEnd(){ + //如果玩家仍处于被干扰状态,解除干扰 + if(player.isAnnoying) player.OnOutAnnoying(); + annoyingToHitTimeLeft = annoyingToHitTime; + isAnnoyingPlayer = false; //创建动画让钟回去 Tweener tweener = - transform.DOMoveY(transform.position.y - upDistance,upTime); + //transform.DOMoveY(transform.position.y - upDistance,upTime); + transform.DOMove(startPositon,upTime); //创建和添加结束事件 TweenCallback action = () => { //重启浮动动画 diff --git a/Assets/Scripts/DiZang.cs b/Assets/Scripts/DiZang.cs index 6b2002a..d41c51b 100644 --- a/Assets/Scripts/DiZang.cs +++ b/Assets/Scripts/DiZang.cs @@ -63,6 +63,11 @@ public class DiZang : Enemy private List throwingPointGroupUse; private Bell myBell; private DiZangsHadn myHand; + public VibrationManager vibrationManager; + /// + /// 现在正在敲钟攻击吗？（包括上下浮） + /// + public bool inBell = false; // _____ _ _ ____ _ // / ____| | | | _ \ | | @@ -87,6 +92,7 @@ public class DiZang : Enemy player = FindObjectOfType(); myBell = transform.Find("钟").GetComponent(); myHand = transform.Find("手").GetComponent(); + vibrationManager = FindObjectOfType(); //告诉钟自己是主人 myBell.owner = this; } @@ -106,6 +112,10 @@ public class DiZang : Enemy ((Random.Range(-1f,1f) > 0) ? (Action)RingTheBell : (Action)CallAiYuPin); StartCoroutine(action()); } + // // + // yield return new WaitForEndOfFrame(); + // StartCoroutine(RingTheBell()); + // // } /// @@ -161,8 +171,12 @@ public class DiZang : Enemy /// private IEnumerator RingTheBell(){ Debug.Log("正在使用:敲钟"); + inBell = true; + StartCoroutine(vibrationManager.ShakePad(0.5f,0.2f,6f,VibrationManager.PadShakeitem.撞钟攻击)); yield return new WaitForEndOfFrame(); myBell.ATK(player); + //开始震动屏幕 + vibrationManager.BellShakeScream(); } /// @@ -190,5 +204,5 @@ public class DiZang : Enemy /// /// 攻击结束的时候触发，重新开始新一轮攻击 /// - public void ATKEnd(){StartCoroutine(ATK());} + public void ATKEnd(){StartCoroutine(ATK());inBell = false;} } diff --git a/Assets/Scripts/DiZangsHadn.cs b/Assets/Scripts/DiZangsHadn.cs index 29ed398..cdd3070 100644 --- a/Assets/Scripts/DiZangsHadn.cs +++ b/Assets/Scripts/DiZangsHadn.cs @@ -53,6 +53,7 @@ public class DiZangsHadn : MonoBehaviour /// [Header("此时是否被打断")][SerializeField] private bool wasInteruput; + private VibrationManager vibrationManager; // _____ _ _ ____ _ // / ____| | | | _ \ | | @@ -73,6 +74,7 @@ public class DiZangsHadn : MonoBehaviour owner = FindObjectOfType(); target = owner.transform.Find("手的终点位置"); start = transform.position; + vibrationManager = FindObjectOfType(); } /// @@ -87,6 +89,9 @@ public class DiZangsHadn : MonoBehaviour target.position.y, 2f ); + //震动手柄和屏幕 + vibrationManager.ShakeScream(Vector2.up,1f); + StartCoroutine(vibrationManager.ShakePad(0.4f,0.2f,2f,VibrationManager.PadShakeitem.伸手拿钱)); //创建并给予下移动画结束事件 TweenCallback action = () =>{ //下移结束，标记为可被攻击 @@ -123,8 +128,14 @@ public class DiZangsHadn : MonoBehaviour floatTweener.Kill(); //通知主人，攻击结束 owner.ATKEnd(); + //重置一下自己的状态 + transform.position = start; + GetComponent().velocity = Vector2.zero; }; tweener.OnComplete(action); + //震动手柄和屏幕 + vibrationManager.ShakeScream(Vector2.up,1f); + StartCoroutine(vibrationManager.ShakePad(0.4f,0.2f,2f,VibrationManager.PadShakeitem.伸手拿钱)); } } @@ -175,6 +186,10 @@ public class DiZangsHadn : MonoBehaviour owner.HPLeft -= MyPlayer.atkMethodMagnification[hitMethod]; //看下死了没 if(owner.CheckDead()) {} + + //震动手柄和屏幕 + vibrationManager.ShakeScream(Vector2.up,1f); + StartCoroutine(vibrationManager.ShakePad(0.4f,0.2f,0.2f,VibrationManager.PadShakeitem.伸手拿钱)); } // _____ _ _ _ _ diff --git a/Assets/Scripts/MoneyBox.cs b/Assets/Scripts/MoneyBox.cs index 09e209e..2b6583e 100644 --- a/Assets/Scripts/MoneyBox.cs +++ b/Assets/Scripts/MoneyBox.cs @@ -9,6 +9,10 @@ using Sirenix.OdinInspector; [RequireComponent(typeof(BoxCollider2D))] public class MoneyBox : Interactive { + /// + /// 桌上硬币，用来显示钱箱上是否有钱 + /// + private GameObject coinOnTheTable; /// /// 箱子里有钱吗？ /// @@ -20,6 +24,7 @@ public class MoneyBox : Interactive private void Init(){ itemName = ItemName.塞钱箱; + coinOnTheTable = transform.Find("桌上硬币").gameObject; } public override void OnCall(){ OnBeGaveMoney(); @@ -28,10 +33,20 @@ public class MoneyBox : Interactive /// /// 当被塞钱的时候触发 /// - public override void OnBeGaveMoney(){hasMoney = true;} + public override void OnBeGaveMoney(){ + //标记自身有钱 + hasMoney = true; + //显示桌上硬币 + coinOnTheTable.SetActive(true); + } /// /// 当被拿钱的时候触发 /// - public void OnBeTakeMoney(){hasMoney = false;} + public void OnBeTakeMoney(){ + //标记自身不再有钱 + hasMoney = false; + //隐藏桌上硬币 + coinOnTheTable.SetActive(false); + } } diff --git a/Assets/Scripts/MyPlayer.cs b/Assets/Scripts/MyPlayer.cs index 81b630c..1635fd7 100644 --- a/Assets/Scripts/MyPlayer.cs +++ b/Assets/Scripts/MyPlayer.cs @@ -64,6 +64,11 @@ public class MyPlayer : MonoBehaviour, Boomer.I_CanBeBoomedObj /// [FoldoutGroup("状态")][Header("当前身上有多少特殊硬币，用来塞钱的那种")] public int specialMoneyCount = 0; + /// + /// 此时是否受着撞钟攻击的影响？ + /// + [Header("此时是否受着撞钟攻击的影响？")][FoldoutGroup("状态")][ReadOnly] + public bool isAnnoying = false; // _____ _ _ // | __ \ (_) | | @@ -488,6 +493,27 @@ public class MyPlayer : MonoBehaviour, Boomer.I_CanBeBoomedObj //镰刀攻击结尾调用，清除镰刀攻击状态防止多次触发动画 public void OnThrowingEnd(){isThrowing = false;} + /// + /// 被撞钟攻击的开始瞬间触发 + /// + public void OnInAnnoying(){ + Debug.Log("我被干扰了"); + //标记自身正在被影响 + isAnnoying = true; + //减速减益 + speed *= 0.5f; + } + + /// + /// 当离开撞钟攻击范围的时候触发一次 + /// + public void OnOutAnnoying(){ + Debug.Log("我脱离了干扰"); + //标记自身离开影响 + isAnnoying = false; + //恢复减速减益 + speed *= 2f; + } // _____ _ __ diff --git a/Assets/Scripts/TrojanHorse.cs b/Assets/Scripts/TrojanHorse.cs index 8744eea..9adff95 100644 --- a/Assets/Scripts/TrojanHorse.cs +++ b/Assets/Scripts/TrojanHorse.cs @@ -154,7 +154,7 @@ public class TrojanHorse : Enemy, Boomer.I_CanBeBoomedObj action = SprayBoomer; else action = CallBoomer; - return SprayBoomer; + return action; } /// @@ -264,7 +264,7 @@ public class TrojanHorse : Enemy, Boomer.I_CanBeBoomedObj //开始攻击 StartCoroutine(StartAATK()); //开始屏幕震动 - FindObjectOfType().HorseShake(); + FindObjectOfType().HorseShakeScream(); //开始向右移动 isMove = true; } diff --git a/Assets/Scripts/VibrationManager.cs b/Assets/Scripts/VibrationManager.cs index 60bb6a1..0c8dadd 100644 --- a/Assets/Scripts/VibrationManager.cs +++ b/Assets/Scripts/VibrationManager.cs @@ -10,18 +10,6 @@ using UnityEngine.InputSystem; /// public class VibrationManager : MonoBehaviour { - - // // - // void Start(){ - // HorseShake(); - // } - // // - - /// - /// 在特洛伊boss关吗? - /// - - public enum PadShakeitem{ 移动, 跳跃, @@ -30,8 +18,19 @@ public class VibrationManager : MonoBehaviour 发射镰刀, 挥动锤子, 木马移动, - 反弹炸弹 + 反弹炸弹, + 撞钟攻击, + 伸手拿钱 } + /// + /// 不会停下的震动的编号 + /// + public List doNotStopShakeNum; + + /// + /// 还接待新的震动吗？ + /// + private bool tradeable = true; public PadShakeitem itemNow; /// @@ -39,6 +38,14 @@ public class VibrationManager : MonoBehaviour /// public bool inHorseStage; + void Start(){ + doNotStopShakeNum = new List(); + doNotStopShakeNum.Add(PadShakeitem.撞钟攻击); + doNotStopShakeNum.Add(PadShakeitem.伸手拿钱); + } + + + /// /// 震动相机，仅对于一些微小短小震动使用 /// @@ -58,8 +65,18 @@ public class VibrationManager : MonoBehaviour /// 震动原因 public IEnumerator ShakePad(float left, float right, float time, PadShakeitem item){ if(Gamepad.current != null){ - itemNow = item; - Gamepad.current.SetMotorSpeeds(left,right); + + //只有处于可接待状态时，才接待震动 + if(tradeable){ + //记录震动项目并开始震动 + itemNow = item; + Gamepad.current.SetMotorSpeeds(left,right); + } + //如果该项目是不可被打断列表中记录着的 + if(doNotStopShakeNum.Contains(item)){ + //标记自身不再接待新的震动 + tradeable = false; + } //Debug.Log("正在开始"+item+"的震动"); yield return new WaitForSeconds(time); //只有震动项目和震动原因相同的时候,才会触发停止震动 @@ -68,6 +85,7 @@ public class VibrationManager : MonoBehaviour //Debug.Log("正在结束"+item+"的震动"); Gamepad.current.SetMotorSpeeds(0,0); if(inHorseStage)HorseShakePad(); + tradeable = true; } } } @@ -75,11 +93,19 @@ public class VibrationManager : MonoBehaviour /// /// 木马震动,屏幕轻微快速上下震动 /// - public void HorseShake(){ + public void HorseShakeScream(){ transform.Find("木马震动源"). GetComponent(). GenerateImpulse(); } + /// + /// 撞钟攻击调用，屏幕中幅度震动 + /// + public void BellShakeScream(){ + transform.Find("撞钟震动源"). + GetComponent(). + GenerateImpulse(); + } public void HorseShakePad(){ StartCoroutine(ShakePad(0f,0.1f,20f,PadShakeitem.木马移动)); diff --git a/Assets/Shader/闪光效果/Custom_Flash.mat b/Assets/Shader/闪光效果/Custom_Flash.mat index 3ab1492..3783cfb 100644 --- a/Assets/Shader/闪光效果/Custom_Flash.mat +++ b/Assets/Shader/闪光效果/Custom_Flash.mat @@ -24,11 +24,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _Angle: 84 - - _DelayTime: 0.2 - - _FlashTime: 1 - - _LoopInterval: 2 - - _Width: 0.2 + - _Angle: 60 + - _DelayTime: 0.5 + - _FlashTime: 0.1 + - _LoopInterval: 3 + - _Width: 0.74 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Sprites/早期临时混乱/1关boss地面.png b/Assets/Sprites/早期临时混乱/1关boss地面.png new file mode 100644 index 0000000000000000000000000000000000000000..6e03a92732733fcf480819e6b00799b7b1495786 GIT binary patch literal 3522 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 literal 0 HcmV?d00001 diff --git a/Assets/Sprites/早期临时混乱/手.png.meta b/Assets/Sprites/早期临时混乱/手.png.meta new file mode 100644 index 0000000..8c8f7a5 --- /dev/null +++ b/Assets/Sprites/早期临时混乱/手.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 73d8e32736352c2428a25a492d1c3472 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/早期临时混乱/装钱箱子.png b/Assets/Sprites/早期临时混乱/装钱箱子.png new file mode 100644 index 0000000000000000000000000000000000000000..3ce56a79357194e070ea0db4abe62ba8a0e76b1b GIT binary patch literal 3409 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 literal 0 HcmV?d00001 diff --git a/Assets/Sprites/早期临时混乱/钱.png.meta b/Assets/Sprites/早期临时混乱/钱.png.meta new file mode 100644 index 0000000..a84a715 --- /dev/null +++ b/Assets/Sprites/早期临时混乱/钱.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 90659c9dccda1794e98995e196dd510f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 744e910..9f5198f 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,6 +11,12 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/test.unity guid: 57c7619c790d5a94890207bd10cc8aca + - enabled: 0 + path: Assets/Scenes/DiZangStageTest.unity + guid: bb3ae1879e9805b4cb5101b71e80cbd4 + - enabled: 0 + path: Assets/Scenes/TeLuoYiStageTest.unity + guid: fc238b8ec8a03f44eb93e84f5fc3af9c m_configObjects: com.unity.adaptiveperformance.loader_settings: {fileID: 11400000, guid: c904ac9773b374d419329ca1a0f380ac, type: 2} com.unity.adaptiveperformance.simulator.provider_settings: {fileID: 11400000, guid: ad690714d07fc1a44849fae3ac890474, type: 2} diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index 1347c8c..784a268 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -53,4 +53,4 @@ Physics2DSettings: m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} - m_LayerCollisionMatrix: bfffffffbfffffffbfffffffbfffffffbfffffffbfffffff00ffffffbffdffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: bfffffffbfffffffbbfeffffbfffffffbfffffffbfffffff00ffffff3ffdfffffbffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 97f66bc..f86deaa 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -24,10 +24,10 @@ EditorUserSettings: value: 224247031146466b011b0b2b1e301034131a112d25292824620d3207f5e53136d2f539a9c2223e31290eea2f4b1a2e0be50f0c05d7050306101af4011fc0311707c416c61fcc5109c51008d7 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c6b153a021713251b32312a2c2936f1f47a2decee22f0 + value: 22424703114646680e0b0227036c7b192c16162d1f3c2737281d1820f6ae2136ebf32f flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b192c16162d1f3c2737281d1820f6ae2136ebf32f + value: 22424703114646680e0b0227036c6b153a021713251b32312a2c2936f1f47a2decee22f0 flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c4b150503563f22213229