Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle

wangguan

2020-10-30 7f8b708e88b255f55e5cb1cebd2f45eb998bfaae

 Assets/00000/package/Prefab/Effect_huojinglingdengchang1026.prefab

@@ -48,7 +48,7 @@
  ringBufferLoopRange: {x: 0, y: 1}
  looping: 0
  prewarm: 0
  playOnAwake: 1
  playOnAwake: 0
  useUnscaledTime: 0
  autoRandomSeed: 1
  useRigidbodyForVelocity: 1
@@ -4949,7 +4949,7 @@
  ringBufferLoopRange: {x: 0, y: 1}
  looping: 0
  prewarm: 0
  playOnAwake: 1
  playOnAwake: 0
  useUnscaledTime: 0
  autoRandomSeed: 1
  useRigidbodyForVelocity: 1