Merge remote-tracking branch 'origin/master'

ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -460,7 +460,6 @@ Transform:
   - {fileID: 4278110667860756949}
   - {fileID: 8692792125260174174}
   - {fileID: 5212359350877648398}
-  - {fileID: 6678189523681876430}
   m_Father: {fileID: 2788556811231999033}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -497,7 +496,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
-  smoke: {fileID: 0}
   hitRate: 1
 --- !u!1 &1757064525815025384
 GameObject:
@@ -589,68 +587,6 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 1, z: 0}
---- !u!1 &3411216572074458385
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6678189523681876430}
-  - component: {fileID: 7384483702532375717}
-  - component: {fileID: 2536450432252384432}
-  m_Layer: 0
-  m_Name: SprintLinkTrigger
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &6678189523681876430
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3411216572074458385}
-  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
-  m_Children: []
-  m_Father: {fileID: 5205406772191310031}
-  m_RootOrder: 10
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &7384483702532375717
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3411216572074458385}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 2, y: 2, z: 2}
-  m_Center: {x: 0, y: 1, z: 0}
---- !u!114 &2536450432252384432
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3411216572074458385}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7f58c1ec424d6b449a9d1d7a5322c9c6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  enemyRopePrefab: {fileID: 616841038056457886, guid: db20d049c85578a4db3cef14a52b0f7b, type: 3}
-  playerRopePrefab: {fileID: 7712882736463803884, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-  linkedEnemy: []
-  playerID: 0
 --- !u!1 &3571941038519084344
 GameObject:
   m_ObjectHideFlags: 0
@@ -767,8 +703,6 @@ MonoBehaviour:
   isTran: 0
   pc: {fileID: 0}
   hptp: 0
-  joint: {fileID: 0}
-  rope: {fileID: 0}
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -853,8 +787,6 @@ MonoBehaviour:
   endChange: 0
   rightDir: {x: 0, y: 0}
   uiMp: {fileID: 8465211090008398057}
-  playerRope: {fileID: 112529840073562573, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-  sprintLinkTrigger: {fileID: 2536450432252384432}
   soulCollector: {fileID: 3739918129319493242}
   skeletonMecanim: {fileID: 6843453365888964567}
   playerSpine:
@@ -878,7 +810,7 @@ MonoBehaviour:
   moveVec: {x: 0, y: 0}
   leftDir: {x: 0, y: 0}
   rushSpeed: 30
-  rushCostMp: 15
+  rushCostMp: 150
   rushDir: {x: 0, y: 0, z: 0}
   rushInvincibleTime: 0.2
   rushTime: 0
@@ -1701,6 +1633,7 @@ MonoBehaviour:
   type: 0
   owner: {fileID: 0}
   isSingleAttack: 0
+  cantSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}

ActionTowerDefense/Assets/Scripts/Characters/AttributeStatus.cs

@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AttributeStatus : MonoBehaviour
+{
+    public enum SpecialState
+    {
+        weak = 0,
+        coma = 1,
+        blownUp = 2,
+        shotDown = 3,
+    }
+
+    public List<SpecialState> curSpecialStates;
+
+    //CharacterState¸üΪSpecialStatusʱµ÷Óô˺¯Êý
+    public void SpecialStateEffect()
+    {
+
+    }
+}

ActionTowerDefense/Assets/Scripts/Characters/AttributeStatus.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1d04dd6e35d71724689001e450625c39
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ActionTowerDefense/Assets/Scripts/Characters/Character.cs

@@ -35,6 +35,7 @@ public enum CharacterState
     BaGua = 24,             //八卦状态
     LockSoul = 25,          //在锁魂塔中
     Conduct = 26,           //在指挥中
+    SpecialStatus,
 }
 
 //攻击类型