Merge branch 'zhaoyang' into yujie

* zhaoyang:
  商城
  雅集调整
  整理服装店
  充值

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs
#	GameClient/Assets/Game/HotUpdate/Views/League/LeagueApplyView.cs
#	GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberLogView.cs
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

FGUIProject/assets/Store/RechargeStoreUI.xml → FGUIProject/assets/Store/ChargeUI.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
   <displayList>
-    <component id="n32_hhx9" name="n32" src="fqor7x" fileName="StoreUI.xml" xy="0,0"/>
     <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
-    <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="ComVipLv.xml" xy="62,493"/>
+    <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
     <list id="n10_d4iw" name="list" xy="0,793" size="1080,1033" layout="flow_hz" overflow="hidden" colGap="20" defaultItem="ui://p9mtgheohhx91i" align="center" scrollItemToViewOnClick="false">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>

FGUIProject/assets/Store/ComVipLv.xml → FGUIProject/assets/Store/components/ComVipLv.xml

@@ -5,15 +5,15 @@
     <text id="n34_hhx9" name="txtLv" xy="60,65" pivot="0.5,0" size="128,94" group="n38_hhx9" font="ui://p9mtgheohhx91g" fontSize="28" color="#8c8580" text="45"/>
     <text id="n35_hhx9" name="n35" xy="38,114" size="31,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="lv."/>
     <image id="n36_hhx9" name="n36" src="fqortau" fileName="imagesNew/sc_xian.png" xy="31,152" size="168,4" group="n38_hhx9"/>
-    <text id="n37_hhx9" name="n37" xy="57,154" size="116,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="累计充值"/>
+    <text id="n37_hhx9" name="n37" xy="57,154" size="116,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="会员等级"/>
     <group id="n38_hhx9" name="n38" xy="31,65" size="168,128"/>
     <component id="n39_hhx9" name="proExp" src="hhx91p" fileName="components/ProgressBar1.xml" xy="250,139">
       <ProgressBar value="50" max="100"/>
     </component>
     <text id="n40_hhx9" name="n40" xy="265,86" size="100,44" group="n43_hhx9" fontSize="32" color="#8c8580" text="再获得"/>
     <loader id="n41_hhx9" name="loaIcon" xy="365,86" size="45,45" group="n43_hhx9" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n42_hhx9" name="txtTips" xy="410,87" size="323,44" group="n43_hhx9" fontSize="32" color="#8c8580" ubb="true" vars="true" text="{exp=0}经验可升级为[color=#5A3E16]{lv=0}[/color]级会员"/>
-    <group id="n43_hhx9" name="n43" xy="265,86" size="468,45" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <text id="n42_hhx9" name="txtTips" xy="410,87" size="323,44" group="n43_hhx9" fontSize="32" color="#8c8580" ubb="true" vars="true" text="{exp=0}积分可升级为[color=#5A3E16]{lv=0}[/color]级会员"/>
+    <group id="n43_hhx9" name="grpTips" xy="265,86" size="468,45" advanced="true" layout="hz" excludeInvisibles="true"/>
     <component id="n44_hhx9" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="862,63" size="52,52">
       <Button icon="ui://p9mtgheofqortar"/>
     </component>

FGUIProject/assets/Store/package.xml

@@ -65,7 +65,6 @@
     <image id="fqortb8" name="sc_yeqian_zhedang.png" path="/imagesNew/"/>
     <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
     <component id="10nota8" name="ItemExchangeUI.xml" path="/" exported="true"/>
-    <component id="d4iw0" name="RechargeStoreUI.xml" path="/" exported="true"/>
     <component id="fqor7x" name="StoreUI.xml" path="/" exported="true"/>
     <component id="hhx90" name="ComZhuangShi.xml" path="/components/"/>
     <image id="hhx91" name="VipLevel_baseboard.png" path="/imagesNew/"/>
@@ -129,8 +128,9 @@
     <image id="hhx91n" name="sc_zizhuan_5.png" path="/imagesExport/" exported="true"/>
     <image id="hhx91o" name="sc_zizhuan_6.png" path="/imagesExport/" exported="true"/>
     <component id="hhx91p" name="ProgressBar1.xml" path="/components/"/>
-    <image id="hhx91q" name="sc_beijing.png" path="/imagesNew/"/>
-    <component id="hhx91r" name="ComVipLv.xml" path="/"/>
+    <image id="hhx91q" name="sc_beijing.png" path="/imagesNew/" atlas="alone_npot"/>
+    <component id="hhx91r" name="ComVipLv.xml" path="/components/"/>
+    <component id="l500tb9" name="ChargeUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Editor/Excel/ExcelChecker.cs

@@ -119,12 +119,11 @@ namespace GFGEditor
 
         private static void CheckClothingShopCfg()
         {
-            ShopCfgClothingArray cfgArray = ShopCfgClothingArray.Instance;
-            ShopCfg[] dataArray = cfgArray.dataArray;
+            List<ShopCfg> dataArray = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.FU_ZHUANG_DIAN, ConstStoreSubId.FU_ZHUANG_DIAN);
             foreach (ShopCfg cfg in dataArray)
             {
-                CheckItemIdExist(cfg.itemID, "商城ClothingShopCfg.itemID");
-                CheckItemIdExist(cfg.costID, "商城ClothingShopCfg.costID");
+                CheckItemIdExist(cfg.itemId, "商城ClothingShopCfg.itemID");
+                CheckItemIdExist(cfg.costId, "商城ClothingShopCfg.costID");
             }
         }
 

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -126,35 +126,19 @@ namespace GFGEditor
         /// <returns></returns>
         private static string GetClothingShopApproach(int itemId)
         {
-            ShopCfgClothingArray manager = ShopCfgClothingArray.Instance;
-            ShopCfg[] dataArray = manager.dataArray;
+            List<ShopCfg> dataArray = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.FU_ZHUANG_DIAN, ConstStoreSubId.FU_ZHUANG_DIAN);
             foreach (ShopCfg cfg in dataArray)
             {
-                if (cfg.itemID == itemId)
+                if (cfg.itemId == itemId)
                 {
                     return "FU_ZHUANG_DIAN=" + ConstStoreId.CLOTHING_STORE_ID; ;
                 }
             }
-            ShopCfg[] shopCfgCJs = ShopCfgCJArray.Instance.dataArray;
-            foreach (ShopCfg cfg in shopCfgCJs)
-            {
-                if (cfg.itemID == itemId)
-                {
-                    return "FU_ZHUANG_DIAN=" + ConstStoreId.LUCKY_BOX_STORE_ID;
-                }
-            }
-            ShopCfg[] shopCfgCJAs = ShopCfgCJAArray.Instance.dataArray;
-            foreach (ShopCfg cfg in shopCfgCJAs)
-            {
-                if (cfg.itemID == itemId)
-                {
-                    return "FU_ZHUANG_DIAN=" + ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID;
-                }
-            }
-            ShopCfg[] shopCfgGallerys = ShopCfgGalleryArray.Instance.dataArray;
+
+            List<ShopCfg> shopCfgGallerys = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY);
             foreach (ShopCfg cfg in shopCfgGallerys)
             {
-                if (cfg.itemID == itemId)
+                if (cfg.itemId == itemId)
                 {
                     return "FU_ZHUANG_DIAN=" + ConstStoreId.GALLERY_STORE_ID;
                 }
@@ -414,18 +398,18 @@ namespace GFGEditor
         /// <returns></returns>
         private static string CheckGiftBagApproach(int itemId)
         {
-            GiftBagCfgArray manager = GiftBagCfgArray.Instance;
-            GiftBagCfg[] dataArray = manager.dataArray;
-            for (int i = 0; i < dataArray.Length; i++)
-            {
-                for (int j = 0; j < dataArray[i].itemsArr.Length; j++)
-                {
-                    if (dataArray[i].itemsArr[j][0] == itemId)
-                    {
-                        return ConstFunctionId.SHOP_GIFT_BAG + "=1";
-                    }
-                }
-            }
+            // GiftBagCfgArray manager = GiftBagCfgArray.Instance;
+            // GiftBagCfg[] dataArray = manager.dataArray;
+            // for (int i = 0; i < dataArray.Length; i++)
+            // {
+            //     for (int j = 0; j < dataArray[i].itemsArr.Length; j++)
+            //     {
+            //         if (dataArray[i].itemsArr[j][0] == itemId)
+            //         {
+            //             return ConstFunctionId.SHOP_GIFT_BAG + "=1";
+            //         }
+            //     }
+            // }
             return null;
         }
         /// <summary>
@@ -435,15 +419,15 @@ namespace GFGEditor
         /// <returns></returns>
         private static string CheckShopExchangeApproach(int itemId)
         {
-            ShopExchangeCfgArray manager = ShopExchangeCfgArray.Instance;
-            ShopExchangeCfg[] dataArray = manager.dataArray;
-            for (int i = 0; i < dataArray.Length; i++)
-            {
-                if (dataArray[i].itemId == itemId)
-                {
-                    return ConstFunctionId.SHOP_EXCHANGE + "=2";
-                }
-            }
+            // ShopExchangeCfgArray manager = ShopExchangeCfgArray.Instance;
+            // ShopExchangeCfg[] dataArray = manager.dataArray;
+            // for (int i = 0; i < dataArray.Length; i++)
+            // {
+            //     if (dataArray[i].itemId == itemId)
+            //     {
+            //         return ConstFunctionId.SHOP_EXCHANGE + "=2";
+            //     }
+            // }
             return null;
         }
         /// <summary>

GameClient/Assets/Editor/Excel/Scanner/ShopScanner.cs

@@ -15,26 +15,28 @@ namespace GFGEditor
         public static void StartScan()
         {
             WriteClothingShop();
-            WriteCJShop();
-            WriteCJAShop();
+            // WriteCJShop();
+            // WriteCJAShop();
             WriteGalleryShop();
         }
 
         public static void WriteClothingShop()
         {
+
             Dictionary<int, string> _typeIndexDic = new Dictionary<int, string>();
-            SQLiteHelper.Instance.OpenConnection();
             try
             {
+                List<ShopCfg> clothingShopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.FU_ZHUANG_DIAN, ConstStoreSubId.FU_ZHUANG_DIAN);
                 string typeIndex = "";
                 int itemId;
                 int id;
-                var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgClothingArray");
-                while (reader.Read())
+
+                int index = 0;
+                while (index < clothingShopCfgs.Count)
                 {
-                    typeIndex = reader["_typeIndex"].ToString();
-                    itemId = int.Parse(reader["_itemId"].ToString());
-                    id = int.Parse(reader["_id"].ToString());
+                    typeIndex = clothingShopCfgs[index].typeIndex.ToString();// reader["_typeIndex"].ToString();
+                    itemId = clothingShopCfgs[index].itemId;//  int.Parse(reader["_itemId"].ToString());
+                    id = clothingShopCfgs[index].id;// int.Parse(reader["_id"].ToString());
 
                     int count;
                     if (Array.IndexOf(_shopItemType, typeIndex) >= 0)
@@ -56,18 +58,18 @@ namespace GFGEditor
                         }
                     }
                     _typeIndexDic.Add(id, count.ToString());
+                    index++;
                 }
             }
-            catch (System.Exception e)
+            catch (Exception e)
             {
-                ET.Log.Error(e);
+                ET.Log.Error(e.ToString());
             }
             finally
             {
                 SQLiteHelper.Instance.CloseConnection();
             }
 
-
             SQLiteHelper.Instance.OpenConnection();
             try
             {
@@ -76,7 +78,7 @@ namespace GFGEditor
                 {
                     var names = new string[] { "typeIndex" };
                     var values = new string[] { "" + _typeIndexDic[key] };
-                    SQLiteHelper.Instance.UpdateValues(nameof(ShopCfgClothingArray), names, values, "id", key.ToString());
+                    SQLiteHelper.Instance.UpdateValues(nameof(ShopCfgArray), names, values, "id", key.ToString());
                 }
             }
             catch (Exception e)
@@ -92,228 +94,228 @@ namespace GFGEditor
 
         public static void WriteCJShop()
         {
-            Dictionary<int, string> _typeIndexDic = new Dictionary<int, string>();
-            SQLiteHelper.Instance.OpenConnection();
-            try
-            {
-                string typeIndex = "";
-                int itemId;
-                int id;
-                var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgCJArray");
-                while (reader.Read())
-                {
-                    typeIndex = reader["_typeIndex"].ToString();
-                    itemId = int.Parse(reader["_itemId"].ToString());
-                    id = int.Parse(reader["_id"].ToString());
-
-                    int count;
-                    if (Array.IndexOf(_shopItemType, typeIndex) >= 0)
-                    {
-                        count = Array.IndexOf(_shopItemType, typeIndex);
-                    }
-                    else
-                    {
-                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-                        string itemType = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType).type.ToString();
-
-                        if (Array.IndexOf(_shopItemType, itemType) >= 0)
-                        {
-                            count = Array.IndexOf(_shopItemType, itemType);
-                        }
-                        else
-                        {
-                            count = _shopItemType.Length - 1;
-                        }
-                    }
-                    _typeIndexDic.Add(id, count.ToString());
-                }
-            }
-            catch (System.Exception e)
-            {
-                ET.Log.Error(e);
-            }
-            finally
-            {
-                SQLiteHelper.Instance.CloseConnection();
-            }
-
-
-            SQLiteHelper.Instance.OpenConnection();
-            try
-            {
-                ICollection keys = _typeIndexDic.Keys;
-                foreach (int key in keys)
-                {
-
-                    var names = new string[] { "typeIndex" };
-                    var values = new string[] { "" + _typeIndexDic[key] };
-                    SQLiteHelper.Instance.UpdateValues(nameof(ShopCfgCJArray), names, values, "id", key.ToString());
-                }
-            }
-            catch (Exception e)
-            {
-                ET.Log.Error(e.ToString());
-            }
-            finally
-            {
-                SQLiteHelper.Instance.CloseConnection();
-            }
+            // Dictionary<int, string> _typeIndexDic = new Dictionary<int, string>();
+            // SQLiteHelper.Instance.OpenConnection();
+            // try
+            // {
+            //     string typeIndex = "";
+            //     int itemId;
+            //     int id;
+            //     var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgCJArray");
+            //     while (reader.Read())
+            //     {
+            //         typeIndex = reader["_typeIndex"].ToString();
+            //         itemId = int.Parse(reader["_itemId"].ToString());
+            //         id = int.Parse(reader["_id"].ToString());
+
+            //         int count;
+            //         if (Array.IndexOf(_shopItemType, typeIndex) >= 0)
+            //         {
+            //             count = Array.IndexOf(_shopItemType, typeIndex);
+            //         }
+            //         else
+            //         {
+            //             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            //             string itemType = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType).type.ToString();
+
+            //             if (Array.IndexOf(_shopItemType, itemType) >= 0)
+            //             {
+            //                 count = Array.IndexOf(_shopItemType, itemType);
+            //             }
+            //             else
+            //             {
+            //                 count = _shopItemType.Length - 1;
+            //             }
+            //         }
+            //         _typeIndexDic.Add(id, count.ToString());
+            //     }
+            // }
+            // catch (System.Exception e)
+            // {
+            //     ET.Log.Error(e);
+            // }
+            // finally
+            // {
+            //     SQLiteHelper.Instance.CloseConnection();
+            // }
+
+
+            // SQLiteHelper.Instance.OpenConnection();
+            // try
+            // {
+            //     ICollection keys = _typeIndexDic.Keys;
+            //     foreach (int key in keys)
+            //     {
+
+            //         var names = new string[] { "typeIndex" };
+            //         var values = new string[] { "" + _typeIndexDic[key] };
+            //         SQLiteHelper.Instance.UpdateValues(nameof(ShopCfgCJArray), names, values, "id", key.ToString());
+            //     }
+            // }
+            // catch (Exception e)
+            // {
+            //     ET.Log.Error(e.ToString());
+            // }
+            // finally
+            // {
+            //     SQLiteHelper.Instance.CloseConnection();
+            // }
 
         }
 
         public static void WriteCJAShop()
         {
-            Dictionary<int, string> _typeIndexDic = new Dictionary<int, string>();
-
-            SQLiteHelper.Instance.OpenConnection();
-            try
-            {
-                string typeIndex = "";
-                int itemId;
-                int id;
-                var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgCJAArray");
-                while (reader.Read())
-                {
-                    typeIndex = reader["_typeIndex"].ToString();
-                    itemId = int.Parse(reader["_itemId"].ToString());
-                    id = int.Parse(reader["_id"].ToString());
-
-                    int count;
-                    if (Array.IndexOf(_shopItemType, typeIndex) >= 0)
-                    {
-                        count = Array.IndexOf(_shopItemType, typeIndex);
-                    }
-                    else
-                    {
-                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-                        string itemType = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType).type.ToString();
-
-                        if (Array.IndexOf(_shopItemType, itemType) >= 0)
-                        {
-                            count = Array.IndexOf(_shopItemType, itemType);
-                        }
-                        else
-                        {
-                            count = _shopItemType.Length - 1;
-                        }
-                    }
-                    _typeIndexDic.Add(id, count.ToString());
-                }
-            }
-            catch (System.Exception e)
-            {
-                ET.Log.Error(e);
-            }
-            finally
-            {
-                SQLiteHelper.Instance.CloseConnection();
-            }
-
-
-            SQLiteHelper.Instance.OpenConnection();
-            try
-            {
-                ICollection keys = _typeIndexDic.Keys;
-                foreach (int key in keys)
-                {
-
-                    var names = new string[] { "typeIndex" };
-                    var values = new string[] { "" + _typeIndexDic[key] };
-                    SQLiteHelper.Instance.UpdateValues(nameof(ShopCfgCJAArray), names, values, "id", key.ToString());
-                }
-            }
-            catch (Exception e)
-            {
-                ET.Log.Error(e.ToString());
-            }
-            finally
-            {
-                SQLiteHelper.Instance.CloseConnection();
-            }
+            // Dictionary<int, string> _typeIndexDic = new Dictionary<int, string>();
+
+            // SQLiteHelper.Instance.OpenConnection();
+            // try
+            // {
+            //     string typeIndex = "";
+            //     int itemId;
+            //     int id;
+            //     var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgCJAArray");
+            //     while (reader.Read())
+            //     {
+            //         typeIndex = reader["_typeIndex"].ToString();
+            //         itemId = int.Parse(reader["_itemId"].ToString());
+            //         id = int.Parse(reader["_id"].ToString());
+
+            //         int count;
+            //         if (Array.IndexOf(_shopItemType, typeIndex) >= 0)
+            //         {
+            //             count = Array.IndexOf(_shopItemType, typeIndex);
+            //         }
+            //         else
+            //         {
+            //             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            //             string itemType = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType).type.ToString();
+
+            //             if (Array.IndexOf(_shopItemType, itemType) >= 0)
+            //             {
+            //                 count = Array.IndexOf(_shopItemType, itemType);
+            //             }
+            //             else
+            //             {
+            //                 count = _shopItemType.Length - 1;
+            //             }
+            //         }
+            //         _typeIndexDic.Add(id, count.ToString());
+            //     }
+            // }
+            // catch (System.Exception e)
+            // {
+            //     ET.Log.Error(e);
+            // }
+            // finally
+            // {
+            //     SQLiteHelper.Instance.CloseConnection();
+            // }
+
+
+            // SQLiteHelper.Instance.OpenConnection();
+            // try
+            // {
+            //     ICollection keys = _typeIndexDic.Keys;
+            //     foreach (int key in keys)
+            //     {
+
+            //         var names = new string[] { "typeIndex" };
+            //         var values = new string[] { "" + _typeIndexDic[key] };
+            //         SQLiteHelper.Instance.UpdateValues(nameof(ShopCfgCJAArray), names, values, "id", key.ToString());
+            //     }
+            // }
+            // catch (Exception e)
+            // {
+            //     ET.Log.Error(e.ToString());
+            // }
+            // finally
+            // {
+            //     SQLiteHelper.Instance.CloseConnection();
+            // }
         }
 
 
         public static void WriteGalleryShop()
         {
-            Dictionary<int, string> _typeIndexDic = new Dictionary<int, string>();
-
-            SQLiteHelper.Instance.OpenConnection();
-            try
-            {
-                string typeIndex = "";
-                int itemId;
-                int id;
-                var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgGalleryArray");
-                while (reader.Read())
-                {
-                    typeIndex = reader["_typeIndex"].ToString();
-                    itemId = int.Parse(reader["_itemId"].ToString());
-                    id = int.Parse(reader["_id"].ToString());
-
-                    int count = 2;
-
-                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-
-                    if (itemCfg.itemType == ConstItemType.DRESS_UP)
-                    {
-                        if (itemCfg.subType == ConstDressUpItemType.BEI_JING)
-                        {
-                            count = 0;//背景
-                        }
-                        else
-                        {
-                            count = 2;//道具
-                        }
-                    }
-                    else if (itemCfg.itemType == ConstItemType.PHOTOGRAPH)
-                    {
-                        if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_NPC)
-                        {
-                            count = 1;//人物
-                        }
-                        else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_BOREDR)
-                        {
-                            count = 3;//npc
-                        }
-                        else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_EFFECT)
-                        {
-                            count = 4;//滤镜
-                        }
-                    }
-
-                    _typeIndexDic.Add(id, count.ToString());
-                }
-            }
-            catch (System.Exception e)
-            {
-                ET.Log.Error(e);
-            }
-            finally
-            {
-                SQLiteHelper.Instance.CloseConnection();
-            }
-
-
-            SQLiteHelper.Instance.OpenConnection();
-            try
-            {
-                ICollection keys = _typeIndexDic.Keys;
-                foreach (int key in keys)
-                {
-
-                    var names = new string[] { "typeIndex" };
-                    var values = new string[] { "" + _typeIndexDic[key] };
-                    SQLiteHelper.Instance.UpdateValues(nameof(ShopCfgGalleryArray), names, values, "id", key.ToString());
-                }
-            }
-            catch (Exception e)
-            {
-                ET.Log.Error(e.ToString());
-            }
-            finally
-            {
-                SQLiteHelper.Instance.CloseConnection();
-            }
+            // Dictionary<int, string> _typeIndexDic = new Dictionary<int, string>();
+
+            // SQLiteHelper.Instance.OpenConnection();
+            // try
+            // {
+            //     string typeIndex = "";
+            //     int itemId;
+            //     int id;
+            //     var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgGalleryArray");
+            //     while (reader.Read())
+            //     {
+            //         typeIndex = reader["_typeIndex"].ToString();
+            //         itemId = int.Parse(reader["_itemId"].ToString());
+            //         id = int.Parse(reader["_id"].ToString());
+
+            //         int count = 2;
+
+            //         ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+
+            //         if (itemCfg.itemType == ConstItemType.DRESS_UP)
+            //         {
+            //             if (itemCfg.subType == ConstDressUpItemType.BEI_JING)
+            //             {
+            //                 count = 0;//背景
+            //             }
+            //             else
+            //             {
+            //                 count = 2;//道具
+            //             }
+            //         }
+            //         else if (itemCfg.itemType == ConstItemType.PHOTOGRAPH)
+            //         {
+            //             if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_NPC)
+            //             {
+            //                 count = 1;//人物
+            //             }
+            //             else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_BOREDR)
+            //             {
+            //                 count = 3;//npc
+            //             }
+            //             else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_EFFECT)
+            //             {
+            //                 count = 4;//滤镜
+            //             }
+            //         }
+
+            //         _typeIndexDic.Add(id, count.ToString());
+            //     }
+            // }
+            // catch (System.Exception e)
+            // {
+            //     ET.Log.Error(e);
+            // }
+            // finally
+            // {
+            //     SQLiteHelper.Instance.CloseConnection();
+            // }
+
+
+            // SQLiteHelper.Instance.OpenConnection();
+            // try
+            // {
+            //     ICollection keys = _typeIndexDic.Keys;
+            //     foreach (int key in keys)
+            //     {
+
+            //         var names = new string[] { "typeIndex" };
+            //         var values = new string[] { "" + _typeIndexDic[key] };
+            //         SQLiteHelper.Instance.UpdateValues(nameof(ShopCfgGalleryArray), names, values, "id", key.ToString());
+            //     }
+            // }
+            // catch (Exception e)
+            // {
+            //     ET.Log.Error(e.ToString());
+            // }
+            // finally
+            // {
+            //     SQLiteHelper.Instance.CloseConnection();
+            // }
         }
     }
 }

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

@@ -39,14 +39,14 @@ namespace GFGGame
         /// </summary>
         public const string FUNCTION_AUTOPLAY_FIGHT = "FUNCTION_AUTOPLAY_FIGHT";
 
-        /// <summary>
-        /// 商城-道具兑换
-        /// </summary>
-        public const string SHOP_EXCHANGE = "SHOP_EXCHANGE";
-        /// <summary>
-        /// 商城-礼包
-        /// </summary>
-        public const string SHOP_GIFT_BAG = "SHOP_GIFT_BAG";
+        // /// <summary>
+        // /// 商城-道具兑换
+        // /// </summary>
+        // public const string SHOP_EXCHANGE = "SHOP_EXCHANGE";
+        // /// <summary>
+        // /// 商城-礼包
+        // /// </summary>
+        // public const string SHOP_GIFT_BAG = "SHOP_GIFT_BAG";
         /// <summary>
         /// 套装培养
         /// </summary>

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

@@ -0,0 +1,18 @@
+namespace GFGGame
+{
+    public class ConstStoreSubId
+    {
+        public const int STORE_CHARGE = 0;//充值
+        public const int STORE_CHARGE_ADDUP = 1;//累计充值
+        public const int STORE_MONTH_GLOAD_CARD = 0;//金卡
+        public const int STORE_MONTH_BLACK_CARD = 0;//黑金卡
+        public const int STORE_GIFT_BAG_ACTIVITY = 0;//活动
+        public const int STORE_GIFT_BAG_TIME_LIMIT = 1;//限时活动
+        public const int STORE_GIFT_BAG_GREATEST = 2;//精选
+        public const int STORE_GIFT_BAG_HOT = 3;//热销
+        public const int STORE_EXCHANGE_GALLERY = 0;//画廊商城
+        public const int STORE_ARENA_ITEM = 0;//竞技场
+        public const int FU_ZHUANG_DIAN = 0;//服装店
+
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button2.cs.meta → GameClient/Assets/Game/HotUpdate/Constant/ConstStoreSubId.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f0c5c9d190ee838488d6ce19979c34c4
+guid: 6272a07e15fdd8240960b40f3c8f3192
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,15 @@
+namespace GFGGame
+{
+    public class ConstStoreTabId
+    {
+        public const int STORE_CHARGE = 1;//商城-充值
+        public const int STORE_GIFT_BAG = 2;//商城-礼包
+        public const int STORE_MONTH_CARD = 3;//商城-月卡
+        public const int STORE_EXCHANGE = 4;//商城-兑换
+        public const int STORE_ARENA = 5;//商城-竞技场
+
+        public const int FU_ZHUANG_DIAN = 101;//服装店
+
+
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component1.cs.meta → GameClient/Assets/Game/HotUpdate/Constant/ConstStoreTabId.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b26687987c2824c49ba5ed0d61b46a78
+guid: dcc28f6ee34c53646b897443e42a66f1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -162,7 +162,7 @@ namespace GFGGame
             SuitFosterDataManager.Instance.Clear();
             StudioDataManager.Instance.Clear();
             StorageDataManager.Instance.Clear();
-            RechargeDataManager.Instance.Clear();
+            ShopDataManager.Instance.Clear();
             DressUpMenuItemDataManager.Clear();
             GuideDataManager.Clear();
             GetSuitItemController.Clear();

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

@@ -1,273 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ET;
-
-namespace GFGGame
-{
-    public class RechargeStoreType
-    {
-        public static int RECHARGE = 0;
-        public static int GIFT = 1;
-        public static int EXCHANGE = 2;
-
-    }
-    public class LockType
-    {
-        public static int NONE = 0;
-        public static int STORY_LV = 1;
-        public static int ROLE_LV = 2;
-    }
-    // public class RefreshType
-    // {
-    //     public static int NONE = 0;
-    //     public static int DAY = 1;
-    //     public static int WEEK = 2;
-    //     public static int MONTH = 3;
-    // }
-    public class CostType
-    {
-        public static int FREE = 0;
-        public static int MONEY = 1;
-        public static int RMB = 2;
-        public static int ITEM = 3;
-    }
-
-    public class RechargeDataManager : SingletonBase<RechargeDataManager>
-    {
-        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> _exchangeDic = new Dictionary<int, int>();
-        public void Clear()
-        {
-            _rechargeDic.Clear();
-            _giftDic.Clear();
-            _exchangeDic.Clear();
-        }
-        public void UpdateRechargeData(int rechargeId, int num)
-        {
-            if (!_rechargeDic.ContainsKey(rechargeId))
-            {
-                _rechargeDic.Add(rechargeId, num);
-            }
-            else
-            {
-                _rechargeDic[rechargeId] = num;
-            }
-        }
-        public void UpdateGiftData(int giftId, int num)
-        {
-            if (!_giftDic.ContainsKey(giftId))
-            {
-                _giftDic.Add(giftId, num);
-            }
-            else
-            {
-                _giftDic[giftId] = num;
-            }
-        }
-        public void UpdateExchangeData(int exchangeId, int num)
-        {
-            if (!_exchangeDic.ContainsKey(exchangeId))
-            {
-                _exchangeDic.Add(exchangeId, num);
-            }
-            else
-            {
-                _exchangeDic[exchangeId] = num;
-            }
-        }
-
-        /// <summary>
-        /// 根据充值id获取购买次数
-        /// </summary>
-        /// <param name="rechargeId"></param>
-        /// <returns></returns>
-        public int GetRechargeBuyNumById(int rechargeId)
-        {
-            return !_rechargeDic.ContainsKey(rechargeId) ? 0 : _rechargeDic[rechargeId];
-        }
-        /// <summary>
-        /// 根据礼包id获取购买次数
-        /// </summary>
-        /// <param name="giftId"></param>
-        /// <returns></returns>
-        public int GetGiftBuyNumById(int giftId)
-        {
-            return !_giftDic.ContainsKey(giftId) ? 0 : _giftDic[giftId];
-        }
-        /// <summary>
-        /// 根据充值id获取购买次数
-        /// </summary>
-        /// <param name="exchangeId"></param>
-        /// <returns></returns>
-        public int GetExchangeBuyNumById(int exchangeId)
-        {
-            return !_exchangeDic.ContainsKey(exchangeId) ? 0 : _exchangeDic[exchangeId];
-        }
-
-
-        public List<GiftBagCfg> GetGiftBagCfgs()
-        {
-            List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>();
-
-            List<GiftBagCfg> noneGiftBagCfgs = GetNoneGiftCfg();
-            giftBagCfgs = giftBagCfgs.Concat(noneGiftBagCfgs).ToList<GiftBagCfg>();
-
-            GiftBagCfg StoryLvGiftCfg = GetStoryLvGiftCfg();
-            if (StoryLvGiftCfg != null) giftBagCfgs.Add(StoryLvGiftCfg);
-            GiftBagCfg RoleLvGiftCfg = GetRoleLvGiftCfg();
-            if (RoleLvGiftCfg != null) giftBagCfgs.Add(RoleLvGiftCfg);
-            giftBagCfgs = RemoveNotOpenCfg(giftBagCfgs);
-            SortGiftBagCfgs(giftBagCfgs);
-            return giftBagCfgs;
-        }
-
-        private List<GiftBagCfg> SortGiftBagCfgs(List<GiftBagCfg> giftBagCfgs)
-        {
-            giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
-            {
-
-                //未售罄的＞未解锁>已售罄的
-                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;
-                if (buyTypeA > buyTypeB) return -1;
-                if (buyTypeA < buyTypeB) return 1;
-
-                //解锁状态
-                int lockA = GetGiftStateById(a.id) ? 1 : -1;
-                int lockB = GetGiftStateById(b.id) ? 1 : -1;
-                if (lockA > lockB) return -1;
-                if (lockA < lockB) return 1;
-
-                //免费>钻石>现金>道具
-                if (a.costType < b.costType) return -1;
-                if (a.costType > b.costType) return 1;
-
-                //有下架时间的 > 没有下架时间的
-                int endTimeA = a.endTime != "" ? 1 : -1;
-                int endTimeB = b.endTime != "" ? 1 : -1;
-                if (endTimeA > endTimeB) return -1;
-                if (endTimeA < endTimeB) return 1;
-
-
-
-                int descA = a.desc == "" ? 0 : int.Parse(a.desc);
-                int descB = b.desc == "" ? 0 : int.Parse(b.desc);
-                if (descA != descB) return descA - descB;
-
-                if (a.price != b.price) return a.price - b.price;
-
-
-                return 0;
-            });
-            return giftBagCfgs;
-        }
-        private List<GiftBagCfg> RemoveNotOpenCfg(List<GiftBagCfg> giftBagCfgs)
-        {
-            for (int i = giftBagCfgs.Count - 1; i >= 0; i--)
-            {
-                if (giftBagCfgs[i].startTime != "" && !TimeUtil.IsBeforeCurTime(giftBagCfgs[i].startTime) || giftBagCfgs[i].endTime != "" && !TimeUtil.IsLaterCurTime(giftBagCfgs[i].endTime))
-                {
-                    giftBagCfgs.RemoveAt(i);
-                }
-            }
-            return giftBagCfgs;
-        }
-        private List<GiftBagCfg> GetNoneGiftCfg()
-        {
-            List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>(GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.NONE));
-
-            return giftBagCfgs;
-        }
-        private GiftBagCfg GetStoryLvGiftCfg()
-        {
-            List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.STORY_LV);
-            if (giftBagCfgs.Count == 0) return null;
-            giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
-            {
-                if (a.storyLevelId.CompareTo(b.storyLevelId) != 0)
-                {
-                    return a.storyLevelId.CompareTo(b.storyLevelId);
-                }
-                return -1;
-            });
-            for (int i = 0; i < giftBagCfgs.Count; i++)
-            {
-                if (GetGiftStateById(giftBagCfgs[i].id) && (GetGiftBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
-            }
-            return giftBagCfgs[0];
-        }
-        private GiftBagCfg GetRoleLvGiftCfg()
-        {
-            List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.ROLE_LV);
-            if (giftBagCfgs.Count == 0) return null;
-            giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
-            {
-                if (a.lv.CompareTo(b.lv) != 0)
-                {
-                    return a.lv.CompareTo(b.lv);
-                }
-                return -1;
-            });
-            for (int i = 0; i < giftBagCfgs.Count; i++)
-            {
-                if (GetGiftStateById(giftBagCfgs[i].id) && (GetGiftBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
-            }
-            return giftBagCfgs[0];
-        }
-
-        public List<ShopExchangeCfg> GetExchangeCfgs()
-        {
-            List<ShopExchangeCfg> shopExchangeCfgs = new List<ShopExchangeCfg>(ShopExchangeCfgArray.Instance.dataArray);
-            shopExchangeCfgs.Sort((ShopExchangeCfg a, ShopExchangeCfg b) =>
-            {
-                //未售罄的>已售罄的
-                int buyTypeA = (a.maxLimit == 0 || a.maxLimit - GetExchangeBuyNumById(a.id) > 0) ? 1 : -1;
-                int buyTypeB = (b.maxLimit == 0 || b.maxLimit - GetExchangeBuyNumById(b.id) > 0) ? 1 : -1;
-                if (buyTypeA > buyTypeB) return -1;
-                if (buyTypeA < buyTypeB) return 1;
-                return 0;
-            });
-            return shopExchangeCfgs;
-        }
-        /// <summary>
-        /// 根据礼包Id获取礼包解锁状态
-        /// /// </summary>
-        /// <param name="giftId"></param>
-        /// <returns></returns>
-        public bool GetGiftStateById(int giftId)
-        {
-            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
-
-            if (cfg.lockType == LockType.NONE)
-            {
-                return true;
-            }
-            else if (cfg.lockType == LockType.STORY_LV)
-            {
-                return InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
-            }
-            else
-            {
-                return GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= cfg.lv;
-            }
-        }
-        /// <summary>
-        /// 根据礼包id获取下架时间
-        /// </summary>
-        /// <param name="giftId"></param>
-        /// <returns></returns>
-        public string GetEndTime(int giftId)
-        {
-            long endTime = 0;
-            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
-            if (cfg.endTime == "") return "";
-
-            endTime = TimeUtil.DateTimeToTimestamp(cfg.endTime);
-            return TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
-        }
-    }
-}

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

@@ -134,13 +134,13 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetRechargeGiftFreeRed()
         {
-            List<GiftBagCfg> _giftCfgs = RechargeDataManager.Instance.GetGiftBagCfgs();
+            List<GiftBagCfg> _giftCfgs = ShopDataManager.Instance.GetGiftBagCfgs();
             for (int i = 0; i < _giftCfgs.Count; i++)
             {
                 GiftBagCfg cfg = _giftCfgs[i];
-                bool isUnLock = RechargeDataManager.Instance.GetGiftStateById(cfg.id);
-                int buyNum = RechargeDataManager.Instance.GetGiftBuyNumById(cfg.id);
-                bool canBuy = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum;
+                bool isUnLock = ShopDataManager.Instance.GetGiftStateById(cfg.id);
+                int buyNum = ShopDataManager.Instance.GetGiftBuyNumById(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

@@ -83,7 +83,22 @@ namespace GFGGame
                 return ItemDataManager.GetItemNum(ConstItemID.DIAMOND_RED); //GameGlobal.myNumericComponent.GetAsInt(NumericType.DiamondR);
             }
         }
+        public static int vipLv
+        {
+            get
+            {
+                return GameGlobal.myNumericComponent.GetAsInt(NumericType.VipLevel);
 
+            }
+        }
+        public static int vipExp
+        {
+            get
+            {
+                return GameGlobal.myNumericComponent.GetAsInt(NumericType.VipExp);
+
+            }
+        }
         public static int Liveness
         {
             get

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

@@ -1,19 +1,323 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using ET;
 
 namespace GFGGame
 {
+    public class LockType
+    {
+        public static int NONE = 0;
+        public static int STORY_LV = 1;
+        public static int ROLE_LV = 2;
+    }
+
+    public class CostType
+    {
+        public static int FREE = 0;
+        public static int ITEM = 1;
+        public static int RMB = 2;
+    }
+
     public class ShopDataManager : SingletonBase<ShopDataManager>
     {
-        // public int SHOP_TYPE;
+        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> _exchangeDic = new Dictionary<int, int>();
+        public void Clear()
+        {
+            _rechargeDic.Clear();
+            _giftDic.Clear();
+            _exchangeDic.Clear();
+        }
+        public void UpdateRechargeData(int rechargeId, int num)
+        {
+            if (!_rechargeDic.ContainsKey(rechargeId))
+            {
+                _rechargeDic.Add(rechargeId, num);
+            }
+            else
+            {
+                _rechargeDic[rechargeId] = num;
+            }
+        }
+        public void UpdateGiftData(int giftId, int num)
+        {
+            if (!_giftDic.ContainsKey(giftId))
+            {
+                _giftDic.Add(giftId, num);
+            }
+            else
+            {
+                _giftDic[giftId] = num;
+            }
+        }
+        public void UpdateExchangeData(int exchangeId, int num)
+        {
+            if (!_exchangeDic.ContainsKey(exchangeId))
+            {
+                _exchangeDic.Add(exchangeId, num);
+            }
+            else
+            {
+                _exchangeDic[exchangeId] = num;
+            }
+        }
+        /************************************************************************************************************/
 
-        public void BuyItem(int itemId, int itemCount, int shopType, ShopCfg shopCfg)
+        public List<ShopCfg> GetList(int storeId, int typeIndex, int scoreType)
         {
-            BuyItemConteoller.Show(itemId, itemCount, ConstBuyType.TYPE_SHOP, shopType, () =>
+            List<ShopCfg> shopCfgs = null;
+            switch (storeId)
             {
-                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 2);
-                GetSuitItemController.TryShow(0);
+                case ConstStoreId.CLOTHING_STORE_ID:
+                    shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2AndtypeIndex(ConstStoreTabId.FU_ZHUANG_DIAN, ConstStoreSubId.FU_ZHUANG_DIAN, typeIndex);
+                    break;
+                case ConstStoreId.GALLERY_STORE_ID:
+                    shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2AndtypeIndex(ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY, typeIndex);
+                    break;
+            }
+            SortItemListByScore(shopCfgs, scoreType);
+            return shopCfgs;
+        }
+
+        public void GetMoneyIdAndNum(int buyId, int count, int shopType, out int costId, out int costNum, out int buyNum)
+        {
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(buyId);
+
+            costId = shopCfg.costId;
+            costNum = shopCfg.price * count;
+            buyNum = count;
+        }
+
+
+        private List<ShopCfg> SortItemListByScore(List<ShopCfg> arrayList, int scoreType)
+        {
+            arrayList.Sort((ShopCfg a, ShopCfg b) =>
+            {
+                long numA = ItemDataManager.GetItemNum(a.itemId);
+                long numB = ItemDataManager.GetItemNum(b.itemId);
+                bool hasA = numA > 0;
+                bool hasB = numB > 0;
+                if (hasA && !hasB)
+                {
+                    return 1;
+                }
+                else if (!hasA && hasB)
+                {
+                    return -1;
+                }
+                else if (scoreType > 0 && !hasA && !hasB)
+                {
+                    int scoreA = ItemDataManager.GetItemAdditionScore(a.itemId, scoreType);
+                    int scoreB = ItemDataManager.GetItemAdditionScore(b.itemId, scoreType);
+                    if (scoreB > scoreA)
+                    {
+                        return 1;
+                    }
+                    else if (scoreB < scoreA)
+                    {
+                        return -1;
+                    }
+                }
+
+                return a.itemId.CompareTo(b.itemId);
+            });
+            return arrayList;
+        }
+
+
+        /**************************************************************************************************************************/
+        /// <summary>
+        /// 根据充值id获取购买次数
+        /// </summary>
+        /// <param name="rechargeId"></param>
+        /// <returns></returns>
+        public int GetRechargeBuyNumById(int rechargeId)
+        {
+            return !_rechargeDic.ContainsKey(rechargeId) ? 0 : _rechargeDic[rechargeId];
+        }
+        /// <summary>
+        /// 根据礼包id获取购买次数
+        /// </summary>
+        /// <param name="giftId"></param>
+        /// <returns></returns>
+        public int GetGiftBuyNumById(int giftId)
+        {
+            return !_giftDic.ContainsKey(giftId) ? 0 : _giftDic[giftId];
+        }
+        /// <summary>
+        /// 根据充值id获取购买次数
+        /// </summary>
+        /// <param name="exchangeId"></param>
+        /// <returns></returns>
+        public int GetExchangeBuyNumById(int exchangeId)
+        {
+            return !_exchangeDic.ContainsKey(exchangeId) ? 0 : _exchangeDic[exchangeId];
+        }
+
+
+        public List<GiftBagCfg> GetGiftBagCfgs()
+        {
+            List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>();
+
+            List<GiftBagCfg> noneGiftBagCfgs = GetNoneGiftCfg();
+            giftBagCfgs = giftBagCfgs.Concat(noneGiftBagCfgs).ToList<GiftBagCfg>();
+
+            GiftBagCfg StoryLvGiftCfg = GetStoryLvGiftCfg();
+            if (StoryLvGiftCfg != null) giftBagCfgs.Add(StoryLvGiftCfg);
+            GiftBagCfg RoleLvGiftCfg = GetRoleLvGiftCfg();
+            if (RoleLvGiftCfg != null) giftBagCfgs.Add(RoleLvGiftCfg);
+            giftBagCfgs = RemoveNotOpenCfg(giftBagCfgs);
+            SortGiftBagCfgs(giftBagCfgs);
+            return giftBagCfgs;
+        }
+
+        private List<GiftBagCfg> SortGiftBagCfgs(List<GiftBagCfg> giftBagCfgs)
+        {
+            giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
+            {
+
+                //未售罄的＞未解锁>已售罄的
+                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;
+                if (buyTypeA > buyTypeB) return -1;
+                if (buyTypeA < buyTypeB) return 1;
+
+                //解锁状态
+                int lockA = GetGiftStateById(a.id) ? 1 : -1;
+                int lockB = GetGiftStateById(b.id) ? 1 : -1;
+                if (lockA > lockB) return -1;
+                if (lockA < lockB) return 1;
+
+                //免费>钻石>现金>道具
+                if (a.costType < b.costType) return -1;
+                if (a.costType > b.costType) return 1;
+
+                //有下架时间的 > 没有下架时间的
+                int endTimeA = a.endTime != "" ? 1 : -1;
+                int endTimeB = b.endTime != "" ? 1 : -1;
+                if (endTimeA > endTimeB) return -1;
+                if (endTimeA < endTimeB) return 1;
+
+
+
+                int descA = a.desc == "" ? 0 : int.Parse(a.desc);
+                int descB = b.desc == "" ? 0 : int.Parse(b.desc);
+                if (descA != descB) return descA - descB;
+
+                if (a.price != b.price) return a.price - b.price;
+
+
+                return 0;
+            });
+            return giftBagCfgs;
+        }
+        private List<GiftBagCfg> RemoveNotOpenCfg(List<GiftBagCfg> giftBagCfgs)
+        {
+            for (int i = giftBagCfgs.Count - 1; i >= 0; i--)
+            {
+                if (giftBagCfgs[i].startTime != "" && !TimeUtil.IsBeforeCurTime(giftBagCfgs[i].startTime) || giftBagCfgs[i].endTime != "" && !TimeUtil.IsLaterCurTime(giftBagCfgs[i].endTime))
+                {
+                    giftBagCfgs.RemoveAt(i);
+                }
+            }
+            return giftBagCfgs;
+        }
+        private List<GiftBagCfg> GetNoneGiftCfg()
+        {
+            List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>(GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.NONE));
+
+            return giftBagCfgs;
+        }
+        private GiftBagCfg GetStoryLvGiftCfg()
+        {
+            List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.STORY_LV);
+            if (giftBagCfgs.Count == 0) return null;
+            giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
+            {
+                if (a.storyLevelId.CompareTo(b.storyLevelId) != 0)
+                {
+                    return a.storyLevelId.CompareTo(b.storyLevelId);
+                }
+                return -1;
+            });
+            for (int i = 0; i < giftBagCfgs.Count; i++)
+            {
+                if (GetGiftStateById(giftBagCfgs[i].id) && (GetGiftBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
+            }
+            return giftBagCfgs[0];
+        }
+        private GiftBagCfg GetRoleLvGiftCfg()
+        {
+            List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.ROLE_LV);
+            if (giftBagCfgs.Count == 0) return null;
+            giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
+            {
+                if (a.lv.CompareTo(b.lv) != 0)
+                {
+                    return a.lv.CompareTo(b.lv);
+                }
+                return -1;
+            });
+            for (int i = 0; i < giftBagCfgs.Count; i++)
+            {
+                if (GetGiftStateById(giftBagCfgs[i].id) && (GetGiftBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
+            }
+            return giftBagCfgs[0];
+        }
+
+        public List<ShopExchangeCfg> GetExchangeCfgs()
+        {
+            List<ShopExchangeCfg> shopExchangeCfgs = new List<ShopExchangeCfg>(ShopExchangeCfgArray.Instance.dataArray);
+            shopExchangeCfgs.Sort((ShopExchangeCfg a, ShopExchangeCfg b) =>
+            {
+                //未售罄的>已售罄的
+                int buyTypeA = (a.maxLimit == 0 || a.maxLimit - GetExchangeBuyNumById(a.id) > 0) ? 1 : -1;
+                int buyTypeB = (b.maxLimit == 0 || b.maxLimit - GetExchangeBuyNumById(b.id) > 0) ? 1 : -1;
+                if (buyTypeA > buyTypeB) return -1;
+                if (buyTypeA < buyTypeB) return 1;
+                return 0;
+            });
+            return shopExchangeCfgs;
+        }
+        /// <summary>
+        /// 根据礼包Id获取礼包解锁状态
+        /// /// </summary>
+        /// <param name="giftId"></param>
+        /// <returns></returns>
+        public bool GetGiftStateById(int giftId)
+        {
+            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
+
+            if (cfg.lockType == LockType.NONE)
+            {
+                return true;
+            }
+            else if (cfg.lockType == LockType.STORY_LV)
+            {
+                return InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
+            }
+            else
+            {
+                return GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= cfg.lv;
+            }
+        }
+        /// <summary>
+        /// 根据礼包id获取下架时间
+        /// </summary>
+        /// <param name="giftId"></param>
+        /// <returns></returns>
+        public string GetEndTime(int giftId)
+        {
+            long endTime = 0;
+            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
+            if (cfg.endTime == "") return "";
 
-            }, true, false, GameConst.MAX_COUNT_TO_BUY_ITEMS);
+            endTime = TimeUtil.DateTimeToTimestamp(cfg.endTime);
+            return TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
         }
     }
 }

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

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.Store;
+
+namespace GFGGame
+{
+
+    public class ShopViewManager : SingletonBase<ShopViewManager>
+    {
+        public void BuyItem(int itemId, int itemCount, int shopType, ShopCfg shopCfg)
+        {
+            BuyItemConteoller.Show(itemId, itemCount, ConstBuyType.TYPE_SHOP, shopType, () =>
+            {
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 2);
+                GetSuitItemController.TryShow(0);
+
+            }, true, false, GameConst.MAX_COUNT_TO_BUY_ITEMS);
+        }
+
+        public void UpdateVipProgressCom(GObject obj)
+        {
+            UI_ComVipLv com = UI_ComVipLv.Proxy(obj);
+            com.m_txtLv.text = RoleDataManager.vipLv.ToString();
+            VipCfg vipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv);
+            com.m_proExp.target.max = vipCfg.num;
+            com.m_proExp.target.value = RoleDataManager.vipExp;
+
+
+            UI_ComVipLv.ProxyEnd();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListGiftItem.cs.meta → GameClient/Assets/Game/HotUpdate/Data/ShopViewManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 10730a4d0c9ed794cb8cf14d1c99d4a4
+guid: 6ba5f9d477a4fbb41baa20978875a1f9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/ClothingShopCfgManager.cs

@@ -5,109 +5,6 @@ namespace GFGGame
     public class ClothingShopCfgManager : SingletonBase<ClothingShopCfgManager>
     {
 
-        public List<ShopCfg> GetList(int storeId, int typeIndex, int scoreType)
-        {
-            List<ShopCfg> shopCfgs = null;
-            switch (storeId)
-            {
-                case ConstStoreId.CLOTHING_STORE_ID:
-                    shopCfgs = ShopCfgClothingArray.Instance.GetCfgsBytypeIndex(typeIndex);
-                    break;
-                case ConstStoreId.LUCKY_BOX_STORE_ID:
-                    shopCfgs = ShopCfgCJArray.Instance.GetCfgsBytypeIndex(typeIndex);
-                    break;
-                case ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID:
-                    shopCfgs = ShopCfgCJAArray.Instance.GetCfgsBytypeIndex(typeIndex);
-                    break;
-                case ConstStoreId.GALLERY_STORE_ID:
-                    shopCfgs = ShopCfgGalleryArray.Instance.GetCfgsBytypeIndex(typeIndex);
-                    break;
-            }
-            SortItemListByScore(shopCfgs, scoreType);
-            return shopCfgs;
-        }
 
-        public ShopCfg GetShopCfg(int buyId, int shopType)
-        {
-            switch (shopType)
-            {
-                case ConstStoreId.CLOTHING_STORE_ID:
-                    return ShopCfgClothingArray.Instance.GetCfg(buyId);
-
-                case ConstStoreId.LUCKY_BOX_STORE_ID:
-                    return ShopCfgCJArray.Instance.GetCfg(buyId);
-
-                case ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID:
-                    return ShopCfgCJAArray.Instance.GetCfg(buyId);
-
-                case ConstStoreId.GALLERY_STORE_ID:
-                    return ShopCfgGalleryArray.Instance.GetCfg(buyId);
-            }
-            return null;
-        }
-        public ShopCfg[] GetShopCfgs(int shopType)
-        {
-            switch (shopType)
-            {
-                case ConstStoreId.CLOTHING_STORE_ID:
-                    return ShopCfgClothingArray.Instance.dataArray;
-
-                case ConstStoreId.LUCKY_BOX_STORE_ID:
-
-                    return ShopCfgCJArray.Instance.dataArray;
-                case ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID:
-
-                    return ShopCfgCJAArray.Instance.dataArray;
-                case ConstStoreId.GALLERY_STORE_ID:
-
-                    return ShopCfgGalleryArray.Instance.dataArray;
-            }
-            return null;
-        }
-
-        public void GetMoneyIdAndNum(int buyId, int count, int shopType, out int costId, out int costNum, out int buyNum)
-        {
-            ShopCfg shopCfg = GetShopCfg(buyId, shopType);
-
-            costId = shopCfg.costID;
-            costNum = shopCfg.costNum * count;
-            buyNum = count;
-        }
-
-
-        private List<ShopCfg> SortItemListByScore(List<ShopCfg> arrayList, int scoreType)
-        {
-            arrayList.Sort((ShopCfg a, ShopCfg b) =>
-            {
-                long numA = ItemDataManager.GetItemNum(a.itemID);
-                long numB = ItemDataManager.GetItemNum(b.itemID);
-                bool hasA = numA > 0;
-                bool hasB = numB > 0;
-                if (hasA && !hasB)
-                {
-                    return 1;
-                }
-                else if (!hasA && hasB)
-                {
-                    return -1;
-                }
-                else if (scoreType > 0 && !hasA && !hasB)
-                {
-                    int scoreA = ItemDataManager.GetItemAdditionScore(a.itemID, scoreType);
-                    int scoreB = ItemDataManager.GetItemAdditionScore(b.itemID, scoreType);
-                    if (scoreB > scoreA)
-                    {
-                        return 1;
-                    }
-                    else if (scoreB < scoreA)
-                    {
-                        return -1;
-                    }
-                }
-
-                return a.itemID.CompareTo(b.itemID);
-            });
-            return arrayList;
-        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeUI.cs

@@ -4,21 +4,19 @@ using FairyGUI;
 
 namespace UI.Store
 {
-    public partial class UI_Component1
+    public partial class UI_ChargeUI
     {
         public GComponent target;
-        public Controller m_c1;
-        public UI_Button2 m_btn0;
-        public UI_Button2 m_btn1;
-        public UI_Button2 m_btn2;
-        public const string URL = "ui://p9mtgheo10not1s";
+        public UI_ComVipLv m_comVipLv;
+        public GList m_list;
+        public const string URL = "ui://p9mtgheol500tb9";
         public const string PACKAGE_NAME = "Store";
-        public const string RES_NAME = "Component1";
-        private static UI_Component1 _proxy;
+        public const string RES_NAME = "ChargeUI";
+        private static UI_ChargeUI _proxy;
 
-        public static UI_Component1 Create(GObject gObject = null)
+        public static UI_ChargeUI Create(GObject gObject = null)
         {
-            var ui = new UI_Component1();
+            var ui = new UI_ChargeUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -27,11 +25,11 @@ namespace UI.Store
             return ui;
         }
 
-        public static UI_Component1 Proxy(GObject gObject = null)
+        public static UI_ChargeUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Component1();
+                _proxy = new UI_ChargeUI();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -58,20 +56,14 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_btn0 = (UI_Button2)UI_Button2.Create(comp.GetChild("btn0"));
-            m_btn1 = (UI_Button2)UI_Button2.Create(comp.GetChild("btn1"));
-            m_btn2 = (UI_Button2)UI_Button2.Create(comp.GetChild("btn2"));
+            m_comVipLv = (UI_ComVipLv)UI_ComVipLv.Create(comp.GetChild("comVipLv"));
+            m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_btn0.Dispose();
-            m_btn0 = null;
-            m_btn1.Dispose();
-            m_btn1 = null;
-            m_btn2.Dispose();
-            m_btn2 = null;
+            m_comVipLv.Dispose();
+            m_comVipLv = null;
+            m_list = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Data/RechargeDataManager.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6f22da16de1a46f46b8511782b235ae9
+guid: f0f439025b149e046b6243ba37b06308
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComVipLv.cs

@@ -0,0 +1,87 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_ComVipLv
+    {
+        public GComponent target;
+        public GTextField m_txtLv;
+        public UI_ProgressBar1 m_proExp;
+        public GLoader m_loaIcon;
+        public GTextField m_txtTips;
+        public GGroup m_grpTips;
+        public GButton m_btnRule;
+        public const string URL = "ui://p9mtgheohhx91r";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "ComVipLv";
+        private static UI_ComVipLv _proxy;
+
+        public static UI_ComVipLv Create(GObject gObject = null)
+        {
+            var ui = new UI_ComVipLv();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComVipLv Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComVipLv();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtLv = (GTextField)comp.GetChild("txtLv");
+            m_proExp = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proExp"));
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_grpTips = (GGroup)comp.GetChild("grpTips");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtLv = null;
+            m_proExp.Dispose();
+            m_proExp = null;
+            m_loaIcon = null;
+            m_txtTips = null;
+            m_grpTips = null;
+            m_btnRule = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComVipLv.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4e8e2472906b03a419adf2ee418feca7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_RechargeStoreUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListChargeItem.cs

@@ -4,23 +4,22 @@ using FairyGUI;
 
 namespace UI.Store
 {
-    public partial class UI_RechargeStoreUI
+    public partial class UI_ListChargeItem
     {
         public GComponent target;
-        public Controller m_c1;
-        public UI_Component1 m_comTab;
-        public GTextField m_txtRefreshTime;
-        public GList m_list;
-        public GList m_listGift;
-        public GList m_listExchange;
-        public const string URL = "ui://p9mtgheod4iw0";
+        public GLoader m_icon;
+        public GImage m_imgDouble;
+        public GTextField m_txtName;
+        public UI_Component2 m_btnBuy;
+        public GTextField m_txtDesc;
+        public const string URL = "ui://p9mtgheohhx91i";
         public const string PACKAGE_NAME = "Store";
-        public const string RES_NAME = "RechargeStoreUI";
-        private static UI_RechargeStoreUI _proxy;
+        public const string RES_NAME = "ListChargeItem";
+        private static UI_ListChargeItem _proxy;
 
-        public static UI_RechargeStoreUI Create(GObject gObject = null)
+        public static UI_ListChargeItem Create(GObject gObject = null)
         {
-            var ui = new UI_RechargeStoreUI();
+            var ui = new UI_ListChargeItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -29,11 +28,11 @@ namespace UI.Store
             return ui;
         }
 
-        public static UI_RechargeStoreUI Proxy(GObject gObject = null)
+        public static UI_ListChargeItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_RechargeStoreUI();
+                _proxy = new UI_ListChargeItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -60,22 +59,20 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_comTab = (UI_Component1)UI_Component1.Create(comp.GetChild("comTab"));
-            m_txtRefreshTime = (GTextField)comp.GetChild("txtRefreshTime");
-            m_list = (GList)comp.GetChild("list");
-            m_listGift = (GList)comp.GetChild("listGift");
-            m_listExchange = (GList)comp.GetChild("listExchange");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_imgDouble = (GImage)comp.GetChild("imgDouble");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_btnBuy = (UI_Component2)UI_Component2.Create(comp.GetChild("btnBuy"));
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_comTab.Dispose();
-            m_comTab = null;
-            m_txtRefreshTime = null;
-            m_list = null;
-            m_listGift = null;
-            m_listExchange = null;
+            m_icon = null;
+            m_imgDouble = null;
+            m_txtName = null;
+            m_btnBuy.Dispose();
+            m_btnBuy = null;
+            m_txtDesc = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListChargeItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d7929938bc538654195c9a9e5a1d4cf9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListGiftItem.cs

@@ -1,119 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Store
-{
-    public partial class UI_ListGiftItem
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public Controller m_c2;
-        public GTextField m_txtDesc;
-        public GGroup m_grpDiscount;
-        public GLoader m_icon;
-        public GTextField m_txtName;
-        public GTextField m_txtEndTime;
-        public GGroup m_grpEndTime;
-        public GTextField m_txtLimit;
-        public GTextField m_txtLock;
-        public GLoader m_loaIcon;
-        public GTextField m_txtIcon;
-        public GGroup m_grpIcon;
-        public GTextField m_txtOriginalPrice;
-        public GGroup m_grpOriginalPrice;
-        public GTextField m_txtPrice;
-        public GGroup m_grpPrice;
-        public const string URL = "ui://p9mtgheo10not1t";
-        public const string PACKAGE_NAME = "Store";
-        public const string RES_NAME = "ListGiftItem";
-        private static UI_ListGiftItem _proxy;
-
-        public static UI_ListGiftItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListGiftItem();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ListGiftItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListGiftItem();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_c1 = comp.GetController("c1");
-            m_c2 = comp.GetController("c2");
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
-            m_grpDiscount = (GGroup)comp.GetChild("grpDiscount");
-            m_icon = (GLoader)comp.GetChild("icon");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
-            m_grpEndTime = (GGroup)comp.GetChild("grpEndTime");
-            m_txtLimit = (GTextField)comp.GetChild("txtLimit");
-            m_txtLock = (GTextField)comp.GetChild("txtLock");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtIcon = (GTextField)comp.GetChild("txtIcon");
-            m_grpIcon = (GGroup)comp.GetChild("grpIcon");
-            m_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
-            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
-            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
-            m_grpPrice = (GGroup)comp.GetChild("grpPrice");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_c2 = null;
-            m_txtDesc = null;
-            m_grpDiscount = null;
-            m_icon = null;
-            m_txtName = null;
-            m_txtEndTime = null;
-            m_grpEndTime = null;
-            m_txtLimit = null;
-            m_txtLock = null;
-            m_loaIcon = null;
-            m_txtIcon = null;
-            m_grpIcon = null;
-            m_txtOriginalPrice = null;
-            m_grpOriginalPrice = null;
-            m_txtPrice = null;
-            m_grpPrice = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button2.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ProgressBar1.cs

@@ -4,37 +4,37 @@ using FairyGUI;
 
 namespace UI.Store
 {
-    public partial class UI_Button2
+    public partial class UI_ProgressBar1
     {
-        public GButton target;
-        public GLoader m_loaMascot;
-        public const string URL = "ui://p9mtgheodmsi1q";
+        public GProgressBar target;
+        public GTextField m_txttitle;
+        public const string URL = "ui://p9mtgheohhx91p";
         public const string PACKAGE_NAME = "Store";
-        public const string RES_NAME = "Button2";
-        private static UI_Button2 _proxy;
+        public const string RES_NAME = "ProgressBar1";
+        private static UI_ProgressBar1 _proxy;
 
-        public static UI_Button2 Create(GObject gObject = null)
+        public static UI_ProgressBar1 Create(GObject gObject = null)
         {
-            var ui = new UI_Button2();
+            var ui = new UI_ProgressBar1();
             if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GButton)gObject;
+            	ui.target =  (GProgressBar)gObject;
             ui.Init(ui.target);
             return ui;
         }
 
-        public static UI_Button2 Proxy(GObject gObject = null)
+        public static UI_ProgressBar1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Button2();
+                _proxy = new UI_ProgressBar1();
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GButton)gObject;
+            	ui.target =  (GProgressBar)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -55,11 +55,11 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_loaMascot = (GLoader)comp.GetChild("loaMascot");
+            m_txttitle = (GTextField)comp.GetChild("txttitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaMascot = null;
+            m_txttitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ProgressBar1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 81837cf2c5fbf9148b94437c1b354dbd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_RechargeStoreUI.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a60b500458118754b9c08d5764d20886
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/ServerProxy/RechargeSProxy.cs

@@ -12,7 +12,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    RechargeDataManager.Instance.UpdateRechargeData(response.RechargeId, response.RechargedTimes);
+                    ShopDataManager.Instance.UpdateRechargeData(response.RechargeId, response.RechargedTimes);
                     PromptController.Instance.ShowFloatTextPrompt("虚拟充值成功", MessageType.SUCCESS);
                     EventAgent.DispatchEvent(ConstMessage.BUY_RECHARGE_SUCCESS);
 
@@ -29,7 +29,7 @@ namespace GFGGame
                 {
                     for (int i = 0; i < response.ks.Count; i++)
                     {
-                        RechargeDataManager.Instance.UpdateRechargeData(response.ks[i], response.vs[i]);
+                        ShopDataManager.Instance.UpdateRechargeData(response.ks[i], response.vs[i]);
                     }
                 }
             }
@@ -44,7 +44,7 @@ namespace GFGGame
                 {
                     for (int i = 0; i < response.ks.Count; i++)
                     {
-                        RechargeDataManager.Instance.UpdateGiftData(response.ks[i], response.vs[i]);
+                        ShopDataManager.Instance.UpdateGiftData(response.ks[i], response.vs[i]);
                     }
                 }
             }
@@ -57,7 +57,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    RechargeDataManager.Instance.UpdateGiftData(response.GiftBagId, response.BuyTimes);
+                    ShopDataManager.Instance.UpdateGiftData(response.GiftBagId, response.BuyTimes);
                     BonusController.TryShowBonusList(GiftBagCfgArray.Instance.GetCfg(response.GiftBagId).itemsArr);
                     EventAgent.DispatchEvent(ConstMessage.BUY_GIFT_SUCCESS);
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
@@ -76,7 +76,7 @@ namespace GFGGame
                 {
                     for (int i = 0; i < response.ks.Count; i++)
                     {
-                        RechargeDataManager.Instance.UpdateExchangeData(response.ks[i], response.vs[i]);
+                        ShopDataManager.Instance.UpdateExchangeData(response.ks[i], response.vs[i]);
                     }
                 }
             }
@@ -89,7 +89,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    RechargeDataManager.Instance.UpdateExchangeData(response.ExchangeId, response.ExchangedTimes);
+                    ShopDataManager.Instance.UpdateExchangeData(response.ExchangeId, response.ExchangedTimes);
                     EventAgent.DispatchEvent(ConstMessage.BUY_EXCHANGE_SUCCESS);
                     ShopExchangeCfg cfg = ShopExchangeCfgArray.Instance.GetCfg(response.ExchangeId);
                     BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(cfg.itemId, cfg.num * response.Times));

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -154,7 +154,7 @@ namespace GFGGame
         }
         private void OnBtnShopClick()
         {
-            ViewManager.Show<RechargeStoreView>();
+            ViewManager.Show<StoreView>();
         }
         private void OnBtnRewardClick()
         {

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -31,7 +31,7 @@ namespace GFGGame
         private int _selectedItemId;//打开界面时选中的物品id
         private int _selectedType = 0;//打开界面时选中的物品类型
         private int _selectedItemCount;
-        private int _selectedItemClothingId;
+        private int _selectedId;
 
         public override void Dispose()
         {
@@ -128,13 +128,13 @@ namespace GFGGame
                     _selectedItemId = (int)objs[2];//从物品来源面板跳转到商店，需要物品id方便打开界面时做选中处理
                     long selectedItemCount = (long)objs[3];
                     _selectedItemCount = (int)selectedItemCount;
-                    ShopCfg[] dataArray = ClothingShopCfgManager.Instance.GetShopCfgs(_storeId);
-                    for (int i = 0; i < dataArray.Length; i++)
+                    List<ShopCfg> dataArray = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.FU_ZHUANG_DIAN, ConstStoreSubId.FU_ZHUANG_DIAN);
+                    for (int i = 0; i < dataArray.Count; i++)
                     {
-                        if (dataArray[i].itemID == _selectedItemId)
+                        if (dataArray[i].itemId == _selectedItemId)
                         {
                             _selectedType = dataArray[i].typeIndex;
-                            _selectedItemClothingId = dataArray[i].id;
+                            _selectedId = dataArray[i].id;
                             // ShopCfg clothingShopCfg = ShopCfgClothingArray.Instance.GetCfg(_selectedItemClothingId);
                             _ui.m_listType.selectedIndex = _selectedType;
                             break;
@@ -174,7 +174,7 @@ namespace GFGGame
             }
             if (_selectedItemId > 0 && _selectedItemCount > 0)
             {
-                ShopDataManager.Instance.BuyItem(_cfgSelected.id, _selectedItemCount, _storeId, _cfgSelected);
+                ShopViewManager.Instance.BuyItem(_cfgSelected.id, _selectedItemCount, _storeId, _cfgSelected);
             }
 
             Timers.inst.AddUpdate(CheckGuide);
@@ -205,10 +205,10 @@ namespace GFGGame
 
         private void OnclickBtnBuy()
         {
-            int count = _selectedItemId > 0 && _cfgSelected.itemID == _selectedItemId ? _selectedItemCount : INIT_COUNT;
+            int count = _selectedItemId > 0 && _cfgSelected.itemId == _selectedItemId ? _selectedItemCount : INIT_COUNT;
             // BuyItemConteoller.Show(_cfgSelected.itemID, _cfgSelected.costID, INIT_COUNT, _cfgSelected.costNum, count, null, true, false, MAX_COUNT);
             count = Math.Max(1, count);
-            ShopDataManager.Instance.BuyItem(_cfgSelected.id, count, _storeId, _cfgSelected);
+            ShopViewManager.Instance.BuyItem(_cfgSelected.id, count, _storeId, _cfgSelected);
         }
         private void UpdateItemChange()
         {
@@ -231,9 +231,9 @@ namespace GFGGame
         private void UpdateRole(bool tween)
         {
             _dressUpObjUI.ResetSceneObj(70, false, true, null, false);
-            _dressUpObjUI.dressUpObj.AddOrRemove(_cfgSelected.itemID, true);
+            _dressUpObjUI.dressUpObj.AddOrRemove(_cfgSelected.itemId, true);
             _dressUpObjUI.UpdateWrapper(_ui.m_compHolder.m_compMover.m_holder);
-            int type = ItemUtilCS.GetItemSubType(_cfgSelected.itemID);
+            int type = ItemUtilCS.GetItemSubType(_cfgSelected.itemId);
             float duration = DURATION;
             if (!tween)
             {
@@ -260,20 +260,20 @@ namespace GFGGame
         {
             _ui.m_listShop.RemoveChildrenToPool();
             int typeIndex = _ui.m_listType.selectedIndex;
-            _dataList = ClothingShopCfgManager.Instance.GetList(_storeId, typeIndex, _scoreType);
+            _dataList = ShopDataManager.Instance.GetList(_storeId, typeIndex, _scoreType);
             _ui.m_listShop.numItems = _dataList.Count;
 
 
             if (_ui.m_listShop.numItems > 0)
             {
-                ShopCfg clothingShopCfg = ClothingShopCfgManager.Instance.GetShopCfg(_selectedItemClothingId, _storeId);//  ShopCfgClothingArray.Instance.GetCfg(_selectedItemClothingId);
+                ShopCfg clothingShopCfg = ShopCfgArray.Instance.GetCfg(_selectedId);
                 int itemIndex = 0;
                 if (_selectedItemId > 0 && clothingShopCfg != null)
                 {
                     // itemIndex = _dataList.IndexOf(clothingShopCfg);
                     for (int i = 0; i < _dataList.Count; i++)
                     {
-                        if (_dataList[i].id == _selectedItemClothingId)
+                        if (_dataList[i].id == _selectedId)
                         {
                             itemIndex = i;
                             break;
@@ -308,15 +308,15 @@ namespace GFGGame
             ShopCfg cfg = _dataList[index];
             listItem.target.data = cfg;
             // listItem.m_grpSelect.visible = false;
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemID);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
             listItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
             string itemName = itemCfg.name;
             listItem.m_txtName.text = itemName;
-            RarityIconController.UpdateRarityIcon(listItem.m_rarity, cfg.itemID, false);
-            ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(cfg.costID);
+            RarityIconController.UpdateRarityIcon(listItem.m_rarity, cfg.itemId, false);
+            ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(cfg.costId);
             listItem.m_iconPrice.url = "ui://CommonGame/" + costItemCfg.res;
-            listItem.m_imgOwned.visible = ItemDataManager.GetItemNum(cfg.itemID) > 0;
-            listItem.m_txtPrice.text = ItemDataManager.GetItemNum(cfg.costID) >= cfg.costNum ? StringUtil.GetColorText(cfg.costNum.ToString(), "#DD994A") : StringUtil.GetColorText(cfg.costNum.ToString(), "#F2989B");
+            listItem.m_imgOwned.visible = ItemDataManager.GetItemNum(cfg.itemId) > 0;
+            listItem.m_txtPrice.text = ItemDataManager.GetItemNum(cfg.costId) >= cfg.price ? StringUtil.GetColorText(cfg.price.ToString(), "#DD994A") : StringUtil.GetColorText(cfg.price.ToString(), "#F2989B");
             listItem.m_loaMainScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (itemCfg.mainScore));
 
             UI_ListClothingShopItem.ProxyEnd();
@@ -338,28 +338,28 @@ namespace GFGGame
 
         private void UpdateSelectedItemInfo()
         {
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.itemID);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.itemId);
             string itemName = itemCfg.name;
             _ui.m_compItemInfo.m_txtName.text = itemName;
             _ui.m_compItemInfo.m_txtDesc.text = itemCfg.desc;
-            RarityIconController.UpdateRarityIcon(_ui.m_compItemInfo.m_rarity, _cfgSelected.itemID, false);
-            ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.costID);
+            RarityIconController.UpdateRarityIcon(_ui.m_compItemInfo.m_rarity, _cfgSelected.itemId, false);
+            ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.costId);
             _ui.m_compItemInfo.m_iconPrice.url = "ui://CommonGame/" + costItemCfg.res;
-            _ui.m_compItemInfo.m_txtPrice.text = "" + _cfgSelected.costNum;
+            _ui.m_compItemInfo.m_txtPrice.text = "" + _cfgSelected.price;
             _ui.m_compItemInfo.m_txtGong.text = "" + itemCfg.score1;
             _ui.m_compItemInfo.m_txtShang.text = "" + itemCfg.score2;
             _ui.m_compItemInfo.m_txtJue.text = "" + itemCfg.score3;
             _ui.m_compItemInfo.m_txtZhi.text = "" + itemCfg.score4;
-            _ui.m_compItemInfo.m_txtOwned.SetVar("v1", "" + ItemDataManager.GetItemNum(_cfgSelected.itemID)).FlushVars();
+            _ui.m_compItemInfo.m_txtOwned.SetVar("v1", "" + ItemDataManager.GetItemNum(_cfgSelected.itemId)).FlushVars();
             UI_ListClothingShopItem listItem = UI_ListClothingShopItem.Proxy(_selectedListItem);
-            listItem.m_imgOwned.visible = ItemDataManager.GetItemNum(_cfgSelected.itemID) > 0;
+            listItem.m_imgOwned.visible = ItemDataManager.GetItemNum(_cfgSelected.itemId) > 0;
             UI_ListClothingShopItem.ProxyEnd();
             _ui.m_compItemInfo.m_listTag.numItems = itemCfg.tagsArr.Length;
         }
 
         private void RenderListTagItem(int index, GObject obj)
         {
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.itemID);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.itemId);
 
             UI_ListTagItem item = UI_ListTagItem.Proxy(obj);
 

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/GalleryShopView.cs

@@ -31,7 +31,7 @@ namespace GFGGame
         private int _selectedItemId;//打开界面时选中的物品id
         private int _selectedType = 0;//打开界面时选中的物品类型
         private int _selectedItemCount;
-        private int _selectedItemClothingId;
+        private int _selectedId;
 
         public override void Dispose()
         {
@@ -111,13 +111,13 @@ namespace GFGGame
                 {
                     _selectedItemId = (int)objs[2];//从物品来源面板跳转到商店，需要物品id方便打开界面时做选中处理
                     _selectedItemCount = (int)objs[3];
-                    ShopCfg[] dataArray = ClothingShopCfgManager.Instance.GetShopCfgs(_storeId);
-                    for (int i = 0; i < dataArray.Length; i++)
+                    List<ShopCfg> dataArray = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY);
+                    for (int i = 0; i < dataArray.Count; i++)
                     {
-                        if (dataArray[i].itemID == _selectedItemId)
+                        if (dataArray[i].itemId == _selectedItemId)
                         {
                             _selectedType = dataArray[i].typeIndex;
-                            _selectedItemClothingId = dataArray[i].id;
+                            _selectedId = dataArray[i].id;
                             _ui.m_comItemList.m_comBtnTab.m_c1.selectedIndex = _selectedType;
                             break;
                         }
@@ -135,7 +135,7 @@ namespace GFGGame
 
             if (_selectedItemId > 0 && _selectedItemCount > 0)
             {
-                ShopDataManager.Instance.BuyItem(_cfgSelected.id, _selectedItemCount, _storeId, _cfgSelected);
+                ShopViewManager.Instance.BuyItem(_cfgSelected.id, _selectedItemCount, _storeId, _cfgSelected);
             }
 
 
@@ -165,10 +165,10 @@ namespace GFGGame
 
         private void OnclickBtnBuy()
         {
-            int count = _selectedItemId > 0 && _cfgSelected.itemID == _selectedItemId ? _selectedItemCount : INIT_COUNT;
+            int count = _selectedItemId > 0 && _cfgSelected.itemId == _selectedItemId ? _selectedItemCount : INIT_COUNT;
             // BuyItemConteoller.Show(_cfgSelected.itemID, _cfgSelected.costID, INIT_COUNT, _cfgSelected.costNum, count, null, true, false, MAX_COUNT);
             count = Math.Max(1, count);
-            ShopDataManager.Instance.BuyItem(_cfgSelected.id, count, _storeId, _cfgSelected);
+            ShopViewManager.Instance.BuyItem(_cfgSelected.id, count, _storeId, _cfgSelected);
         }
         private void UpdateItemChange()
         {
@@ -182,19 +182,19 @@ namespace GFGGame
         {
 
             int typeIndex = _ui.m_comItemList.m_comBtnTab.m_c1.selectedIndex;
-            _dataList = ClothingShopCfgManager.Instance.GetList(_storeId, typeIndex, _scoreType);
+            _dataList = ShopDataManager.Instance.GetList(_storeId, typeIndex, _scoreType);
             _ui.m_comItemList.m_list.numItems = _dataList.Count;
 
 
             if (_ui.m_comItemList.m_list.numItems > 0)
             {
-                ShopCfg clothingShopCfg = ClothingShopCfgManager.Instance.GetShopCfg(_selectedItemClothingId, _storeId);
+                ShopCfg clothingShopCfg = ShopCfgArray.Instance.GetCfg(_selectedId);
                 int itemIndex = 0;
                 if (_selectedItemId > 0 && clothingShopCfg != null)
                 {
                     for (int i = 0; i < _dataList.Count; i++)
                     {
-                        if (_dataList[i].id == _selectedItemClothingId)
+                        if (_dataList[i].id == _selectedId)
                         {
                             itemIndex = i;
                             break;
@@ -221,16 +221,16 @@ namespace GFGGame
             ShopCfg cfg = _dataList[index];
             listItem.target.data = cfg;
             // listItem.m_grpSelect.visible = false;
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemID);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
             listItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             string itemName = itemCfg.name;
             listItem.m_txtName.text = itemName;
             // RarityIconController.UpdateRarityIcon(listItem.m_rarity, cfg.itemID, false);
-            ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(cfg.costID);
+            ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(cfg.costId);
             listItem.m_iconPrice.url = "ui://CommonGame/" + costItemCfg.res;
-            listItem.m_imgOwned.visible = ItemDataManager.GetItemNum(cfg.itemID) > 0;
+            listItem.m_imgOwned.visible = ItemDataManager.GetItemNum(cfg.itemId) > 0;
             // listItem.m_txtPrice.text = ItemDataManager.GetItemNum(cfg.costID) >= cfg.costNum ? StringUtil.GetColorText(cfg.costNum.ToString(), "#DD994A") : StringUtil.GetColorText(cfg.costNum.ToString(), "#F2989B");
-            listItem.m_txtPrice.text = cfg.costNum.ToString();
+            listItem.m_txtPrice.text = cfg.price.ToString();
             UI_ListGalleryShopItem.ProxyEnd();
         }
         private void OnClickListShopItem(EventContext context)
@@ -252,7 +252,7 @@ namespace GFGGame
         }
         private void UpdateRole(bool tween)
         {
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.itemID);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.itemId);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
             _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg); ;
             // _ui.m_comRes.m_loaBg.visible = false;
@@ -332,7 +332,7 @@ namespace GFGGame
         }
         private void UpdateSelectedItemInfo()
         {
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.itemID);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.itemId);
             _ui.m_txtName.text = itemCfg.name;
             _ui.m_txtDesc.text = itemCfg.desc;
         }

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

@@ -165,16 +165,16 @@ namespace GFGGame
                     // this.Hide();
                     isJump = ViewManager.Show<ClothingDecomposeView>(null, _fromeViewDatas);
                     break;
-                case ConstFunctionId.SHOP_GIFT_BAG:
-                    // this.Hide();
-                    int giftBagValue = int.Parse(infos[1]);
-                    isJump = ViewManager.Show<StoreView>(new object[] { ConstFunctionId.STORE_CHARGE, giftBagValue }, _fromeViewDatas);
-                    break;
-                case ConstFunctionId.SHOP_EXCHANGE:
-                    // this.Hide();
-                    int exchangeValue = int.Parse(infos[1]);
-                    isJump = ViewManager.Show<StoreView>(new object[] { ConstFunctionId.STORE_CHARGE, exchangeValue }, _fromeViewDatas);
-                    break;
+                // case ConstFunctionId.SHOP_GIFT_BAG:
+                //     // this.Hide();
+                //     int giftBagValue = int.Parse(infos[1]);
+                //     isJump = ViewManager.Show<StoreView>(new object[] { ConstFunctionId.STORE_CHARGE, giftBagValue }, _fromeViewDatas);
+                //     break;
+                // case ConstFunctionId.SHOP_EXCHANGE:
+                //     // this.Hide();
+                //     int exchangeValue = int.Parse(infos[1]);
+                //     isJump = ViewManager.Show<StoreView>(new object[] { ConstFunctionId.STORE_CHARGE, exchangeValue }, _fromeViewDatas);
+                //     break;
                 case ConstFunctionId.JU_QING_GUAN_QIA:
 
                     string value = infos[1];

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

@@ -110,10 +110,10 @@ namespace GFGGame
             _shopType = shopType;
             if (buyType == ConstBuyType.TYPE_SHOP)
             {
-                ShopCfg shopCfg = ClothingShopCfgManager.Instance.GetShopCfg(buyId, shopType);
-                int maxBuyCount = (int)Math.Floor((decimal)(ItemDataManager.GetItemNum(shopCfg.costID) / shopCfg.costNum));
+                ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(buyId);
+                int maxBuyCount = (int)Math.Floor((decimal)(ItemDataManager.GetItemNum(shopCfg.costId) / shopCfg.price));
                 _maxCanBuy = Math.Min(maxCount, maxBuyCount);
-                _itemId = shopCfg.itemID;
+                _itemId = shopCfg.itemId;
 
             }
             else if (buyType == ConstBuyType.TYPE_ITEM)
@@ -281,7 +281,7 @@ namespace GFGGame
             if (_buyType == ConstBuyType.TYPE_SHOP)
             {
 
-                ClothingShopCfgManager.Instance.GetMoneyIdAndNum(_buyId, (int)count, _shopType, out _costId, out _costNum, out _buyNum);
+                ShopDataManager.Instance.GetMoneyIdAndNum(_buyId, (int)count, _shopType, out _costId, out _costNum, out _buyNum);
 
             }
             else if (_buyType == ConstBuyType.TYPE_ITEM)

GameClient/Assets/Game/HotUpdate/Views/League/LeagueApplyView.cs

@@ -29,6 +29,7 @@ namespace GFGGame
             packageName = UI_LeagueApplyUI.PACKAGE_NAME;
             _ui = UI_LeagueApplyUI.Create();
             this.viewCom = _ui.target;
+            // isfullScreen = true;
             this.viewCom.Center();
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;

GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberLogView.cs

@@ -26,6 +26,7 @@ namespace GFGGame
             packageName = UI_LeagueMemberLogUI.PACKAGE_NAME;
             _ui = UI_LeagueMemberLogUI.Create();
             this.viewCom = _ui.target;
+            // isfullScreen = true;
             this.viewCom.Center();
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ChargeStoreView.cs

@@ -0,0 +1,99 @@
+using UI.Store;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class ChargeStoreView : BaseWindow
+    {
+        private UI_ChargeUI _ui;
+        private List<ShopCfg> _shopCfgs;
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ChargeUI.PACKAGE_NAME;
+            _ui = UI_ChargeUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+
+            _ui.m_list.itemRenderer = ListItemRenderer;
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE);
+            _ui.m_list.numItems = _shopCfgs.Count;
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            ShopCfg itemData = _shopCfgs[index];
+            UI_ListChargeItem item = UI_ListChargeItem.Proxy(obj);
+            item.m_btnBuy.m_c1.selectedIndex = 1;
+            item.m_btnBuy.m_txtTitle.text = itemData.price.ToString();
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnClickBtnBuy);
+                // item.target.onClick.Add(() =>
+                // {
+                //     if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
+                //     {
+                //         RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
+                //         LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+                //     }
+                // });
+            }
+            item.target.data = index;
+            item.m_txtName.text = string.Format("{0}{1}", itemData.itemNum, itemData.itemName);
+            item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", itemData.itemNum, itemData.itemName);
+            bool isDouble = ShopDataManager.Instance.GetRechargeBuyNumById(itemData.id) < itemData.doubleTimes;
+            item.m_imgDouble.visible = isDouble;
+            item.m_txtDesc.visible = isDouble;
+            item.m_icon.url = "ui://Store/sc_zizhuan_" + (index + 1);
+
+            UI_ListChargeItem.ProxyEnd();
+        }
+
+        private void OnClickBtnBuy(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int index = (int)obj.data;
+            ShopCfg itemData = _shopCfgs[index];
+            if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
+            {
+                RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ChargeStoreView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fdd2736077e8b324c9b104b9df3b2dc8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/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 = RechargeDataManager.Instance.GetGiftStateById(_giftId) ? 0 : 1;
+            _ui.m_c1.selectedIndex = ShopDataManager.Instance.GetGiftStateById(_giftId) ? 0 : 1;
             if (cfg.lockType == LockType.STORY_LV)
             {
                 StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLevelId);
@@ -56,10 +56,10 @@ namespace GFGGame
             {
                 _ui.m_txtLock.text = string.Format("角色达到{0}级解锁", cfg.lv);
             }
-            int buyNum = RechargeDataManager.Instance.GetGiftBuyNumById(cfg.id);
-            _ui.m_txtLimit.text = string.Format("{0}({1}/{2})", RechargeDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
+            int buyNum = ShopDataManager.Instance.GetGiftBuyNumById(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 = RechargeDataManager.Instance.GetEndTime(cfg.id);
+            _ui.m_txtEndTime.text = ShopDataManager.Instance.GetEndTime(cfg.id);
             _ui.m_grpEndTime.visible = cfg.endTime != "";
 
             _ui.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
@@ -107,7 +107,7 @@ namespace GFGGame
         {
 
             GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(_giftId);
-            if (cfg.costType == CostType.MONEY || cfg.costType == CostType.ITEM)
+            if (cfg.costType == CostType.ITEM)
             {
                 long hasNum = ItemDataManager.GetItemNum(cfg.costId);
                 if (hasNum < cfg.price)

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ItemExchangeView.cs

@@ -58,7 +58,7 @@ namespace GFGGame
             }
             else
             {
-                int lastBuyCount = cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id);//剩余购买次数
+                int lastBuyCount = cfg.maxLimit - ShopDataManager.Instance.GetExchangeBuyNumById(cfg.id);//剩余购买次数
                 _maxCanBuy = Math.Min(curMoneyCanBuy, lastBuyCount);
             }
             _maxCanBuy = Math.Max(1, _maxCanBuy);

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs

@@ -1,289 +1,289 @@
-using UI.Store;
-using UI.CommonGame;
-using FairyGUI;
-using System.Collections.Generic;
-using ET;
+// using UI.Store;
+// using UI.CommonGame;
+// using FairyGUI;
+// using System.Collections.Generic;
+// using ET;
 
-namespace GFGGame
-{
-    public class RechargeStoreView : BaseWindow
-    {
-        private UI_RechargeStoreUI _ui;
-        private List<GiftBagCfg> _giftCfgs;
-        private List<ShopExchangeCfg> _exchangeCfgs;
-        public override void Dispose()
-        {
+// namespace GFGGame
+// {
+//     public class RechargeStoreView : BaseWindow
+//     {
+//         private UI_RechargeStoreUI _ui;
+//         private List<GiftBagCfg> _giftCfgs;
+//         private List<ShopExchangeCfg> _exchangeCfgs;
+//         public override void Dispose()
+//         {
 
-            if (_ui != null)
-            {
-                _ui.Dispose();
-            }
-            _ui = null;
-            base.Dispose();
-        }
+//             if (_ui != null)
+//             {
+//                 _ui.Dispose();
+//             }
+//             _ui = null;
+//             base.Dispose();
+//         }
 
-        protected override void OnInit()
-        {
-            base.OnInit();
-            packageName = UI_RechargeStoreUI.PACKAGE_NAME;
-            _ui = UI_RechargeStoreUI.Create();
-            this.viewCom = _ui.target;
-            isfullScreen = true;
-            this.clickBlankToClose = false;
+//         protected override void OnInit()
+//         {
+//             base.OnInit();
+//             packageName = UI_RechargeStoreUI.PACKAGE_NAME;
+//             _ui = UI_RechargeStoreUI.Create();
+//             this.viewCom = _ui.target;
+//             isfullScreen = true;
+//             this.clickBlankToClose = false;
 
-            _ui.m_list.itemRenderer = ListItemRenderer;
-            _ui.m_listGift.itemRenderer = ListGiftItemRenderer;
-            _ui.m_listExchange.itemRenderer = ListExchangeItemRenderer;
+//             _ui.m_list.itemRenderer = ListItemRenderer;
+//             _ui.m_listGift.itemRenderer = ListGiftItemRenderer;
+//             _ui.m_listExchange.itemRenderer = ListExchangeItemRenderer;
 
-            _ui.m_comTab.m_c1.onChanged.Add(OnComTabChange);
-            _ui.m_c1.onChanged.Add(OnTabChange);
+//             _ui.m_comTab.m_c1.onChanged.Add(OnComTabChange);
+//             _ui.m_c1.onChanged.Add(OnTabChange);
 
 
-        }
-        protected override void AddEventListener()
-        {
-            base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
-            EventAgent.AddEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
-            EventAgent.AddEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
-            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-        }
-        protected override void OnShown()
-        {
-            base.OnShown();
+//         }
+//         protected override void AddEventListener()
+//         {
+//             base.AddEventListener();
+//             EventAgent.AddEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
+//             EventAgent.AddEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
+//             EventAgent.AddEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
+//             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+//         }
+//         protected override void OnShown()
+//         {
+//             base.OnShown();
 
-            _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
-            _ui.m_comTab.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
-            _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
-            UpdateExchangeList();
-            UpdateGiftBagList();
-            OnTabChange();
-            Timers.inst.Add(1, 0, UpdateExchangeTime);
-        }
+//             _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
+//             _ui.m_comTab.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
+//             _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
+//             UpdateExchangeList();
+//             UpdateGiftBagList();
+//             OnTabChange();
+//             Timers.inst.Add(1, 0, UpdateExchangeTime);
+//         }
 
-        protected override void OnHide()
-        {
-            base.OnHide();
-            Timers.inst.Remove(UpdateExchangeTime);
+//         protected override void OnHide()
+//         {
+//             base.OnHide();
+//             Timers.inst.Remove(UpdateExchangeTime);
 
-        }
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
-            EventAgent.RemoveEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
-            EventAgent.RemoveEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
-            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-        }
+//         }
+//         protected override void RemoveEventListener()
+//         {
+//             base.RemoveEventListener();
+//             EventAgent.RemoveEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
+//             EventAgent.RemoveEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
+//             EventAgent.RemoveEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
+//             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+//         }
 
-        private void OnComTabChange()
-        {
-            _ui.m_c1.selectedIndex = _ui.m_comTab.m_c1.selectedIndex;
+//         private void OnComTabChange()
+//         {
+//             _ui.m_c1.selectedIndex = _ui.m_comTab.m_c1.selectedIndex;
 
-        }
-        private void OnTabChange()
-        {
-            _ui.m_list.ScrollToView(0);
-            _ui.m_listGift.ScrollToView(0);
-            _ui.m_listExchange.ScrollToView(0);
-        }
-        private void UpdateList()
-        {
-            _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
-        }
-        private void UpdateGiftBagList()
-        {
-            _giftCfgs = RechargeDataManager.Instance.GetGiftBagCfgs();
-            _ui.m_listGift.numItems = _giftCfgs.Count;
-            UpdateRedDot();
-        }
-        private void UpdateExchangeList()
-        {
-            _exchangeCfgs = RechargeDataManager.Instance.GetExchangeCfgs();
-            _ui.m_listExchange.numItems = _exchangeCfgs.Count;
-        }
-        private void UpdateExchangeTime(object param)
-        {
-            long endTime = TimeUtil.GetTomorrowTime(GlobalCfgArray.globalCfg.refreshTime);
-            string time = TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
-            _ui.m_txtRefreshTime.text = time + "后刷新";
-            for (int i = 0; i < _ui.m_listGift.numItems; i++)
-            {
-                UI_ListGiftItem item = UI_ListGiftItem.Proxy(_ui.m_listGift.GetChildAt(i));
-                GiftBagCfg cfg = _giftCfgs[i];
-                item.m_txtEndTime.text = RechargeDataManager.Instance.GetEndTime(cfg.id);
-                UI_ListGiftItem.ProxyEnd();
-            }
-        }
-        private void ListItemRenderer(int index, GObject obj)
-        {
-            RechargeCfg itemData = RechargeCfgArray.Instance.dataArray[index];
-            UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
-            item.m_txtExchangeCount.visible = false;
-            item.m_btnBuy.m_c1.selectedIndex = 1;
-            item.m_btnBuy.m_txtTitle.text = itemData.price.ToString();
-            if (item.target.data == null)
-            {
-                item.target.onClick.Add(() =>
-                {
-                    if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
-                    {
-                        RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
-                        LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
-                    }
-                });
-            }
-            item.target.data = index;
-            item.m_txtName.text = string.Format("{0}{1}", itemData.itemNum, itemData.name);
-            item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", itemData.itemNum, itemData.name);
-            bool isDouble = RechargeDataManager.Instance.GetRechargeBuyNumById(itemData.id) < itemData.doubleTimes;
-            item.m_imgDouble.visible = isDouble;
-            item.m_txtDesc.visible = isDouble;
-            item.m_icon.url = "ui://Store/sc_zizhuan_" + itemData.id;
+//         }
+//         private void OnTabChange()
+//         {
+//             _ui.m_list.ScrollToView(0);
+//             _ui.m_listGift.ScrollToView(0);
+//             _ui.m_listExchange.ScrollToView(0);
+//         }
+//         private void UpdateList()
+//         {
+//             _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
+//         }
+//         private void UpdateGiftBagList()
+//         {
+//             _giftCfgs = StoreDataManager.Instance.GetGiftBagCfgs();
+//             _ui.m_listGift.numItems = _giftCfgs.Count;
+//             UpdateRedDot();
+//         }
+//         private void UpdateExchangeList()
+//         {
+//             _exchangeCfgs = StoreDataManager.Instance.GetExchangeCfgs();
+//             _ui.m_listExchange.numItems = _exchangeCfgs.Count;
+//         }
+//         private void UpdateExchangeTime(object param)
+//         {
+//             long endTime = TimeUtil.GetTomorrowTime(GlobalCfgArray.globalCfg.refreshTime);
+//             string time = TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
+//             _ui.m_txtRefreshTime.text = time + "后刷新";
+//             for (int i = 0; i < _ui.m_listGift.numItems; i++)
+//             {
+//                 UI_ListGiftItem item = UI_ListGiftItem.Proxy(_ui.m_listGift.GetChildAt(i));
+//                 GiftBagCfg cfg = _giftCfgs[i];
+//                 item.m_txtEndTime.text = StoreDataManager.Instance.GetEndTime(cfg.id);
+//                 UI_ListGiftItem.ProxyEnd();
+//             }
+//         }
+//         private void ListItemRenderer(int index, GObject obj)
+//         {
+//             RechargeCfg itemData = RechargeCfgArray.Instance.dataArray[index];
+//             UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
+//             item.m_txtExchangeCount.visible = false;
+//             item.m_btnBuy.m_c1.selectedIndex = 1;
+//             item.m_btnBuy.m_txtTitle.text = itemData.price.ToString();
+//             if (item.target.data == null)
+//             {
+//                 item.target.onClick.Add(() =>
+//                 {
+//                     if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
+//                     {
+//                         RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
+//                         LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+//                     }
+//                 });
+//             }
+//             item.target.data = index;
+//             item.m_txtName.text = string.Format("{0}{1}", itemData.itemNum, itemData.name);
+//             item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", itemData.itemNum, itemData.name);
+//             bool isDouble = StoreDataManager.Instance.GetRechargeBuyNumById(itemData.id) < itemData.doubleTimes;
+//             item.m_imgDouble.visible = isDouble;
+//             item.m_txtDesc.visible = isDouble;
+//             item.m_icon.url = "ui://Store/sc_zizhuan_" + itemData.id;
 
-            UI_StoreListItem.ProxyEnd();
-        }
+//             UI_StoreListItem.ProxyEnd();
+//         }
 
-        private void ListGiftItemRenderer(int index, GObject obj)
-        {
-            UI_ListGiftItem item = UI_ListGiftItem.Proxy(obj);
-            GiftBagCfg cfg = _giftCfgs[index];
+//         private void ListGiftItemRenderer(int index, GObject obj)
+//         {
+//             UI_ListGiftItem item = UI_ListGiftItem.Proxy(obj);
+//             GiftBagCfg cfg = _giftCfgs[index];
 
-            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 = cfg.name;
+//             item.m_icon.url = ResPathUtil.GetIconPath(cfg.res, "png"); // string.Format("ui://RechargeStore/{0}", cfg.res);
 
-            item.m_txtDesc.SetVar("count", cfg.desc).FlushVars(); ;
-            item.m_grpDiscount.visible = cfg.desc != "";
+//             item.m_txtDesc.SetVar("count", cfg.desc).FlushVars(); ;
+//             item.m_grpDiscount.visible = cfg.desc != "";
 
-            item.m_txtEndTime.text = RechargeDataManager.Instance.GetEndTime(cfg.id);
-            item.m_grpEndTime.visible = cfg.endTime != "";
+//             item.m_txtEndTime.text = StoreDataManager.Instance.GetEndTime(cfg.id);
+//             item.m_grpEndTime.visible = cfg.endTime != "";
 
-            item.m_c2.selectedIndex = RechargeDataManager.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 = 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);
+//             }
 
-            int buyNum = RechargeDataManager.Instance.GetGiftBuyNumById(cfg.id);
-            item.m_txtLimit.text = string.Format("{0}({1}/{2})", RechargeDataManager.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;
-            if (item.m_c1.selectedIndex == 0)
-            {
-                item.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
-                if (cfg.price > 0 && cfg.costType != CostType.FREE)
-                {
-                    item.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
-                    item.m_grpIcon.visible = true;
-                    item.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
+//             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;
+//             if (item.m_c1.selectedIndex == 0)
+//             {
+//                 item.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
+//                 if (cfg.price > 0 && cfg.costType != CostType.FREE)
+//                 {
+//                     item.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
+//                     item.m_grpIcon.visible = true;
+//                     item.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
 
-                    if (cfg.costType == CostType.RMB)
-                    {
-                        item.m_loaIcon.visible = false;
-                        item.m_txtIcon.visible = true;
-                        item.m_txtIcon.text = "￥";
-                    }
-                    else
-                    {
-                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.costId);
-                        item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-                        item.m_loaIcon.visible = true;
-                        item.m_txtIcon.visible = false;
-                    }
-                }
-                else
-                {
-                    item.m_grpIcon.visible = false;
-                    item.m_grpOriginalPrice.visible = false;
-                    item.m_txtPrice.text = "免费";
-                }
-            }
+//                     if (cfg.costType == CostType.RMB)
+//                     {
+//                         item.m_loaIcon.visible = false;
+//                         item.m_txtIcon.visible = true;
+//                         item.m_txtIcon.text = "￥";
+//                     }
+//                     else
+//                     {
+//                         ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.costId);
+//                         item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+//                         item.m_loaIcon.visible = true;
+//                         item.m_txtIcon.visible = false;
+//                     }
+//                 }
+//                 else
+//                 {
+//                     item.m_grpIcon.visible = false;
+//                     item.m_grpOriginalPrice.visible = false;
+//                     item.m_txtPrice.text = "免费";
+//                 }
+//             }
 
-            if (item.target.data == null)
-            {
-                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;
+//             if (item.target.data == null)
+//             {
+//                 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;
 
-            RedDotController.Instance.SetComRedDot(item.target, isRed, "", -6, 100);
-            UI_ListGiftItem.ProxyEnd();
-        }
-        private void OnBtnBuyClick(EventContext context)
-        {
-            GObject btn = context.sender as GObject;
-            int giftId = (int)btn.data;
-            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
-            if (cfg.maxBuyNum != 0 && RechargeDataManager.Instance.GetGiftBuyNumById(giftId) == cfg.maxBuyNum)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("已售罄");
-                return;
-            }
-            if (cfg.price == 0 || cfg.costType == CostType.FREE)
-            {
-                RechargeSProxy.ReqBuyGiftBag((int)btn.data).Coroutine();
-            }
-            else
-            {
-                ViewManager.Show<GiftBagBuyView>(btn.data);
-            }
-        }
+//             RedDotController.Instance.SetComRedDot(item.target, isRed, "", -6, 100);
+//             UI_ListGiftItem.ProxyEnd();
+//         }
+//         private void OnBtnBuyClick(EventContext context)
+//         {
+//             GObject btn = context.sender as GObject;
+//             int giftId = (int)btn.data;
+//             GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
+//             if (cfg.maxBuyNum != 0 && StoreDataManager.Instance.GetGiftBuyNumById(giftId) == cfg.maxBuyNum)
+//             {
+//                 PromptController.Instance.ShowFloatTextPrompt("已售罄");
+//                 return;
+//             }
+//             if (cfg.price == 0 || cfg.costType == CostType.FREE)
+//             {
+//                 RechargeSProxy.ReqBuyGiftBag((int)btn.data).Coroutine();
+//             }
+//             else
+//             {
+//                 ViewManager.Show<GiftBagBuyView>(btn.data);
+//             }
+//         }
 
-        private void ListExchangeItemRenderer(int index, GObject obj)
-        {
-            ShopExchangeCfg cfg = _exchangeCfgs[index];
-            UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
-            item.m_btnBuy.m_c1.selectedIndex = 0;
-            item.m_btnBuy.m_txtTitle.text = cfg.costNum.ToString();
-            item.m_txtExchangeCount.text = string.Format("x{0}", cfg.num);
-            // item.m_txtExchangeCount.visible = cfg.num > 1;
-            bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
-            item.m_c1.selectedIndex = isSellOut ? 1 : 0;
-            if (item.target.data == null)
-            {
-                // item.target.onClick.Add(() =>
-                // {
-                //     bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
-                //     if (isSellOut)
-                //     {
-                //         PromptController.Instance.ShowFloatTextPrompt("已售罄");
-                //         return;
-                //     }
-                //     ViewManager.Show<ItemExchangeView>(cfg.id);
-                // });
-                item.target.onClick.Add(OnBtnBugItem);
-            }
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
-            item.target.data = cfg;
-            item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costId).res);
-            item.m_txtName.text = itemCfg.name;
-            item.m_txtDesc.text = string.Format("剩余：{0}", cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id));
-            if (cfg.maxLimit == 0) item.m_txtDesc.text = "剩余：不限";
-            item.m_imgDouble.visible = false;
-            item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+//         private void ListExchangeItemRenderer(int index, GObject obj)
+//         {
+//             ShopExchangeCfg cfg = _exchangeCfgs[index];
+//             UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
+//             item.m_btnBuy.m_c1.selectedIndex = 0;
+//             item.m_btnBuy.m_txtTitle.text = cfg.costNum.ToString();
+//             item.m_txtExchangeCount.text = string.Format("x{0}", cfg.num);
+//             // item.m_txtExchangeCount.visible = cfg.num > 1;
+//             bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - StoreDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
+//             item.m_c1.selectedIndex = isSellOut ? 1 : 0;
+//             if (item.target.data == null)
+//             {
+//                 // item.target.onClick.Add(() =>
+//                 // {
+//                 //     bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
+//                 //     if (isSellOut)
+//                 //     {
+//                 //         PromptController.Instance.ShowFloatTextPrompt("已售罄");
+//                 //         return;
+//                 //     }
+//                 //     ViewManager.Show<ItemExchangeView>(cfg.id);
+//                 // });
+//                 item.target.onClick.Add(OnBtnBugItem);
+//             }
+//             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
+//             item.target.data = cfg;
+//             item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costId).res);
+//             item.m_txtName.text = itemCfg.name;
+//             item.m_txtDesc.text = string.Format("剩余：{0}", cfg.maxLimit - StoreDataManager.Instance.GetExchangeBuyNumById(cfg.id));
+//             if (cfg.maxLimit == 0) item.m_txtDesc.text = "剩余：不限";
+//             item.m_imgDouble.visible = false;
+//             item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
 
-            UI_StoreListItem.ProxyEnd();
-        }
-        private void OnBtnBugItem(EventContext context)
-        {
-            ShopExchangeCfg cfg = (context.sender as GObject).data as ShopExchangeCfg;
-            bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
-            if (isSellOut)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("已售罄");
-                return;
-            }
-            ViewManager.Show<ItemExchangeView>(cfg.id);
-        }
+//             UI_StoreListItem.ProxyEnd();
+//         }
+//         private void OnBtnBugItem(EventContext context)
+//         {
+//             ShopExchangeCfg cfg = (context.sender as GObject).data as ShopExchangeCfg;
+//             bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - StoreDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
+//             if (isSellOut)
+//             {
+//                 PromptController.Instance.ShowFloatTextPrompt("已售罄");
+//                 return;
+//             }
+//             ViewManager.Show<ItemExchangeView>(cfg.id);
+//         }
 
-        private void UpdateRedDot()
-        {
-            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetRechargeGiftFreeRed());
-        }
-    }
-}
+//         private void UpdateRedDot()
+//         {
+//             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetRechargeGiftFreeRed());
+//         }
+//     }
+// }

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -31,8 +31,6 @@ namespace GFGGame
 
             Font font0 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("FangZhengHeiTiJianTi-1", "ttf"));
             FontManager.RegisterFont(new DynamicFont("FangZhengHeiTiJianTi-1", font0));
-            UIConfig.defaultFont = "FangZhengHeiTiJianTi-1";
-
             Font font1 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("FZKTJW--GB1-0", "ttf"));
             FontManager.RegisterFont(new DynamicFont("FZKTJW--GB1-0", font1));
             Font font2 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("SourceHanSerifCN-Regular-1", "otf"));
@@ -50,7 +48,7 @@ namespace GFGGame
             Font font8 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("SourceHanSerifCN-SemiBold-7", "otf"));
             FontManager.RegisterFont(new DynamicFont("SourceHanSerifCN-SemiBold-7", font8));
 
-
+            UIConfig.defaultFont = "FZKTJW--GB1-0";
 
             _viewDic = new Dictionary<string, UIView>();
             //��ʼ����ͼ������

GameClient/Assets/ResIn/UI/Store/Store_atlas0_3.png.meta → GameClient/Assets/ResIn/UI/Store/Store_atlas_hhx91q.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8a96a6891257ecc4d9211e0a6ddb9845
+guid: a5c6852083c36374bb1abb5264771a08
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}