Răsfoiți Sursa

不能站在block上bug

SZAND\msx_2 1 an în urmă
părinte
comite
c355110f38

+ 79 - 0
ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/Block/Block.prefab

@@ -623,6 +623,7 @@ Transform:
   - {fileID: 281351543135073694}
   - {fileID: 6182312090916350298}
   - {fileID: 3497415575580724392}
+  - {fileID: 4240303883776295497}
   m_Father: {fileID: 7412701798663147638}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1539,3 +1540,81 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1001 &4142043895858231942
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 4715689819613013896}
+    m_Modifications:
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.32
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1611437088567555043, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_Name
+      value: Platform
+      objectReference: {fileID: 0}
+    - target: {fileID: 7276118674276319178, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_Size.x
+      value: 0.42292014
+      objectReference: {fileID: 0}
+    - target: {fileID: 7276118674276319178, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_Size.y
+      value: 8.240609
+      objectReference: {fileID: 0}
+    - target: {fileID: 7276118674276319178, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_Center.x
+      value: -0.05981932
+      objectReference: {fileID: 0}
+    - target: {fileID: 7276118674276319178, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: m_Center.y
+      value: -5.8796954
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
+--- !u!4 &4240303883776295497 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+  m_PrefabInstance: {fileID: 4142043895858231942}
+  m_PrefabAsset: {fileID: 0}

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

@@ -15547,8 +15547,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 10, y: 1.1802474, z: 1.2762372}
-  m_Center: {x: -0.00000007961863, y: 0.22530775, z: -0.5962706}
+  m_Size: {x: 10, y: 12.249434, z: 12.123883}
+  m_Center: {x: 0.000003371754, y: -5.309286, z: 0.7179361}
 --- !u!114 &5195053035251041698
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -15684,8 +15684,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 10, y: 1.1379251, z: 0.9577283}
-  m_Center: {x: -0.000000005239034, y: 0.19580507, z: -0.2132951}
+  m_Size: {x: 10, y: 11.047022, z: 11.179463}
+  m_Center: {x: -0.00003533259, y: -2.9985745, z: -5.324108}
 --- !u!114 &405828172956143487
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -21454,7 +21454,8 @@ Transform:
   m_LocalPosition: {x: 0.008960867, y: 7.0475364, z: -1.4971969}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2610504245854017837}
   m_Father: {fileID: 7652881806103649629}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -21785,7 +21786,6 @@ Transform:
   m_Children:
   - {fileID: 6044684492718314986}
   - {fileID: 6255311901631402459}
-  - {fileID: 2610504245854017837}
   - {fileID: 5362811165846112536}
   m_Father: {fileID: 7907975740392708805}
   m_RootOrder: 4
@@ -27016,7 +27016,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1282819543542127411}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &4515056868385938181
 MonoBehaviour:
@@ -27099,8 +27099,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 10, y: 1.1802474, z: 1.2762372}
-  m_Center: {x: -0.00000007961863, y: 0.22530775, z: -0.5962706}
+  m_Size: {x: 10, y: 11.087668, z: 10.064833}
+  m_Center: {x: -0.000018797966, y: 0.42303938, z: -4.8836403}
 --- !u!114 &6926042192959360048
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -32940,51 +32940,51 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1282819543542127411}
+    m_TransformParent: {fileID: 4834281468781420425}
     m_Modifications:
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalScale.x
-      value: 2.4999998
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.025
+      value: 0.05
       objectReference: {fileID: 0}
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.4999999
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0.031687748
+      value: 0.25663534
       objectReference: {fileID: 0}
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 5.124734
+      value: 3.2019315
       objectReference: {fileID: 0}
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -0.14683032
+      value: 1.6375954
       objectReference: {fileID: 0}
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.64812225
+      value: 0.96333414
       objectReference: {fileID: 0}
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.021716347
+      value: -0.032278012
       objectReference: {fileID: 0}
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.76079977
+      value: -0.2662066
       objectReference: {fileID: 0}
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0.025491783
+      value: -0.008919667
       objectReference: {fileID: 0}
     - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

+ 2 - 2
ActionTowerDefense/Assets/Scripts/Boss/YuMenGuan/Block.cs

@@ -99,7 +99,7 @@ public class Block : Character
                 dieKeepTime -= Time.deltaTime;
                 if (!isDie && dieKeepTime <= 0)
                 {
-                    if (curBomb == null)
+                    if (curBomb != null)
                     {
                         DropSouls();
                     }
@@ -109,7 +109,6 @@ public class Block : Character
                 if (curBomb != null && !curBomb.activeSelf ||isDie && curBomb == null)
                 {
                     gameObject.SetActive(false);
-                    DropSouls();
                 }
                 break;
             default:
@@ -201,6 +200,7 @@ public class Block : Character
                 rb.velocity = Vector3.zero;
                 break;
             case State.back:
+                DropSouls();
                 rb.useGravity = true;
                 break;
             default:

+ 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: -1817.0963, y: 0}
+        m_Offset: {x: -2121.6458, 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: -1717.3427, y: 0}
+        m_Offset: {x: -1893.862, 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: -1485.8049, y: 0}
+        m_Offset: {x: -1681.7349, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}