商店

FGUIProject/assets/Store/components/ListGiftItem.xml

@@ -19,13 +19,13 @@
     </group>
     <group id="n26_10not" name="grpDiscount" xy="0,-1" size="100,96" advanced="true"/>
     <loader id="n23_10not" name="icon" xy="61,55" size="162,162" aspect="true" url="ui://p9mtgheohhx91n" fill="scaleMatchHeight"/>
-    <text id="n27_10not" name="txtName" xy="340,26" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
+    <text id="n27_10not" name="txtName" xy="328,26" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
     <text id="n29_10not" name="txtEndTime" xy="81,220" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" text="1天后下架"/>
-    <text id="n32_10not" name="txtLimit" xy="241,76" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
-    <text id="n31_10not" name="txtLock" xy="339,120" pivot="0.5,0" anchor="true" size="210,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
+    <text id="n32_10not" name="txtLimit" xy="229,76" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
+    <text id="n31_10not" name="txtLock" xy="330,111" pivot="0.5,0" anchor="true" size="239,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" text="飞花令达到段位07解锁">
       <gearDisplay controller="c2" pages="0"/>
     </text>
-    <text id="n44_iftf" name="n44" xy="280,120" size="112,49" fontSize="36" color="#a59f8f" align="center" text="已售罄">
+    <text id="n44_iftf" name="n44" xy="299,120" size="81,36" fontSize="26" color="#a59f8f" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay2 controller="c2" pages="1" condition="0"/>
     </text>

FGUIProject/assets/Store/components/ListShopItem.xml

@@ -22,10 +22,10 @@
     <text id="n27_10not" name="txtName" xy="145,72" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
     <text id="n29_10not" name="txtEndTime" xy="89,340" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" vars="true" text="{value=1天}后下架"/>
     <text id="n56_l500" name="txtLimit" xy="45,121" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
-    <text id="n31_10not" name="txtLock" xy="145,150" pivot="0.5,0" anchor="true" size="210,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
+    <text id="n31_10not" name="txtLock" xy="145,150" pivot="0.5,0" anchor="true" size="229,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" text="飞花令达到段位7解锁">
       <gearDisplay controller="c2" pages="0"/>
     </text>
-    <text id="n57_l500" name="n57" xy="93,157" size="112,49" fontSize="36" color="#a59f8f" align="center" text="已售罄">
+    <text id="n57_l500" name="n57" xy="104,157" size="81,36" fontSize="26" color="#a59f8f" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay2 controller="c2" pages="1" condition="0"/>
     </text>

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

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using GFGGame;
+using UnityEngine;
 
 namespace GFGEditor
 {
@@ -24,19 +25,21 @@ namespace GFGEditor
         {
 
             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;
-
-                int index = 0;
-                while (index < clothingShopCfgs.Count)
+                var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgArray");
+                while (reader.Read())
                 {
-                    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());
+                    typeIndex = reader["_typeIndex"].ToString();
+                    itemId = int.Parse(reader["_itemId"].ToString());
+                    id = int.Parse(reader["_id"].ToString());
+                    int menu1 = int.Parse(reader["_menu1"].ToString());
+                    int menu2 = int.Parse(reader["_menu2"].ToString());
+                    if (menu1 != ConstStoreTabId.FU_ZHUANG_DIAN || menu2 != ConstStoreSubId.FU_ZHUANG_DIAN) continue;
 
                     int count;
                     if (Array.IndexOf(_shopItemType, typeIndex) >= 0)
@@ -58,7 +61,6 @@ namespace GFGEditor
                         }
                     }
                     _typeIndexDic.Add(id, count.ToString());
-                    index++;
                 }
             }
             catch (Exception e)

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

@@ -332,7 +332,7 @@ namespace GFGGame
             }
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
-                return string.Format("飞花令达到{0}段位解锁", shopCfg.lockValue);
+                return string.Format("飞花令达到段位-{0}解锁", shopCfg.lockValue);
             }
             return "";
         }

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using ET;
 
 namespace GFGGame
@@ -44,6 +45,24 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     ShopDataManager.Instance.UpdateGiftData(response.BuyId, response.TotalTimes);
+                    ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(response.BuyId);
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+                    if (LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL && shopCfg.costType == CostType.RMB)
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("虚拟充值成功");
+                    }
+
+                    List<ItemData> itemDatas;
+                    if (itemCfg.itemType == ConstItemType.GIFT_BAG)
+                    {
+                        itemDatas = ItemUtil.CreateItemDataList(itemCfg.itemsArr, response.Times * shopCfg.itemNum);
+                    }
+                    else
+                    {
+                        itemDatas = ItemUtil.CreateItemDataList(itemCfg.id, response.Times * shopCfg.itemNum);
+                    }
+                    BonusController.TryShowBonusList(itemDatas);
+
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/Utils/ItemUtil.cs

@@ -60,7 +60,8 @@ namespace GFGGame
 
         public static void AddDiamondPurple()
         {
-            ViewManager.Show(ViewName.RECHARGE_STORE_VIEW);
+            //  ViewManager.Show(ViewName.RECHARGE_STORE_VIEW);
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE });
         }
 
         //红钻（鲛绡）

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

@@ -96,7 +96,7 @@ namespace GFGGame
                     AlertUI.Show(costCfg.name + "不足，是否前往购买？").SetLeftButton(true).SetRightButton(true, "确认", (AlertWindow.AlertCallback)((object data) =>
                     {
                         long costNeedCount = coustNum - ItemDataManager.GetItemNum(costId);
-                        BuyItemConteoller.Show(costId, costNeedCount, 0, null, true, true, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED);
+                        BuyItemConteoller.Show(costId, costNeedCount, ConstBuyType.TYPE_ITEM, null, true, true, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED);
                     }));
                     OnClickBtnCancel();
                 }

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

@@ -89,7 +89,6 @@ namespace GFGGame
             ShopCfg itemData = _shopCfgs[index];
             if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
             {
-                // RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
                 ShopSProxy.ReqShopBuy(itemData.id, 1).Coroutine();
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
             }