Bläddra i källkod

敌方隐身英灵爆炸参数调整到炸弹预制体上

LAPTOP-OM1V99U2\永远de小亡灵 1 år sedan
förälder
incheckning
688cc6a761

+ 4 - 4
ActionTowerDefense/Assets/Resources/Prefab/FX/FollowSoulEffect.prefab

@@ -88180,15 +88180,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   time: 0
-  boomTime: 0
+  boomTime: 2
   isBoom: 0
   attackInfo:
-    damage: 0
+    damage: 400
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
-  destroyTime: 0
+  destroyTime: 5
   characters: []
 --- !u!54 &923046814478230668
 Rigidbody:
@@ -88214,7 +88214,7 @@ SphereCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7974523266980730195}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Radius: 8

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/Spirits_Invisible.prefab

@@ -107,7 +107,7 @@ Animator:
   m_GameObject: {fileID: 1090663073729466903}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 47cc6460e203a0b45a51357919ea1988, type: 2}
+  m_Controller: {fileID: 0}
   m_CullingMode: 0
   m_UpdateMode: 1
   m_ApplyRootMotion: 0

+ 230 - 0
ActionTowerDefense/Assets/Resources/Spine/Spirits_Assassin/Spirits_Assassin_Controller.controller

@@ -671,6 +671,92 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!74 &-3060314501212524821
+AnimationClip:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: attack_summon
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.3333
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: dummy
+    path: 
+    classID: 1
+    script: {fileID: 0}
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 1341452863
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.3333
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
 --- !u!74 &-2934406410063455287
 AnimationClip:
   m_ObjectHideFlags: 0
@@ -1125,6 +1211,12 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 7762287511542934629}
     m_Position: {x: 320, y: 660, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 7977021450772176765}
+    m_Position: {x: 0, y: 0, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 9220789475148955431}
+    m_Position: {x: 620, y: 210, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -1161,6 +1253,92 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!74 &5208855767785171808
+AnimationClip:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: attack_summon
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.3333
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: dummy
+    path: 
+    classID: 1
+    script: {fileID: 0}
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 1341452863
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.3333
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
 --- !u!1102 &5722392888464085076
 AnimatorState:
   serializedVersion: 6
@@ -1325,6 +1503,32 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &7977021450772176765
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: rush_attack 0
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 5208855767785171808}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &8024309173197250462
 AnimatorState:
   serializedVersion: 6
@@ -1403,3 +1607,29 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &9220789475148955431
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: rush_attack 1
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -3060314501212524821}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

+ 4 - 5
ActionTowerDefense/Assets/Scripts/Spirits/ESpirits_Invisible.cs

@@ -62,6 +62,7 @@ public class ESpirits_Invisible : MonoBehaviour
         switch (state)
         {
             case InvisibleState.Normal:
+                
                 if (haveSoulNumber != followNumber && SoulInMap.souls.Count != 0)
                 {
                     ChangeState(InvisibleState.FindSoul);
@@ -72,14 +73,11 @@ public class ESpirits_Invisible : MonoBehaviour
                     ChangeState(InvisibleState.Hurt);
                     return;
                 }
-                //posx = Mathf.Min(PlayersInput.instance[0].transform.position.x,
-                //    PlayersInput.instance[1].transform.position.x);
                 posx = PlayersInput.instance[nowPlayer].transform.position.x;
-                targetPos = new Vector3(posx + offsetX,altitude + offsetY, 0);
-                Goto(targetPos,moveSpeed);
+                targetPos = new Vector3(posx + offsetX, altitude + offsetY, 0);
+                Goto(targetPos, moveSpeed);
                 if (Vector3.Distance(targetPos, transform.position) < 1)
                 {
-
                     offsetY = Random.Range(-randomRageY, randomRageY);
                     offsetX = Random.Range(-randomRageX, randomRageX);
                     nowNumber++;
@@ -89,6 +87,7 @@ public class ESpirits_Invisible : MonoBehaviour
                         nowPlayer = 1 - nowPlayer;
                     }
                 }
+                
                 break;
             case InvisibleState.Hurt:
                 if (haveSoulNumber != followNumber && SoulInMap.souls.Count != 0)

+ 0 - 3
ActionTowerDefense/Assets/Scripts/Spirits/SoulBoom.cs

@@ -6,13 +6,10 @@ public class SoulBoom : MonoBehaviour
 {
     [HideInInspector]
     public float time;
-    [HideInInspector]
     public float boomTime;
     [HideInInspector]
     public bool isBoom;
-    [HideInInspector]
     public AttackInfo attackInfo;
-    [HideInInspector]
     public float destroyTime;
     public List<Character> characters = new List<Character>();
     private void Update()

+ 0 - 3
ActionTowerDefense/Assets/Scripts/Spirits/SoulFollowEffect.cs

@@ -39,9 +39,6 @@ public class SoulFollowEffect : MonoBehaviour
         GameObject boomSoul = Instantiate(soul.transform.GetChild(1).gameObject);
         boomSoul.transform.position = transform.position;
         SoulBoom soulBoom = boomSoul.GetComponent<SoulBoom>();
-        soulBoom.boomTime = boomTime;
-        soulBoom.attackInfo = GetComponentInParent<Enemy>().attack1Infos[0];
-        soulBoom.destroyTime = destroyTime;
         boomSoul.SetActive(true);
     }
     public void ShowSouls(int newNumber)