Merge branch 'master' of http://bttc123.synology.me:3002/bttc123/ActionTowerDefense

ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -242,7 +242,7 @@ Canvas:
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
+  m_SortingLayerID: 1516060329
   m_SortingOrder: 0
   m_TargetDisplay: 0
 --- !u!114 &1969773275
@@ -649,26 +649,30 @@ MonoBehaviour:
   totalHp: 3000
   hp: 0
   attack1Infos:
-  - damage: 300
+  - damage: 5
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
     changeHurt: 0
     hurtTime: 0
-  - damage: 300
+    repelValue: 0
+  - damage: 5
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
     changeHurt: 0
     hurtTime: 0
-  - damage: 300
+    repelValue: 0
+  - damage: 5
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
     changeHurt: 0
     hurtTime: 0
-  - damage: 300
+    repelValue: 0
+  - damage: 5
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
     changeHurt: 0
     hurtTime: 0
+    repelValue: 0
   attack2Infos: []
   attackTriggers:
   - {fileID: 1267495056}
@@ -694,6 +698,11 @@ MonoBehaviour:
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
   moveSpeed: 20
+  beRepelValue: 0
+  totalBeRepelValue: 100
+  weakTime: 0
+  totalWeakTime: 3
+  weakUpSpeed: 10
   demonicPrefabs:
   - {fileID: 8639832132491289359, guid: 4c2987691cdb47040b3a55ff928803c3, type: 3}
   - {fileID: 5440846222648032759, guid: 05825e721b2832f478f66e78daed901f, type: 3}
@@ -1390,6 +1399,7 @@ MonoBehaviour:
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   hurtTime: 0
+  repelValue: 0
 --- !u!1 &9046555753133816952
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Tower.prefab

@@ -162,7 +162,7 @@ Canvas:
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
+  m_SortingLayerID: 1516060329
   m_SortingOrder: 0
   m_TargetDisplay: 0
 --- !u!114 &6126647543790724641
@@ -753,6 +753,9 @@ MonoBehaviour:
   - damage: 10
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
+    changeHurt: 0
+    hurtTime: 0
+    repelValue: 0
   attack2Infos: []
   attackTriggers: []
   attackType: 1
@@ -769,6 +772,7 @@ MonoBehaviour:
   searchTrigger: {fileID: 6126647545521899017}
   targetTypes: 04000000
   canHitFly: 0
+  hurtKeepTime: 0
 --- !u!54 &6126647545658003340
 Rigidbody:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Scripts/Demonic.cs

@@ -325,10 +325,13 @@ public class Demonic : MoveCharacter
                     ChangeState(CharacterState.Idle);
                     break;
                 }
-                if (!foot.TrigGround && !canFly)
+                if (!foot.TrigGround)
                 {
                     rb.velocity += Vector3.up * extraFallGravity * Time.deltaTime;
                 }
+                Vector3 vel = rb.velocity;
+                vel.x = vel.x * (1 - decelerationRatio * Time.deltaTime);
+                rb.velocity = vel;
                 break;
             case CharacterState.Attack:
                 if (attackTime <= 0)

ActionTowerDefense/Assets/Scripts/Enemy.cs

@@ -274,6 +274,9 @@ public class Enemy : MoveCharacter
                 {
                     rb.velocity += Vector3.up * extraFallGravity * Time.deltaTime;
                 }
+                Vector3 vel = rb.velocity;
+                vel.x = vel.x * (1 - decelerationRatio * Time.deltaTime);
+                rb.velocity = vel;
                 break;
             case CharacterState.Attack:
                 if (attackTime <= 0)

ActionTowerDefense/Assets/Scripts/MoveCharacter.cs

@@ -16,6 +16,7 @@ public class MoveCharacter : Character
     public float weakTime;
     public float totalWeakTime;
     public float weakUpSpeed = 10f;
+    public float decelerationRatio = 1f;
 
     public override void BeHit(int damage, Vector3 force, bool changeHurt, float hurtTime, float repelValue)
     {

ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -522,6 +522,13 @@ public class PlayerController : MoveCharacter
                         break;
                     }
                 }
+                if (!foot.TrigGround)
+                {
+                    rb.velocity += Vector3.up * extraFallGravity * Time.deltaTime;
+                }
+                Vector3 vel = rb.velocity;
+                vel.x = vel.x * (1 - decelerationRatio * Time.deltaTime);
+                rb.velocity = vel;
                 CachedPlayerInput();
                 break;
             case CharacterState.Attack: