From f3b4a6331589ff092681169ce6fa7b8aa250c74d Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 11 十二月 2025 17:44:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Manager/StageManager.cs | 15 +++++++
Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs | 1
Main/Main.cs | 14 -------
Main/Core/NetworkPackage/GameNetSystem.cs | 40 +++++++++++++++----
Main/System/Chat/ChatBulletView.cs | 8 +++
5 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
index d0b878b..4a99d0a 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
@@ -16,6 +16,7 @@
GameNetSystem.Instance.netState = GameNetSystem.NetState.Connected;
GameNetSystem.Instance.SetIsWaitLoginMap(false);
+ GameNetSystem.Instance.SendCachePackage();
NetLinkWin.Hide();
if (LoginManager.Instance.reconnectBackGround)
diff --git a/Main/Core/NetworkPackage/GameNetSystem.cs b/Main/Core/NetworkPackage/GameNetSystem.cs
index 059ca0b..a0661a3 100644
--- a/Main/Core/NetworkPackage/GameNetSystem.cs
+++ b/Main/Core/NetworkPackage/GameNetSystem.cs
@@ -141,6 +141,27 @@
waitLoginMap = _wait;
}
+ public bool GetIsWaitLoginMap()
+ {
+ return waitLoginMap;
+ }
+
+ //0403鐧诲綍涔嬪墠鐨勫寘缂撳瓨
+ Queue<GameNetPackBasic> sendQueue = new Queue<GameNetPackBasic>();
+
+ public void SendCachePackage()
+ {
+ int cnt = sendQueue.Count;
+ if (mainSocket != null)
+ {
+ while (sendQueue.Count > 0)
+ {
+ SendInfo(sendQueue.Dequeue());
+ }
+ }
+ Debug.LogError($"閲嶇偣鎻愰啋锛�0403鐧诲綍鍚� 鍙戦�佺紦瀛樺寘鏁伴噺 {cnt} 涓�");
+ }
+
public void SendInfo(GameNetPackBasic protocol)
{
if (waitLogin)
@@ -152,15 +173,16 @@
}
}
- // 0102鏄粠鍦板浘鍙戦�佺殑 璇存槑宸茬櫥褰曪紝闄ら潪鏈嶅姟绔姤閿欏紓甯革紝杩欓噷鍙互涓嶅睆钄�
- // if (waitLoginMap)
- // {
- // if (protocol is not C0123_tagCClientPackVersion && protocol is not C0101_tagCPlayerLogin)
- // {
- // Debug.LogError("绛夊緟0403鍖咃紝涓嶅厑璁稿彂閫佸叾浠栧寘 " + protocol.ToString());
- // return;
- // }
- // }
+ // 0102鏄粠鍦板浘鍙戦�佺殑 璇存槑宸茬櫥褰曪紝浣嗗彲鑳藉崱椤垮鑷撮�氱煡route鐘舵�佹參浜庡鎴风锛屼緷鐒堕渶瑕侀槻鑼�
+ if (waitLoginMap)
+ {
+ if (protocol is not C0123_tagCClientPackVersion && protocol is not C0101_tagCPlayerLogin)
+ {
+ Debug.LogError("閲嶇偣鎻愰啋锛氱櫥褰曞畬鎴愬墠鐨勫皝鍖呭厛鍔犲叆闃熷垪 绛�0403鍥炲寘鍚庡啀涓�璧峰彂閫佹湇鍔＄ " + protocol.ToString());
+ sendQueue.Enqueue(protocol);
+ return;
+ }
+ }
if (mainSocket != null)
{
diff --git a/Main/Main.cs b/Main/Main.cs
index c8845f3..8d58b09 100644
--- a/Main/Main.cs
+++ b/Main/Main.cs
@@ -125,20 +125,6 @@
//閿�姣佹墍鏈夋垬鍦�
BattleManager.Instance.DestroyAllBattleField();
- //娓告垙鍐呮棩蹇楀叧闂�
-#if !UNITY_EDITOR
- if (File.Exists(Directory.GetParent(Application.persistentDataPath) + "/Debug") ||
- LocalSave.GetString("#@#BrancH") != string.Empty)
- {
- Debug.unityLogger.logEnabled = true;
- }
- else
- {
- Debug.unityLogger.logEnabled = true;
- }
-
-#endif
-
}
private static void ReleaseMgrs()
diff --git a/Main/Manager/StageManager.cs b/Main/Manager/StageManager.cs
index 5d1fcad..9b6e0a1 100644
--- a/Main/Manager/StageManager.cs
+++ b/Main/Manager/StageManager.cs
@@ -1,4 +1,5 @@
using System;
+using System.IO;
using Cysharp.Threading.Tasks;
using UnityEngine;
using UnityEngine.SceneManagement;
@@ -128,6 +129,20 @@
AfterLoadingGameScene?.Invoke();
UIManager.Instance.OpenWindow<MainWin>();
+
+ //娓告垙鍐呮棩蹇楀叧闂�
+#if !UNITY_EDITOR
+ if (File.Exists(Directory.GetParent(Application.persistentDataPath) + "/Debug") ||
+ LocalSave.GetString("#@#BrancH") != string.Empty)
+ {
+ Debug.unityLogger.logEnabled = true;
+ }
+ else
+ {
+ Debug.unityLogger.logEnabled = false;
+ }
+
+#endif
}
protected async UniTask OnLoading(AsyncOperation asyncOperation, Func<float> getLoadingProgress, Func<UniTask> anthorTask = null)
diff --git a/Main/System/Chat/ChatBulletView.cs b/Main/System/Chat/ChatBulletView.cs
index c7d5564..462720b 100644
--- a/Main/System/Chat/ChatBulletView.cs
+++ b/Main/System/Chat/ChatBulletView.cs
@@ -52,7 +52,13 @@
case ChatChannel.World:
return Language.Get("Chat17", data.Name, data.Content);
case ChatChannel.Guild:
- return Language.Get("Chat16", Language.Get("ChatTab1"), data.Name, data.Content);
+ FairyMember fairyMember = PlayerDatas.Instance.fairyData.GetMember((int)data.PlayerID);
+ int fmlv = 0;
+ if (fairyMember != null)
+ {
+ fmlv = fairyMember.FmLV;
+ }
+ return Language.Get("Chat16", RichTextMsgReplaceConfig.GetRichReplace("FAMILY", fmlv), data.Name, data.Content);
default:
return data.Content;
}
--
Gitblit v1.8.0