diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs
index d33b1f1c..1c72380a 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs
@@ -61,90 +61,85 @@ namespace GameLogic
 
             if (data == null)
             {
-                // 没有加入过阵营
-                if (data.teamId == "-1")
+                if (protCustMessageData.content.Contains("加入"))
                 {
-                    // 指令集操作
-                    if (protCustMessageData.content.Contains("加入"))
+                    var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray();
+
+                    if (number.Length == 0)
                     {
-                        var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray();
-
-                        if (number.Length == 0)
+                        // 检查是否输入姓氏
+                        foreach (var surname in DataGameSceneManager.Instance.m_Strs)
                         {
-                            // 检查是否输入姓氏
-                            foreach (var surname in DataGameSceneManager.Instance.m_Strs)
-                            {
-                                if (protCustMessageData.content.Contains(surname))
-                                {
-                                    int index = DataGameSceneManager.Instance.m_Strs.IndexOf(surname);
-                                    var actor = DataGameSceneManager.Instance.GetTeamActor(index.ToString());
-                                    //actor.AddUnitPlayer(data);
-                                    data = DataGameSceneManager.Instance.CreateUnitPlayerData(protCustMessageData, index);
-                                    actor.AddPlayer(data);
-                                    return;
-                                }
-                            }
-                        }
-                        else
-                        {
-
-                            int targetId = Random.Range(2, EventConts.MaxPlayerIds);
-
-                            data = DataGameSceneManager.Instance.CreateUnitPlayerData(protCustMessageData, targetId - 1);
-                            // 二次容错
-                            if (data == null)
+                            if (protCustMessageData.content.Contains(surname))
                             {
+                                int index = DataGameSceneManager.Instance.m_Strs.IndexOf(surname);
+                                var actor = DataGameSceneManager.Instance.GetTeamActor(index.ToString());
+                                //actor.AddUnitPlayer(data);
+                                data = DataGameSceneManager.Instance.CreateUnitPlayerData(protCustMessageData, index);
+                                actor.AddPlayer(data);
                                 return;
                             }
-
-                            var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
-                            actor.AddPlayer(data);
                         }
-
                     }
-                    //else if (protCustMessageData.content.Contains("666"))
-                    //{
-                    //    int targetId = Random.Range(1, EventConts.MaxPlayerIds);
-                    //    var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
-                    //    if (actor == null)
-                    //    {
-                    //        Log.Error("没有获取到实体玩家,tid = {0}", targetId);
-                    //        return;
-                    //    }
-                    //    //actor.AddUnitPlayer(data);
-                    //}
                     else
                     {
 
-                        // 直接数字
-                        var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray();
+                        int targetId = Random.Range(2, EventConts.MaxPlayerIds);
 
-                        if (number.Length == 0)
+                        data = DataGameSceneManager.Instance.CreateUnitPlayerData(protCustMessageData, targetId - 1);
+                        // 二次容错
+                        if (data == null)
                         {
-                            Log.Error("No digits found in content: {0}", protCustMessageData.content);
-                            return; // or handle the error as needed
+                            return;
                         }
-                        int targetId = -1;
 
-                        if (int.TryParse(new string(number), out targetId))
+                        var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
+                        actor.AddPlayer(data);
+                    }
+
+                }
+                //else if (protCustMessageData.content.Contains("666"))
+                //{
+                //    int targetId = Random.Range(1, EventConts.MaxPlayerIds);
+                //    var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
+                //    if (actor == null)
+                //    {
+                //        Log.Error("没有获取到实体玩家,tid = {0}", targetId);
+                //        return;
+                //    }
+                //    //actor.AddUnitPlayer(data);
+                //}
+                else
+                {
+
+                    // 直接数字
+                    var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray();
+
+                    if (number.Length == 0)
+                    {
+                        Log.Error("No digits found in content: {0}", protCustMessageData.content);
+                        return; // or handle the error as needed
+                    }
+                    int targetId = -1;
+
+                    if (int.TryParse(new string(number), out targetId))
+                    {
+                        // 超过最大数
+                        if (targetId > EventConts.MaxPlayerIds)
                         {
-                            // 超过最大数
-                            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);
-
+                            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);
+
                     }
                 }
             }
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
index fa510137..5c68aef6 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
@@ -1350,6 +1350,7 @@ namespace GameLogic
 
             if (m_GameTimerLen <= 0)
             {
+                isGaunJunShiKe = false;
                 // 游戏结束
                 OnRestGame();
             }
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
index b10c7b0c..96c3ac05 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
@@ -456,11 +456,11 @@ namespace GameLogic
                         return;
                     }
 
-                    m_rectBgList.GetChild(teamId).gameObject.SetActive(true);
-                    m_rectSdx.GetChild(teamId).gameObject.SetActive(true);
-                    m_rectSceneFx.GetChild(teamId).gameObject.SetActive(true);
-                    m_rectSpeed.GetChild(teamId).gameObject.SetActive(true);
-                    m_rectTopFx.GetChild(teamId).gameObject.SetActive(true);
+                    m_rectBgList.GetChild(teamId-1).gameObject.SetActive(true);
+                    m_rectSdx.GetChild(teamId-1).gameObject.SetActive(true);
+                    m_rectSceneFx.GetChild(teamId - 1).gameObject.SetActive(true);
+                    m_rectSpeed.GetChild(teamId - 1).gameObject.SetActive(true);
+                    m_rectTopFx.GetChild(teamId - 1).gameObject.SetActive(true);
 
 
                     // 替换UI图
@@ -593,7 +593,7 @@ namespace GameLogic
         {
             //m_img_BT.sprite = GameModule.Resource.LoadAsset<Sprite>(string.Format("zjm_{0}_BT", DataGameSceneManager.Instance.m_TeamId + 1));
             //m_img_BT.SetNativeSize();
-            m_img_BT.material = GameModule.Resource.LoadAsset<Material>(string.Format("Main_UI_Top{0}", DataGameSceneManager.Instance.m_TeamId + 1));
+            m_img_BT.material = GameModule.Resource.LoadAsset<Material>(string.Format("Main_UI_Top{0}", DataGameSceneManager.Instance.m_TeamId));
         }
 
         /// <summary>
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameMainForm.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameMainForm.cs
index 907ec241..a68bd815 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameMainForm.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameMainForm.cs
@@ -50,7 +50,7 @@ namespace GameLogic
             switch (gameLenTiemrId)
             {
                 case 0:
-                    EventConts.gameLenTiemr = 10 * 60;
+                    EventConts.gameLenTiemr = 2 * 60;
                     break;
                 case 1:
                     EventConts.gameLenTiemr = 20 * 60;