From 24469e466628ab4f893c902aabb1805a1f80f0a8 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 28 Jun 2021 16:56:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E5=B1=B1=E3=80=91?= =?UTF-8?q?=E7=89=B9=E6=95=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefab/fx_linshousan_di.prefab | 22 ++++++------ .../Prefab/fx_linshousan_gao.prefab | 12 +++---- .../Prefab/fx_linshousan_zhong.prefab | 34 +++++++++---------- .../Effects/Model/Materials.meta | 8 +++++ 4 files changed, 42 insertions(+), 34 deletions(-) create mode 100644 Assets/ManagedResources/Effects/Model/Materials.meta diff --git a/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_di.prefab b/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_di.prefab index 4ffa11944f..671e964337 100644 --- a/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_di.prefab +++ b/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_di.prefab @@ -115,8 +115,8 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 3 - scalar: 1 - minScalar: 1 + scalar: 0.8 + minScalar: 2 maxCurve: serializedVersion: 2 m_Curve: @@ -169,7 +169,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 3 scalar: 0.4 - minScalar: 0.7 + minScalar: 0.2 maxCurve: serializedVersion: 2 m_Curve: @@ -14304,7 +14304,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 3 scalar: 0.3 - minScalar: 1 + minScalar: 1.5 maxCurve: serializedVersion: 2 m_Curve: @@ -15693,7 +15693,7 @@ ParticleSystem: x: serializedVersion: 2 minMaxState: 0 - scalar: 0.2 + scalar: 0.1 minScalar: 0 maxCurve: serializedVersion: 2 @@ -16441,7 +16441,7 @@ ParticleSystem: z: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 0.2 minScalar: 0 maxCurve: serializedVersion: 2 @@ -19020,7 +19020,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 3 scalar: 0.3 - minScalar: 1 + minScalar: 1.5 maxCurve: serializedVersion: 2 m_Curve: @@ -20409,7 +20409,7 @@ ParticleSystem: x: serializedVersion: 2 minMaxState: 0 - scalar: -0.2 + scalar: -0.1 minScalar: 0 maxCurve: serializedVersion: 2 @@ -21157,7 +21157,7 @@ ParticleSystem: z: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 0.2 minScalar: 0 maxCurve: serializedVersion: 2 @@ -23646,7 +23646,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9022495685628282144} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -14, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 9022495684637789955} @@ -23656,7 +23656,7 @@ Transform: - {fileID: 9022495684766472880} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &9022495685628282159 ParticleSystem: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_gao.prefab b/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_gao.prefab index 656350ae85..438b94a425 100644 --- a/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_gao.prefab +++ b/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_gao.prefab @@ -18984,7 +18984,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 3 scalar: 1 - minScalar: 1.2 + minScalar: 3 maxCurve: serializedVersion: 2 m_Curve: @@ -19037,7 +19037,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 3 scalar: 0.4 - minScalar: 1 + minScalar: 0.2 maxCurve: serializedVersion: 2 m_Curve: @@ -20620,8 +20620,8 @@ ParticleSystem: orbitalZ: serializedVersion: 2 minMaxState: 0 - scalar: 4 - minScalar: 0 + scalar: 2 + minScalar: -2 maxCurve: serializedVersion: 2 m_Curve: @@ -28290,7 +28290,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9073840004240118716} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -17, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 582371364194970972} @@ -28301,7 +28301,7 @@ Transform: - {fileID: 5564813012479080876} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &968191322827367580 ParticleSystem: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_zhong.prefab b/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_zhong.prefab index 5c66501184..b3fd70c0de 100644 --- a/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_zhong.prefab +++ b/Assets/ManagedResources/EffectResUI/PokemonMain/Prefab/fx_linshousan_zhong.prefab @@ -47,7 +47,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} looping: 1 - prewarm: 0 + prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 @@ -115,8 +115,8 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 3 - scalar: 1 - minScalar: 1.2 + scalar: 1.5 + minScalar: 3 maxCurve: serializedVersion: 2 m_Curve: @@ -169,7 +169,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 3 scalar: 0.4 - minScalar: 1 + minScalar: 0.2 maxCurve: serializedVersion: 2 m_Curve: @@ -865,7 +865,7 @@ ParticleSystem: rateOverTime: serializedVersion: 2 minMaxState: 0 - scalar: 90 + scalar: 40 minScalar: 10 maxCurve: serializedVersion: 2 @@ -9499,7 +9499,7 @@ Transform: - {fileID: 737395895847930548} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &737395896633499381 ParticleSystem: m_ObjectHideFlags: 0 @@ -14213,7 +14213,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} looping: 1 - prewarm: 0 + prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 @@ -18920,7 +18920,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} looping: 1 - prewarm: 0 + prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 @@ -18989,7 +18989,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 3 scalar: 0.3 - minScalar: 1 + minScalar: 2 maxCurve: serializedVersion: 2 m_Curve: @@ -19738,7 +19738,7 @@ ParticleSystem: rateOverTime: serializedVersion: 2 minMaxState: 0 - scalar: 90 + scalar: 40 minScalar: 10 maxCurve: serializedVersion: 2 @@ -20360,7 +20360,7 @@ ParticleSystem: x: serializedVersion: 2 minMaxState: 0 - scalar: -0.2 + scalar: -0.1 minScalar: 0 maxCurve: serializedVersion: 2 @@ -21108,7 +21108,7 @@ ParticleSystem: z: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 0.1 minScalar: 0 maxCurve: serializedVersion: 2 @@ -23618,7 +23618,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} looping: 1 - prewarm: 0 + prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 @@ -23687,7 +23687,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 3 scalar: 0.3 - minScalar: 1 + minScalar: 2 maxCurve: serializedVersion: 2 m_Curve: @@ -24436,7 +24436,7 @@ ParticleSystem: rateOverTime: serializedVersion: 2 minMaxState: 0 - scalar: 90 + scalar: 40 minScalar: 10 maxCurve: serializedVersion: 2 @@ -25058,7 +25058,7 @@ ParticleSystem: x: serializedVersion: 2 minMaxState: 0 - scalar: 0.2 + scalar: 0.1 minScalar: 0 maxCurve: serializedVersion: 2 @@ -25806,7 +25806,7 @@ ParticleSystem: z: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 0.1 minScalar: 0 maxCurve: serializedVersion: 2 diff --git a/Assets/ManagedResources/Effects/Model/Materials.meta b/Assets/ManagedResources/Effects/Model/Materials.meta new file mode 100644 index 0000000000..85c619cb77 --- /dev/null +++ b/Assets/ManagedResources/Effects/Model/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70e7feb15403e214f801e51b8b4e0461 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: