diff --git a/Assets/Framework/Tool/UITool/SubUIManager.cs b/Assets/Framework/Tool/UITool/SubUIManager.cs index 7426a115f..ead38db70 100644 --- a/Assets/Framework/Tool/UITool/SubUIManager.cs +++ b/Assets/Framework/Tool/UITool/SubUIManager.cs @@ -93,7 +93,26 @@ public class SubUIManager } } + /// + /// 这里使用C#的异步所以操作建议在onshown中进行要不然外面的函数要加异步 + /// + /// + /// + /// + public async void ShowAsync(UIPanel type, System.Action args) + { + if (addressMap.ContainsKey(type)) + { + args?.Invoke(); + UIBase uIBase = await LoadAndShowAsync(type, addressMap[type], null); + } + else + { + Debug.LogError("当前页面不存在"); + } + + } private async Task LoadAndShowAsync(UIPanel type, string address, object args = null) { if (panels.TryGetValue(type, out var existing) && existing != null) diff --git a/Assets/MyGame/Scripts/Net/APIManager.cs b/Assets/MyGame/Scripts/Net/APIManager.cs index aa755d85b..337430b5d 100644 --- a/Assets/MyGame/Scripts/Net/APIManager.cs +++ b/Assets/MyGame/Scripts/Net/APIManager.cs @@ -363,7 +363,7 @@ namespace Assets.MyGame.Scripts.Net #endif //这里之后补弹窗 - UIManager.Instance.ShowBoardError("错误代码:" + code + "错误信息:" + message); + UIManager.Instance.ShowBoardError(message); } } } diff --git a/Assets/MyGame/Scripts/Net/WebSocketManager.cs b/Assets/MyGame/Scripts/Net/WebSocketManager.cs index 0a1b31df0..4a077f9d9 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketManager.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketManager.cs @@ -214,9 +214,9 @@ namespace Assets.MyGame.Scripts.Net #if UNITY_EDITOR Debug.LogWarning($"[WebSocket] {type} 未连接,无法发送消息" + msg); + UIManager.Instance.ShowBoardError($"[WebSocket] {type} 未连接,无法发送消息"); #endif - UIManager.Instance.ShowBoardError($"[WebSocket] {type} 未连接,无法发送消息"); } } diff --git a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs index 36e206129..7c9f8a77f 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs @@ -583,7 +583,7 @@ namespace Assets.MyGame.Scripts.Net string roomName = GameManager.Instance.gameData.currRoomData?.roomName ?? ""; string roomLevel = GameManager.Instance.gameData.currRoomData?.roomLevel.ToString() ?? ""; string msgText = $"恭喜用户{userName} 在 {roomName} {roomLevel}场 捕获了{fishId}*{gold}倍"; - UIManager.Instance.ShowBoardGongGao(msgText); + //UIManager.Instance.ShowBoardGongGao(msgText); } break; diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/2CreateRoom.prefab b/Assets/MyGame/aa/UI/Game/ChineseChess/2CreateRoom.prefab index 740d91808..158ec6696 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/2CreateRoom.prefab +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/2CreateRoom.prefab @@ -2576,6 +2576,7 @@ MonoBehaviour: toggle_Black: {fileID: 4300691433647707251} tMPInput_Password: {fileID: 5686063089244421633} TiShi: {fileID: 6026358677931071003} + btn_VIP: {fileID: 6523045360275411240} --- !u!1 &6814235304022214699 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessCreateRoom.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessCreateRoom.cs index 510b18594..e9801b6bb 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessCreateRoom.cs +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessCreateRoom.cs @@ -83,10 +83,18 @@ public class UIChineseChessCreateRoom : SubUIBase } public GameObject TiShi; + public Button btn_VIP; public void ShowTiShi() { TiShi.SetActive(true); + btn_VIP.onClick.AddListener(() =>{ + + uIManager.Get(UIPanel.HomeMainPanel)?.uIManager.ShowAsync(UIPanel.ShopPanel, () => + { + uIManager.Close(UIPanel.MainGamePanelZGXQ); + }); + }); } } diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs index 796e15b22..d612277a5 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs @@ -85,7 +85,7 @@ public class UIHome_BY_SelectRoomLevelPanel : SubUIBase { HideTiShi(); UIManager.Instance.Get(UIPanel.HomeMainPanel) - .subUIManager.ShowAsync(UIPanel.ShopPanel, ShopTab.Diamond); + .subUIManager.ShowAsync(UIPanel.ShopPanel, ShopTab.VipExp); }); } diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs index 13939876c..60c3a8eb1 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs @@ -83,7 +83,7 @@ public class UIHome_BY_ShopPanel : SubUIBase { APIRequestList.BuyGold(new BuyGoldParam { number = item.number, count = 1 }, (response) => { - UIManager.Instance.ShowBoardError(response); + UIManager.Instance.ShowBoardError("购买成功"); APIRequestList.GetUser(GameManager.Instance.user.id, (a) => { GameManager.Instance.UpdataUserData(a); @@ -130,7 +130,8 @@ public class UIHome_BY_ShopPanel : SubUIBase { APIRequestList.BuyGold(new BuyGoldParam { number = item.number, count = 1 }, (response) => { - UIManager.Instance.ShowBoardError(response); + UIManager.Instance.ShowBoardError("购买成功"); + APIRequestList.GetUser(GameManager.Instance.user.id, (a) => { GameManager.Instance.UpdataUserData(a); @@ -179,7 +180,8 @@ public class UIHome_BY_ShopPanel : SubUIBase { APIRequestList.BuyDiamond(new BuyDiamondParam { number = item.number, count = 1 }, (response) => { - UIManager.Instance.ShowBoardError(response); + UIManager.Instance.ShowBoardError("购买成功"); + APIRequestList.GetUser(GameManager.Instance.user.id, (a) => { GameManager.Instance.UpdataUserData(a); @@ -227,7 +229,8 @@ public class UIHome_BY_ShopPanel : SubUIBase { APIRequestList.BuyProp(new BuyPropParam { propNumber = item.number, count = 1 }, (response) => { - UIManager.Instance.ShowBoardError(response); + UIManager.Instance.ShowBoardError("购买成功"); + APIRequestList.GetUser(GameManager.Instance.user.id, (a) => { GameManager.Instance.UpdataUserData(a); @@ -269,7 +272,8 @@ public class UIHome_BY_ShopPanel : SubUIBase { APIRequestList.BuyProp(new BuyPropParam { propNumber = item.number, count = 1 }, (response) => { - UIManager.Instance.ShowBoardError(response); + UIManager.Instance.ShowBoardError("购买成功"); + APIRequestList.GetUser(GameManager.Instance.user.id, (a) => { GameManager.Instance.UpdataUserData(a); @@ -320,7 +324,8 @@ public class UIHome_BY_ShopPanel : SubUIBase { APIRequestList.BuyProp(new BuyPropParam { propNumber = item.number, count = 1 }, (response) => { - UIManager.Instance.ShowBoardError(response); + UIManager.Instance.ShowBoardError("购买成功"); + APIRequestList.GetUser(GameManager.Instance.user.id, (a) => { GameManager.Instance.UpdataUserData(a);