1
0

2 Коммитууд 72bb4d29a3 ... 8ebc260d0b

Эзэн SHA1 Мессеж Огноо
  HY-LSZNWIN10\Administrator 8ebc260d0b Merge remote-tracking branch 'origin/master' 1 долоо хоног өмнө
  HY-LSZNWIN10\Administrator 83599a6dff 修复boss头发攻击没有伤害的问题 1 долоо хоног өмнө

+ 75 - 49
ActionTowerDefense/Assets/Resources/Prefab/Boss/WaterSprite/Boss_Umbrella.prefab

@@ -166,7 +166,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2168178734352227195}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -215,62 +215,88 @@ MonoBehaviour:
   canBreakWall: 0
   wallBrealNum: 10
   isShoot: 0
-  owner: {fileID: 0}
   isSingleAttack: 0
+  isDoT: 0
+  owner: {fileID: 0}
   cantSingleAttack: 0
   trigedObjs: []
-  attackInfo:
-    attackValue: 0
-    damage: 100
-    attackDir: {x: 0, y: 0, z: 0}
-    effect: {fileID: 0}
-    attackEffect: 
-    attackMethod_Type: 0
-    floatState:
-      time: 0
-      upTime: {x: 0, y: 0}
-      backSpeed: {x: 0, y: 0}
-      rotateSpeed: {x: 0, y: 0}
-      height: {x: 0, y: 0}
-      ControlOrder: 0
-    blowUp:
-      directionType: 0
-      dir: {x: 0, y: 0, z: 0}
-      dirRandom: {x: 0, y: 0, z: 0}
-      force: 0
-      time: 0
-      haveLandingDamage: 0
-      landingDamageRate: 0
-      ControlOrder: 0
-    shotDown:
-      directionType: 0
-      dir: {x: 0, y: 0, z: 0}
-      dirRandom: {x: 0, y: 0, z: 0}
-      force: 0
-      time: 0
-      haveLandingDamage: 0
-      landingDamage: 0
-      ControlOrder: 0
-    weak:
-      time: 0
-      ControlOrder: 0
-    armorPiercing:
-      rate: 0
-    vulnerable:
-      rate: 0
-      time: 0
-    stackingWounds:
-      damage: 0
-      time: 0
-    changeDamage:
-      rate: 0
-    sustainedInjury:
-      damage: 0
+  trigedTime: []
+  attackMethod:
+    attackName: 
+    attackType: 0
+    attackInfo:
+      attackValue: 0
+      damage: 100
+      attackDir: {x: 0, y: 0, z: 0}
+      criticalChance: 0
+      criticalStrikeEffect: 0
+      lifesteal: 0
+      effect: {fileID: 0}
+      attackEffect: 
+      attackMethod_Type: 0
+      floatState:
+        time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
+        ControlOrder: 0
+      blowUp:
+        directionType: 0
+        dir: {x: 0, y: 0, z: 0}
+        dirRandom: {x: 0, y: 0, z: 0}
+        force: 0
+        time: 0
+        haveLandingDamage: 0
+        landingDamageRate: 0
+        ControlOrder: 0
+      shotDown:
+        directionType: 0
+        dir: {x: 0, y: 0, z: 0}
+        dirRandom: {x: 0, y: 0, z: 0}
+        force: 0
+        time: 0
+        haveLandingDamage: 0
+        landingDamageRate: 0
+        minLandingDamage: 0
+        ControlOrder: 0
+      weak:
+        time: 0
+        ControlOrder: 0
+      armorPiercing:
+        rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
+      stackingWounds:
+        damage: 0
+        time: 0
+      changeDamage:
+        rate: 0
+      sustainedInjury:
+        damage: 0
+    attackTrigger: {fileID: 0}
+    needToChange: 0
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    searchMode: 0
+    canHitFly: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    maxUpAngle: 0
+    maxDownAngle: 0
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    skill: {fileID: 0}
+    additionalEffects: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
   offsetY: 1
   hitRate: 1
+  interval: 0
+  isCreatedByDemonicSummon: 0
 --- !u!1 &5655515116860382242
 GameObject:
   m_ObjectHideFlags: 0

+ 2 - 2
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -5696,7 +5696,7 @@ MonoBehaviour:
   totalDieKeepTime: 1.3333334
   showInjuryNum: 1
   injuryNumText: {fileID: 6467251191553420251, guid: 4a700717bc3a50f45bd603f36382651f, type: 3}
-  injuryNumTextSummon: {fileID: 0}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   injuryNumPos_summon: {x: 0, y: 1}
   injuryNumRandom_summon: {x: 1, y: 1}
   injuryNumPos_march: {x: 0, y: 1}
@@ -5727,6 +5727,7 @@ MonoBehaviour:
   cookEffect: {fileID: 0}
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
+  charactertag: 0
   hitResistance: 100
   bc: {fileID: 0}
   foot: {fileID: 3571941039716665623}
@@ -6424,7 +6425,6 @@ MeshRenderer:
   m_Materials:
   - {fileID: 2100000, guid: 1b17f7962e0b9be49bb10e99c6bd95a6, type: 2}
   - {fileID: 2100000, guid: 0c319badfe2307a48b8810d891649565, type: 2}
-  - {fileID: 2100000, guid: 1b17f7962e0b9be49bb10e99c6bd95a6, type: 2}
   - {fileID: 2100000, guid: 8f08601a75fbb72488593cad9f89acca, type: 2}
   - {fileID: 2100000, guid: 0c319badfe2307a48b8810d891649565, type: 2}
   m_StaticBatchInfo:

+ 4 - 3
ActionTowerDefense/Assets/Scripts/Boss/WaterGhost/BlackUmbrella.cs

@@ -23,9 +23,9 @@ public class BlackUmbrella : MonoBehaviour
     [HideInInspector]
     public Transform umbrellaBackPos;
 
-    [HideInInspector]
     public Transform owner;
- 
+    WaterSprite ws;
+
     private Animator ani;
     private Animator bossAni;
     private WaterSpriteAttackController attackCon;
@@ -69,7 +69,7 @@ public class BlackUmbrella : MonoBehaviour
         if (ani == null)
         {
             ani = GetComponent<Animator>();
-            WaterSprite ws = owner.GetComponent<WaterSprite>();
+            ws = owner.GetComponent<WaterSprite>();
             bossAni = ws.ani;
             GetComponentInChildren<AttackTrigger>().owner = ws;
             attackCon = owner.GetComponent<WaterSpriteAttackController>();
@@ -218,6 +218,7 @@ public class BlackUmbrella : MonoBehaviour
         if (!effectIns)
         {
             effectIns = PoolManager.Instantiate(effect, Camera.main.transform);
+            effectIns.GetComponent<Bullet>().owner = ws;
         }
         if (!IsTargetVisible(gameObject))
         {

+ 1 - 0
ActionTowerDefense/Assets/Scripts/Boss/WaterGhost/WaterSprite.cs

@@ -179,6 +179,7 @@ public class WaterSprite : Boss
 
     public override void ClearAllSkills()
     {
+        Debug.Log("Çå¿Õ¼¼ÄܶÔÏó");
         GameObject umbrella = attack.umbrellaInstance;
         if (umbrella)
         {