From 725b7b2374f43582a2d78b2cae3f8303359651b8 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 10 十一月 2025 14:30:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/HeroUI/HeroUIManager.OnTeam.cs |   46 +++++++++++++++++++++-------------------------
 1 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/Main/System/HeroUI/HeroUIManager.OnTeam.cs b/Main/System/HeroUI/HeroUIManager.OnTeam.cs
index 73d39ac..7efa4f4 100644
--- a/Main/System/HeroUI/HeroUIManager.OnTeam.cs
+++ b/Main/System/HeroUI/HeroUIManager.OnTeam.cs
@@ -320,9 +320,6 @@
         return selectHeroList;
     }
 
-    //锛侊紒锛佹柊鎺掑簭瑙勫垯
-    //鑻ュ湪鏂版墜寮曞锛堝紩瀵糏D锛変腑锛屽鏋�5鍙蜂綅涓虹┖锛屽垯浼樺厛鏀剧疆5鍙蜂綅
-    //鎸夋垬鍔涙帓搴� 
     int CmpHeroRecommend(string guidA, string guidB)
     {
         HeroInfo heroA = HeroManager.Instance.GetHero(guidA);
@@ -333,30 +330,29 @@
         }
 
         // // 鎺掑簭瑙勫垯锛氭灏嗙瓑绾э紴绐佺牬绛夌骇锛炴灏嗚閱掗樁绾э紴姝﹀皢鍝佽川锛炴灏嗗悶鍣槦绾э紴姝﹀皢ID
-        // if (heroA.heroLevel != heroB.heroLevel)
-        // {
-        //     return heroA.heroLevel > heroB.heroLevel ? -1 : 1;
-        // }
-        // if (heroA.breakLevel != heroB.breakLevel)
-        // {
-        //     return heroA.breakLevel > heroB.breakLevel ? -1 : 1;
-        // }
-        // if (heroA.awakeLevel != heroB.awakeLevel)
-        // {
-        //     return heroA.awakeLevel > heroB.awakeLevel ? -1 : 1;
-        // }
-        // if (heroA.Quality != heroB.Quality)
-        // {
-        //     return heroA.Quality > heroB.Quality ? -1 : 1;
-        // }
-        // if (heroA.heroStar != heroB.heroStar)
-        // {
-        //     return heroA.heroStar > heroB.heroStar ? -1 : 1;
-        // }
+        if (heroA.heroLevel != heroB.heroLevel)
+        {
+            return heroA.heroLevel > heroB.heroLevel ? -1 : 1;
+        }
+        if (heroA.breakLevel != heroB.breakLevel)
+        {
+            return heroA.breakLevel > heroB.breakLevel ? -1 : 1;
+        }
+        if (heroA.awakeLevel != heroB.awakeLevel)
+        {
+            return heroA.awakeLevel > heroB.awakeLevel ? -1 : 1;
+        }
+        if (heroA.Quality != heroB.Quality)
+        {
+            return heroA.Quality > heroB.Quality ? -1 : 1;
+        }
+        if (heroA.heroStar != heroB.heroStar)
+        {
+            return heroA.heroStar > heroB.heroStar ? -1 : 1;
+        }
 
+        return heroA.heroId.CompareTo(heroB.heroId);
 
-
-        return heroB.CalculateFightPower(false).CompareTo(heroA.CalculateFightPower(false));
     }
 
     int CmpByJob(string guidA, string guidB)

--
Gitblit v1.8.0