From ef79b7871e25c33d6d6916a7e37ec887862fcabd Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Mon, 29 Apr 2024 18:01:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleInfoLayout.prefab | 2 +- .../~Lua/Modules/Fight/FightPointPassMainPanel.lua | 6 ++++-- .../~Lua/Modules/Gem/SmallSoldierInfoPanel.lua | 2 ++ .../~Lua/Modules/Gem/SmallSoldierManager.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab index eb02d4d201..5d8182948a 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab @@ -4958,7 +4958,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: -955.8} + m_AnchoredPosition: {x: 0, y: -784} m_SizeDelta: {x: 954, y: 562.30005} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2781343876037430039 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 46e9cf3361..87aa9acf6f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -834,7 +834,7 @@ function this.BattleLogic() --end end curAttack=allAttacck - LogError("curAttack======================================="..allAttacck) + --LogError("curAttack======================================="..allAttacck) --this.hpBar.fillAmount=bossHp/curSoliderStageConfig.Hp --this.SetHp(curSoliderStageConfig.Hp,bossHp,curSoliderStageConfig.HpNumber) cd=0 @@ -1057,18 +1057,20 @@ function FightPointPassMainPanel:OnOpen(func) end end function FightPointPassMainPanel:OnFocus() + GuideManager.CheckFuncGuide() local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FirstRecharge) if activityId and activityId~=0 and ActTimeCtrlManager.SingleFuncState(1) then this.btnFirstRechar:SetActive(true) else this.btnFirstRechar:SetActive(false) end - GuideManager.CheckFuncGuide() + end -- 从战斗出来会加载两次 function FightPointPassMainPanel:OnShow() + GuideManager.CheckFuncGuide() --LogError("SmallSoldierManager.changeSolider.type=========="..SmallSoldierManager.changeSolider.type) this.RefreshSoliderInfo() this.BattleLogic() diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierInfoPanel.lua index 0419182d4c..1c51405a61 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierInfoPanel.lua @@ -97,6 +97,8 @@ function SmallSoldierInfoPanel:BindEvent() else sureFunc() end + else + sureFunc() end diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierManager.lua b/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierManager.lua index d18633a01c..af22f272ed 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierManager.lua @@ -90,7 +90,7 @@ function this.InitData(msg) cd=lvConfig.Time bossHp=lvConfig.Hp if PlayerPrefs.GetInt("SmallSoldierFailed"..PlayerManager.uid)~=FightPointPassManager.soldierLayerId then - if not GuideManager.IsInMainGuide() and UIManager.GetOpenPanel(UIName.BattlePanel)==nil then + if not GuideManager.IsInMainGuide() and UIManager.GetOpenPanel(UIName.BattlePanel)==nil and UIManager.GetOpenPanel(UIName.BattleWinPopup)==nil then UIManager.OpenPanel(UIName.SmallSoldierFailPop) end PlayerPrefs.SetInt("SmallSoldierFailed"..PlayerManager.uid,FightPointPassManager.soldierLayerId) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index ad1ed3df89..ee775d46b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -932,7 +932,7 @@ end function this:OnSortingOrderChange() --LogError("CheckFuncGuide()==============================================检测引导") - + GuideManager.CheckFuncGuide() -- self.sceneTran.gameObject:GetComponent("Canvas").sortingOrder = self.sortingOrder - 4 -- Util.GetGameObject(self.sceneTran.gameObject, "layer7"):GetComponent("Canvas").sortingOrder = self.sortingOrder - 3 this.npcRoot:GetComponent("Canvas").sortingOrder = self.sortingOrder - 2