zhaoyang 3 лет назад
Родитель
Сommit
6bc7ddd84f
37 измененных файлов с 836 добавлено и 36 удалено
  1. 16 5
      FGUIProject/assets/CommonGame/BuyCountUI.xml
  2. 1 1
      FGUIProject/assets/CommonGame/components/Button10.xml
  3. 5 4
      FGUIProject/assets/CommonGame/components/Button12.xml
  4. 10 1
      FGUIProject/assets/CommonGame/components/Button14.xml
  5. 11 9
      FGUIProject/assets/CommonGame/components/Button5.xml
  6. BIN
      FGUIProject/assets/CommonGame/images/sc_czanniu_2.png
  7. 30 0
      FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml
  8. 38 0
      FGUIProject/assets/RechargeStore/ItemExchangeUI.xml
  9. 28 2
      FGUIProject/assets/RechargeStore/RechargeStoreUI.xml
  10. 5 5
      FGUIProject/assets/RechargeStore/components/ListGiftItem.xml
  11. 1 1
      FGUIProject/assets/RechargeStore/components/StoreListItem.xml
  12. BIN
      FGUIProject/assets/RechargeStore/images/sc_xtxtxt.png
  13. BIN
      FGUIProject/assets/RechargeStore/imagesExport/jinbi_1.png
  14. 7 3
      FGUIProject/assets/RechargeStore/package.xml
  15. 62 0
      GameClient/Assets/Game/HotUpdate/Data/RechargeDataManager.cs
  16. 11 0
      GameClient/Assets/Game/HotUpdate/Data/RechargeDataManager.cs.meta
  17. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button14.cs
  18. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button14.cs.meta
  19. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button5.cs
  20. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button5.cs.meta
  21. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyCountUI.cs
  22. 107 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_GiftBagBuyUI.cs
  23. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_GiftBagBuyUI.cs.meta
  24. 119 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ItemExchangeUI.cs
  25. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ItemExchangeUI.cs.meta
  26. 95 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ListGiftItem.cs
  27. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ListGiftItem.cs.meta
  28. 6 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_RechargeStoreUI.cs
  29. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_StoreListItem.cs
  30. 70 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/RechargeSProxy.cs
  31. 2 2
      GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs
  32. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  33. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  34. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  35. BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0!a.png
  36. BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0.png
  37. BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_fui.bytes

+ 16 - 5
FGUIProject/assets/CommonGame/BuyCountUI.xml

@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="936,536">
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_hinb" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,536"/>
-    <loader id="n26_eiwu" name="n26" xy="0,0" size="936,536" visible="false" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
+    <image id="n0_hinb" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,536">
+      <gearSize controller="c1" pages="0" values="936,536,1,1" default="936,695,1,1"/>
+    </image>
     <component id="n23_ai2z" name="btnAll" src="ai2z9f" fileName="components/Button12.xml" xy="731,131"/>
-    <image id="n19_ai2z" name="n19" src="ai2z9e" fileName="imagesExport/hb_kuangdi_2.png" xy="69,237" group="n21_ai2z"/>
+    <image id="n19_ai2z" name="n19" src="ai2z9e" fileName="imagesExport/hb_kuangdi_2.png" xy="69,237" group="n21_ai2z">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
     <loader id="n4_hinb" name="icon" xy="101,66" size="200,200" group="n21_ai2z" aspect="true"/>
     <loader id="n17_ugdz" name="rarity" xy="257,66" size="44,94" group="n21_ai2z" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n5_hinb" name="txtName" xy="100,236" size="201,41" group="n21_ai2z" fontSize="30" color="#ffffff" align="center" autoSize="height" text="名字"/>
+    <text id="n5_hinb" name="txtName" xy="100,236" size="201,41" group="n21_ai2z" fontSize="30" color="#ffffff" align="center" autoSize="height" text="名字">
+      <gearDisplay controller="c1" pages="0"/>
+    </text>
     <group id="n21_ai2z" name="n21" xy="69,66" size="264,211"/>
     <image id="n8_hinb" name="n8" src="ai2z9d" fileName="imagesExport/hb_kuangdi_1.png" xy="353,138" group="n22_ai2z"/>
     <component id="n9_hinb" name="btnPlus" src="hinb5s" fileName="components/ButtonPlus2.xml" xy="618,130" group="n22_ai2z"/>
@@ -20,11 +26,16 @@
     <text id="n15_ugdz" name="txtPrice" xy="459,288" pivot="0.5,0" size="93,49" group="n16_ugdz" fontSize="36" color="#fdf3d7" autoClearText="true" text="9999"/>
     <group id="n16_ugdz" name="n16" xy="331,288" size="273,49" advanced="true"/>
     <component id="n6_hinb" name="btnSure" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="496,354">
+      <gearText controller="c1" pages="0" values="确认" default="兑换"/>
       <Button title="确认"/>
     </component>
     <component id="n7_hinb" name="btnCancel" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="54,354">
+      <gearDisplay controller="c1" pages="0"/>
       <Button title="取消"/>
     </component>
-    <text id="n24_ai2z" name="txtBuyTips" xy="314,471" pivot="0.5,0" size="308,36" fontSize="26" color="#a0845c" text="消耗1珍珠,可兑换10缴销"/>
+    <text id="n24_ai2z" name="txtBuyTips" xy="314,471" pivot="0.5,0" size="308,36" fontSize="26" color="#a0845c" text="消耗1珍珠,可兑换10缴销">
+      <gearDisplay controller="c1" pages="0"/>
+    </text>
   </displayList>
+  <relation target="n0_hinb" sidePair="height-height"/>
 </component>

+ 1 - 1
FGUIProject/assets/CommonGame/components/Button10.xml

@@ -2,7 +2,7 @@
 <component size="380,105" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ih75" name="n0" src="ih7592" fileName="images/tctc_anniu_1.png" xy="0,0">
+    <image id="n0_ih75" name="n0" src="uo1t9n" fileName="images/tctc_anniu_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_ih75" name="title" xy="0,0" size="380,105" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#ac904e" singleLine="true" text="确定">

+ 5 - 4
FGUIProject/assets/CommonGame/components/Button12.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="144,75" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ai2z" src="ai2z9c" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
+    <image id="n0_ai2z" name="n0" src="ai2z9c" fileName="imagesExport/hb_anniu_3.png" xy="0,0" visible="false">
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
+    <loader id="n1_10not" name="icon" xy="0,0" size="144,75" url="ui://eg2y0ldpai2z9c" autoSize="true"/>
   </displayList>
+  <Button/>
 </component>

+ 10 - 1
FGUIProject/assets/CommonGame/components/Button14.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="240,80" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n0_10not" name="n0" src="10nota5" fileName="images/sc_czanniu_1.png" xy="0,0">
+      <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <loader id="n1_10not" name="icon" xy="50,10" size="60,60" group="n3_10not" url="ui://eg2y0ldpg3nf9q"/>
@@ -15,8 +17,15 @@
     <group id="n6_10not" name="n6" xy="120,15" size="33,49" group="n8_10not"/>
     <text id="n7_10not" name="txtPrice" xy="163,15" size="26,49" group="n8_10not" fontSize="36" color="#fdfaed" align="center" strokeColor="#ac904e" text="5"/>
     <group id="n8_10not" name="n8" xy="50,10" size="139,60" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
+      <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </group>
+    <image id="n9_10not" name="n9" src="10nota4" fileName="images/sc_czanniu_2.png" xy="0,0">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <text id="n10_10not" name="n10" xy="67,12" size="112,49" fontSize="36" color="#fdfaed" align="center" strokeColor="#989180" text="已售罄">
+      <gearDisplay controller="c1" pages="1"/>
+    </text>
   </displayList>
   <Button/>
 </component>

+ 11 - 9
FGUIProject/assets/CommonGame/components/Button5.xml

@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="264,79" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_d4iw" name="n0" src="d4iwj" fileName="imagesExport/sc_anniu_1.png" xy="0,3" visible="false">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_d4iw" name="title" xy="126,9" size="64,64" group="n3_dmsi" fontSize="48" color="#8b6540" align="center" vAlign="middle" vars="true" singleLine="true" text="60">
+    <loader id="n4_10not" name="icon" xy="70,9" size="60,60" group="n5_10not" url="ui://eg2y0ldpq08x4" autoSize="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </loader>
+    <text id="n2_dmsi" name="n2" xy="74,7" size="52,64" group="n5_10not" fontSize="48" color="#8b6540" text="¥">
+      <gearDisplay controller="c1" pages="0"/>
+    </text>
+    <group id="n5_10not" name="n5" xy="70,7" size="60,64" group="n6_10not" advanced="true"/>
+    <text id="n1_d4iw" name="title" xy="130,7" size="64,64" group="n6_10not" fontSize="48" color="#8b6540" align="center" vAlign="middle" vars="true" singleLine="true" text="60">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <text id="n2_dmsi" name="n2" xy="74,9" size="52,64" group="n3_dmsi" fontSize="48" color="#8b6540" text="¥"/>
-    <group id="n3_dmsi" name="n3" xy="74,9" size="116,64" advanced="true">
-      <relation target="" sidePair="center-center"/>
-    </group>
+    <group id="n6_10not" name="n6" xy="70,7" size="124,64" advanced="true" layout="hz" excludeInvisibles="true"/>
   </displayList>
   <Button/>
 </component>

BIN
FGUIProject/assets/CommonGame/images/sc_czanniu_2.png


+ 30 - 0
FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="936,695">
+  <displayList>
+    <image id="n0_10not" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,695"/>
+    <text id="n1_10not" name="txtName" xy="463,40" pivot="0.5,0" size="10,74" fontSize="56" color="#8f6e30" text=""/>
+    <loader id="n2_10not" name="loaIcon" xy="133,281" size="50,50"/>
+    <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="307,212" size="618,198" layout="row" overflow="scroll" colGap="10" 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="txtRefreshTime" xy="756,105" 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="grpRefreshTime" xy="729,105" size="155,42" advanced="true"/>
+    <loader id="n8_10not" name="icon" xy="374,507" size="60,60" group="n10_10not" url="ui://vlgobc1510not1w"/>
+    <text id="n9_10not" name="txtIcon" xy="379,506" size="50,62" group="n10_10not" fontSize="46" color="#a17d5f" text="¥"/>
+    <group id="n10_10not" name="n10" xy="374,506" size="60,62" group="n15_10not"/>
+    <text id="n11_10not" name="txtOriginalPrice" xy="465,506" pivot="0.5,0" size="32,62" 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="464,539" pivot="0.5,0" size="35,2" group="n13_10not">
+      <relation target="n11_10not" sidePair="width-width"/>
+    </image>
+    <group id="n13_10not" name="n13" xy="464,506" size="35,62" group="n15_10not"/>
+    <text id="n14_10not" name="txtPrice" xy="529,506" size="32,62" group="n15_10not" fontSize="46" color="#a17d5f" align="center" text="5"/>
+    <group id="n15_10not" name="grpPrice" xy="374,506" size="187,62" advanced="true" layout="hz" colGap="30" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <component id="n16_10not" name="btnBuy" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,566"/>
+  </displayList>
+</component>

+ 38 - 0
FGUIProject/assets/RechargeStore/ItemExchangeUI.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="936,695">
+  <displayList>
+    <image id="n0_hinb" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,695"/>
+    <text id="n5_hinb" name="txtName" xy="401,28" pivot="0.5,0" size="116,74" fontSize="56" color="#8f6e30" align="center" text="名字"/>
+    <image id="n19_ai2z" name="n19" src="dmsi1o" fileName="images/sc_tc_kuang_2.png" xy="48,148" group="n21_ai2z"/>
+    <loader id="n4_hinb" name="icon" xy="57,158" size="200,200" group="n21_ai2z" aspect="true"/>
+    <loader id="n17_ugdz" name="rarity" xy="215,158" size="44,94" group="n21_ai2z" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <text id="n28_10not" name="txtNum" xy="123,313" pivot="0.5,0" size="69,49" group="n21_ai2z" fontSize="36" color="#fff7e6" align="center" strokeColor="#816531" text="x10"/>
+    <text id="n29_10not" name="txtBuyCount" xy="86,358" pivot="0.5,0" size="138,44" group="n21_ai2z" fontSize="32" color="#bc8068" text="剩余:100"/>
+    <group id="n21_ai2z" name="n21" xy="48,148" size="220,254"/>
+    <text id="n30_10not" name="txtHasCount" xy="692,121" size="138,46" fontSize="34" color="#a38e66" align="center" text="已拥有:"/>
+    <text id="n32_10not" name="n32" xy="40,422" size="180,59" group="n22_ai2z" fontSize="44" color="#a08249" align="center" text="兑换数量"/>
+    <image id="n8_hinb" name="n8" src="dmsi1p" fileName="images/sc_tc_kuang_3.png" xy="241,429" group="n22_ai2z"/>
+    <text id="n25_t1at" name="txtCount" xy="368,426" size="200,56" group="n22_ai2z" fontSize="42" color="#fdf3d7" align="center" vAlign="middle" autoSize="none" text="找钱"/>
+    <component id="n9_hinb" name="btnPlus" src="hinb5s" fileName="components/ButtonPlus2.xml" pkg="eg2y0ldp" xy="636,421" group="n22_ai2z"/>
+    <component id="n10_hinb" name="btnMinus" src="hinb5t" fileName="components/ButtonMinus1.xml" pkg="eg2y0ldp" xy="232,421" group="n22_ai2z"/>
+    <component id="n23_ai2z" name="btnAll" src="ai2z9f" fileName="components/Button12.xml" pkg="eg2y0ldp" xy="745,417" group="n22_ai2z">
+      <Button icon="ui://vlgobc15dmsi1n"/>
+    </component>
+    <group id="n22_ai2z" name="n22" xy="40,417" size="849,75"/>
+    <image id="n18_ai2z" name="n18" src="dmsi1f" fileName="images/sc_shulianga.png" xy="331,518" group="n16_ugdz"/>
+    <text id="n20_ai2z" name="n20" xy="358,510" size="76,49" group="n27_10not" fontSize="36" color="#a08249" text="花费"/>
+    <loader id="n14_ugdz" name="iconPrice" xy="443,519" size="32,32" group="n27_10not" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n15_ugdz" name="txtPrice" xy="484,510" size="93,49" group="n27_10not" fontSize="36" color="#fdf3d7" autoClearText="true" text="9999"/>
+    <group id="n27_10not" name="n27" xy="358,510" size="219,49" group="n16_ugdz"/>
+    <group id="n16_ugdz" name="n16" xy="331,510" size="274,49" advanced="true"/>
+    <component id="n6_hinb" name="btnSure" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="278,566">
+      <Button title="兑换"/>
+    </component>
+    <component id="n7_hinb" name="btnCancel" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="54,354" visible="false">
+      <Button title="取消"/>
+    </component>
+    <text id="n24_ai2z" name="txtBuyTips" xy="314,471" pivot="0.5,0" size="308,36" visible="false" fontSize="26" color="#a0845c" text="消耗1珍珠,可兑换10缴销"/>
+    <text id="n31_10not" name="txtDiscribe" xy="315,176" size="550,49" fontSize="36" color="#a38b64" align="center" autoSize="none" text="描述描述描述描述描述描述描述描述"/>
+  </displayList>
+  <relation target="n0_hinb" sidePair="height-height"/>
+</component>

+ 28 - 2
FGUIProject/assets/RechargeStore/RechargeStoreUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2," selected="1"/>
+  <controller name="c1" pages="0,,1,,2," selected="2"/>
   <displayList>
     <image id="n2_d4iw" name="n2" src="10nota3" fileName="bgimg/scsc_bjbj.jpg" pkg="eg2y0ldp" xy="0,-240">
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -12,7 +12,33 @@
     </image>
     <image id="n16_10not" name="n16" src="10not1r" fileName="images/sc_kuangjia_3.png" xy="0,1613"/>
     <component id="n17_10not" name="comTab" src="10not1s" fileName="components/Component1.xml" xy="96,290"/>
-    <list id="n10_d4iw" name="list" xy="0,368" size="1080,1208" layout="flow_hz" overflow="scroll" scrollBarFlags="64" colGap="22" defaultItem="ui://vlgobc15d4iwr" align="center" scrollItemToViewOnClick="false">
+    <list id="n10_d4iw" name="list" xy="0,368" size="1080,1160" layout="flow_hz" overflow="scroll" scrollBarFlags="64" colGap="22" defaultItem="ui://vlgobc15d4iwr" align="center" scrollItemToViewOnClick="false">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n23_10not" name="listGift" xy="0,368" size="1080,1160" layout="flow_hz" overflow="scroll" colGap="10" defaultItem="ui://vlgobc1510not1t" align="center">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n24_10not" name="listExchange" xy="0,368" size="1080,1160" layout="flow_hz" overflow="scroll" scrollBarFlags="64" colGap="22" defaultItem="ui://vlgobc15d4iwr" align="center" scrollItemToViewOnClick="false">
+      <gearDisplay controller="c1" pages="2"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>

+ 5 - 5
FGUIProject/assets/RechargeStore/components/Component2.xml → FGUIProject/assets/RechargeStore/components/ListGiftItem.xml

@@ -4,15 +4,15 @@
     <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"/>
     <image id="n24_10not" name="n24" src="dmsi1j" fileName="images/sc_kuangczcz.png" xy="2,97" group="n26_10not"/>
-    <text id="n25_10not" name="txtDiscount" xy="20,123" size="91,81" group="n26_10not" fontSize="34" color="#ffe5cf" align="center" leading="-5" letterSpacing="-2" vars="true" text="超值&#xA;{count=250}%"/>
-    <component id="n35_10not" name="n35" src="10nota6" fileName="components/Button14.xml" pkg="eg2y0ldp" xy="185,269" group="n26_10not"/>
-    <group id="n26_10not" name="grpDiscount" xy="2,97" size="423,252"/>
+    <text id="n25_10not" name="txtDesc" xy="20,123" size="91,81" group="n26_10not" fontSize="34" color="#ffe5cf" align="center" leading="-5" letterSpacing="-2" vars="true" text="超值&#xA;{count=250}%"/>
+    <group id="n26_10not" name="grpDiscount" xy="2,97" size="128,132"/>
     <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="txtRefreshTime" xy="296,230" size="94,42" group="n30_10not" fontSize="30" color="#ffffff" align="center" leading="-5" letterSpacing="-2" strokeColor="#b98653" strokeSize="2" text="12小时"/>
     <group id="n30_10not" name="grpRefreshTime" xy="269,230" size="155,42" advanced="true"/>
+    <text id="n32_10not" name="txtLimit" xy="35,332" pivot="0.5,0" size="189,36" fontSize="26" color="#ab9a87" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购(0/1)"/>
     <text id="n31_10not" name="txtLock" xy="347,300" pivot="0.5,0" anchor="true" size="215,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁"/>
-    <text id="n32_10not" name="txtLimit" xy="40,329" size="40,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text=""/>
-    <image id="n34_10not" name="n34" src="10not1u" fileName="images/sc_kuangand.png" xy="2,96"/>
+    <component id="n35_10not" name="btnBuy" src="10nota6" fileName="components/Button14.xml" pkg="eg2y0ldp" xy="225,288"/>
+    <image id="n34_10not" name="imgSellOut" src="10not1u" fileName="images/sc_kuangand.png" xy="2,96"/>
   </displayList>
 </component>

+ 1 - 1
FGUIProject/assets/RechargeStore/components/StoreListItem.xml

@@ -8,6 +8,6 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <component id="n14_d4iw" name="btnBuy" src="d4iw59" fileName="components/Button5.xml" pkg="eg2y0ldp" xy="19,433"/>
-    <text id="n18_dmsi" name="txtDouble" xy="8,380" pivot="0.5,0" size="286,49" fontSize="36" color="#bb674e" text="首充赠送+60钻石"/>
+    <text id="n18_dmsi" name="txtDesc" xy="8,380" pivot="0.5,0" size="286,49" fontSize="36" color="#bb674e" text="首充赠送+60钻石"/>
   </displayList>
 </component>

BIN
FGUIProject/assets/RechargeStore/images/sc_xtxtxt.png


BIN
FGUIProject/assets/RechargeStore/imagesExport/jinbi_1.png


+ 7 - 3
FGUIProject/assets/RechargeStore/package.xml

@@ -23,20 +23,24 @@
     <image id="dmsi1c" name="sc_kuangdikjia_1.png" path="/images/"/>
     <image id="dmsi1d" name="sc_kuangjia_1.png" path="/images/" scale="9grid" scale9grid="269,469,540,1064"/>
     <image id="dmsi1e" name="sc_kuangjia_2.png" path="/images/"/>
-    <image id="dmsi1f" name="sc_shulianga.png" path="/images/"/>
+    <image id="dmsi1f" name="sc_shulianga.png" path="/images/" scale="9grid" scale9grid="128,9,17,18"/>
     <image id="dmsi1g" name="scsc_anniuej_1.png" path="/images/"/>
     <image id="dmsi1j" name="sc_kuangczcz.png" path="/images/"/>
     <image id="dmsi1k" name="sc_kuangdikjia_2.png" path="/images/"/>
     <image id="dmsi1l" name="sc_kuangsjsj.png" path="/images/"/>
-    <image id="dmsi1m" name="sc_tc_xian_1.png" path="/images/"/>
+    <image id="dmsi1m" name="sc_tc_xian_1.png" path="/images/" scale="9grid" scale9grid="24,0,48,0"/>
     <image id="dmsi1n" name="sc_tc_anniu_1.png" path="/images/"/>
     <image id="dmsi1o" name="sc_tc_kuang_2.png" path="/images/"/>
     <image id="dmsi1p" name="sc_tc_kuang_3.png" path="/images/"/>
     <component id="dmsi1q" name="Button2.xml" path="/components/"/>
     <image id="10not1r" name="sc_kuangjia_3.png" path="/images/"/>
     <component id="10not1s" name="Component1.xml" path="/components/"/>
-    <component id="10not1t" name="Component2.xml" path="/components/"/>
+    <component id="10not1t" name="ListGiftItem.xml" path="/components/"/>
     <image id="10not1u" name="sc_kuangand.png" path="/images/"/>
+    <component id="10nota8" name="ItemExchangeUI.xml" path="/" exported="true"/>
+    <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
+    <image id="10not1w" name="jinbi_1.png" path="/imagesExport/"/>
+    <image id="10not1x" name="sc_xtxtxt.png" path="/images/" scale="9grid" scale9grid="19,2,38,4"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\RechargeStore" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 62 - 0
GameClient/Assets/Game/HotUpdate/Data/RechargeDataManager.cs

@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class RechargeDataManager : SingletonBase<RechargeDataManager>
+    {
+        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 List<GiftBagCfg> GetGiftBagDatas()
+        {
+            GiftBagCfg[] giftBagCfgs = GiftBagCfgArray.Instance.dataArray;
+            List<GiftBagCfg> giftBagDatas = new List<GiftBagCfg>();
+            for (int i = 0; i < giftBagCfgs.Length; i++)
+            {
+
+            }
+            return giftBagDatas;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Data/RechargeDataManager.cs.meta

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button14.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_Button14
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GTextField m_txtIcon;
+        public GTextField m_txtOriginalPrice;
+        public GTextField m_txtPrice;
+        public const string URL = "ui://eg2y0ldp10nota6";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Button14";
+        private static UI_Button14 _proxy;
+
+        public static UI_Button14 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button14();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button14 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button14();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_txtIcon = (GTextField)comp.GetChild("txtIcon");
+            m_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
+            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtIcon = null;
+            m_txtOriginalPrice = null;
+            m_txtPrice = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button14.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button5.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_Button5
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://eg2y0ldpd4iw59";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Button5";
+        private static UI_Button5 _proxy;
+
+        public static UI_Button5 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button5();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button5 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button5();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button5.cs.meta

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

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyCountUI.cs

@@ -7,6 +7,7 @@ namespace UI.CommonGame
     public partial class UI_BuyCountUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GImage m_bg;
         public GButton m_btnAll;
         public GLoader m_icon;
@@ -67,6 +68,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_bg = (GImage)comp.GetChild("bg");
             m_btnAll = (GButton)comp.GetChild("btnAll");
             m_icon = (GLoader)comp.GetChild("icon");
@@ -83,6 +85,7 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_bg = null;
             m_btnAll = null;
             m_icon = null;

+ 107 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_GiftBagBuyUI.cs

@@ -0,0 +1,107 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RechargeStore
+{
+    public partial class UI_GiftBagBuyUI
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GTextField m_txtName;
+        public GLoader m_loaIcon;
+        public GTextField m_txtLimit;
+        public GList m_list;
+        public GTextField m_txtRefreshTime;
+        public GGroup m_grpRefreshTime;
+        public GLoader m_icon;
+        public GTextField m_txtIcon;
+        public GTextField m_txtOriginalPrice;
+        public GTextField m_txtPrice;
+        public GGroup m_grpPrice;
+        public GButton m_btnBuy;
+        public const string URL = "ui://vlgobc1510not1v";
+        public const string PACKAGE_NAME = "RechargeStore";
+        public const string RES_NAME = "GiftBagBuyUI";
+        private static UI_GiftBagBuyUI _proxy;
+
+        public static UI_GiftBagBuyUI Create(GObject gObject = null)
+        {
+            var ui = new UI_GiftBagBuyUI();
+            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_GiftBagBuyUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_GiftBagBuyUI();
+            }
+            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_bg = (GImage)comp.GetChild("bg");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtLimit = (GTextField)comp.GetChild("txtLimit");
+            m_list = (GList)comp.GetChild("list");
+            m_txtRefreshTime = (GTextField)comp.GetChild("txtRefreshTime");
+            m_grpRefreshTime = (GGroup)comp.GetChild("grpRefreshTime");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_txtIcon = (GTextField)comp.GetChild("txtIcon");
+            m_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
+            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
+            m_grpPrice = (GGroup)comp.GetChild("grpPrice");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_txtName = null;
+            m_loaIcon = null;
+            m_txtLimit = null;
+            m_list = null;
+            m_txtRefreshTime = null;
+            m_grpRefreshTime = null;
+            m_icon = null;
+            m_txtIcon = null;
+            m_txtOriginalPrice = null;
+            m_txtPrice = null;
+            m_grpPrice = null;
+            m_btnBuy = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_GiftBagBuyUI.cs.meta

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

+ 119 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ItemExchangeUI.cs

@@ -0,0 +1,119 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RechargeStore
+{
+    public partial class UI_ItemExchangeUI
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GTextField m_txtName;
+        public GLoader m_icon;
+        public GLoader m_rarity;
+        public GTextField m_txtNum;
+        public GTextField m_txtBuyCount;
+        public GTextField m_txtHasCount;
+        public GTextField m_txtCount;
+        public GButton m_btnPlus;
+        public GButton m_btnMinus;
+        public GButton m_btnAll;
+        public GLoader m_iconPrice;
+        public GTextField m_txtPrice;
+        public GButton m_btnSure;
+        public GButton m_btnCancel;
+        public GTextField m_txtBuyTips;
+        public GTextField m_txtDiscribe;
+        public const string URL = "ui://vlgobc1510nota8";
+        public const string PACKAGE_NAME = "RechargeStore";
+        public const string RES_NAME = "ItemExchangeUI";
+        private static UI_ItemExchangeUI _proxy;
+
+        public static UI_ItemExchangeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ItemExchangeUI();
+            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_ItemExchangeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ItemExchangeUI();
+            }
+            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_bg = (GImage)comp.GetChild("bg");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_rarity = (GLoader)comp.GetChild("rarity");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_txtBuyCount = (GTextField)comp.GetChild("txtBuyCount");
+            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_btnPlus = (GButton)comp.GetChild("btnPlus");
+            m_btnMinus = (GButton)comp.GetChild("btnMinus");
+            m_btnAll = (GButton)comp.GetChild("btnAll");
+            m_iconPrice = (GLoader)comp.GetChild("iconPrice");
+            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
+            m_btnSure = (GButton)comp.GetChild("btnSure");
+            m_btnCancel = (GButton)comp.GetChild("btnCancel");
+            m_txtBuyTips = (GTextField)comp.GetChild("txtBuyTips");
+            m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_txtName = null;
+            m_icon = null;
+            m_rarity = null;
+            m_txtNum = null;
+            m_txtBuyCount = null;
+            m_txtHasCount = null;
+            m_txtCount = null;
+            m_btnPlus = null;
+            m_btnMinus = null;
+            m_btnAll = null;
+            m_iconPrice = null;
+            m_txtPrice = null;
+            m_btnSure = null;
+            m_btnCancel = null;
+            m_txtBuyTips = null;
+            m_txtDiscribe = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ItemExchangeUI.cs.meta

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

+ 95 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ListGiftItem.cs

@@ -0,0 +1,95 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RechargeStore
+{
+    public partial class UI_ListGiftItem
+    {
+        public GComponent target;
+        public GLoader m_icon;
+        public GTextField m_txtDesc;
+        public GTextField m_txtName;
+        public GTextField m_txtRefreshTime;
+        public GGroup m_grpRefreshTime;
+        public GTextField m_txtLimit;
+        public GTextField m_txtLock;
+        public GButton m_btnBuy;
+        public GImage m_imgSellOut;
+        public const string URL = "ui://vlgobc1510not1t";
+        public const string PACKAGE_NAME = "RechargeStore";
+        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_icon = (GLoader)comp.GetChild("icon");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtRefreshTime = (GTextField)comp.GetChild("txtRefreshTime");
+            m_grpRefreshTime = (GGroup)comp.GetChild("grpRefreshTime");
+            m_txtLimit = (GTextField)comp.GetChild("txtLimit");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_imgSellOut = (GImage)comp.GetChild("imgSellOut");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_icon = null;
+            m_txtDesc = null;
+            m_txtName = null;
+            m_txtRefreshTime = null;
+            m_grpRefreshTime = null;
+            m_txtLimit = null;
+            m_txtLock = null;
+            m_btnBuy = null;
+            m_imgSellOut = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ListGiftItem.cs.meta

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

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_RechargeStoreUI.cs

@@ -12,6 +12,8 @@ namespace UI.RechargeStore
         public GComponent m_valueBar;
         public UI_Component1 m_comTab;
         public GList m_list;
+        public GList m_listGift;
+        public GList m_listExchange;
         public const string URL = "ui://vlgobc15d4iw0";
         public const string PACKAGE_NAME = "RechargeStore";
         public const string RES_NAME = "RechargeStoreUI";
@@ -64,6 +66,8 @@ namespace UI.RechargeStore
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_comTab = (UI_Component1)UI_Component1.Create(comp.GetChild("comTab"));
             m_list = (GList)comp.GetChild("list");
+            m_listGift = (GList)comp.GetChild("listGift");
+            m_listExchange = (GList)comp.GetChild("listExchange");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -73,6 +77,8 @@ namespace UI.RechargeStore
             m_comTab.Dispose();
             m_comTab = null;
             m_list = null;
+            m_listGift = null;
+            m_listExchange = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_StoreListItem.cs

@@ -11,7 +11,7 @@ namespace UI.RechargeStore
         public GLoader m_icon;
         public GTextField m_txtName;
         public GButton m_btnBuy;
-        public GTextField m_txtDouble;
+        public GTextField m_txtDesc;
         public const string URL = "ui://vlgobc15d4iwr";
         public const string PACKAGE_NAME = "RechargeStore";
         public const string RES_NAME = "StoreListItem";
@@ -63,7 +63,7 @@ namespace UI.RechargeStore
             m_icon = (GLoader)comp.GetChild("icon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_txtDouble = (GTextField)comp.GetChild("txtDouble");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -71,7 +71,7 @@ namespace UI.RechargeStore
             m_icon = null;
             m_txtName = null;
             m_btnBuy = null;
-            m_txtDouble = null;
+            m_txtDesc = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 70 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/RechargeSProxy.cs

@@ -12,9 +12,79 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    RechargeDataManager.Instance.UpdateRechargeData(response.RechargeId, response.RechargedTimes);
                     PromptController.Instance.ShowFloatTextPrompt("虚拟充值成功", MessageType.SUCCESS);
                 }
             }
         }
+        public static async ETTask ReqRechargeInfo()
+        {
+            M2C_GetRechargeInfo response = null;
+            response = (M2C_GetRechargeInfo)await MessageHelper.SendToServer(new C2M_GetRechargeInfo() { });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    for (int i = 0; i < response.ks.Count; i++)
+                    {
+                        RechargeDataManager.Instance.UpdateRechargeData(response.ks[i], response.vs[i]);
+                    }
+                }
+            }
+        }
+        public static async ETTask ReqRequestGiftBagInfo()
+        {
+            M2C_RequestGiftBagInfo response = null;
+            response = (M2C_RequestGiftBagInfo)await MessageHelper.SendToServer(new C2M_RequestGiftBagInfo() { });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    for (int i = 0; i < response.ks.Count; i++)
+                    {
+                        RechargeDataManager.Instance.UpdateGiftData(response.ks[i], response.vs[i]);
+                    }
+                }
+            }
+        }
+        public static async ETTask ReqBuyGiftBag(int giftId)
+        {
+            M2C_BuyGiftBag response = null;
+            response = (M2C_BuyGiftBag)await MessageHelper.SendToServer(new C2M_BuyGiftBag() { GiftBagId = giftId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    RechargeDataManager.Instance.UpdateGiftData(response.GiftBagId, response.BuyTimes);
+                }
+            }
+        }
+        public static async ETTask ReqExchangeInfo(int giftId)
+        {
+            M2C_RequestShopExchangeInfo response = null;
+            response = (M2C_RequestShopExchangeInfo)await MessageHelper.SendToServer(new C2M_RequestShopExchangeInfo() { });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    for (int i = 0; i < response.ks.Count; i++)
+                    {
+                        RechargeDataManager.Instance.UpdateExchangeData(response.ks[i], response.vs[i]);
+                    }
+                }
+            }
+        }
+        public static async ETTask ReqExchangeShopItem(int exchangeId)
+        {
+            M2C_ExchangeShopItem response = null;
+            response = (M2C_ExchangeShopItem)await MessageHelper.SendToServer(new C2M_ExchangeShopItem() { ExchangeId = exchangeId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    RechargeDataManager.Instance.UpdateExchangeData(response.ExchangeId, response.ExchangeTimes);
+                }
+            }
+        }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs

@@ -76,9 +76,9 @@ namespace GFGGame
             }
             item.m_btnBuy.data = index;
             item.m_txtName.text = string.Format("{0}{1}", itemData.itemNum, itemData.name);
-            item.m_txtDouble.text = string.Format("首冲赠送+{0}{1}", itemData.itemNum, itemData.name);
+            item.m_txtDesc.text = string.Format("首冲赠送+{0}{1}", itemData.itemNum, itemData.name);
             item.m_imgDouble.visible = false;
-            item.m_txtDouble.visible = false;
+            item.m_txtDesc.visible = false;
             item.m_icon.url = "ui://RechargeStore/sc_zizhuan_" + itemData.id;
 
             UI_StoreListItem.ProxyEnd();

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0.png


BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_fui.bytes