From 2636bf475c8b4b03ee869a5db2f5fdd891ed9f97 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 04 十二月 2025 09:19:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/PhantasmPavilion/ChatBubbleHelper.cs | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Main/System/PhantasmPavilion/ChatBubbleHelper.cs b/Main/System/PhantasmPavilion/ChatBubbleHelper.cs
index eccfc81..4f01ca0 100644
--- a/Main/System/PhantasmPavilion/ChatBubbleHelper.cs
+++ b/Main/System/PhantasmPavilion/ChatBubbleHelper.cs
@@ -1,20 +1,18 @@
public static class ChatBubbleHelper
{
-
-
- public static int GetOtherChatBubbleID(int nowID)
+ public static int GetOtherChatBubbleID(int job, int nowID)
{
- return 0;//PhantasmPavilionModel.Instance.GetNowOtherChatBubbleID(nowID);
+ int defaultID = GetChatBubbleDefaultID(job);
+ return ChatBubbleBoxConfig.HasKey(nowID) ? nowID : defaultID;
}
public static int GetMyChatBubbleID()
{
- return 0;//PhantasmPavilionModel.Instance.GetNowChatBubbleID();
+ return PhantasmPavilionManager.Instance.TryGetNowShowID(PhantasmPavilionType.ChatBox, out int defaultID) ? defaultID : 0;
}
- public static int GetChatBubbleDefaultID()
+ public static int GetChatBubbleDefaultID(int job)
{
- // PhantasmPavilionModel.Instance.TryGetDefaultID(PhantasmPavilionTab.ChatBubble, 0, out int defaultID);
- return 0;//defaultID;
+ return PhantasmPavilionManager.Instance.TryGetDefaultID(PhantasmPavilionType.ChatBox, job, out int defaultID) ? defaultID : 0;
}
}
\ No newline at end of file
--
Gitblit v1.8.0