Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

chenxin

2020-12-04 9ad1afab7d9962af7b8e0f592c0b150887b4f2f6

 Assets/00000/package/Time/Effect_HuoJingLingTimeline.playable

@@ -127,17 +127,17 @@
      m_Curve:
      - serializedVersion: 3
        time: 0
        value: {x: 0, y: 0, z: 0}
        value: {x: -235.58, y: -87.37799, z: -65.586}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 720, z: 0}
        outSlope: {x: 56.033997, y: -701.58, z: -11.151978}
        tangentMode: 0
        weightedMode: 0
        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 0.5
        value: {x: 0, y: 360, z: 0}
        inSlope: {x: -0, y: 720, z: -0}
        value: {x: -207.563, y: -438.168, z: -71.16199}
        inSlope: {x: 56.033997, y: -701.58, z: -11.151978}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
        weightedMode: 0
@@ -192,17 +192,17 @@
      m_Curve:
      - serializedVersion: 3
        time: 0
        value: 0
        value: -235.58
        inSlope: 0
        outSlope: 0
        outSlope: 56.033997
        tangentMode: 69
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 0.5
        value: 0
        inSlope: -0
        value: -207.563
        inSlope: 56.033997
        outSlope: 0
        tangentMode: 69
        weightedMode: 0
@@ -220,17 +220,17 @@
      m_Curve:
      - serializedVersion: 3
        time: 0
        value: 0
        value: -87.37799
        inSlope: 0
        outSlope: 720
        outSlope: -701.58
        tangentMode: 69
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 0.5
        value: 360
        inSlope: 720
        value: -438.168
        inSlope: -701.58
        outSlope: 0
        tangentMode: 69
        weightedMode: 0
@@ -248,17 +248,17 @@
      m_Curve:
      - serializedVersion: 3
        time: 0
        value: 0
        value: -65.586
        inSlope: 0
        outSlope: 0
        outSlope: -11.151978
        tangentMode: 69
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 0.5
        value: 0
        inSlope: -0
        value: -71.16199
        inSlope: -11.151978
        outSlope: 0
        tangentMode: 69
        weightedMode: 0