fix roleId, hook password input

Author: radistmorse

GameClientNetwork_Patch.cs

@@ -0,0 +1,31 @@
+using HarmonyLib;
+
+namespace PEPatch
+{
+    [HarmonyPatch(typeof(GameClientNetwork))]
+    public class GameClientNetwork_Patch
+    {
+        [HarmonyPrefix]
+        [HarmonyPatch("uLink_OnFailedToConnect")]
+        public static bool uLink_OnFailedToConnect(uLink.NetworkConnectionError error)
+        {
+            if (error == uLink.NetworkConnectionError.InvalidPassword && UILobbyMainWndCtrl.Instance != null)
+            {
+                MessageBox_N.CancelMask(MsgInfoType.ServerLoginMask);
+
+                var serverData = Traverse.Create(UILobbyMainWndCtrl.Instance).Field("mSelectServerData").GetValue();
+
+                if (serverData is ServerRegistered)
+                {
+                    Traverse.Create(serverData).Field("PasswordStatus").SetValue(1);
+                    UILobbyMainWndCtrl.Instance.mCheckPasswordInput.text = string.Empty;
+                    UILobbyMainWndCtrl.Instance.mPassWordWnd.SetActive(true);
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+    }
+}

PEPatch.csproj

@@ -46,11 +46,15 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="uLink">
+      <HintPath>PELib\uLink.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine">
       <HintPath>PELib\UnityEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GameClientNetwork_Patch.cs" />
     <Compile Include="PatchInitializer.cs" />
     <Compile Include="PatchUtils.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

PatchUtils.cs

@@ -71,7 +71,7 @@ public static void LoadMultiplayerData()
 
                         var steamId = SteamFriendPrcMgr.Instance.GetMyInfo()._SteamID.m_SteamID;
 
-                        var roleId = (steamId.GetHashCode() ^ customData.charactorName.GetHashCode()) % 16000000;
+                        var roleId = (steamId.GetHashCode() ^ customData.charactorName.GetHashCode()) % 13000000;
 
                         var role = new CustomData.RoleInfo()
                         {

UILobbyMainWndCtrl_Patch.cs

@@ -77,9 +77,12 @@ public static bool BtnJoinOnClick(UILobbyMainWndCtrl __instance)
             Traverse.Create(server).Field("GameMode").SetValue(0);
             Traverse.Create(server).Field("ServerUID").SetValue(1L);
 
-            __instance.GetType().GetMethod("ConnectServer", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic).Invoke(__instance, new object[] { false, server });
+            Traverse.Create(__instance).Field("mSelectServerData").SetValue(server);
+            Traverse.Create(__instance).Field("roomUID").SetValue(1L);
 
-            return false;
+            __instance.mCheckPasswordInput.text = string.Empty;
+
+            return true;
         }
     }
 }

UIPlayerBuildCtrl_Patch.cs

@@ -33,7 +33,7 @@ public static bool CreatePlayer(UIPlayerBuildCtrl __instance)
 
                         var steamId = SteamFriendPrcMgr.Instance.GetMyInfo()._SteamID.m_SteamID;
 
-                        var roleId = (steamId.GetHashCode() ^ name.GetHashCode()) % 16000000;
+                        var roleId = (steamId.GetHashCode() ^ name.GetHashCode()) % 13000000;
 
                         var role = new CustomData.RoleInfo()
                         {