Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle

wangguan

2020-12-17 fc4c18a0d81783d429f9095daf0d0663ff691b54

Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle

 Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Huo.prefab

@@ -316,7 +316,7 @@
    startSize:
      serializedVersion: 2
      minMaxState: 0
      scalar: 25
      scalar: 15
      minScalar: 1
      maxCurve:
        serializedVersion: 2
@@ -5195,7 +5195,7 @@
    startSize:
      serializedVersion: 2
      minMaxState: 0
      scalar: 25
      scalar: 15
      minScalar: 3
      maxCurve:
        serializedVersion: 2

 Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Mu.prefab

@@ -285,7 +285,7 @@
    startSize:
      serializedVersion: 2
      minMaxState: 0
      scalar: 25
      scalar: 15
      minScalar: 1
      maxCurve:
        serializedVersion: 2
@@ -5164,7 +5164,7 @@
    startSize:
      serializedVersion: 2
      minMaxState: 0
      scalar: 25
      scalar: 15
      minScalar: 3
      maxCurve:
        serializedVersion: 2

 Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Shui.prefab

@@ -316,7 +316,7 @@
    startSize:
      serializedVersion: 2
      minMaxState: 0
      scalar: 25
      scalar: 15
      minScalar: 1
      maxCurve:
        serializedVersion: 2
@@ -5195,7 +5195,7 @@
    startSize:
      serializedVersion: 2
      minMaxState: 0
      scalar: 25
      scalar: 15
      minScalar: 3
      maxCurve:
        serializedVersion: 2