礼包

FGUIProject/assets/Store/components/ListGiftItem.xml

@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="460,270">
-  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="1"/>
-  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="1"/>
+  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="1">
+    <remark page="0" value="可购买"/>
+    <remark page="1" value="已售罄"/>
+  </controller>
+  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0">
+    <remark page="0" value="未解锁"/>
+    <remark page="1" value="已解锁"/>
+  </controller>
   <displayList>
     <image id="n22_10not" name="n22" src="hhx91f" fileName="imagesNew/GiftBag_baseboard1.png" xy="26,0"/>
     <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="0,-1" group="n26_10not"/>
@@ -14,21 +20,18 @@
     <group id="n26_10not" name="grpDiscount" xy="0,-1" size="100,96" advanced="true"/>
     <loader id="n23_10not" name="icon" xy="61,55" size="162,162" aspect="true" url="ui://p9mtgheohhx91n" fill="scaleMatchHeight"/>
     <text id="n27_10not" name="txtName" xy="340,26" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
-    <text id="n29_10not" name="txtEndTime" xy="81,220" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" text="1天后下架">
-      <gearDisplay controller="c1" pages="0"/>
-    </text>
-    <text id="n32_10not" name="txtLimit" xy="241,76" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）">
-      <gearDisplay controller="c1" pages="0"/>
-    </text>
+    <text id="n29_10not" name="txtEndTime" xy="81,220" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" text="1天后下架"/>
+    <text id="n32_10not" name="txtLimit" xy="241,76" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
     <text id="n31_10not" name="txtLock" xy="339,120" pivot="0.5,0" anchor="true" size="210,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
-      <gearDisplay controller="c2" pages="1"/>
+      <gearDisplay controller="c2" pages="0"/>
     </text>
     <text id="n44_iftf" name="n44" xy="280,120" size="112,49" fontSize="36" color="#a59f8f" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="0" condition="0"/>
+      <gearDisplay2 controller="c2" pages="1" condition="0"/>
     </text>
     <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="-7,-29">
       <gearDisplay controller="c1" pages="1"/>
+      <gearDisplay2 controller="c2" pages="0" condition="1"/>
     </image>
     <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="257,184"/>
   </displayList>

FGUIProject/assets/Store/components/ListShopItem.xml

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="290,455">
-  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="1"/>
-  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0"/>
+  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="0">
+    <remark page="0" value="可购买"/>
+    <remark page="1" value="已售罄"/>
+  </controller>
+  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="1">
+    <remark page="0" value="未解锁"/>
+    <remark page="1" value="已解锁"/>
+  </controller>
   <displayList>
     <image id="n22_10not" name="n22" src="hhx9w" fileName="imagesNew/GiftBag_baseboard.png" xy="0,0"/>
-    <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="191,263" group="n54_l500"/>
-    <text id="n48_l500" name="n48" xy="208,271" size="69,46" group="n54_l500" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
+    <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="191,263" group="n26_10not"/>
+    <text id="n48_l500" name="n48" xy="208,271" size="69,46" group="n26_10not" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
     <text id="n49_l500" name="txtDesc" xy="205,301" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
     <text id="n50_l500" name="n50" xy="254,314" size="19,31" group="n51_l500" fontSize="22" color="#ffffff" letterSpacing="-2" text="%"/>
-    <group id="n51_l500" name="n51" xy="205,301" size="68,52" group="n54_l500" advanced="true" layout="hz" colGap="-6" excludeInvisibles="true">
+    <group id="n51_l500" name="n51" xy="205,301" size="68,52" group="n26_10not" advanced="true" layout="hz" colGap="-6" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <group id="n54_l500" name="n54" xy="191,263" size="100,96" group="n26_10not"/>
     <group id="n26_10not" name="grpDiscount" xy="191,263" size="100,96" advanced="true"/>
     <loader id="n23_10not" name="icon" xy="61,169" size="162,162" aspect="true" url="ui://p9mtgheohhx91n" fill="scaleMatchHeight"/>
     <text id="n27_10not" name="txtName" xy="145,72" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
-    <text id="n29_10not" name="txtEndTime" xy="89,340" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" text="1天后下架">
-      <gearDisplay controller="c1" pages="0"/>
+    <text id="n29_10not" name="txtEndTime" xy="89,340" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" vars="true" text="{value=1天}后下架"/>
+    <text id="n56_l500" name="txtLimit" xy="45,121" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
+    <text id="n31_10not" name="txtLock" xy="145,150" pivot="0.5,0" anchor="true" size="210,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
+      <gearDisplay controller="c2" pages="0"/>
     </text>
-    <text id="n32_10not" name="txtLimit" xy="45,121" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）">
-      <gearDisplay controller="c1" pages="0"/>
-    </text>
-    <text id="n31_10not" name="txtLock" xy="145,121" pivot="0.5,0" anchor="true" size="210,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
+    <text id="n57_l500" name="n57" xy="93,157" size="112,49" fontSize="36" color="#a59f8f" align="center" text="已售罄">
       <gearDisplay controller="c2" pages="1"/>
     </text>
-    <text id="n44_iftf" name="n44" xy="89,330" size="112,49" fontSize="36" color="#a59f8f" align="center" text="已售罄">
-      <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="0" condition="0"/>
-    </text>
-    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="0,-84" size="291,600">
+    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="0,-72" size="291,600">
       <gearDisplay controller="c1" pages="1"/>
     </image>
     <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="71,390"/>

GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -138,8 +138,8 @@ namespace GFGGame
             for (int i = 0; i < _giftCfgs.Count; i++)
             {
                 GiftBagCfg cfg = _giftCfgs[i];
-                bool isUnLock = ShopDataManager.Instance.GetGiftStateById(cfg.id);
-                int buyNum = ShopDataManager.Instance.GetGiftBuyNumById(cfg.id);
+                bool isUnLock = ShopDataManager.Instance.GetShopGoodsStateById(cfg.id);
+                int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(cfg.id);
                 bool canBuy = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? true : false;
                 if (isUnLock && canBuy && cfg.price == 0) return true;
 

GameClient/Assets/Game/HotUpdate/Data/RoleDataManager.cs

@@ -194,6 +194,22 @@ namespace GFGGame
             roleName = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRoleName();
             roleId = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().CurrentRoleId;
         }
+        /// <summary>
+        /// 检测是否开通指定类型月卡
+        /// </summary>
+        /// <returns></returns>
+        public static bool CheckIsMonthCardOpenByType(int monthCardType)
+        {
+            if (monthCardType == MonthCardType.Gold)
+            {
+                return TimeHelper.ServerNow() < GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldEndTime);
+            }
+            else if (monthCardType == MonthCardType.BlackGold)
+            {
+                return TimeHelper.ServerNow() < GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldEndTime);
+            }
+            return false;
+        }
         public static OtherRoleInfoData GetOtherRoleInfoData(OtherRoleInfoProto otherRoleInfo)
         {
             OtherRoleInfoData otherRoleInfoData = new OtherRoleInfoData();

GameClient/Assets/Game/HotUpdate/Data/ShopDataManager.cs

@@ -10,6 +10,7 @@ namespace GFGGame
         public static int NONE = 0;
         public static int STORY_LV = 1;
         public static int ROLE_LV = 2;
+        public static int MONTH_CARD_TYPE = 3;
     }
 
     public class CostType
@@ -24,12 +25,12 @@ namespace GFGGame
         public string[] refreshType = { "永久限购", "每日限购", "每周限购", "每月限购" };
 
         private Dictionary<int, int> _rechargeDic = new Dictionary<int, int>();
-        private Dictionary<int, int> _giftDic = new Dictionary<int, int>();
+        private Dictionary<int, int> _goodsDic = new Dictionary<int, int>();
         private Dictionary<int, int> _exchangeDic = new Dictionary<int, int>();
         public void Clear()
         {
             _rechargeDic.Clear();
-            _giftDic.Clear();
+            _goodsDic.Clear();
             _exchangeDic.Clear();
         }
         public void UpdateRechargeData(int rechargeId, int num)
@@ -45,13 +46,13 @@ namespace GFGGame
         }
         public void UpdateGiftData(int giftId, int num)
         {
-            if (!_giftDic.ContainsKey(giftId))
+            if (!_goodsDic.ContainsKey(giftId))
             {
-                _giftDic.Add(giftId, num);
+                _goodsDic.Add(giftId, num);
             }
             else
             {
-                _giftDic[giftId] = num;
+                _goodsDic[giftId] = num;
             }
         }
         public void UpdateExchangeData(int exchangeId, int num)
@@ -140,13 +141,13 @@ namespace GFGGame
             return !_rechargeDic.ContainsKey(rechargeId) ? 0 : _rechargeDic[rechargeId];
         }
         /// <summary>
-        /// 根据礼包id获取购买次数
+        /// 根据商品id获取购买次数
         /// </summary>
-        /// <param name="giftId"></param>
+        /// <param name="goodsId"></param>
         /// <returns></returns>
-        public int GetGiftBuyNumById(int giftId)
+        public int GetGoodsBuyNumById(int goodsId)
         {
-            return !_giftDic.ContainsKey(giftId) ? 0 : _giftDic[giftId];
+            return !_goodsDic.ContainsKey(goodsId) ? 0 : _goodsDic[goodsId];
         }
         /// <summary>
         /// 根据充值id获取购买次数
@@ -181,14 +182,14 @@ namespace GFGGame
             {
 
                 //未售罄的＞未解锁>已售罄的
-                int buyTypeA = (a.maxBuyNum == 0 || a.maxBuyNum - GetGiftBuyNumById(a.id) > 0) ? 1 : -1;
-                int buyTypeB = (b.maxBuyNum == 0 || b.maxBuyNum - GetGiftBuyNumById(b.id) > 0) ? 1 : -1;
+                int buyTypeA = (a.maxBuyNum == 0 || a.maxBuyNum - GetGoodsBuyNumById(a.id) > 0) ? 1 : -1;
+                int buyTypeB = (b.maxBuyNum == 0 || b.maxBuyNum - GetGoodsBuyNumById(b.id) > 0) ? 1 : -1;
                 if (buyTypeA > buyTypeB) return -1;
                 if (buyTypeA < buyTypeB) return 1;
 
                 //解锁状态
-                int lockA = GetGiftStateById(a.id) ? 1 : -1;
-                int lockB = GetGiftStateById(b.id) ? 1 : -1;
+                int lockA = GetShopGoodsStateById(a.id) ? 1 : -1;
+                int lockB = GetShopGoodsStateById(b.id) ? 1 : -1;
                 if (lockA > lockB) return -1;
                 if (lockA < lockB) return 1;
 
@@ -246,7 +247,7 @@ namespace GFGGame
             });
             for (int i = 0; i < giftBagCfgs.Count; i++)
             {
-                if (GetGiftStateById(giftBagCfgs[i].id) && (GetGiftBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
+                if (GetShopGoodsStateById(giftBagCfgs[i].id) && (GetGoodsBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
             }
             return giftBagCfgs[0];
         }
@@ -264,7 +265,7 @@ namespace GFGGame
             });
             for (int i = 0; i < giftBagCfgs.Count; i++)
             {
-                if (GetGiftStateById(giftBagCfgs[i].id) && (GetGiftBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
+                if (GetShopGoodsStateById(giftBagCfgs[i].id) && (GetGoodsBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
             }
             return giftBagCfgs[0];
         }
@@ -284,13 +285,13 @@ namespace GFGGame
             return shopExchangeCfgs;
         }
         /// <summary>
-        /// 根据礼包Id获取礼包解锁状态
+        /// 根据商品Id获取商品是否解锁解锁
         /// /// </summary>
-        /// <param name="giftId"></param>
+        /// <param name="goodsId"></param>
         /// <returns></returns>
-        public bool GetGiftStateById(int giftId)
+        public bool GetShopGoodsStateById(int goodsId)
         {
-            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
+            ShopCfg cfg = ShopCfgArray.Instance.GetCfg(goodsId);
 
             if (cfg.lockType == LockType.NONE)
             {
@@ -300,6 +301,10 @@ namespace GFGGame
             {
                 return InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
             }
+            else if (cfg.lockType == LockType.MONTH_CARD_TYPE)
+            {
+                return RoleDataManager.CheckIsMonthCardOpenByType(cfg.MonthlyCardType);
+            }
             else
             {
                 return GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= cfg.lv;

GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagBuyView.cs

@@ -46,7 +46,7 @@ namespace GFGGame
             _ui.m_txtName.text = cfg.name;
             _ui.m_loaIcon.url = ResPathUtil.GetIconPath(cfg.res, "png");//string.Format("ui://RechargeStore/{0}", cfg.res);
             _ui.m_list.numItems = cfg.itemsArr.Length;
-            _ui.m_c1.selectedIndex = ShopDataManager.Instance.GetGiftStateById(_giftId) ? 0 : 1;
+            _ui.m_c1.selectedIndex = ShopDataManager.Instance.GetShopGoodsStateById(_giftId) ? 0 : 1;
             if (cfg.lockType == LockType.STORY_LV)
             {
                 StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLevelId);
@@ -56,7 +56,7 @@ namespace GFGGame
             {
                 _ui.m_txtLock.text = string.Format("角色达到{0}级解锁", cfg.lv);
             }
-            int buyNum = ShopDataManager.Instance.GetGiftBuyNumById(cfg.id);
+            int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(cfg.id);
             _ui.m_txtLimit.text = string.Format("{0}({1}/{2})", ShopDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
             // if (cfg.refreshType == RefreshType.NONE) _ui.m_txtLimit.text = "永久限购";
             _ui.m_txtEndTime.text = ShopDataManager.Instance.GetEndTime(cfg.id);

GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagStoreView.cs

@@ -56,43 +56,48 @@ namespace GFGGame
 
         private void ListItemRenderer(int index, GObject obj)
         {
-            // UI_ListShopItem item = UI_ListShopItem.Proxy(obj);
-            // ShopCfg cfg = _giftCfgs[index];
+            UI_ListShopItem item = UI_ListShopItem.Proxy(obj);
+            ShopCfg shopCfg = _shopCfgs[index];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
 
-            // item.m_txtName.text = cfg.name;
-            // item.m_icon.url = ResPathUtil.GetIconPath(cfg.res, "png"); // string.Format("ui://RechargeStore/{0}", cfg.res);
+            item.m_txtName.text = shopCfg.itemName;
+            item.m_icon.url = ResPathUtil.GetIconPath(itemCfg); // string.Format("ui://RechargeStore/{0}", cfg.res);
 
-            // item.m_txtDesc.SetVar("count", cfg.desc).FlushVars(); ;
-            // item.m_grpDiscount.visible = cfg.desc != "";
+            item.m_grpDiscount.visible = shopCfg.price < shopCfg.originalPrice;
+            item.m_txtDesc.text = ((double)(shopCfg.originalPrice / shopCfg.price) * 100).ToString();
 
-            // item.m_txtEndTime.text = StoreDataManager.Instance.GetEndTime(cfg.id);
-            // item.m_grpEndTime.visible = cfg.endTime != "";
+            item.m_txtEndTime.SetVar("value", ShopDataManager.Instance.GetEndTime(shopCfg.id)).FlushVars();
+            item.m_txtEndTime.visible = shopCfg.endTime != "";
 
-            // item.m_c2.selectedIndex = StoreDataManager.Instance.GetGiftStateById(cfg.id) ? 0 : 1;
-            // if (cfg.lockType == LockType.STORY_LV)
-            // {
-            //     StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLevelId);
-            //     item.m_txtLock.text = string.Format("通关{0}-{1}解锁", StoryUtil.GetChapterOrder(storyLevelCfg.chapterId), storyLevelCfg.order);
-            // }
-            // else if (cfg.lockType == LockType.ROLE_LV)
-            // {
-            //     item.m_txtLock.text = string.Format("角色达到{0}级解锁", cfg.lv);
-            // }
+            item.m_c2.selectedIndex = ShopDataManager.Instance.GetShopGoodsStateById(shopCfg.id) ? 0 : 1;
+            if (shopCfg.lockType == LockType.STORY_LV)
+            {
+                StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(shopCfg.storyLevelId);
+                item.m_txtLock.text = string.Format("通关{0}-{1}解锁", StoryUtil.GetChapterOrder(storyLevelCfg.chapterId), storyLevelCfg.order);
+            }
+            else if (shopCfg.lockType == LockType.ROLE_LV)
+            {
+                item.m_txtLock.text = string.Format("角色达到{0}级解锁", shopCfg.lv);
+            }
+            else if (shopCfg.lockType == LockType.MONTH_CARD_TYPE)
+            {
+                item.m_txtLock.text = string.Format("开通{0}解锁", shopCfg.MonthlyCardType == MonthCardType.Gold ? "金卡" : "黑金卡");
+            }
 
-            // int buyNum = StoreDataManager.Instance.GetGiftBuyNumById(cfg.id);
-            // item.m_txtLimit.text = string.Format("{0}({1}/{2})", StoreDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
-            // item.m_txtLimit.visible = cfg.maxBuyNum > 0;
-            // item.m_c1.selectedIndex = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? 0 : 1;
+            int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
+            item.m_txtLimit.text = string.Format("{0}({1}/{2})", ShopDataManager.Instance.refreshType[shopCfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), shopCfg.maxBuyNum);
+            item.m_txtLimit.visible = shopCfg.maxBuyNum > 0;
+            item.m_c1.selectedIndex = shopCfg.maxBuyNum == 0 || buyNum < shopCfg.maxBuyNum ? 0 : 1;
             // if (item.m_c1.selectedIndex == 0)
             // {
-            //     item.m_btnBuy.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
-            //     if (cfg.price > 0 && cfg.costType != CostType.FREE)
+            //     item.m_btnBuy.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.originalPrice);// cfg.originalPrice.ToString();
+            //     if (shopCfg.price > 0 && shopCfg.costType != CostType.FREE)
             //     {
-            //         item.m_btnBuy.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
+            //         item.m_btnBuy.m_grpOriginalPrice.visible = shopCfg.originalPrice > 0;
             //         item.m_btnBuy.m_grpIcon.visible = true;
-            //         item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
+            //         item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.price);// cfg.price.ToString();
 
-            //         if (cfg.costType == CostType.RMB)
+            //         if (shopCfg.costType == CostType.RMB)
             //         {
             //             item.m_btnBuy.m_loaIcon.visible = false;
             //             item.m_btnBuy.m_txtIcon.visible = true;
@@ -100,7 +105,7 @@ namespace GFGGame
             //         }
             //         else
             //         {
-            //             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.costId);
+            //             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.costId);
             //             item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
             //             item.m_btnBuy.m_loaIcon.visible = true;
             //             item.m_btnBuy.m_txtIcon.visible = false;
@@ -118,11 +123,11 @@ namespace GFGGame
             // {
             //     item.target.onClick.Add(OnBtnBuyClick);
             // }
-            // item.target.data = cfg.id;
-            // bool isRed = item.m_c1.selectedIndex == 0 && item.m_c2.selectedIndex == 0 && cfg.price == 0;
+            // item.target.data = shopCfg.id;
+            // bool isRed = item.m_c1.selectedIndex == 0 && item.m_c2.selectedIndex == 0 && shopCfg.price == 0;
 
             // RedDotController.Instance.SetComRedDot(item.target, isRed, "", -6, 100);
-            // UI_ListShopItem.ProxyEnd();
+            UI_ListShopItem.ProxyEnd();
         }
     }
 }