Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
462ac9c494
|
@ -663,10 +663,10 @@ end
|
||||||
|
|
||||||
-- 获取当前需要显示的描述文字
|
-- 获取当前需要显示的描述文字
|
||||||
function this.GetCurLevelTips()
|
function this.GetCurLevelTips()
|
||||||
LogError("GetCurLevelTips")
|
--LogError("GetCurLevelTips")
|
||||||
|
|
||||||
for id, config in ConfigPairs(LevelTipsConfig) do
|
for id, config in ConfigPairs(LevelTipsConfig) do
|
||||||
LogError(id)
|
--LogError(id)
|
||||||
if config.Type == 1 then
|
if config.Type == 1 then
|
||||||
if this.CarbonIdCompare(this.GetCurFightId(), config.Parameter) <= 0 then
|
if this.CarbonIdCompare(this.GetCurFightId(), config.Parameter) <= 0 then
|
||||||
return config.Desc -- string.format("通关%s,%s", mainLevelConfig[config.Parameter].Name, config.Desc)
|
return config.Desc -- string.format("通关%s,%s", mainLevelConfig[config.Parameter].Name, config.Desc)
|
||||||
|
|
|
@ -352,7 +352,7 @@ function SingleRecruitPanel:UpdataPanelData(_heroData)
|
||||||
this.UI_Effect_appear:SetActive(false)
|
this.UI_Effect_appear:SetActive(false)
|
||||||
Sound_Recruit3 = SoundManager.PlaySound(SoundConfig.Sound_Recruit3)
|
Sound_Recruit3 = SoundManager.PlaySound(SoundConfig.Sound_Recruit3)
|
||||||
|
|
||||||
if heroStaticData and testLiveGO then
|
if heroStaticData and not IsNull(testLiveGO) then
|
||||||
poolManager:UnLoadLive(GetResourcePath(heroStaticData.Live), testLiveGO)
|
poolManager:UnLoadLive(GetResourcePath(heroStaticData.Live), testLiveGO)
|
||||||
heroStaticData, testLiveGO = nil, nil
|
heroStaticData, testLiveGO = nil, nil
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue