Эх сурвалжийг харах

Merge remote-tracking branch 'origin/master'

LAPTOP-OM1V99U2\永远de小亡灵 10 сар өмнө
parent
commit
e4dae58edb

+ 17 - 1
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Cook.prefab

@@ -671,6 +671,7 @@ MonoBehaviour:
   trigGroundList: []
   myBaGuaTrigger: {fileID: 0}
   baGuaTrigger: []
+  notOnGiant: 0
 --- !u!1 &5440846222648032759
 GameObject:
   m_ObjectHideFlags: 0
@@ -732,6 +733,7 @@ MonoBehaviour:
   searchTrigger: {fileID: 2932762729738363159}
   bodyCollider: {fileID: 4543619153787591511}
   uiHp: {fileID: 3402650366513594425}
+  beHitTrigger: {fileID: 0}
   state: 0
   totalHp: 1000
   hp: 0
@@ -743,7 +745,9 @@ MonoBehaviour:
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
-  totalDieKeepTime: 1.34
+  ls: {fileID: 0}
+  isInSoulTower: 0
+  totalDieKeepTime: 0
   dieKeepTime: 0
   canHitFly: 1
   isNonAttack: 1
@@ -758,6 +762,8 @@ MonoBehaviour:
   attack2Infos: []
   attackTriggers:
   - {fileID: 7729941002223262554}
+  addAttackEffect: {fileID: 0}
+  curDamage: 
   targetTypes: 010000000300000004000000
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
@@ -791,6 +797,7 @@ MonoBehaviour:
   weakTime: 0
   totalWeakTime: 3
   weakHitRate: 2
+  weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
   isDamageReduction: 0
   reductionDegree: 0
@@ -808,6 +815,7 @@ MonoBehaviour:
   minRotateSpeed: 4
   isFloat: 0
   normalFallSpeed: 10
+  effect: {fileID: 0}
   playerMe: {fileID: 0}
   playerAni: {fileID: 0}
   playerCol: {fileID: 0}
@@ -844,6 +852,9 @@ MonoBehaviour:
   flyUpSpeed: 10
   baseSortingOrder: 2500
   runSpeed: 4
+  isReturnSoulTower: 0
+  origSoulPos: {x: 0, y: 0, z: 0}
+  isRecorded: 0
   searchState: 0
   soulCollector: {fileID: 0}
   attackDistance: 0
@@ -856,6 +867,7 @@ MonoBehaviour:
   dropSoulMax: 3
   dropSoulMin: 1
   dropSoulAngle: 60
+  upFirstAfterWeaknessOrNot: 0
 --- !u!54 &5440846222648032765
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -1553,6 +1565,10 @@ PrefabInstance:
       propertyPath: m_SortingOrder
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 3142485048627165112, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: reductionDegree
+      value: 0.5
+      objectReference: {fileID: 0}
     - target: {fileID: 4008180574111224898, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
       propertyPath: startDelay.scalar
       value: 1