From fc9c7d80b65e47440eb123076fb0ae4bce5412c1 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Tue, 2 Jul 2024 15:27:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BDroom=20manager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Formation/FormationPanelV2.prefab | 74 +++++++++---------- .../ManagedResources/~Lua/Common/Managers.lua | 2 +- .../~Lua/Modules/Login/LoginPanel.lua | 24 +++--- .../~Lua/Modules/Net/NetManager.lua | 4 +- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index 3f2683918d..732dac9c81 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -44551,7 +44551,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 180 + m_Spacing: 70 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -71003,20 +71003,20 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_LocalPosition.y + value: 43 objectReference: {fileID: 0} - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_LocalPosition.y - value: 43 + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -71268,20 +71268,20 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_LocalPosition.y + value: 43 objectReference: {fileID: 0} - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_LocalPosition.y - value: 43 + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -71533,20 +71533,20 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_LocalPosition.y + value: 43 objectReference: {fileID: 0} - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_LocalPosition.y - value: 43 + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -71798,20 +71798,20 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_LocalPosition.y + value: 43 objectReference: {fileID: 0} - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_LocalPosition.y - value: 43 + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -72063,20 +72063,20 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_LocalPosition.y + value: 43 objectReference: {fileID: 0} - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_LocalPosition.y - value: 43 + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -72328,20 +72328,20 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_LocalPosition.y + value: 43 objectReference: {fileID: 0} - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_LocalPosition.y - value: 43 + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} diff --git a/Assets/ManagedResources/~Lua/Common/Managers.lua b/Assets/ManagedResources/~Lua/Common/Managers.lua index a197436dc7..2639797c79 100644 --- a/Assets/ManagedResources/~Lua/Common/Managers.lua +++ b/Assets/ManagedResources/~Lua/Common/Managers.lua @@ -46,7 +46,7 @@ local ManagerNames = { "Map/MapManager", ----地图战斗数据管理 "MapFight/MapFightManager", - "MapFight/RoomManager", + --"MapFight/RoomManager", --新手引导 "Guide/GuideManager", --任务系统数据管理，任务系统从属于通用事件系统 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 424c06224a..765c277aa4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -771,18 +771,18 @@ function this.ExecuteLoading() end else UIManager.OpenPanelAsync(UIName.MainPanel, function() - if RoomManager.RoomAddress == nil or RoomManager.RoomAddress == "" then - RoomManager.IsMatch = 0 - elseif RoomManager.RoomAddress == "1" then - RoomManager.IsMatch = 1 - UIManager.OpenPanel(UIName.GMPanel) - PopupTipPanel.ShowTip(Language[11141]) - else - if RoomManager.CurRoomType == 1 then - Log("在房间里，需要重新获取房间游戏数据~~~~~~~~~~") - RoomManager.RoomReGetGameRequest(RoomManager.RoomAddress) - end - end + -- if RoomManager.RoomAddress == nil or RoomManager.RoomAddress == "" then + -- RoomManager.IsMatch = 0 + -- elseif RoomManager.RoomAddress == "1" then + -- RoomManager.IsMatch = 1 + -- UIManager.OpenPanel(UIName.GMPanel) + -- PopupTipPanel.ShowTip(Language[11141]) + -- else + -- if RoomManager.CurRoomType == 1 then + -- Log("在房间里，需要重新获取房间游戏数据~~~~~~~~~~") + -- RoomManager.RoomReGetGameRequest(RoomManager.RoomAddress) + -- end + -- end LoadingPanel.End() end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 02308c52c5..203044356e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -179,8 +179,8 @@ function this.PlayerInfoRequest(func) --临时初始化地图探索的静态数据 MapManager.InitAllMapPgData() -- WorkShopManager.UpdateWorkShopLvAndExp(msg.player.workLevel,msg.player.workExp) - RoomManager.CurRoomType = msg.player.curRoomType - RoomManager.RoomAddress = msg.player.roomAddreess + --RoomManager.CurRoomType = msg.player.curRoomType + --RoomManager.RoomAddress = msg.player.roomAddreess -- 精英怪数据 local suddBossId = msg.SuddenlyBossInfo.suddBossId