Bladeren bron

平台可以选择谁能走

WGL 2 maanden geleden
bovenliggende
commit
4eaa8530cc

+ 12 - 4
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab

@@ -586,7 +586,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   rb: {fileID: 0}
   moveCharacter: {fileID: 0}
-  canOnGiant: 1
   haveGravity: 1
   trigGroundList: []
   platform: {fileID: 0}
@@ -842,7 +841,6 @@ MonoBehaviour:
     minAttackDis: 0
     searchMode: 0
     canHitFly: 1
-    armorPiercing: 0
     bulletPrefab: {fileID: 0}
     shootPos: []
     maxUpAngle: 0
@@ -907,7 +905,6 @@ MonoBehaviour:
     minAttackDis: 0
     searchMode: 0
     canHitFly: 1
-    armorPiercing: 0
     bulletPrefab: {fileID: 0}
     shootPos: []
     maxUpAngle: 0
@@ -972,7 +969,6 @@ MonoBehaviour:
     minAttackDis: 0
     searchMode: 0
     canHitFly: 0
-    armorPiercing: 0
     bulletPrefab: {fileID: 0}
     shootPos: []
     maxUpAngle: 0
@@ -1593,6 +1589,18 @@ PrefabInstance:
       propertyPath: canPenetrateBullets
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5706277928133819894, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_Enabled
       value: 0

+ 192 - 0
ActionTowerDefense/Assets/Resources/Prefab/ScenceInteraction/china_bridge.prefab

@@ -2148,6 +2148,22 @@ PrefabInstance:
       propertyPath: m_Name
       value: Platform (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 4
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &950138701161947883 stripped
@@ -2222,6 +2238,22 @@ PrefabInstance:
       propertyPath: canDown
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &1648020575898239016 stripped
@@ -2300,6 +2332,22 @@ PrefabInstance:
       propertyPath: haveMagnetic
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &1780206820179857934 stripped
@@ -2374,6 +2422,22 @@ PrefabInstance:
       propertyPath: canDown
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 4
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &3561340921117414748 stripped
@@ -2452,6 +2516,22 @@ PrefabInstance:
       propertyPath: haveMagnetic
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &4077696197427828486 stripped
@@ -2526,6 +2606,22 @@ PrefabInstance:
       propertyPath: canDown
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 4
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &4478891414781607705 stripped
@@ -2600,6 +2696,22 @@ PrefabInstance:
       propertyPath: canDown
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 4
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &4806840894034370970 stripped
@@ -2674,6 +2786,22 @@ PrefabInstance:
       propertyPath: canDown
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 4
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &4988212647724925324 stripped
@@ -2748,6 +2876,22 @@ PrefabInstance:
       propertyPath: canDown
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &6069891306407973631 stripped
@@ -2900,6 +3044,22 @@ PrefabInstance:
       propertyPath: m_Name
       value: Platform
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 4
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &6874730430326756880 stripped
@@ -3056,6 +3216,22 @@ PrefabInstance:
       propertyPath: canDown
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 4
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &8739740514263683258 stripped
@@ -3130,6 +3306,22 @@ PrefabInstance:
       propertyPath: canDown
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[1]
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[2]
+      value: 4
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
 --- !u!4 &9172148340426108557 stripped

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

@@ -25417,6 +25417,7 @@ MonoBehaviour:
   targetTypes: 0400000006000000
   attackSummonId: 0
   attackMarchId: 0
+  summonTime: []
   attackMethod_summon: []
   attackMethod_march:
   - attackName: attack_march
@@ -25475,7 +25476,6 @@ MonoBehaviour:
     minAttackDis: 0
     searchMode: 0
     canHitFly: 1
-    armorPiercing: 0
     bulletPrefab: {fileID: 7473170563405908938, guid: 1a8b22d7c1002f9468efb1362b6616a3, type: 3}
     shootPos:
     - {fileID: 6126647544809975593}
@@ -25541,7 +25541,6 @@ MonoBehaviour:
     minAttackDis: 0
     searchMode: 0
     canHitFly: 0
-    armorPiercing: 0
     bulletPrefab: {fileID: 0}
     shootPos: []
     maxUpAngle: 0
@@ -35556,6 +35555,14 @@ PrefabInstance:
       propertyPath: canPenetrateBullets
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 9180128304838884880, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalScale.x
       value: 1.45
@@ -35642,6 +35649,14 @@ PrefabInstance:
       propertyPath: canPenetrateBullets
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4258677732850543250, guid: 12435a63399f44f4a919a57010981786, type: 3}
+      propertyPath: targetType.Array.data[0]
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 9180128304838884880, guid: 12435a63399f44f4a919a57010981786, type: 3}
       propertyPath: m_LocalScale.x
       value: 1.45

+ 3 - 16
ActionTowerDefense/Assets/Scripts/Characters/Foot.cs

@@ -1,15 +1,13 @@
-using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using Sirenix.OdinInspector;
+using System;
 
 public class Foot : MonoBehaviour
 {
     [FoldoutGroup("组件")] public Rigidbody rb;
     [FoldoutGroup("组件")] public MoveCharacter moveCharacter;
 
-    [FoldoutGroup("条件")] [LabelText("是否能站在胖子上")] public bool canOnGiant;
-
     public bool haveGravity = true;
     public bool TrigGround
     {
@@ -135,8 +133,8 @@ public class Foot : MonoBehaviour
             Platform platform = other.GetComponent<Platform>();
             if (platform != null)
             {
-                //是否为胖子头上的平台(==null不是胖子的平台)
-                if (platform.rb == null)
+                TargetType myTargetType = (TargetType)Enum.Parse(typeof(TargetType), moveCharacter.tag);
+                if (Array.Exists(platform.targetType, x => x == myTargetType))
                 {
                     if (!trigGroundList.Exists(t => t == other.gameObject))
                     {
@@ -144,17 +142,6 @@ public class Foot : MonoBehaviour
                         platform.feet.Add(this);
                     }
                 }
-                else
-                {
-                    if (canOnGiant)
-                    {
-                        if (!trigGroundList.Exists(t => t == other.gameObject))
-                        {
-                            trigGroundList.Add(other.gameObject);
-                            platform.feet.Add(this);
-                        }
-                    }
-                }
             }
         }
     }

+ 2 - 0
ActionTowerDefense/Assets/Scripts/Platform.cs

@@ -10,10 +10,12 @@ public class Platform : MonoBehaviour
     [FoldoutGroup("组件")] public Transform left;
     [FoldoutGroup("组件")] public Transform right;
 
+    [FoldoutGroup("条件")] public TargetType[] targetType;
     [FoldoutGroup("条件")] [LabelText("是否可以下平台")] public bool canDown = true;
     [FoldoutGroup("条件")] [LabelText("是否优先行走")] public bool haveMagnetic;
     [FoldoutGroup("条件")] [LabelText("是否可以穿透子弹")] public bool canPenetrateBullets;
     
+
     public bool TrigFeet
     {
         get