From d32bf010471c18e9672db621727e0e802b95b5d7 Mon Sep 17 00:00:00 2001
From: Roman <1325980292@qq.com>
Date: Tue, 28 Dec 2021 21:34:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=90=BD=E5=88=B0=E5=A1=9E?=
 =?UTF-8?q?=E9=92=B1=E7=AE=B1=E4=B8=8A=E7=99=BE=E5=88=86=E7=99=BE=E5=8D=A1?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=9C=A8=E9=A9=AC=E4=BC=9A=E8=A2=AB=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E7=9A=84=E6=94=BB=E5=87=BB=E6=96=B9=E5=BC=8F=E4=BC=A4=E5=AE=B3?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scenes/DiZangStageTest.unity     |  4 ++--
 Assets/Scripts/Boss/木马/TrojanHorse.cs |  1 +
 ProjectSettings/ProjectSettings.asset   |  1 +
 UserSettings/EditorUserSettings.asset   | 22 +++++++++++-----------
 4 files changed, 15 insertions(+), 13 deletions(-)

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