diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xunxianzhaomu.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xunxianzhaomu.png index 6171d2337c..541d55c256 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xunxianzhaomu.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xunxianzhaomu.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab index cb3d9b4323..16e5ab3191 100644 --- a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab @@ -9867,7 +9867,7 @@ PrefabInstance: - target: {fileID: 1083836935691712645, guid: a687f15a5cdfc2246b6ec0f891d4f7a5, type: 3} propertyPath: m_AnchoredPosition.y - value: -185 + value: -180 objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: a687f15a5cdfc2246b6ec0f891d4f7a5, type: 3} @@ -10242,7 +10242,7 @@ PrefabInstance: - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} propertyPath: m_AnchoredPosition.y - value: -185 + value: -180 objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} @@ -10367,7 +10367,7 @@ PrefabInstance: - target: {fileID: 1083836935691712645, guid: a687f15a5cdfc2246b6ec0f891d4f7a5, type: 3} propertyPath: m_AnchoredPosition.y - value: -185 + value: -180 objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: a687f15a5cdfc2246b6ec0f891d4f7a5, type: 3} @@ -10742,7 +10742,7 @@ PrefabInstance: - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} propertyPath: m_AnchoredPosition.y - value: -185 + value: -180 objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} @@ -10992,7 +10992,7 @@ PrefabInstance: - target: {fileID: 1083836935691712645, guid: a687f15a5cdfc2246b6ec0f891d4f7a5, type: 3} propertyPath: m_AnchoredPosition.y - value: -185 + value: -180 objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: a687f15a5cdfc2246b6ec0f891d4f7a5, type: 3} @@ -11117,7 +11117,7 @@ PrefabInstance: - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} propertyPath: m_AnchoredPosition.y - value: -185 + value: -180 objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} @@ -11242,7 +11242,7 @@ PrefabInstance: - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} propertyPath: m_AnchoredPosition.y - value: -185 + value: -180 objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} @@ -11617,7 +11617,7 @@ PrefabInstance: - target: {fileID: 1083836935691712645, guid: a687f15a5cdfc2246b6ec0f891d4f7a5, type: 3} propertyPath: m_AnchoredPosition.y - value: -185 + value: -180 objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: a687f15a5cdfc2246b6ec0f891d4f7a5, type: 3} @@ -12367,7 +12367,7 @@ PrefabInstance: - target: {fileID: 1083836935691712645, guid: a687f15a5cdfc2246b6ec0f891d4f7a5, type: 3} propertyPath: m_AnchoredPosition.y - value: -185 + value: -180 objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: a687f15a5cdfc2246b6ec0f891d4f7a5, type: 3} @@ -12617,7 +12617,7 @@ PrefabInstance: - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} propertyPath: m_AnchoredPosition.y - value: -185 + value: -180 objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua index 3ef4a8b54b..25ff3367f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua @@ -19,10 +19,10 @@ local fakeName = { [6] = "天级", } local effectName = { - [3] = "ui-tianmen-huang", - [4] = "ui-tianmen-zi", - [5] = "ui-tianmen-lan", - [6] = "ui-tianmen-lv", + [6] = "ui-tianmen-huang", + [5] = "ui-tianmen-zi", + [4] = "ui-tianmen-lan", + [3] = "ui-tianmen-lv", } --初始化组件(用于子类重写) function LingMaiMiJingPanel:InitComponent() @@ -222,6 +222,9 @@ function LingMaiMiJingPanel:SetVeins() end end) + for i = 3, 6 do + Util.GetGameObject(go,effectName[i]):SetActive(false) + end local effect1 = Util.GetGameObject(go,effectName[data.Quality]) Util.SetParticleSortLayer(effect1, self.sortingOrder + 1) effect1:SetActive(data.uid == PlayerManager.uid)