Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
jiaoyangna 2020-08-29 17:36:42 +08:00
commit 6436392c8e
8 changed files with 39 additions and 20 deletions

View File

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

@ -66,7 +66,7 @@ function this.InitMirrorData()
end
function this.CarbonRedCheck()
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.TRIAL) then
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.PEOPLE_MIRROR) then
return false
end
this.GetTimeTip()

View File

@ -85,7 +85,8 @@ function FormationEditPopup:BindEvent()
if func~=nil then --保存完毕后 将英雄did合集传递过去 此时我拥有这些英雄 不用担心英雄已被删除
func(dids)
end
PlayerPrefs.SetInt(PlayerManager.uid.."TrialIsOpen",1)--设置森罗红点关
PlayerPrefs.SetInt(PlayerManager.uid.."Trial",1)--设置森罗红点关
CheckRedPointStatus(RedPointType.Trial)
self:ClosePanel()
end)
else

View File

@ -237,6 +237,7 @@ end
--设置试练已杀小怪数量
function this.SetKillCount(v)
CheckRedPointStatus(RedPointType.TrialReward)
CheckRedPointStatus(RedPointType.Trial)
this.killCount=v
end
--获取已杀小怪数量
@ -300,19 +301,11 @@ function this.SetHeroHp(data,did,func)
end
function this.TrialRedCheck()
local var
if PlayerPrefs.HasKey(PlayerManager.uid.."TrialIsOpen") then
var = PlayerPrefs.GetInt(PlayerManager.uid.."TrialIsOpen")
else
PlayerPrefs.SetInt(PlayerManager.uid.."TrialIsOpen",0)
end
if var == 1 then
return false
elseif var == 0 and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then
local var = PlayerPrefs.GetInt(PlayerManager.uid.."Trial")
if var == 0 and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then
return true
end
return MapTrialManager.TrialRewardRedPointCheck()
end
return this

View File

@ -58,15 +58,17 @@ function this.ResetLocalData()
local text =PlayerManager.uid.."fiveTime"
local curTime = GetTimeStamp()
if PlayerPrefs.HasKey(text) then
if PlayerPrefs.GetInt(text) > curTime then
func()
PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5)+86400)
end
else
if not PlayerPrefs.HasKey(text) then
func()
PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5))
end
LogPink("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime)
if PlayerPrefs.GetInt(text) < curTime then
func()
PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5)+86400)
end
LogGreen("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime)
LogPurple(PlayerPrefs.GetInt(PlayerManager.uid.."Trial"))
end
function this.OnGoldChange()

View File

@ -107,7 +107,7 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.People_Mirror, RedPointType.Vientiane)
RPData:SetParent(RedPointType.Trial, RedPointType.Vientiane)
RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial)
-- RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial)
RPData:SetParent(RedPointType.EndLess, RedPointType.Vientiane)
RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat)

View File

@ -109,6 +109,7 @@ function this.SetScrollPre(root,data)
getBtn:SetActive(false)
this.RefreshPanel()
CheckRedPointStatus(RedPointType.TrialReward)
CheckRedPointStatus(RedPointType.Trial)
end)
end)
end)