Merge remote-tracking branch 'origin/master'

ActionTowerDefense/Assets/Resources/Prefab/Arrow_summon.prefab

@@ -133,7 +133,7 @@ MonoBehaviour:
   bulletType: 1
   isGetTarget: 0
   speed: 25
-  maxFlyTime: 1
+  maxFlyTime: 0.8
   flyTime: 0
   isTrack: 0
   canAlwaysTrack: 0

ActionTowerDefense/Assets/Resources/Prefab/FX/InjuryNum.prefab

@@ -60,7 +60,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 1516060329
-  m_SortingOrder: 10
+  m_SortingOrder: 1
   m_TargetDisplay: 0
 --- !u!114 &8749957310071290871
 MonoBehaviour:
@@ -167,7 +167,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3a190f6296dae6343a4814ec08eaada3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  stayTime: 0.5
+  stayTime: 0.15
   time: 0
   text: {fileID: 2900984280701609507}
 --- !u!1 &8125812590587871954
@@ -263,13 +263,13 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 50
-  m_fontSizeBase: 50
+  m_fontSize: 40
+  m_fontSizeBase: 40
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 3
+  m_fontStyle: 2
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 256
   m_textAlignment: 65535

ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -5772,7 +5772,7 @@ MonoBehaviour:
   AttackSummonChangeTime: 0
   lastSoldier: 0
   mp: 0
-  totalMp: 450
+  totalMp: 600
   totalMp_2Players: 450
   isMpRepel: 1
   isRapedReply: 0
@@ -5790,14 +5790,14 @@ MonoBehaviour:
   moveVec: {x: 0, y: 0}
   leftDir: {x: 0, y: 0}
   rushSpeed: 30
-  rushChargeTotalNums: 10
+  rushChargeTotalNums: 2
   rushChargeNums: 0
-  rushChargeAddTime: 1
+  rushChargeAddTime: 3
   rushChargeTime: 0
   rushDir: {x: 0, y: 0, z: 0}
   rushInvincibleTime: 1
   rushTime: 0
-  totalRushTime: 0.2
+  totalRushTime: 0.3
   cacheRushTime: 0
   totalCacheRushTime: 0.1
   jumpSpeed: 20
@@ -6275,6 +6275,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:

ActionTowerDefense/Assets/Resources/Prefab/blad1_summon.prefab

@@ -9839,7 +9839,7 @@ MonoBehaviour:
   bulletType: 0
   isGetTarget: 0
   speed: 25
-  maxFlyTime: 1
+  maxFlyTime: 0.8
   flyTime: 0
   isTrack: 0
   canAlwaysTrack: 0

ActionTowerDefense/Assets/Resources/Prefab/blad2_summon.prefab

@@ -19593,7 +19593,7 @@ MonoBehaviour:
   bulletType: 0
   isGetTarget: 0
   speed: 25
-  maxFlyTime: 1
+  maxFlyTime: 0.8
   flyTime: 0
   isTrack: 0
   canAlwaysTrack: 0