From 6654c9c3b81f27a21a2da617ce348d6825fc479e Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 5 Nov 2020 17:04:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB?= =?UTF-8?q?=E3=80=91=20=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=9C=A3=E7=89=A9=20=E6=96=B0=E6=A0=87=20=20=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExpeditionSelectHalidomPanel.prefab | 75 +++++++++++++++++++ .../Modules/Expedition/ExpeditionManager.lua | 4 + .../ExpeditionSelectHalidomPanel.lua | 2 + 3 files changed, 81 insertions(+) diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab index c774d8613e..e50d0df3f4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab @@ -1246,6 +1246,7 @@ RectTransform: - {fileID: 4599864883104131042} - {fileID: 9144379138180442586} - {fileID: 2852514959933465201} + - {fileID: 2775512645932585358} m_Father: {fileID: 3099126925472904098} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1756,6 +1757,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &7692649950684363445 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2775512645932585358} + - component: {fileID: 3894831567905296074} + - component: {fileID: 7111047594126581542} + m_Layer: 5 + m_Name: newImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2775512645932585358 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7692649950684363445} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1000020802548592087} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 318, y: 60} + m_SizeDelta: {x: 58, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3894831567905296074 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7692649950684363445} + m_CullTransparentMesh: 0 +--- !u!114 &7111047594126581542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7692649950684363445} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: a10e41ffee387fe4fa87572b447d9e5a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7753554180664546627 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index eb7595d7ac..e0a51fd51a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -5,6 +5,7 @@ this.nodeInfo = {}--所有节点信息 this.heroInfo = {}--己方英雄信息 this.lay = {}--阶段 this.allHoly = {}--激活的圣物 +this.allSHoly = {}--激活的圣物静态idlist this.ResurgenceNum = 0--复活次数 this.curNodeInfo = {}--当前执行逻辑的节点信息 this.expeditionLeve = 0--猎妖之路阶段 @@ -91,9 +92,11 @@ function this.InitExpeditionData(msg) --Log("#msg.equipIds "..#msg.equipIds) for i = 1, #msg.equipIds do local singleHalidomInfo = {} + LogPink("singleHalidomInfo.id ".. msg.equipIds[i].id.." "..msg.equipIds[i].equiptId) singleHalidomInfo.id = msg.equipIds[i].id--动态id singleHalidomInfo.equiptId = msg.equipIds[i].equiptId this.allHoly[singleHalidomInfo.id] =singleHalidomInfo + this.allSHoly[singleHalidomInfo.equiptId] = singleHalidomInfo.equiptId end end --移除援助的英雄 @@ -294,6 +297,7 @@ function this.UpdateHalidomValue(msg) singleHalidomInfo.equiptId = msg.equipIds[i].equiptId --Log(" ******* 推送更新远征圣物 "..singleHalidomInfo.id.." "..singleHalidomInfo.equiptId) this.allHoly[singleHalidomInfo.id] =singleHalidomInfo + this.allSHoly[singleHalidomInfo.equiptId] = singleHalidomInfo.equiptId end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua index 6e9aa90a0b..762efaa1c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua @@ -102,9 +102,11 @@ function ExpeditionSelectHalidomPanel:OnShowSingleHolyData(go,singleHoly) local posImage = Util.GetGameObject(go, "posImage") local proImage = Util.GetGameObject(go, "proImage") local heroImage = Util.GetGameObject(go, "Hero") + local newImage = Util.GetGameObject(go, "newImage") posImage:SetActive(false) proImage:SetActive(false) heroImage:SetActive(false) + newImage:SetActive(not ExpeditionManager.allSHoly[configData.Id]) if configData.SpecialIcon then if configData.SpecialIcon[1] == 1 then--属性 proImage:SetActive(true)