From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/Battle/BattleManager.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Main/System/Battle/BattleManager.cs b/Main/System/Battle/BattleManager.cs
index 684a399..f32cf2d 100644
--- a/Main/System/Battle/BattleManager.cs
+++ b/Main/System/Battle/BattleManager.cs
@@ -675,7 +675,7 @@
//鍙戣繘鍏ユ垬鏂楀寘
private float lastTime = 0f;
private float turnCoolDown = 0.5f; // 鍐峰嵈鏃堕棿
- public void SendTurnFight(uint mapID, uint funcLineID = 0, byte tagType = 0, uint tagID = 0, uint[] valueList = null)
+ public void SendTurnFight(uint mapID, uint funcLineID = 0, byte tagType = 0, uint tagID = 0, uint[] valueList = null, bool showLoading = true)
{
// 杩炵画棰戠箒鍙戝寘锛岃Е鍙戞彁绀�
float currentTime = Time.time;
@@ -698,7 +698,7 @@
}
GameNetSystem.Instance.SendInfo(pack);
Debug.Log("鎴樻枟鏃跺簭 鍙戣捣 " + Time.time);
- if (mapID != 1)
+ if (mapID != 1 && showLoading)
{
UIManager.Instance.OpenWindowAsync<MapLoadingWin>().Forget();
}
--
Gitblit v1.8.0