zhaoyang 2 年之前
父節點
當前提交
59f0889f71

+ 5 - 6
FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1264" opaque="false">
+<component size="962,1310" opaque="false">
   <displayList>
-    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1264">
+    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,1" size="962,1307">
       <relation target="n17_ohbx" sidePair="height-height,middle-middle"/>
     </component>
-    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,-27" group="n17_ohbx"/>
-    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="0,643" size="962,596" group="n17_ohbx"/>
-    <group id="n17_ohbx" name="grpTips" xy="0,-27" size="962,1267" advanced="true" layout="vt" excludeInvisibles="true">
+    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,1" group="n17_ohbx"/>
+    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="0,715" size="962,596" group="n17_ohbx"/>
+    <group id="n17_ohbx" name="grpTips" xy="0,1" size="962,1310" advanced="true" layout="vt" excludeInvisibles="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>
-  <relation target="n17_ohbx" sidePair="height-height"/>
 </component>

+ 13 - 13
FGUIProject/assets/CommonGame/components/ComTipsBase.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,520">
+<component size="962,714">
   <displayList>
     <text id="n1_s2cc" name="txtName" xy="65,50" size="186,61" group="n24_u2u3" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
     <text id="n3_s2cc" name="txtOwned" xy="752,72" pivot="1,0" size="129,41" group="n24_u2u3" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
@@ -9,25 +9,25 @@
     <image id="n20_r9ri" name="n20" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="354,162" group="n24_u2u3"/>
     <text id="n9_si5z" name="txtDesc" xy="375,181" size="506,166" group="n24_u2u3" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
     <group id="n24_u2u3" name="n24" xy="56,50" size="850,320" group="n25_u2u3" advanced="true"/>
-    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="75,390" size="50,50" group="n19_si5z"/>
-    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_2.png" xy="300,390" size="50,50" group="n19_si5z"/>
-    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesNew/kp_sx_3.png" xy="525,390" size="50,50" group="n19_si5z"/>
-    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="750,390" size="50,50" group="n19_si5z"/>
-    <text id="n15_si5z" name="txtGong" xy="135,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n16_si5z" name="txtShang" xy="360,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n17_si5z" name="txtJue" xy="585,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n18_si5z" name="txtZhi" xy="810,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <group id="n19_si5z" name="grpScore" xy="75,390" size="807,50" group="n25_u2u3" advanced="true"/>
-    <list id="n21_u2u3" name="listTag" xy="71,460" size="377,41" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
+    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="75,400" size="50,50" group="n19_si5z"/>
+    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_2.png" xy="300,400" size="50,50" group="n19_si5z"/>
+    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesNew/kp_sx_3.png" xy="525,400" size="50,50" group="n19_si5z"/>
+    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="750,400" size="50,50" group="n19_si5z"/>
+    <text id="n15_si5z" name="txtGong" xy="135,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n16_si5z" name="txtShang" xy="360,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n17_si5z" name="txtJue" xy="585,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n18_si5z" name="txtZhi" xy="810,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <group id="n19_si5z" name="grpScore" xy="75,400" size="807,50" group="n25_u2u3" advanced="true"/>
+    <list id="n21_u2u3" name="listTag" xy="71,480" size="377,41" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
       <item/>
       <item/>
     </list>
-    <list id="n26_l500" name="listItem" xy="196,521" pivot="0.5,0" size="569,131" group="n25_u2u3" visible="false" layout="row" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <list id="n26_l500" name="listItem" xy="196,551" pivot="0.5,0" size="569,131" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n25_u2u3" name="n25" xy="56,50" size="850,451" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <group id="n25_u2u3" name="n25" xy="56,50" size="850,632" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
   </displayList>
   <relation target="n25_u2u3" sidePair="height-height"/>
 </component>

+ 1 - 15
GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs

@@ -5,20 +5,6 @@ namespace GFGGame
 {
     public class ShopSProxy
     {
-        // public static async ETTask<bool> ShopBuy(int shopType, int buyId, long buyCount)
-        // {
-        //     M2C_ShopBuy response = null;
-        //     response = (M2C_ShopBuy)await MessageHelper.SendToServer(new C2M_ShopBuy() { ShopType = shopType, BuyId = buyId, BuyCount = (int)buyCount });
-        //     if (response != null)
-        //     {
-        //         if (response.Error == ErrorCode.ERR_Success)
-        //         {
-        //             // EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
-        //             return true;
-        //         }
-        //     }
-        //     return false;
-        // }
         public static async ETTask<bool> ReqShopInfo()
         {
             S2C_RequestShopInfo response = null;
@@ -62,7 +48,7 @@ namespace GFGGame
                         itemDatas = ItemUtil.CreateItemDataList(itemCfg.id, response.Times * shopCfg.itemNum);
                     }
                     BonusController.TryShowBonusList(itemDatas);
-
+                    EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
                     return true;
                 }
             }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs

@@ -152,8 +152,8 @@ namespace GFGGame
         }
         private async void OnBtnExchangeClick()
         {
-            ShopExchangeCfg cfg = ShopExchangeCfgArray.Instance.GetCfg(_goodIds);
-            if (ItemDataManager.GetItemNum(cfg.costId) < cfg.costNum)
+            ShopCfg cfg = ShopCfgArray.Instance.GetCfg(_goodIds);
+            if (ItemDataManager.GetItemNum(cfg.costId) < cfg.price)
             {
                 PromptController.Instance.ShowFloatTextPrompt("道具不足");
                 return;

+ 8 - 3
GameClient/Assets/Game/HotUpdate/Views/Store/StoreArenaView.cs

@@ -36,14 +36,14 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_ARENA, menu2);
-            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
-            _ui.m_list.numItems = _shopCfgs.Count;
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -53,9 +53,14 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
 
-
+        private void UpdateView()
+        {
+            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
         private void ListItemRenderer(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgs[index];

+ 8 - 3
GameClient/Assets/Game/HotUpdate/Views/Store/StoreExchangeView.cs

@@ -36,14 +36,14 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_EXCHANGE, menu2);
-            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
-            _ui.m_list.numItems = _shopCfgs.Count;
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -53,9 +53,14 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
 
-
+        private void UpdateView()
+        {
+            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
         private void ListItemRenderer(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgs[index];

+ 8 - 3
GameClient/Assets/Game/HotUpdate/Views/Store/StoreGiftBagView.cs

@@ -36,14 +36,14 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
-            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
-            _ui.m_list.numItems = _shopCfgs.Count;
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -53,9 +53,14 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
 
-
+        private void UpdateView()
+        {
+            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
         private void ListItemRenderer(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgs[index];

二進制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes