名字冲突修改

GameClient/Assets/Game/HotUpdate/Constant/ConstCardRarity.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    public class ConstCardRarity 
+    public class ConstCardRarity_Type 
     {
 
         public const int Rarity_TIAN = 4;
@@ -22,15 +22,15 @@ namespace GFGGame
 
         public static SortedList CardRarityList()
         {
-            if (ConstCardRarity._cardRarityList == null)
+            if (ConstCardRarity_Type._cardRarityList == null)
             {
-                ConstCardRarity._cardRarityList = new SortedList();
-                ConstCardRarity._cardRarityList.Add(ConstCardRarity.Rarity_HUANG, ConstCardRarity.TITLE_HUANG);
-                ConstCardRarity._cardRarityList.Add(ConstCardRarity.Rarity_XUAN, ConstCardRarity.TITLE_XUAN);
-                ConstCardRarity._cardRarityList.Add(ConstCardRarity.Rarity_DI, ConstCardRarity.TITLE_DI);
-                ConstCardRarity._cardRarityList.Add(ConstCardRarity.Rarity_TIAN, ConstCardRarity.TITLE_TIAN);
+                ConstCardRarity_Type._cardRarityList = new SortedList();
+                ConstCardRarity_Type._cardRarityList.Add(ConstCardRarity_Type.Rarity_HUANG, ConstCardRarity_Type.TITLE_HUANG);
+                ConstCardRarity_Type._cardRarityList.Add(ConstCardRarity_Type.Rarity_XUAN, ConstCardRarity_Type.TITLE_XUAN);
+                ConstCardRarity_Type._cardRarityList.Add(ConstCardRarity_Type.Rarity_DI, ConstCardRarity_Type.TITLE_DI);
+                ConstCardRarity_Type._cardRarityList.Add(ConstCardRarity_Type.Rarity_TIAN, ConstCardRarity_Type.TITLE_TIAN);
             }
-            return ConstCardRarity._cardRarityList;
+            return ConstCardRarity_Type._cardRarityList;
         }
     }
 }