1

2025-11-14 19:34:36 +08:00
parent de88d2d6a1
commit 5ba318796f
77 changed files with 4244 additions and 11632 deletions
--- a/Assets/JGW/Vfx/10/animation/VFX_SM_B1_S5_20_A_loop.anim
+++ b/Assets/JGW/Vfx/10/animation/VFX_SM_B1_S5_20_A_loop.anim
@@ -21,24 +21,6 @@ AnimationClip:
    curve:
      serializedVersion: 2
      m_Curve:
-      - serializedVersion: 3
-        time: 3.4666667
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 4.2
-        value: 0.87822956
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      - serializedVersion: 3
        time: 4.8
        value: 0
@@ -49,11 +31,20 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 5.366667
-        value: 0.5743983
-        inSlope: 1.0136441
-        outSlope: 1.0136441
-        tangentMode: 34
+        time: 5.8333335
+        value: 1.172502
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 6.6666665
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
@@ -79,7 +70,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 3.1666667
+        time: 4.4
        value: 1
        inSlope: Infinity
        outSlope: Infinity
@@ -88,7 +79,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 4.8333335
+        time: 6.7
        value: 0
        inSlope: Infinity
        outSlope: Infinity
@@ -97,7 +88,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 7
+        time: 8
        value: 0
        inSlope: Infinity
        outSlope: Infinity
@@ -127,7 +118,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 2.8666666
+        time: 3.2666667
        value: 1
        inSlope: Infinity
        outSlope: Infinity
@@ -136,7 +127,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 4.8333335
+        time: 6
        value: 0
        inSlope: Infinity
        outSlope: Infinity
@@ -145,7 +136,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 7
+        time: 8
        value: 0
        inSlope: Infinity
        outSlope: Infinity
@@ -166,7 +157,7 @@ AnimationClip:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 3
-        time: 2.8666666
+        time: 3.2666667
        value: 1
        inSlope: 0
        outSlope: 0
@@ -175,7 +166,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 4.8
+        time: 5.9666667
        value: 1
        inSlope: 0
        outSlope: 0
@@ -196,7 +187,7 @@ AnimationClip:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 3
-        time: 2.8666666
+        time: 3.2666667
        value: 1
        inSlope: 0
        outSlope: 0
@@ -205,7 +196,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 4.8
+        time: 5.9666667
        value: 1
        inSlope: 0
        outSlope: 0
@@ -226,7 +217,7 @@ AnimationClip:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 3
-        time: 2.8666666
+        time: 3.2666667
        value: -0.7898782
        inSlope: 0
        outSlope: 0
@@ -235,7 +226,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 1
      - serializedVersion: 3
-        time: 3.5666666
+        time: 4.233333
        value: -0.47947016
        inSlope: 1.590299
        outSlope: 1.590299
@@ -244,7 +235,7 @@ AnimationClip:
        inWeight: 0.6892684
        outWeight: 0.3559846
      - serializedVersion: 3
-        time: 4.2
+        time: 5.133333
        value: 0.53583103
        inSlope: 1.4936006
        outSlope: 1.4936006
@@ -253,7 +244,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.31191382
      - serializedVersion: 3
-        time: 4.8
+        time: 5.9666667
        value: 0.81890786
        inSlope: 0
        outSlope: 0
@@ -274,7 +265,7 @@ AnimationClip:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 3
-        time: 2.8666666
+        time: 3.2666667
        value: 0
        inSlope: 0
        outSlope: 0
@@ -283,7 +274,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 4.8
+        time: 5.9666667
        value: 0
        inSlope: 0
        outSlope: 0
@@ -376,7 +367,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 7
+    m_StopTime: 8
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@@ -396,24 +387,6 @@ AnimationClip:
    curve:
      serializedVersion: 2
      m_Curve:
-      - serializedVersion: 3
-        time: 3.4666667
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 4.2
-        value: 0.87822956
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      - serializedVersion: 3
        time: 4.8
        value: 0
@@ -424,11 +397,20 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 5.366667
-        value: 0.5743983
-        inSlope: 1.0136441
-        outSlope: 1.0136441
-        tangentMode: 34
+        time: 5.8333335
+        value: 1.172502
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 6.6666665
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
@@ -454,7 +436,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 3.1666667
+        time: 4.4
        value: 1
        inSlope: Infinity
        outSlope: Infinity
@@ -463,7 +445,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 4.8333335
+        time: 6.7
        value: 0
        inSlope: Infinity
        outSlope: Infinity
@@ -472,7 +454,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 7
+        time: 8
        value: 0
        inSlope: Infinity
        outSlope: Infinity
@@ -502,7 +484,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 2.8666666
+        time: 3.2666667
        value: 1
        inSlope: Infinity
        outSlope: Infinity
@@ -511,7 +493,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 4.8333335
+        time: 6
        value: 0
        inSlope: Infinity
        outSlope: Infinity
@@ -520,7 +502,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 7
+        time: 8
        value: 0
        inSlope: Infinity
        outSlope: Infinity
@@ -541,7 +523,7 @@ AnimationClip:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 3
-        time: 2.8666666
+        time: 3.2666667
        value: 1
        inSlope: 0
        outSlope: 0
@@ -550,7 +532,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 4.8
+        time: 5.9666667
        value: 1
        inSlope: 0
        outSlope: 0
@@ -571,7 +553,7 @@ AnimationClip:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 3
-        time: 2.8666666
+        time: 3.2666667
        value: 1
        inSlope: 0
        outSlope: 0
@@ -580,7 +562,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 4.8
+        time: 5.9666667
        value: 1
        inSlope: 0
        outSlope: 0
@@ -601,7 +583,7 @@ AnimationClip:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 3
-        time: 2.8666666
+        time: 3.2666667
        value: -0.7898782
        inSlope: 0
        outSlope: 0
@@ -610,7 +592,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 1
      - serializedVersion: 3
-        time: 3.5666666
+        time: 4.233333
        value: -0.47947016
        inSlope: 1.590299
        outSlope: 1.590299
@@ -619,7 +601,7 @@ AnimationClip:
        inWeight: 0.6892684
        outWeight: 0.3559846
      - serializedVersion: 3
-        time: 4.2
+        time: 5.133333
        value: 0.53583103
        inSlope: 1.4936006
        outSlope: 1.4936006
@@ -628,7 +610,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.31191382
      - serializedVersion: 3
-        time: 4.8
+        time: 5.9666667
        value: 0.81890786
        inSlope: 0
        outSlope: 0
@@ -649,7 +631,7 @@ AnimationClip:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 3
-        time: 2.8666666
+        time: 3.2666667
        value: 0
        inSlope: 0
        outSlope: 0
@@ -658,7 +640,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 4.8
+        time: 5.9666667
        value: 0
        inSlope: 0
        outSlope: 0
--- a/Assets/JGW/Vfx/Material/vfx_mat_other_009.mat
+++ b/Assets/JGW/Vfx/Material/vfx_mat_other_009.mat
@@ -147,12 +147,12 @@ Material:
    m_Colors:
    - Dissolve_Tiling_Offset: {r: 1, g: 1, b: 0, a: 0}
    - FresnelColor: {r: 0.7490197, g: 0.27633196, b: 0, a: 1}
-    - MainColor: {r: 1, g: 0.6698113, b: 0.6698113, a: 1}
+    - MainColor: {r: 1, g: 0.5460338, b: 0, a: 1}
    - MainColor_1: {r: 1, g: 0, b: 0, a: 1}
    - MainTexTiling_Offset: {r: 1, g: 2, b: 0, a: 0}
    - Mask_Tiling_Offset: {r: 1, g: 1, b: 0, a: 0}
    - Noise_Tiling_Offset: {r: 2, g: 1, b: 0, a: 0}
-    - Refine: {r: 10, g: 10, b: 1, a: 0.5}
+    - Refine: {r: 10, g: 10, b: 1, a: 0.89}
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
    - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
    - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0}
--- a/Assets/JGW/Vfx/Material/vfx_mat_other_010.mat
+++ b/Assets/JGW/Vfx/Material/vfx_mat_other_010.mat
@@ -42,7 +42,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - MainTex:
-        m_Texture: {fileID: 2800000, guid: d038cb66d61bd3341aeb98d0811d21ac, type: 3}
+        m_Texture: {fileID: 2800000, guid: cda0e3bd61fb25448b9b00821d457c1a, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - MaskTex:
@@ -147,7 +147,7 @@ Material:
    m_Colors:
    - Dissolve_Tiling_Offset: {r: 1, g: 1, b: 0, a: 0}
    - FresnelColor: {r: 0.7490197, g: 0.27633196, b: 0, a: 1}
-    - MainColor: {r: 0, g: 0, b: 0, a: 1}
+    - MainColor: {r: 0.72955966, g: 0.49337918, b: 0, a: 1}
    - MainColor_1: {r: 1, g: 1, b: 1, a: 1}
    - MainTexTiling_Offset: {r: 1, g: 2, b: 0, a: 0}
    - Mask_Tiling_Offset: {r: 1, g: 1, b: 0, a: 0}