From 186b2ca0c3c8df9f02588af866f6c69b1a14d9c2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 2 Sep 2021 16:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=81=B5=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 --- .../Prefabs/UI/RoleInfo/RoleEquipPanel.prefab | 6 +++--- .../UI/RoleInfo/RoleEquipTreasureChangePopup.prefab | 4 ++-- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 +- .../MonsterCamp/FourElementMonsterCampPanel.lua | 12 +++++++----- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index c329acb603..2bca11d6d5 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -101983,10 +101983,10 @@ RectTransform: m_Father: {fileID: 224330976962607446} m_RootOrder: 1 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7270011539357970735 MonoBehaviour: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab index 248a994a4e..4c7172ee0e 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab @@ -1612,7 +1612,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 400} + m_SizeDelta: {x: 800, y: 545} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5475895897133978284 MonoBehaviour: @@ -8706,7 +8706,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: 0, y: 199.99997} + m_AnchoredPosition: {x: 0, y: 261.0016} m_SizeDelta: {x: 800, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6137256389977648411 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 798d1c092c..a66b2577ee 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2556,7 +2556,7 @@ CompShowType = { d = 4, e = 5, f = 6, - fourElement = 7, + fourElement = 11, } --跨服玩法 diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index be6ddd1b18..f0472a84ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -137,8 +137,8 @@ end --界面打开时调用(用于子类重写) function FourElementMonsterCampPanel:OnOpen(index) + BindRedPointObject(redTrailType[curType],this.btnHelpFightRed) curType = index - BindRedPointObject(redTrailType[curType],this.btnHelpFightRed) this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.MonsterCamp }) end @@ -165,7 +165,9 @@ function FourElementMonsterCampPanel:OnShow() PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,waves) local propertyId = SacredTreeManager.GetUnLockNewProperty(waves) if propertyId > 0 then - UIManager.OpenPanel(UIName.RewardItemPopup,nil,nil,nil,CompShowType.fourElement,nil,nil,nil,propertyId) + Timer.New(function() + UIManager.OpenPanel(UIName.RewardItemPopup,nil,nil,nil,CompShowType.fourElement,nil,nil,nil,propertyId) + end,0.2):Start() local power = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) if power - MonsterCampManager.oldpower > 0 then UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = MonsterCampManager.oldpower,newValue = power}) @@ -200,13 +202,13 @@ function this.InitMonsterShow() end --界面关闭时调用(用于子类重写) -function FourElementMonsterCampPanel:OnClose() - ClearRedPointObject(redTrailType[curType],this.btnHelpFightRed) +function FourElementMonsterCampPanel:OnClose() + ClearRedPointObject(redTrailType[curType],this.btnHelpFightRed) MonsterCampManager.CurOffsetIndex = -1 end --界面销毁时调用(用于子类重写) -function FourElementMonsterCampPanel:OnDestroy() +function FourElementMonsterCampPanel:OnDestroy() this.spLoader:Destroy() for k,v in pairs(this.singledataList) do v:OnDestroy()