礼包

FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml

@@ -5,33 +5,34 @@
     <image id="n0_10not" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,695"/>
     <image id="n18_iftf" name="n18" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="230,32"/>
     <text id="n1_10not" name="txtName" xy="354,31" pivot="0.5,0" size="228,74" fontSize="56" color="#8f6e30" text="礼包礼包"/>
-    <loader id="n2_10not" name="loaIcon" xy="137,273" pivot="0.5,0.5" size="50,50" autoSize="true"/>
-    <text id="n3_10not" name="txtLimit" xy="45,420" pivot="0.5,0" size="251,46" fontSize="34" color="#a3926c" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（0/1）"/>
-    <list id="n4_10not" name="list" xy="234,212" size="691,197" layout="row" overflow="hidden" colGap="10" defaultItem="ui://eg2y0ldpj48o98" align="center">
+    <loader id="n2_10not" name="loaIcon" xy="44,159" pivot="0.5,0.5" size="250,250" aspect="true" url="ui://vlgobc15d4iwl" fill="scaleMatchHeight"/>
+    <text id="n3_10not" name="txtLimit" xy="100,420" pivot="0.5,0" size="132,46" fontSize="34" color="#a3926c" align="center" leading="-5" letterSpacing="-2" ubb="true" text="永久限购"/>
+    <list id="n4_10not" name="list" xy="296,212" size="632,197" layout="row" overflow="scroll" scroll="horizontal" colGap="-20" defaultItem="ui://eg2y0ldpj48o98" align="center">
+      <item/>
       <item/>
       <item/>
     </list>
     <image id="n5_10not" name="n5" src="dmsi1l" fileName="images/sc_kuangsjsj.png" xy="729,107" group="n7_10not"/>
     <text id="n6_10not" name="txtEndTime" xy="756,105" pivot="0.5,0" size="94,41" group="n7_10not" fontSize="30" color="#ffffff" align="center" leading="-5" letterSpacing="-2" strokeColor="#b98653" strokeSize="2" text="12小时"/>
     <group id="n7_10not" name="grpEndTime" xy="729,105" size="155,42" advanced="true"/>
-    <loader id="n8_10not" name="loaPriceIcon" xy="379,507" size="60,60" group="n10_10not" visible="false" url="ui://vlgobc1510not1w" fill="scale"/>
-    <text id="n9_10not" name="txtIcon" xy="379,506" size="50,61" group="n10_10not" fontSize="46" color="#a17d5f" text="￥"/>
-    <group id="n10_10not" name="grpIcon" xy="379,506" size="50,61" group="n15_10not" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <text id="n11_10not" name="txtOriginalPrice" xy="460,506" pivot="0.5,0" size="32,61" group="n13_10not" fontSize="46" color="#caa293" align="center" text="4"/>
-    <image id="n12_10not" name="n12" src="dmsi1m" fileName="images/sc_tc_xian_1.png" xy="459,539" pivot="0.5,0" size="35,2" group="n13_10not">
-      <relation target="n11_10not" sidePair="width-width"/>
-    </image>
-    <group id="n13_10not" name="grpOriginalPrice" xy="459,506" size="35,61" group="n15_10not" advanced="true"/>
-    <text id="n14_10not" name="txtPrice" xy="524,506" size="32,61" group="n15_10not" fontSize="46" color="#a17d5f" align="center" text="5"/>
-    <group id="n15_10not" name="grpPrice" xy="379,506" size="177,61" advanced="true" layout="hz" colGap="30" excludeInvisibles="true">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="center-center"/>
-    </group>
     <component id="n16_10not" name="btnBuy" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,566">
       <gearDisplay controller="c1" pages="0"/>
     </component>
     <text id="n17_oeuo" name="txtLock" xy="316,540" pivot="0.5,0" size="304,64" fontSize="48" color="#aa946b" text="通关2-10解锁">
       <gearDisplay controller="c1" pages="1"/>
     </text>
+    <loader id="n8_10not" name="loaPriceIcon" xy="322,507" size="60,60" group="n10_10not" visible="false" url="ui://vlgobc1510not1w" fill="scale"/>
+    <text id="n9_10not" name="txtIcon" xy="322,506" size="50,61" group="n10_10not" fontSize="46" color="#a17d5f" text="￥"/>
+    <group id="n10_10not" name="grpIcon" xy="322,506" size="50,61" group="n19_cs8j" advanced="true" layout="hz" excludeInvisibles="true">
+      <relation target="n11_10not" sidePair="right-left"/>
+    </group>
+    <text id="n11_10not" name="txtOriginalPrice" xy="403,506" pivot="0.5,0" size="89,62" group="n19_cs8j" fontSize="46" color="#caa293" align="center" text="400"/>
+    <image id="n12_10not" name="n12" src="dmsi1m" fileName="images/sc_tc_xian_1.png" xy="402,539" pivot="0.5,0" size="92,2" group="n19_cs8j">
+      <relation target="n11_10not" sidePair="width-width,center-center"/>
+    </image>
+    <text id="n14_10not" name="txtPrice" xy="524,506" size="89,62" group="n19_cs8j" fontSize="46" color="#a17d5f" align="center" text="500">
+      <relation target="n11_10not" sidePair="left-right"/>
+    </text>
+    <group id="n19_cs8j" name="grpOriginalPrice" xy="322,506" size="291,62" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/RechargeStore/components/ListGiftItem.xml

@@ -4,11 +4,11 @@
   <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n22_10not" name="n22" src="dmsi1k" fileName="images/sc_kuangdikjia_2.png" xy="0,0"/>
-    <loader id="n23_10not" name="icon" xy="45,170" size="162,162" url="ui://vlgobc15d4iwl"/>
-    <text id="n27_10not" name="txtName" xy="346,135" pivot="0.5,0" anchor="true" size="85,56" fontSize="42" color="#906d4b" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
     <image id="n24_10not" name="n24" src="dmsi1j" fileName="images/sc_kuangczcz.png" xy="2,98" group="n26_10not"/>
     <text id="n25_10not" name="txtDesc" xy="31,121" size="69,81" group="n26_10not" font="ui://eg2y0ldpk1kha2" fontSize="34" color="#ffe5cf" align="center" leading="-5" letterSpacing="-2" vars="true" text="超值&#xA;{count=250}%"/>
     <group id="n26_10not" name="grpDiscount" xy="2,98" size="128,132" advanced="true"/>
+    <loader id="n23_10not" name="icon" xy="56,186" size="140,140" aspect="true" url="ui://vlgobc15d4iwl" fill="scaleMatchHeight"/>
+    <text id="n27_10not" name="txtName" xy="346,135" pivot="0.5,0" anchor="true" size="85,56" fontSize="42" color="#906d4b" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
     <image id="n28_10not" name="n28" src="dmsi1l" fileName="images/sc_kuangsjsj.png" xy="269,232" group="n30_10not"/>
     <text id="n29_10not" name="txtEndTime" xy="298,230" pivot="0.5,0" size="94,41" group="n30_10not" fontSize="30" color="#ffffff" align="center" leading="-5" letterSpacing="-2" strokeColor="#b98653" strokeSize="2" text="12小时"/>
     <group id="n30_10not" name="grpEndTime" xy="269,230" size="155,42" advanced="true">

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_GiftBagBuyUI.cs

@@ -15,15 +15,14 @@ namespace UI.RechargeStore
         public GList m_list;
         public GTextField m_txtEndTime;
         public GGroup m_grpEndTime;
+        public GButton m_btnBuy;
+        public GTextField m_txtLock;
         public GLoader m_loaPriceIcon;
         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 GButton m_btnBuy;
-        public GTextField m_txtLock;
+        public GGroup m_grpOriginalPrice;
         public const string URL = "ui://vlgobc1510not1v";
         public const string PACKAGE_NAME = "RechargeStore";
         public const string RES_NAME = "GiftBagBuyUI";
@@ -79,15 +78,14 @@ namespace UI.RechargeStore
             m_list = (GList)comp.GetChild("list");
             m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
             m_grpEndTime = (GGroup)comp.GetChild("grpEndTime");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
             m_loaPriceIcon = (GLoader)comp.GetChild("loaPriceIcon");
             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");
-            m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -99,15 +97,14 @@ namespace UI.RechargeStore
             m_list = null;
             m_txtEndTime = null;
             m_grpEndTime = null;
+            m_btnBuy = null;
+            m_txtLock = null;
             m_loaPriceIcon = null;
             m_txtIcon = null;
             m_grpIcon = null;
             m_txtOriginalPrice = null;
-            m_grpOriginalPrice = null;
             m_txtPrice = null;
-            m_grpPrice = null;
-            m_btnBuy = null;
-            m_txtLock = null;
+            m_grpOriginalPrice = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,10 +9,10 @@ namespace UI.RechargeStore
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
-        public GLoader m_icon;
-        public GTextField m_txtName;
         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;
@@ -73,10 +73,10 @@ namespace UI.RechargeStore
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
-            m_icon = (GLoader)comp.GetChild("icon");
-            m_txtName = (GTextField)comp.GetChild("txtName");
             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");
@@ -93,10 +93,10 @@ namespace UI.RechargeStore
         {
             m_c1 = null;
             m_c2 = null;
-            m_icon = null;
-            m_txtName = null;
             m_txtDesc = null;
             m_grpDiscount = null;
+            m_icon = null;
+            m_txtName = null;
             m_txtEndTime = null;
             m_grpEndTime = null;
             m_txtLimit = null;

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

@@ -44,7 +44,7 @@ namespace GFGGame
             _giftId = (int)this.viewData;
             GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(_giftId);
             _ui.m_txtName.text = cfg.name;
-            _ui.m_loaIcon.url = string.Format("ui://RechargeStore/{0}", cfg.res);
+            _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;
             if (cfg.lockType == LockType.STORY_LV)
@@ -62,12 +62,12 @@ namespace GFGGame
             _ui.m_txtEndTime.text = RechargeDataManager.Instance.GetEndTime(cfg.id);
             _ui.m_grpEndTime.visible = cfg.endTime != "";
 
-            _ui.m_txtOriginalPrice.text = cfg.originalPrice.ToString();
+            _ui.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
             if (cfg.price > 0 && cfg.costType != CostType.FREE)
             {
                 _ui.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
                 _ui.m_grpIcon.visible = true;
-                _ui.m_txtPrice.text = cfg.price.ToString();
+                _ui.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
 
                 if (cfg.costType == CostType.RMB)
                 {

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

@@ -141,7 +141,7 @@ namespace GFGGame
             GiftBagCfg cfg = _giftCfgs[index];
 
             item.m_txtName.text = cfg.name;
-            item.m_icon.url = string.Format("ui://RechargeStore/{0}", cfg.res);
+            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 != "";
@@ -166,12 +166,12 @@ namespace GFGGame
             item.m_c1.selectedIndex = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? 0 : 1;
             if (item.m_c1.selectedIndex == 0)
             {
-                item.m_txtOriginalPrice.text = cfg.originalPrice.ToString();
+                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 = cfg.price.ToString();
+                    item.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
 
                     if (cfg.costType == CostType.RMB)
                     {