From 2f9b8de4db0473e9a1268f5ef9d80d136a328afb Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 2 Jun 2021 20:59:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E7=BC=96=E9=98=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Map/EndLessMapManager.lua | 11 ++--------- .../~Lua/Modules/Map/View/EndLessMapView.lua | 4 +--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index b08f3d916d..609ce8fd48 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -102,7 +102,6 @@ end -- 登录初始化地图数据 function this.InitMapInfoData(mapId) - -- --LogGreen("mapId:"..mapId) this.openMapId = mapId > 1 and mapId or 4001-- 开放的地图ID end -- ================================== 妖灵师状态刷新 ======================================== @@ -261,9 +260,7 @@ function this.InitAllEndlessHero(heroList,isClear) this.InitSingleEndlessHero(heroList[i]) end local id ,lv = this.GetShiQiValue() - -- --LogGreen("lv:"..lv) this.moraleLv = lv - -- --LogGreen("this.moraleLv:"..this.moraleLv) this.moraleId = id end @@ -481,7 +478,7 @@ function this.SetHeroFormationList(heroDid,teamId,isAddOrDel) end function this.GetSingleCanUseHeroData(heroDid) - if not this.canUseHeroDatas then + if not this.canUseHeroDatas or LengthOfTable(this.canUseHeroDatas) < 1 then this.GetCanUseHeroDatas() end if this.canUseHeroDatas[heroDid] then @@ -515,15 +512,12 @@ function this.GetCanUseHeroDatas() end function this.SetCanUseHeroNew() - LogGreen("111:") - if not this.canUseHeroDatas then + if not this.canUseHeroDatas or LengthOfTable(this.canUseHeroDatas) < 1 then this.GetCanUseHeroDatas() end - LogGreen("222:") for k,v in pairs(this.canUseHeroDatas) do PlayerPrefs.SetInt("endlessCanUseHero"..PlayerManager.uid..v.dynamicId,0) v.isNew = 0 - LogGreen("v.isNew:"..v.isNew) end CheckRedPointStatus(RedPointType.wujinBianDui) CheckRedPointStatus(RedPointType.EndlessPanel) @@ -610,7 +604,6 @@ function this.GetHeroLeftBlood(heroId) if this.allHeroBlood[heroId] then return this.allHeroBlood[heroId].curHp else - Log("神将血量值不存在,默认是满血") local allProp = HeroManager.CalculateWarAllProVal(heroId) return allProp[3] end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index d3959031c8..006786a33e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -318,12 +318,12 @@ end function EndLessMapView:OnOpen() - LogError("EndLessMapView:OnOpen") -- 初始化组件显示 this:InitCompShow(CarbonManager.difficulty) if not this:IsEndLessMap() then return end local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS) PlayerPrefs.SetInt("WuJin"..PlayerManager.uid,serData.endTime) + CheckRedPointStatus(RedPointType.EndlessPanel) -- 初始化各种标志的状态 this:InitBoolState() -- 开始探索请求 @@ -335,8 +335,6 @@ function EndLessMapView:OnOpen() this:InitCostValue() this:RefreshEnergyValue(true, 0) this:RefreshEnergyShow() - Util.GetGameObject(MapPanel.gameObject, "centerDown/selectHero"):SetActive(false) - this.helpBtn:SetActive(false) -- 检测引导 GuideManager.CheckCarbonGuild(CARBON_TYPE.ENDLESS) From de30eb3499eb6ffe01da6f33093e0590f91b3c6e Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 2 Jun 2021 21:04:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=99=BB=E9=99=86=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E3=80=91=E8=A7=86=E9=A2=91=E5=8D=B8=E8=BD=BD=E5=88=A4?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/PackageManager.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua index a8e12ec27e..13db945dcc 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua @@ -60,6 +60,8 @@ function PackageManager.SetVideo(obj,Image) end function PackageManager.UnloadVideo() - Log("卸载视频:"..tostring(this.config.VideoName)) - resMgr:UnLoadAsset(this.config.VideoName) + if this.config.VideoName then + Log("卸载视频:"..tostring(this.config.VideoName)) + resMgr:UnLoadAsset(this.config.VideoName) + end end \ No newline at end of file