瀏覽代碼

会员中心

zhaoyang 2 年之前
父節點
當前提交
47aab8150f
共有 37 個文件被更改,包括 714 次插入178 次删除
  1. 17 0
      FGUIProject/assets/CommonGame/components/ComItemIconNew1.xml
  2. 14 0
      FGUIProject/assets/CommonGame/components/ComItemNew1.xml
  3. 二進制
      FGUIProject/assets/CommonGame/imagesNew/dikuang_SkillLevel.png
  4. 0 0
      FGUIProject/assets/CommonGame/imagesNew/wp_baseboard1.png
  5. 4 0
      FGUIProject/assets/CommonGame/package.xml
  6. 二進制
      FGUIProject/assets/Main/images/zjm_e_6.png
  7. 3 3
      FGUIProject/assets/Store/StoreChargeAddUpUI.xml
  8. 0 12
      FGUIProject/assets/Store/components/Button1.xml
  9. 0 10
      FGUIProject/assets/Store/components/Button2.xml
  10. 10 0
      FGUIProject/assets/Store/components/Button6.xml
  11. 19 0
      FGUIProject/assets/Store/components/Button7.xml
  12. 13 0
      FGUIProject/assets/Store/components/Button8.xml
  13. 0 18
      FGUIProject/assets/Store/components/Component1.xml
  14. 46 0
      FGUIProject/assets/Store/components/ListVipItem.xml
  15. 7 7
      FGUIProject/assets/Store/package.xml
  16. 89 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs
  17. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs.meta
  18. 78 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs
  19. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs.meta
  20. 0 116
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagBuyUI.cs
  21. 107 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListVipItem.cs
  22. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListVipItem.cs.meta
  23. 6 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreChargeAddUpUI.cs
  24. 29 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs
  25. 3 1
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs
  26. 146 10
      GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeAddUpView.cs
  27. 4 0
      GameClient/Assets/ResIn/Prefab/SceneSuitFoster.prefab
  28. 二進制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  29. 二進制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  30. 二進制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  31. 二進制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  32. 二進制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  33. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_atlas0.png
  34. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_atlas0_1.png
  35. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_atlas0_3.png
  36. 96 0
      GameClient/Assets/ResIn/UI/Store/Store_atlas0_3.png.meta
  37. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_fui.bytes

+ 17 - 0
FGUIProject/assets/CommonGame/components/ComItemIconNew1.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="180,180">
+  <displayList>
+    <image id="n25_pu55" name="n25" src="hhx9j" fileName="imagesNew/wp_baseboard1.png" xy="1,1"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="89,94" pivot="0.5,0.5" anchor="true" size="122,122" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <text id="n17_j48o" name="txtHasCount" xy="90,225" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n18_j48o" name="loaRarity" xy="115,38" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
+    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="8,73" size="160,40" group="n29_pu55"/>
+    <group id="n29_pu55" name="n29" xy="-1,73" size="178,40" group="n30_9jv6" advanced="true"/>
+    <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="32,37" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="46,68" size="85,49" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="32,37" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
+    <group id="n30_9jv6" name="n30" xy="-1,33" size="178,228"/>
+  </displayList>
+</component>

+ 14 - 0
FGUIProject/assets/CommonGame/components/ComItemNew1.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="180,180" pivot="0.5,0.5" overflow="hidden" opaque="false">
+  <displayList>
+    <component id="n25_pu55" name="comItemIcon" src="qik1tlz" fileName="components/ComItemIconNew1.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
+    <text id="n26_r9ri" name="txtName" xy="90,206" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+      <relation target="n25_pu55" sidePair="bottom-bottom"/>
+    </text>
+    <image id="n27_qik1" name="n27" src="qik1tm0" fileName="imagesNew/dikuang_SkillLevel.png" xy="24,145" size="131,33" group="n28_qik1"/>
+    <text id="n15_ehs9" name="txtCount" xy="89,138" pivot="0.5,0" anchor="true" size="97,44" group="n28_qik1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" align="center" vars="true" text="x00200">
+      <relation target="n25_pu55" sidePair="center-center"/>
+    </text>
+    <group id="n28_qik1" name="n28" xy="24,138" size="131,44"/>
+  </displayList>
+</component>

二進制
FGUIProject/assets/CommonGame/imagesNew/dikuang_SkillLevel.png


+ 0 - 0
FGUIProject/assets/Store/imagesNew/wp_baseboard1.png → FGUIProject/assets/CommonGame/imagesNew/wp_baseboard1.png


+ 4 - 0
FGUIProject/assets/CommonGame/package.xml

@@ -301,6 +301,10 @@
     <image id="l500tlv" name="wpk_db_1.png" path="/imagesNew/"/>
     <image id="l500tlv" name="wpk_db_1.png" path="/imagesNew/"/>
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
     <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/"/>
     <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/"/>
+    <component id="qik1tly" name="ComItemNew1.xml" path="/components/" exported="true"/>
+    <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/"/>
+    <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
+    <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
   </resources>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

二進制
FGUIProject/assets/Main/images/zjm_e_6.png


+ 3 - 3
FGUIProject/assets/Store/StoreChargeAddUpUI.xml

@@ -4,9 +4,7 @@
     <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
     <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
     <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
     <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
     <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
     <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
-    <list id="n10_d4iw" name="list" xy="0,793" size="1080,1033" layout="flow_hz" overflow="hidden" colGap="20" defaultItem="ui://p9mtgheohhx91i" align="center" scrollItemToViewOnClick="false">
-      <relation target="" sidePair="bottomext-bottom"/>
-      <item/>
+    <list id="n58_qik1" name="list" xy="0,790" size="1080,1082" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="8" colGap="60" defaultItem="ui://p9mtgheoqik1tby" align="center">
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
@@ -17,5 +15,7 @@
     <component id="n29_hhx9" name="n29" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
     <component id="n29_hhx9" name="n29" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
     </component>
+    <component id="n61_qik1" name="btnLeft" src="qik1tbz" fileName="components/Button8.xml" xy="20,1130" pivot="0.5,0.5" scale="-1,1"/>
+    <component id="n62_qik1" name="btnRight" src="qik1tbz" fileName="components/Button8.xml" xy="965,1130" pivot="0.5,0.5"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 0 - 12
FGUIProject/assets/Store/components/Button1.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="298,152" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
-  <displayList>
-    <image id="n0_nz0t" name="n0" src="d4iwc" fileName="images/sc_yj_anniu_xz.png" xy="0,0" pkg="vlgobc15">
-      <gearDisplay controller="button" pages="1"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_nz0t" name="n1" xy="114,54" size="76,49" fontSize="36" color="#fff4cc" text="充值"/>
-  </displayList>
-  <Button mode="Radio"/>
-</component>

+ 0 - 10
FGUIProject/assets/Store/components/Button2.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="258,70" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
-  <displayList>
-    <loader id="n4_iftf" name="loaMascot" xy="3,-231" size="252,232" url="ui://p9mtgheoiftftac"/>
-    <loader id="n2_10not" name="icon" xy="0,0" size="258,70" url="ui://p9mtgheodmsi17" autoSize="true"/>
-  </displayList>
-  <Button mode="Radio"/>
-  <customProperty target="loaMascot" propertyId="1"/>
-</component>

+ 10 - 0
FGUIProject/assets/Store/components/Button6.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="52,52" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_qik1" src="hhx9p" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

+ 19 - 0
FGUIProject/assets/Store/components/Button7.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="184,56" extention="Button">
+  <controller name="button" pages="0,up,1,down,5,disable" selected="2"/>
+  <displayList>
+    <image id="n2_qik1" name="n2" src="hhx9o" fileName="imagesNew/bt_lock.png" xy="0,1">
+      <gearDisplay controller="button" pages="5"/>
+    </image>
+    <image id="n0_qik1" name="n0" src="hhx9m" fileName="imagesNew/bt_get.png" xy="0,1">
+      <gearDisplay controller="button" pages="0,1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="184,56" fontSize="36" color="#7e6e56" align="center" vAlign="middle" autoSize="none" singleLine="true" text="已领取">
+      <gearColor controller="button" pages="0,5" values="#5a3e16,#000000|#7e6e56,#000000" default="#5a3e16,#000000"/>
+      <gearText controller="button" pages="5" values="已领取" default="领取"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 13 - 0
FGUIProject/assets/Store/components/Button8.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="94,94" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_qik1" src="hhx9l" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="94,94" fontSize="30" autoSize="none" align="center" vAlign="middle" singleLine="true">
+      <relation target="" sidePair="width,height"/>
+    </text>
+  </displayList>
+</component>

+ 0 - 18
FGUIProject/assets/Store/components/Component1.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="890,70">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
-  <displayList>
-    <component id="n17_10not" name="btn0" src="dmsi1q" fileName="components/Button2.xml" xy="0,0">
-      <Button checked="true" icon="ui://p9mtgheodmsi17" selectedIcon="ui://p9mtgheodmsi16" controller="c1" page="0"/>
-      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftaa"/>
-    </component>
-    <component id="n18_10not" name="btn1" src="dmsi1q" fileName="components/Button2.xml" xy="314,0">
-      <Button icon="ui://p9mtgheodmsi19" selectedIcon="ui://p9mtgheodmsi18" controller="c1" page="1"/>
-      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftab"/>
-    </component>
-    <component id="n19_10not" name="btn2" src="dmsi1q" fileName="components/Button2.xml" xy="628,0">
-      <Button icon="ui://p9mtgheodmsi1b" selectedIcon="ui://p9mtgheodmsi1a" controller="c1" page="2"/>
-      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftac"/>
-    </component>
-  </displayList>
-</component>

+ 46 - 0
FGUIProject/assets/Store/components/ListVipItem.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1050" overflow="hidden" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n35_qik1" name="n35" src="hhx9t" fileName="imagesNew/tz_baseboard.png" xy="116,29" group="n58_qik1"/>
+    <graph id="n37_qik1" name="holder" xy="348,461" size="1,1" group="n58_qik1" touchable="false">
+      <gearDisplay controller="button" pages="1"/>
+    </graph>
+    <component id="n38_qik1" name="btnShow" src="qik1tbv" fileName="components/Button6.xml" xy="101,0" group="n58_qik1"/>
+    <image id="n39_qik1" name="n39" src="hhx9u" fileName="imagesNew/tz_name_baseboard.png" xy="80,60" group="n45_qik1"/>
+    <text id="n40_qik1" name="txtName0" xy="100,70" pivot="0.5,0" size="56,69" group="n45_qik1" fontSize="52" color="#915e15" text="梦"/>
+    <text id="n41_qik1" name="txtName1" xy="119,120" pivot="0.5,0" size="38,46" group="n45_qik1" fontSize="34" color="#915e15" text="影"/>
+    <text id="n42_qik1" name="txtName2" xy="103,151" pivot="0.5,0" size="34,41" group="n45_qik1" fontSize="30" color="#915e15" text="画"/>
+    <text id="n43_qik1" name="txtName3" xy="120,176" pivot="0.5,0" size="34,41" group="n45_qik1" fontSize="30" color="#915e15" text="婵"/>
+    <text id="n44_qik1" name="txtName4" xy="116,203" pivot="0.5,0" size="41,122" group="n45_qik1" fontSize="36" color="#915e15" align="center" leading="-12" autoSize="none" text="婵娟"/>
+    <group id="n45_qik1" name="n45" xy="80,60" size="96,265" group="n58_qik1"/>
+    <image id="n46_qik1" name="n46" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,113" pivot="0.5,0.5" group="n49_qik1" scale="-1,1"/>
+    <text id="n48_qik1" name="txtGiftBag" xy="649,100" pivot="0.5,0" size="244,44" group="n49_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级特级礼包"/>
+    <image id="n47_qik1" name="n47" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,113" pivot="0.5,0.5" group="n49_qik1"/>
+    <group id="n49_qik1" name="n49" xy="582,100" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n50_qik1" name="listGiftBag" xy="574,161" size="601,401" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" lineGap="20" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n56_qik1" name="btnGetGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="673,445" group="n58_qik1"/>
+    <image id="n51_qik1" name="n51" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,565" pivot="0.5,0.5" group="n54_qik1" scale="-1,1"/>
+    <text id="n52_qik1" name="txtWeekGiftBag" xy="649,552" pivot="0.5,0" size="244,44" group="n54_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级每周礼包"/>
+    <image id="n53_qik1" name="n53" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,565" pivot="0.5,0.5" group="n54_qik1"/>
+    <group id="n54_qik1" name="n54" xy="582,552" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n55_qik1" name="listWeekGiftBag" xy="574,619" size="601,401" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" lineGap="20" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n57_qik1" name="btnGetWeekGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="673,906" group="n58_qik1"/>
+    <group id="n58_qik1" name="n58" xy="80,0" size="1095,1037"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

+ 7 - 7
FGUIProject/assets/Store/package.xml

@@ -2,9 +2,6 @@
 <packageDescription id="p9mtgheo">
 <packageDescription id="p9mtgheo">
   <resources>
   <resources>
     <component id="d4iwr" name="StoreListItem.xml" path="/components/" exported="true"/>
     <component id="d4iwr" name="StoreListItem.xml" path="/components/" exported="true"/>
-    <component id="nz0t14" name="Button1.xml" path="/components/"/>
-    <component id="dmsi1q" name="Button2.xml" path="/components/"/>
-    <component id="10not1s" name="Component1.xml" path="/components/"/>
     <component id="10not1t" name="ListGiftItem.xml" path="/components/"/>
     <component id="10not1t" name="ListGiftItem.xml" path="/components/"/>
     <component id="iftftaf" name="Component2.xml" path="/components/"/>
     <component id="iftftaf" name="Component2.xml" path="/components/"/>
     <component id="fqortb1" name="Button3.xml" path="/components/"/>
     <component id="fqortb1" name="Button3.xml" path="/components/"/>
@@ -63,7 +60,7 @@
     <image id="fqortb6" name="sc_beijing_hua.png" path="/imagesNew/"/>
     <image id="fqortb6" name="sc_beijing_hua.png" path="/imagesNew/"/>
     <image id="fqortb7" name="sc_beijing_shang.png" path="/imagesNew/"/>
     <image id="fqortb7" name="sc_beijing_shang.png" path="/imagesNew/"/>
     <image id="fqortb8" name="sc_yeqian_zhedang.png" path="/imagesNew/"/>
     <image id="fqortb8" name="sc_yeqian_zhedang.png" path="/imagesNew/"/>
-    <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
+    <component id="10not1v" name="GiftBagBuyUI.xml" path="/"/>
     <component id="fqor7x" name="StoreUI.xml" path="/" exported="true"/>
     <component id="fqor7x" name="StoreUI.xml" path="/" exported="true"/>
     <component id="hhx90" name="ComZhuangShi.xml" path="/components/"/>
     <component id="hhx90" name="ComZhuangShi.xml" path="/components/"/>
     <image id="hhx91" name="VipLevel_baseboard.png" path="/imagesNew/"/>
     <image id="hhx91" name="VipLevel_baseboard.png" path="/imagesNew/"/>
@@ -84,17 +81,15 @@
     <image id="hhx9g" name="VipLevel_Progress_baseboard.png" path="/imagesNew/" scale="9grid" scale9grid="22,4,44,8"/>
     <image id="hhx9g" name="VipLevel_Progress_baseboard.png" path="/imagesNew/" scale="9grid" scale9grid="22,4,44,8"/>
     <image id="hhx9h" name="font_VipLevel_8.png" path="/font/"/>
     <image id="hhx9h" name="font_VipLevel_8.png" path="/font/"/>
     <image id="hhx9i" name="font_VipLevel_9.png" path="/font/"/>
     <image id="hhx9i" name="font_VipLevel_9.png" path="/font/"/>
-    <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="hhx9k" name="wp_baseboard-ornament.png" path="/imagesNew/"/>
     <image id="hhx9k" name="wp_baseboard-ornament.png" path="/imagesNew/"/>
     <image id="hhx9l" name="bt_cut.png" path="/imagesNew/"/>
     <image id="hhx9l" name="bt_cut.png" path="/imagesNew/"/>
     <image id="hhx9m" name="bt_get.png" path="/imagesNew/"/>
     <image id="hhx9m" name="bt_get.png" path="/imagesNew/"/>
     <image id="hhx9n" name="bt_getted.png" path="/imagesNew/"/>
     <image id="hhx9n" name="bt_getted.png" path="/imagesNew/"/>
     <image id="hhx9o" name="bt_lock.png" path="/imagesNew/"/>
     <image id="hhx9o" name="bt_lock.png" path="/imagesNew/"/>
     <image id="hhx9p" name="bt_preview.png" path="/imagesNew/"/>
     <image id="hhx9p" name="bt_preview.png" path="/imagesNew/"/>
-    <image id="hhx9q" name="bt_to.png" path="/imagesNew/"/>
     <image id="hhx9r" name="ornament_title.png" path="/imagesNew/"/>
     <image id="hhx9r" name="ornament_title.png" path="/imagesNew/"/>
     <image id="hhx9s" name="red.png" path="/imagesNew/"/>
     <image id="hhx9s" name="red.png" path="/imagesNew/"/>
-    <image id="hhx9t" name="tz_baseboard.png" path="/imagesNew/"/>
+    <image id="hhx9t" name="tz_baseboard.png" path="/imagesNew/" scale="9grid" scale9grid="214,468,428,101"/>
     <image id="hhx9u" name="tz_name_baseboard.png" path="/imagesNew/"/>
     <image id="hhx9u" name="tz_name_baseboard.png" path="/imagesNew/"/>
     <image id="hhx9v" name="font_save_baseboard.png" path="/imagesNew/"/>
     <image id="hhx9v" name="font_save_baseboard.png" path="/imagesNew/"/>
     <image id="hhx9w" name="GiftBag_baseboard.png" path="/imagesNew/"/>
     <image id="hhx9w" name="GiftBag_baseboard.png" path="/imagesNew/"/>
@@ -140,6 +135,11 @@
     <image id="l500tbs" name="sc_yk_jsdb.png" path="/imagesNew/"/>
     <image id="l500tbs" name="sc_yk_jsdb.png" path="/imagesNew/"/>
     <image id="l500tbt" name="sc_yk_zz.png" path="/imagesNew/"/>
     <image id="l500tbt" name="sc_yk_zz.png" path="/imagesNew/"/>
     <image id="l500tbu" name="sc_yk_zz2.png" path="/imagesNew/"/>
     <image id="l500tbu" name="sc_yk_zz2.png" path="/imagesNew/"/>
+    <component id="qik1tbv" name="Button6.xml" path="/components/"/>
+    <component id="qik1tbw" name="Button7.xml" path="/components/"/>
+    <image id="qik1tbx" name="bt_to.png" path="/imagesNew/"/>
+    <component id="qik1tby" name="ListVipItem.xml" path="/components/"/>
+    <component id="qik1tbz" name="Button8.xml" path="/components/"/>
   </resources>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>
 </packageDescription>

+ 89 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComItemIconNew1
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtHasCount;
+        public GLoader m_loaRarity;
+        public GImage m_imgHas;
+        public GImage m_imgNotHas;
+        public GImage m_imgShowTong;
+        public GGroup m_grpGot;
+        public const string URL = "ui://eg2y0ldpqik1tlz";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComItemIconNew1";
+        private static UI_ComItemIconNew1 _proxy;
+
+        public static UI_ComItemIconNew1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComItemIconNew1();
+            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_ComItemIconNew1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComItemIconNew1();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_imgHas = (GImage)comp.GetChild("imgHas");
+            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
+            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
+            m_grpGot = (GGroup)comp.GetChild("grpGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtHasCount = null;
+            m_loaRarity = null;
+            m_imgHas = null;
+            m_imgNotHas = null;
+            m_imgShowTong = null;
+            m_grpGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagBuyUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: 2b93631e0f2f8ce47a5cfcde3f6418fc
+guid: 16d2b13e4f388e443a4aa699fa6fea84
 MonoImporter:
 MonoImporter:
   externalObjects: {}
   externalObjects: {}
   serializedVersion: 2
   serializedVersion: 2

+ 78 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs

@@ -0,0 +1,78 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComItemNew1
+    {
+        public GComponent target;
+        public UI_ComItemIconNew1 m_comItemIcon;
+        public GTextField m_txtName;
+        public GTextField m_txtCount;
+        public const string URL = "ui://eg2y0ldpqik1tly";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComItemNew1";
+        private static UI_ComItemNew1 _proxy;
+
+        public static UI_ComItemNew1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComItemNew1();
+            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_ComItemNew1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComItemNew1();
+            }
+            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_comItemIcon = (UI_ComItemIconNew1)UI_ComItemIconNew1.Create(comp.GetChild("comItemIcon"));
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comItemIcon.Dispose();
+            m_comItemIcon = null;
+            m_txtName = null;
+            m_txtCount = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 0 - 116
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagBuyUI.cs

@@ -1,116 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Store
-{
-    public partial class UI_GiftBagBuyUI
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GComponent m_bg;
-        public GTextField m_txtName;
-        public GLoader m_loaIcon;
-        public GTextField m_txtLimit;
-        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 GTextField m_txtPrice;
-        public GGroup m_grpOriginalPrice;
-        public const string URL = "ui://p9mtgheo10not1v";
-        public const string PACKAGE_NAME = "Store";
-        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_c1 = comp.GetController("c1");
-            m_bg = (GComponent)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_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_txtPrice = (GTextField)comp.GetChild("txtPrice");
-            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_bg = null;
-            m_txtName = null;
-            m_loaIcon = null;
-            m_txtLimit = null;
-            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_txtPrice = null;
-            m_grpOriginalPrice = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 107 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListVipItem.cs

@@ -0,0 +1,107 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_ListVipItem
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public GButton m_btnShow;
+        public GTextField m_txtName0;
+        public GTextField m_txtName1;
+        public GTextField m_txtName2;
+        public GTextField m_txtName3;
+        public GTextField m_txtName4;
+        public GTextField m_txtGiftBag;
+        public GList m_listGiftBag;
+        public GButton m_btnGetGiftBag;
+        public GTextField m_txtWeekGiftBag;
+        public GList m_listWeekGiftBag;
+        public GButton m_btnGetWeekGiftBag;
+        public const string URL = "ui://p9mtgheoqik1tby";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "ListVipItem";
+        private static UI_ListVipItem _proxy;
+
+        public static UI_ListVipItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListVipItem();
+            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_ListVipItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListVipItem();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+            m_btnShow = (GButton)comp.GetChild("btnShow");
+            m_txtName0 = (GTextField)comp.GetChild("txtName0");
+            m_txtName1 = (GTextField)comp.GetChild("txtName1");
+            m_txtName2 = (GTextField)comp.GetChild("txtName2");
+            m_txtName3 = (GTextField)comp.GetChild("txtName3");
+            m_txtName4 = (GTextField)comp.GetChild("txtName4");
+            m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
+            m_listGiftBag = (GList)comp.GetChild("listGiftBag");
+            m_btnGetGiftBag = (GButton)comp.GetChild("btnGetGiftBag");
+            m_txtWeekGiftBag = (GTextField)comp.GetChild("txtWeekGiftBag");
+            m_listWeekGiftBag = (GList)comp.GetChild("listWeekGiftBag");
+            m_btnGetWeekGiftBag = (GButton)comp.GetChild("btnGetWeekGiftBag");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_btnShow = null;
+            m_txtName0 = null;
+            m_txtName1 = null;
+            m_txtName2 = null;
+            m_txtName3 = null;
+            m_txtName4 = null;
+            m_txtGiftBag = null;
+            m_listGiftBag = null;
+            m_btnGetGiftBag = null;
+            m_txtWeekGiftBag = null;
+            m_listWeekGiftBag = null;
+            m_btnGetWeekGiftBag = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListVipItem.cs.meta

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

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreChargeAddUpUI.cs

@@ -10,6 +10,8 @@ namespace UI.Store
         public GComponent m_valueBar;
         public GComponent m_valueBar;
         public UI_ComVipLv m_comVipLv;
         public UI_ComVipLv m_comVipLv;
         public GList m_list;
         public GList m_list;
+        public GButton m_btnLeft;
+        public GButton m_btnRight;
         public const string URL = "ui://p9mtgheol500tbf";
         public const string URL = "ui://p9mtgheol500tbf";
         public const string PACKAGE_NAME = "Store";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "StoreChargeAddUpUI";
         public const string RES_NAME = "StoreChargeAddUpUI";
@@ -60,6 +62,8 @@ namespace UI.Store
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_comVipLv = (UI_ComVipLv)UI_ComVipLv.Create(comp.GetChild("comVipLv"));
             m_comVipLv = (UI_ComVipLv)UI_ComVipLv.Create(comp.GetChild("comVipLv"));
             m_list = (GList)comp.GetChild("list");
             m_list = (GList)comp.GetChild("list");
+            m_btnLeft = (GButton)comp.GetChild("btnLeft");
+            m_btnRight = (GButton)comp.GetChild("btnRight");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
@@ -67,6 +71,8 @@ namespace UI.Store
             m_comVipLv.Dispose();
             m_comVipLv.Dispose();
             m_comVipLv = null;
             m_comVipLv = null;
             m_list = null;
             m_list = null;
+            m_btnLeft = null;
+            m_btnRight = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 29 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs

@@ -54,5 +54,34 @@ namespace GFGGame
             }
             }
             return false;
             return false;
         }
         }
+        //领取VIP等级礼包
+        public static async ETTask<bool> ReqGetVipGiftBag(int vipLv)
+        {
+            S2C_GetVipLevelGift response = null;
+            response = (S2C_GetVipLevelGift)await MessageHelper.SendToServer(new C2S_GetVipLevelGift() { VipLevel = vipLv });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        //领取VIP周礼包
+        public static async ETTask<bool> ReqGetVipWeekGiftBag(int vipLv)
+        {
+            S2C_GetVipWeekGift response = null;
+            response = (S2C_GetVipWeekGift)await MessageHelper.SendToServer(new C2S_GetVipWeekGift() { VipLevel = vipLv });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
     }
+
 }
 }

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -1,5 +1,7 @@
 using ET;
 using ET;
 using FairyGUI;
 using FairyGUI;
+using UnityEngine;
+
 namespace GFGGame
 namespace GFGGame
 {
 {
     public class ItemView
     public class ItemView
@@ -65,7 +67,7 @@ namespace GFGGame
                 Log.Error($"使用了一个不存在的物品 {_itemData.id}!");
                 Log.Error($"使用了一个不存在的物品 {_itemData.id}!");
                 return;
                 return;
             }
             }
-            _loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            _loaIcon.url = string.IsNullOrEmpty(itemCfg.res) ? "" : ResPathUtil.GetIconPath(itemCfg);
             RarityIconController.UpdateRarityIcon(_loaRarity, _itemData.id, false);
             RarityIconController.UpdateRarityIcon(_loaRarity, _itemData.id, false);
             // _imgGot.visible = false;
             // _imgGot.visible = false;
             _txtName.visible = false;
             _txtName.visible = false;

+ 146 - 10
GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeAddUpView.cs

@@ -3,14 +3,18 @@ using UI.CommonGame;
 using FairyGUI;
 using FairyGUI;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using ET;
 using ET;
+using System;
 
 
 namespace GFGGame
 namespace GFGGame
 {
 {
     public class StoreChargeAddUpView : BaseWindow
     public class StoreChargeAddUpView : BaseWindow
     {
     {
-        private UI_StoreGiftBagUI _ui;
+        private UI_StoreChargeAddUpUI _ui;
         private ValueBarController _valueBarController;
         private ValueBarController _valueBarController;
         private List<ShopCfg> _shopCfgs;
         private List<ShopCfg> _shopCfgs;
+        private DressUpObjUI _dressUpObjUI;
+        private List<DressUpObjUI> _dressUpObjUIs = new List<DressUpObjUI>();
+        private int _curSelectIndex = 0;
 
 
         public override void Dispose()
         public override void Dispose()
         {
         {
@@ -19,10 +23,24 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController.Dispose();
                 _valueBarController = null;
                 _valueBarController = null;
             }
             }
+            if (_dressUpObjUI != null)
+            {
+                _dressUpObjUI.Dispose();
+                _dressUpObjUI = null;
+            }
+            for (int i = 0; i < _dressUpObjUIs.Count; i++)
+            {
+                if (_dressUpObjUIs[i] != null)
+                {
+                    _dressUpObjUIs[i].Dispose();
+                    _dressUpObjUIs[i] = null;
+                }
+            }
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();
             }
             }
+
             _ui = null;
             _ui = null;
             base.Dispose();
             base.Dispose();
         }
         }
@@ -30,14 +48,22 @@ namespace GFGGame
         protected override void OnInit()
         protected override void OnInit()
         {
         {
             base.OnInit();
             base.OnInit();
-            packageName = UI_StoreGiftBagUI.PACKAGE_NAME;
-            _ui = UI_StoreGiftBagUI.Create();
+            packageName = UI_StoreChargeAddUpUI.PACKAGE_NAME;
+            _ui = UI_StoreChargeAddUpUI.Create();
             this.viewCom = _ui.target;
             this.viewCom = _ui.target;
             isfullScreen = true;
             isfullScreen = true;
             this.clickBlankToClose = false;
             this.clickBlankToClose = false;
 
 
-            _ui.m_list.itemRenderer = ListItemRenderer;
+            _dressUpObjUI = new DressUpObjUI("SceneSuitFoster");
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _valueBarController = new ValueBarController(_ui.m_valueBar);
+
+            _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_list.SetVirtual();
+            _ui.m_list.scrollPane.onScrollEnd.Add(UpdateSuitView);
+            _ui.m_list.scrollPane.decelerationRate = 0.8f;
+
+            _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
+            _ui.m_btnRight.onClick.Add(OnBtnRightClick);
         }
         }
         protected override void AddEventListener()
         protected override void AddEventListener()
         {
         {
@@ -46,11 +72,13 @@ namespace GFGGame
         protected override void OnShown()
         protected override void OnShown()
         {
         {
             base.OnShown();
             base.OnShown();
-            int menu2 = (int)this.viewData;
-            _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
-            _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
-            _ui.m_list.numItems = _shopCfgs.Count;
             _valueBarController.OnShown();
             _valueBarController.OnShown();
+
+            _ui.m_list.numItems = VipCfgArray.Instance.dataArray.Length - 1;
+            _curSelectIndex = Math.Max(0, RoleDataManager.vipLv - 1);
+            _ui.m_list.selectedIndex = _curSelectIndex;
+            _ui.m_list.ScrollToView(_curSelectIndex);
+            ShopViewManager.Instance.UpdateVipProgressCom(_ui.m_comVipLv.target);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
@@ -63,11 +91,119 @@ namespace GFGGame
             base.RemoveEventListener();
             base.RemoveEventListener();
         }
         }
 
 
+        private void RefreshList()
+        {
 
 
+        }
         private void ListItemRenderer(int index, GObject obj)
         private void ListItemRenderer(int index, GObject obj)
         {
         {
-            ShopCfg shopCfg = _shopCfgs[index];
-            ShopViewManager.Instance.UptadeItem(obj, shopCfg);
+            VipCfg lastVipCfg = VipCfgArray.Instance.dataArray[index];
+            VipCfg vipCfg = VipCfgArray.Instance.dataArray[index + 1];
+            UI_ListVipItem item = UI_ListVipItem.Proxy(obj);
+            string name = SuitCfgArray.Instance.GetCfg(vipCfg.suitId).name;
+            item.m_txtName0.text = name.Length > 0 ? name.Substring(0, 1) : "";
+            item.m_txtName1.text = name.Length > 1 ? name.Substring(1, 1) : "";
+            item.m_txtName2.text = name.Length > 2 ? name.Substring(2, 1) : "";
+            item.m_txtName3.text = name.Length > 3 ? name.Substring(3, 1) : "";
+            item.m_txtName4.text = name.Length > 4 ? name.Substring(4) : "";
+
+            item.m_txtGiftBag.SetVar("value", vipCfg.id.ToString()).FlushVars();
+            if (item.m_listGiftBag.data == null)
+            {
+                item.m_listGiftBag.itemRenderer = ListRewardItemRender;
+            }
+            item.m_listGiftBag.data = lastVipCfg.bonusOnceArr;
+            item.m_listGiftBag.numItems = lastVipCfg.bonusOnceArr.Length;
+
+            item.m_txtWeekGiftBag.SetVar("value", vipCfg.id.ToString()).FlushVars();
+            if (item.m_listWeekGiftBag.data == null)
+            {
+                item.m_listWeekGiftBag.itemRenderer = ListRewardItemRender;
+            }
+            item.m_listWeekGiftBag.data = vipCfg.bonusWeekArr;
+            item.m_listWeekGiftBag.numItems = vipCfg.bonusWeekArr.Length;
+
+            if (item.m_holder.data == null)
+            {
+                DressUpObjUI dressUpObjUI = new DressUpObjUI("SceneSuitFoster");
+                item.m_holder.data = dressUpObjUI;
+                _dressUpObjUIs.Add(dressUpObjUI);
+            }
+            _dressUpObjUI = item.m_holder.data as DressUpObjUI;
+            _dressUpObjUI.ResetSceneObj(90, false, true, null, false);
+            _dressUpObjUI.dressUpObj.PutOnSuitCfg(vipCfg.suitId, true, new int[] { ConstDressUpItemType.BEI_JING }, true, false);
+            _dressUpObjUI.UpdateWrapper(item.m_holder);
+
+            if (item.m_btnGetGiftBag.data == null)
+            {
+                item.m_btnGetGiftBag.onClick.Add(OnBtnGetGiftBagClick);
+            }
+            item.m_btnGetGiftBag.data = vipCfg.id;
+            bool isGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfg.id);
+            item.m_btnGetGiftBag.enabled = !isGet;
+            if (item.m_btnGetWeekGiftBag.data == null)
+            {
+                item.m_btnGetWeekGiftBag.onClick.Add(OnBtnGetWeekGiftBagClick);
+            }
+            item.m_btnGetWeekGiftBag.data = vipCfg.id;
+            bool isWeekGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus), vipCfg.id);
+            item.m_btnGetWeekGiftBag.enabled = !isWeekGet;
+            UI_ListVipItem.ProxyEnd();
+        }
+
+        private void ListRewardItemRender(int index, GObject obj)
+        {
+            int[][] rewards = (int[][])obj.parent.data;
+
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            ItemData itemData = ItemUtil.createItemData(rewards[index]);
+            (obj.data as ItemView).SetData(itemData);
+            (obj.data as ItemView).ChangeTxtCountStyle();
+        }
+        private void OnBtnGetGiftBagClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int vipLv = (int)obj.data;
+            if (RoleDataManager.vipLv < vipLv)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("会员等级不足");
+                return;
+            }
+            ShopSProxy.ReqGetVipGiftBag(vipLv).Coroutine();
+        }
+        private void OnBtnGetWeekGiftBagClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int vipLv = (int)obj.data;
+            if (RoleDataManager.vipLv < vipLv)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("会员等级不足");
+                return;
+            }
+            ShopSProxy.ReqGetVipWeekGiftBag(vipLv).Coroutine();
+        }
+        private void OnBtnLeftClick()
+        {
+
+            if (_curSelectIndex == 0) return;
+            _curSelectIndex = _curSelectIndex - 1;
+            _ui.m_list.ScrollToView(_curSelectIndex, true);
+            _ui.m_list.selectedIndex = _curSelectIndex;
+        }
+        private void OnBtnRightClick()
+        {
+            if (_curSelectIndex == _ui.m_list.numItems - 1) return;
+            _curSelectIndex = _curSelectIndex + 1;
+            _ui.m_list.ScrollToView(_curSelectIndex, true);
+            _ui.m_list.selectedIndex = _curSelectIndex;
+        }
+        private void UpdateSuitView()
+        {
+            _curSelectIndex = _ui.m_list.GetFirstChildInView();
+            _ui.m_list.selectedIndex = _curSelectIndex;
         }
         }
     }
     }
 }
 }

+ 4 - 0
GameClient/Assets/ResIn/Prefab/SceneSuitFoster.prefab

@@ -86,6 +86,10 @@ PrefabInstance:
       propertyPath: m_Name
       propertyPath: m_Name
       value: Role
       value: Role
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
+    - target: {fileID: 8605298645814931756, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_MaskInteraction
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
 --- !u!4 &5071376304944447272 stripped
 --- !u!4 &5071376304944447272 stripped

二進制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


二進制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


二進制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


二進制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


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


二進制
GameClient/Assets/ResIn/UI/Store/Store_atlas0.png


二進制
GameClient/Assets/ResIn/UI/Store/Store_atlas0_1.png


二進制
GameClient/Assets/ResIn/UI/Store/Store_atlas0_3.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Store/Store_atlas0_3.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: dc2ffb1b2b5016342bb76f1369595be2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
GameClient/Assets/ResIn/UI/Store/Store_fui.bytes