Merge branch 'master' of http://10.108.64.190:3000/gfg/Client

* 'master' of http://10.108.64.190:3000/gfg/Client:
  卡牌图标适配
  卡牌显示等级和属性分
  清理

FGUIProject/assets/CommonGame/components/ComIcon000.xml

@@ -2,7 +2,7 @@
 <component size="222,254">
   <displayList>
     <image id="n25_pu55" name="n25" src="orsttit" fileName="images/wpbb_di.png" xy="0,0" size="222,222"/>
-    <loader id="n12_ehs9" name="loaIcon" xy="110,111" pivot="0.5,0.5" anchor="true" size="140,140" aspect="true" url="ui://xz8kxrecng0i27" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="110,111" pivot="0.5,0.5" anchor="true" size="140,140" aspect="true" url="ui://xz8kxrecng0i27" align="center" vAlign="middle" fill="scaleMatchHeight"/>
     <text id="n17_j48o" name="txtHasCount" xy="112,243" pivot="0.5,0" anchor="true" size="100,36" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
     <loader id="n18_j48o" name="loaRarity" xy="164,0" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="21,91" size="178,40" group="n29_pu55"/>

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -96,10 +96,10 @@ namespace GFGGame
         }
         private void UpdateScore()
         {
-            bool isDressUp = itemCfg.itemType == ConstItemType.DRESS_UP;
-            _ui.m_comTipsBase.m_loaRarity.visible = isDressUp;
-            _ui.m_comTipsBase.m_grpScore.visible = isDressUp;
-            if (!isDressUp) return;
+            bool isDressUpOrCard = itemCfg.itemType == ConstItemType.DRESS_UP || itemCfg.itemType == ConstItemType.CARD;
+            _ui.m_comTipsBase.m_loaRarity.visible = isDressUpOrCard;
+            _ui.m_comTipsBase.m_grpScore.visible = isDressUpOrCard;
+            if (!isDressUpOrCard) return;
             _ui.m_comTipsBase.m_txtGong.text = "" + itemCfg.score1;
             _ui.m_comTipsBase.m_txtShang.text = "" + itemCfg.score2;
             _ui.m_comTipsBase.m_txtJue.text = "" + itemCfg.score3;

GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -2,12 +2,6 @@ using UI.DressUp;
 using FairyGUI;
 using UnityEngine;
 using System.Collections.Generic;
-using System;
-using ET;
-using System.Collections;
-using System.Threading.Tasks;
-using UI.Arena;
-using UI.CommonGame;
 
 namespace GFGGame
 {

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -3,7 +3,6 @@ using FairyGUI;
 using UnityEngine;
 using System.Collections.Generic;
 using ET;
-using static UnityEditor.Progress;
 
 namespace GFGGame
 {