Răsfoiți Sursa

角色走桥

WGL 4 luni în urmă
părinte
comite
5694b0d4a6

+ 1 - 2
ActionTowerDefense/Assets/Resources/Prefab/Platform.prefab

@@ -15,7 +15,7 @@ GameObject:
   - component: {fileID: 7018218071394610794}
   m_Layer: 13
   m_Name: Platform
-  m_TagString: Untagged
+  m_TagString: Platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -112,5 +112,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   rb: {fileID: 0}
   feet: []
-  edgeDistance: 2.5
   canDown: 1

+ 73 - 10
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -499,6 +499,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   hitRate: 1
+  isDemSummon: 0
 --- !u!1 &1604833298414634730
 GameObject:
   m_ObjectHideFlags: 0
@@ -764,8 +765,11 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 0}
+  isBeHitBySummonAttack: 0
   showInjuryNum: 1
   canFly: 0
+  nowCanFly: 0
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
@@ -774,6 +778,10 @@ MonoBehaviour:
   cookEffect: {fileID: 0}
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
+  injuryNumPos_summon: {x: 0, y: 1}
+  injuryNumRandom_summon: {x: 1, y: 1}
+  injuryNumPos_march: {x: 0, y: 1}
+  injuryNumRandom_march: {x: 2, y: 2}
   foot: {fileID: 3571941039716665623}
   attributeStatus: {fileID: 0}
   hitFeedbackSystem: {fileID: 0}
@@ -812,6 +820,7 @@ MonoBehaviour:
   sustainedInjury_IntervalTime: 0
   sustainedInjury_damage: 0
   heavyDamage: 100
+  killer: {fileID: 0}
   playerId: 0
   pos: {x: 140, y: 0}
   canJump: 1
@@ -883,6 +892,7 @@ MonoBehaviour:
   - {x: -1, y: 0, z: 0}
   - {x: -1, y: 0, z: 0}
   - {x: -1, y: 0, z: 0}
+  addSummonInvincibleTime: 0.1
   attackState: 0
   attackMoveSpeed: 5
   cacheAttackTime: 0
@@ -1015,7 +1025,6 @@ MonoBehaviour:
   attackInterval: 0
   curDamage: 0
   canHitFly: 0
-  armorPiercing: 0
   attackInfo:
     attackValue: 0
     damage: 0
@@ -1027,17 +1036,27 @@ MonoBehaviour:
       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}
       force: 0
       time: 0
+      haveLandingDamage: 0
+      landingDamage: 0
+      ControlOrder: 0
     shotDown:
+      directionType: 0
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
+      haveLandingDamage: 0
+      landingDamage: 0
+      ControlOrder: 0
     weak:
       time: 0
-    armor:
+      ControlOrder: 0
+    armorPiercing:
       rate: 0
     vulnerable:
       rate: 0
@@ -1046,6 +1065,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
@@ -1063,7 +1083,6 @@ MonoBehaviour:
   - id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -1075,17 +1094,27 @@ MonoBehaviour:
         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}
         force: 0
         time: 0
+        haveLandingDamage: 0
+        landingDamage: 0
+        ControlOrder: 0
       shotDown:
+        directionType: 0
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
+        haveLandingDamage: 0
+        landingDamage: 0
+        ControlOrder: 0
       weak:
         time: 0
-      armor:
+        ControlOrder: 0
+      armorPiercing:
         rate: 0
       vulnerable:
         rate: 0
@@ -1094,6 +1123,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0
@@ -1114,7 +1144,6 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -1126,17 +1155,27 @@ MonoBehaviour:
         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}
         force: 0
         time: 0
+        haveLandingDamage: 0
+        landingDamage: 0
+        ControlOrder: 0
       shotDown:
+        directionType: 0
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
+        haveLandingDamage: 0
+        landingDamage: 0
+        ControlOrder: 0
       weak:
         time: 0
-      armor:
+        ControlOrder: 0
+      armorPiercing:
         rate: 0
       vulnerable:
         rate: 0
@@ -1145,6 +1184,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0
@@ -1237,8 +1277,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.67, y: 0.12, z: 2}
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.67, y: 0.5695005, z: 2}
+  m_Center: {x: 0, y: -0.22475025, z: 0}
 --- !u!114 &3571941039716665623
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1567,6 +1607,7 @@ MonoBehaviour:
   haveVulnerable: 0
   vulnerableTime: 0
   resistances:
+    controlOrder: 0
     Float: 0
     BlowUp: 0
     ShotDown: 0
@@ -1599,17 +1640,27 @@ MonoBehaviour:
       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}
       force: 0
       time: 0
+      haveLandingDamage: 0
+      landingDamage: 0
+      ControlOrder: 0
     shotDown:
+      directionType: 0
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
+      haveLandingDamage: 0
+      landingDamage: 0
+      ControlOrder: 0
     weak:
       time: 0
-    armor:
+      ControlOrder: 0
+    armorPiercing:
       rate: 0
     vulnerable:
       rate: 0
@@ -1618,6 +1669,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0
@@ -1939,17 +1991,27 @@ MonoBehaviour:
       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}
       force: 0
       time: 0
+      haveLandingDamage: 0
+      landingDamage: 0
+      ControlOrder: 0
     shotDown:
+      directionType: 0
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
+      haveLandingDamage: 0
+      landingDamage: 0
+      ControlOrder: 0
     weak:
       time: 0
-    armor:
+      ControlOrder: 0
+    armorPiercing:
       rate: 0
     vulnerable:
       rate: 0
@@ -1958,6 +2020,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0

Fișier diff suprimat deoarece este prea mare
+ 800 - 122
ActionTowerDefense/Assets/Scenes/Game.unity


+ 2 - 2
ActionTowerDefense/Assets/Scripts/Characters/Foot.cs

@@ -36,7 +36,7 @@ public class Foot : MonoBehaviour
                 {
                     foreach (GameObject i in trigGroundList)
                     {
-                        if (i.layer == 13)
+                        if (i.CompareTag("Platform"))
                         {
                             rb.useGravity = false;
                             rb.velocity = new Vector3(rb.velocity.x, 0, rb.velocity.z);
@@ -72,7 +72,7 @@ public class Foot : MonoBehaviour
 
     private void OnTriggerEnter(Collider other)
     {
-        if (other.CompareTag("Plane"))
+        if (other.CompareTag("Plane")||other.CompareTag("Ground"))
         {
             //if (notOnGiant)
             //{

+ 1 - 0
ActionTowerDefense/Assets/Scripts/Characters/PlayerController.cs

@@ -1521,6 +1521,7 @@ public class PlayerController : MoveCharacter
                 //animalAni.SetInteger("state", (int)PlayerState.Walk);
                 break;
             case CharacterState.Rise:
+                bodyCollider.SetActive(false);
                 aniCollider.Play("Rise", 0, 0);
                 canJumpTime = 0;
                 break;

+ 3 - 3
ActionTowerDefense/ProjectSettings/TagManager.asset

@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!78 &1
 TagManager:
-  serializedVersion: 3
+  serializedVersion: 2
   tags:
   - Plane
   - Demonic
@@ -12,6 +12,8 @@ TagManager:
   - Soul
   - Boss
   - Portal
+  - Ground
+  - Platform
   layers:
   - Default
   - TransparentFX
@@ -70,5 +72,3 @@ TagManager:
   - name: UI
     uniqueID: 1516060329
     locked: 0
-  m_RenderingLayers:
-  - Default

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff