瀏覽代碼

Revert "冲突示范"

This reverts commit d622b9970e4a08f3b7b7d8bd688f5873d868cc6c.
DESKTOP-PG06IH1\Mr.AB 1 年之前
父節點
當前提交
942bcd6737
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      ActionTowerDefense/Assets/Resources/Prefab/Tower.prefab

+ 4 - 2
ActionTowerDefense/Assets/Resources/Prefab/Tower.prefab

@@ -729,7 +729,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6126647545658003341}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 87455058f5cb44344ab3d9e2b68a9174, type: 3}
   m_Name: 
@@ -744,7 +744,7 @@ MonoBehaviour:
   uiHp: {fileID: 6126647545328450153}
   state: 0
   attackTime: 0
-  totalAttack1Time: 1233
+  totalAttack1Time: 1
   totalAttack2Time: 1
   isDie: 0
   totalHp: 10000
@@ -754,6 +754,7 @@ MonoBehaviour:
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
     changeHurt: 0
+    hurtTime: 0
     repelValue: 0
   attack2Infos: []
   attackTriggers: []
@@ -771,6 +772,7 @@ MonoBehaviour:
   searchTrigger: {fileID: 6126647545521899017}
   targetTypes: 04000000
   canHitFly: 0
+  hurtKeepTime: 0
 --- !u!54 &6126647545658003340
 Rigidbody:
   m_ObjectHideFlags: 0