diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua index 7b5acfbe7a..710d8f5efe 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua @@ -240,6 +240,11 @@ end --打开面板 function UIManager.OpenPanel(id, ...) + -- 如果是 + if id == UIName.BattlePanel and this.IsOpen(UIName.BattlePanel) then + LogError("战斗界面重复打开!!") + return + end return UIManager.GetPanel(id, true, nil, ...) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua index ec96d662f4..44dd1c8691 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua @@ -204,7 +204,7 @@ function RoleView.New(go, role, position, root) instance.rageSlider = Util.GetGameObject(go, "rageProgress/rage"):GetComponent("Image") instance.rageText = Util.GetGameObject(go, "rageProgress/Text"):GetComponent("Text") instance.effect_rage = Util.GetGameObject(go, "rageProgress/effect") - instance.effect_dead:SetActive(instance.role.Rage >= 4) + instance.effect_rage:SetActive(instance.role.Rage >= 4) instance.rageSlider.fillAmount = instance.role.Rage / 4 instance.rageText.gameObject:SetActive(false) instance.rageText.text = "" @@ -800,7 +800,10 @@ function RoleView:OnSkillCast(skill) if self.rlgTween3 then self.rlgTween3:Kill() end self.rlgTween3 = self.RoleLiveGO.transform:DOLocalMove(Vector3.New(self.outOffset[1], self.outOffset[2] - 220, 0), 0.3, false):SetEase(Ease.OutSine) if self.liveRender then - self.liveRender.transform:SetParent(Util.GetGameObject(self.GameObject, "Mask2").transform) + local mask2 = Util.GetGameObject(self.GameObject, "Mask2") + if mask2 then + self.liveRender.transform:SetParent(mask2.transform) + end end local cardRenderMat = self.liveRender.material cardRenderMat:SetInt("_IsMask", 0)