diff --git a/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_duihuan_01.png.meta b/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_duihuan_01.png.meta new file mode 100644 index 0000000000..aecdedeb7c --- /dev/null +++ b/Assets/ManagedResources/Atlas/QianKunBox/q_qiankun_duihuan_01.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 223c27779ceb0f544815d8ad8ea1011a +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ea5459d1ced1f07418c23966c6f3fa00 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: QianKunBox + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua index d794de18e3..ace296ff42 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua @@ -497,8 +497,24 @@ function SoundManager.SetBgmEnabled(b) _bgm_enabled = b end +-- 设置音效播放速度 +function SoundManager.SetAudioSpeed(speed) + speed = speed or 1 + -- for _, unit in ipairs(_backgroundSound) do + -- unit.audio.pitch = speed + -- end + for _, unit in ipairs(_soundChannel) do + unit.audio.pitch = speed + end + -- for _, unit in ipairs(_AmbientChannel) do + -- unit.audio.pitch = speed + -- end +end + + function SoundManager.Dispose() SoundManager.Clear() end + --endregion diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 74666a5d23..bbe20cc0a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -632,6 +632,8 @@ function this.SetTimeScale(TimeScale) Game.GlobalEvent:DispatchEvent(GameEvent.Battle.OnTimeScaleChanged) -- 真正生效的敌方 Time.timeScale = TimeScale + -- 设置音效播放的速度 + SoundManager.SetAudioSpeed(TimeScale) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 360afb8587..caefa2b381 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -294,6 +294,8 @@ function this.BattleEnd(result) BattleManager.PauseBattle() -- 强制停止倍速 Time.timeScale = 1 + -- 设置音效播放的速度 + SoundManager.SetAudioSpeed(1) --用一个变量接收最近的战斗结果 this.lastBattleResult = { result = result, @@ -489,6 +491,8 @@ function this:OnClose() -- BattleManager.SetTimeScale(1) -- 真正生效的敌方 Time.timeScale = 1 + -- 设置音效播放的速度 + SoundManager.SetAudioSpeed(1) if endFunc then endFunc(this.lastBattleResult) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index e30992b947..4edfe5cf2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -354,9 +354,9 @@ function this.EnemyAppear() if index == 4 then -- 提前播放音效 - if BattleLogic.CurOrder == 1 then - SoundManager.PlaySound(SoundConfig.Sound_BattleStart_04) - end + -- if BattleLogic.CurOrder == 1 then + -- SoundManager.PlaySound(SoundConfig.Sound_BattleStart_04) + -- end elseif index == 6 then --显示血条 diff --git a/data_execl/base_data/CombatControl.xlsx b/data_execl/base_data/CombatControl.xlsx index 8725d05048..f440707189 100644 Binary files a/data_execl/base_data/CombatControl.xlsx and b/data_execl/base_data/CombatControl.xlsx differ diff --git a/data_execl/base_data/ItemConfig.xlsx b/data_execl/base_data/ItemConfig.xlsx index db8ead7809..08f05d5933 100644 Binary files a/data_execl/base_data/ItemConfig.xlsx and b/data_execl/base_data/ItemConfig.xlsx differ diff --git a/data_execl/base_data/TreasureTaskConfig.xlsx b/data_execl/base_data/TreasureTaskConfig.xlsx index dce6d69a93..71fe1c1af7 100644 Binary files a/data_execl/base_data/TreasureTaskConfig.xlsx and b/data_execl/base_data/TreasureTaskConfig.xlsx differ