Преглед изворни кода

砖头怪不掉落魂bug;转阶段roar特效位置修改;砖头怪只有撞塔会爆炸

SZAND\msx_2 пре 1 година
родитељ
комит
015a68a78d

+ 28 - 16
ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/Boss_YuMenGuan.prefab

@@ -298,7 +298,7 @@ Transform:
   - {fileID: 4306865386881122374}
   - {fileID: 8182546596261761909}
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 4
+  m_RootOrder: 3
   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: 2615558516803081595}
-  m_RootOrder: 0
+  m_RootOrder: 1
   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: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 131.84601, y: -21.865997, z: -28.312012}
 --- !u!108 &2878654455075685573
 Light:
@@ -20743,6 +20743,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 3472427944151914781}
   - {fileID: 2878654454710598882}
   m_Father: {fileID: 7652881806103649629}
   m_RootOrder: 10
@@ -21783,7 +21784,7 @@ Transform:
   - {fileID: 2610504245854017837}
   - {fileID: 5362811165846112536}
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4308159754961789826
 Animator:
@@ -21914,7 +21915,7 @@ Transform:
   - {fileID: 6713198738227080425}
   - {fileID: 2987500950580286168}
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 130.04, z: 0}
 --- !u!95 &7907975740994812595
 Animator:
@@ -27248,7 +27249,7 @@ RectTransform:
   - {fileID: 8039411687375053953}
   - {fileID: 4971189969960109047}
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -27346,7 +27347,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3472427944151914781}
   - {fileID: 4689423852286470051}
   - {fileID: 7652881806103649629}
   - {fileID: 2878654455075685572}
@@ -32820,7 +32820,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 7907975740392708805}
+    m_TransformParent: {fileID: 2615558516803081595}
     m_Modifications:
     - target: {fileID: 295816438810166877, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
       propertyPath: m_IsActive
@@ -32850,13 +32850,25 @@ PrefabInstance:
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.5000004
+      objectReference: {fileID: 0}
+    - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: 1.7
       objectReference: {fileID: 0}
     - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 3
+      value: 4.11
       objectReference: {fileID: 0}
     - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
       propertyPath: m_LocalPosition.z
@@ -32864,23 +32876,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.7071067
       objectReference: {fileID: 0}
     - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0.70710695
       objectReference: {fileID: 0}
     - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: 0.0000000026523694
       objectReference: {fileID: 0}
     - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0.000000029684056
       objectReference: {fileID: 0}
     - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      value: -90
       objectReference: {fileID: 0}
     - target: {fileID: 2760765185109847393, guid: cadb01e8f53a04e47995d48a23436d21, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
@@ -33053,7 +33065,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
       propertyPath: m_LocalPosition.x

+ 10 - 3
ActionTowerDefense/Assets/Scripts/Boss/YuMenGuan/Block.cs

@@ -10,6 +10,7 @@ public class Block : Character
         charge = 1,         //ĐîÁŚ
         sprint = 2,         //łĺ´Ě
         bomb = 3,           //ąŹŐ¨
+        none = 4,
     }
 
     [Header("ľôÂäťę")]
@@ -93,9 +94,10 @@ public class Block : Character
         switch (newState)
         {
             case CharacterState.Die:
+                ChangeAttackState(State.none);
+                DropSouls();
                 isDie = true;
                 dieKeepTime = totalDieKeepTime;
-                curBomb = Instantiate(bombPrefab, transform.position, new Quaternion(0, 0, 0, 0), transform);
                 break;
             default:
                 break;
@@ -111,7 +113,7 @@ public class Block : Character
                 {
                     bodyTrans.gameObject.SetActive(false);
                 }
-                if (!curBomb.activeSelf)
+                if (curBomb != null && !curBomb.activeSelf || curBomb == null)
                 {
                     gameObject.SetActive(false);
                 }
@@ -149,7 +151,7 @@ public class Block : Character
         {
             rb.velocity = Vector3.zero;
             rb.AddForce(force);
-            ChangeAttackState(State.bomb);
+            ChangeState(CharacterState.Die);
             return;
         }
         else
@@ -195,8 +197,13 @@ public class Block : Character
                 {
                     rb.velocity = Vector3.zero;
                 }
+                curBomb = Instantiate(bombPrefab, transform.position, new Quaternion(0, 0, 0, 0), transform);
                 ChangeState(CharacterState.Die);
                 break;
+            case State.none:
+                rb.velocity = Vector3.zero;
+                attackTriggers[0].enabled = false;
+                break;
             default:
                 break;
         }

+ 1 - 1
ActionTowerDefense/Assets/material/line.mat

@@ -43,7 +43,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 53e9fd48a689b264d9a7741adfe8e9b2, type: 3}
         m_Scale: {x: 1, y: 1}
-        m_Offset: {x: -899.84674, y: 0}
+        m_Offset: {x: -1458.6829, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

+ 1 - 1
ActionTowerDefense/Assets/material/line_air.mat

@@ -43,7 +43,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: c8aeee0a826afe14a8bc88cc6309b437, type: 3}
         m_Scale: {x: 1, y: 1}
-        m_Offset: {x: -819.6581, y: 0}
+        m_Offset: {x: -1367.9966, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

+ 1 - 1
ActionTowerDefense/Assets/material/line_back.mat

@@ -43,7 +43,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: f3e88fd2fe21e374582525302db1f9ec, type: 3}
         m_Scale: {x: 1, y: 1}
-        m_Offset: {x: -794.4571, y: 0}
+        m_Offset: {x: -1225.8953, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}