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/ComRewardItem.xml

@@ -2,7 +2,7 @@
 <component size="204,232">
   <displayList>
     <image id="n2_m9wm" name="n2" src="m9wm8s" fileName="images/gxhd_gd_dik.png" xy="0,0"/>
-    <loader id="n3_m9wm" name="loaIcon" xy="40,40" pivot="0.5,0.5" size="116,116" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <loader id="n3_m9wm" name="loaIcon" xy="40,40" pivot="0.5,0.5" size="116,116" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scaleMatchHeight"/>
     <text id="n5_m9wm" name="txtCount" xy="167,160" pivot="1,1" size="29,36" fontSize="26" color="#efd78d" text="x1"/>
     <text id="n4_m9wm" name="txtName" xy="98,196" pivot="0.5,0" anchor="true" size="106,36" fontSize="26" color="#fdedbe" text="赵钱孙李"/>
     <image id="n6_kzte" name="imgOnceBonus" src="kzteths" fileName="images/gxhd_scjlscjl.png" xy="8,134"/>

FGUIProject/assets/Main/components/ComResultProMask.xml

@@ -4,6 +4,7 @@
     <image id="n5_fqor" name="imgMask" src="qkjsl9" fileName="imagesNew/pro_activate.png" xy="0,0" size="850,239">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
+    <image id="n6_o4m7" name="bar" src="qkjsl9" fileName="imagesNew/pro_activate.png" xy="0,108" fillMethod="hz"/>
     <graph id="n4_fqor" name="holder" xy="424,110" size="1,1"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ProgressBar3.xml

@@ -4,7 +4,7 @@
     <image id="n0_qkjs" name="n0" src="qkjsla" fileName="imagesNew/pro_bk_in.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_qkjs" name="bar" src="qkjsl9" fileName="imagesNew/pro_activate.png" xy="37,5" fillMethod="hz"/>
+    <image id="n1_qkjs" name="bar" src="qkjsl9" fileName="imagesNew/pro_activate.png" xy="37,5" size="0,24" fillMethod="hz"/>
     <component id="n4_fqor" name="comHolder" src="fqoro3" fileName="components/ComResultProMask.xml" xy="36,-103"/>
     <graph id="n6_fqor" name="holder" xy="885,16" pivot="0.5,0.5" anchor="true" size="1,1">
       <relation target="n4_fqor" sidePair="right-right"/>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComResultProMask.cs

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public GImage m_imgMask;
+        public GImage m_bar;
         public GGraph m_holder;
         public const string URL = "ui://mfvz4q8kfqoro3";
         public const string PACKAGE_NAME = "Main";
@@ -57,11 +58,13 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_imgMask = (GImage)comp.GetChild("imgMask");
+            m_bar = (GImage)comp.GetChild("bar");
             m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_imgMask = null;
+            m_bar = null;
             m_holder = null;
             if(disposeTarget && target != null)
             {

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

@@ -363,6 +363,11 @@ namespace GFGGame
                 return;
             }
 
+            if (!DressUpMenuItemDataManager.CheckHasItem(id))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("还未获得这件装扮");
+                return;
+            }
             MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
             UpdateStepBtn(true);

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

@@ -417,6 +417,11 @@ namespace GFGGame
                 return;
             }
 
+            if (!DressUpMenuItemDataManager.CheckHasItem(id))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("还未获得这件装扮");
+                return;
+            }
             MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
             UpdateStepBtn(true);

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

@@ -3,6 +3,7 @@ using FairyGUI;
 using UnityEngine;
 using System.Collections.Generic;
 using ET;
+using static UnityEditor.Progress;
 
 namespace GFGGame
 {
@@ -369,6 +370,11 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(id);
             if (itemCfg != null)
             {
+                if(!DressUpMenuItemDataManager.CheckHasItem(itemCfg.id))
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("还未获得这件装扮");
+                    return;
+                }
                 MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
             }
             else

GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -76,7 +76,7 @@ namespace GFGGame
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightResult"));
-
+            _ui.m_comExpBar.m_proExp.m_comHolder.target.width = 0;
             AddEffect();
         }
         private void AddEffect()