Merge remote-tracking branch 'origin/master'

ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab

@@ -881,7 +881,7 @@ MonoBehaviour:
     attackType: 0
     attackInfo:
       attackValue: 13
-      damage: 10
+      damage: 5
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
       criticalStrikeEffect: 0
@@ -903,7 +903,7 @@ MonoBehaviour:
         force: 110
         time: 2
         haveLandingDamage: 1
-        landingDamageRate: 2.5
+        landingDamageRate: 3
         ControlOrder: 0
       shotDown:
         directionType: 0

ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab

@@ -366,6 +366,7 @@ MonoBehaviour:
   cookEffect: {fileID: 0}
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
+  charactertag: 0
   hitResistance: 0
   bc: {fileID: 0}
   foot: {fileID: 2437299196663985756}
@@ -427,7 +428,7 @@ MonoBehaviour:
   player: {fileID: 0}
   playerID: 0
   id: 0
-  costMp: 50
+  costMp: 60
   isBack: 0
   baseSortingOrder: 6000
   runSpeed: 0
@@ -480,9 +481,9 @@ MonoBehaviour:
   attackSummonId: 0
   attackMarchId: 0
   summonTime:
-  - 0.15
-  - 0.15
-  - 0.7
+  - 0.2
+  - 0.2
+  - 0.9
   attackMethod_summon:
   - attackName: attack_summon1
     attackType: 0

ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -5728,6 +5728,7 @@ MonoBehaviour:
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   hitResistance: 100
+  bc: {fileID: 0}
   foot: {fileID: 3571941039716665623}
   attributeStatus: {fileID: 0}
   hitFeedbackSystem: {fileID: 0}
@@ -5819,7 +5820,7 @@ MonoBehaviour:
   moveVec: {x: 0, y: 0}
   leftDir: {x: 0, y: 0}
   rushSpeed: 30
-  rushChargeTotalNums: 4
+  rushChargeTotalNums: 2
   rushChargeNums: 0
   rushChargeAddTime: 1
   rushChargeTime: 0
@@ -5965,6 +5966,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  owner: {fileID: 0}
   attackInterval: 0
   addAttackEffect: {fileID: 0}
   isAttackTriggerOn: 0
@@ -5982,6 +5984,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -6217,6 +6220,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 01000000
@@ -6420,6 +6424,7 @@ MeshRenderer:
   m_Materials:
   - {fileID: 2100000, guid: 1b17f7962e0b9be49bb10e99c6bd95a6, type: 2}
   - {fileID: 2100000, guid: 0c319badfe2307a48b8810d891649565, type: 2}
+  - {fileID: 2100000, guid: 1b17f7962e0b9be49bb10e99c6bd95a6, type: 2}
   - {fileID: 2100000, guid: 8f08601a75fbb72488593cad9f89acca, type: 2}
   - {fileID: 2100000, guid: 0c319badfe2307a48b8810d891649565, type: 2}
   m_StaticBatchInfo:
@@ -6591,6 +6596,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -6702,6 +6708,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -7118,6 +7125,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 

ActionTowerDefense/Assets/Resources/Spine/Player01/player01_Controller.controller

@@ -2014,7 +2014,7 @@ AnimationClip:
         inWeight: 0
         outWeight: 0
       - serializedVersion: 3
-        time: 0.6666667
+        time: 1
         value: 0
         inSlope: 0
         outSlope: 0
@@ -2050,7 +2050,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.6666667
+    m_StopTime: 1
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0