chore(PlayerManager): 更新版本号至4.0.7

- 将项目版本从4.0.6升级到4.0.7
- 保持其他配置不变

.gitea/workflows/dotnet.yml

@@ -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

Gui/GUIStyles.cs

@@ -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;

Gui/InternalWidgets/AddFriendButton.cs

@@ -13,7 +13,7 @@ public static class AddFriendButton
             Name = "Add Friend",
             GetText = player => "加好友",
             Condition = player =>
-                !PlayerManager.IsLocalPlayer(PlayerManager.LocalPlayer)
+                !PlayerManager.IsLocalPlayer(player)
                 && !player.IsFriend,
             OnClick = player =>
             {

Gui/PlayerManagerGUI.cs

@@ -190,15 +190,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);
+                }
             }
         }
 

Patches/DistanceFilterPatch.cs

@@ -0,0 +1,22 @@
+using System.Reflection.Emit;
+using System.Collections.Generic;
+using HarmonyLib;
+using stick.plugins.playermanager;
+
+[HarmonyPatch(typeof(MatchmakingHandler), "OnRandomServerJoinFailed")]
+class DistanceFilterPatch
+{
+    public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+    {
+        return new CodeMatcher(instructions)
+            .MatchForward(false,
+                new CodeMatch(OpCodes.Ldc_I4_1),
+                new CodeMatch(OpCodes.Stloc_0)
+                )
+            .SetInstruction(
+                new CodeInstruction(OpCodes.Ldsfld,
+                    AccessTools.Field(typeof(PlayerManager), nameof(PlayerManager.lobbyDistanceFilter))))
+            .InstructionEnumeration();
+    }
+}
+

Plugin.cs

@@ -102,6 +102,11 @@ public class PlayerManager : BaseUnityPlugin
     /// </summary>
     public static List<CSteamID> lobbyDataList = [];
 
+    /// <summary>
+    /// 进入过的大厅列表
+    /// </summary>
+    public static HashSet<CSteamID> enteredLobbyList = [];
+
     /// <summary>
     /// 大厅距离过滤设置
     /// </summary>
@@ -195,7 +200,7 @@ public class PlayerManager : BaseUnityPlugin
     private void Update()
     {
         HandleInput();
-        if (SteamManager.Initialized)
+        if (SteamManager.Initialized && LocalPlayer is null)
         {
             LocalPlayer = new(SteamUser.GetSteamID());
         }
@@ -293,6 +298,8 @@ public class PlayerManager : BaseUnityPlugin
         }
         Harmony.CreateAndPatchAll(typeof(ApplyBlacklist));
         Harmony.CreateAndPatchAll(typeof(ListenForChange));
+        Harmony.CreateAndPatchAll(typeof(MutePatch));
+        Harmony.CreateAndPatchAll(typeof(DistanceFilterPatch));
     }
 
     /// <summary>
@@ -432,6 +439,7 @@ public class PlayerManager : BaseUnityPlugin
     {
         Debug.Log("大厅列表请求完成: " + result.m_nLobbiesMatching + " 个大厅");
         lobbyDataList = [];
+        enteredLobbyList = [];
         uint lobbyCount = result.m_nLobbiesMatching;
 
         for (uint i = 0; i < lobbyCount; i++)

readme.md

@@ -17,8 +17,26 @@
 - 静音单个玩家
 - 一键加好友
 
+## 作者
+
+老狼老狼几点钟、Moncak、z7572
+
 ## 更新日志
 
+### v4.0.7
+
+1. 现在点击大厅列表中的按钮进入大厅会在列表中将该大厅用灰色样式标识，标记已进入过
+2. 现在不会在每帧都初始化一遍LocalPlayer   *难道他真的是猪？？*
+
+### v4.0.6
+
+1. 大厅搜索范围按钮现在可同步修改快速匹配的搜索范围
+2. 修复了禁音功能   *难道他真的是猪？？*
+
+### v4.0.5
+
+1. 修复了加好友按钮始终不显示的问题   *难道他真的是猪？？*
+
 ### v4.0.4
 
 1. 房间列表现在在房间内也显示，但是点击无效

stick.plugins.playermanager.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net35</TargetFramework>
     <AssemblyName>stick.plugins.playermanager</AssemblyName>
     <Product>PlayerManager</Product>
-    <Version>4.0.4</Version>
+    <Version>4.0.7</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <RestoreAdditionalProjectSources>