Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
3dd3af7ade
|
@ -60,6 +60,8 @@ function PackageManager.SetVideo(obj,Image)
|
||||||
end
|
end
|
||||||
|
|
||||||
function PackageManager.UnloadVideo()
|
function PackageManager.UnloadVideo()
|
||||||
Log("卸载视频:"..tostring(this.config.VideoName))
|
if this.config.VideoName then
|
||||||
resMgr:UnLoadAsset(this.config.VideoName)
|
Log("卸载视频:"..tostring(this.config.VideoName))
|
||||||
|
resMgr:UnLoadAsset(this.config.VideoName)
|
||||||
|
end
|
||||||
end
|
end
|
|
@ -102,7 +102,6 @@ end
|
||||||
|
|
||||||
-- 登录初始化地图数据
|
-- 登录初始化地图数据
|
||||||
function this.InitMapInfoData(mapId)
|
function this.InitMapInfoData(mapId)
|
||||||
-- --LogGreen("mapId:"..mapId)
|
|
||||||
this.openMapId = mapId > 1 and mapId or 4001-- 开放的地图ID
|
this.openMapId = mapId > 1 and mapId or 4001-- 开放的地图ID
|
||||||
end
|
end
|
||||||
-- ================================== 妖灵师状态刷新 ========================================
|
-- ================================== 妖灵师状态刷新 ========================================
|
||||||
|
@ -261,9 +260,7 @@ function this.InitAllEndlessHero(heroList,isClear)
|
||||||
this.InitSingleEndlessHero(heroList[i])
|
this.InitSingleEndlessHero(heroList[i])
|
||||||
end
|
end
|
||||||
local id ,lv = this.GetShiQiValue()
|
local id ,lv = this.GetShiQiValue()
|
||||||
-- --LogGreen("lv:"..lv)
|
|
||||||
this.moraleLv = lv
|
this.moraleLv = lv
|
||||||
-- --LogGreen("this.moraleLv:"..this.moraleLv)
|
|
||||||
this.moraleId = id
|
this.moraleId = id
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -481,7 +478,7 @@ function this.SetHeroFormationList(heroDid,teamId,isAddOrDel)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.GetSingleCanUseHeroData(heroDid)
|
function this.GetSingleCanUseHeroData(heroDid)
|
||||||
if not this.canUseHeroDatas then
|
if not this.canUseHeroDatas or LengthOfTable(this.canUseHeroDatas) < 1 then
|
||||||
this.GetCanUseHeroDatas()
|
this.GetCanUseHeroDatas()
|
||||||
end
|
end
|
||||||
if this.canUseHeroDatas[heroDid] then
|
if this.canUseHeroDatas[heroDid] then
|
||||||
|
@ -515,15 +512,12 @@ function this.GetCanUseHeroDatas()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.SetCanUseHeroNew()
|
function this.SetCanUseHeroNew()
|
||||||
LogGreen("111:")
|
if not this.canUseHeroDatas or LengthOfTable(this.canUseHeroDatas) < 1 then
|
||||||
if not this.canUseHeroDatas then
|
|
||||||
this.GetCanUseHeroDatas()
|
this.GetCanUseHeroDatas()
|
||||||
end
|
end
|
||||||
LogGreen("222:")
|
|
||||||
for k,v in pairs(this.canUseHeroDatas) do
|
for k,v in pairs(this.canUseHeroDatas) do
|
||||||
PlayerPrefs.SetInt("endlessCanUseHero"..PlayerManager.uid..v.dynamicId,0)
|
PlayerPrefs.SetInt("endlessCanUseHero"..PlayerManager.uid..v.dynamicId,0)
|
||||||
v.isNew = 0
|
v.isNew = 0
|
||||||
LogGreen("v.isNew:"..v.isNew)
|
|
||||||
end
|
end
|
||||||
CheckRedPointStatus(RedPointType.wujinBianDui)
|
CheckRedPointStatus(RedPointType.wujinBianDui)
|
||||||
CheckRedPointStatus(RedPointType.EndlessPanel)
|
CheckRedPointStatus(RedPointType.EndlessPanel)
|
||||||
|
@ -610,7 +604,6 @@ function this.GetHeroLeftBlood(heroId)
|
||||||
if this.allHeroBlood[heroId] then
|
if this.allHeroBlood[heroId] then
|
||||||
return this.allHeroBlood[heroId].curHp
|
return this.allHeroBlood[heroId].curHp
|
||||||
else
|
else
|
||||||
Log("神将血量值不存在,默认是满血")
|
|
||||||
local allProp = HeroManager.CalculateWarAllProVal(heroId)
|
local allProp = HeroManager.CalculateWarAllProVal(heroId)
|
||||||
return allProp[3]
|
return allProp[3]
|
||||||
end
|
end
|
||||||
|
|
|
@ -318,12 +318,12 @@ end
|
||||||
|
|
||||||
|
|
||||||
function EndLessMapView:OnOpen()
|
function EndLessMapView:OnOpen()
|
||||||
LogError("EndLessMapView:OnOpen")
|
|
||||||
-- 初始化组件显示
|
-- 初始化组件显示
|
||||||
this:InitCompShow(CarbonManager.difficulty)
|
this:InitCompShow(CarbonManager.difficulty)
|
||||||
if not this:IsEndLessMap() then return end
|
if not this:IsEndLessMap() then return end
|
||||||
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS)
|
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS)
|
||||||
PlayerPrefs.SetInt("WuJin"..PlayerManager.uid,serData.endTime)
|
PlayerPrefs.SetInt("WuJin"..PlayerManager.uid,serData.endTime)
|
||||||
|
CheckRedPointStatus(RedPointType.EndlessPanel)
|
||||||
-- 初始化各种标志的状态
|
-- 初始化各种标志的状态
|
||||||
this:InitBoolState()
|
this:InitBoolState()
|
||||||
-- 开始探索请求
|
-- 开始探索请求
|
||||||
|
@ -335,8 +335,6 @@ function EndLessMapView:OnOpen()
|
||||||
this:InitCostValue()
|
this:InitCostValue()
|
||||||
this:RefreshEnergyValue(true, 0)
|
this:RefreshEnergyValue(true, 0)
|
||||||
this:RefreshEnergyShow()
|
this:RefreshEnergyShow()
|
||||||
Util.GetGameObject(MapPanel.gameObject, "centerDown/selectHero"):SetActive(false)
|
|
||||||
this.helpBtn:SetActive(false)
|
|
||||||
-- 检测引导
|
-- 检测引导
|
||||||
GuideManager.CheckCarbonGuild(CARBON_TYPE.ENDLESS)
|
GuideManager.CheckCarbonGuild(CARBON_TYPE.ENDLESS)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue