From 08ef62eb2b1a586365a48c680d3ee679091e667e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 30 Apr 2021 12:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=B3=E5=B0=8A=E9=99=8D=E4=B8=96=20=20=20?= =?UTF-8?q?=20=E5=89=8D=E5=BE=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/SupremeHeroPopup.prefab | 56 +++++++++---------- .../~Lua/Modules/Popup/SupremeHeroPopup.lua | 7 ++- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab index 56148520cc..92dcdfc0c6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab @@ -4934,7 +4934,7 @@ ParticleSystem: --- !u!199 &64690113 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9637,7 +9637,7 @@ ParticleSystem: --- !u!199 &69172534 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14345,7 +14345,7 @@ ParticleSystem: --- !u!199 &204799297 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19125,7 +19125,7 @@ ParticleSystem: --- !u!199 &279759104 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23960,7 +23960,7 @@ ParticleSystem: --- !u!199 &462227806 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28663,7 +28663,7 @@ ParticleSystem: --- !u!199 &513000431 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33749,7 +33749,7 @@ ParticleSystem: --- !u!199 &589373448 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38510,7 +38510,7 @@ ParticleSystem: --- !u!199 &731631312 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -43329,7 +43329,7 @@ ParticleSystem: --- !u!199 &776903912 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48032,7 +48032,7 @@ ParticleSystem: --- !u!199 &815718708 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -52741,7 +52741,7 @@ ParticleSystem: --- !u!199 &1086905469 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -57502,7 +57502,7 @@ ParticleSystem: --- !u!199 &1145507478 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -62321,7 +62321,7 @@ ParticleSystem: --- !u!199 &1176510546 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -67082,7 +67082,7 @@ ParticleSystem: --- !u!199 &1199557686 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -71843,7 +71843,7 @@ ParticleSystem: --- !u!199 &1261539162 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -76604,7 +76604,7 @@ ParticleSystem: --- !u!199 &1273843583 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -81369,7 +81369,7 @@ ParticleSystem: --- !u!199 &1371557504 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -86130,7 +86130,7 @@ ParticleSystem: --- !u!199 &1408515770 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90900,7 +90900,7 @@ ParticleSystem: --- !u!199 &1469096893 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -95606,7 +95606,7 @@ ParticleSystem: --- !u!199 &1654140410 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -100511,7 +100511,7 @@ ParticleSystem: --- !u!199 &1822328417 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -105217,7 +105217,7 @@ ParticleSystem: --- !u!199 &1981367497 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -109965,7 +109965,7 @@ ParticleSystem: --- !u!199 &2130572716 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -112013,7 +112013,7 @@ RectTransform: m_Children: - {fileID: 5549884072537957039} m_Father: {fileID: 1593966968479717942} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -112388,7 +112388,7 @@ RectTransform: - {fileID: 5340822025078538718} - {fileID: 6882643634657733322} m_Father: {fileID: 1593966968479717942} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -112435,10 +112435,10 @@ RectTransform: - {fileID: 2013433043837755292} - {fileID: 6481611044557373655} - {fileID: 5568861175177969657} + - {fileID: 1221612153605822957} - {fileID: 4878749898380413223} - {fileID: 347420160009930924} - {fileID: 3856169001450030976} - - {fileID: 1221612153605822957} - {fileID: 8763056725147773343} m_Father: {fileID: 5873460360470581336} m_RootOrder: 1 @@ -113587,7 +113587,7 @@ RectTransform: m_Children: - {fileID: 6373605657769495589} m_Father: {fileID: 1593966968479717942} - m_RootOrder: 6 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -114149,7 +114149,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1593966968479717942} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua index 903efd5a89..c919cbf009 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua @@ -114,7 +114,7 @@ local jumpEvnt = { PopupTipPanel.ShowTip(Language[11531]) end, [3] = function () - JumpManager.GoJump(36004) + JumpManager.GoJump(36005) end, } @@ -157,9 +157,10 @@ function SupremeHeroPopup:BindEvent() --各任务前往按钮 for i = 1, #this.rewardBtn do Util.AddClick(this.rewardBtn[i],function() - if this.GetMissionState(i) == 0 then - Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceClear) + if this.GetMissionState(i) == 0 then + LogGreen("jfdksljfklsdjf") jumpEvnt[i]() + Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceClear) self:ClosePanel() end end)