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

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -11,7 +11,11 @@
     <text id="n11_si5z" name="txtDesc" xy="375,240" size="506,166" group="n12_si5z" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
     <text id="n28_s5s9" name="txtExchangeCount" xy="243,365" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
     <group id="n12_si5z" name="n12" xy="40,109" size="866,313" group="n33_l500" advanced="true"/>
-    <list id="n32_l500" name="listItem" xy="205,442" pivot="0.5,0" size="569,131" group="n33_l500" layout="row" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <list id="n32_l500" name="listItem" xy="205,442" pivot="0.5,0" size="569,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>

GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs

@@ -14,6 +14,8 @@ namespace GFGGame
         private int _itemId;
         private long _count;
         private List<int[]> _itemList = new List<int[]>();
+        // private LongPressGesture _longPressAdd;
+        // private LongPressGesture _longPressMinus;
 
         public override void Dispose()
         {
@@ -78,11 +80,8 @@ namespace GFGGame
             _ui.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemCfg.id)).FlushVars();
             _ui.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;
             _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
-            RarityIconController.UpdateRarityIcon(_ui.m_loaRarity, itemCfg.id, false);
-            _ui.m_loaRarity.visible = itemCfg.itemType == ConstItemType.DRESS_UP;
-            _ui.m_txtExchangeCount.visible = false;
-            _ui.m_comCost.target.visible = false;
-
+            _ui.m_txtRmbCost.visible = false;
+            
             UpdateThItemList(itemCfg);
             _ui.m_listItem.numItems = _itemList.Count; //itemCfg.itemsArr.Length;
             _ui.m_listItem.visible = itemCfg.itemType == ConstItemType.USEABLE &&