Compare commits
14 Commits
6ab8c38109
...
v4.0.8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8b5e3c33d2 | ||
|
|
079716cc85 | ||
|
|
04337028b3 | ||
|
|
6b9910486b | ||
|
|
c320a07370 | ||
|
|
a0d1386712 | ||
|
|
ab960fc38b | ||
|
|
a40a605c37 | ||
|
|
b19f906216 | ||
|
|
3ecb7fb78b | ||
|
|
4e8931caba | ||
|
|
3adcdc46ba | ||
|
|
b6edc70594 | ||
| 9e7fb4d443 |
@@ -21,6 +21,11 @@ jobs:
|
||||
|
||||
- name: Restore dependencies
|
||||
run: dotnet restore
|
||||
# 直接加代理得了
|
||||
env:
|
||||
http_proxy: "http://172.17.0.1:7890"
|
||||
https_proxy: "http://172.17.0.1:7890"
|
||||
no_proxy: "localhost,127.0.0.1,*.lan"
|
||||
|
||||
- name: Build
|
||||
run: dotnet build --no-restore --configuration Release
|
||||
|
||||
@@ -41,6 +41,9 @@ public static class DefaultWidgets
|
||||
if (PlayerManager.ShowNameToggleButton.Value)
|
||||
RegisterManager.RegisterPlayerRow(InternalWidgets.NameToggleButton.Create());
|
||||
|
||||
if (PlayerManager.ShowTransButton.Value)
|
||||
RegisterManager.RegisterPlayerRow(InternalWidgets.TransButton.Create());
|
||||
|
||||
if (PlayerManager.ShowMuteButton.Value)
|
||||
RegisterManager.RegisterPlayerRow(InternalWidgets.MuteButton.Create());
|
||||
if (PlayerManager.ShowAddFriendButton.Value)
|
||||
|
||||
@@ -15,6 +15,9 @@ public static class GUIStyles
|
||||
/// <summary>普通按钮样式(fontSize=22, richText=false)</summary>
|
||||
public static GUIStyle Button;
|
||||
|
||||
/// <summary>被按过的按钮样式,用于标识已经进入过的房间(fontSize=22)</summary>
|
||||
public static GUIStyle ButtonPressed;
|
||||
|
||||
/// <summary>黄色按钮样式(已记录玩家)</summary>
|
||||
public static GUIStyle YellowButton;
|
||||
|
||||
@@ -35,6 +38,8 @@ public static class GUIStyles
|
||||
|
||||
Label = new GUIStyle(GUI.skin.label) { fontSize = 22 };
|
||||
Button = new GUIStyle(GUI.skin.button) { fontSize = 22, richText = false };
|
||||
ButtonPressed = new GUIStyle(GUI.skin.button) { fontSize = 22, richText = false };
|
||||
ButtonPressed.normal.textColor = Color.grey;
|
||||
|
||||
YellowButton = new GUIStyle(GUI.skin.button) { fontSize = 22, richText = false };
|
||||
YellowButton.normal.textColor = Color.yellow;
|
||||
|
||||
21
Gui/InternalWidgets/TransButton.cs
Normal file
21
Gui/InternalWidgets/TransButton.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using MultiplayerBasicExample;
|
||||
|
||||
namespace stick.plugins.playermanager.Gui.InternalWidgets;
|
||||
|
||||
public static class TransButton
|
||||
{
|
||||
public static IPlayerRowWidget Create()
|
||||
{
|
||||
return new PlayerRowButtonWidget
|
||||
{
|
||||
Name = "Trans Host",
|
||||
Condition = player =>
|
||||
PlayerManager.IsHost(PlayerManager.LocalPlayer)
|
||||
&& !PlayerManager.IsLocalPlayer(player),
|
||||
GetText = _ => "转让",
|
||||
OnClick = player =>
|
||||
PlayerManager.TransferLobbyOwnership(player),
|
||||
Width = 100f,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ using MultiplayerBasicExample;
|
||||
using Steamworks;
|
||||
using UnityEngine;
|
||||
using stick.plugins.playermanager.Recorder;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace stick.plugins.playermanager.Gui;
|
||||
|
||||
@@ -30,6 +31,11 @@ public static class PlayerManagerGUI
|
||||
/// </summary>
|
||||
private static readonly LayoutCursor Cursor = new();
|
||||
|
||||
/// <summary>
|
||||
/// 记录该行widget是否该绘制
|
||||
/// </summary>
|
||||
private static readonly HashSet<IPlayerRowWidget> IgnoreWidgets = [];
|
||||
|
||||
#endregion
|
||||
|
||||
#region 主绘制方法
|
||||
@@ -89,10 +95,29 @@ public static class PlayerManagerGUI
|
||||
Cursor.EndRow();
|
||||
}
|
||||
|
||||
// 玩家行区域:每玩家一行,行内横向迭代注册的 PlayerRowWidget
|
||||
for (int i = 0; i < PlayerManager.lobbyMemberList.Count; i++)
|
||||
|
||||
IgnoreWidgets.Clear();
|
||||
// 如果一个widget对所有玩家都不需要绘制,则忽略
|
||||
foreach (var widget in RegisterManager.PlayerRowWidgets)
|
||||
{
|
||||
bool shouldDraw = false;
|
||||
foreach (var member in PlayerManager.lobbyMemberList)
|
||||
{
|
||||
if (!member.SteamId.IsValid()) continue;
|
||||
if (widget.ShouldDraw(member))
|
||||
{
|
||||
shouldDraw = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!shouldDraw)
|
||||
IgnoreWidgets.Add(widget);
|
||||
}
|
||||
|
||||
// 玩家行区域:每玩家一行,行内横向迭代注册的 PlayerRowWidget
|
||||
foreach (var member in PlayerManager.lobbyMemberList)
|
||||
{
|
||||
PlayerInfo member = PlayerManager.lobbyMemberList[i];
|
||||
if (!member.SteamId.IsValid()) continue;
|
||||
|
||||
Cursor.BeginRow();
|
||||
@@ -101,7 +126,8 @@ public static class PlayerManagerGUI
|
||||
if (widget.ShouldDraw(member))
|
||||
widget.Draw(Cursor.NextColumn(widget.Width, 40f), member);
|
||||
else
|
||||
Cursor.NextColumn(widget.Width, 40f); // 占位推进列位置
|
||||
if (!IgnoreWidgets.Contains(widget))
|
||||
Cursor.NextColumn(widget.Width, 40f); // 占位推进列位置对齐
|
||||
}
|
||||
Cursor.EndRow();
|
||||
}
|
||||
@@ -190,15 +216,21 @@ public static class PlayerManagerGUI
|
||||
for (int i = 0; i < PlayerManager.lobbyDataList.Count; i++)
|
||||
{
|
||||
CSteamID lobbyId = PlayerManager.lobbyDataList[i];
|
||||
var style = PlayerManager.enteredLobbyList.Contains(lobbyId) ? GUIStyles.ButtonPressed : GUIStyles.Button;
|
||||
|
||||
if (GUI.Button(
|
||||
new Rect(Cursor.OffsetX, Cursor.LineHeight * i, 500f, 40f),
|
||||
$"{lobbyId} 人数{SteamMatchmaking.GetNumLobbyMembers(lobbyId)}",
|
||||
GUIStyles.Button
|
||||
style
|
||||
))
|
||||
{
|
||||
// 在大厅中则不加入
|
||||
if (!PlayerManager.MatchmakingHandler.IsInsideLobby)
|
||||
{
|
||||
// 记录一下加入过的状态
|
||||
PlayerManager.enteredLobbyList.Add(lobbyId);
|
||||
PlayerManager.JoinSpecificServer(lobbyId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,8 +13,7 @@ class DistanceFilterPatch
|
||||
new CodeMatch(OpCodes.Ldc_I4_1),
|
||||
new CodeMatch(OpCodes.Stloc_0)
|
||||
)
|
||||
.RemoveInstruction()
|
||||
.InsertAndAdvance(
|
||||
.SetInstruction(
|
||||
new CodeInstruction(OpCodes.Ldsfld,
|
||||
AccessTools.Field(typeof(PlayerManager), nameof(PlayerManager.lobbyDistanceFilter))))
|
||||
.InstructionEnumeration();
|
||||
|
||||
34
Plugin.cs
34
Plugin.cs
@@ -39,6 +39,11 @@ public class PlayerManager : BaseUnityPlugin
|
||||
/// </summary>
|
||||
internal static ConfigEntry<bool> ShowKickButton;
|
||||
|
||||
/// <summary>
|
||||
/// 是否显示转让按钮
|
||||
/// </summary>
|
||||
internal static ConfigEntry<bool> ShowTransButton;
|
||||
|
||||
/// <summary>
|
||||
/// 是否显示记录/拉黑按钮
|
||||
/// </summary>
|
||||
@@ -102,6 +107,11 @@ public class PlayerManager : BaseUnityPlugin
|
||||
/// </summary>
|
||||
public static List<CSteamID> lobbyDataList = [];
|
||||
|
||||
/// <summary>
|
||||
/// 进入过的大厅列表
|
||||
/// </summary>
|
||||
public static HashSet<CSteamID> enteredLobbyList = [];
|
||||
|
||||
/// <summary>
|
||||
/// 大厅距离过滤设置
|
||||
/// </summary>
|
||||
@@ -195,7 +205,7 @@ public class PlayerManager : BaseUnityPlugin
|
||||
private void Update()
|
||||
{
|
||||
HandleInput();
|
||||
if (SteamManager.Initialized)
|
||||
if (SteamManager.Initialized && LocalPlayer is null)
|
||||
{
|
||||
LocalPlayer = new(SteamUser.GetSteamID());
|
||||
}
|
||||
@@ -239,6 +249,13 @@ public class PlayerManager : BaseUnityPlugin
|
||||
"是否显示踢人按钮"
|
||||
);
|
||||
|
||||
ShowTransButton = Config.Bind(
|
||||
"GUI",
|
||||
"ShowTransButton",
|
||||
true,
|
||||
"是否显示转让按钮"
|
||||
);
|
||||
|
||||
ShowRecordButton = Config.Bind(
|
||||
"GUI",
|
||||
"ShowRecordButton",
|
||||
@@ -321,6 +338,7 @@ public class PlayerManager : BaseUnityPlugin
|
||||
else
|
||||
{
|
||||
RequestLobbyList();
|
||||
OnLobbyMembersChanged();
|
||||
PlayerManagerGUI.ShowLobbyInfo = true;
|
||||
Debug.Log("大厅信息界面已打开");
|
||||
}
|
||||
@@ -329,6 +347,19 @@ public class PlayerManager : BaseUnityPlugin
|
||||
|
||||
#region 公共方法
|
||||
|
||||
/// <summary>
|
||||
/// 转让房主
|
||||
/// </summary>
|
||||
/// <param name="targetPlayer">目标玩家</param>
|
||||
/// <returns></returns>
|
||||
public static void TransferLobbyOwnership(PlayerInfo targetPlayer)
|
||||
{
|
||||
if (targetPlayer != null && targetPlayer != LocalPlayer)
|
||||
{
|
||||
SteamMatchmaking.SetLobbyOwner(CurrentLobbyID, targetPlayer.SteamId);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 通过SteamID获取NetworkSpawnID
|
||||
/// </summary>
|
||||
@@ -434,6 +465,7 @@ public class PlayerManager : BaseUnityPlugin
|
||||
{
|
||||
Debug.Log("大厅列表请求完成: " + result.m_nLobbiesMatching + " 个大厅");
|
||||
lobbyDataList = [];
|
||||
enteredLobbyList = [];
|
||||
uint lobbyCount = result.m_nLobbiesMatching;
|
||||
|
||||
for (uint i = 0; i < lobbyCount; i++)
|
||||
|
||||
26
readme.md
26
readme.md
@@ -5,6 +5,7 @@
|
||||
## 功能
|
||||
|
||||
- 房间查找
|
||||
- 转让房主
|
||||
- 玩家记录
|
||||
- 被记录的玩家显示为黄名
|
||||
- 是steam好友的玩家显示为绿名(优先级更高)
|
||||
@@ -17,8 +18,27 @@
|
||||
- 静音单个玩家
|
||||
- 一键加好友
|
||||
|
||||
## 作者
|
||||
|
||||
老狼老狼几点钟、Moncak、z7572
|
||||
|
||||
## 更新日志
|
||||
|
||||
### v4.0.8
|
||||
|
||||
1. 添加了转让房主功能
|
||||
2. 现在如果某个按钮(行组件)对所有人都不显示,则不留空
|
||||
|
||||
### v4.0.7
|
||||
|
||||
1. 现在点击大厅列表中的按钮进入大厅会在列表中将该大厅用灰色样式标识,标记已进入过
|
||||
2. 现在不会在每帧都初始化一遍LocalPlayer *难道他真的是猪??*
|
||||
|
||||
### v4.0.6
|
||||
|
||||
1. 大厅搜索范围按钮现在可同步修改快速匹配的搜索范围
|
||||
2. 修复了禁音功能 *难道他真的是猪??*
|
||||
|
||||
### v4.0.5
|
||||
|
||||
1. 修复了加好友按钮始终不显示的问题 *难道他真的是猪??*
|
||||
@@ -52,11 +72,11 @@
|
||||
|
||||
1. 修复了删除玩家记录时回写会导致所有记录的名字消失的问题
|
||||
|
||||
*需要注意的是目前版本在重新记录玩家之后,曾用名会被现在的名字替换*
|
||||
*需要注意的是目前版本在重新记录玩家之后,曾用名会被现在的名字替换*
|
||||
|
||||
### v3.0.1
|
||||
|
||||
**存在较大问题请勿更新**
|
||||
**存在较大问题请勿更新**
|
||||
|
||||
1. 修复了玩家记录不能被正确读取的问题
|
||||
2. 将每次绘制时获取玩家信息改为按需获取
|
||||
@@ -66,7 +86,7 @@
|
||||
|
||||
### v3.0.0
|
||||
|
||||
**存在较大问题请勿更新**
|
||||
**存在较大问题请勿更新**
|
||||
|
||||
1. 较为彻底地重构了代码
|
||||
2. 添加了黑名单功能
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<TargetFramework>net35</TargetFramework>
|
||||
<AssemblyName>stick.plugins.playermanager</AssemblyName>
|
||||
<Product>PlayerManager</Product>
|
||||
<Version>4.0.6</Version>
|
||||
<Version>4.0.8</Version>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<RestoreAdditionalProjectSources>
|
||||
|
||||
Reference in New Issue
Block a user