snxxz_art.git - Gitblit

parent: 66aa03b4 | 补丁 | 提交 | ignore whitespace

art_zongting

2018-12-11 3ff9af30d7ca34c46bfc9e40fc2db2121448fd51

暴击神兵特效调整

6个文件已修改

	Effects/ShenBing/Fs/BaoJi/Animation/Effect_FsBaoJi_01.anim	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Effects/ShenBing/Fs/BaoJi/Animation/Effect_FsBaoJi_02.anim	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Effects/ShenBing/Fs/BaoJi/Effect_FsBaoJi_01.prefab	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Effects/ShenBing/Fs/BaoJi/Materials/EF_FsBaoJi_03.mat	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Effects/ShenBing/Fs/BaoJi/Materials/EF_Fs_BaoJi_03_h.mat	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Effects/ShenBing/Fs/BaoJi/Texture/Ef_FsBaoJi_10.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Effects/ShenBing/Fs/BaoJi/Animation/Effect_FsBaoJi_01.anim

@@ -59,7 +59,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.1
        value: 0.2
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -71,7 +71,7 @@
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.1
        value: 0.2
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -87,7 +87,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.2
        value: 0.4
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -99,7 +99,7 @@
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.2
        value: 0.4
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -115,7 +115,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.5
        value: 0.8
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -127,7 +127,7 @@
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.5
        value: 0.8
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -143,7 +143,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.5
        value: 0.6
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -155,7 +155,7 @@
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.5
        value: 0.6
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -302,6 +302,13 @@
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 3904355907
      attribute: 1090582214
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 3904355907
      attribute: 1359017670
      script: {fileID: 0}
      typeID: 23
@@ -309,7 +316,7 @@
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 3904355907
      attribute: 1895888582
      attribute: 1627453126
      script: {fileID: 0}
      typeID: 23
      customType: 22
@@ -323,14 +330,7 @@
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 3904355907
      attribute: 1090582214
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 3904355907
      attribute: 1627453126
      attribute: 1895888582
      script: {fileID: 0}
      typeID: 23
      customType: 22
@@ -383,7 +383,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.1
        value: 0.2
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -395,7 +395,7 @@
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.1
        value: 0.2
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -411,7 +411,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.2
        value: 0.4
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -423,7 +423,7 @@
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.2
        value: 0.4
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -439,7 +439,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.5
        value: 0.8
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -451,7 +451,7 @@
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.5
        value: 0.8
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -467,7 +467,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.5
        value: 0.6
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -479,7 +479,7 @@
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.5
        value: 0.6
        inSlope: 0
        outSlope: 0
        tangentMode: 136

 Effects/ShenBing/Fs/BaoJi/Animation/Effect_FsBaoJi_02.anim

@@ -143,19 +143,19 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.4
        value: 0.5
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 0.5
        value: 0.25
        value: 0.3
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.4
        value: 0.5
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -219,7 +219,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.4
        value: 0.6
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -488,19 +488,19 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.4
        value: 0.5
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 0.5
        value: 0.25
        value: 0.3
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.4
        value: 0.5
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -678,7 +678,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.4
        value: 0.6
        inSlope: 0
        outSlope: 0
        tangentMode: 136

 Effects/ShenBing/Fs/BaoJi/Effect_FsBaoJi_01.prefab

@@ -221,7 +221,7 @@
  m_GameObject: {fileID: 1252971665436706}
  m_LocalRotation: {x: -0.000000013038513, y: -0.000000033527606, z: -0.000000004889442,
    w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalPosition: {x: 102.537056, y: 15.049284, z: 47.186195}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4488546553573534}
@@ -586,7 +586,7 @@
  lengthInSec: 1
  simulationSpeed: 1
  looping: 1
  prewarm: 0
  prewarm: 1
  playOnAwake: 1
  autoRandomSeed: 1
  startDelay:
@@ -633,7 +633,7 @@
  moveWithTransform: 0
  moveWithCustomTransform: {fileID: 0}
  scalingMode: 1
  randomSeed: 563701981
  randomSeed: -1353714677
  InitialModule:
    serializedVersion: 3
    enabled: 1
@@ -723,7 +723,7 @@
      serializedVersion: 2
      minMaxState: 0
      minColor: {r: 1, g: 1, b: 1, a: 1}
      maxColor: {r: 0.16360295, g: 0.20760638, b: 0.759, a: 1}
      maxColor: {r: 0, g: 0.047058824, b: 0.5529412, a: 0.7176471}
      maxGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
@@ -785,7 +785,7 @@
    startSize:
      serializedVersion: 2
      minMaxState: 0
      scalar: 3.8
      scalar: 4.5
      minScalar: 1
      maxCurve:
        serializedVersion: 2
@@ -6891,7 +6891,7 @@
  moveWithTransform: 0
  moveWithCustomTransform: {fileID: 0}
  scalingMode: 1
  randomSeed: -1693533713
  randomSeed: -1193534241
  InitialModule:
    serializedVersion: 3
    enabled: 1

 Effects/ShenBing/Fs/BaoJi/Materials/EF_FsBaoJi_03.mat

@@ -75,4 +75,4 @@
    m_Colors:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _TintColor: {r: 0, g: 0.2965517, b: 1, a: 0.366}
    - _TintColor: {r: 0, g: 0.516, b: 1, a: 0.516}

 Effects/ShenBing/Fs/BaoJi/Materials/EF_Fs_BaoJi_03_h.mat

@@ -75,4 +75,4 @@
    m_Colors:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _TintColor: {r: 1, g: 0, b: 0.84827566, a: 0.2}
    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.634}

 Effects/ShenBing/Fs/BaoJi/Texture/Ef_FsBaoJi_10.png

			@@ -59,7 +59,7 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.1
			value: 0.2
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -71,7 +71,7 @@
			tangentMode: 136
			- serializedVersion: 2
			time: 1
			value: 0.1
			value: 0.2
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -87,7 +87,7 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.2
			value: 0.4
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -99,7 +99,7 @@
			tangentMode: 136
			- serializedVersion: 2
			time: 1
			value: 0.2
			value: 0.4
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -115,7 +115,7 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.5
			value: 0.8
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -127,7 +127,7 @@
			tangentMode: 136
			- serializedVersion: 2
			time: 1
			value: 0.5
			value: 0.8
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -143,7 +143,7 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.5
			value: 0.6
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -155,7 +155,7 @@
			tangentMode: 136
			- serializedVersion: 2
			time: 1
			value: 0.5
			value: 0.6
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -302,6 +302,13 @@
			isPPtrCurve: 0
			- serializedVersion: 2
			path: 3904355907
			attribute: 1090582214
			script: {fileID: 0}
			typeID: 23
			customType: 22
			isPPtrCurve: 0
			- serializedVersion: 2
			path: 3904355907
			attribute: 1359017670
			script: {fileID: 0}
			typeID: 23
			@@ -309,7 +316,7 @@
			isPPtrCurve: 0
			- serializedVersion: 2
			path: 3904355907
			attribute: 1895888582
			attribute: 1627453126
			script: {fileID: 0}
			typeID: 23
			customType: 22
			@@ -323,14 +330,7 @@
			isPPtrCurve: 0
			- serializedVersion: 2
			path: 3904355907
			attribute: 1090582214
			script: {fileID: 0}
			typeID: 23
			customType: 22
			isPPtrCurve: 0
			- serializedVersion: 2
			path: 3904355907
			attribute: 1627453126
			attribute: 1895888582
			script: {fileID: 0}
			typeID: 23
			customType: 22
			@@ -383,7 +383,7 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.1
			value: 0.2
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -395,7 +395,7 @@
			tangentMode: 136
			- serializedVersion: 2
			time: 1
			value: 0.1
			value: 0.2
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -411,7 +411,7 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.2
			value: 0.4
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -423,7 +423,7 @@
			tangentMode: 136
			- serializedVersion: 2
			time: 1
			value: 0.2
			value: 0.4
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -439,7 +439,7 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.5
			value: 0.8
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -451,7 +451,7 @@
			tangentMode: 136
			- serializedVersion: 2
			time: 1
			value: 0.5
			value: 0.8
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -467,7 +467,7 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.5
			value: 0.6
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -479,7 +479,7 @@
			tangentMode: 136
			- serializedVersion: 2
			time: 1
			value: 0.5
			value: 0.6
			inSlope: 0
			outSlope: 0
			tangentMode: 136

			@@ -143,19 +143,19 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.4
			value: 0.5
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			- serializedVersion: 2
			time: 0.5
			value: 0.25
			value: 0.3
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			- serializedVersion: 2
			time: 1
			value: 0.4
			value: 0.5
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -219,7 +219,7 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.4
			value: 0.6
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -488,19 +488,19 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.4
			value: 0.5
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			- serializedVersion: 2
			time: 0.5
			value: 0.25
			value: 0.3
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			- serializedVersion: 2
			time: 1
			value: 0.4
			value: 0.5
			inSlope: 0
			outSlope: 0
			tangentMode: 136
			@@ -678,7 +678,7 @@
			m_Curve:
			- serializedVersion: 2
			time: 0
			value: 0.4
			value: 0.6
			inSlope: 0
			outSlope: 0
			tangentMode: 136

			@@ -221,7 +221,7 @@
			m_GameObject: {fileID: 1252971665436706}
			m_LocalRotation: {x: -0.000000013038513, y: -0.000000033527606, z: -0.000000004889442,
			w: 1}
			m_LocalPosition: {x: 0, y: 0, z: 0}
			m_LocalPosition: {x: 102.537056, y: 15.049284, z: 47.186195}
			m_LocalScale: {x: 1, y: 1, z: 1}
			m_Children:
			- {fileID: 4488546553573534}
			@@ -586,7 +586,7 @@
			lengthInSec: 1
			simulationSpeed: 1
			looping: 1
			prewarm: 0
			prewarm: 1
			playOnAwake: 1
			autoRandomSeed: 1
			startDelay:
			@@ -633,7 +633,7 @@
			moveWithTransform: 0
			moveWithCustomTransform: {fileID: 0}
			scalingMode: 1
			randomSeed: 563701981
			randomSeed: -1353714677
			InitialModule:
			serializedVersion: 3
			enabled: 1
			@@ -723,7 +723,7 @@
			serializedVersion: 2
			minMaxState: 0
			minColor: {r: 1, g: 1, b: 1, a: 1}
			maxColor: {r: 0.16360295, g: 0.20760638, b: 0.759, a: 1}
			maxColor: {r: 0, g: 0.047058824, b: 0.5529412, a: 0.7176471}
			maxGradient:
			serializedVersion: 2
			key0: {r: 1, g: 1, b: 1, a: 1}
			@@ -785,7 +785,7 @@
			startSize:
			serializedVersion: 2
			minMaxState: 0
			scalar: 3.8
			scalar: 4.5
			minScalar: 1
			maxCurve:
			serializedVersion: 2
			@@ -6891,7 +6891,7 @@
			moveWithTransform: 0
			moveWithCustomTransform: {fileID: 0}
			scalingMode: 1
			randomSeed: -1693533713
			randomSeed: -1193534241
			InitialModule:
			serializedVersion: 3
			enabled: 1

			@@ -75,4 +75,4 @@
			m_Colors:
			- _Color: {r: 1, g: 1, b: 1, a: 1}
			- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
			- _TintColor: {r: 0, g: 0.2965517, b: 1, a: 0.366}
			- _TintColor: {r: 0, g: 0.516, b: 1, a: 0.516}