From ad54ddbd4c12125fd44e9b7b3fd5bbcd92cce677 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 22 七月 2025 20:15:37 +0800
Subject: [PATCH] 122 子 【武将】武将系统 / 【武将】武将系统-客户端

---
 Main/Utility/UIHelper.cs |   67 +++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/Main/Utility/UIHelper.cs b/Main/Utility/UIHelper.cs
index 38c9366..2ed1ccc 100644
--- a/Main/Utility/UIHelper.cs
+++ b/Main/Utility/UIHelper.cs
@@ -2,8 +2,6 @@
 using System.Text;
 using UnityEngine;
 using System.Linq;
-using System.Xml.Linq;
-using System.Collections;
 using System.Collections.Generic;
 using UnityEngine.UI;
 
@@ -377,15 +375,15 @@
         }
         else if (num >= M)
         {
-            return StringUtility.Contact(numto2Decimals(num / M).ToString("0.##"), Language.Get("L1070"));
+            return StringUtility.Contact(numto2Decimals(num / M).ToString("0.#"), Language.Get("L1070"));
         }
         else if (num >= K)
         {
-            return StringUtility.Contact(numto2Decimals(num / K).ToString("0.##"), Language.Get("L1071"));
+            return StringUtility.Contact(numto2Decimals(num / K).ToString("0.#"), Language.Get("L1071"));
         }
         else
         {
-            return numto2Decimals(num).ToString("0.##");
+            return numto2Decimals(num).ToString("0.#");
         }
     }
 
@@ -407,15 +405,15 @@
         }
         else if (num >= M)
         {
-            return StringUtility.Contact(numto2Decimals(num / M).ToString("0.##"),"m");
+            return StringUtility.Contact(numto2Decimals(num / M).ToString("0.#"), "m");
         }
         else if (num >= K)
         {
-            return StringUtility.Contact(numto2Decimals(num / K).ToString("0.##"), "k");
+            return StringUtility.Contact(numto2Decimals(num / K).ToString("0.#"), "k");
         }
         else
         {
-            return numto2Decimals(num).ToString("0.##");
+            return numto2Decimals(num).ToString("0.#");
         }
     }
 
@@ -594,6 +592,14 @@
     //     return name;
     // }
 
+    //鐗╁搧 鍚勫姛鑳藉搧璐�
+    public static Color GetUIColorByFunc(int itemColor, bool bright = false)
+    {
+        return GetUIColor(itemColor + 1, bright);
+    }
+
+
+    //瀵瑰簲鍝佽川(鏍�)锛涚墿鍝� 鍚勫姛鑳藉搧璐ㄤ粠2寮�濮� 鐢℅etUIColorByFunc
     public static Color GetUIColor(int itemColor, bool bright = false)
     {
         switch (itemColor)
@@ -623,7 +629,7 @@
             case 11:
                 return GetUIColor(TextColType.itembuxiu, bright);
             case 12:
-                return GetUIColor(TextColType.itemyonghen, bright);    
+                return GetUIColor(TextColType.itemyonghen, bright);
 
 
         }
@@ -701,53 +707,66 @@
         return bright ? s_BrightWhiteColor : s_DarkWhiteColor;
     }
 
+    //瀵瑰簲鍝佽川(鏍�)锛涚墿鍝� 鍚勫姛鑳藉搧璐ㄤ粠2寮�濮� 鐢℅etUIOutlineColorByFunc
+    public static Color GetUIOutlineColor(int quality)
+    {
+        return GetUIOutlineColor((QualityTextColType)quality);
+    }
 
-    //鎻忚竟棰滆壊锛屽搴斿搧璐�
+    //鐗╁搧 鍚勫姛鑳藉搧璐�
+    public static Color GetUIOutlineColorByFunc(int quality)
+    {
+        return GetUIOutlineColor((QualityTextColType)(quality + 1));
+    }
+
+    //鎻忚竟棰滆壊锛屽搴斿搧璐�(鏍�)
     public static Color GetUIOutlineColor(QualityTextColType type)
     {
         switch (type)
         {
             case QualityTextColType.itemcucao:
                 // 2d2d2d 绮楃硻
-                return new Color32(45, 45, 45, 255);
+                return new Color32(45, 45, 45, 128);
             case QualityTextColType.itemputong:
                 // 424242 鏅��
-                return new Color32(66, 66, 66, 255);
+                return new Color32(66, 66, 66, 128);
             case QualityTextColType.itemjingliang:
                 // 172543 绮捐壇
-                return new Color32(23, 37, 67, 255);
+                return new Color32(23, 37, 67, 128);
             case QualityTextColType.itemxiyou:
                 // 2a0f30 绋�鏈�
-                return new Color32(42, 15, 48, 255);
+                return new Color32(42, 15, 48, 128);
             case QualityTextColType.itemshishi:
                 // 4a2f00 鍙茶瘲
-                return new Color32(74, 47, 0, 255);
+                return new Color32(74, 47, 0, 128);
             case QualityTextColType.itemchuanqi:
                 // 451800 浼犲
-                return new Color32(69, 24, 0, 255);
+                return new Color32(69, 24, 0, 128);
             case QualityTextColType.itemshenhua:
                 // 510000 绁炶瘽
-                return new Color32(81, 0, 0, 255);
+                return new Color32(81, 0, 0, 128);
             case QualityTextColType.itemwuxia:
                 // 43003e 鏃犵憰
-                return new Color32(67, 0, 62, 255);
+                return new Color32(67, 0, 62, 128);
             case QualityTextColType.itemanjin:
                 // 6f4401 鏆楅噾
-                return new Color32(111, 68, 1, 255);
+                return new Color32(111, 68, 1, 128);
             case QualityTextColType.itemjueyi:
                 // 203995 缁濊壓
-                return new Color32(32, 57, 149, 255);
+                return new Color32(32, 57, 149, 128);
             case QualityTextColType.itemyuanzu:
                 // 461f5d 鍏冪
-                return new Color32(70, 31, 93, 255);
+                return new Color32(70, 31, 93, 128);
             case QualityTextColType.itembuxiu:
                 // 2e3975 涓嶆溄
-                return new Color32(46, 57, 117, 255);
+                return new Color32(46, 57, 117, 128);
             case QualityTextColType.itemyonghen:
                 // 5d1d52 姘告亽
-                return new Color32(93, 29, 82, 255);
+                return new Color32(93, 29, 82, 128);
+            case QualityTextColType.red:
+                return s_BrightRedColor;
         }
-        return new Color32(0, 0, 0, 255);
+        return new Color32(0, 0, 0, 128);
     }
 
     private static Regex m_TextColorRegex = new Regex("<color=#[0-9a-zA-Z]+>(.*)</color>", RegexOptions.Singleline);

--
Gitblit v1.8.0