头像排序

GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs

@@ -122,10 +122,10 @@ namespace GFGGame
         {
             _headDatas.Sort((int a, int b) =>
             {
-                if (_newHeadDatas.IndexOf(a) >= 0) return -1;
-                if (_newHeadDatas.IndexOf(b) >= 0) return 1;
-                if (a == RoleDataManager.headId) return -1;
-                if (b == RoleDataManager.headId) return 1;
+                if (_newHeadDatas.IndexOf(a) >= 0 && _newHeadDatas.IndexOf(b) < 0) return -1;
+                if (_newHeadDatas.IndexOf(b) >= 0 && _newHeadDatas.IndexOf(a) < 0) return 1;
+                if (a == RoleDataManager.headId && b != RoleDataManager.headId) return -1;
+                if (b == RoleDataManager.headId && a != RoleDataManager.headId) return 1;
                 return b - a;
             });
         }
@@ -134,10 +134,10 @@ namespace GFGGame
         {
             _headBorderDatas.Sort((int a, int b) =>
             {
-                if (_newHeadBorderDatas.IndexOf(a) >= 0) return -1;
-                if (_newHeadBorderDatas.IndexOf(b) >= 0) return 1;
-                if (a == RoleDataManager.headBorderId) return -1;
-                if (b == RoleDataManager.headBorderId) return 1;
+                if (_newHeadBorderDatas.IndexOf(a) >= 0 && _newHeadBorderDatas.IndexOf(b) < 0) return -1;
+                if (_newHeadBorderDatas.IndexOf(b) >= 0 && _newHeadBorderDatas.IndexOf(a) < 0) return 1;
+                if (a == RoleDataManager.headBorderId && b != RoleDataManager.headBorderId) return -1;
+                if (b == RoleDataManager.headBorderId && a != RoleDataManager.headBorderId) return 1;
                 return b - a;
             });
         }