diff --git a/Assets/Scenes/DiZangStageTest.unity b/Assets/Scenes/DiZangStageTest.unity index 49266e5..e01a467 100644 --- a/Assets/Scenes/DiZangStageTest.unity +++ b/Assets/Scenes/DiZangStageTest.unity @@ -6045,7 +6045,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1} + m_Size: {x: 1, y: 0.19} m_EdgeRadius: 0 --- !u!1 &357198016 GameObject: @@ -9881,7 +9881,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1226109627} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.03464675, y: -1.6231626, z: -10} + m_LocalPosition: {x: 0.033087015, y: -1.6231879, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2009770128} diff --git a/Assets/Scripts/Boss/木马/TrojanHorse.cs b/Assets/Scripts/Boss/木马/TrojanHorse.cs index 8e1b54d..57f4227 100644 --- a/Assets/Scripts/Boss/木马/TrojanHorse.cs +++ b/Assets/Scripts/Boss/木马/TrojanHorse.cs @@ -343,6 +343,7 @@ public class TrojanHorse : Enemy, Boomer.I_CanBeBoomedObj } public override void OnBeHit(MyPlayer.AtkMethod hitMethod,int hitDir){ + if(hitMethod == MyPlayer.AtkMethod.反弹炸弹) //结算生命值 HPLeft -= MyPlayer.atkMethodMagnification[hitMethod]; } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index de3e208..480d5dd 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -148,6 +148,7 @@ PlayerSettings: bundleVersion: 1.1 preloadedAssets: - {fileID: -233813179328996068, guid: c904ac9773b374d419329ca1a0f380ac, type: 2} + - {fileID: 11400000, guid: 380cc78eca6b50e488c31a08df51ea79, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index b276650..4869e4c 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,23 +18,23 @@ EditorUserSettings: value: 22424703114646680e0b0227036c661925162b3e2d2f2304283a097df7ee3d2cfb flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b192c16162d1f3c2737281d1820f6ae2136ebf32f - flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c6b153a021713251b32312a2c2936f1f47a2decee22f0 - flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c5c0518590d24253c3f - flags: 0 - RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c791f580216233831 flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7519580216233831 flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c6619580216233831 flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c7b192c16162d1f3c2737281d1820f6ae2136ebf32f + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c6b153a021713251b32312a2c2936f1f47a2decee22f0 + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c5c0518590d24253c3f + flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b7968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7 flags: 0