LT 4 روز پیش
والد
کامیت
f8f5f1d4bb

+ 50 - 2
Assets/Art/VFX/FXPrefabs/fx_gf_1103.prefab

@@ -5130,8 +5130,8 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
   moveTarget: {fileID: 0}
-  delayTime: 0.3
-  multipleTargetDelayTime: 0
+  delayTime: 0.2
+  multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_1103_hit
   hitFxName: fx_gf_1103_hit
   hitAudioName: 
   hitAudioName: 
   extraMoveSpeed: 0
   extraMoveSpeed: 0
@@ -29754,10 +29754,58 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
+    - target: {fileID: 1150413714555610350, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: InitialModule.startLifetime.scalar
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 1150413714555610350, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.atime0
+      value: 15806
+      objectReference: {fileID: 0}
+    - target: {fileID: 1150413714555610350, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.atime1
+      value: 65535
+      objectReference: {fileID: 0}
+    - target: {fileID: 1150413714555610350, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.atime2
+      value: 65535
+      objectReference: {fileID: 0}
+    - target: {fileID: 1150413714555610350, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.key0.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1150413714555610350, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.key1.a
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1150413714555610350, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.key1.b
+      value: 0.004894943
+      objectReference: {fileID: 0}
+    - target: {fileID: 1150413714555610350, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.key1.g
+      value: 0.004894943
+      objectReference: {fileID: 0}
+    - target: {fileID: 1150413714555610350, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.key1.r
+      value: 0.2594338
+      objectReference: {fileID: 0}
+    - target: {fileID: 1150413714555610350, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.key2.a
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1150413714555610350, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.m_NumAlphaKeys
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 1745893356863579098, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
     - target: {fileID: 1745893356863579098, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
       propertyPath: m_Name
       propertyPath: m_Name
       value: fx_gf1103_sf
       value: fx_gf1103_sf
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
+    - target: {fileID: 4918118553868030214, guid: 48cc2b3aefc553549a35b844635c6261, type: 3}
+      propertyPath: InitialModule.startLifetime.scalar
+      value: 0.5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedGameObjects: []

+ 15 - 15
Assets/Art/VFX/FXPrefabs/fx_gf_1103_hit.prefab

@@ -19562,7 +19562,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_RenderMode: 4
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_MeshDistribution: 0
   m_SortMode: 0
   m_SortMode: 0
@@ -19624,7 +19624,7 @@ Transform:
   serializedVersion: 2
   serializedVersion: 2
   m_LocalRotation: {x: 0.7071026, y: 0.0024398407, z: 0.0024398407, w: -0.7071026}
   m_LocalRotation: {x: 0.7071026, y: 0.0024398407, z: 0.0024398407, w: -0.7071026}
   m_LocalPosition: {x: 0, y: -0.00000047683716, z: 0}
   m_LocalPosition: {x: 0, y: -0.00000047683716, z: 0}
-  m_LocalScale: {x: 0.62263, y: 0.40083, z: 0.23509}
+  m_LocalScale: {x: 0.9757235, y: 0.40083, z: 0.23509}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
   m_Father: {fileID: 379215919460472101}
   m_Father: {fileID: 379215919460472101}
@@ -19652,7 +19652,7 @@ ParticleSystem:
   startDelay:
   startDelay:
     serializedVersion: 2
     serializedVersion: 2
     minMaxState: 0
     minMaxState: 0
-    scalar: 0
+    scalar: 0.05
     minScalar: 0
     minScalar: 0
     maxCurve:
     maxCurve:
       serializedVersion: 2
       serializedVersion: 2
@@ -19712,7 +19712,7 @@ ParticleSystem:
     startLifetime:
     startLifetime:
       serializedVersion: 2
       serializedVersion: 2
       minMaxState: 0
       minMaxState: 0
-      scalar: 1
+      scalar: 0.5
       minScalar: 5
       minScalar: 5
       maxCurve:
       maxCurve:
         serializedVersion: 2
         serializedVersion: 2
@@ -20641,18 +20641,18 @@ ParticleSystem:
         m_Curve:
         m_Curve:
         - serializedVersion: 3
         - serializedVersion: 3
           time: 0
           time: 0
-          value: 0.5643616
+          value: 0
           inSlope: 2
           inSlope: 2
-          outSlope: 2.6849208
+          outSlope: 2.5804458
           tangentMode: 69
           tangentMode: 69
           weightedMode: 0
           weightedMode: 0
           inWeight: 0.33333334
           inWeight: 0.33333334
           outWeight: 0.33333334
           outWeight: 0.33333334
         - serializedVersion: 3
         - serializedVersion: 3
-          time: 0.16225374
-          value: 1
-          inSlope: 2.6849208
-          outSlope: 0
+          time: 0.29847658
+          value: 0.77020264
+          inSlope: 2.5804458
+          outSlope: 0.32756907
           tangentMode: 69
           tangentMode: 69
           weightedMode: 0
           weightedMode: 0
           inWeight: 0.33333334
           inWeight: 0.33333334
@@ -20660,7 +20660,7 @@ ParticleSystem:
         - serializedVersion: 3
         - serializedVersion: 3
           time: 1
           time: 1
           value: 1
           value: 1
-          inSlope: -0
+          inSlope: 0.32756907
           outSlope: 0
           outSlope: 0
           tangentMode: 69
           tangentMode: 69
           weightedMode: 0
           weightedMode: 0
@@ -29418,7 +29418,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_MeshDistribution: 0
   m_SortMode: 0
   m_SortMode: 0
@@ -29504,7 +29504,7 @@ ParticleSystem:
   prewarm: 0
   prewarm: 0
   playOnAwake: 1
   playOnAwake: 1
   useUnscaledTime: 0
   useUnscaledTime: 0
-  autoRandomSeed: 0
+  autoRandomSeed: 1
   startDelay:
   startDelay:
     serializedVersion: 2
     serializedVersion: 2
     minMaxState: 0
     minMaxState: 0
@@ -29561,7 +29561,7 @@ ParticleSystem:
   moveWithTransform: 0
   moveWithTransform: 0
   moveWithCustomTransform: {fileID: 0}
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 0
   scalingMode: 0
-  randomSeed: 8251
+  randomSeed: 0
   InitialModule:
   InitialModule:
     serializedVersion: 3
     serializedVersion: 3
     enabled: 1
     enabled: 1
@@ -30432,7 +30432,7 @@ ParticleSystem:
       countCurve:
       countCurve:
         serializedVersion: 2
         serializedVersion: 2
         minMaxState: 0
         minMaxState: 0
-        scalar: 20
+        scalar: 15
         minScalar: 30
         minScalar: 30
         maxCurve:
         maxCurve:
           serializedVersion: 2
           serializedVersion: 2

+ 1 - 1
Assets/Art/VFX/Materials/fx_gf1103_hit_hen.mat

@@ -41,7 +41,7 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     - _TextureGao:
     - _TextureGao:
         m_Texture: {fileID: 2800000, guid: be2dad9cf95ef434aada790911eaf0ff, type: 3}
         m_Texture: {fileID: 2800000, guid: be2dad9cf95ef434aada790911eaf0ff, type: 3}
-        m_Scale: {x: 1, y: 1}
+        m_Scale: {x: 2.43, y: 1}
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     - _dissolve:
     - _dissolve:
         m_Texture: {fileID: 2800000, guid: 893077602610eaf4e9b93d85a92b7323, type: 3}
         m_Texture: {fileID: 2800000, guid: 893077602610eaf4e9b93d85a92b7323, type: 3}

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 641 - 480
Assets/Art/cs3.scene


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است