商店显示

FGUIProject/assets/Store/components/ListGiftItem.xml

@@ -22,17 +22,19 @@
     <text id="n27_10not" name="txtName" xy="248,14" pivot="0.5,0" anchor="true" size="261,44" fontSize="32" 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="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="n44_iftf" name="n44" xy="299,120" size="81,36" fontSize="26" color="#a59f8f" align="center" text="已售罄">
+    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="257,184">
+      <gearDisplay controller="c1" pages="0"/>
+    </component>
+    <text id="n58_l500" name="n58" xy="268,176" pivot="0.5,0" size="124,54" fontSize="40" color="#5a3e16" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="1" condition="0"/>
     </text>
-    <text id="n31_10not" name="txtLock" xy="330,111" pivot="0.5,0" anchor="true" size="143,52" fontSize="22" color="#8c8580" align="center" leading="-5" letterSpacing="-2" text="飞花令达到段位&#xA;巴拉巴拉啦解锁">
+    <image id="n54_l500" name="n54" src="l500tbt" fileName="imagesNew/sc_yk_zz.png" xy="5,-2" group="n57_l500"/>
+    <image id="n55_l500" name="n55" src="l500tbs" fileName="imagesNew/sc_yk_jsdb.png" xy="32,62" group="n57_l500"/>
+    <text id="n56_l500" name="txtLock" xy="238,101" pivot="0.5,0" anchor="true" size="210,67" group="n57_l500" fontSize="28" color="#fffdf9" align="center" vAlign="middle" leading="-5" letterSpacing="-2" autoSize="none" text="飞花令段位达到巴拉巴拉解锁">
       <gearDisplay controller="c2" pages="0"/>
     </text>
-    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="-7,-61" size="474,379">
-      <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="0" condition="1"/>
-    </image>
-    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="257,184"/>
+    <group id="n57_l500" name="n57" xy="5,-2" size="449,272" advanced="true">
+      <gearDisplay controller="c2" pages="0"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/Store/components/ListShopItem.xml

@@ -4,12 +4,13 @@
     <remark page="0" value="可购买"/>
     <remark page="1" value="已售罄"/>
   </controller>
-  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="1">
+  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0">
     <remark page="0" value="未解锁"/>
     <remark page="1" value="已解锁"/>
   </controller>
   <displayList>
     <image id="n22_10not" name="n22" src="hhx9w" fileName="imagesNew/GiftBag_baseboard.png" xy="0,0"/>
+    <image id="n55_l500" name="n55" src="fqortau" fileName="imagesNew/sc_xian.png" xy="27,119" size="236,4"/>
     <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="191,263" group="n26_10not"/>
     <text id="n48_l500" name="n48" xy="208,271" size="69,46" group="n26_10not" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
     <text id="n49_l500" name="txtDesc" xy="207,301" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
@@ -22,18 +23,19 @@
     <text id="n27_10not" name="txtName" xy="145,78" pivot="0.5,0" anchor="true" size="261,44" fontSize="32" 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="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="104,157" size="81,36" fontSize="26" color="#a59f8f" align="center" text="已售罄">
+    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="71,390">
+      <gearDisplay controller="c1" pages="0"/>
+    </component>
+    <text id="n57_l500" name="n57" xy="83,383" pivot="0.5,0" size="124,54" fontSize="40" color="#5a3e16" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="1" condition="0"/>
     </text>
-    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="0,-72" size="291,600">
-      <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="0" condition="1"/>
-    </image>
-    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="71,390"/>
-    <image id="n55_l500" name="n55" src="fqortau" fileName="imagesNew/sc_xian.png" xy="27,119" size="236,4"/>
+    <image id="n58_l500" name="n58" src="l500tbr" fileName="imagesNew/sc_lb_zz.png" xy="0,0" group="n60_l500"/>
+    <image id="n59_l500" name="n59" src="l500tbq" fileName="imagesNew/sc_lb_jsdb.png" xy="-22,189" group="n60_l500"/>
+    <text id="n31_10not" name="txtLock" xy="145,227" pivot="0.5,0" anchor="true" size="210,67" group="n60_l500" fontSize="28" color="#fffdf9" align="center" vAlign="middle" leading="-5" letterSpacing="-2" autoSize="none" text="飞花令段位达到巴拉巴拉解锁">
+      <gearDisplay controller="c2" pages="0"/>
+    </text>
+    <group id="n60_l500" name="n60" xy="-22,0" size="333,455" advanced="true">
+      <gearDisplay controller="c2" pages="0"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/Store/package.xml

@@ -135,6 +135,10 @@
     <component id="l500tbe" name="ListShopItem.xml" path="/components/"/>
     <component id="l500tbf" name="StoreChargeAddUpUI.xml" path="/" exported="true"/>
     <component id="l500tbh" name="StoreExchangeUI.xml" path="/" exported="true"/>
+    <image id="l500tbq" name="sc_lb_jsdb.png" path="/imagesNew/"/>
+    <image id="l500tbr" name="sc_lb_zz.png" path="/imagesNew/"/>
+    <image id="l500tbs" name="sc_yk_jsdb.png" path="/imagesNew/"/>
+    <image id="l500tbt" name="sc_yk_zz.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

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

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

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

@@ -73,7 +73,7 @@ namespace GFGGame
                 item.m_btnBuy.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.originalPrice);
                 if (shopCfg.price > 0 && shopCfg.costType != CostType.FREE)//不免费
                 {
-                    item.m_btnBuy.m_grpOriginalPrice.visible = shopCfg.originalPrice > 0;
+                    item.m_btnBuy.m_grpOriginalPrice.visible = shopCfg.originalPrice > 0 && shopCfg.originalPrice != shopCfg.price;
                     item.m_btnBuy.m_loaIcon.visible = true;
                     item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.price);// cfg.price.ToString();
 

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

@@ -16,8 +16,8 @@ namespace UI.Store
         public GTextField m_txtName;
         public GTextField m_txtEndTime;
         public GTextField m_txtLimit;
-        public GTextField m_txtLock;
         public UI_Button5 m_btnBuy;
+        public GTextField m_txtLock;
         public const string URL = "ui://p9mtgheo10not1t";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ListGiftItem";
@@ -74,8 +74,8 @@ namespace UI.Store
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
             m_txtLimit = (GTextField)comp.GetChild("txtLimit");
-            m_txtLock = (GTextField)comp.GetChild("txtLock");
             m_btnBuy = (UI_Button5)UI_Button5.Create(comp.GetChild("btnBuy"));
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -88,9 +88,9 @@ namespace UI.Store
             m_txtName = null;
             m_txtEndTime = null;
             m_txtLimit = null;
-            m_txtLock = null;
             m_btnBuy.Dispose();
             m_btnBuy = null;
+            m_txtLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -16,8 +16,8 @@ namespace UI.Store
         public GTextField m_txtName;
         public GTextField m_txtEndTime;
         public GTextField m_txtLimit;
-        public GTextField m_txtLock;
         public UI_Button5 m_btnBuy;
+        public GTextField m_txtLock;
         public const string URL = "ui://p9mtgheol500tbe";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ListShopItem";
@@ -74,8 +74,8 @@ namespace UI.Store
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
             m_txtLimit = (GTextField)comp.GetChild("txtLimit");
-            m_txtLock = (GTextField)comp.GetChild("txtLock");
             m_btnBuy = (UI_Button5)UI_Button5.Create(comp.GetChild("btnBuy"));
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -88,9 +88,9 @@ namespace UI.Store
             m_txtName = null;
             m_txtEndTime = null;
             m_txtLimit = null;
-            m_txtLock = null;
             m_btnBuy.Dispose();
             m_btnBuy = null;
+            m_txtLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();