From 93a94731840b6eafd394ae93d01e306e3580a3d4 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 28 Jul 2021 16:52:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E7=82=B9=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RoleInfo/EquipTreasureStrongPopup.prefab | 20 +++++++++---------- .../Prefabs/UI/RoleInfo/RoleEquipPanel.prefab | 12 +++++------ .../RoleEquipTreasureChangePopup.prefab | 10 +++++----- .../RoleInfo/EquipTreasureStrongPopup.lua | 8 +++++--- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 5 ++++- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab index d25595ddc2..c5493b186d 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab @@ -1044,8 +1044,8 @@ RectTransform: 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: 93.56, y: -36.02} - m_SizeDelta: {x: 224.68, y: 86.51} + m_AnchoredPosition: {x: 93.56, y: -23.842} + m_SizeDelta: {x: 224.68, y: 110.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &903598582962903888 CanvasRenderer: @@ -1163,8 +1163,8 @@ RectTransform: 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: -98.12, y: -36.02} - m_SizeDelta: {x: 221.56, y: 86.51} + m_AnchoredPosition: {x: -98.12, y: -23.843} + m_SizeDelta: {x: 221.56, y: 110.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4663026695833607491 CanvasRenderer: @@ -2628,7 +2628,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -277, y: -1746} - m_SizeDelta: {x: 224.68, y: 96.2} + m_SizeDelta: {x: 224.68, y: 110.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8899086003853839299 CanvasRenderer: @@ -2741,7 +2741,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.9490196, g: 0.91764706, b: 0.7882353, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2944,7 +2944,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 456.4, y: 0} m_SizeDelta: {x: 912.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3795659575372293691 @@ -2979,7 +2979,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 0 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -3018,8 +3018,8 @@ RectTransform: 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: -2.1, y: -36.5} - m_SizeDelta: {x: 926.2, y: 118.1} + m_AnchoredPosition: {x: -2.1, y: -22.4} + m_SizeDelta: {x: 926.2, y: 146.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7910508246414614372 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index a05eea9057..59172ea116 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -7635,11 +7635,11 @@ RectTransform: - {fileID: 8774495478651919640} - {fileID: 224079165133665220} - {fileID: 2741045372675118090} - - {fileID: 68852558248628701} - {fileID: 1660503546251682612} - {fileID: 605647442647711863} - {fileID: 1978998900481182243} - {fileID: 8180161487852970196} + - {fileID: 68852558248628701} m_Father: {fileID: 224330976962607446} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -82402,7 +82402,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224346866425234302} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -164777,7 +164777,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224346866425234302} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -179197,7 +179197,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224346866425234302} - m_RootOrder: 5 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -184570,7 +184570,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224346866425234302} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -196976,7 +196976,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224346866425234302} - m_RootOrder: 7 + 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/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab index d0e1d8e741..9a11970092 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab @@ -36,7 +36,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 400, y: 50.477} + m_SizeDelta: {x: 370, y: 50.477} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &802499989 CanvasRenderer: @@ -5606,10 +5606,10 @@ RectTransform: m_Father: {fileID: 802499987} m_RootOrder: 0 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: -77.77, y: -0.11924} - m_SizeDelta: {x: 244.46, y: 50.24} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 114.73, y: -0.11924} + m_SizeDelta: {x: 229.46, y: 50.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1193572887044614810 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua index 055c7957cf..e94f506c49 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua @@ -190,6 +190,7 @@ function EquipTreasureStrongPopup:RefreshRedPoint(delta,isRefreshTabRed) this.selectText.text = type == 1 and "强 化" or "精 炼" this.select.transform.localScale = Vector3.one this.select.gameObject:SetActive(true) + this.select.transform:SetSiblingIndex(1) end,delta):Start() if isRefreshTabRed then local redDataStrong ,redDataRefine = false,false @@ -295,8 +296,9 @@ function EquipTreasureStrongPopup:SetScrollPre(go,data,_index) name:GetComponent("Text").text = HeroManager.GetSingleHeroData(data.upHeroDid).heroConfig.ReadingName Util.AddOnceClick(btn,function() this.select.transform:SetParent(go.transform) - this.select:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(-8.5,6.8,0) + this.select:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(-8.5,5.04,0) this.select.gameObject:SetActive(true) + this.select.transform:SetSiblingIndex(1) curEquipData = data curIndex = go this:SetWindShow(type,0) @@ -326,7 +328,7 @@ function EquipTreasureStrongPopup:SetWindShow(_index,delta) propertyShow = EquipTreasureManager.GetCurrLvAndNextLvPropertyValue(1,curEquipData.levelPool,curEquipData.lv) --显示消耗 items = HeroManager.GetCostItems(curEquipData.idDyn,curEquipData.strongConfig) - if curEquipData.quality == 6 then + if curEquipData.quantity == 6 then this.hintTxt.text = "强化等级已达上限" else this.hintTxt.text = Language[11778] @@ -348,7 +350,7 @@ function EquipTreasureStrongPopup:SetWindShow(_index,delta) end propertyShow = EquipTreasureManager.GetCurrLvAndNextLvPropertyValue(2,curEquipData.refinePool,curEquipData.refineLv) items = HeroManager.GetCostItems(curEquipData.idDyn,curEquipData.refineConfig) - if curEquipData.quality == 6 then + if curEquipData.quantity == 6 then this.hintTxt.text = "精炼等级已达上限" else this.hintTxt.text=Language[11782] diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 5bdd9a86ba..89dc556cbb 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -527,6 +527,7 @@ function this:AllEquipDownBtnOnClick() end PlaySoundWithoutClick(SoundConfig.Sound_TakeOff) this.ShowHeroEquip() + this.CheckRedTab() end function this.ShowHeroEquip() @@ -887,7 +888,7 @@ function this.SingleItemDataShow(_go, _itemData) if curHeroCanUpEquipTabs and #curHeroCanUpEquipTabs > 0 then local isShow = false for i = 1, #curHeroCanUpEquipTabs do - if curHeroCanUpEquipTabs[i] == _itemData.idDyn then + if curHeroCanUpEquipTabs[i] == _itemData.id then isShow = true end end @@ -1107,6 +1108,8 @@ end function this.CheckRedTab() for i = 1,#redTabs do if i < 5 then + local allEquip = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession, i) + this:SortEquipDatas(allEquip) local showRed = false if curHeroCanUpEquipTabs and #curHeroCanUpEquipTabs > 0 then for j = 1,#curHeroCanUpEquipTabs do