Browse Source

添加ready提示修改

DESKTOP-PG06IH1\Mr.AB 10 tháng trước cách đây
mục cha
commit
6b05a28b2f

+ 20 - 20
ActionTowerDefense/Assets/Resources/Prefab/Conduct/AngryBullet.prefab

@@ -59,7 +59,7 @@ ParticleSystem:
   startDelay:
     serializedVersion: 2
     minMaxState: 0
-    scalar: 1
+    scalar: 0
     minScalar: 0
     maxCurve:
       serializedVersion: 2
@@ -172,7 +172,7 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 0
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -288,7 +288,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 3
+      scalar: 1
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -4836,9 +4836,9 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1730265859
+  m_SortingLayer: 4
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -5213,7 +5213,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 3
+      scalar: 1
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -9761,9 +9761,9 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1730265859
+  m_SortingLayer: 4
+  m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -9882,8 +9882,8 @@ MonoBehaviour:
   maxTime: 0.02
   maxTimes: 2
   curTimes: 0
-  firstMaxDis: 20
-  maxDistance: 10
+  firstMaxDis: 99
+  maxDistance: 99
   self: {fileID: 322494267869588354}
   speed: 20
   fx: 1
@@ -10172,7 +10172,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 5
+      scalar: 2
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -14720,9 +14720,9 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1730265859
+  m_SortingLayer: 4
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -15129,7 +15129,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.7
+      scalar: 0.2
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -19677,9 +19677,9 @@ ParticleSystemRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1730265859
+  m_SortingLayer: 4
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/Conduct/AngryBulletController.prefab

@@ -47,5 +47,5 @@ MonoBehaviour:
   angryBulletObj: {fileID: 3584230841871599468, guid: 781fd505403106740a57d2980611eb38, type: 3}
   playerController: {fileID: 0}
   cacheConductId: 0
-  invokeTime: 0.05
+  invokeTime: 0.1
   maxNum: 0

+ 143 - 1
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -1003,7 +1003,7 @@ MonoBehaviour:
   - 0
   - 0
   - 0
-  conductSkills: 060000000300000004000000
+  conductSkills: 060000000000000004000000
   conductCanRelease: 010101
   conductReadyTip: {fileID: 946637326309089849}
   bigGiant: {fileID: 5440846222648032759, guid: d64528a2dcc945b4a9ea5d5a859679f3, type: 3}
@@ -1797,6 +1797,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: conductReady
       objectReference: {fileID: 0}
+    - target: {fileID: 1373031044951819773, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1639900831015566504, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
       propertyPath: m_RootOrder
       value: 3
@@ -1841,6 +1845,70 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8283194513254342148, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8283194513254342148, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8283194513254342148, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8283194513254342148, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8283194513254342148, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 8283194513254342148, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8283194513254342148, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8283194513254342148, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 8283194513254342148, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 8894579418163447399, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: c6938425d6b5363428e7d1151a6e0000, type: 3}
+    - target: {fileID: 8894579418163447399, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_Color.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8894579418163447399, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8894579418163447399, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8894579418163447399, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_SortingLayer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8894579418163447399, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_SortingOrder
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8894579418163447399, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -1730265859
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
 --- !u!114 &946637326309089849 stripped
@@ -1859,6 +1927,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1639900831015566504, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
   m_PrefabInstance: {fileID: 302311904116852515}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &8557356703488448807 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8283194513254342148, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+  m_PrefabInstance: {fileID: 302311904116852515}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1290486754801983368
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1978,3 +2051,72 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 6831563428749086452, guid: b6796e6a59b3da34a8735079b033db33, type: 3}
   m_PrefabInstance: {fileID: 1290486754801983368}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5911346910402251420
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8557356703488448807}
+    m_Modifications:
+    - target: {fileID: 203424476612699416, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_Name
+      value: star
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}