diff --git a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab index e1c4e30032..792e947e97 100644 --- a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab @@ -35,9 +35,9 @@ RectTransform: m_Father: {fileID: 7783183355034074848} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 417.19995} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -542.80005} m_SizeDelta: {x: 0, y: 412} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &938386100 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index adfd0422d1..50ee22446c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -330,11 +330,17 @@ function CarbonsPanel:BtnClick(id) end UIManager.OpenPanel(UIName.DailyCarbonPanel) elseif id == FUNCTION_OPEN_TYPE.MONSTER_COMING then - if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.FourElementTrail) then + -- if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.FourElementTrail) then + -- UIManager.OpenPanel(UIName.MonsterCampMainPanel) + -- else + -- JumpManager.GoJump(1011) + -- end + if CheckFunctionOpen(FUNCTION_OPEN_TYPE.FourElementTrail) then UIManager.OpenPanel(UIName.MonsterCampMainPanel) else JumpManager.GoJump(1011) end + elseif id == FUNCTION_OPEN_TYPE.EXPEDITION then if ActTimeCtrlManager.SingleFuncState(id) then if #ExpeditionManager.nodeInfo <= 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua index 280f94affa..d84b3cea15 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua @@ -44,9 +44,9 @@ function this.RefreshFindTreasureRedPoint() if BagManager.GetItemCountById(FindTreasureManager.materialItemId) >= mazeTreasureMax then return true end - if this.GetShowFindTreasureVipRedPoint() then - return true - end + -- if this.GetShowFindTreasureVipRedPoint() then + -- return true + -- end return false end function this.SetShowFindTreasureVipRedPoint(isShow) @@ -55,6 +55,7 @@ function this.SetShowFindTreasureVipRedPoint(isShow) CheckRedPointStatus(RedPointType.SecretTer_FindTreasure) end function this.GetShowFindTreasureVipRedPoint() + if this.isShowFindTreasureVipRedPoint then local gaoState = PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.GoFindTreasure) local haoState = PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.HaoFindTreasure) diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index 217bd40d4f..7f443e7b60 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -82,8 +82,20 @@ function RankingSingleListPanel:BindEvent() end) for i=1,#this.signBtnList do Util.AddClick(this.signBtnList[i].btn,function() - this.GetRankInfo(sData.rankType,1,0) proType=i + local formation=FormationTypeDef.LuoFuZhengFeng1 + if proType==1 then + formation= FormationTypeDef.LuoFuZhengFeng1 + elseif proType==2 then + formation= FormationTypeDef.LuoFuZhengFeng2 + elseif proType==3 then + formation= FormationTypeDef.LuoFuZhengFeng3 + elseif proType==4 then + formation= FormationTypeDef.LuoFuZhengFeng4 + end + JumpServerManager.showRankType=formation + this.GetRankInfo(sData.rankType,1,0) + this.selectObj.transform:SetParent(this.signBtnList[i].btn.transform) this.selectObj.transform.localPosition = Vector3.zero end) @@ -119,6 +131,17 @@ function RankingSingleListPanel:OnOpen(_sData,_TabDataIndex,_tabData) if proType==0 then proType=1 end + local formation=FormationTypeDef.LuoFuZhengFeng1 + if proType==1 then + formation= FormationTypeDef.LuoFuZhengFeng1 + elseif proType==2 then + formation= FormationTypeDef.LuoFuZhengFeng2 + elseif proType==3 then + formation= FormationTypeDef.LuoFuZhengFeng3 + elseif proType==4 then + formation= FormationTypeDef.LuoFuZhengFeng4 + end + JumpServerManager.showRankType=formation this.selectObj.transform:SetParent(this.signBtnList[proType].btn.transform) this.selectObj.transform.localPosition = Vector3.zero end @@ -417,6 +440,7 @@ function this.InitRollingInfo(_root) info0.text="" return info0 end + --玩家信息弹窗 function this.AddPlayerInfoClick(root,uid,serverName) local clickBtn=Util.GetGameObject(root,"ClickBtn")