fix roleid

Author: radistmorse

PatchUtils.cs

@@ -54,7 +54,8 @@ public static void LoadMultiplayerData()
                 return;
             }
 
-            var rez = new List<CustomData.RoleInfo>();
+            GameClientLobby.Self.myRoles = new List<CustomData.RoleInfo>();
+            GameClientLobby.Self.myRolesExisted = new List<CustomData.RoleInfo>();
 
             foreach (var file in Directory.GetFiles(path))
             {
@@ -70,28 +71,24 @@ public static void LoadMultiplayerData()
 
                         var steamId = SteamFriendPrcMgr.Instance.GetMyInfo()._SteamID.m_SteamID;
 
-                        var roleId = steamId.GetHashCode();
+                        var roleId = steamId.GetHashCode() ^ customData.charactorName.GetHashCode();
 
-                        if (roleId > int.MaxValue - 4)
-                        {
-                            roleId = 1;
-                        }
-
-                        rez.Add(new CustomData.RoleInfo()
+                        var role = new CustomData.RoleInfo()
                         {
                             appearData = customData.appearData.Serialize(),
                             nudeData = customData.nudeAvatarData.Serialize(),
                             name = customData.charactorName,
                             sex = (byte)(int)customData.sex,
                             steamId = steamId,
-                            roleID = roleId + rez.Count + 1
-                        });
+                            roleID = roleId
+                        };
+
+                        GameClientLobby.Self.myRoles.Add(role);
+                        GameClientLobby.Self.myRolesExisted.Add(role);
+
                     }
                 }
             }
-
-            GameClientLobby.Self.myRoles = rez;
-            GameClientLobby.Self.myRolesExisted = rez;
         }
     }
 }

UIMLoginControl_Patch.cs

@@ -20,9 +20,10 @@ public static bool EnterLobby(UIMLoginControl __instance)
         public static bool BtnOKOnClick(UIMLoginControl __instance)
         {
             __instance.BtnOK?.Invoke();
-            var roleId = Traverse.Create(__instance).Field("deleteRoleIndex").GetValue<int>();
 
-            CustomData.RoleInfo role = MLPlayerInfo.Instance.GetRoleInfo(__instance.rc.GetSelectedIndex()).mRoleInfo;
+            var roleId = MLPlayerInfo.Instance.GetRoleInfo(Traverse.Create(__instance).Field("deleteRoleIndex").GetValue<int>()).mRoleInfo.roleID;
+
+            CustomData.RoleInfo role = GameClientLobby.Self.myRoles.Find(it => it.roleID == roleId);
             role.deletedFlag = 1;
             GameClientLobby.Self.myRolesExisted.Remove(role);
             GameClientLobby.Self.myRolesDeleted.Clear();

UIPlayerBuildCtrl_Patch.cs

@@ -14,42 +14,43 @@ public static bool CreatePlayer(UIPlayerBuildCtrl __instance)
             {
                 if (__instance.actionOk)
                 {
+                    __instance.actionOk = false;
+                    __instance.Invoke("ResetActionOK", 2.0f);
+
                     var name = Traverse.Create(__instance).Field("mNameInput").Property("text").GetValue<string>();
 
                     if (!string.IsNullOrEmpty(name))
                     {
+                        if (GameClientLobby.Self.myRoles.Any(r => r.deletedFlag ==0 && r.name == name))
+                        {
+                            MessageBox_N.ShowOkBox(PELocalization.GetString(ErrorMessage.NAME_HAS_EXISTED));
+                            return false;    
+                        }
+
                         var playerModel = Traverse.Create(__instance).Field("mCurrent").GetValue<PlayerModel>();
                         byte[] appearData = playerModel.mAppearData.Serialize();
                         byte[] nudeData = playerModel.mNude.Serialize();
 
                         var steamId = SteamFriendPrcMgr.Instance.GetMyInfo()._SteamID.m_SteamID;
 
-                        var roleId = steamId.GetHashCode();
-
-                        if (roleId > int.MaxValue - 4)
-                        {
-                            roleId = 1;
-                        }
+                        var roleId = steamId.GetHashCode() ^ name.GetHashCode();
 
                         var role = new CustomData.RoleInfo()
                         {
                             appearData = appearData,
                             nudeData = nudeData,
                             name = name,
                             sex = (byte)(int)Traverse.Create(__instance).Property("Sex").GetValue(),
-                            steamId = SteamFriendPrcMgr.Instance.GetMyInfo()._SteamID.m_SteamID,
-                            roleID = roleId + GameClientLobby.Self.myRoles.Where(r => r.deletedFlag != 1).Select(r => r.roleID).DefaultIfEmpty(0).Max() + 1
+                            steamId = steamId,
+                            roleID = roleId
                         };
 
                         GameClientLobby.Self.myRoles.Add(role);
                         GameClientLobby.Self.myRolesExisted.Add(role);
-                        role.roleID = GameClientLobby.Self.myRoles.Count;
 
                         PatchUtils.SaveMultiplayerData();
 
                         MLPlayerInfo.Instance.SetSelectedRole(role.name);
-                        MLPlayerInfo.Instance.UpdateScene();
-
 
                         PeSceneCtrl.Instance.GotoMultiRoleScene();