From 024b684999c7ab9a23241744d4392126375b0e12 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 8 Nov 2021 10:51:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E7=A5=9E=E9=AD=82?= =?UTF-8?q?=E6=94=BE=E5=A4=A7=E9=95=9C=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/RoleInfoPopup.prefab | 12 ++++++------ .../~Lua/Modules/Popup/RoleInfoPopup.lua | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab index ff6d18a9a8..08d404d971 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab @@ -632,7 +632,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: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -874,7 +874,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: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8495,7 +8495,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: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -19868,7 +19868,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: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -19962,7 +19962,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: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22697,7 +22697,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: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 7d5d43ae29..c54f91215d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -93,7 +93,7 @@ function RoleInfoPopup:BindEvent() Util.AddClick(this.ShenhunBtn,function() local s = function() local pro = {} - local lv = GodSoulManager.GetGodSoulLv(curHeroData.dynamicId) + local lv = curHeroData.godSoulLv local skillList = GodSoulManager.GetGodSoulDataByLv(curHeroData.heroConfig.Id,0) for i = 1,LengthOfTable(skillList) do @@ -284,7 +284,6 @@ function this.RoleInfo1() this.pinjieRoot.gameObject:SetActive(false) this.shenhunRoot.gameObject:SetActive(true) for i = 1,#this.shenhunList do - Util.SetGray(this.shenhunList[i].go,true) if i > star then this.shenhunList[i].fx_shenhun.gameObject:SetActive(false) this.shenhunList[i].goItem.gameObject:SetActive(true)