Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

art_wzw

2018-11-13 0e8cbe1345031d5658d3fbd8d9c7f7a10b8076ad

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

 Effects/ShenBing/Fs/GongJi/Materials/403.mat

@@ -81,4 +81,4 @@
    m_Colors:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _TintColor: {r: 0.5514706, g: 0.7587221, b: 1, a: 0.209}
    - _TintColor: {r: 0.5514706, g: 0.7587221, b: 1, a: 0.46}

 Effects/ShenBing/Fs/HunDun/Animation/Effect_FsHuDun_02.anim

@@ -113,19 +113,19 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.31590796
        value: 0.5740782
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 0.5
        value: 0.46554258
        value: 0.72371286
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.31590796
        value: 0.5740782
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -225,19 +225,19 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.6784095
        value: 0.90703297
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 0.5
        value: 0.5047667
        value: 0.73339015
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.6784095
        value: 0.90703297
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -515,19 +515,19 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.31590796
        value: 0.5740782
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 0.5
        value: 0.46554258
        value: 0.72371286
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.31590796
        value: 0.5740782
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -627,19 +627,19 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.6784095
        value: 0.90703297
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 0.5
        value: 0.5047667
        value: 0.73339015
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.6784095
        value: 0.90703297
        inSlope: 0
        outSlope: 0
        tangentMode: 136

 Effects/ShenBing/Fs/HunDun/Effect_FsHuDun_02.prefab

@@ -286,7 +286,7 @@
  m_EditorClassIdentifier: 
  duration: 0
  effectId: 0
  startTime: 1602.9729
  startTime: 1650.0094
  releaseHideChildren: 1
--- !u!114 &114221904880632374
MonoBehaviour:
@@ -369,7 +369,7 @@
  moveWithTransform: 0
  moveWithCustomTransform: {fileID: 0}
  scalingMode: 1
  randomSeed: 1531423153
  randomSeed: -1054817038
  InitialModule:
    serializedVersion: 3
    enabled: 1