diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab index 5f2fda780d..41f6e02111 100644 --- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &113973470620193855 RectTransform: m_ObjectHideFlags: 0 @@ -14276,7 +14276,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1175011951389449845 RectTransform: m_ObjectHideFlags: 0 @@ -23689,7 +23689,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1293326127809268710 RectTransform: m_ObjectHideFlags: 0 @@ -37981,7 +37981,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1854192085083497250 RectTransform: m_ObjectHideFlags: 0 @@ -47440,7 +47440,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.000023721137, y: 50} + m_AnchoredPosition: {x: -0.000025491418, y: 50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 1, y: 0.5} --- !u!114 &455843809901100221 @@ -47481,7 +47481,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2148652388003798601 RectTransform: m_ObjectHideFlags: 0 @@ -57401,7 +57401,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3515246308159524062 RectTransform: m_ObjectHideFlags: 0 @@ -71781,7 +71781,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4282618727732723752 RectTransform: m_ObjectHideFlags: 0 @@ -91135,7 +91135,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5182712287089576832 RectTransform: m_ObjectHideFlags: 0 @@ -101278,7 +101278,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6701160020723403936 RectTransform: m_ObjectHideFlags: 0 @@ -101805,7 +101805,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7351366383169951927 RectTransform: m_ObjectHideFlags: 0 @@ -111671,8 +111671,8 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 38e5bd26b46de5144943d4c2e30e6be7, type: 2} - - {fileID: 2100000, guid: 38e5bd26b46de5144943d4c2e30e6be7, type: 2} + - {fileID: 2100000, guid: 0ba4d5b30b138a3448e33f6a2dfa748d, type: 2} + - {fileID: 2100000, guid: 0ba4d5b30b138a3448e33f6a2dfa748d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -111897,7 +111897,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8530793789822388078 RectTransform: m_ObjectHideFlags: 0 @@ -121500,7 +121500,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8809090848457724609 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua index 681c44a27c..92ca0c6f3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua @@ -38,6 +38,8 @@ function TailsManSouPanel:InitComponent() self.addBtn = Util.GetGameObject(self.gameObject,"bg/add") self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform) + self.effectJin = Util.GetGameObject(self.gameObject,"bg/effect/UI_effect_RecruitPanel_particle_jin") + self.effectHong = Util.GetGameObject(self.gameObject,"bg/effect/UI_effect_RecruitPanel_particle_hong") end --绑定事件(用于子类重写) @@ -108,6 +110,10 @@ function TailsManSouPanel:OnShow() self.tabBox:Init(self.tabbox.gameObject, tabs, curPage) curData = TailsManSoulManager.GetTailsmanSoulDatas(tabs[curPage].quality) self:RefreshData() + self.effectJin.gameObject:SetActive(tabs[curPage].quality == 5) + self.effectHong.gameObject:SetActive(tabs[curPage].quality == 6) + Util.SetParticleSortLayer(self.effectJin.gameObject,self.sortingOrder + 1) + Util.SetParticleSortLayer(self.effectHong.gameObject,self.sortingOrder + 1) end @@ -150,6 +156,8 @@ function TailsManSouPanel:SetSingleData(go,data,index) self.itemPreList[go].iconList[i] = {} self.itemPreList[go].iconList[i].go = Util.GetGameObject(self.itemPreList[go].bg.transform,"compGrid/iconDi"..i) self.itemPreList[go].iconList[i].icon = Util.GetGameObject(self.itemPreList[go].iconList[i].go.transform,"icon"):GetComponent("Image") + self.itemPreList[go].iconList[i].effecthong = Util.GetGameObject(self.itemPreList[go].iconList[i].go,"UI_Effect_Kuang_HongSe") + self.itemPreList[go].iconList[i].effectjin = Util.GetGameObject(self.itemPreList[go].iconList[i].go,"UI_Effect_Kuang_JinSe") end end self.itemPreList[go].data = data @@ -166,7 +174,7 @@ function TailsManSouPanel:SetSingleData(go,data,index) self.itemPreList[go].slider.value = self.itemPreList[go].data.lv/self.itemPreList[go].data.maxLv self.itemPreList[go].progress.text = self.itemPreList[go].data.lv.."/"..self.itemPreList[go].data.maxLv self.itemPreList[go].red.gameObject:SetActive(self:CheckRedPoint(self.itemPreList[go].data.trumpList)) - Util.SetParticleSortLayer(go,self.sortingOrder + 1) + for i = 1,math.max(#data.trumpList,#self.itemPreList[go].iconList) do if not data.trumpList[i] then self.itemPreList[go].iconList[i].go.gameObject:SetActive(false) @@ -174,7 +182,10 @@ function TailsManSouPanel:SetSingleData(go,data,index) self.itemPreList[go].iconList[i].go.gameObject:SetActive(true) self.itemPreList[go].iconList[i].icon.sprite = this.spLoader:LoadSprite(GetResourcePath(data.trumpList[i].config.Icon)) end + self.itemPreList[go].iconList[i].effecthong.gameObject:SetActive(data.trumpList[i].config.Quality == 6) + self.itemPreList[go].iconList[i].effectjin.gameObject:SetActive(data.trumpList[i].config.Quality == 5) end + Util.SetParticleSortLayer(go,self.sortingOrder + 1) Util.AddOnceClick(go,function() UIManager.OpenPanel(UIName.TailsmanSoulMainPanel,self.itemPreList[go].data.id) end) @@ -197,6 +208,8 @@ function TailsManSouPanel:OnSortingOrderChange() for k,v in pairs(self.itemPreList) do Util.SetParticleSortLayer(k,self.sortingOrder + 1) end + Util.SetParticleSortLayer(self.effectJin.gameObject,self.sortingOrder + 1) + Util.SetParticleSortLayer(self.effectHong.gameObject,self.sortingOrder + 1) end --界面关闭时调用(用于子类重写)