特效系统完善

11 months ago · 6b40c8f75d
8 changed files with 109 additions and 333582 deletions
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/BulletFather.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/BulletFather.prefab
@ -0,0 +1,61 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1055007851598090953
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4263336468108556755}
+  - component: {fileID: 6106862267553835108}
+  - component: {fileID: 2145123208192719611}
+  m_Layer: 0
+  m_Name: BulletFather
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4263336468108556755
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1055007851598090953}
+  serializedVersion: 2
+  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: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6106862267553835108
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1055007851598090953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: db15616011d4af54ab96675691ae89d9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  bullet: {fileID: 7497921666332780400, guid: 0998db39df641244bb46077f7d373bea, type: 3}
+--- !u!114 &2145123208192719611
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1055007851598090953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 570ebcb3e54b95b459b35f119d0bdc6a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  time: 4
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/FireStraightBullet/VFX_Fireball.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/FireStraightBullet/VFX_Fireball.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8807691333d18d043bf17b655b01c366
+guid: c3c0f6a50e4c99e4db88e5f80c303b71
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/FireStraightBullet/VFX_Fireball.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/FireStraightBullet/VFX_Fireball.prefab
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab
@ -831,7 +831,7 @@ MonoBehaviour:
  fun1Val: {fileID: 0}
  fun2Val: {fileID: 0}
  fun3Val: {fileID: 0}
-  cardBulletPrefab: {fileID: 7497921666332780400, guid: 0998db39df641244bb46077f7d373bea,
+  cardBulletFatherPrefab: {fileID: 1055007851598090953, guid: c3c0f6a50e4c99e4db88e5f80c303b71,
    type: 3}
  smallCardPrefab: {fileID: 3615574969851259241, guid: 6b6415efaba29284c9541d0dd5521dd3,
    type: 3}
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
@ -26175,112 +26175,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 348176937}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1228210582
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1228210583}
-  - component: {fileID: 1228210586}
-  - component: {fileID: 1228210585}
-  - component: {fileID: 1228210584}
-  m_Layer: 0
-  m_Name: Plane (2)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &1228210583
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1228210582}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.5, y: -0.5, z: 0.5, w: 0.5}
-  m_LocalPosition: {x: 0, y: 0, z: 11.520001}
-  m_LocalScale: {x: 0.10000002, y: 0.10000001, z: 0.09999999}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1705010921}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!64 &1228210584
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1228210582}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1228210585
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1228210582}
-  m_Enabled: 0
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 9e939f1168e06f243b03e77153dc19c5, type: 2}
-  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: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1228210586
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1228210582}
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1239633463
 GameObject:
  m_ObjectHideFlags: 0
@ -40306,93 +40200,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1678324333}
  m_CullTransparentMesh: 1
--- !u!1001 &1682235762
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 90
-      objectReference: {fileID: 0}
-    - target: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7497921666332780400, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: m_Name
-      value: PS_VFX_Fireball_Proj
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263866456224861184, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: CollisionModule.type
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263866456224861184, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: CollisionModule.m_Planes.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263866456224861184, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      propertyPath: CollisionModule.m_Planes.Array.data[0]
-      value: 
-      objectReference: {fileID: 1228210583}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1228210583}
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 0998db39df641244bb46077f7d373bea, type: 3}
 --- !u!1 &1685999706
 GameObject:
  m_ObjectHideFlags: 0
@ -40718,12 +40525,6 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1704571197}
  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1705010921 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3767782239457588665, guid: 0998db39df641244bb46077f7d373bea,
-    type: 3}
-  m_PrefabInstance: {fileID: 1682235762}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1705244122
 GameObject:
  m_ObjectHideFlags: 0
@ -50638,4 +50439,3 @@ SceneRoots:
  - {fileID: 544518823}
  - {fileID: 1331568016}
  - {fileID: 2123037811}
-  - {fileID: 1682235762}
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Bullet/CardBullet/BulletFather.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Bullet/CardBullet/BulletFather.cs
@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BulletFather : MonoBehaviour
+{
+    [Header("×Óµ¯Ò©Ô¤ÖÆÌå")]
+    public GameObject bullet;
+
+    public IEnumerator CreateBulleNode(List<MapUnity> destinationMapUnity)
+    {
+        for (int i = 0; i < destinationMapUnity.Count; i++)
+        {
+            var bulle = Instantiate(bullet, transform.position, bullet.transform.localRotation);
+            if (i < destinationMapUnity.Count - 1)
+            {
+                StartCoroutine(bulle.GetComponent<BulletNode>().MoveToDestination(destinationMapUnity[i].transform, GameManager.Instance.player.transform));
+                //yield return new WaitForSeconds(0.1f);
+            }
+            else
+            {
+                yield return StartCoroutine(bulle.GetComponent<BulletNode>().MoveToDestination(destinationMapUnity[i].transform, GameManager.Instance.player.transform));
+            }
+            yield return null;
+        }
+    }
+}
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Bullet/CardBullet/BulletFather.cs.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Bullet/CardBullet/BulletFather.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: db15616011d4af54ab96675691ae89d9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs
@ -68,7 +68,7 @@ public class CardEntity : MonoBehaviour

    public Text fun3Val;
    [Header("卡牌释放后弹丸效果")]//临时引用，以后要挪到属性表里
-    public GameObject cardBulletPrefab;
+    public GameObject cardBulletFatherPrefab;
    [Header("卡牌释放后效小卡")]
    public GameObject smallCardPrefab;
    //不生成小卡(手动禁止小卡功能)
@ -253,7 +253,12 @@ public class CardEntity : MonoBehaviour
            }
            MapUnityManager.Instance.castPool.Clear();

-            List <MapUnity> cardColorInfluence = influencePreviewPool .ToList ();//生效地块
+            List<MapUnity> cardColorInfluence = influencePreviewPool.ToList();//ÉúÐ§µØ¿é
+            var bullet = Instantiate(cardBulletFatherPrefab, transform.position, cardBulletFatherPrefab.transform.localRotation);
+            BulletFather bulletFather = bullet.GetComponent<BulletFather>();
+            yield return bulletFather .StartCoroutine(bulletFather.CreateBulleNode(cardColorInfluence));
+            /*
+           
            for(int i=0;i < cardColorInfluence.Count;i++ )
            {
                var bulle = Instantiate(cardBulletPrefab, transform.position, cardBulletPrefab.transform.localRotation);
@ -267,9 +272,7 @@ public class CardEntity : MonoBehaviour
                    yield return StartCoroutine(bulle.GetComponent<BulletNode>().MoveToDestination(cardColorInfluence[i].transform, GameManager.Instance.player.transform));
                }
                
-            }
-           
-
+            }*/
        }

        yield return StartCoroutine(DestructionManager.Instance.startDestoryAndUseCard(this.gameObject, cardOriginalData, influencePreviewPool, cardIndex, targetNode));