From 3b8317a8973b25f6818afba38242b4dc589cb098 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Mon, 19 Oct 2020 21:30:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=8D=E9=81=A5=E6=B8=B8=E7=BA=A2=E7=82=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab | 2 +- .../~Lua/Modules/Login/LoginPanel.lua | 2 ++ .../~Lua/Modules/XiaoYao/XiaoYaoManager.lua | 30 +++++++++---------- .../~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua | 14 ++++++--- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab index 8825978d32..114bbadc57 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab @@ -3379,7 +3379,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 99c1872e47465ce4a9332827a3fb8d92, type: 3} + m_Sprite: {fileID: 21300000, guid: 6a8851429d5982a458c1af37ed7176f9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index b8189fe898..75d23d6042 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -465,7 +465,9 @@ function this.ExecuteLoading() --[[[32] =]] function() NetManager.GetSituationInfoRequest(LoadingPanel.OnStep) end, --[[[33] =]] function() NetManager.RefreshTimeSLRequest(LoadingPanel.OnStep) end, --[[[34] =]] function() HeroManager.CheckRepeatTreasure(LoadingPanel.OnStep) end, + --[[[34] =]] function() XiaoYaoManager.GetOpenMapData(LoadingPanel.OnStep) end, --[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前 + if AppConst.isGuide then if GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) then --创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面 diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua index 0dbb9ffe7a..65e4c5bb2b 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua @@ -1,7 +1,7 @@ XiaoYaoManager = {} local this = XiaoYaoManager +this.allMapData={} this.curMapId=0; - this.MonsterData={} this.fightBossIndex = 0 @@ -14,8 +14,7 @@ this.luckyluckyTurnTableRemainTime = 0 --打开逍遥游地图列表界面 function this.OpenMapList() - this.GetOpenMapData(function(_data) - Log("打开逍遥游地图列表界面") + this.GetOpenMapData(function(_data) UIManager.OpenPanel(UIName.XiaoYaoYouPanel,_data) end) end @@ -25,9 +24,13 @@ function this.GetOpenMapData(func) local _data={} Log(#msg.infos) for i = 1, #msg.infos do - Log("mapId:"..msg.infos[i].mapId..",process:"..msg.infos[i].process) - _data[msg.infos[i].mapId]=msg.infos[i].process - end + Log("mapId:"..msg.infos[i].mapId..",process:"..msg.infos[i].process..",redpoint:"..msg.infos[i].redPoint) + _data[msg.infos[i].mapId]={} + _data[msg.infos[i].mapId].process=msg.infos[i].process + _data[msg.infos[i].mapId].redPoint=msg.infos[i].redPoint + Log("逍遥游红点数据,mapid:"..msg.infos[i].mapId..",redPoint:"..msg.infos[i].redPoint) + end + this.allMapData=_data if func then func(_data) end @@ -351,17 +354,12 @@ function this.CheckRedPoint() if BagManager.GetItemCountById(UpViewRechargeType.YunYouVle)>=PrivilegeManager.GetPrivilegeNumber(39) then return true end - if this.luckyluckyTurnTableTimes > 0 and (this.luckyluckyTurnTableRemainTime - PlayerManager.serverTime > 0) then - return true + + for k, v in pairs(this.allMapData) do + if v.redPoint==1 then + return true + end end - local temp = this.GetMonsterDatas() - if temp and #temp > 0 then - return true - end - local temp = XiaoYaoManager.GetHeroDatas() - if temp and #temp > 0 then - return true - end return false end return XiaoYaoManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua index 862008bfae..d47e692706 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua @@ -71,8 +71,7 @@ function this:OnShow() end -- 刷新界面显示 -function this.RefreshShow(data) - +function this.RefreshShow(data) local _allData={} local _cruLevel = PlayerManager.level Log("当前玩家等级:".._cruLevel) @@ -80,9 +79,13 @@ function this.RefreshShow(data) local _isUnLock = config.UnlockLevel >= 0 and _cruLevel >= config.UnlockLevel--判断章节是否开启 local showReward = ConfigManager.GetConfigData(ConfigName.RewardGroup,config.FinalReward).ShowItem local _progress=0 + local isShowRed=false Log("当前mapid:"..config.MapID) + Log("index"..index) if data[config.MapID]~=nil then - _progress=data[config.MapID] + Log("data[index].redPoint"..data[config.MapID].redPoint) + _progress=data[config.MapID].process + isShowRed=data[config.MapID].redPoint==1 end local _singleData={ mapId=config.MapID, @@ -92,7 +95,8 @@ function this.RefreshShow(data) isUnLock=_isUnLock, progress=_progress, passReward=showReward[1], - unlockLevel = config.UnlockLevel + unlockLevel = config.UnlockLevel, + redPoint=isShowRed } _allData[index]=_singleData end @@ -122,6 +126,7 @@ function this.SingleDataShow(btn, go, data, index) local fightIcon = Util.GetGameObject(go, "fightIcon"):GetComponent("Image") local reward = Util.GetGameObject(go, "fightIcon/reward") local name = Util.GetGameObject(go, "fightIcon/name"):GetComponent("Text") + local redPoint = Util.GetGameObject(go, "fightIcon/redPoint") local _rewardObj= SubUIManager.Open(SubUIConfig.ItemView, reward.transform) -- local progressObj=Util.GetGameObject(go,"fightIcon/progress") -- local progress=Util.GetGameObject(go,"fightIcon/progress/Image"):GetComponent("Image") @@ -140,6 +145,7 @@ function this.SingleDataShow(btn, go, data, index) XiaoYaoManager.OpenXiaoYaoMap(data.mapId) end end) + redPoint:SetActive(data.redPoint) Log("isUnLock值:"..tostring(data.isUnLock)) -- lock:SetActive(not data.isUnLock) name.text=data.mapName