diff --git a/Assets/arts/effects/material/battle/sfx_c1_p53001/sfx_c1_p53001_10.mat b/Assets/arts/effects/material/battle/sfx_c1_p53001/sfx_c1_p53001_10.mat index ca2f3a8eb..a0a0d4c92 100644 --- a/Assets/arts/effects/material/battle/sfx_c1_p53001/sfx_c1_p53001_10.mat +++ b/Assets/arts/effects/material/battle/sfx_c1_p53001/sfx_c1_p53001_10.mat @@ -61,7 +61,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _tex: - m_Texture: {fileID: 2800000, guid: 3cbcc0dabc324724ebf08b0fe62bc001, type: 3} + m_Texture: {fileID: 2800000, guid: e292277af063ff04e9787f793b1f23bd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _tex_mask: diff --git a/Assets/arts/effects/material/battle/sfx_c1_p53001/sfx_c1_p53001_11.mat b/Assets/arts/effects/material/battle/sfx_c1_p53001/sfx_c1_p53001_11.mat index a6a51fa69..3e8bc3d37 100644 --- a/Assets/arts/effects/material/battle/sfx_c1_p53001/sfx_c1_p53001_11.mat +++ b/Assets/arts/effects/material/battle/sfx_c1_p53001/sfx_c1_p53001_11.mat @@ -62,7 +62,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _tex: - m_Texture: {fileID: 2800000, guid: 28918d4d4d01b074db5a079721bba055, type: 3} + m_Texture: {fileID: 2800000, guid: 24e537a233ddf7440a847031a30e1810, type: 3} m_Scale: {x: 1, y: 2} m_Offset: {x: 0, y: -0.38} - _tex_mask: diff --git a/Assets/arts/effects/texture/yuan_yjs_0002_b03.png b/Assets/arts/effects/texture/yuan_yjs_0002_b03.png new file mode 100644 index 000000000..ec4788ee6 Binary files /dev/null and b/Assets/arts/effects/texture/yuan_yjs_0002_b03.png differ diff --git a/Assets/arts/effects/texture/yuan_yjs_0002_b03.png.meta b/Assets/arts/effects/texture/yuan_yjs_0002_b03.png.meta new file mode 100644 index 000000000..3ae68fffe --- /dev/null +++ b/Assets/arts/effects/texture/yuan_yjs_0002_b03.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: e292277af063ff04e9787f793b1f23bd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/effects/battle/sfx_c1_buff_hudun_01.prefab b/Assets/prefabs/effects/battle/sfx_c1_buff_hudun_01.prefab index 9e981ddd1..e22ec1560 100644 --- a/Assets/prefabs/effects/battle/sfx_c1_buff_hudun_01.prefab +++ b/Assets/prefabs/effects/battle/sfx_c1_buff_hudun_01.prefab @@ -228,7 +228,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 0.55661035, b: 0.16509432, a: 1} + maxColor: {r: 0.6683613, g: 0.16470587, b: 1, a: 1} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -5101,7 +5101,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 0.6315753, b: 0, a: 1} + maxColor: {r: 0.7561572, g: 0.5896226, b: 1, a: 0.27058825} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -5163,7 +5163,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 0 - scalar: 3.1 + scalar: 3.11 minScalar: 2.5 maxCurve: serializedVersion: 2 @@ -9976,7 +9976,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 0.7067549, b: 0, a: 0.99215686} + maxColor: {r: 1, g: 1, b: 1, a: 0.99215686} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -14851,7 +14851,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 0.8689655, b: 0, a: 0.3764706} + maxColor: {r: 0.7875604, g: 0.5235849, b: 1, a: 0.3764706} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -19537,7 +19537,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -10.3} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!198 &2141381309350670176 diff --git a/Assets/prefabs/effects/battle/sfx_c1_ui_line_b01.prefab b/Assets/prefabs/effects/battle/sfx_c1_ui_line_b01.prefab index bd8630f42..28ddb14d6 100644 --- a/Assets/prefabs/effects/battle/sfx_c1_ui_line_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_c1_ui_line_b01.prefab @@ -5088,7 +5088,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 0.5339291, b: 0.43867922, a: 1} + maxColor: {r: 1, g: 0.64279586, b: 0.5707547, a: 1} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -9713,7 +9713,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 0 + m_SortingFudge: -1 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 2 @@ -9958,7 +9958,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 0.5566038, g: 0, b: 0, a: 1} + maxColor: {r: 0.8396226, g: 0, b: 0, a: 1} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -14583,7 +14583,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 1 + m_SortingFudge: 0 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 2 diff --git a/Assets/prefabs/effects/battle/sfx_c1_ui_line_b02.prefab b/Assets/prefabs/effects/battle/sfx_c1_ui_line_b02.prefab index f2f9cfd59..f88e66b49 100644 --- a/Assets/prefabs/effects/battle/sfx_c1_ui_line_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_c1_ui_line_b02.prefab @@ -4848,7 +4848,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 1 + m_SortingFudge: 0 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 2 @@ -9718,7 +9718,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 0 + m_SortingFudge: -1 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 2 diff --git a/Assets/prefabs/effects/battle/sfx_c1_ui_line_b03.prefab b/Assets/prefabs/effects/battle/sfx_c1_ui_line_b03.prefab index be02e7ebf..940315ea6 100644 --- a/Assets/prefabs/effects/battle/sfx_c1_ui_line_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_c1_ui_line_b03.prefab @@ -4848,7 +4848,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 0 + m_SortingFudge: -1 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 2 @@ -14583,7 +14583,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 1 + m_SortingFudge: 0 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 2 diff --git a/Assets/prefabs/effects/battle/sfx_c1_ui_line_b04.prefab b/Assets/prefabs/effects/battle/sfx_c1_ui_line_b04.prefab index 88c054f73..4686bb354 100644 --- a/Assets/prefabs/effects/battle/sfx_c1_ui_line_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_c1_ui_line_b04.prefab @@ -4848,7 +4848,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 1 + m_SortingFudge: 0 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 2 @@ -14532,7 +14532,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 0 + m_SortingFudge: -1 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 2 diff --git a/Assets/prefabs/effects/battle/sfx_c1_ui_line_b05.prefab b/Assets/prefabs/effects/battle/sfx_c1_ui_line_b05.prefab index a13412130..a8d1aec9a 100644 --- a/Assets/prefabs/effects/battle/sfx_c1_ui_line_b05.prefab +++ b/Assets/prefabs/effects/battle/sfx_c1_ui_line_b05.prefab @@ -4848,7 +4848,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 1 + m_SortingFudge: 0 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 2 @@ -5144,7 +5144,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 0.8995203, g: 0.4575472, b: 1, a: 1} + maxColor: {r: 0.9369019, g: 0.6650944, b: 1, a: 1} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -9769,7 +9769,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 0 + m_SortingFudge: -1 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 2 diff --git a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b01.prefab b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b01.prefab index 79dbabf44..b9aea425a 100644 --- a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b01.prefab @@ -4799,7 +4799,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: -20 m_LengthScale: -1 - m_SortingFudge: 1 + m_SortingFudge: -2 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 0 @@ -14534,7 +14534,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 0 + m_SortingFudge: -1.5 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 0 diff --git a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b02.prefab b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b02.prefab index 78de06392..14a2c1bc5 100644 --- a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b02.prefab @@ -9662,7 +9662,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 0 + m_SortingFudge: -1.5 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 0 @@ -14483,7 +14483,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: -20 m_LengthScale: -1 - m_SortingFudge: 1 + m_SortingFudge: -2 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 0 diff --git a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b03.prefab b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b03.prefab index 3240bc5e9..631912b9a 100644 --- a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b03.prefab @@ -4848,7 +4848,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 0 + m_SortingFudge: -1.5 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 0 @@ -9669,7 +9669,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: -20 m_LengthScale: -1 - m_SortingFudge: 1 + m_SortingFudge: -2 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 0 diff --git a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b04.prefab b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b04.prefab index 6db33bce0..39d65fb9b 100644 --- a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b04.prefab @@ -4899,7 +4899,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 0 + m_SortingFudge: -1.5 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 0 @@ -9720,7 +9720,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: -20 m_LengthScale: -1 - m_SortingFudge: 1 + m_SortingFudge: -2 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 0 diff --git a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b05.prefab b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b05.prefab index 6813fff06..63ea1d829 100644 --- a/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b05.prefab +++ b/Assets/prefabs/effects/battle/sfx_c1_ui_qizi_b05.prefab @@ -4848,7 +4848,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 - m_SortingFudge: 0 + m_SortingFudge: -1.5 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 0 @@ -9669,7 +9669,7 @@ ParticleSystemRenderer: m_CameraVelocityScale: 0 m_VelocityScale: -20 m_LengthScale: -1 - m_SortingFudge: 1 + m_SortingFudge: -2 m_NormalDirection: 1 m_ShadowBias: 0 m_RenderAlignment: 0