WGL 1 ヶ月 前
コミット
cda58ee64f

+ 6 - 5
ActionTowerDefense/Assets/Resources/Prefab/Conduct/IceRain.prefab

@@ -77,7 +77,7 @@ SpriteRenderer:
   m_SortingLayer: 4
   m_SortingOrder: 1
   m_Sprite: {fileID: 21300000, guid: b7dafa7e5223da44d98bba0cc7ca80f7, type: 3}
-  m_Color: {r: 0.8490566, g: 0.7584525, b: 0.18823424, a: 0.972549}
+  m_Color: {r: 0.18823528, g: 0.8509804, b: 0.83190405, a: 0.972549}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
@@ -9988,7 +9988,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9a4a2dbc1e482cd4b9f1532e1fddcb30, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  canStop: 0
   stopTime: 0
   isBulletMove: 1
   owner: {fileID: 0}
@@ -10063,18 +10062,20 @@ MonoBehaviour:
   trigedObjs: []
   bulletType: 0
   isGetTarget: 0
-  speed: 10
+  speed: 20
   maxFlyTime: 10
   flyTime: 0
-  isTrack: 0
-  canAlwaysTrack: 0
   trackTarget: {fileID: 0}
   effect: {fileID: 0}
   disappearEffect: {fileID: 417478504669294145, guid: 385b33db1f202c2468299c69263cfda5, type: 3}
   canTransmit: 0
   haveTransmit: 0
   transmitTime: 0
+  canStop: 0
+  isTrack: 0
+  canAlwaysTrack: 0
   isCreatedByDemonicSummon: 0
+  canPassGround: 0
 --- !u!54 &8541051486027365006
 Rigidbody:
   m_ObjectHideFlags: 0

+ 2 - 1
ActionTowerDefense/Assets/Resources/Prefab/Conduct/IceRainControl.prefab

@@ -47,7 +47,8 @@ MonoBehaviour:
   sword: {fileID: 7473170563405908938, guid: 17671019b4ca59f49963e6c7bf5c5ff7, type: 3}
   owner: {fileID: 0}
   swordsNum: 0
-  totalTime: 1
+  totalTime: 0.5
+  minInterval: 0.05
   damage: 0
   PosRangeX: {x: 2, y: 7}
   start: 0

+ 43 - 10
ActionTowerDefense/Assets/Resources/Prefab/GameManager.prefab

@@ -72,6 +72,26 @@ MonoBehaviour:
   enemyGoldDrop: 5
   dropGoldFX: {fileID: 1723151111827507807, guid: 8ac2bd44510cc7840adf9877a9ecad46, type: 3}
   dropGoldText: {fileID: 6467251191553420251, guid: 7df1aa66331659042a29ed5c238dce79, type: 3}
+  isFireEnable: 0
+  fireProbability: 100
+  fireDamageRadio: 0.01
+  isIceEnable: 0
+  iceProbability: 100
+  frozenTime: 3
+  isThunderEnable: 0
+  thunderProbability: 100
+  moveSpeedScale: 0.6
+  attackSpeedScale: 0.6
+  thunderDamage: 3
+  isWindEnable: 0
+  windProbability: 100
+  weightReductionratio: 0.1
+  windDamage: 3
+  isWoodEnable: 0
+  woodProbability: 100
+  isRockEnable: 0
+  rockProbability: 100
+  stoneHpRadio: 1
   tagWeight:
   - 20
   - 15
@@ -135,9 +155,9 @@ MonoBehaviour:
     attributeTag: 7
     sacrificeRatio:
     - 100
-    - 100
-    - 100
-    - 100
+    - 60
+    - 50
+    - 50
     power: 01000000020000000300000004000000
     effectBonus: 5
     cd:
@@ -151,10 +171,10 @@ MonoBehaviour:
     attributeTag: 6
     sacrificeRatio:
     - 100
-    - 100
-    - 100
-    - 100
-    power: 02000000030000000400000005000000
+    - 60
+    - 50
+    - 50
+    power: 03000000030000000400000005000000
     effectBonus: 5
     cd:
     - 20
@@ -162,8 +182,21 @@ MonoBehaviour:
     - 10
     - 5
     obj: {fileID: 256012001268456902, guid: 26ed0fb31296bdd4bb45e22ce2b925bc, type: 3}
-    angleRange: 90
-    arrivalAngle: 0
+  iceRain:
+    attributeTag: 3
+    sacrificeRatio:
+    - 100
+    - 60
+    - 50
+    - 50
+    power: 0a000000050000000700000009000000
+    effectBonus: 5
+    cd:
+    - 20
+    - 15
+    - 10
+    - 5
+    obj: {fileID: 256012001268456902, guid: 758282baf4c34f04a86e4bb81a0afbdd, type: 3}
 --- !u!114 &1880576200062196086
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -205,7 +238,7 @@ MonoBehaviour:
   levelIdA_debug: 8
   levelIdB_debug: 2
   curLevel: {fileID: 0}
-  curLevelID: 0
+  curLevelID: 5
   levels:
   - "0:9\u54081\u5173\u5361\u5C1D\u8BD5"
   - "1:\u6C34\u9762\u5173\u53612"

+ 6 - 0
ActionTowerDefense/Assets/Scripts/Bullet.cs

@@ -159,6 +159,12 @@ public class Bullet : MonoBehaviour
             }
 
         }
+        if(!canPassGround && other.CompareTag("Ground"))
+        {
+            DisappearEffect();
+            gameObject.SetActive(false);
+            return;
+        }
         BeHitTrigger hitTrigger = other.GetComponent<BeHitTrigger>();
         if (hitTrigger != null)
         {

+ 15 - 11
ActionTowerDefense/Assets/Scripts/Conduct/IceRainController.cs

@@ -8,7 +8,10 @@ public class IceRainController : MonoBehaviour
     public PlayerController owner;
     public int swordsNum;
     public float totalTime;
+    public float minInterval;
     private float interval;
+    private Vector3 pos;
+    private int dir;
     public int damage;
     public Vector2 PosRangeX;
     public bool start;
@@ -24,16 +27,8 @@ public class IceRainController : MonoBehaviour
             GameObject obj = PoolManager.Instantiate(sword);
             owner.attackController.curAttackMethod.attackInfo.damage = damage;
             owner.attackController.curAttackMethod.attackInfo.attackMethod_Type = AttackMethod_Type.Attack_Summon;
-            Vector3 targetPos = new Vector3(Random.Range(PosRangeX.x,PosRangeX.y), 0, 0);
-            if (owner.bodyTrans.localScale.x >= 0)
-            {
-                targetPos = owner.transform.position - targetPos;
-            }
-            else
-            {
-                targetPos = owner.transform.position - targetPos;
-            }
-            targetPos.y = height;
+            Vector3 targetPos = new Vector3(dir * Random.Range(PosRangeX.x,PosRangeX.y), height, 0);
+            targetPos = pos + targetPos;
             obj.GetComponent<Bullet>().BeShoot(owner, targetPos, Vector3.down, false);
             num++;
             time = interval;
@@ -48,7 +43,16 @@ public class IceRainController : MonoBehaviour
     {
         time = 0;
         num = 0;
-        interval = totalTime / swordsNum;
+        interval = totalTime/swordsNum;
+        pos = owner.transform.position;
+        if (owner.bodyTrans.localScale.x >= 0)
+        {
+            dir = -1;
+        }
+        else
+        {
+            dir = 1;
+        }
         start = true;
     }
 }