From 0b4cfe3a7497e3b3a3efcd68100ef85e2bc161c8 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 12 Jan 2022 14:35:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index a40bf3c7c2..10b69ba6c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -67,6 +67,7 @@ function RoleInfoLayout:InitComponent() this.posInfo = Util.GetGameObject(this.posBtn,"PosInfo"):GetComponent("Text") this.proTip = Util.GetGameObject(self.gameObject,"content/pro/tishi") this.skillGrid=Util.GetGameObject(self.gameObject,"content/skill") + this.skillGridCanvas = this.skillGrid:GetComponent("Canvas") this.selsectSkillImage=Util.GetGameObject(this.skillGrid,"selsectSkillImage") this.skillList = {} for i = 1,6 do @@ -189,6 +190,7 @@ function this.SkillInfoPopupClose(panelType, p) if panelType == UIName.SkillInfoPopup and this.skillPanel == p then --监听到SkillInfoPopup关闭,把层级设回去 this.selsectSkillImage:SetActive(false) this.skillPanel = nil + this.skillGridCanvas.sortingOrder = this.sortingOrder + 1 end end @@ -370,6 +372,7 @@ end --单个技能显示 function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills) + this.skillGridCanvas.sortingOrder = this.sortingOrder + 1 this.skillData = this.GetSkillsData() for i = 1,math.max(#this.skillList,#this.skillData) do this.skillList[i].icon.gameObject:GetComponent("Button").onClick:RemoveAllListeners() @@ -415,6 +418,7 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills local awakenSkillList = this.GetAwakenSkill() this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId),awakenSkillList[i-2]) end + this.skillGridCanvas.sortingOrder = this.skillPanel.sortingOrder + 1 end) end end From 1e1e697ba4c40c7101d6de9665da58d110465eaa Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 12 Jan 2022 14:40:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A2=84=E8=AE=BE=E6=BC=8F=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleInfoLayout.prefab | 46 +++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab index 53f4a231b9..8907d0dc97 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab @@ -6586,9 +6586,9 @@ RectTransform: m_Father: {fileID: 5306787189736440502} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 58, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 58, y: -71.175} m_SizeDelta: {x: 0, y: 101} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6149476631504047147 @@ -9638,6 +9638,8 @@ GameObject: m_Component: - component: {fileID: 8121286746226876291} - component: {fileID: 8124780028357906616} + - component: {fileID: 5488706725289087337} + - component: {fileID: 1417515970342626066} m_Layer: 5 m_Name: skill m_TagString: Untagged @@ -9696,6 +9698,44 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!223 &5488706725289087337 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8335544241066286179} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1417515970342626066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8335544241066286179} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &8335999088447926411 GameObject: m_ObjectHideFlags: 0 From 05e078dadc79d00bcf87351fcc5ac54b9580177d Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 12 Jan 2022 15:27:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=A2=E7=B4=A2=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SizeFitterPopup_ExploreSelectFormation.lua | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua index c3e4282990..4fcee4ea1b 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua @@ -199,15 +199,20 @@ function this:Refresh(_data,_item) if #formation.teamHeroInfos < 1 then else - if FormationManager.GetFormationPower(_data.formationId) > this.mapData.force then - --打开时间弹窗 + if GuideManager.IsFunctionGuideExist() then UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.SelectExploreTime,this.mapData,_data) - else - MsgPanel.ShowTwo("所选队伍战力小于推荐战力,是否仍要进行探索?", function()end, function() - --打开时间弹窗 - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.SelectExploreTime,this.mapData,_data) - end, "取消", "确定", "提示",false,"") - end + else + if FormationManager.GetFormationPower(_data.formationId) > this.mapData.force then + --打开时间弹窗 + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.SelectExploreTime,this.mapData,_data) + else + MsgPanel.ShowTwo("所选队伍战力小于推荐战力,是否仍要进行探索?", function()end, function() + --打开时间弹窗 + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.SelectExploreTime,this.mapData,_data) + end, "取消", "确定", "提示",false,"") + end + end + end end) end