Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
96316f4b39
|
@ -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:
|
|
@ -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
|
||||
|
|
|
@ -632,6 +632,8 @@ function this.SetTimeScale(TimeScale)
|
|||
Game.GlobalEvent:DispatchEvent(GameEvent.Battle.OnTimeScaleChanged)
|
||||
-- 真正生效的敌方
|
||||
Time.timeScale = TimeScale
|
||||
-- 设置音效播放的速度
|
||||
SoundManager.SetAudioSpeed(TimeScale)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
--显示血条
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue