Merge branch 'china/dev' into china/test

dev_chengFeng
zhangshanxue 2021-11-30 16:48:04 +08:00
commit 4ff2346dc4
19 changed files with 77 additions and 33 deletions

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d0d4fcb48f85ca541b9b88b4f09fb73a
guid: 3f734ccbdd604a84295305f45022365e
AudioImporter:
externalObjects: {}
serializedVersion: 6

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 56d5f4bb75c88da47b68ccdae8f67bd8
guid: be391b90281d4bc41ae1ae3bcb9b81d6
AudioImporter:
externalObjects: {}
serializedVersion: 6

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: dffdee4298f72874aaca89c960e8cdaf
guid: b82841729a2071f4f8fe1c679525ba06
AudioImporter:
externalObjects: {}
serializedVersion: 6

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 40b725938082ff24b978ef30aea7a60d
guid: 3fa6dc2c072719c45a437f161c1d04c0
AudioImporter:
externalObjects: {}
serializedVersion: 6

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 62edb5da3e02ab749b7b6568356b7ec2
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:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 24690cc301bef2a4db5c65be9e8eecb4
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:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 1ca8476ed4aa10a4084f14eedf23df34
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:

View File

@ -1,22 +0,0 @@
fileFormatVersion: 2
guid: e8104da84cdbc6b41a4edebdca2a619c
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:

View File

@ -23610,7 +23610,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2486517206346123983}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@ -23753,7 +23753,7 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2486517206571488771}
serializedVersion: 6
lengthInSec: 3
lengthInSec: 1.5
simulationSpeed: 1
stopAction: 0
cullingMode: 3
@ -28459,7 +28459,7 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2486517206608966572}
serializedVersion: 6
lengthInSec: 6
lengthInSec: 3
simulationSpeed: 1
stopAction: 0
cullingMode: 1
@ -33147,7 +33147,7 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2486517206886235056}
serializedVersion: 6
lengthInSec: 3
lengthInSec: 1.5
simulationSpeed: 1
stopAction: 0
cullingMode: 3
@ -51927,7 +51927,7 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2486517207254254809}
serializedVersion: 6
lengthInSec: 4
lengthInSec: 2
simulationSpeed: 1
stopAction: 0
cullingMode: 3

View File

@ -701,7 +701,7 @@ function this.ExcuteBattle()
FightPointPassManager.ExecuteFightStory(curFightId, function(drop)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1, function()
this:OnShow()
end)
end,1)
end)
end)
else

View File

@ -167,7 +167,7 @@ function RewardItemSingleShowPopup:BindEvent()
this.SendBackCompoundReCallBack(drop)
end)
else
PopupTipPanel.ShowTip(Language[11509])
PopupTipPanel.ShowTip("碎片不足,无法合成坐骑。")
end
else
local _itemData = BagManager.bagDatas[itemSid]