Browse Source

指挥ready效果接入

LAPTOP-OM1V99U2\永远de小亡灵 10 months ago
parent
commit
ee2c2e091d

+ 81 - 83
ActionTowerDefense/Assets/Resources/Prefab/Conduct/conductReady.prefab

@@ -29,7 +29,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8283194513254342148}
+  - {fileID: 3157771271738667440}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -45,89 +45,87 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: efc3c75c4c266ef488ed0a1ba33a2910, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  isShowing: 0
-  sprite: {fileID: 8894579418163447399}
---- !u!1 &1373031044951819773
-GameObject:
+  starFx: {fileID: 8750109257812787716}
+--- !u!1001 &8916027172269287196
+PrefabInstance:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8283194513254342148}
-  - component: {fileID: 8894579418163447399}
-  m_Layer: 0
-  m_Name: Sprite
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8283194513254342148
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1639900831015566504}
+    m_Modifications:
+    - target: {fileID: 203424476612699416, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_Name
+      value: star
+      objectReference: {fileID: 0}
+    - target: {fileID: 203424476612699416, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      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}
+--- !u!4 &3157771271738667440 stripped
 Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 5795780073264895660, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+  m_PrefabInstance: {fileID: 8916027172269287196}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1373031044951819773}
-  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: 1639900831015566504}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &8894579418163447399
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+--- !u!1 &8750109257812787716 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 203424476612699416, guid: f3a0026daa5674441b25b18d98ea18cd, type: 3}
+  m_PrefabInstance: {fileID: 8916027172269287196}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1373031044951819773}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 1, y: 1}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0

+ 4 - 75
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -1014,7 +1014,6 @@ MonoBehaviour:
   - 3.5
   giantDieNum: 02000000030000000500000007000000
   photosphereObj: {fileID: 256012001268456902, guid: ba2e5bcb5c7ac604ea72b2fcb544a3cb, type: 3}
-  addAttack: 0.2
   attackEffect: {fileID: 417478504669294145, guid: 3b9e1b8087a2c2441a51fff8fec35d4f, type: 3}
   mountain: {fileID: 8587706472837483213, guid: d966b0d5004eaad49b37c963f1aaa584, type: 3}
   offset: {x: 0, y: 7, z: 0}
@@ -1845,6 +1844,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3157771271738667440, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8283194513254342148, guid: 00e0f54f92bab0e4f8e42b1550fc8955, type: 3}
       propertyPath: m_LocalScale.x
       value: 3
@@ -1927,11 +1930,6 @@ 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
@@ -2051,72 +2049,3 @@ 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}

+ 8 - 13
ActionTowerDefense/Assets/Scripts/Conduct/ConductReadyTip.cs

@@ -5,33 +5,28 @@ using UnityEngine;
 public class ConductReadyTip : MonoBehaviour
 {
     private bool isShowing;
-    public SpriteRenderer sprite;
+    public GameObject starFx;
     private float time;
-    // Start is called before the first frame update
-    void Start()
+    private void Start()
     {
-        sprite.enabled = false;
+        starFx.SetActive(false);
     }
-
-    // Update is called once per frame
     void Update()
     {
         if (isShowing)
         {
-            time -= Time.deltaTime;
-            sprite.color = new Color(1, 1, 1, time);
-            if(time <= 0)
+            time += Time.deltaTime;
+            if(time >= 1)
             {
-                sprite.enabled = false;
+                starFx.SetActive(false);
                 isShowing = false;
             }
         }
     }
     public void Show()
     {
-        time = 1;
-        sprite.enabled = true;
-        sprite.color = new Color(1, 1, 1, 1);
+        time = 0;
+        starFx.SetActive(true);
         isShowing = true;
     }
 }