From 0d40e26a343fefbfb26bde8ba1f17222ca4874b2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 26 Dec 2020 18:29:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=AF=E6=9C=AC=E7=BA=A2=E7=82=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Carbon/CarbonTypePanelV2.lua | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 8802f8dd6d..504274a89c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -225,12 +225,11 @@ function CarbonTypePanelV2:OnShow(...) if not redPointTypeList then redPointTypeList= {} end - for k,v in pairs(carbons) do - if redPointTypeList[Util.GetGameObject(v, "redPoint")] then - ClearRedPointObject(redPointTypeList[Util.GetGameObject(v, "redPoint")],Util.GetGameObject(v, "redPoint")) - redPointTypeList[Util.GetGameObject(v, "redPoint")] = -1 - end + for k,v in pairs(redPointTypeList) do + ClearRedPointObject(v,k) + v = -1 end + for k,v in ipairs(carbons) do local data if not type[PlayerManager.carbonType][k] then @@ -238,11 +237,12 @@ function CarbonTypePanelV2:OnShow(...) else data = type[PlayerManager.carbonType][k] end + local redpoint = Util.GetGameObject(v, "redPoint") if data.redPointType == -1 or not data.redPointType then - Util.GetGameObject(v, "redPoint"):SetActive(false) + redpoint:SetActive(false) else - BindRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint")) - redPointTypeList[Util.GetGameObject(v, "redPoint")] = data.redPointType + BindRedPointObject(data.redPointType,redpoint) + redPointTypeList[redpoint] = data.redPointType CheckRedPointStatus(data.redPointType) end end @@ -503,8 +503,12 @@ function CarbonTypePanelV2:OnClose() this.refreshTimer = nil end this.isPlayDoorAudio = false - carbonType = 0 + carbonType = 0 + for k,v in pairs(redPointTypeList) do + ClearRedPointObject(v,k) + v = -1 + end end --界面销毁时调用(用于子类重写) @@ -524,19 +528,19 @@ function CarbonTypePanelV2:OnDestroy() ClearRedPointObject(RedPointType.Setting, this.headRedpot) - for k,v in ipairs(carbons) do - local data - if not type[PlayerManager.carbonType][k] then - data = type[PlayerManager.carbonType].default - else - data = type[PlayerManager.carbonType][k] - end - if data.redPointType == -1 or not data.redPointType then - else - ClearRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint")) - redPointTypeList[Util.GetGameObject(v, "redPoint")] = -1 - end - end + -- for k,v in ipairs(carbons) do + -- local data + -- if not type[PlayerManager.carbonType][k] then + -- data = type[PlayerManager.carbonType].default + -- else + -- data = type[PlayerManager.carbonType][k] + -- end + -- if data.redPointType == -1 or not data.redPointType then + -- else + -- ClearRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint")) + -- redPointTypeList[Util.GetGameObject(v, "redPoint")] = -1 + -- end + -- end redPointTypeList = {} end