SZAND\msx_2 6 kuukautta sitten
vanhempi
commit
980478f16d

+ 8 - 7
ActionTowerDefense/Assets/Scripts/SystemReflect/ScreenReflectPresets.cs

@@ -6,7 +6,7 @@ public enum ScreenReflectEffects
 {
     screenShake = 0,        //屏幕震动
     freezeFrame = 1,        //顿帧
-    stun = 2,               //硬直
+    hitStun = 2,            //硬直
 }
 
 public class ScreenReflectPresets : MonoBehaviour
@@ -19,7 +19,7 @@ public class ScreenReflectPresets : MonoBehaviour
         public int level;
         [ShowIf("effect", ScreenReflectEffects.freezeFrame)]
         public int frame;
-        [ShowIf("effect", ScreenReflectEffects.stun)]
+        [ShowIf("effect", ScreenReflectEffects.hitStun)]
         public float time;
     }
 
@@ -35,13 +35,13 @@ public class ScreenReflectPresets : MonoBehaviour
 
     public List<ScreenReflectInfo> reflectPresets;
 
-    public void ScreenReflect(BeHitTrigger beHitter, int x)
+    public void ScreenReflect(HitFeedbackSystem hfs, int x)
     {
-        foreach(ScreenReflectInfo sri in reflectPresets)
+        foreach (ScreenReflectInfo sri in reflectPresets)
         {
             if (x >= sri.minX)
             {
-                foreach(ScreenReflects sr in sri.effects)
+                foreach (ScreenReflects sr in sri.effects)
                 {
                     switch (sr.effect)
                     {
@@ -49,9 +49,10 @@ public class ScreenReflectPresets : MonoBehaviour
                             screenShake.ShakeScreen(sr.level);
                             break;
                         case ScreenReflectEffects.freezeFrame:
+                            hfs.freezeFrame = sr.frame;
                             break;
-                        case ScreenReflectEffects.stun:
-                            //硬直
+                        case ScreenReflectEffects.hitStun:
+                            hfs.hitStunTime = sr.time;
                             break;
                     }
                 }

+ 1 - 1
ActionTowerDefense/Assets/Scripts/SystemReflect/ScreenShake.cs

@@ -37,7 +37,7 @@ public class ScreenShake : MonoBehaviour
 
 	//µ±Ç°Õð¶¯ÐÅÏ¢
 	private List<ShakePos> shakePoses;
-
+	
 	private float shakeFrame;
 	private float pastFrame;