diff --git a/Assets/arts/effects/material/battle/sfx_buff_immune/sfx_buff_immune_01.mat b/Assets/arts/effects/material/battle/sfx_buff_immune/sfx_buff_immune_01.mat index 8e61ceb09..6ab2d591c 100644 --- a/Assets/arts/effects/material/battle/sfx_buff_immune/sfx_buff_immune_01.mat +++ b/Assets/arts/effects/material/battle/sfx_buff_immune/sfx_buff_immune_01.mat @@ -64,9 +64,9 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _tex_mask: - m_Texture: {fileID: 2800000, guid: 3fce3542e554e0e488352582ccd87cb6, type: 3} + m_Texture: {fileID: 2800000, guid: cfd925b74d51ff04b9f7cbc9583beafc, type: 3} m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: -0.57} m_Floats: - _BumpScale: 1 - _CULLENUM: 0 @@ -92,7 +92,7 @@ Material: - _diss_edge_width: 0.01 - _diss_smoothness: 0.01 - _diss_tex_rotate: 0 - - _tex_mask_rotate: 270 + - _tex_mask_rotate: 0 - _tex_rotate: 0 - _ztest_on: 4 m_Colors: diff --git a/Assets/arts/effects/material/battle/sfx_buff_immune/sfx_buff_immune_02.mat b/Assets/arts/effects/material/battle/sfx_buff_immune/sfx_buff_immune_02.mat index eb4ffe0e5..251f028cc 100644 --- a/Assets/arts/effects/material/battle/sfx_buff_immune/sfx_buff_immune_02.mat +++ b/Assets/arts/effects/material/battle/sfx_buff_immune/sfx_buff_immune_02.mat @@ -64,9 +64,9 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _tex_mask: - m_Texture: {fileID: 2800000, guid: 3fce3542e554e0e488352582ccd87cb6, type: 3} + m_Texture: {fileID: 2800000, guid: cfd925b74d51ff04b9f7cbc9583beafc, type: 3} m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: -0.66} m_Floats: - _BumpScale: 1 - _CULLENUM: 0 @@ -92,7 +92,7 @@ Material: - _diss_edge_width: 0.01 - _diss_smoothness: 0.01 - _diss_tex_rotate: 0 - - _tex_mask_rotate: 270 + - _tex_mask_rotate: 0 - _tex_rotate: 0 - _ztest_on: 4 m_Colors: diff --git a/Assets/arts/sounds/sfx/battle/44002011.wav.meta b/Assets/arts/sounds/sfx/battle/44002011.wav.meta new file mode 100644 index 000000000..144be7418 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/44002011.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: be1b79aaed3159646835ae442d1cbf68 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 0 + compressionFormat: 2 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 1 + normalize: 1 + preloadAudioData: 0 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/sounds/sfx/battle/44002015.wav.meta b/Assets/arts/sounds/sfx/battle/44002015.wav.meta new file mode 100644 index 000000000..dcad6eaaa --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/44002015.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2373cb0fc3f9bf041b1bd23d00b47762 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 0 + compressionFormat: 2 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 1 + normalize: 1 + preloadAudioData: 0 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/sounds/sfx/battle/54004015.wav.meta b/Assets/arts/sounds/sfx/battle/54004015.wav.meta new file mode 100644 index 000000000..ddb9e3889 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/54004015.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2cf3a24c12883974ab50029f48572f9d +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 0 + compressionFormat: 2 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 1 + normalize: 1 + preloadAudioData: 0 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/common/bi_report.lua.bytes b/Assets/lua/app/common/bi_report.lua.bytes index 58e36a7d3..f1a34f44e 100644 Binary files a/Assets/lua/app/common/bi_report.lua.bytes and b/Assets/lua/app/common/bi_report.lua.bytes differ diff --git a/Assets/lua/app/common/data_manager.lua.bytes b/Assets/lua/app/common/data_manager.lua.bytes index e162cc6ad..a350d60bf 100644 Binary files a/Assets/lua/app/common/data_manager.lua.bytes and b/Assets/lua/app/common/data_manager.lua.bytes differ diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index cd748251e..14ddd2bbe 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/module/item/item_const.lua.bytes b/Assets/lua/app/module/item/item_const.lua.bytes index d360428e1..842f040de 100644 Binary files a/Assets/lua/app/module/item/item_const.lua.bytes and b/Assets/lua/app/module/item/item_const.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/act_pvp/act_pvp_match_result_ui.lua.bytes b/Assets/lua/app/ui/activity/act_pvp/act_pvp_match_result_ui.lua.bytes index 0dc8d0a75..59a9c0713 100644 Binary files a/Assets/lua/app/ui/activity/act_pvp/act_pvp_match_result_ui.lua.bytes and b/Assets/lua/app/ui/activity/act_pvp/act_pvp_match_result_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/cell/attr_cell.lua.bytes b/Assets/lua/app/ui/hero/cell/attr_cell.lua.bytes index 562a3e355..1a54beda7 100644 Binary files a/Assets/lua/app/ui/hero/cell/attr_cell.lua.bytes and b/Assets/lua/app/ui/hero/cell/attr_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/runes_info_comp.lua.bytes b/Assets/lua/app/ui/hero/runes_info_comp.lua.bytes index c7aefd259..25b2d067d 100644 Binary files a/Assets/lua/app/ui/hero/runes_info_comp.lua.bytes and b/Assets/lua/app/ui/hero/runes_info_comp.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes b/Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes index 2bf1bb019..01fc3f17c 100644 Binary files a/Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes and b/Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/act_pvp/act_pvp_data.lua.bytes b/Assets/lua/app/userdata/activity/act_pvp/act_pvp_data.lua.bytes index 8c77a5b87..d2cde1e6c 100644 Binary files a/Assets/lua/app/userdata/activity/act_pvp/act_pvp_data.lua.bytes and b/Assets/lua/app/userdata/activity/act_pvp/act_pvp_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/bag/item_data.lua.bytes b/Assets/lua/app/userdata/bag/item_data.lua.bytes index d9dfdbbf0..1292c1f44 100644 Binary files a/Assets/lua/app/userdata/bag/item_data.lua.bytes and b/Assets/lua/app/userdata/bag/item_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/bag/item_entity.lua.bytes b/Assets/lua/app/userdata/bag/item_entity.lua.bytes index 4bb168268..53113d10a 100644 Binary files a/Assets/lua/app/userdata/bag/item_entity.lua.bytes and b/Assets/lua/app/userdata/bag/item_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_data.lua.bytes b/Assets/lua/app/userdata/hero/hero_data.lua.bytes index dc81bc6e7..a6b3ea17a 100644 Binary files a/Assets/lua/app/userdata/hero/hero_data.lua.bytes and b/Assets/lua/app/userdata/hero/hero_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes index 0aa660372..837afc713 100644 Binary files a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes and b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/player/player_data.lua.bytes b/Assets/lua/app/userdata/player/player_data.lua.bytes index ed408ef81..a44778b3b 100644 Binary files a/Assets/lua/app/userdata/player/player_data.lua.bytes and b/Assets/lua/app/userdata/player/player_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/runes/runes_data.lua.bytes b/Assets/lua/app/userdata/runes/runes_data.lua.bytes index ed93fab74..f256a6a41 100644 Binary files a/Assets/lua/app/userdata/runes/runes_data.lua.bytes and b/Assets/lua/app/userdata/runes/runes_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/runes/runes_entity.lua.bytes b/Assets/lua/app/userdata/runes/runes_entity.lua.bytes index 80186b11b..8f9fe6aec 100644 Binary files a/Assets/lua/app/userdata/runes/runes_entity.lua.bytes and b/Assets/lua/app/userdata/runes/runes_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/skin/skin_data.lua.bytes b/Assets/lua/app/userdata/skin/skin_data.lua.bytes index 99a218faa..a07ab692f 100644 Binary files a/Assets/lua/app/userdata/skin/skin_data.lua.bytes and b/Assets/lua/app/userdata/skin/skin_data.lua.bytes differ diff --git a/Assets/prefabs/effects/battle/sfx_buff_charm_b01.prefab b/Assets/prefabs/effects/battle/sfx_buff_charm_b01.prefab index f88200ed1..a24fb5666 100644 --- a/Assets/prefabs/effects/battle/sfx_buff_charm_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_buff_charm_b01.prefab @@ -51,7 +51,7 @@ ParticleSystem: cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 @@ -9671,7 +9671,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 3646451181286306413} - EffectDuration: 1 + EffectDuration: 0.5 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0