SZAND\msx_2 1 жил өмнө
parent
commit
d67421684b

+ 0 - 3
ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/Boom.prefab

@@ -53891,9 +53891,6 @@ MonoBehaviour:
     repelValue: 100
   destroyTime: 5
   characters: []
-  isTransfiguration: 1
-  soulUnstableTime: 20
-  parent: {fileID: 0}
 --- !u!54 &3502249394266294728
 Rigidbody:
   m_ObjectHideFlags: 0

+ 99 - 14
ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/Boss_YuMenGuan.prefab

@@ -291,14 +291,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1212016988484430024}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 2.63, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4306865386881122374}
   - {fileID: 8182546596261761909}
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1429438433994176184
 GameObject:
@@ -904,7 +904,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!108 &2878654454710598883
 Light:
@@ -998,7 +998,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 131.84601, y: -21.865997, z: -28.312012}
 --- !u!108 &2878654455075685573
 Light:
@@ -21782,7 +21782,7 @@ Transform:
   - {fileID: 2610504245854017837}
   - {fileID: 5362811165846112536}
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4308159754961789826
 Animator:
@@ -21913,7 +21913,7 @@ Transform:
   - {fileID: 6713198738227080425}
   - {fileID: 2987500950580286168}
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!95 &7907975740994812595
 Animator:
@@ -27247,7 +27247,7 @@ RectTransform:
   - {fileID: 8039411687375053953}
   - {fileID: 4971189969960109047}
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -27345,6 +27345,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 3472427944151914781}
   - {fileID: 7652881806103649629}
   - {fileID: 2878654455075685572}
   - {fileID: 2878654454710598882}
@@ -27507,14 +27508,15 @@ MonoBehaviour:
     core: {fileID: 7551100372909007610}
   curStateId: 0
   restWeaknessNum: 0
+  roarEffect: {fileID: 3274725863406055185}
+  roarTime: 3
   coreDamageRate: 2
   curTarget: 2
-  tryTry: 0
   circulate: A
   categories: 
   curCategoryID: 0
-  minInterval: 2
-  maxInterval: 5
+  minInterval: 1
+  maxInterval: 3
   attackConfigurations:
   - category: 0
     attacks:
@@ -27535,23 +27537,23 @@ MonoBehaviour:
   wave1: {fileID: 8481532737664997307, guid: 5e9b05873d774fa4888dc4c56a1002f0, type: 3}
   wave2: {fileID: 8481532737664997307, guid: 5e9b05873d774fa4888dc4c56a1002f0, type: 3}
   wave1Damage:
-    damage: 100
+    damage: 150
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   wave2Damage:
-  - damage: 80
+  - damage: 130
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
-  - damage: 120
+  - damage: 150
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
-  - damage: 160
+  - damage: 170
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
@@ -32791,6 +32793,89 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1001 &1612499353030390908
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7907975740392708805}
+    m_Modifications:
+    - target: {fileID: 295816438810166877, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2700654212487626646, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2700654212487626646, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -3.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4256629854486027117, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_Name
+      value: RoarEffect
+      objectReference: {fileID: 0}
+    - target: {fileID: 4256629854486027117, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+--- !u!1 &3274725863406055185 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4256629854486027117, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+  m_PrefabInstance: {fileID: 1612499353030390908}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &3472427944151914781 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+  m_PrefabInstance: {fileID: 1612499353030390908}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2853510674666054114
 PrefabInstance:
   m_ObjectHideFlags: 0

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 321 - 332
ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/RoarEffect.prefab


+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/RoarWave.prefab.meta → ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/RoarEffect.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 13ca2f1eb6517c24db565f8663e38461
+guid: cadb01e8f53a04e47995d48a23436d21
 PrefabImporter:
   externalObjects: {}
   userData: 

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/ShockWave.prefab

@@ -175,7 +175,7 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8481532737664997307}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 1, y: 3, z: 1}

+ 16 - 12
ActionTowerDefense/Assets/Scripts/Boss/Boss.cs

@@ -44,6 +44,9 @@ public class Boss : MoveCharacter
     private int curStateTotalHp;            //当前阶段总血量
     public int restWeaknessNum;             //剩余弱点数量
     private Weakness coreWeakness;
+    public GameObject roarEffect;
+    public float roarTime;
+    private bool isChangeState;
 
     [Header("核心受到伤害倍率")]
     public int coreDamageRate;
@@ -52,7 +55,6 @@ public class Boss : MoveCharacter
     public TargetType curTarget;
 
     [Header("Boss攻击规律")]
-    public bool tryTry;
     public string circulate;                //循环配置
     private int len;
     public AttackCategories[] categories;  //循环大类
@@ -82,6 +84,8 @@ public class Boss : MoveCharacter
         beLarger = true;
         ChangeWeakness();
         CalculateHp();
+        isChangeState = false;
+        curInterval = Random.Range(minInterval, maxInterval);
     }
 
     //切换弱点
@@ -158,7 +162,11 @@ public class Boss : MoveCharacter
             if (curStateId < maxStateId)
             {
                 curStateId++;
-                ChangeBossState();
+                isChangeState = true;
+                roarEffect.SetActive(true);
+                roarEffect.GetComponentInChildren<ParticleSystem>().Play();
+                ChangeState(CharacterState.Idle);
+                Invoke("ChangeBossState", roarTime);
             }
             else
             {
@@ -187,13 +195,6 @@ public class Boss : MoveCharacter
         {
             Enlarge();
         }
-        if (tryTry)
-        {
-            if (state != CharacterState.Attack)
-            {
-                ChangeState(CharacterState.Attack);
-            }
-        }
     }
 
     public virtual void Attack()
@@ -240,10 +241,13 @@ public class Boss : MoveCharacter
         switch (state)
         {
             case CharacterState.Idle:
-                curInterval -= Time.deltaTime;
-                if (curInterval <= 0)
+                if (!isChangeState)
                 {
-                    RandomAttackState();
+                    curInterval -= Time.deltaTime;
+                    if (curInterval <= 0)
+                    {
+                        RandomAttackState();
+                    }
                 }
                 break;
             case CharacterState.Run:

+ 4 - 0
ActionTowerDefense/Assets/Scripts/Boss/YuMenGuan/Block.cs

@@ -75,6 +75,10 @@ public class Block : Character
 
     public override void ChangeState(CharacterState newState)
     {
+        if (state == newState)
+        {
+            return;
+        }
         switch (state)
         {
             default:

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

@@ -54,6 +54,9 @@ public class SoulBoom : MonoBehaviour
         }
         if (time >= destroyTime)
         {
+            time = 0;
+            isBoom = false;
+            characters = new List<MoveCharacter>();
             gameObject.SetActive(false);
         }
     }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно