From 20e8880b3fc6b019b63e2db621fd824473277a98 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Mon, 9 Jun 2025 11:29:08 +0800 Subject: [PATCH] 1 --- .../Manager/DataDanMuSceneManager.cs | 48 +++++++------------ 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs index 1c72380a..c3a85b4b 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -63,7 +64,10 @@ namespace GameLogic { if (protCustMessageData.content.Contains("加入")) { - var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray(); + + //var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray(); + var number = protCustMessageData.content.Substring(2); + Log.Debug(number); if (number.Length == 0) { @@ -83,9 +87,7 @@ namespace GameLogic } else { - - int targetId = Random.Range(2, EventConts.MaxPlayerIds); - + int targetId = UnityEngine.Random.Range(2, EventConts.MaxPlayerIds); data = DataGameSceneManager.Instance.CreateUnitPlayerData(protCustMessageData, targetId - 1); // 二次容错 if (data == null) @@ -109,38 +111,20 @@ namespace GameLogic // } // //actor.AddUnitPlayer(data); //} - else + else if (int.TryParse(protCustMessageData.content, out int index)) { - - // 直接数字 - var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray(); - - if (number.Length == 0) + // 超过最大数 + if (index > EventConts.MaxPlayerIds) { - Log.Error("No digits found in content: {0}", protCustMessageData.content); - return; // or handle the error as needed + index = UnityEngine.Random.Range(2, EventConts.MaxPlayerIds); } - int targetId = -1; - if (int.TryParse(new string(number), out targetId)) - { - // 超过最大数 - if (targetId > EventConts.MaxPlayerIds) - { - targetId = Random.Range(2, EventConts.MaxPlayerIds); - } - data = DataGameSceneManager.Instance.CreateUnitPlayerData(protCustMessageData, targetId - 1); - // 二次容错 - if (data == null) - { - return; - } - - var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString()); - actor.AddPlayer(data); - - } + var actor = DataGameSceneManager.Instance.GetTeamActor(index.ToString()); + //actor.AddUnitPlayer(data); + data = DataGameSceneManager.Instance.CreateUnitPlayerData(protCustMessageData, index); + actor.AddPlayer(data); + return; } } @@ -153,7 +137,7 @@ namespace GameLogic if (data == null) { - int targetId = Random.Range(2, EventConts.MaxPlayerIds); + int targetId = UnityEngine.Random.Range(2, EventConts.MaxPlayerIds); data = DataGameSceneManager.Instance.CreateUnitPlayerData(protCustMessageData, targetId - 1); // 二次容错