Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
f7d97ef4aa
Binary file not shown.
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 933381d17a9f5d0449788528d6872f5e
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bd6c5a6dbf8c0f1459a47ac57626e202
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -60,9 +60,8 @@ function QianKunBoxBuyOnePanel:BindEvent()
|
||||||
Util.AddClick(this.openOneAgainButton, function ()
|
Util.AddClick(this.openOneAgainButton, function ()
|
||||||
if isLimitUpHero then
|
if isLimitUpHero then
|
||||||
if this.func then
|
if this.func then
|
||||||
self.bg.gameObject:SetActive(false)
|
|
||||||
self.bg.gameObject:SetActive(true)
|
|
||||||
this.func()
|
this.func()
|
||||||
|
|
||||||
end
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
@ -115,6 +114,8 @@ end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function QianKunBoxBuyOnePanel:OnOpen(...)
|
function QianKunBoxBuyOnePanel:OnOpen(...)
|
||||||
|
self.bg.gameObject:SetActive(false)
|
||||||
|
self.bg.gameObject:SetActive(true)
|
||||||
SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen)
|
SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen)
|
||||||
local args = { ... }
|
local args = { ... }
|
||||||
this.drop=args[1]
|
this.drop=args[1]
|
||||||
|
|
Loading…
Reference in New Issue