Merge branch 'master_develop' into master_test
commit
af9f316417
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,43 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e7b39b63c002a2d4888f9466e1291842
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides:
|
||||||
|
1:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
4:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
7:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b4b1183e2898e1b44a63f89cb8713a80
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides:
|
||||||
|
1:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
4:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
7:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 263c5ed8ff294014f8bcb6c5772e3fb3
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides:
|
||||||
|
1:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
4:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
7:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 68cd2d70da3cf814da629446567c08f8
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides:
|
||||||
|
1:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
4:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
7:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -701,5 +701,17 @@ function this.GetTimeLimitRedPointStatus()
|
||||||
return freeTime and freeTime >= 1
|
return freeTime and freeTime >= 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.GetQiankunBoxRedPointStatus()
|
||||||
|
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
|
||||||
|
local freeTimesId=lotterySetting[RecruitType.QianKunBoxSingle].FreeTimes
|
||||||
|
local freeTime= 0
|
||||||
|
if freeTimesId>0 then
|
||||||
|
freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
|
||||||
|
RecruitManager.freeUseTimeList[freeTimesId]=freeTime
|
||||||
|
return freeTime and freeTime >= 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
this.TimeLimitedTimes = 0
|
this.TimeLimitedTimes = 0
|
||||||
return this
|
return this
|
|
@ -389,7 +389,7 @@ function this.RegisterRedCheckFunc()
|
||||||
RPData:AddCheckFunc(RedPointType.Expedition_Treasure,TreasureOfHeavenManger.RedPoint)
|
RPData:AddCheckFunc(RedPointType.Expedition_Treasure,TreasureOfHeavenManger.RedPoint)
|
||||||
--限时招募
|
--限时招募
|
||||||
RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus)
|
RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus)
|
||||||
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetTimeLimitRedPointStatus)
|
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -55,6 +55,7 @@ function this.RefreshFreeTime()
|
||||||
this.freeUseTimeList[38] = PrivilegeManager.GetPrivilegeRemainValue(38)
|
this.freeUseTimeList[38] = PrivilegeManager.GetPrivilegeRemainValue(38)
|
||||||
this.freeUseTimeList[14] = PrivilegeManager.GetPrivilegeRemainValue(14)
|
this.freeUseTimeList[14] = PrivilegeManager.GetPrivilegeRemainValue(14)
|
||||||
this.freeUseTimeList[32] = PrivilegeManager.GetPrivilegeRemainValue(32)
|
this.freeUseTimeList[32] = PrivilegeManager.GetPrivilegeRemainValue(32)
|
||||||
|
this.freeUseTimeList[99] = PrivilegeManager.GetPrivilegeRemainValue(99)
|
||||||
|
|
||||||
if (ActTimeCtrlManager.SingleFuncState(1)) then
|
if (ActTimeCtrlManager.SingleFuncState(1)) then
|
||||||
CheckRedPointStatus(RedPointType.Recruit_Red)
|
CheckRedPointStatus(RedPointType.Recruit_Red)
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue