diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index ce7ef1c8c6..e6c9808ca0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -599,12 +599,12 @@ RectTransform: - {fileID: 7976777090345002985} - {fileID: 7976777089625316357} - {fileID: 7976777089671548419} - m_Father: {fileID: 7682634954648963246} - m_RootOrder: 13 + m_Father: {fileID: 1072833264322135079} + m_RootOrder: 17 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: 1355, y: 174} + m_AnchoredPosition: {x: 257, y: 320} m_SizeDelta: {x: 300, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1586863083 @@ -13720,7 +13720,7 @@ 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: 377, y: 427} + m_AnchoredPosition: {x: 435, y: 488} m_SizeDelta: {x: 300, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6051061268542503837 @@ -23433,7 +23433,7 @@ 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, y: 191} + m_AnchoredPosition: {x: 98, y: 133} m_SizeDelta: {x: 300, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3840882077209159326 @@ -44947,7 +44947,6 @@ RectTransform: - {fileID: 5749431481947614733} - {fileID: 1631121790323343848} - {fileID: 7975778528748521356} - - {fileID: 1586863079} - {fileID: 1741493654907866535} - {fileID: 3578757564134258929} m_Father: {fileID: 1473827928010218247} @@ -67045,7 +67044,7 @@ RectTransform: - {fileID: 4261583465330808747} - {fileID: 259620261269998925} m_Father: {fileID: 7682634954648963246} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -68203,7 +68202,7 @@ RectTransform: - {fileID: 1449823918479400147} - {fileID: 4727936823561651707} m_Father: {fileID: 7682634954648963246} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -80563,6 +80562,7 @@ RectTransform: - {fileID: 5002586775546102601} - {fileID: 915627652} - {fileID: 6762574921092838611} + - {fileID: 1586863079} m_Father: {fileID: 1473827928010218247} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 8e8bb7eb54..f911ac85ff 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -33112,7 +33112,7 @@ 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: -18.5, y: -165} + m_AnchoredPosition: {x: 0, y: -165} m_SizeDelta: {x: 289, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1311794813696684337 diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua index 707e1f9aa7..6143126f94 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua @@ -311,7 +311,7 @@ local POS = { function this.SetButtonPosition(Obj) local objList = {} for i = 1, Obj.transform.childCount do - LogRed(tostring(Obj.transform:GetChild(i-1).gameObject.activeInHierarchy)) + -- LogRed(tostring(Obj.transform:GetChild(i-1).gameObject.activeInHierarchy)) if Obj.transform:GetChild(i-1).gameObject.activeInHierarchy then table.insert(objList,Obj.transform:GetChild(i-1).gameObject) end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 9160d5bb0c..f4ee894b28 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -154,7 +154,7 @@ function this:InitComponent() this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi") this.btnWaiDi:SetActive(false) --家园 - this.btnHomeLand = Util.GetGameObject(this.gameObject, "scene/layer6/btnHomeLand") + this.btnHomeLand = Util.GetGameObject(this.gameObject, "scene/layer4/btnHomeLand") this.btnHomeLand:SetActive(true) --跨服 this.btnJumpServer = Util.GetGameObject(this.gameObject, "scene/layer4/btnJumpServer") @@ -165,7 +165,7 @@ function this:InitComponent() [FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50), [FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -1100), [FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200), - [FUNCTION_OPEN_TYPE.HOMELAND] = this:AddFuncItem(this.btnHomeLand, -1500), + [FUNCTION_OPEN_TYPE.HOMELAND] = this:AddFuncItem(this.btnHomeLand, -200), [FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200), [FUNCTION_OPEN_TYPE.RECURITY] = this:AddFuncItem(this.btnRecruit, -56), --[FUNCTION_OPEN_TYPE.ELEMENT_RECURITY] = this:AddFuncItem(this.btnElementDrawCard, 0), diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HomeLandEquip.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HomeLandEquip.lua index 44a1d31663..aa74b7c41e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HomeLandEquip.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HomeLandEquip.lua @@ -129,15 +129,20 @@ function this:SetData() --设置消耗 local limit = EquipStrengthen[HomeLandManager.EquipData[curIndex].Id].Limit local cost = EquipStrengthen[HomeLandManager.EquipData[curIndex].Id].Cost - -- local color1 = HomeLandManager.BuildData[limit[1]].level >= limit[2] and "#FFEED6" or "red" - -- this.costCondition.text = string.format("%s到达%s级",color1,HomeLand[limit[1]].Name,limit[2]) - this.costCondition.text = HomeLandManager.BuildData[limit[1]].level >= limit[2] and "" or string.format("%s到达%s级",HomeLand[limit[1]].Name,limit[2]) - this.costIcon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(cost[1][1])) - local color2 = BagManager.GetTotalItemNum(cost[1][1]) >= cost[1][2] and "#FFEED6" or "red" - this.costNum.text = string.format("%s",color2,cost[1][2]) + if HomeLandManager.BuildData[limit[1]].level >= limit[2] then + this.costCondition.text = "" + this.costIcon.gameObject:SetActive(true) + this.costNum.gameObject:SetActive(true) + this.costIcon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(cost[1][1])) + local color2 = BagManager.GetTotalItemNum(cost[1][1]) >= cost[1][2] and "#FFEED6" or "red" + this.costNum.text = string.format("%s",color2,cost[1][2]) + else + this.costIcon.gameObject:SetActive(false) + this.costNum.gameObject:SetActive(false) + this.costCondition.text = string.format("%s到达%s级",HomeLand[limit[1]].Name,limit[2]) + end --按钮和tips显示 - local bool = HomeLandManager.GetCurIndexBtnsShow() -- LogBlue("bool:"..tostring(bool)) this.Btn1:SetActive(bool)